[Formatted file added some dynamic properties and added general SOAP error handler
Tijmen de Mes <tijmen@ag-projects.com>**20240314093345
 Ignore-this: 3b1ab18172e374822198834488a6afab5a0b1a01aef276acee8d02b00d316f84b05cfb76cc75bdd2
] hunk ./library/sip_settings.php 173
-    public function __construct($account,$loginCredentials=array(),$soapEngines=array())
+    public function __construct($account, $loginCredentials=array(), $soapEngines=array())
hunk ./library/sip_settings.php 176
-		//define_syslog_variables();
+        //define_syslog_variables();
hunk ./library/sip_settings.php 182
-        $debug=sprintf("<font color=blue><p><b>Initialize %s(%s)</b></font>",get_class($this),$account);
+        $debug=sprintf("<font color=blue><p><b>Initialize %s(%s)</b></font>", get_class($this), $account);
hunk ./library/sip_settings.php 188
-		if ($this->isEmbedded()) {
-        	$this->login_type = 'subscriber';
+        if ($this->isEmbedded()) {
+            $this->login_type = 'subscriber';
hunk ./library/sip_settings.php 237
-
hunk ./library/sip_settings.php 238
-
hunk ./library/sip_settings.php 244
-
hunk ./library/sip_settings.php 255
-            $this->hiddenElements=sprintf("
-            <input type=hidden name=account value='%s'>
-            <input type=hidden name=sip_engine value='%s'>
-            <input type=hidden name=user_agent value='%s'>
-            <input type=hidden name=realm value='%s'>
-            ",
-            $this->account,
-            $this->sip_engine,
-            $_REQUEST['user_agent'],
-            $_REQUEST['realm']
+            $this->hiddenElements = sprintf(
+                "
+                <input type=hidden name=account value='%s'>
+                <input type=hidden name=sip_engine value='%s'>
+                <input type=hidden name=user_agent value='%s'>
+                <input type=hidden name=realm value='%s'>
+                ",
+                $this->account,
+                $this->sip_engine,
+                $_REQUEST['user_agent'],
+                $_REQUEST['realm']
hunk ./library/sip_settings.php 311
-            "WEBName" =>sprintf (_("Reject Anonymous")),
+            "WEBName" =>sprintf(_("Reject Anonymous")),
hunk ./library/sip_settings.php 320
-            "WEBName" =>sprintf (_("Email Missed Calls")),
+            "WEBName" =>sprintf(_("Email Missed Calls")),
hunk ./library/sip_settings.php 326
-
hunk ./library/sip_settings.php 343
-          	$this->tabs['diversions']=_('Forwarding');
-          	$this->tabs['accept']=_('Accept');
-          	$this->tabs['contacts']=_('Contacts');
+            $this->tabs['diversions']=_('Forwarding');
+            $this->tabs['accept']=_('Accept');
+            $this->tabs['contacts']=_('Contacts');
hunk ./library/sip_settings.php 350
-            	$this->tabs['barring']=_("Barring");
+                $this->tabs['barring']=_("Barring");
hunk ./library/sip_settings.php 412
-        $_protocol=preg_match("/^(https?:\/\/)/",$_SERVER['SCRIPT_URI'],$m);
+        $_protocol=preg_match("/^(https?:\/\/)/", $_SERVER['SCRIPT_URI'], $m);
hunk ./library/sip_settings.php 452
-
hunk ./library/sip_settings.php 453
-
hunk ./library/sip_settings.php 668
-        if ($this->showSoapConnectionInfo)  {
-            printf ("<p>%s at <a href=%swsdl target=wsdl>%s</a> as %s ",$this->soapClassSipPort,$this->SOAPurl,$this->SOAPurl,$this->soapUsername);
+        if ($this->showSoapConnectionInfo) {
+            printf("<p>%s at <a href=%swsdl target=wsdl>%s</a> as %s ", $this->soapClassSipPort, $this->SOAPurl, $this->SOAPurl, $this->soapUsername);
hunk ./library/sip_settings.php 694
-            printf ("<br>%s at <a href=%swsdl target=wsdl>%s</a> as %s ",$this->soapClassVoicemailPort,$this->SOAPurlVoicemail,$this->SOAPurlVoicemail,$this->soapEngines[$this->voicemail_engine]['username']);
+            printf("<br>%s at <a href=%swsdl target=wsdl>%s</a> as %s ", $this->soapClassVoicemailPort, $this->SOAPurlVoicemail, $this->SOAPurlVoicemail, $this->soapEngines[$this->voicemail_engine]['username']);
hunk ./library/sip_settings.php 719
-            printf ("<br>%s at <a href=%swsdl target=wsdl>%s</a> as %s ",$this->soapClassEnumPort,$this->SOAPurlEnum,$this->SOAPurlEnum,$this->soapEngines[$this->enum_engine]['username']);
+            printf("<br>%s at <a href=%swsdl target=wsdl>%s</a> as %s ", $this->soapClassEnumPort, $this->SOAPurlEnum, $this->SOAPurlEnum, $this->soapEngines[$this->enum_engine]['username']);
hunk ./library/sip_settings.php 744
-            printf ("<br>%s at <a href=%swsdl target=wsdl>%s</a> as %s ",$this->soapClassRatingPort,$this->SOAPurlRating,$this->SOAPurlRating,$this->soapEngines[$this->rating_engine]['username']);
+            printf("<br>%s at <a href=%swsdl target=wsdl>%s</a> as %s ", $this->soapClassRatingPort, $this->SOAPurlRating, $this->SOAPurlRating, $this->soapEngines[$this->rating_engine]['username']);
hunk ./library/sip_settings.php 768
-            printf ("<br>%s at <a href=%swsdl target=wsdl>%s</a> as %s ",$this->soapClassCustomerPort,$this->SOAPurlCustomer,$this->SOAPurlCustomer,$this->soapEngines[$this->customer_engine]['username']);
+            printf("<br>%s at <a href=%swsdl target=wsdl>%s</a> as %s ", $this->soapClassCustomerPort, $this->SOAPurlCustomer, $this->SOAPurlCustomer, $this->soapEngines[$this->customer_engine]['username']);
hunk ./library/sip_settings.php 776
-        list($username, $domain)=explode("@",trim($account));
+        list($username, $domain)=explode("@", trim($account));
hunk ./library/sip_settings.php 785
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error (SipPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 808
-        if ( $this->Preferences['blocked_by'] && !in_array("blocked",$result->groups)) {
+        if ( $this->Preferences['blocked_by'] && !in_array("blocked", $result->groups)) {
hunk ./library/sip_settings.php 847
-                    $this->ip_access_list .= sprintf("%s/%s ",$result->acl[$key]->ip, $result->acl[$key]->mask);
+                    $this->ip_access_list .= sprintf("%s/%s ", $result->acl[$key]->ip, $result->acl[$key]->mask);
hunk ./library/sip_settings.php 924
-        if (!array_key_exists($this->tab,$this->tabs)) $this->tab="settings";
+        if (!array_key_exists($this->tab, $this->tabs)) $this->tab="settings";
hunk ./library/sip_settings.php 937
-    function getDomainOwner ($domain='')
+    public function soapHasError($result)
hunk ./library/sip_settings.php 939
+        return (new PEAR)->isError($result);
+    }
+
+
+    public function checkPrintSoapError($result, $port = 'SipPort')
+    {
+        if (!$this->soapHasError($result)) {
+            return false;
+        }
+
+        $error_msg  = $result->getMessage();
+        $error_fault= $result->getFault();
+        $error_code = $result->getCode();
+
+        printf(
+            "
+            <div class=row-fluid>
+                <div class=span12>
+                    <span class='alert alert-error'>Error (%s): %s (%s): %s</span>
+                </div>
+            </div>
+            ",
+            $port,
+            $error_msg,
+            $error_fault->detail->exception->errorcode,
+            $error_fault->detail->exception->errorstring
+        );
+        return true;
+    }
+
+    function getDomainOwner($domain = '')
+    {
hunk ./library/sip_settings.php 1062
-            printf ("<p><font color=red>Error (CustomerPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error (CustomerPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 1122
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 1146
-            printf ("<p><font color=red>Error (RatingPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error (RatingPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 1161
-        $addAliases     = array_unique(array_diff($aliases_new,$aliases_old));
-        $deleteAliases  = array_unique(array_diff($aliases_old,$aliases_new));
+        $addAliases     = array_unique(array_diff($aliases_new, $aliases_old));
+        $deleteAliases  = array_unique(array_diff($aliases_old, $aliases_new));
hunk ./library/sip_settings.php 1167
-            if (!preg_match("/^[a-z0-9-_.@]+$/i",$_alias)) continue;
-
-            $els=explode("@",$_alias);
+            if (!preg_match("/^[a-z0-9-_.@]+$/i", $_alias)) continue;
+
+            $els=explode("@", $_alias);
hunk ./library/sip_settings.php 1192
-            if ((new PEAR)->isError($result)) {
-                $error_msg  = $result->getMessage();
-                $error_fault= $result->getFault();
-                $error_code = $result->getCode();
-                printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 1200
-            $els=explode("@",$_alias);
+            $els=explode("@", $_alias);
hunk ./library/sip_settings.php 1221
-            if ((new PEAR)->isError($result)) {
-                $error_msg  = $result->getMessage();
-                $error_fault= $result->getFault();
-                $error_code = $result->getCode();
-                printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 1241
-                printf ("<p><font color=red>Error (VoicemailPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                printf("<p><font color=red>Error (VoicemailPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 1275
-        printf (("%s &lt;sip:%s@%s&gt;"),$this->fullName,$this->username,$this->domain);
+        printf(("%s &lt;sip:%s@%s&gt;"), $this->fullName, $this->username, $this->domain);
hunk ./library/sip_settings.php 1295
-                if ($this->homeNode=getSipThorHomeNode($this->account,$this->sip_proxy)) {
-                    printf (" <font color=green>%s</font>",$this->homeNode);
+                if ($this->homeNode=getSipThorHomeNode($this->account, $this->sip_proxy)) {
+                    printf(" <font color=green>%s</font>", $this->homeNode);
hunk ./library/sip_settings.php 1328
-            if (in_array("free-pstn",$this->groups)) {
+            if (in_array("free-pstn", $this->groups)) {
hunk ./library/sip_settings.php 1334
-                    if (!$seen[$tel_enum] && !in_array($tel_enum,$this->enums)) {
-                        $this->divertTargets[]=array("name"  => sprintf (_("Tel %s"),$tel),
+                    if (!$seen[$tel_enum] && !in_array($tel_enum, $this->enums)) {
+                        $this->divertTargets[]=array("name"  => sprintf(_("Tel %s"), $tel),
hunk ./library/sip_settings.php 1346
-                    if (!$seen[$tel_enum] && !in_array($tel_enum,$this->enums)) {
-                        $this->divertTargets[]=array("name"  => sprintf (_("Tel %s"),$tel),
+                    if (!$seen[$tel_enum] && !in_array($tel_enum, $this->enums)) {
+                        $this->divertTargets[]=array("name"  => sprintf(_("Tel %s"), $tel),
hunk ./library/sip_settings.php 1353
-
hunk ./library/sip_settings.php 1354
-
hunk ./library/sip_settings.php 1360
-            if (!$seen[$tel_enum] && !in_array($tel_enum,$this->enums)) {
-                $this->divertTargets[] = array("name"        => sprintf (_("Mobile %s"),$tel),
+            if (!$seen[$tel_enum] && !in_array($tel_enum, $this->enums)) {
+                $this->divertTargets[] = array("name"        => sprintf(_("Mobile %s"), $tel),
hunk ./library/sip_settings.php 1370
-        $this->divertTargets[]=array("name"  => sprintf (_("Other")),
+        $this->divertTargets[]=array("name"  => sprintf(_("Other")),
hunk ./library/sip_settings.php 1489
-            printf ("<p><font color=red>Error (CustomerPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error (CustomerPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 1499
-
hunk ./library/sip_settings.php 1530
-                    "WEBName" => sprintf (_("PSTN Privacy")),
+                    "WEBName" => sprintf(_("PSTN Privacy")),
hunk ./library/sip_settings.php 1554
-
hunk ./library/sip_settings.php 1572
-        $result     = $this->CustomerPort->getAccount(intval($this->reseller));
+        $result = $this->CustomerPort->getAccount(intval($this->reseller));
hunk ./library/sip_settings.php 1578
-            printf ("<p><font color=red>Error (CustomerPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error (CustomerPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 1731
-                "WEBName"    => sprintf (_("PSTN Privacy")),
+                "WEBName"    => sprintf(_("PSTN Privacy")),
hunk ./library/sip_settings.php 1756
-
hunk ./library/sip_settings.php 1758
-
hunk ./library/sip_settings.php 1766
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 1782
-            if (preg_match("/^(sip:|sips:)(.*)$/i",$uri,$m)) {
+            if (preg_match("/^(sip:|sips:)(.*)$/i", $uri, $m)) {
hunk ./library/sip_settings.php 1803
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 1805
-        }  else {
+        } else {
hunk ./library/sip_settings.php 1837
-        return array("name"  => sprintf (_("Voice Mailbox")),
+        return array("name"  => sprintf(_("Voice Mailbox")),
hunk ./library/sip_settings.php 1853
-
hunk ./library/sip_settings.php 1906
-        if ($this->login_type == 'subscriber' && in_array("blocked",$this->groups)) {
+        if ($this->login_type == 'subscriber' && in_array("blocked", $this->groups)) {
hunk ./library/sip_settings.php 1923
-
hunk ./library/sip_settings.php 1950
-                printf ("<font color=red>Daily Credit Exceeded</font>");
+                printf("<font color=red>Daily Credit Exceeded</font>");
hunk ./library/sip_settings.php 1953
-                $log=sprintf("CC transaction is not allowed from %s for %s (%s)",$_SERVER['REMOTE_ADDR'],$account->account,$this->fraud_reason);
+                $log=sprintf("CC transaction is not allowed from %s for %s (%s)", $_SERVER['REMOTE_ADDR'], $account->account, $this->fraud_reason);
hunk ./library/sip_settings.php 1975
-        printf (_("Calling to telephone numbers is possible at the costs set forth in the <a href=%s&tab=payments&task=showprices>Price List</a>. "),$this->url);
-        //printf (_("You can purchase credit with a <a href=%s&tab=payments&method=creditcard>Credit Card</a> or <a href=%s&tab=payments&method=btc>Bitcoin</a>. "),$this->url, $this->url);
+        printf(_("Calling to telephone numbers is possible at the costs set forth in the <a href=%s&tab=payments&task=showprices>Price List</a>. "), $this->url);
+        //printf(_("You can purchase credit with a <a href=%s&tab=payments&method=creditcard>Credit Card</a> or <a href=%s&tab=payments&method=btc>Bitcoin</a>. "), $this->url, $this->url);
hunk ./library/sip_settings.php 1978
-        //printf (_("You can purchase credit using <a href=http://bitcoin.org target=_new>Bitcoin</a>. "), $this->url);
+        //printf(_("You can purchase credit using <a href=http://bitcoin.org target=_new>Bitcoin</a>. "), $this->url);
hunk ./library/sip_settings.php 2003
-                    if (!in_array("payments",$this->groups)) {
+                    if (!in_array("payments", $this->groups)) {
hunk ./library/sip_settings.php 2010
-                if (!in_array("payments",$this->groups)) {
+                if (!in_array("payments", $this->groups)) {
hunk ./library/sip_settings.php 2028
-                    printf ("<font color=red>%s</font>",$this->fraud_reason);
+                    printf("<font color=red>%s</font>", $this->fraud_reason);
hunk ./library/sip_settings.php 2031
-                    $log=sprintf("CC transaction is not allowed from %s for %s (%s)",$_SERVER['REMOTE_ADDR'],$account->account,$this->fraud_reason);
+                    $log=sprintf("CC transaction is not allowed from %s for %s (%s)", $_SERVER['REMOTE_ADDR'], $account->account, $this->fraud_reason);
hunk ./library/sip_settings.php 2061
-                    $this->addBalanceReseller($credit_amount,sprintf("CC transaction %s",$payment_processor->transaction_results['id']));
+                    $this->addBalanceReseller($credit_amount, sprintf("CC transaction %s", $payment_processor->transaction_results['id']));
hunk ./library/sip_settings.php 2088
-                printf (_("Error: Please specify a file"));
+                printf(_("Error: Please specify a file"));
hunk ./library/sip_settings.php 2090
-
hunk ./library/sip_settings.php 2092
-                printf (_("Error: Please enter the name printed on the Credit Card"));
+                printf(_("Error: Please enter the name printed on the Credit Card"));
hunk ./library/sip_settings.php 2094
-
-            } elseif (!preg_match("/^\d{4}$/",$_REQUEST['last_digits'])) {
+            } elseif (!preg_match("/^\d{4}$/", $_REQUEST['last_digits'])) {
hunk ./library/sip_settings.php 2096
-                printf (_("Error: Last digits must be numeric"));
+                printf(_("Error: Last digits must be numeric"));
hunk ./library/sip_settings.php 2098
-
-            } elseif (!preg_match("/^\+[1-9][0-9]{7,14}$/",$_REQUEST['mobile_number'])) {
+            } elseif (!preg_match("/^\+[1-9][0-9]{7,14}$/", $_REQUEST['mobile_number'])) {
hunk ./library/sip_settings.php 2101
-                printf (_("Error: Mobile Number must be in international format starting with +"));
+                printf(_("Error: Mobile Number must be in international format starting with +"));
hunk ./library/sip_settings.php 2103
-
hunk ./library/sip_settings.php 2105
-                printf (_("Error: Maximum file size is %s"),$max_file_size);
+                printf(_("Error: Maximum file size is %s"), $max_file_size);
hunk ./library/sip_settings.php 2107
-
hunk ./library/sip_settings.php 2108
-
hunk ./library/sip_settings.php 2150
-                    printf ("Error: Failed to save identity document %s (%s)", $this->db->Error,$this->db->Errno);
+                    printf("Error: Failed to save identity document %s (%s)", $this->db->Error, $this->db->Errno);
hunk ./library/sip_settings.php 2158
-                $subject=sprintf ("%s requested CC Payments",$this->account);
+                $subject=sprintf("%s requested CC Payments", $this->account);
hunk ./library/sip_settings.php 2171
-                $mime->addAttachment($content, $_FILES['tmpfile']['type'],$_FILES['tmpfile']['name'],'false');
+                $mime->addAttachment($content, $_FILES['tmpfile']['type'], $_FILES['tmpfile']['name'],'false');
hunk ./library/sip_settings.php 2193
-                printf ("Error deleting record: %s (%s)", $this->db->Error,$this->db->Errno);
+                printf("Error deleting record: %s (%s)", $this->db->Error, $this->db->Errno);
hunk ./library/sip_settings.php 2208
-            printf ("Error for database query: %s (%s)", $this->db->Error,$this->db->Errno);
+            printf("Error for database query: %s (%s)", $this->db->Error, $this->db->Errno);
hunk ./library/sip_settings.php 2217
-            if (!in_array("payments",$this->groups)) {
+            if (!in_array("payments", $this->groups)) {
hunk ./library/sip_settings.php 2239
-            printf ("</tr>");
+            printf("</tr>");
hunk ./library/sip_settings.php 2272
-
hunk ./library/sip_settings.php 2281
-            printf (_("To become verified, upload a copy of your passport or driving license that matches the Credit Card owner. "),$this->billing_email, $this->account, $this->billing_email);
+            printf(_("To become verified, upload a copy of your passport or driving license that matches the Credit Card owner. "), $this->billing_email, $this->account, $this->billing_email);
hunk ./library/sip_settings.php 2283
-            printf (_("This copy will be kept on your profile until the credit card transaction has been approved. "));
+            printf(_("This copy will be kept on your profile until the credit card transaction has been approved. "));
hunk ./library/sip_settings.php 2308
-            printf ("<input type=text size=35 name='name' value='%s'>",$_REQUEST['name']);
+            printf("<input type=text size=35 name='name' value='%s'>", $_REQUEST['name']);
hunk ./library/sip_settings.php 2322
-            printf ("<input type='file' name='tmpfile'>");
+            printf("<input type='file' name='tmpfile'>");
hunk ./library/sip_settings.php 2328
-            if (in_array("free-pstn",$this->groups)) {
+            if (in_array("free-pstn", $this->groups)) {
hunk ./library/sip_settings.php 2337
-                printf("<input type=text size=15 name='mobile_number' value='%s'> %s",$_REQUEST['mobile_number'],_("International format starting with +"));
+                printf("<input type=text size=15 name='mobile_number' value='%s'> %s", $_REQUEST['mobile_number'], _("International format starting with +"));
hunk ./library/sip_settings.php 2353
-            printf("<input type=text size=5 name='last_digits' value='%s'>",$_REQUEST['last_digits']);
+            printf("<input type=text size=5 name='last_digits' value='%s'>", $_REQUEST['last_digits']);
hunk ./library/sip_settings.php 2390
-            printf ("Error for database query: %s (%s)", $this->db->Error,$this->db->Errno);
+            printf("Error for database query: %s (%s)", $this->db->Error, $this->db->Errno);
hunk ./library/sip_settings.php 2397
-			$h=sprintf("Content-type: %s",$this->db->f('file_type'));
+			$h=sprintf("Content-type: %s", $this->db->f('file_type'));
hunk ./library/sip_settings.php 2400
-            $h=sprintf("Content-Disposition: attachment; filename=%s",$this->db->f('file_name'));
+            $h=sprintf("Content-Disposition: attachment; filename=%s", $this->db->f('file_name'));
hunk ./library/sip_settings.php 2403
-            $h=sprintf("Content-Length: %s",$this->db->f('file_size'));
+            $h=sprintf("Content-Length: %s", $this->db->f('file_size'));
hunk ./library/sip_settings.php 2520
-        if (!in_array("trunking",$this->groups)) {
+        if (!in_array("trunking", $this->groups)) {
hunk ./library/sip_settings.php 2527
-        printf (_("You may create new aliases for incoming calls"));
-        printf ("
+        printf(_("You may create new aliases for incoming calls"));
+        printf("
hunk ./library/sip_settings.php 2603
-                    printf ("
+                    printf("
hunk ./library/sip_settings.php 2615
-                    printf ("
+                    printf("
hunk ./library/sip_settings.php 2624
-
hunk ./library/sip_settings.php 2636
-            printf (_("Email SIP Account information to %s"),$this->email);
+            printf(_("Email SIP Account information to %s"), $this->email);
hunk ./library/sip_settings.php 2647
-            printf (_("Login using SIP credentials at <a href=%s>%s</a>"),$this->sip_settings_page,$this->sip_settings_page);
+            printf(_("Login using SIP credentials at <a href=%s>%s</a>"), $this->sip_settings_page, $this->sip_settings_page);
hunk ./library/sip_settings.php 2677
-                    //printf (_("Account remove request is active"));
+                    //printf(_("Account remove request is active"));
hunk ./library/sip_settings.php 2694
-        if (in_array("trunking",$this->groups)) {
+        if (in_array("trunking", $this->groups)) {
hunk ./library/sip_settings.php 2727
-
hunk ./library/sip_settings.php 2731
-                printf ("<tr bgcolor=lightgray><td>Number</td><td>Country</td><td>Expire Date</td><td>Order</td><td>Action</td></tr>");
+                printf("<tr bgcolor=lightgray><td>Number</td><td>Country</td><td>Expire Date</td><td>Order</td><td>Action</td></tr>");
hunk ./library/sip_settings.php 2748
-                    $form.=sprintf ("<option value=1>1 %s",_("Month"));
-                    $form.=sprintf ("<option value=3>3 %s",_("Months"));
-                    $form.=sprintf ("<option value=6>6 %s",_("Months"));
-                    $form.=sprintf ("<option value=12>12 %s",_("Months"));
-                    $form.=sprintf ("<option value=24>24 %s",_("Months"));
+                    $form.=sprintf("<option value=1>1 %s", _("Month"));
+                    $form.=sprintf("<option value=3>3 %s", _("Months"));
+                    $form.=sprintf("<option value=6>6 %s", _("Months"));
+                    $form.=sprintf("<option value=12>12 %s", _("Months"));
+                    $form.=sprintf("<option value=24>24 %s", _("Months"));
hunk ./library/sip_settings.php 2757
-                    $form.=sprintf ("<input type=hidden name='number' value='%s'>",$_number);
-                    $form.=sprintf ("<input type=submit name='ddi_action' value='Renew'>");
-                    $form.=sprintf ("<input type=submit name='ddi_action' value='Drop'>");
-
-                    printf ("<tr class=$_class><td valign=top>+%s</td><td valign=top>%s</td><td valign=top>%s</td><td valign=top>%s</td><form method=post><td>%s</td></form></tr>",$_number,$numbers[$_number]['country_name'],$numbers[$_number]['did_expire_date_gmt'],$numbers[$_number]['order_id'],$form);
+                    $form.=sprintf("<input type=hidden name='number' value='%s'>", $_number);
+                    $form.=sprintf("<input type=submit name='ddi_action' value='Renew'>");
+                    $form.=sprintf("<input type=submit name='ddi_action' value='Drop'>");
+
+                    printf("<tr class=$_class><td valign=top>+%s</td><td valign=top>%s</td><td valign=top>%s</td><td valign=top>%s</td><form method=post><td>%s</td></form></tr>", $_number, $numbers[$_number]['country_name'], $numbers[$_number]['did_expire_date_gmt'], $numbers[$_number]['order_id'], $form);
hunk ./library/sip_settings.php 2770
-
hunk ./library/sip_settings.php 2784
-                $basket = array('ddi_number' => array('price'       => sprintf("%.2f",$total),
-                                                      'description' => sprintf(_('Telephone Number (+%s %s) for %d months'),$_REQUEST['prefix'],$prefixes[$_REQUEST['prefix']]['country_name'],$_REQUEST['period']),
+                $basket = array('ddi_number' => array('price'       => sprintf("%.2f", $total),
+                                                      'description' => sprintf(_('Telephone Number (+%s %s) for %d months'), $_REQUEST['prefix'], $prefixes[$_REQUEST['prefix']]['country_name'], $_REQUEST['period']),
hunk ./library/sip_settings.php 2819
-                    $payment_processor = new $this->payment_processor_class($this,$basket);
+                    $payment_processor = new $this->payment_processor_class($this, $basket);
hunk ./library/sip_settings.php 2897
-                        printf ("<option value='%s' %s>%s %s (+%s) - Setup %s USD, Monthy %s USD",$prefix,$selected,$prefixes[$prefix]['country_name'],$prefixes[$prefix]['city_name'],$prefix,$prefixes[$prefix]['setup'],$prefixes[$prefix]['monthly']);
+                        printf("<option value='%s' %s>%s %s (+%s) - Setup %s USD, Monthy %s USD", $prefix, $selected, $prefixes[$prefix]['country_name'], $prefixes[$prefix]['city_name'], $prefix, $prefixes[$prefix]['setup'], $prefixes[$prefix]['monthly']);
hunk ./library/sip_settings.php 2899
-                        printf ("<option value='%s' %s>%s %s (+%s) - Monthy %s USD",$prefix,$selected,$prefixes[$prefix]['country_name'],$prefixes[$prefix]['city_name'],$prefix,$prefixes[$prefix]['monthly']);
+                        printf("<option value='%s' %s>%s %s (+%s) - Monthy %s USD", $prefix, $selected, $prefixes[$prefix]['country_name'], $prefixes[$prefix]['city_name'], $prefix, $prefixes[$prefix]['monthly']);
hunk ./library/sip_settings.php 2910
-                printf ("<option value=1>1 %s",_("Month"));
-                printf ("<option value=3>3 %s",_("Months"));
-                printf ("<option value=6>6 %s",_("Months"));
-                printf ("<option value=12>12 %s",_("Months"));
-                printf ("<option value=24>24 %s",_("Months"));
+                printf("<option value=1>1 %s", _("Month"));
+                printf("<option value=3>3 %s", _("Months"));
+                printf("<option value=6>6 %s", _("Months"));
+                printf("<option value=12>12 %s", _("Months"));
+                printf("<option value=24>24 %s", _("Months"));
hunk ./library/sip_settings.php 2931
-
hunk ./library/sip_settings.php 2952
-        printf (_("To request support you may send an e-mail to %s"),$this->support_email);
+        printf(_("To request support you may send an e-mail to %s"), $this->support_email);
hunk ./library/sip_settings.php 2956
-            printf (_("For more information visit %s"),$this->support_web);
+            printf(_("For more information visit %s"), $this->support_web);
hunk ./library/sip_settings.php 2967
-
-        $this->valid_os=array('nt','mac');
+        $this->valid_os = array('nt','mac');
hunk ./library/sip_settings.php 2979
-        $_account['display_name']   = sprintf("%s %s",$this->firstName,$this->lastName);
+        $_account['display_name']   = sprintf("%s %s", $this->firstName, $this->lastName);
hunk ./library/sip_settings.php 3003
-                $match_password=false;
-
-                if ($_REQUEST['password']) {
-                    $str=$this->result->id->username.":".$this->result->id->domain.":".$_REQUEST['password'];
-                    if (md5($str) == $this->result->ha1) {
-                        $_account['password']=$_REQUEST['password'];
-                        $match_password=true;
-                    }
+            $match_password=false;
+
+            if ($_REQUEST['password']) {
+                $str=$this->result->id->username.":".$this->result->id->domain.":".$_REQUEST['password'];
+                if (md5($str) == $this->result->ha1) {
+                    $_account['password']=$_REQUEST['password'];
+                    $match_password=true;
hunk ./library/sip_settings.php 3011
-
-                if (!$match_password) {
-                    print "<form method='POST' id='password_download' class='form-horizontal' action='$this->url'><p>";
-                    print _("Please enter your SIP account password: ");
-                    if ($_REQUEST['password'] || $_REQUEST['continue']) {
-                        print "</p><div id='pass_group' class='control-group error'>";
-                    } else {
-                        print "</p><div id='pass_group' class=control-group>";
-                    }
-                    print "<label class=control-label>";
-                    print _("Password");
-                    print "</label>";
-                    print "<div id='controls_password' class=controls>";
-                    print "<input class='input' type='password' id='password' name='password' placeholder='";
-                    print _("Enter your password");
-                    print "'' value='";
-                    print $_REQUEST['password'];
-                    print "'>";
-                    if ($_REQUEST['password'] || $_REQUEST['continue']) {
-                        print "<span id=\"help-text\" class=\"help-inline\">Entered password does not match your account</span>";
-                    }
-                    print "</div></div>";
-                    print "<input type='hidden' name='tab' value='download'>";
-                    print "<div class='form-actions'>";
-                    print "<input type=submit value='Continue' class='btn btn-primary'>";
-                    print "<input type='hidden' name='continue' value='1'>";
-                    print "</div></form>";
-                    $class='hide';
+            }
+
+            if (!$match_password) {
+                print "<form method='POST' id='password_download' class='form-horizontal' action='$this->url'><p>";
+                print _("Please enter your SIP account password: ");
+                if ($_REQUEST['password'] || $_REQUEST['continue']) {
+                    print "</p><div id='pass_group' class='control-group error'>";
+                } else {
+                    print "</p><div id='pass_group' class=control-group>";
hunk ./library/sip_settings.php 3021
+                print "<label class=control-label>";
+                print _("Password");
+                print "</label>";
+                print "<div id='controls_password' class=controls>";
+                print "<input class='input' type='password' id='password' name='password' placeholder='";
+                print _("Enter your password");
+                print "'' value='";
+                print $_REQUEST['password'];
+                print "'>";
+                if ($_REQUEST['password'] || $_REQUEST['continue']) {
+                    print "<span id=\"help-text\" class=\"help-inline\">Entered password does not match your account</span>";
+                }
+                print "</div></div>";
+                print "<input type='hidden' name='tab' value='download'>";
+                print "<div class='form-actions'>";
+                print "<input type=submit value='Continue' class='btn btn-primary'>";
+                print "<input type='hidden' name='continue' value='1'>";
+                print "</div></form>";
+                $class='hide';
+            }
hunk ./library/sip_settings.php 3045
-        if (in_array($os,$this->valid_os)) {
+        if (in_array($os, $this->valid_os)) {
hunk ./library/sip_settings.php 3064
-
hunk ./library/sip_settings.php 3104
-        printf ("Notes. ");
+        printf("Notes. ");
hunk ./library/sip_settings.php 3122
-
hunk ./library/sip_settings.php 3144
-
hunk ./library/sip_settings.php 3171
-
hunk ./library/sip_settings.php 3181
-        if ($this->login_type == 'subscriber' && in_array("deny-password-change",$this->groups)) {
+        if ($this->login_type == 'subscriber' && in_array("deny-password-change", $this->groups)) {
hunk ./library/sip_settings.php 3189
-            printf ("\n\n<!-- \nSIP Account password: %s\n -->\n\n",$this->password);
+            printf("\n\n<!-- \nSIP Account password: %s\n -->\n\n", $this->password);
hunk ./library/sip_settings.php 3235
-            printf ("\"name=yubikey value=\"%s\"><span class=help-inline>",$this->Preferences['yubikey']) ;
+            printf("\"name=yubikey value=\"%s\"><span class=help-inline>", $this->Preferences['yubikey']) ;
hunk ./library/sip_settings.php 3264
-             printf ("<option value='%s' %s>%s\n",$_lang,$selected_lang[$_lang],$this->languages[$_lang]['name']);
+             printf("<option value='%s' %s>%s\n", $_lang, $selected_lang[$_lang], $this->languages[$_lang]['name']);
hunk ./library/sip_settings.php 3280
-        $this->showTimezones('timezone',$this->timezone);
+        $this->showTimezones('timezone', $this->timezone);
hunk ./library/sip_settings.php 3283
-        $LocalTime=getLocalTime($this->timezone,$timestamp);
+        $LocalTime=getLocalTime($this->timezone, $timestamp);
hunk ./library/sip_settings.php 3304
-                printf ("<option value=\"%s\" %s>%s",$_region,$selected_region[$_region],$this->emergency_regions[$_region]);
+                printf("<option value=\"%s\" %s>%s", $_region, $selected_region[$_region], $this->emergency_regions[$_region]);
hunk ./library/sip_settings.php 3316
-            if (in_array("free-pstn",$this->groups)) {
-
-                if (in_array("quota",$this->groups)) {
+            if (in_array("free-pstn", $this->groups)) {
+
+                if (in_array("quota", $this->groups)) {
hunk ./library/sip_settings.php 3334
-                    printf ("<span class='add-on'>%s</span><input class=input-medium type=text size=6 maxsize=6 name=quota value='%s'></div><span class='help-inline muted'>",$this->currency,$this->quota);
+                    printf("<span class='add-on'>%s</span><input class=input-medium type=text size=6 maxsize=6 name=quota value='%s'></div><span class='help-inline muted'>", $this->currency, $this->quota);
hunk ./library/sip_settings.php 3336
-                    if ($this->quota || in_array("quota",$this->groups)) {
+                    if ($this->quota || in_array("quota", $this->groups)) {
hunk ./library/sip_settings.php 3339
-                            printf (_("This month usage: %.2f %s"),$this->thisMonth['price'], $this->currency);
-                            printf (" / %d ",$this->thisMonth['calls']);
+                            printf(_("This month usage: %.2f %s"), $this->thisMonth['price'], $this->currency);
+                            printf(" / %d ", $this->thisMonth['calls']);
hunk ./library/sip_settings.php 3369
-                    printf ("%s %s ",$this->quota,$this->currency);
+                    printf("%s %s ", $this->quota, $this->currency);
hunk ./library/sip_settings.php 3372
-                        printf (_("This month usage: %.2f %s"),$this->thisMonth['price'], $this->currency);
-                        printf (" / %d ",$this->thisMonth['calls']);
+                        printf(_("This month usage: %.2f %s"), $this->thisMonth['price'], $this->currency);
+                        printf(" / %d ", $this->thisMonth['calls']);
hunk ./library/sip_settings.php 3380
-
hunk ./library/sip_settings.php 3413
-            if (in_array($key,$this->groups)) {
+            if (in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 3462
-                        printf ("
+                        printf("
hunk ./library/sip_settings.php 3478
-                        printf ("
+                        printf("
hunk ./library/sip_settings.php 3491
-                        printf ("
+                        printf("
hunk ./library/sip_settings.php 3503
-
hunk ./library/sip_settings.php 3505
-                    if (in_array($key,$this->groups)) {
+                    if (in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 3507
-                           printf ("
+                           printf("
hunk ./library/sip_settings.php 3522
-                       printf ("
+                       printf("
hunk ./library/sip_settings.php 3535
-                       if (in_array($key,$this->groups)) {
+                       if (in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 3541
-
-
hunk ./library/sip_settings.php 3559
-
hunk ./library/sip_settings.php 3569
-
hunk ./library/sip_settings.php 3585
-        printf ("
+        printf("
hunk ./library/sip_settings.php 3595
-        printf ("\" value='%d' size=3 type=number max=\"900\"><span class='add-on'>s</span>",$this->timeout);
+        printf("\" value='%d' size=3 type=number max=\"900\"><span class='add-on'>s</span>", $this->timeout);
hunk ./library/sip_settings.php 3603
-        if (in_array("free-pstn",$this->groups) && !$this->show_barring_tab) {
+        if (in_array("free-pstn", $this->groups) && !$this->show_barring_tab) {
hunk ./library/sip_settings.php 3617
-            printf ("<label class='checkbox'><input type=checkbox %s value=1 name='show_barring_tab'>%s</label>\n",$check_show_barring_tab,_("Barring"));
+            printf("<label class='checkbox'><input type=checkbox %s value=1 name='show_barring_tab'>%s</label>\n", $check_show_barring_tab, _("Barring"));
hunk ./library/sip_settings.php 3668
-        if (in_array("trunking",$this->groups)) {
+        if (in_array("trunking", $this->groups)) {
hunk ./library/sip_settings.php 3733
-            printf (" %s) ",$this->voicemail['Account']);
+            printf(" %s) ", $this->voicemail['Account']);
hunk ./library/sip_settings.php 3763
-                $_text=sprintf(_("Send voice messages by e-mail to %s"),$this->email);
-                printf ("<option value=1 %s>%s",$selected_store_voicemail['email'],$_text);
-                printf ("<option value=0 %s>%s",$selected_store_voicemail['server'],_("Send messages by e-mail and store messages on the server"));
+                $_text=sprintf(_("Send voice messages by e-mail to %s"), $this->email);
+                printf("<option value=1 %s>%s", $selected_store_voicemail['email'], $_text);
+                printf("<option value=0 %s>%s", $selected_store_voicemail['server'], _("Send messages by e-mail and store messages on the server"));
hunk ./library/sip_settings.php 3768
-                printf (_("Voice messages are sent by email to %s"),$this->email);
+                printf(_("Voice messages are sent by email to %s"), $this->email);
hunk ./library/sip_settings.php 3787
-                printf ("<input class=input-medium type=text size=15 name=voicemail_password value=\"%s\">",$this->voicemail['Password']);
+                printf("<input class=input-medium type=text size=15 name=voicemail_password value=\"%s\">", $this->voicemail['Password']);
hunk ./library/sip_settings.php 3800
-                   printf(_("Dial %s to listen to your messages or change preferences. "),$this->voicemail_access_number);
+                   printf(_("Dial %s to listen to your messages or change preferences. "), $this->voicemail_access_number);
hunk ./library/sip_settings.php 3865
-                printf ("<img src='%s/30/%s' border=0>",$this->SipUAImagesPath,$UAImage);
+                printf("<img src='%s/30/%s' border=0>", $this->SipUAImagesPath, $UAImage);
hunk ./library/sip_settings.php 3883
-                    $_els=explode(":",$publicContact);
+                    $_els=explode(":", $publicContact);
hunk ./library/sip_settings.php 3891
-                    printf ("%s",$this->geo_location);
+                    printf("%s", $this->geo_location);
hunk ./library/sip_settings.php 3909
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 3924
-            if (preg_match("/^\+[1-9][0-9]*$/",$_prefix)) {
+            if (preg_match("/^\+[1-9][0-9]*$/", $_prefix)) {
hunk ./library/sip_settings.php 3932
-        $result     = $this->SipPort->setBarringPrefixes($this->sipId,$prefixes);
-
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+        $result     = $this->SipPort->setBarringPrefixes($this->sipId, $prefixes);
+
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 4070
-                                    "WEBName" =>sprintf (_("Voice Mailbox")),
+                                    "WEBName" =>sprintf(_("Voice Mailbox")),
hunk ./library/sip_settings.php 4088
-            if (strcmp($quota,$this->quota) != 0) {
+            if (strcmp($quota, $this->quota) != 0) {
hunk ./library/sip_settings.php 4096
-                $result->groups = array_unique(array_diff($this->groups,array('quota')));
+                $result->groups = array_unique(array_diff($this->groups, array('quota')));
hunk ./library/sip_settings.php 4104
-            if (strcmp($rpid,$this->rpid) != 0) {
+            if (strcmp($rpid, $this->rpid) != 0) {
hunk ./library/sip_settings.php 4151
-                    if (in_array($key,$this->groups) && !$val) {
+                    if (in_array($key, $this->groups) && !$val) {
hunk ./library/sip_settings.php 4159
-                    } elseif (!in_array($key,$this->groups) && $val) {
+                    } elseif (!in_array($key, $this->groups) && $val) {
hunk ./library/sip_settings.php 4166
-                    if (!in_array($key,$this->groups) && $val) {
-                        $this->setPreference('last_sip_quota',strval($this->quota));
+                    if (!in_array($key, $this->groups) && $val) {
+                        $this->setPreference('last_sip_quota', strval($this->quota));
hunk ./library/sip_settings.php 4179
-                        if (in_array($key,$this->groups)) {
+                        if (in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 4185
-                        if (!$val && in_array($key,$this->groups)) {
+                        if (!$val && in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 4195
-                            $this->setPreference('blocked_by',$val);
+                            $this->setPreference('blocked_by', $val);
hunk ./library/sip_settings.php 4198
-                        } elseif (!$val && in_array($key,$this->groups)) {
+                        } elseif (!$val && in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 4207
-                            if ($val && ($val != $this->Preferences['blocked_by'] || !in_array($key,$this->groups) )) {
-                                $this->setPreference('blocked_by',$val);
+                            if ($val && ($val != $this->Preferences['blocked_by'] || !in_array($key, $this->groups) )) {
+                                $this->setPreference('blocked_by', $val);
hunk ./library/sip_settings.php 4211
-                            } elseif (!$val && in_array($key,$this->groups)) {
+                            } elseif (!$val && in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 4219
-                            if (in_array($key,$this->groups)) {
+                            if (in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 4227
-                        if (!$val && in_array($key,$this->groups)) {
+                        if (!$val && in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 4229
-                        } elseif ($val && !in_array($key,$this->groups)) {
+                        } elseif ($val && !in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 4236
-                        if (in_array($key,$this->groups)) {
+                        if (in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 4246
-                if (in_array($key,$this->groups)) {
+                if (in_array($key, $this->groups)) {
hunk ./library/sip_settings.php 4254
-        $extra_groups=explode(' ',$_REQUEST['extra_groups']);
+        $extra_groups=explode(' ', $_REQUEST['extra_groups']);
hunk ./library/sip_settings.php 4257
-            if (!in_array($_grp,array_keys($this->availableGroups))) {
+            if (!in_array($_grp, array_keys($this->availableGroups))) {
hunk ./library/sip_settings.php 4262
-        $grantACLarray  = array_unique(array_diff($newACLarray,$this->groups));
-        $revokeACLarray = array_unique(array_diff($this->groups,$newACLarray));
+        $grantACLarray  = array_unique(array_diff($newACLarray, $this->groups));
+        $revokeACLarray = array_unique(array_diff($this->groups, $newACLarray));
hunk ./library/sip_settings.php 4283
-            $this->setPreference("language",$language);
+            $this->setPreference("language", $language);
hunk ./library/sip_settings.php 4288
-            $this->setPreference("show_barring_tab",$show_barring_tab);
+            $this->setPreference("show_barring_tab", $show_barring_tab);
hunk ./library/sip_settings.php 4293
-            $this->setPreference("account_delete_request",date('m/d/Y h:i:s a', time()));
+            $this->setPreference("account_delete_request", date('m/d/Y h:i:s a', time()));
hunk ./library/sip_settings.php 4297
-        if ($this->login_type == 'subscriber' && in_array("deny-password-change",$this->groups)) {
+        if ($this->login_type == 'subscriber' && in_array("deny-password-change", $this->groups)) {
hunk ./library/sip_settings.php 4319
-            $this->setPreference('web_password',$web_password_new);
+            $this->setPreference('web_password', $web_password_new);
hunk ./library/sip_settings.php 4331
-            $this->setPreference('yubikey',$yubikey);
+            $this->setPreference('yubikey', $yubikey);
hunk ./library/sip_settings.php 4349
-                    list($ip,$mask) = explode("/",$el);
+                    list($ip, $mask) = explode("/", $el);
hunk ./library/sip_settings.php 4353
-                    if (!preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/",$ip)) {
+                    if (!preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/", $ip)) {
hunk ./library/sip_settings.php 4375
-        if (strcmp($quickdial,$this->quickdial) != 0) {
+        if (strcmp($quickdial, $this->quickdial) != 0) {
hunk ./library/sip_settings.php 4380
-        $mobile_number  = preg_replace("/[^\+0-9]/","",$mobile_number);
-        if ($mobile_number && !preg_match("/^\+/",$mobile_number)) {
+        $mobile_number  = preg_replace("/[^\+0-9]/","", $mobile_number);
+        if ($mobile_number && !preg_match("/^\+/", $mobile_number)) {
hunk ./library/sip_settings.php 4386
-            $this->setPreference('mobile_number',$mobile_number);
+            $this->setPreference('mobile_number', $mobile_number);
hunk ./library/sip_settings.php 4415
-        if ($result->timeout == '')  {
+        if ($result->timeout == '') {
hunk ./library/sip_settings.php 4420
-        if ($result->timeout > 900)  {
+        if ($result->timeout > 900) {
hunk ./library/sip_settings.php 4435
-            if ((new PEAR)->isError($result)) {
-                $error_msg  = $result->getMessage();
-                $error_fault= $result->getFault();
-                $error_code = $result->getCode();
-                printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 4440
-                    $this->sendChangedEmail(False,$this->changedFields);
-                }
+                    $this->sendChangedEmail(False, $this->changedFields);
hunk ./library/sip_settings.php 4442
-
+            }
hunk ./library/sip_settings.php 4448
-            //$log=sprintf("delete_voicemail_orig=%s",$this->voicemail['Options']->delete);
+            //$log=sprintf("delete_voicemail_orig=%s", $this->voicemail['Options']->delete);
hunk ./library/sip_settings.php 4457
-            $voicemail_password=preg_replace("/[^0-9]/","",$voicemail_password);
+            $voicemail_password=preg_replace("/[^0-9]/","", $voicemail_password);
hunk ./library/sip_settings.php 4470
-
hunk ./library/sip_settings.php 4487
-            if ($textboxURI && $textboxURI != "<voice-mailbox>" && !preg_match("/@/",$textboxURI)) {
+            if ($textboxURI && $textboxURI != "<voice-mailbox>" && !preg_match("/@/", $textboxURI)) {
hunk ./library/sip_settings.php 4491
-            if (preg_match("/^([\+|0].*)@/",$textboxURI,$m))  {
+            if (preg_match("/^([\+|0].*)@/", $textboxURI, $m))  {
hunk ./library/sip_settings.php 4525
-
hunk ./library/sip_settings.php 4540
-
hunk ./library/sip_settings.php 4549
-                $this->setPreference($_prefLast,$last_other);
+                $this->setPreference($_prefLast, $last_other);
hunk ./library/sip_settings.php 4555
-                //$log=sprintf("Diversion %s changed from %s to %s",$key,htmlentities($this->diversions[$key]),htmlentities($diversions[$key]));
+                //$log=sprintf("Diversion %s changed from %s to %s", $key, htmlentities($this->diversions[$key]), htmlentities($diversions[$key]));
hunk ./library/sip_settings.php 4582
-            $result     = $this->SipPort->setCallDiversions($this->sipId,$diversionsSOAP);
+            $result     = $this->SipPort->setCallDiversions($this->sipId, $diversionsSOAP);
hunk ./library/sip_settings.php 4588
-                printf ("<p><font color=red>Error2 (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                printf("<p><font color=red>Error2 (SipPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 4596
-    function setDiversion($condition,$uri)
+    function setDiversion($condition, $uri)
hunk ./library/sip_settings.php 4598
-        dprint ("setDiversion($condition,$uri)");
+        dprint ("setDiversion($condition, $uri)");
hunk ./library/sip_settings.php 4607
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 4641
-                if (!preg_match("/^(sip:|sips:)/",$uri)) $uri="sip:".$uri;
+                if (!preg_match("/^(sip:|sips:)/", $uri)) $uri="sip:".$uri;
hunk ./library/sip_settings.php 4655
-            if (preg_match("/^(sip:|sips:)(.*)$/i",$uri,$m)) {
+            if (preg_match("/^(sip:|sips:)(.*)$/i", $uri, $m)) {
hunk ./library/sip_settings.php 4666
-        $result     = $this->SipPort->setCallDiversions($this->sipId,$result);
-
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+        $result = $this->SipPort->setCallDiversions($this->sipId, $result);
+
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 4671
-
hunk ./library/sip_settings.php 4690
-            $result     = $this->SipPort->setCallDiversions($this->sipId,$diversions);
-
-            if ((new PEAR)->isError($result)) {
-                $error_msg  = $result->getMessage();
-                $error_fault= $result->getFault();
-                $error_code = $result->getCode();
-                printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $result     = $this->SipPort->setCallDiversions($this->sipId, $diversions);
+
+            if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 4707
-            if ($this->diversions[$key]=="<voice-mailbox>" || preg_match("/voicemail_server/",$this->diversions[$key])) {
+            if ($this->diversions[$key]=="<voice-mailbox>" || preg_match("/voicemail_server/", $this->diversions[$key])) {
hunk ./library/sip_settings.php 4722
-            $result = $this->SipPort->setCallDiversions($this->sipId,$diversions);
-
-            if ((new PEAR)->isError($result)) {
-                $error_msg  = $result->getMessage();
-                $error_fault= $result->getFault();
-                $error_code = $result->getCode();
-                printf(
-                    "<p><font color=red>Error (SipPort): %s (%s): %s</font>",
-                    $error_msg,
-                    $error_fault->detail->exception->errorcode,
-                    $error_fault->detail->exception->errorstring
-                );
+            $result = $this->SipPort->setCallDiversions($this->sipId, $diversions);
+
+            if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 4753
-            printf ("<p><font color=red>Error (VoicemailPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error (VoicemailPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 4782
-            printf ("<p><font color=red>Error (VoicemailPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error (VoicemailPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 4802
-            printf ("<p><font color=red>Error (VoicemailPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error (VoicemailPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 4809
-    function setPreference($name,$value)
+    function setPreference($name, $value)
hunk ./library/sip_settings.php 4811
-        dprint("setPreference($name,$value)");
+        dprint("setPreference($name, $value)");
hunk ./library/sip_settings.php 4833
-
hunk ./library/sip_settings.php 4836
-            $newProperties[]=array('name'  => $name,
-                                   'value' => $value);
+            $newProperties[] = array(
+                'name'  => $name,
+                'value' => $value
+            );
hunk ./library/sip_settings.php 4851
-        if ($this->login_type == 'subscriber' && in_array("blocked",$this->groups)) {
+        if ($this->login_type == 'subscriber' && in_array("blocked", $this->groups)) {
hunk ./library/sip_settings.php 4869
-                    if ($result = $this->addBalanceSubscriber($prepaidCard,$prepaidId)) {
+                    if ($result = $this->addBalanceSubscriber($prepaidCard, $prepaidId)) {
hunk ./library/sip_settings.php 4871
-                        printf (_("Old balance was %s, new balance is %s. "),$result->old_balance, $result->new_balance);
+                        printf(_("Old balance was %s, new balance is %s. "), $result->old_balance, $result->new_balance);
hunk ./library/sip_settings.php 4881
-                    if (strlen($value) && $result = $this->addBalanceReseller($value,$description)) {
+                    if (strlen($value) && $result = $this->addBalanceReseller($value, $description)) {
hunk ./library/sip_settings.php 4883
-                        printf (_("Old balance was %s, new balance is %s. "),$result->old_balance, $result->new_balance);
+                        printf(_("Old balance was %s, new balance is %s. "), $result->old_balance, $result->new_balance);
hunk ./library/sip_settings.php 4889
-                    printf ("Refunding transaction id %s in value of %s", $transaction->id, $transaction->value);
+                    printf("Refunding transaction id %s in value of %s", $transaction->id, $transaction->value);
hunk ./library/sip_settings.php 4896
-                        printf ("<p><font color=red>Error %d: %s (%s)</font>",$refund_results['error']['error_code'], $refund_results['error']['desc'], $refund_results['error']['short_message']);
+                        printf("<p><font color=red>Error %d: %s (%s)</font>", $refund_results['error']['error_code'], $refund_results['error']['desc'], $refund_results['error']['short_message']);
hunk ./library/sip_settings.php 4898
-                        printf ("<p>Transaction %s refunded with %s: %s",$transaction->id, $refund_results['success']['desc']->RefundTransactionID,$refund_results['success']['desc']->GrossRefundAmount->_value);
-                        $description=sprintf("Refund %s with %s",$transaction->id, $refund_results['success']['desc']->RefundTransactionID);
-                        if ($result = $this->addBalanceReseller(-$transaction->value,$description)) {
+                        printf("<p>Transaction %s refunded with %s: %s", $transaction->id, $refund_results['success']['desc']->RefundTransactionID, $refund_results['success']['desc']->GrossRefundAmount->_value);
+                        $description=sprintf("Refund %s with %s", $transaction->id, $refund_results['success']['desc']->RefundTransactionID);
+                        if ($result = $this->addBalanceReseller(-$transaction->value, $description)) {
hunk ./library/sip_settings.php 4902
-                            printf (_("Old balance was %s, new balance is %s. "),$result->old_balance, $result->new_balance);
+                            printf(_("Old balance was %s, new balance is %s. "), $result->old_balance, $result->new_balance);
hunk ./library/sip_settings.php 4911
-                $subject=sprintf ("SIP Account %s balance update",$this->account);
+                $subject=sprintf("SIP Account %s balance update", $this->account);
hunk ./library/sip_settings.php 4917
-                    printf (_("Subscriber has been notified at %s."), $this->email);
+                    printf(_("Subscriber has been notified at %s."), $this->email);
hunk ./library/sip_settings.php 4938
-            printf ("%.2f %s ",$this->prepaidAccount->balance,$this->currency);
+            printf("%.2f %s ", $this->prepaidAccount->balance, $this->currency);
hunk ./library/sip_settings.php 4946
-
hunk ./library/sip_settings.php 5003
-                printf ("<option value='%s'>%s",base64_encode(json_encode($t)),$tran);
+                printf("<option value='%s'>%s", base64_encode(json_encode($t)), $tran);
hunk ./library/sip_settings.php 5018
-
hunk ./library/sip_settings.php 5038
-        printf (_("To add Credit to your account using a Prepaid Card enter it below. "));
+        printf(_("To add Credit to your account using a Prepaid Card enter it below. "));
hunk ./library/sip_settings.php 5074
-
hunk ./library/sip_settings.php 5083
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 5086
-        }  else {
+        } else {
hunk ./library/sip_settings.php 5092
-    function addBalanceSubscriber($prepaidCard,$prepaidId)
+    function addBalanceSubscriber($prepaidCard, $prepaidId)
hunk ./library/sip_settings.php 5094
-        dprint("addBalanceSubscriberLocal($prepaidCard,$prepaidId)");
+        dprint("addBalanceSubscriberLocal($prepaidCard, $prepaidId)");
hunk ./library/sip_settings.php 5101
-        $result = $this->SipPort->addBalanceFromVoucher($this->sipId,$card);
-
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+        $result = $this->SipPort->addBalanceFromVoucher($this->sipId, $card);
+
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 5105
-        }  else {
+        } else {
hunk ./library/sip_settings.php 5110
-    function addBalanceReseller($value=0,$description='')
+    function addBalanceReseller($value=0, $description='')
hunk ./library/sip_settings.php 5113
-        $result     = $this->SipPort->addBalance($this->sipId,floatval($value),$description);
-
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+        $result = $this->SipPort->addBalance($this->sipId, floatval($value), $description);
+
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 5134
-                printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                printf("<p><font color=red>Error (SipPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 5139
-
hunk ./library/sip_settings.php 5153
-                printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                printf("<p><font color=red>Error (SipPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 5161
-             if (preg_match("/^CC transaction (.*)$/",$entry->description,$m)) {
+             if (preg_match("/^CC transaction (.*)$/", $entry->description, $m)) {
hunk ./library/sip_settings.php 5165
-             if (preg_match("/^Refund (.*) with (.*)$/",$entry->description,$m)) {
+             if (preg_match("/^Refund (.*) with (.*)$/", $entry->description, $m)) {
hunk ./library/sip_settings.php 5181
-
hunk ./library/sip_settings.php 5198
-         }
-
-         $total = array('debit'  => $total_debit,
-                        'credit' => $total_credit
-                        );
-         return $total;
+        }
+
+        $total = array(
+            'debit'  => $total_debit,
+            'credit' => $total_credit
+        );
+        return $total;
hunk ./library/sip_settings.php 5227
-            printf (_("Today's transactions: %.2f credit, %.2f debit"), $today_summary['credit'],$today_summary['debit']);
+            printf(_("Today's transactions: %.2f credit, %.2f debit"), $today_summary['credit'], $today_summary['debit']);
hunk ./library/sip_settings.php 5262
-                    $description=sprintf("<a href=%s/callsearch.phtml?action=search&call_id=%s target=cdrtool>$_line->description</a>",$this->cdrtool_address,urlencode($_line->session));
+                    $description=sprintf("<a href=%s/callsearch.phtml?action=search&call_id=%s target=cdrtool>$_line->description</a>", $this->cdrtool_address, urlencode($_line->session));
hunk ./library/sip_settings.php 5292
-            printf ("
+            printf("
hunk ./library/sip_settings.php 5300
-            ",$found,
+            ", $found,
hunk ./library/sip_settings.php 5316
-        printf ("
+        printf("
hunk ./library/sip_settings.php 5332
-        printf ("
+        printf("
hunk ./library/sip_settings.php 5376
-    	$h=sprintf("Content-Disposition: inline; filename=%s-prepaid-history.csv",$this->account);
+    	$h=sprintf("Content-Disposition: inline; filename=%s-prepaid-history.csv", $this->account);
hunk ./library/sip_settings.php 5397
-            printf ("%s,%s,%s,%s,%s,%s,%s\n",
+            printf("%s,%s,%s,%s,%s,%s,%s\n",
hunk ./library/sip_settings.php 5421
-
hunk ./library/sip_settings.php 5501
-                        $name .= sprintf(' (%s %s0)',_("Dial"),$this->access_numbers[$condition]);
+                        $name .= sprintf(' (%s %s0)', _("Dial"), $this->access_numbers[$condition]);
hunk ./library/sip_settings.php 5503
-                        $name .= sprintf(' (%s %s1)',_("Dial"),$this->access_numbers[$condition]);
+                        $name .= sprintf(' (%s %s1)', _("Dial"), $this->access_numbers[$condition]);
hunk ./library/sip_settings.php 5505
-                        $name .= sprintf(' (%s %s)',_("Dial"),$this->access_numbers[$condition]);
+                        $name .= sprintf(' (%s %s)', _("Dial"), $this->access_numbers[$condition]);
hunk ./library/sip_settings.php 5507
-                        $name .= sprintf(' (%s %s+ %s)',_("Dial"),$this->access_numbers[$condition],_("Number"));
+                        $name .= sprintf(' (%s %s+ %s)', _("Dial"), $this->access_numbers[$condition], _("Number"));
hunk ./library/sip_settings.php 5547
-                printf (_("Dial %s2*X where X = Number of Minutes, 0 to Reset"), $this->access_numbers['FUNC']);
+                printf(_("Dial %s2*X where X = Number of Minutes, 0 to Reset"), $this->access_numbers['FUNC']);
hunk ./library/sip_settings.php 5633
-            printf ("<p><font color=red>Error (EnumPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error (EnumPort): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 5640
-            if (!in_array($enum,$this->enums)) $this->enums[]=$enum;
+            if (!in_array($enum, $this->enums)) $this->enums[]=$enum;
hunk ./library/sip_settings.php 5650
-        if (preg_match("/^\+\d+$/",$enum_text)) {
+        if (preg_match("/^\+\d+$/", $enum_text)) {
hunk ./library/sip_settings.php 5658
-            $char = substr($enum_text,$z,1);
-            if (preg_match("/[a-zA-Z]/",$char)) {
+            $char = substr($enum_text, $z,1);
+            if (preg_match("/[a-zA-Z]/", $char)) {
hunk ./library/sip_settings.php 5661
-            } elseif (preg_match("/[0-9]/",$char)) {
+            } elseif (preg_match("/[0-9]/", $char)) {
hunk ./library/sip_settings.php 5683
-        printf ("<select class=input-medium name=%s>",$name);
+        printf("<select class=input-medium name=%s>", $name);
hunk ./library/sip_settings.php 5701
-        if (!preg_match("/^\d+$/",$this->username)) return 1;
+        if (!preg_match("/^\d+$/", $this->username)) return 1;
hunk ./library/sip_settings.php 5710
-            if ($this->quickdial && preg_match("/^$this->quickdial/",$this->username)) {
+            if ($this->quickdial && preg_match("/^$this->quickdial/", $this->username)) {
hunk ./library/sip_settings.php 5713
-            printf (_("Prefix to auto-complete short numbers"),$dial_suffix);
+            printf(_("Prefix to auto-complete short numbers"), $dial_suffix);
hunk ./library/sip_settings.php 5723
-        if (in_array("free-pstn",$this->groups)) {
+        if (in_array("free-pstn", $this->groups)) {
hunk ./library/sip_settings.php 5728
-                printf ("
+                printf("
hunk ./library/sip_settings.php 5733
-            ",$this->Preferences['mobile_number'],_("International format starting with +"));
+            ", $this->Preferences['mobile_number'], _("International format starting with +"));
hunk ./library/sip_settings.php 5793
-                printf ("
+                printf("
hunk ./library/sip_settings.php 5799
-            ",$this->ip_access_list);
+            ", $this->ip_access_list);
hunk ./library/sip_settings.php 5810
-                printf ("\" cols=60 rows=1 name=ip_access_list>%s</textarea>
+                printf("\" cols=60 rows=1 name=ip_access_list>%s</textarea>
hunk ./library/sip_settings.php 5813
-            ",$this->ip_access_list);
+            ", $this->ip_access_list);
hunk ./library/sip_settings.php 5823
-        if (!in_array("free-pstn",$this->groups)) {
+        if (!in_array("free-pstn", $this->groups)) {
hunk ./library/sip_settings.php 5844
-                printf ("
+                printf("
hunk ./library/sip_settings.php 5850
-            ",$limit_text_ro);
+            ", $limit_text_ro);
hunk ./library/sip_settings.php 5863
-             printf ("\" value='%s'> %s
+             printf("\" value='%s'> %s
hunk ./library/sip_settings.php 5866
-            ",$this->callLimit, $limit_text);
+            ", $this->callLimit, $limit_text);
hunk ./library/sip_settings.php 5893
-              printf (_("%s calls /  %s /  %s / %.2f %s"), $this->calls, $calltime,$this->trafficPrint,$this->price,$this->currency);
+              printf(_("%s calls /  %s /  %s / %.2f %s"), $this->calls, $calltime, $this->trafficPrint, $this->price, $this->currency);
hunk ./library/sip_settings.php 5955
-                    "<a href=\"javascript:void(null);\" onClick=\"return window.open('sip_trace.phtml?%s', '_blank','toolbar=0,status=0,menubar=0,scrollbars=1,resizable=1,width=1300px,height=600')\">
+                    "<a href=\"javascript:void(null);\" onClick=\"return window.open('sip_trace.phtml?%s', '_blank','toolbar=0,status=0,menubar=0,scrollbars=1,resizable=1,width=1300px, height=600')\">
hunk ./library/sip_settings.php 6041
-                    "<a href=\"javascript:void(null);\" onClick=\"return window.open('sip_trace.phtml?%s', '_blank','toolbar=0,status=0,menubar=0,scrollbars=1,resizable=1,width=1000px,height=600')\">
+                    "<a href=\"javascript:void(null);\" onClick=\"return window.open('sip_trace.phtml?%s', '_blank','toolbar=0,status=0,menubar=0,scrollbars=1,resizable=1,width=1000px, height=600')\">
hunk ./library/sip_settings.php 6114
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf(
-                "<p><font color=red>Error (SipPort): %s (%s): %s</font>",
-                $error_msg,
-                $error_fault->detail->exception->errorcode,
-                $error_fault->detail->exception->errorstring
-            );
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 6208
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf(
-                "<p><font color=red>Error (SipPort): %s (%s): %s</font>",
-                $error_msg,
-                $error_fault->detail->exception->errorcode,
-                $error_fault->detail->exception->errorstring
-            );
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 6238
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf(
-                "
-                <div class=row-fluid>
-                    <div class=span12>
-                        <span class='alert alert-error'>Error (SipPort): %s (%s): %s</span>
-                    </div>
-                </div>
-                ",
-                $error_msg,
-                $error_fault->detail->exception->errorcode,
-                $error_fault->detail->exception->errorstring
-            );
-            return false;
-        }
-        return true;
+        return !$this->checkPrintSoapError($result);
hunk ./library/sip_settings.php 6260
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf(
-                "<p><font color=red>Error (SipPort): %s (%s): %s</font>",
-                $error_msg,
-                $error_fault->detail->exception->errorcode,
-                $error_fault->detail->exception->errorstring
-            );
-            return false;
-        }
-        return true;
+        return !$this->checkPrintSoapError($result);
hunk ./library/sip_settings.php 6273
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf(
-                "<p><font color=red>Error (SipPort): %s (%s): %s</font>",
-                $error_msg,
-                $error_fault->detail->exception->errorcode,
-                $error_fault->detail->exception->errorstring
-            );
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 6311
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf(
-                "<p><font color=red>Error (SipPort): %s (%s): %s</font>",
-                $error_msg,
-                $error_fault->detail->exception->errorcode,
-                $error_fault->detail->exception->errorstring
-            );
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 6612
-            $phonebook .= sprintf("Name,Address,Group\n");
+            $phonebook .= sprintf("Name, Address, Group\n");
hunk ./library/sip_settings.php 6614
-            $phonebook .= sprintf("Name,Group Name,SIP URL,Proxy ID\n");
+            $phonebook .= sprintf("Name, Group Name, SIP URL, Proxy ID\n");
hunk ./library/sip_settings.php 6624
-            $phonebook .= sprintf("Index,Name,,,,\n");
+            $phonebook .= sprintf("Index, Name,,,,\n");
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 6708
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf(
-                "<p><font color=red>Error (SipPort): %s (%s): %s</font>",
-                $error_msg,
-                $error_fault->detail->exception->errorcode,
-                $error_fault->detail->exception->errorstring
-            );
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 6734
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf(
-                "<p><font color=red>Error (SipPort): %s (%s): %s</font>",
-                $error_msg,
-                $error_fault->detail->exception->errorcode,
-                $error_fault->detail->exception->errorstring
-            );
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 6881
-                    $journal_id_sql.=sprintf("'%s',",$entry);
+                    $journal_id_sql.=sprintf("'%s',", $entry);
hunk ./library/sip_settings.php 6906
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+        if ($this->checkPrintSoapError($result)) {
hunk ./library/sip_settings.php 6957
-            if (!preg_match("/^[0-2][0-9]:[0-5][0-9]$/",$start) ||
-                !preg_match("/^[0-2][0-9]:[0-5][0-9]$/",$stop) ||
+            if (!preg_match("/^[0-2][0-9]:[0-5][0-9]$/", $start) ||
+                !preg_match("/^[0-2][0-9]:[0-5][0-9]$/", $stop) ||
hunk ./library/sip_settings.php 7001
-        $result     = $this->SipPort->setAcceptRules($this->sipId,$rules);
-
-        if ((new PEAR)->isError($result)) {
-            $error_msg  = $result->getMessage();
-            $error_fault= $result->getFault();
-            $error_code = $result->getCode();
-            printf ("<p><font color=red>Error (SipPort): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
-            return false;
-        }
-
-        return true;
-
+        $result     = $this->SipPort->setAcceptRules($this->sipId, $rules);
+
+        return !$this->checkPrintSoapError($result);
hunk ./library/sip_settings.php 7008
-        if (in_array("trunking",$this->groups)) {
+        if (in_array("trunking", $this->groups)) {
hunk ./library/sip_settings.php 7036
-        printf (_("Your current time is: %s"),$this->timezone);
+        printf(_("Your current time is: %s"), $this->timezone);
hunk ./library/sip_settings.php 7038
-        $LocalTime=getLocalTime($this->timezone,$timestamp);
+        $LocalTime=getLocalTime($this->timezone, $timestamp);
hunk ./library/sip_settings.php 7099
-                printf ('
+                printf('
hunk ./library/sip_settings.php 7110
-                ',$this->acceptRules['temporary']['duration']);
+                ', $this->acceptRules['temporary']['duration']);
hunk ./library/sip_settings.php 7150
-        if (is_array($this->acceptRules['temporary']['groups']) &&in_array("everybody",$this->acceptRules['temporary']['groups'])) {
+        if (is_array($this->acceptRules['temporary']['groups']) &&in_array("everybody", $this->acceptRules['temporary']['groups'])) {
hunk ./library/sip_settings.php 7153
-            && in_array("nobody",$this->acceptRules['temporary']['groups'])
+            && in_array("nobody", $this->acceptRules['temporary']['groups'])
hunk ./library/sip_settings.php 7157
-            && !in_array('everybody',$this->acceptRules['temporary']['groups'])
-            && !in_array('nobody',$this->acceptRules['temporary']['groups'])
+            && !in_array('everybody', $this->acceptRules['temporary']['groups'])
+            && !in_array('nobody', $this->acceptRules['temporary']['groups'])
hunk ./library/sip_settings.php 7170
-        printf ("<td style='vertical-align:middle' class='note'><input type=radio name=%s value=0 %s> %s</td> ",$_name,$_checked_everybody,_("Everybody"));
-        printf ("<td style='vertical-align:middle' class='$class_nobody'><input type=radio name=%s value=1 %s> %s </td>",$_name,$_checked_nobody,_("Nobody"));
+        printf("<td style='vertical-align:middle' class='note'><input type=radio name=%s value=0 %s> %s</td> ", $_name, $_checked_everybody, _("Everybody"));
+        printf("<td style='vertical-align:middle' class='$class_nobody'><input type=radio name=%s value=1 %s> %s </td>", $_name, $_checked_nobody, _("Nobody"));
hunk ./library/sip_settings.php 7185
-            printf ("<input type=radio name=%s value=2 %s class=hidden>",$_name,$_checked_groups);
+            printf("<input type=radio name=%s value=2 %s class=hidden>", $_name, $_checked_groups);
hunk ./library/sip_settings.php 7191
-                if (preg_match("/(everybody|nobody)/",$this->acceptRules['groups'][$_group])) continue;
-
-                if (in_array($this->acceptRules['groups'][$_group],$this->acceptRules['temporary']['groups'])) {
+                if (preg_match("/(everybody|nobody)/", $this->acceptRules['groups'][$_group])) continue;
+
+                if (in_array($this->acceptRules['groups'][$_group], $this->acceptRules['temporary']['groups'])) {
hunk ./library/sip_settings.php 7200
-                printf ("<span><input style='vertical-align:top' type=checkbox name=%s value=%s onClick=\"document.sipsettings.radio_temporary[2].checked=true\" %s> %s</span>\n",
+                printf("<span><input style='vertical-align:top' type=checkbox name=%s value=%s onClick=\"document.sipsettings.radio_temporary[2].checked=true\" %s> %s</span>\n",
hunk ./library/sip_settings.php 7244
-            printf ("%s",$this->acceptDailyProfiles[$profile]);
+            printf("%s", $this->acceptDailyProfiles[$profile]);
hunk ./library/sip_settings.php 7248
-            printf ("<td><select class=span10 name=start_%s>",$profile);
+            printf("<td><select class=span10 name=start_%s>", $profile);
hunk ./library/sip_settings.php 7275
-            printf ("<option %s>23:59",$selected_StartTime['23:59']);
+            printf("<option %s>23:59", $selected_StartTime['23:59']);
hunk ./library/sip_settings.php 7281
-            printf ("<td><select class=span10 name=stop_%s>",$profile);
+            printf("<td><select class=span10 name=stop_%s>", $profile);
hunk ./library/sip_settings.php 7304
-            printf ("<option %s>23:59",$selected_StopTime['23:59']);
+            printf("<option %s>23:59", $selected_StopTime['23:59']);
hunk ./library/sip_settings.php 7313
-            if (is_array($this->acceptRules['persistent'][$profile]['groups']) && in_array("everybody",$this->acceptRules['persistent'][$profile]['groups'])) {
+            if (is_array($this->acceptRules['persistent'][$profile]['groups']) && in_array("everybody", $this->acceptRules['persistent'][$profile]['groups'])) {
hunk ./library/sip_settings.php 7315
-            } elseif (is_array($this->acceptRules['persistent'][$profile]['groups']) && in_array("nobody",$this->acceptRules['persistent'][$profile]['groups'])) {
+            } elseif (is_array($this->acceptRules['persistent'][$profile]['groups']) && in_array("nobody", $this->acceptRules['persistent'][$profile]['groups'])) {
hunk ./library/sip_settings.php 7333
-            printf ("<td style='vertical-align: middle;' class='note'><input style='vertical-align: top;' type=radio name=%s value=0 %s> %s</td>",$_name,$_checked_everybody,_("Everybody"));
-            printf ("<td style='vertical-align: middle;' class='$class_nobody'><input style='vertical-align: top;' type=radio name=%s value=1 %s> %s</td>",$_name,$_checked_nobody,_("Nobody"));
+            printf("<td style='vertical-align: middle;' class='note'><input style='vertical-align: top;' type=radio name=%s value=0 %s> %s</td>", $_name, $_checked_everybody, _("Everybody"));
+            printf("<td style='vertical-align: middle;' class='$class_nobody'><input style='vertical-align: top;' type=radio name=%s value=1 %s> %s</td>", $_name, $_checked_nobody, _("Nobody"));
hunk ./library/sip_settings.php 7346
-                printf ("<input style='vertical-align: top;' type=radio name=%s value=2 %s class=hidden>",$_name,$_checked_groups);
+                printf("<input style='vertical-align: top;' type=radio name=%s value=2 %s class=hidden>", $_name, $_checked_groups);
hunk ./library/sip_settings.php 7351
-                    if (preg_match("/(everybody|nobody)/",$this->acceptRules['groups'][$_group])) continue;
-
-                    if (in_array($this->acceptRules['groups'][$_group],$this->acceptRules['persistent'][$profile]['groups'])) {
+                    if (preg_match("/(everybody|nobody)/", $this->acceptRules['groups'][$_group])) continue;
+
+                    if (in_array($this->acceptRules['groups'][$_group], $this->acceptRules['persistent'][$profile]['groups'])) {
hunk ./library/sip_settings.php 7360
-                    printf ("<input style='vertical-align: top;' type=checkbox name=%s value=%s onClick=\"document.sipsettings.radio_persistent_%s[2].checked=true\" %s> %s ",
+                    printf("<input style='vertical-align: top;' type=checkbox name=%s value=%s onClick=\"document.sipsettings.radio_persistent_%s[2].checked=true\" %s> %s ",
hunk ./library/sip_settings.php 7642
-                  printf (_("SIP settings have been sent to %s"), $this->email);
+                  printf(_("SIP settings have been sent to %s"), $this->email);
hunk ./library/sip_settings.php 7668
-        $subject = sprintf("SIP Account %s changed",$this->account);
+        $subject = sprintf("SIP Account %s changed", $this->account);
hunk ./library/sip_settings.php 7729
-        $subject = sprintf("The account %s was removed from IP Address: %s",$this->account, $this->ip);
+        $subject = sprintf("The account %s was removed from IP Address: %s", $this->account, $this->ip);
hunk ./library/sip_settings.php 7748
-        $this->expire = date("Y-m-d H:i:s",strtotime("+30 minutes"));
+        $this->expire = date("Y-m-d H:i:s", strtotime("+30 minutes"));
hunk ./library/sip_settings.php 7806
-            printf (_("Password reset has been sent to %s"), $this->email);
+            printf(_("Password reset has been sent to %s"), $this->email);
hunk ./library/sip_settings.php 7879
-        if (!preg_match("/^sip:/",$uri)) {
+        if (!preg_match("/^sip:/", $uri)) {
hunk ./library/sip_settings.php 7903
-        if (preg_match("/^(.*sips?:0\d+)@(.*)(>?)$/",$uri,$m)) {
+        if (preg_match("/^(.*sips?:0\d+)@(.*)(>?)$/", $uri, $m)) {
hunk ./library/sip_settings.php 7911
-        if (preg_match("/^sips?:00(\d+)@/",$uri,$m)) {
+        if (preg_match("/^sips?:00(\d+)@/", $uri, $m)) {
hunk ./library/sip_settings.php 7919
-        list($date,$time)=explode(" ",$call_date);
-
-        if ($date== Date("Y-m-d",time())) {
+        list($date, $time)=explode(" ", $call_date);
+
+        if ($date== Date("Y-m-d", time())) {
hunk ./library/sip_settings.php 7923
-        } elseif ($date== Date("Y-m-d",time()-3600*24)) {
+        } elseif ($date== Date("Y-m-d", time()-3600*24)) {
hunk ./library/sip_settings.php 8105
-                printf ("<p><font color=red>Error (Rating): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                printf("<p><font color=red>Error (Rating): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 8132
-            printf ("
+            printf("
hunk ./library/sip_settings.php 8152
-            printf ("
+            printf("
hunk ./library/sip_settings.php 8183
-            $this->showTimezones('profileTimezone',$_timezone);
+            $this->showTimezones('profileTimezone', $_timezone);
hunk ./library/sip_settings.php 8209
-                printf ("<p><font color=red>Error (Rating): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                printf("<p><font color=red>Error (Rating): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 8235
-                    printf ("<p><font color=red>Error (Rating): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                    printf("<p><font color=red>Error (Rating): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 8249
-                    printf ("<p><font color=red>Error (Rating): %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                    printf("<p><font color=red>Error (Rating): %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 8283
-        $extraGroups = array_unique(array_diff($this->groups,$foundGroupInAvailableGroups));
+        $extraGroups = array_unique(array_diff($this->groups, $foundGroupInAvailableGroups));
hunk ./library/sip_settings.php 8290
-            printf ("<input type=hidden name=extra_groups value='%s'>",trim($extraGroups_text));
+            printf("<input type=hidden name=extra_groups value='%s'>", trim($extraGroups_text));
hunk ./library/sip_settings.php 8299
-            printf ("<input class=input-medium type=text size=30 name=extra_groups value='%s'>",trim($extraGroups_text));
+            printf("<input class=input-medium type=text size=30 name=extra_groups value='%s'>", trim($extraGroups_text));
hunk ./library/sip_settings.php 8311
-	include("/etc/cdrtool/enrollment/config.ini");
+        include("/etc/cdrtool/enrollment/config.ini");
hunk ./library/sip_settings.php 8405
-        $header=sprintf("Content-Disposition: inline; filename=sipthor-owner-certificate-%s.crt",$this->owner);
+        $header=sprintf("Content-Disposition: inline; filename=sipthor-owner-certificate-%s.crt", $this->owner);
hunk ./library/sip_settings.php 8417
-        $header=sprintf("Content-Disposition: inline; filename=sipthor-owner-certificate-%s.p12",$this->owner);
+        $header=sprintf("Content-Disposition: inline; filename=sipthor-owner-certificate-%s.p12", $this->owner);
hunk ./library/sip_settings.php 8431
-    function changeLanguage($lang='en',$domain='cdrtool')
+    function changeLanguage($lang='en', $domain='cdrtool')
hunk ./library/sip_settings.php 8457
-        if (in_array("trunking",$this->groups)) {
+        if (in_array("trunking", $this->groups)) {
hunk ./library/sip_settings.php 8469
-        printf ("' value='%s'> ",$_REQUEST['firstname']);
+        printf("' value='%s'> ", $_REQUEST['firstname']);
hunk ./library/sip_settings.php 8474
-        printf ("' value='%s'>",$_REQUEST['lastname']);
+        printf("' value='%s'>", $_REQUEST['lastname']);
hunk ./library/sip_settings.php 8543
-            printf ("<p><font color=red>Error from %s: %s (%s): %s</font>",$this->SoapEngine->SOAPurl,$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error from %s: %s (%s): %s</font>", $this->SoapEngine->SOAPurl, $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 8563
-            printf(_("%s contacts found. "),$this->rows);
+            printf(_("%s contacts found. "), $this->rows);
hunk ./library/sip_settings.php 8566
-                //printf (_("Click on %s to add a Contact to Blink. "),$this->plus_sign_img);
+                //printf(_("Click on %s to add a Contact to Blink. "), $this->plus_sign_img);
hunk ./library/sip_settings.php 8612
-                $sip_account=sprintf("%s@%s",$account->id->username,$account->id->domain);
-                $contacts_url=sprintf("<a href=%s&tab=contacts&task=add&uri=%s&name=%s&search_text=%s>%s</a>",$this->url,$sip_account,urlencode($name),$sip_account,$this->phonebook_img);
+                $sip_account=sprintf("%s@%s", $account->id->username, $account->id->domain);
+                $contacts_url=sprintf("<a href=%s&tab=contacts&task=add&uri=%s&name=%s&search_text=%s>%s</a>", $this->url, $sip_account, urlencode($name), $sip_account, $this->phonebook_img);
hunk ./library/sip_settings.php 8616
-                    //$add_contact_url=sprintf("<a href=\"javascript:blink.addContact_withDisplayName_('%s', '%s');\">%s</a>",$sip_account,$name,$this->plus_sign_img);
-                    printf ("<tr class=%s><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s %s</td>",
+                    //$add_contact_url=sprintf("<a href=\"javascript:blink.addContact_withDisplayName_('%s', '%s');\">%s</a>", $sip_account, $name, $this->plus_sign_img);
+                    printf("<tr class=%s><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s %s</td>",
hunk ./library/sip_settings.php 8628
-                    printf ("<tr class=%s><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s %s</td>",
+                    printf("<tr class=%s><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s %s</td>",
hunk ./library/sip_settings.php 8673
-                printf ("<a href='%s&next=0'>Begin</a> ",$url);
+                printf("<a href='%s&next=0'>Begin</a> ", $url);
hunk ./library/sip_settings.php 8676
-            printf ("<a href='%s&next=%s'>Previous</a> ",$url,$mod_show_next);
+            printf("<a href='%s&next=%s'>Previous</a> ", $url, $mod_show_next);
hunk ./library/sip_settings.php 8686
-            printf ("<a href='%s&next=%s'>Next</a> ",$url,$show_next);
+            printf("<a href='%s&next=%s'>Next</a> ", $url, $show_next);
hunk ./library/sip_settings.php 8711
-        if (array_key_exists($_loc['country_code'],$country_transition)) {
+        if (array_key_exists($_loc['country_code'], $country_transition)) {
hunk ./library/sip_settings.php 10848
-    if (preg_match("/^(.*<sips?:.*)@(.*>)/",$uri,$m)) {
-        if (preg_match("/^(.*):/U",$m[2],$p)) {
+    if (preg_match("/^(.*<sips?:.*)@(.*>)/", $uri, $m)) {
+        if (preg_match("/^(.*):/U", $m[2], $p)) {
hunk ./library/sip_settings.php 10854
-    } elseif (preg_match("/^(sips?:.*)[=:;]/U",$uri,$p)) {
+    } elseif (preg_match("/^(sips?:.*)[=:;]/U", $uri, $p)) {
hunk ./library/sip_settings.php 10884
-    if (preg_match("/^(sip:|sips:)(.*)$/",$uri,$m)) $uri=$m[2];
+    if (preg_match("/^(sip:|sips:)(.*)$/", $uri, $m)) $uri=$m[2];
hunk ./library/sip_settings.php 10917
-function getSipThorHomeNode ($account,$sip_proxy)
+function getSipThorHomeNode ($account, $sip_proxy)
hunk ./library/sip_settings.php 10925
-    $request=sprintf("lookup sip_proxy for %s",$account);
+    $request=sprintf("lookup sip_proxy for %s", $account);
hunk ./library/sip_settings.php 10934
-function getSipAccountFromX509Certificate($account='')
+function getSipAccountFromX509Certificate($account = '')
hunk ./library/sip_settings.php 10937
-     if (!$account) {
+    if (!$account) {
hunk ./library/sip_settings.php 10940
-     }
-
-     list($username, $domain) = explode("@",$account);
-
-     if (!$username || !$domain) {
-         print _("Invalid account provided");
-         return false;
-     }
-
-     if (!$_SERVER[SSL_CLIENT_CERT]) {
-     	print _("Error: No X.509 client certificate provided\n");
+    }
+
+    list($username, $domain) = explode("@", $account);
+
+    if (!$username || !$domain) {
+        print _("Invalid account provided");
hunk ./library/sip_settings.php 10947
-     }
-
-     if (!$cert=openssl_x509_parse($_SERVER[SSL_CLIENT_CERT])) {
-     	print _("Error: Failed to parse X.509 client certificate\n");
+    }
+
+    if (!$_SERVER[SSL_CLIENT_CERT]) {
+        print _("Error: No X.509 client certificate provided\n");
hunk ./library/sip_settings.php 10952
-     }
-
-     require("/etc/cdrtool/ngnpro_engines.inc");
-
-     global $domainFilters, $resellerFilters, $soapEngines;
-
-     if ($domainFilters[$domain]['sip_engine']) {
-         $credentials['engine']   = $domainFilters[$domain]['sip_engine'];
-         $credentials['customer'] = $domainFilters[$domain]['customer'];
-         $credentials['reseller'] = $domainFilters[$domain]['reseller'];
-     } elseif ($domainFilters['default']['sip_engine']) {
+    }
+
+    if (!$cert=openssl_x509_parse($_SERVER[SSL_CLIENT_CERT])) {
+        print _("Error: Failed to parse X.509 client certificate\n");
+        return false;
+    }
+
+    require("/etc/cdrtool/ngnpro_engines.inc");
+
+    global $domainFilters, $resellerFilters, $soapEngines;
+
+    if ($domainFilters[$domain]['sip_engine']) {
+        $credentials['engine']   = $domainFilters[$domain]['sip_engine'];
+        $credentials['customer'] = $domainFilters[$domain]['customer'];
+        $credentials['reseller'] = $domainFilters[$domain]['reseller'];
+    } elseif ($domainFilters['default']['sip_engine']) {
hunk ./library/sip_settings.php 10969
-     } else {
+    } else {
hunk ./library/sip_settings.php 10972
-     }
-
-     $SOAPlogin=array(
-                      "username" => $soapEngines[$credentials['engine']]['username'],
-                      "password" => $soapEngines[$credentials['engine']]['password'],
-                      "admin"    => true
-     );
-
-     $SoapAuth = array('auth', $SOAPlogin , 'urn:AGProjects:NGNPro', 0, '');
-
-     $SipPort  = new WebService_NGNPro_SipPort($soapEngines[$credentials['engine']]['url']);
-
-     $SipPort->_options['timeout'] = 5;
-     $SipPort->setOpt('curl', CURLOPT_SSL_VERIFYPEER, 0);
-     $SipPort->setOpt('curl', CURLOPT_SSL_VERIFYHOST, 0);
-     $SipPort->addHeader($SoapAuth);
-
-     // Filter
-     $filter=array('username' => $username,
-                   'domain'   => $domain,
-                   'owner'    => intval($cert['subject']['CN'])
-                   );
-
-     // Range
-     $range=array('start' => 0,
-                  'count' => 10
-                  );
-
-     $orderBy = array('attribute' => 'changeDate',
-                      'direction' => 'DESC'
-                      );
-
-     // Compose query
-     $Query=array('filter'  => $filter,
-                  'orderBy' => $orderBy,
-                  'range'   => $range
-                  );
-
-     // Call function
-     $result     = $SipPort->getAccounts($Query);
-
-     if ((new PEAR)->isError($result)) {
-         $error_msg  = $result->getMessage();
-         $error_fault= $result->getFault();
-         $error_code = $result->getCode();
-         printf ("<p><font color=red>Error from %s (SipPort): %s (%s): %s</font>",$soapEngines[$credentials['engine']]['url'],$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
-         return false;
-     }
-
-     if ($result->total != 1) {
-         return false;
-     }
-
-     $credentials['account']  = $account;
-     $credentials['customer'] = $result->customer;
-     $credentials['reseller'] = $result->reseller;
-
-     return $credentials;
+    }
+
+    $SOAPlogin=array(
+        "username" => $soapEngines[$credentials['engine']]['username'],
+        "password" => $soapEngines[$credentials['engine']]['password'],
+        "admin"    => true
+    );
+
+    $SoapAuth = array('auth', $SOAPlogin , 'urn:AGProjects:NGNPro', 0, '');
+
+    $SipPort  = new WebService_NGNPro_SipPort($soapEngines[$credentials['engine']]['url']);
+
+    $SipPort->_options['timeout'] = 5;
+    $SipPort->setOpt('curl', CURLOPT_SSL_VERIFYPEER, 0);
+    $SipPort->setOpt('curl', CURLOPT_SSL_VERIFYHOST, 0);
+    $SipPort->addHeader($SoapAuth);
+
+    // Filter
+    $filter=array(
+        'username' => $username,
+        'domain'   => $domain,
+        'owner'    => intval($cert['subject']['CN'])
+    );
+
+    // Range
+    $range=array(
+        'start' => 0,
+        'count' => 10
+    );
+
+    $orderBy = array(
+        'attribute' => 'changeDate',
+        'direction' => 'DESC'
+    );
+
+    // Compose query
+    $Query = array(
+        'filter'  => $filter,
+        'orderBy' => $orderBy,
+        'range'   => $range
+    );
+
+    // Call function
+    $result     = $SipPort->getAccounts($Query);
+
+    if ((new PEAR)->isError($result)) {
+        $error_msg  = $result->getMessage();
+        $error_fault= $result->getFault();
+        $error_code = $result->getCode();
+        printf("<p><font color=red>Error from %s (SipPort): %s (%s): %s</font>", $soapEngines[$credentials['engine']]['url'], $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
+        return false;
+    }
+
+    if ($result->total != 1) {
+        return false;
+    }
+
+    $credentials['account']  = $account;
+    $credentials['customer'] = $result->customer;
+    $credentials['reseller'] = $result->reseller;
+
+    return $credentials;
hunk ./library/sip_settings.php 11051
-        $a=explode("@",$realm);
+        $a=explode("@", $realm);
hunk ./library/sip_settings.php 11056
-    	$realm = 'SIP_settings';
+        $realm = 'SIP_settings';
hunk ./library/sip_settings.php 11070
-               '",qop="auth",nonce="'.$nonce.'",opaque="'.md5($realm).'"');
-
-        //syslog(LOG_NOTICE, sprintf ("SIP settings page: sent auth request for realm %s to %s", $realm, $_SERVER['REMOTE_ADDR']));
+               '", qop="auth", nonce="'.$nonce.'", opaque="'.md5($realm).'"');
+
+        //syslog(LOG_NOTICE, sprintf("SIP settings page: sent auth request for realm %s to %s", $realm, $_SERVER['REMOTE_ADDR']));
hunk ./library/sip_settings.php 11088
-       $a = explode("@",$username);
+       $a = explode("@", $username);
hunk ./library/sip_settings.php 11099
-    $credentials['account']    = sprintf("%s@%s",$username, $domain);
+    $credentials['account']    = sprintf("%s@%s", $username, $domain);
hunk ./library/sip_settings.php 11105
-
hunk ./library/sip_settings.php 11146
-            $split=explode(":",$_property->value);
+            $split=explode(":", $_property->value);
hunk ./library/sip_settings.php 11184
-	$client_nonce_els=explode(":",base64_decode($data['nonce']));
+	$client_nonce_els=explode(":", base64_decode($data['nonce']));
hunk ./library/sip_settings.php 11201
-               '",qop="auth",nonce="'.$nonce.'",stale=true,opaque="'.md5($realm).'"');
+               '",qop="auth",nonce="'.$nonce.'",stale=true, opaque="'.md5($realm).'"');
hunk ./library/sip_settings.php 11225
-    preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
+    preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s, ]+))@', $txt, $matches, PREG_SET_ORDER);
hunk ./library/sip_settings.php 11235
-function renderUI($SipSettings_class,$account,$login_credentials,$soapEngines)
+function renderUI($SipSettings_class, $account, $login_credentials, $soapEngines)
hunk ./library/sip_settings.php 11239
-    $SipSettings = new $SipSettings_class($account,$login_credentials,$soapEngines);
+    $SipSettings = new $SipSettings_class($account, $login_credentials, $soapEngines);
hunk ./library/sip_settings.php 11278
-            $SipSettings = new $SipSettings_class($account,$login_credentials,$soapEngines);
+            $SipSettings = new $SipSettings_class($account, $login_credentials, $soapEngines);
hunk ./library/sip_settings.php 11281
-            printf (_("Error: %s"),$SipSettings->error);
+            printf(_("Error: %s"), $SipSettings->error);
hunk ./library/sip_settings.php 11287
-        $SipSettings = new $SipSettings_class($account,$login_credentials,$soapEngines);
+        $SipSettings = new $SipSettings_class($account, $login_credentials, $soapEngines);
hunk ./library/sip_settings.php 11306
-
hunk ./library/sip_settings.php 11313
-                $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                $_msg=sprintf("Error (SipPort): %s (%s): %s", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 11318
-            }  else {
-                printf("<p>The account %s has been removed</p>",$SipSettings->account);
+            } else {
+                printf("<p>The account %s has been removed</p>", $SipSettings->account);
hunk ./library/sip_settings.php 11330
-            printf("The delete request for account %s has expired or is not valid",$SipSettings->account);
+            printf("The delete request for account %s has expired or is not valid", $SipSettings->account);
hunk ./library/sip_settings.php 11343
-    	if ($_REQUEST['csv']) {
-        	$SipSettings->exportBalanceHistory();
+        if ($_REQUEST['csv']) {
+            $SipSettings->exportBalanceHistory();
hunk ./library/sip_settings.php 11346
-           print json_encode($SipSettings->balance_history);
+            print json_encode($SipSettings->balance_history);
hunk ./library/sip_settings.php 11399
-
hunk ./library/sip_settings.php 11412
-        $result = $SipSettings->SipPort->addBalanceFromVoucher($SipSettings->sipId,$card);
+        $result = $SipSettings->SipPort->addBalanceFromVoucher($SipSettings->sipId, $card);
hunk ./library/sip_settings.php 11418
-            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_msg=sprintf("Error (SipPort): %s (%s): %s", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 11424
-        }  else {
+        } else {
hunk ./library/sip_settings.php 11431
-
hunk ./library/sip_settings.php 11452
-            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_msg=sprintf("Error (SipPort): %s (%s): %s", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 11459
-        }  else {
+        } else {
hunk ./library/sip_settings.php 11478
-
hunk ./library/sip_settings.php 11484
-        $result     = $SipSettings->SipPort->setAcceptRules($SipSettings->sipId,$SipSettings->acceptRules);
+        $result     = $SipSettings->SipPort->setAcceptRules($SipSettings->sipId, $SipSettings->acceptRules);
hunk ./library/sip_settings.php 11490
-            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_msg=sprintf("Error (SipPort): %s (%s): %s", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 11495
-                $_msg=sprintf(_('Do not disturb has been enabled for %d minutes'),intval($_REQUEST['duration']));
+                $_msg=sprintf(_('Do not disturb has been enabled for %d minutes'), intval($_REQUEST['duration']));
hunk ./library/sip_settings.php 11512
-        $result     = $SipSettings->SipPort->setAcceptRules($SipSettings->sipId,$SipSettings->acceptRules);
+        $result     = $SipSettings->SipPort->setAcceptRules($SipSettings->sipId, $SipSettings->acceptRules);
hunk ./library/sip_settings.php 11518
-            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_msg=sprintf("Error (SipPort): %s (%s): %s", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 11538
-            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_msg=sprintf("Error (SipPort): %s (%s): %s", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 11562
-                $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                $_msg=sprintf("Error (SipPort): %s (%s): %s", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 11602
-            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_msg=sprintf("Error (SipPort): %s (%s): %s", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 11606
-            $_msg=sprintf(_('Added alias %s'),strtolower($username));
+            $_msg=sprintf(_('Added alias %s'), strtolower($username));
hunk ./library/sip_settings.php 11622
-            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_msg=sprintf("Error (SipPort): %s (%s): %s", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 11639
-
hunk ./library/sip_settings.php 11640
-                printf ("Key $key changed %s",$_REQUEST[$key]);
+                printf("Key $key changed %s", $_REQUEST[$key]);
hunk ./library/sip_settings.php 11647
-                if ($textboxURI && $textboxURI != "<voice-mailbox>" && !preg_match("/@/",$textboxURI)) {
+                if ($textboxURI && $textboxURI != "<voice-mailbox>" && !preg_match("/@/", $textboxURI)) {
hunk ./library/sip_settings.php 11652
-                if (preg_match("/^([\+|0].*)@/",$textboxURI,$m))  {
+                if (preg_match("/^([\+|0].*)@/", $textboxURI, $m))  {
hunk ./library/sip_settings.php 11656
-                if (strlen($textboxURI) && $textboxURI != "<voice-mailbox>" && !preg_match("/^sip:/",$textboxURI))  {
+                if (strlen($textboxURI) && $textboxURI != "<voice-mailbox>" && !preg_match("/^sip:/", $textboxURI))  {
hunk ./library/sip_settings.php 11664
-                $_log.=sprintf("%s=%s ",$key,$textboxURI);
+                $_log.=sprintf("%s=%s ", $key, $textboxURI);
hunk ./library/sip_settings.php 11668
-            		$new_diversions[$key]=$old_diversions[$key];
+                    $new_diversions[$key]=$old_diversions[$key];
hunk ./library/sip_settings.php 11675
-            $result     = $SipSettings->SipPort->setCallDiversions($SipSettings->sipId,$new_diversions);
+            $result     = $SipSettings->SipPort->setCallDiversions($SipSettings->sipId, $new_diversions);
hunk ./library/sip_settings.php 11681
-                $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                $_msg=sprintf("Error (SipPort): %s (%s): %s", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 11685
-                $_msg=sprintf(_('Changed diversions %s'),$_log);
+                $_msg=sprintf(_('Changed diversions %s'), $_log);
hunk ./library/sip_settings.php 11785
-        	$this->customerEngine = $this->enrollment['customer_engine'];
+            $this->customerEngine = $this->enrollment['customer_engine'];
hunk ./library/sip_settings.php 11787
-        	$this->customerEngine = $this->enrollment['sip_engine'];
+            $this->customerEngine = $this->enrollment['sip_engine'];
hunk ./library/sip_settings.php 11791
-        	$this->emailEngine = $this->enrollment['email_engine'];
+            $this->emailEngine = $this->enrollment['email_engine'];
hunk ./library/sip_settings.php 11793
-        	$this->emailEngine = $this->enrollment['sip_engine'];
+            $this->emailEngine = $this->enrollment['sip_engine'];
hunk ./library/sip_settings.php 11797
-        	$this->groups = $this->enrollment['groups'];
+            $this->groups = $this->enrollment['groups'];
hunk ./library/sip_settings.php 11799
-        	$this->groups = array();
+            $this->groups = array();
hunk ./library/sip_settings.php 11884
-		$username=strtolower(trim($_REQUEST['username']));
-
-        if (!preg_match("/^[1-9a-z][0-9a-z_.-]{2,64}[0-9a-z]$/",$username)) {
+        $username=strtolower(trim($_REQUEST['username']));
+
+        if (!preg_match("/^[1-9a-z][0-9a-z_.-]{2,64}[0-9a-z]$/", $username)) {
hunk ./library/sip_settings.php 11898
-        	// create owner id
+            // create owner id
hunk ./library/sip_settings.php 11900
-            $this->CustomerSoapEngine = new SoapEngine($customerEngine,$this->soapEngines,$this->customerLoginCredentials);
+            $this->CustomerSoapEngine = new SoapEngine($customerEngine, $this->soapEngines, $this->customerLoginCredentials);
hunk ./library/sip_settings.php 11905
-            $properties=$this->customerRecords->setInitialCredits(array('sip_credit'         => 1,
-                                                                        'sip_alias_credit'   => 1,
-                                                                        'email_credit'       => 1
-                                                                        )
-                                                                  );
-            if (preg_match("/^(\w+)\s+(\w+)$/",$_REQUEST['display_name'],$m)) {
+            $properties=$this->customerRecords->setInitialCredits(
+                array(
+                    'sip_credit'         => 1,
+                    'sip_alias_credit'   => 1,
+                    'email_credit'       => 1
+                )
+            );
+            if (preg_match("/^(\w+)\s+(\w+)$/", $_REQUEST['display_name'], $m)) {
hunk ./library/sip_settings.php 11931
-                         'firstName'  => $firstName,
-                         'lastName'   => $lastName,
-                         'timezone'   => $timezone,
-                         'password'   => trim($_REQUEST['password']),
-                         'email'      => trim($_REQUEST['email']),
-                         'country'    => $location['country_code'],
-                         'state'      => utf8_encode($location['region']),
-                         'city'       => utf8_encode($location['city']),
-                         'properties' => $properties
-                        );
+                'firstName'  => $firstName,
+                'lastName'   => $lastName,
+                'timezone'   => $timezone,
+                'password'   => trim($_REQUEST['password']),
+                'email'      => trim($_REQUEST['email']),
+                'country'    => $location['country_code'],
+                'state'      => utf8_encode($location['region']),
+                'city'       => utf8_encode($location['city']),
+                'properties' => $properties
+            );
hunk ./library/sip_settings.php 11949
-                $customer['tel'] = sprintf ("+1%s9999999",$location['area_code']);
+                $customer['tel'] = sprintf("+1%s9999999",$location['area_code']);
hunk ./library/sip_settings.php 12023
-        $this->SipSoapEngine = new SoapEngine($sipEngine,$this->soapEngines,$this->sipLoginCredentials);
+        $this->SipSoapEngine = new SoapEngine($sipEngine, $this->soapEngines, $this->sipLoginCredentials);
hunk ./library/sip_settings.php 12035
-            if (in_array($_REQUEST['lang'],$languages)) {
+            if (in_array($_REQUEST['lang'], $languages)) {
hunk ./library/sip_settings.php 12101
-                if (!$passport = $this->generateCertificate($sip_address,$_REQUEST['email'],$_REQUEST['password'])) {
+                if (!$passport = $this->generateCertificate($sip_address, $_REQUEST['email'], $_REQUEST['password'])) {
hunk ./library/sip_settings.php 12114
-                if ($SipSettings = new $this->sipClass($sip_address,$this->sipLoginCredentials,$this->soapEngines)) {
+                if ($SipSettings = new $this->sipClass($sip_address, $this->sipLoginCredentials, $this->soapEngines)) {
hunk ./library/sip_settings.php 12132
-                $this->EmailSoapEngine = new SoapEngine($emailEngine,$this->soapEngines,$this->sipLoginCredentials);
+                $this->EmailSoapEngine = new SoapEngine($emailEngine, $this->soapEngines, $this->sipLoginCredentials);
hunk ./library/sip_settings.php 12183
-    function generateCertificate($sip_address,$email,$password)
+    function generateCertificate($sip_address, $email, $password)
hunk ./library/sip_settings.php 12281
+    private $CardProcessor;
+    private $account;
+
hunk ./library/sip_settings.php 12421
-                        $log_text.=sprintf("%s:%s ",$errors[$key]['field'],$errors[$key]['desc']);
+                        $log_text.=sprintf("%s:%s ", $errors[$key]['field'], $errors[$key]['desc']);
hunk ./library/sip_settings.php 12424
-                    $log=sprintf("CC transaction for %s failed with error: %s",$this->account->account,$log_text);
+                    $log=sprintf("CC transaction for %s failed with error: %s", $this->account->account, $log_text);
hunk ./library/sip_settings.php 12482
-                        printf (_("For questions related to your payments or to request a refund please email to <i>%s</i> and mention your transaction id <b>%s</b>. "),
+                        printf(_("For questions related to your payments or to request a refund please email to <i>%s</i> and mention your transaction id <b>%s</b>. "),
hunk ./library/sip_settings.php 12532
-                    $extra_information['Invoice Page']=sprintf("https://admin.ag-projects.com/admin/invoice.phtml?iId=%d&adminonly=1",$result['invoice']);
+                    $extra_information['Invoice Page']=sprintf("https://admin.ag-projects.com/admin/invoice.phtml?iId=%d&adminonly=1", $result['invoice']);
hunk ./library/sip_settings.php 12535
-                if ($this->CardProcessor->saveOrder($_POST,$pay_process_results,$extra_information)) {
+                if ($this->CardProcessor->saveOrder($_POST, $pay_process_results, $extra_information)) {
hunk ./library/sip_settings.php 12543
-                    $log=sprintf("Error: SIP Account %s - CC transaction %s failed to save order",$this->account->account, $this->CardProcessor->transaction_data['TRANSACTION_ID']);
+                    $log=sprintf("Error: SIP Account %s - CC transaction %s failed to save order", $this->account->account, $this->CardProcessor->transaction_data['TRANSACTION_ID']);
hunk ./library/sip_settings.php 12577
-                if ($this->account->Preferences['ip'] && preg_match("/^$_ip/",$this->account->Preferences['ip'])) {
+                if ($this->account->Preferences['ip'] && preg_match("/^$_ip/", $this->account->Preferences['ip'])) {
hunk ./library/sip_settings.php 12582
-                if (preg_match("/^$_ip/",$_SERVER['REMOTE_ADDR'])) {
+                if (preg_match("/^$_ip/", $_SERVER['REMOTE_ADDR'])) {
hunk ./library/sip_settings.php 12590
-
hunk ./library/sip_settings.php 12591
-                if (in_array($_loc['country_name'],$this->deny_countries)) {
+                if (in_array($_loc['country_name'], $this->deny_countries)) {
hunk ./library/sip_settings.php 12600
-                if (!in_array($_loc['country_name'],$this->allow_countries)) {
+                if (!in_array($_loc['country_name'], $this->allow_countries)) {
hunk ./library/sip_settings.php 12610
-                if (in_array($this->account->email,$this->accept_email_addresses)) return false;
+                if (in_array($this->account->email, $this->accept_email_addresses)) return false;
hunk ./library/sip_settings.php 12613
-            list($user,$domain)= explode("@",$this->account->email);
+            list($user, $domain)= explode("@", $this->account->email);
hunk ./library/sip_settings.php 12616
-                    $this->fraud_reason=sprintf ('Domain %s is Not Allowed',$domain);
+                    $this->fraud_reason=sprintf('Domain %s is Not Allowed', $domain);
hunk ./library/sip_settings.php 12668
-        $result = $this->did_engine->didww_getdidwwregions($this->auth_string,$country);
+        $result = $this->did_engine->didww_getdidwwregions($this->auth_string, $country);
hunk ./library/sip_settings.php 12675
-            printf ("<p><font color=red>Error: %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error: %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 12677
-        }  else {
+        } else {
hunk ./library/sip_settings.php 12700
-        $query=sprintf("select * from ddi_cache where environment = '%s' and DATE_ADD(date, INTERVAL +1 day) > NOW()",addslashes($this->environment));
+        $query=sprintf("select * from ddi_cache where environment = '%s' and DATE_ADD(date, INTERVAL +1 day) > NOW()", addslashes($this->environment));
hunk ./library/sip_settings.php 12706
-            $prefixes = json_decode($this->db->f('cache'),true);
+            $prefixes = json_decode($this->db->f('cache'), true);
hunk ./library/sip_settings.php 12721
-            $query=sprintf("delete from ddi_cache where environment = '%s'",addslashes($this->environment));
+            $query=sprintf("delete from ddi_cache where environment = '%s'", addslashes($this->environment));
hunk ./library/sip_settings.php 12724
-            $query=sprintf("insert into ddi_cache (cache,date,environment) values ('%s', NOW(),'%s')",addslashes(json_encode($prefixes)),addslashes($this->environment));
+            $query=sprintf("insert into ddi_cache (cache, date, environment) values ('%s', NOW(),'%s')", addslashes(json_encode($prefixes)), addslashes($this->environment));
hunk ./library/sip_settings.php 12744
-            printf ("<p><font color=red>Error: %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error: %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 12776
-            printf ("<p><font color=red>Error: %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error: %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 12779
-            $query=sprintf ("insert into ddi_numbers (
+            $query=sprintf("insert into ddi_numbers (
hunk ./library/sip_settings.php 12833
-                $log=sprintf ("Database error for DID createOrder: %s (%s)",$this->db->Error,$this->db->Errno);
+                $log=sprintf("Database error for DID createOrder: %s (%s)", $this->db->Error, $this->db->Errno);
hunk ./library/sip_settings.php 12837
-
hunk ./library/sip_settings.php 12838
-
hunk ./library/sip_settings.php 12860
-            printf ("<p><font color=red>Error: %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error: %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 12863
-            $query=sprintf ("update ddi_numbers set did_timeleft = '%s' and did_expire_date_gmt = '%s' where did_number = '%s'
+            $query=sprintf("update ddi_numbers set did_timeleft = '%s' and did_expire_date_gmt = '%s' where did_number = '%s'
hunk ./library/sip_settings.php 12871
-                $log=sprintf ("Database error for DID renewOrder: %s (%s)",$this->db->Error,$this->db->Errno);
+                $log=sprintf("Database error for DID renewOrder: %s (%s)", $this->db->Error, $this->db->Errno);
hunk ./library/sip_settings.php 12898
-            printf ("<p><font color=red>Error: %s (%s): %s</font>",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            printf("<p><font color=red>Error: %s (%s): %s</font>", $error_msg, $error_fault->detail->exception->errorcode, $error_fault->detail->exception->errorstring);
hunk ./library/sip_settings.php 12901
-            $query=sprintf ("delete from ddi_numbers where did_number = '%s'",addslashes($result->did_number));
+            $query=sprintf("delete from ddi_numbers where did_number = '%s'", addslashes($result->did_number));
hunk ./library/sip_settings.php 12904
-                $log=sprintf ("Database error for DID cancelOrder: %s (%s)",$this->db->Error,$this->db->Errno);
+                $log=sprintf("Database error for DID cancelOrder: %s (%s)", $this->db->Error, $this->db->Errno);
hunk ./library/sip_settings.php 12911
-
hunk ./library/sip_settings.php 12917
-        $query=sprintf ("select * from ddi_numbers where sip_address = '%s' and environment = '%s'",addslashes($sip_address),addslashes($this->environment));
+        $query=sprintf("select * from ddi_numbers where sip_address = '%s' and environment = '%s'", addslashes($sip_address), addslashes($this->environment));
hunk ./library/sip_settings.php 12920
-            $log=sprintf ("Database error for DID createOrder: %s (%s)",$this->db->Error,$this->db->Errno);
+            $log=sprintf("Database error for DID createOrder: %s (%s)", $this->db->Error, $this->db->Errno);
hunk ./library/sip_settings.php 12936
-
-        	}
+            }
hunk ./library/sip_settings.php 12940
-