[Formatted code Tijmen de Mes **20191025115224 Ignore-this: d54ec4842e05b54de2195fefe39220ce ] hunk ./library/sip_settings.php 6604 - $this->contentType="Content-type: text/csv"; + $this->contentType = "Content-type: text/csv"; hunk ./library/sip_settings.php 6608 - if (!$userAgent) $userAgent='snom'; + if (!$userAgent) $userAgent = 'snom'; hunk ./library/sip_settings.php 6610 - if ($userAgent=='snom') { - $this->export_filename="tbook.csv"; - $phonebook.=sprintf("Name,Address,Group\n"); - } else if ($userAgent == 'eyebeam') { - $phonebook.=sprintf("Name,Group Name,SIP URL,Proxy ID\n"); - } else if ($userAgent == 'csco') { - $this->contentType="Content-type: text/xml"; - $this->export_filename="directory.xml"; - $phonebook.=sprintf ("\n\t%s\n\tDirectory\n",$this->account); - } else if ($userAgent == 'unidata') { - $this->export_filename="phonebook.csv"; - $phonebook.=sprintf("Index,Name,,,,\n"); - $phonebook.=sprintf("0,Undefined,,,,\n"); + if ($userAgent == 'snom') { + $this->export_filename = "tbook.csv"; + $phonebook .= sprintf("Name,Address,Group\n"); + } elseif ($userAgent == 'eyebeam') { + $phonebook .= sprintf("Name,Group Name,SIP URL,Proxy ID\n"); + } elseif ($userAgent == 'csco') { + $this->contentType = "Content-type: text/xml"; + $this->export_filename = "directory.xml"; + $phonebook .= sprintf( + "\n\t%s\n\tDirectory\n", + $this->account + ); + } elseif ($userAgent == 'unidata') { + $this->export_filename = "phonebook.csv"; + $phonebook .= sprintf("Index,Name,,,,\n"); + $phonebook .= sprintf("0,Undefined,,,,\n"); hunk ./library/sip_settings.php 6627 - $z=1; - foreach($this->PhonebookGroups as $_group) { - $this->groupIndex[$_group]=$z; - $phonebook.=sprintf ("%s,%s,,,,\n",$z,$_group); + $z = 1; + foreach ($this->PhonebookGroups as $_group) { + $this->groupIndex[$_group] = $z; + $phonebook .= sprintf("%s,%s,,,,\n", $z, $_group); hunk ./library/sip_settings.php 6634 - $phonebook.=sprintf("\nIndex,Name,RdNm,Tel,Group\n"); - + $phonebook .= sprintf("\nIndex,Name,RdNm,Tel,Group\n"); hunk ./library/sip_settings.php 6637 - $found=0; + $found = 0; hunk ./library/sip_settings.php 6640 - hunk ./library/sip_settings.php 6645 - if (!preg_match("/[_%]/",$uri)) { - $uri=substr($uri,4); - $els=explode("@",$uri); - if ($els[1]==$this->domain) $uri=$els[0]; - if ($userAgent=='snom') { - $phonebook.=sprintf ("%s %s,%s,%s\n",$fname,$lname,$uri,$this->PhonebookGroups[$group]); - } else if ($userAgent == 'unidata' && $fname && $lname) { - $phonebook.=sprintf ("%s,%s,%s %s,%s,%s\n",$found,$fname,$fname,$lname,$uri,$this->PhonebookGroups[$group]); - } else if ($userAgent == 'eyebeam') { - $phonebook.=sprintf ("%s %s,%s,1\n",$fname,$lname,$this->PhonebookEntries[$_entry]->uri,$this->PhonebookGroups[$group]); - } else if ($userAgent == 'csco') { - $phonebook.=sprintf ("\n\t\n\t%s %s\n\t%s\n\t\n",$fname,$lname,$uri); + if (!preg_match("/[_%]/", $uri)) { + $uri = substr($uri, 4); + $els = explode("@", $uri); + if ($els[1] == $this->domain) $uri=$els[0]; + if ($userAgent == 'snom') { + $phonebook .= sprintf( + "%s %s,%s,%s\n", + $fname, + $lname, + $uri, + $this->PhonebookGroups[$group] + ); + } elseif ($userAgent == 'unidata' && $fname && $lname) { + $phonebook .= sprintf( + "%s,%s,%s %s,%s,%s\n", + $found, + $fname, + $fname, + $lname, + $uri, + $this->PhonebookGroups[$group] + ); + } elseif ($userAgent == 'eyebeam') { + $phonebook .= sprintf( + "%s %s,%s,1\n", + $fname, + $lname, + $this->PhonebookEntries[$_entry]->uri, + $this->PhonebookGroups[$group] + ); + } elseif ($userAgent == 'csco') { + $phonebook .= sprintf( + "\n\t\n\t%s %s\n\t%s\n\t\n", + $fname, + $lname, + $uri + ); hunk ./library/sip_settings.php 6688 - $phonebook.=sprintf ("\n\n"); + $phonebook .= sprintf("\n\n"); hunk ./library/sip_settings.php 6692 - $_header=sprintf("Content-Disposition: inline; filename=%s",$this->export_filename); + $_header = sprintf("Content-Disposition: inline; filename=%s", $this->export_filename); hunk ./library/sip_settings.php 6699 - hunk ./library/sip_settings.php 6701 - function getRejectMembers() { + function getRejectMembers() + { hunk ./library/sip_settings.php 6704 + hunk ./library/sip_settings.php 6706 - $result = $this->SipPort->getRejectMembers($this->sipId); + $result = $this->SipPort->getRejectMembers($this->sipId); hunk ./library/sip_settings.php 6712 - printf ("

Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring); + printf( + "

Error (SipPort): %s (%s): %s", + $error_msg, + $error_fault->detail->exception->errorcode, + $error_fault->detail->exception->errorstring + ); hunk ./library/sip_settings.php 6720 - - $this->rejectMembers=$result; + $this->rejectMembers = $result; hunk ./library/sip_settings.php 6726 - function setRejectMembers() { - - $members=array(); - - $rejectMembers=$_REQUEST['rejectMembers']; + function setRejectMembers() + { + $members = array(); + $rejectMembers = $_REQUEST['rejectMembers']; hunk ./library/sip_settings.php 6732 - if (strlen($_member) && !preg_match("/^sip:/",$_member)) { + if (strlen($_member) && !preg_match("/^sip:/", $_member)) { hunk ./library/sip_settings.php 6735 - if (strlen($_member)) $members[]=$_member; + if (strlen($_member)) $members[] = $_member; hunk ./library/sip_settings.php 6741 - $result = $this->SipPort->setRejectMembers($this->sipId,$members); + $result = $this->SipPort->setRejectMembers($this->sipId, $members); hunk ./library/sip_settings.php 6747 - printf ("

Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring); + printf( + "

Error (SipPort): %s (%s): %s", + $error_msg, + $error_fault->detail->exception->errorcode, + $error_fault->detail->exception->errorstring + );