[Use name in phonebook and prefix sip: to reject entries
Adrian Georgescu <ag@ag-projects.com>**20071025231654] hunk ./provisioning/sip_settings_lib.phtml 3628
-
-		$firstName = trim($_REQUEST['first_name']);
-        $lastName  = trim($_REQUEST['last_name']);
hunk ./provisioning/sip_settings_lib.phtml 3629
-        $group     = trim($_REQUEST['group']);
+	    $group     = trim($_REQUEST['group']);
hunk ./provisioning/sip_settings_lib.phtml 3631
-        $phonebookEntry=array('firstName' => $firstName,
-                              'lastName'  => $lastName,
-                              'uri'       => $uri,
-                              'group'     => $group
+   		if ($this->SOAPversion > 1) {
+			$name = trim($_REQUEST['name']);
+    	    $phonebookEntry=array('name' => $name,
+            	                  'uri'       => $uri,
+                	              'group'     => $group
hunk ./provisioning/sip_settings_lib.phtml 3637
-
+        } else {
+			$firstName = trim($_REQUEST['first_name']);
+    	    $lastName  = trim($_REQUEST['last_name']);
+    	    $phonebookEntry=array('firstName' => $firstName,
+        	                      'lastName'  => $lastName,
+            	                  'uri'       => $uri,
+                	              'group'     => $group
+                              );
+        }
hunk ./provisioning/sip_settings_lib.phtml 3751
-        $match=array('uri'       => $search_text,
-                     'firstName' => $search_text,
-                     'lastName'  => $search_text
-                     );
+        if ($this->SOAPversion > 1) {
+        	$match=array('uri'  => $search_text,
+            	         'name' => $search_text
+                    	 );
+        } else {
+        	$match=array('uri'       => $search_text,
+            	         'firstName' => $search_text,
+                	     'lastName'  => $search_text
+                    	 );
+        }
hunk ./provisioning/sip_settings_lib.phtml 3837
-        $first_name = $_REQUEST['first_name'];
-        $last_name = $_REQUEST['last_name'];
hunk ./provisioning/sip_settings_lib.phtml 3839
+        if ($this->SOAPversion > 1) {
+        	$name = $_REQUEST['name'];
+        } else {
+        	$first_name = $_REQUEST['first_name'];
+	        $last_name = $_REQUEST['last_name'];
+        }
+
hunk ./provisioning/sip_settings_lib.phtml 3919
-            print _("Group");
+            print _("Address");
hunk ./provisioning/sip_settings_lib.phtml 3927
-            print _("Address");
+            print _("Group");
hunk ./provisioning/sip_settings_lib.phtml 3938
-                $fname    = $this->PhonebookEntries[$_entry]->firstName;
-                $lname    = $this->PhonebookEntries[$_entry]->lastName;
-
hunk ./provisioning/sip_settings_lib.phtml 3949
-
-                printf ("<select name=group onChange=\"location.href='%s&task=update&uri=%s&first_name=%s&last_name=%s&group='+this.options[this.selectedIndex].value\">",$url_string,urlencode($this->PhonebookEntries[$_entry]->uri),urlencode($fname),urlencode($lname));
-        		print "<option value=\"\">";
-        		$selected_grp[$this->PhonebookEntries[$_entry]->group]="selected";
-                foreach(array_keys($this->PhonebookGroups) as $_key) {
-            		printf ("<option value=\"%s\" %s>%s",$_key,$selected_grp[$_key],$this->PhonebookGroups[$_key]);
-        		}
-                unset($selected_grp);
-
-        		print "</select>";
+                print $this->PhonebookEntries[$_entry]->uri;
hunk ./provisioning/sip_settings_lib.phtml 3956
-                if ($fname || $lname) {
-                    print "<a onClick=\"return toggleVisibility('row$found')\" href=#>$fname $lname</a>";
+        		if ($this->SOAPversion > 1) {
+                    print _("Name");
+                    printf ("<input type=text name=name value='%s'>",$this->PhonebookEntries[$_entry]->name);
+                    print "<a href=\"javascript: document.Entry$found.submit()\">Update</a>";
hunk ./provisioning/sip_settings_lib.phtml 3961
-                    print "<a onClick=\"return toggleVisibility('row$found')\" href=#>Edit</a>";
-                }
-
-                print "
-                <table border=0 class=extrainfo id=row$found cellpadding=0 cellspacing=0 width=100%>
+	                if ($fname || $lname) {
+    	                print "<a onClick=\"return toggleVisibility('row$found')\" href=#>$fname $lname</a>";
+        	        } else {
+            	        print "<a onClick=\"return toggleVisibility('row$found')\" href=#>Edit</a>";
+                	}
+	                print "
+    	            <table border=0 class=extrainfo id=row$found cellpadding=0 cellspacing=0 width=100%>
hunk ./provisioning/sip_settings_lib.phtml 3982
-                    print "<tr><td><a href=\"javascript: document.Entry$found.submit()\">Update</a></td></tr>";
hunk ./provisioning/sip_settings_lib.phtml 3984
-                </table>
+        	        </table>
+            	    ";
+                }
+
+                print "
hunk ./provisioning/sip_settings_lib.phtml 3991
-                print $this->PhonebookEntries[$_entry]->uri;
+        		if ($this->SOAPversion > 1) {
+                	printf ("<select name=group onChange=\"location.href='%s&task=update&uri=%s&name=%s&group='+this.options[this.selectedIndex].value\">",$url_string,urlencode($this->PhonebookEntries[$_entry]->uri),urlencode($this->PhonebookEntries[$_entry]->name));
+                } else {
+                	$fname    = $this->PhonebookEntries[$_entry]->firstName;
+	                $lname    = $this->PhonebookEntries[$_entry]->lastName;
+                	printf ("<select name=group onChange=\"location.href='%s&task=update&uri=%s&first_name=%s&last_name=%s&group='+this.options[this.selectedIndex].value\">",$url_string,urlencode($this->PhonebookEntries[$_entry]->uri),urlencode($fname),urlencode($lname));
+                }
+
+        		print "<option value=\"\">";
+        		$selected_grp[$this->PhonebookEntries[$_entry]->group]="selected";
+                foreach(array_keys($this->PhonebookGroups) as $_key) {
+            		printf ("<option value=\"%s\" %s>%s",$_key,$selected_grp[$_key],$this->PhonebookGroups[$_key]);
+        		}
+                unset($selected_grp);
+
+        		print "</select>";
+
hunk ./provisioning/sip_settings_lib.phtml 4156
+        	if (strlen($_member) && !preg_match("/^sip:/",$_member)) {
+            	$_member.='sip:'.$_member;
+            }
hunk ./provisioning/sip_settings_lib.phtml 4920
-        $uri_print="<a href=sip:$uri>$this->call_img</a>";
+        $uri_print="<a href=$uri>$this->call_img</a>";