[Link vm, presence and customer soap engines to sip account engine Adrian Georgescu **20070912120808] hunk ./provisioning_logic.phtml 468 - 'Operators' => array('recordsClass' => 'Customers', - 'soapClass' => 'WebService_NGNPro_CustomerPort' - ), hunk ./provisioning_logic.phtml 479 - ) + ), + 'Operators' => array('recordsClass' => 'Customers', + 'soapClass' => 'WebService_NGNPro_CustomerPort' + ) hunk ./provisioning_logic.phtml 535 - hunk ./provisioning_logic.phtml 773 + if ($_engine == 'Operators' && $this->version <= 1) continue; hunk ./provisioning_logic.phtml 1012 - if (!$this->SOAPEngine->enableResellers) return; + if (!$this->version <= 1 ) return; hunk ./provisioning_logic.phtml 1069 - if (!$this->SOAPEngine->enableResellers) return; + if (!$this->version <= 1 ) return; hunk ./provisioning_logic.phtml 1219 + "; + if ($this->version > 1) print "Operator"; + print" hunk ./provisioning_logic.phtml 1223 - Operator hunk ./provisioning_logic.phtml 1267 + if ($this->version > 1) { hunk ./provisioning_logic.phtml 1271 - %s hunk ./provisioning_logic.phtml 1273 + %s hunk ./provisioning_logic.phtml 1278 - $domain, hunk ./provisioning_logic.phtml 1280 + $domain, hunk ./provisioning_logic.phtml 1285 + } else { + printf(" + + %s + %s + %s + %s + ", + $bgcolor, + $index, + $domain, + $domain->changeDate, + $_url, + $actionText + ); + } hunk ./provisioning_logic.phtml 1578 + "; + if ($this->version > 1) print "Operator"; + print" hunk ./provisioning_logic.phtml 1582 - Operator hunk ./provisioning_logic.phtml 1640 + if ($account->reseller) { + $resellerSipSettingsPage=$account->reseller; + } else { + $resellerSipSettingsPage=$this->reseller; + } + hunk ./provisioning_logic.phtml 1648 - $account->reseller,$this->SOAPEngine->soapEngineIdSettingsPage); + $resellerSipSettingsPage,$this->SOAPEngine->soapEngineIdSettingsPage); hunk ./provisioning_logic.phtml 1669 + if ($this->version > 1) { + hunk ./provisioning_logic.phtml 1674 - %s hunk ./provisioning_logic.phtml 1675 + %s hunk ./provisioning_logic.phtml 1686 - hunk ./provisioning_logic.phtml 1688 - $sip_account, hunk ./provisioning_logic.phtml 1690 + $sip_account, hunk ./provisioning_logic.phtml 1703 - + } else { + printf(" + + %s + %s + %s %s + %s + %s + %s + %s + %s + %s + %s + + ", + $bgcolor, + $index, + $sip_account, + $account->firstName, + $account->lastName, + $account->email, + $account->email, + $account->rpid, + $account->quota, + $groups, + $account->changeDate, + $account->owner, + $_url, + $actionText + ); + } + hunk ./provisioning_logic.phtml 2192 + "; + if ($this->version > 1) print "Operator"; + print" hunk ./provisioning_logic.phtml 2196 - Operator hunk ./provisioning_logic.phtml 2247 + if ($this->version > 1) { + hunk ./provisioning_logic.phtml 2252 - %s@%s hunk ./provisioning_logic.phtml 2254 + %s@%s hunk ./provisioning_logic.phtml 2262 - $alias->id->username, - $alias->id->domain, hunk ./provisioning_logic.phtml 2264 + $alias->id->username, + $alias->id->domain, hunk ./provisioning_logic.phtml 2273 - + } else { + printf(" + + %s + %s@%s + %s@%s + %s + %s + %s + + ", + $bgcolor, + $index, + $alias->id->username, + $alias->id->domain, + $alias->target->username, + $alias->target->domain, + $alias->owner, + $alias->changeDate, + $_url, + $actionText + ); + } hunk ./provisioning_logic.phtml 2583 + "; + if ($this->version > 1) print "Operator"; + print" hunk ./provisioning_logic.phtml 2588 - Operator hunk ./provisioning_logic.phtml 2651 + if ($this->version > 1) { hunk ./provisioning_logic.phtml 2655 + %s.%s hunk ./provisioning_logic.phtml 2658 - %s.%s hunk ./provisioning_logic.phtml 2667 - $range_link, - $range->id->tld, hunk ./provisioning_logic.phtml 2669 + $range_link, + $range->id->tld, + $range->ttl, + $range->minDigits, + $range->maxDigits, + $range->used, + $range->changeDate, + $_url, + $actionText + ); + } else { + printf(" + + %s + +%s + %s + %s + %s + %s + %s + %s + %s + ", + $bgcolor, + $index, + $range_link, + $range->id->tld, hunk ./provisioning_logic.phtml 2705 + } hunk ./provisioning_logic.phtml 3114 + "; + if ($this->version > 1) print "Operator"; + print" hunk ./provisioning_logic.phtml 3120 - Operator hunk ./provisioning_logic.phtml 3180 + if ($this->version > 1) { hunk ./provisioning_logic.phtml 3185 + %s.%s hunk ./provisioning_logic.phtml 3189 - %s.%s hunk ./provisioning_logic.phtml 3199 + $number->reseller, + $number->customer, hunk ./provisioning_logic.phtml 3204 - $number->reseller, - $number->customer, hunk ./provisioning_logic.phtml 3213 + } else { + printf(" + + %s + +%s + %s + %s + %s + %s + %s + %s + %s + %s + %s + ", + $bgcolor, + $index, + $number->id->number, + $number->id->tld, + $this->tel2enum($number->id->number,$number->id->tld), + ucfirst($_mapping->type), + $_mapping->mapto, + $_mapping->ttl, + $_mapping->priority, + $number->owner, + $_mapping->lastChange, + $_url, + $actionText + ); + } hunk ./provisioning_logic.phtml 3244 + if ($this->version > 1) { hunk ./provisioning_logic.phtml 3269 + } else { + printf(" + + + + + + %s + %s + %s + %s + %s + + %s + ", + $bgcolor, + ucfirst($_mapping->type), + $_mapping->mapto, + $_mapping->ttl, + $_mapping->priority, + $_mapping->lastChange, + $_url, + $actionText + ); + } hunk ./provisioning_logic.phtml 3927 + "; + if ($this->version > 1) print "Operator"; + print" hunk ./provisioning_logic.phtml 3931 - Operator hunk ./provisioning_logic.phtml 3981 + if ($this->version > 1) { + hunk ./provisioning_logic.phtml 3986 - %s hunk ./provisioning_logic.phtml 3991 + %s hunk ./provisioning_logic.phtml 3996 - $peer->ip, hunk ./provisioning_logic.phtml 3998 + $peer->ip, + $peer->protocol, + $peer->fromPattern, + $peer->description, + $peer->owner, + $_url, + $actionText + ); + } else { + printf(" + + %s + %s + %s + %s + %s + %s + %s + ", + $bgcolor, + $index, + $peer->ip, hunk ./provisioning_logic.phtml 4028 + } hunk ./provisioning_logic.phtml 5306 - Operator + "; + if ($this->version > 1) print "Operator"; + print" hunk ./provisioning_logic.phtml 5606 + 'rmdsfromrpid' => 'Remove from PSTN caller ID digits:', hunk ./provisioning_logic.phtml 5753 - $result->quota=intval($result->quota); + $result->quota = intval($result->quota); + $result->answerTimeout = intval($result->answerTimeout); hunk ./provisioning_logic.phtml 5783 - $result->quota=intval($result->quota); + $result->quota = intval($result->quota); + $result->answerTimeout = intval($result->answerTimeout); hunk ./provisioning_logic.phtml 5814 - $result->quota=intval($sub_action_parameter); + $result->quota = intval($sub_action_parameter); + $result->answerTimeout = intval($result->answerTimeout); hunk ./provisioning_logic.phtml 5826 + } + + } else if ($action=='rmdsfromrpid') { + $this->SOAPEngine->soapclient->addHeader($this->SOAPEngine->SoapAuth); + $result = $this->SOAPEngine->soapclient->getAccount($account); + + if (PEAR::isError($result)) { + $error_msg = $result->getMessage(); + $error_fault= $result->getFault(); + $error_code = $result->getCode(); + printf ("Error: %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring); + break; + } else { + //print_r($result); + // Sanitize data types due to PHP bugs + + if (!is_array($result->properties)) $result->properties=array(); + if (!is_array($result->groups)) $result->groups=array(); + if (is_numeric($sub_action_parameter) && strlen($result->rpid) > $sub_action_parameter) { + printf("%s %s",$result->rpid,$sub_action_parameter); + $result->rpid=substr($result->rpid,$sub_action_parameter); + printf("%s %s",$result->rpid,$sub_action_parameter); + } else { + printf ("Error: '%s' must be numeric and less than caller if length",$sub_action_parameter); + continue; + } + + $result->quota = intval($result->quota); + $result->answerTimeout = intval($result->answerTimeout); + + $function=array('commit' => array('name' => 'updateAccount', + 'parameters' => array($result), + 'logs' => array('success' => sprintf('SIP account %s@%s has PSTN caller ID set to %s',$key['username'],$key['domain'],$result->rpid) + ) + ) + + ); + $this->SOAPEngine->execute($function); + hunk ./provisioning_logic.phtml 5880 - if (!is_array($result->properties)) $result->properties=array(); - if (!is_array($result->groups)) $result->groups=array(); - if (is_numeric($username)) $result->rpid=$username; - $result->quota=intval($result->quota); + if (!is_array($result->properties)) $result->properties=array(); + if (!is_array($result->groups)) $result->groups=array(); + if (is_numeric($key['username'])) $result->rpid=$key['username']; + + $result->quota = intval($result->quota); + $result->answerTimeout = intval($result->answerTimeout); hunk ./provisioning_logic.phtml 5889 - 'logs' => array('success' => sprintf('SIP account %s@%s has PSTN caller ID set to %s',$key['username'],$key['domain'],$sub_action_parameter) + 'logs' => array('success' => sprintf('SIP account %s@%s has PSTN caller ID set to %s',$key['username'],$key['domain'],$key['username']) hunk ./provisioning_logic.phtml 5919 - $result->quota=intval($result->quota); + $result->quota = intval($result->quota); + $result->answerTimeout = intval($result->answerTimeout); hunk ./provisioning_logic.phtml 5924 - 'logs' => array('success' => sprintf('SIP account %s@%s has PSTN caller ID set to %s%s ',$key['username'],$key['domain'],$sub_action_parameter,$result->rpid) + 'logs' => array('success' => sprintf('SIP account %s@%s has PSTN caller ID set to %s ',$key['username'],$key['domain'],$result->rpid) hunk ./sip_settings_lib.phtml 8 - var $soapEngineIdSipPort = 'mdns'; - var $soapEngineIdVoicemailPort = 'mdns_vm'; - var $soapEngineIdCustomerPort = 'mdns'; - var $soapEngineIdPresencePort = 'ssp'; hunk ./sip_settings_lib.phtml 18 + hunk ./sip_settings_lib.phtml 45 - 'mailto' , - 'free-pstn' , - 'blocked' , - 'sip_password' , - 'quota' , - 'language' , - 'quota_reset' , - 'used_quota' , - 'voicemail' , - 'anonymous' , - 'advanced' , - 'rpid' , - 'timezone' , - 'accept' , - 'accept_temporary_group' , - 'accept_temporary_remain' , - 'web_timestamp' , - 'acceptDailyStartTime' , - 'acceptDailyStopTime' , - 'acceptDailyGroup' , - 'quickdial' , + 'mailto', + 'free-pstn', + 'blocked', + 'sip_password', + 'quota', + 'language', + 'quota_reset', + 'used_quota', + 'voicemail', + 'anonymous', + 'advanced', + 'rpid', + 'timezone', + 'accept', + 'accept_temporary_group', + 'accept_temporary_remain', + 'web_timestamp', + 'acceptDailyStartTime', + 'acceptDailyStopTime', + 'acceptDailyGroup', + 'quickdial', hunk ./sip_settings_lib.phtml 225 - $this->tabs[presence]=_("Presence"); + $this->tabs[presence]=_("Presence"); hunk ./sip_settings_lib.phtml 255 - $this->VoicemailPort = new $this->soapClassVoicemailPort($this->SOAPurl); - $this->CustomerPort = new $this->soapClassCustomerPort($this->SOAPurl); - $this->PresencePort = new $this->soapClassPresencePort($this->SOAPurlPresence); + + if (strlen($this->soapEngines[$this->soapEngineIdSipPort]['voicemailEngineId'])) { + $this->SOAPurlVoicemail = $this->soapEngines[$this->soapEngines[$this->soapEngineIdSipPort]['voicemailEngineId']]['url']; + $this->SOAPloginVoicemail = array( + "username" => $this->soapEngines[$this->soapEngines[$this->soapEngineIdSipPort]['voicemailEngineId']]['username'], + "password" => $this->soapEngines[$this->soapEngines[$this->soapEngineIdSipPort]['voicemailEngineId']]['password'], + "admin" => true, + "impersonate" => intval($this->rId) + ); + + $this->SoapAuthVoicemail = array('auth', $this->SOAPloginVoicemail , 'urn:AGProjects:NGNPro', 0, ''); + } else { + $this->SOAPurlVoicemail = $this->SOAPurl; + $this->SoapAuthVoicemail = $this->SoapAuth; + } + + if (strlen($this->soapEngines[$this->soapEngines[$this->soapEngineIdSipPort]['presenceEngineId']])) { + $this->SOAPurlPresence = $this->soapEngines[$this->soapEngines[$this->soapEngineIdSipPort]['presenceEngineId']]['url']; + $this->PresencePort = new $this->soapClassPresencePort($this->SOAPurlPresence); + $this->PresencePort->setOpt('curl', CURLOPT_TIMEOUT, 5); + $this->PresencePort->setOpt('curl', CURLOPT_SSL_VERIFYPEER, 0); + $this->PresencePort->setOpt('curl', CURLOPT_SSL_VERIFYHOST, 0); + } + + if (strlen($this->soapEngines[$this->soapEngineIdSipPort]['customerEngineId'])) { + $this->SOAPurlCustomer = $this->soapEngines[$this->soapEngines[$this->soapEngineIdSipPort]['customerEngineId']]['url']; + $this->SOAPloginCustomer = array( + "username" => $this->soapEngines[$this->soapEngines[$this->soapEngineIdSipPort]['customerEngineId']]['username'], + "password" => $this->soapEngines[$this->soapEngines[$this->soapEngineIdSipPort]['customerEngineId']]['password'], + "admin" => true, + "impersonate" => intval($this->rId) + ); + + $this->SoapAuthCustomer = array('auth', $this->SOAPloginCustomer , 'urn:AGProjects:NGNPro', 0, ''); + } else { + $this->SOAPurlCustomer = $this->SOAPurl; + $this->SoapAuthCustomer = $this->SoapAuth; + } + + + $this->VoicemailPort = new $this->soapClassVoicemailPort($this->SOAPurlVoicemail); + $this->CustomerPort = new $this->soapClassCustomerPort($this->SOAPurlCustomer); hunk ./sip_settings_lib.phtml 310 - $this->PresencePort->setOpt('curl', CURLOPT_TIMEOUT, 5); - $this->PresencePort->setOpt('curl', CURLOPT_SSL_VERIFYPEER, 0); - $this->PresencePort->setOpt('curl', CURLOPT_SSL_VERIFYHOST, 0); - hunk ./sip_settings_lib.phtml 511 - $this->SOAPloginCustomer=array( - "username" =>"soapadmin", - "password" =>"troleu", - "admin" =>true, - "impersonate" =>intval($this->$this->owner) - ); - - $this->SoapAuthCustomer=array('auth', $this->SOAPloginCustomer , 'urn:AGProjects:NGNPro', 0, ''); - hunk ./sip_settings_lib.phtml 732 - $this->VoicemailPort->addHeader($this->SoapAuth); + $this->VoicemailPort->addHeader($this->SoapAuthVoicemail); hunk ./sip_settings_lib.phtml 2726 - $this->VoicemailPort->addHeader($this->SoapAuth); + $this->VoicemailPort->addHeader($this->SoapAuthVoicemail); hunk ./sip_settings_lib.phtml 2772 - $this->VoicemailPort->addHeader($this->SoapAuth); + $this->VoicemailPort->addHeader($this->SoapAuthVoicemail); hunk ./sip_settings_lib.phtml 2788 - $this->VoicemailPort->addHeader($this->SoapAuth); + $this->VoicemailPort->addHeader($this->SoapAuthVoicemail); hunk ./sip_settings_lib.phtml 2829 - $this->VoicemailPort->addHeader($this->SoapAuth); + $this->VoicemailPort->addHeader($this->SoapAuthVoicemail);