[More enrollment functions
Adrian Georgescu <ag@ag-projects.com>**20090925215346] hunk ./library/sip_settings.php 135
+    var $enrollment_url      = false;
+    var $sip_settings_api_url= false;
hunk ./library/sip_settings.php 349
+        if ($this->soapEngines[$this->sip_engine]['enrollment_url']) {
+        	$this->enrollment_url =$this->soapEngines[$this->sip_engine]['enrollment_url'];
+        }
+
+        if ($this->soapEngines[$this->sip_engine]['sip_settings_api_url']) {
+        	$this->sip_settings_api_url =$this->soapEngines[$this->sip_engine]['sip_settings_api_url'];
+        }
+
hunk ./library/sip_settings.php 1503
-        <table class=border2 border=0 cellspacing=0 cellpadding=0 align=right>
+        <table border=0 cellspacing=0 cellpadding=0 align=right>
hunk ./library/sip_settings.php 1603
-		include("/etc/cdrtool/enrollment/config.ini");
+		if ($this->enrollment_url) {
+            include("/etc/cdrtool/enrollment/config.ini");
+    
+            if (is_array($enrollment)) {
+                $chapter=sprintf(_("Client certificates"));
+                $this->showChapter($chapter);
+                if ($this->sip_settings_api_url) {
+                    print "
+                    <tr>
+                    <td class=border colspan=2>";
+                    printf (_("You can use the certificate for changing settings using <a href=%s target=sip_api>SIP Settings API</a>"),$this->sip_settings_api_url);
+                    printf ("
+                    </td>
+                    </tr>
+                    ");
+                
+                }
hunk ./library/sip_settings.php 1621
-        if (is_array($enrollment)) {
-            $chapter=sprintf(_("Client certificates"));
-            $this->showChapter($chapter);
-            print "
-            <tr>
-            <td class=border>";
-            print _("X.509 PEM format");
-            printf ("
-            </td>
-            <td class=border><a href=%s&action=crt&export=1>%s.crt</a>
-            </td>
-            </tr>
-            <tr>
-              <td height=3 colspan=2></td>
-            </tr>",$this->url, $this->account);
-            print "
-            <tr>
-            <td class=border>";
-            print _("PKCS#12 store format");
-            printf ("
-            </td>
-            <td class=border><a href=%s&action=p12&export=1>%s.p12</a>
-            </td>
-            </tr>
-            <tr>
-              <td height=3 colspan=2></td>
-            </tr>",$this->url, $this->account);
+                print "
+                <tr>
+                <td class=border>";
+                print _("X.509 PEM format");
+                printf ("
+                </td>
+                <td class=border><a href=%s&action=crt>%s.crt</a>
+                </td>
+                </tr>
+                <tr>
+                  <td height=3 colspan=2></td>
+                </tr>",$this->url, $this->account);
+                print "
+                <tr>
+                <td class=border>";
+                print _("PKCS#12 store format");
+                printf ("
+                </td>
+                <td class=border><a href=%s&action=p12>%s.p12</a>
+                </td>
+                </tr>
+                <tr>
+                  <td height=3 colspan=2></td>
+                </tr>",$this->url, $this->account);
+            }
hunk ./library/sip_settings.php 1648
+
hunk ./library/sip_settings.php 3408
-            print ": $prepaidAccount->balance $this->currency";
+            printf (": %.2f %s ",$prepaidAccount->balance,$this->currency);
hunk ./library/sip_settings.php 6379
+    // Generic code for all sip settings pages
hunk ./library/sip_settings.php 6382
-	// Generic code for all sip settings pages
hunk ./library/sip_settings.php 6389
+    }
+
+    if ($_REQUEST['action']=="save settings") {
+        if ($SipSettings->checkSettings()) {
+            $SipSettings->saveSettings();
+            unset($SipSettings);
+            $SipSettings = new $SipSettings_class($account,$login_credentials,$soapEngines);
+
+        } else {
+            print "<font color=red>";
+            printf (_("Error: %s"),$SipSettings->error);
+            print "</font>";
+        }
+    } else if ($_REQUEST['action']=="set diversions") {
+        $SipSettings->setDiversions();
+        unset($SipSettings);
+        $SipSettings = new $SipSettings_class($account,$login_credentials,$soapEngines);
+    } else if ($_REQUEST['action']=="set barring") {
+        $SipSettings->setBarringPrefixes();
+    } else if ($_REQUEST['action']=="set presence") {
+        $SipSettings->setPresence();
+    } else if ($_REQUEST['action']=="set reject") {
+        $SipSettings->setRejectMembers();
+    } else if ($_REQUEST['action']=="set accept rules") {
+        $SipSettings->setAcceptRules();
+    } else if ($_REQUEST['action']=="set aliases") {
+        $SipSettings->setAliases();
+    } else if ($_REQUEST['action']=="send email") {
+        $SipSettings->sendEmail();
+    } else if ($_REQUEST['action']=="crt") {
+        $SipSettings->exportCertificateX509();
+        return true;
+    } else if ($_REQUEST['action']=="p12") {
+        $SipSettings->exportCertificateP12();
+        return true;
+    } else if ($_REQUEST['action']=="prepaid") {
+        $SipSettings->exportBalanceHistory();
+        return true;
+    } else if ($_REQUEST['action'] == 'diversions') {
+        $SipSettings->getDiversions();
+        print json_encode($SipSettings->diversions);
+        return true;
+    } else if ($_REQUEST['action'] == 'prepaid') {
+        $SipSettings->getPrepaidStatus();
+        print json_encode($SipSettings->prepaidAccount);
+        return true;
+    } else if ($_REQUEST['action'] == 'monthly_usage') {
+        $SipSettings->getCallStatistics();
+        print json_encode($SipSettings->thisMonth);
+        return true;
+    } else if ($_REQUEST['action'] == 'balance_history') {
+        $SipSettings->getBalanceHistory();
+        print json_encode($SipSettings->balance_history);
+        return true;
+    } else if ($_REQUEST['action'] == 'accept'){
+        $SipSettings->getAcceptRules();
+        print json_encode($SipSettings->acceptRules);
+        return true;
+    } else if ($_REQUEST['action'] == 'reject'){
+        $SipSettings->getRejectMembers();
+        print json_encode($SipSettings->rejectMembers);
+        return true;
+    } else if ($_REQUEST['action'] == 'calls'){
+        $SipSettings->getCalls();
+        print json_encode($SipSettings->call_history);
+        return true;
+    } else if ($_REQUEST['action'] == 'voicemail'){
+        $SipSettings->getVoicemail();
+        print json_encode($SipSettings->voicemail);
+        return true;
+    } else if ($_REQUEST['action'] == 'aliases'){
+        $SipSettings->getAliases();
+        print json_encode($SipSettings->aliases);
+        return true;
+    } else if ($_REQUEST['action'] == 'enum'){
+        $SipSettings->getEnumMappings();
+        print json_encode($SipSettings->enums);
+        return true;
+    } else if ($_REQUEST['action'] == 'account'){
+        $account=array('email'         => $SipSettings->email,
+                       'first'         => $SipSettings->firstName,
+                       'lastname'      => $SipSettings->lastName,
+                       'mobile_number' => $SipSettings->mobile_number,
+                       'pstn_access'   => $SipSettings->pstn_access,
+                       'prepaid'       => $SipSettings->prepaid,
+                       'quota'         => $SipSettings->quota,
+                       'timezone'      => $SipSettings->timezone,
+                       'groups'        => $SipSettings->groups
+                       );
+        print json_encode($account);
+        return true;
+    } else if ($_REQUEST['action'] == 'dnd_on'){
+        $SipSettings->getAcceptRules();
+        $SipSettings->acceptRules['temporary']=array('groups'   =>array('nobody'),
+                                                     'duration' =>intval($_REQUEST['duration'])
+                                                     );
+        $SipSettings->SipPort->addHeader($SipSettings->SoapAuth);
+        $result     = $SipSettings->SipPort->setAcceptRules($SipSettings->sipId,$SipSettings->acceptRules);
+
+        if (PEAR::isError($result)) {
+            $error_msg  = $result->getMessage();
+            $error_fault= $result->getFault();
+            $error_code = $result->getCode();
+            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_ret=false;
+        } else {
+            $_ret=true;
+            if (intval($_REQUEST['duration'] > 0)) {
+                $_msg=sprintf('Do not disturb has been enabled for %d minutes',intval($_REQUEST['duration']));
+            } else {
+                $_msg=sprintf('Do not disturb has been enabled');
+            }
+        }
+
+        $return=array('success'       => $_ret,
+                      'error_message' => $_msg
+                      );
+        print (json_encode($return));
+        return true;
+    } else if ($_REQUEST['action'] == 'dnd_off'){
+        $SipSettings->getAcceptRules();
+        $SipSettings->acceptRules['temporary']=array('groups'   =>array('everybody'),
+                                                     'duration' =>0
+                                                     );
+        $SipSettings->SipPort->addHeader($SipSettings->SoapAuth);
+        $result     = $SipSettings->SipPort->setAcceptRules($SipSettings->sipId,$SipSettings->acceptRules);
+
+        if (PEAR::isError($result)) {
+            $error_msg  = $result->getMessage();
+            $error_fault= $result->getFault();
+            $error_code = $result->getCode();
+            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_ret=false;
+        } else {
+            $_ret=true;
+            $_msg=sprintf('Do not disturb has been disabled');
+        }
+
+        $return=array('success'       => $_ret,
+                      'error_message' => $_msg
+                      );
+        print (json_encode($return));
+        return true;
+    } else if ($_REQUEST['action'] == 'privacy_on'){
+        $SipSettings->SipPort->addHeader($SipSettings->SoapAuth);
+        $result     = $SipSettings->SipPort->addToGroup(array("username" => $SipSettings->username,"domain"=> $SipSettings->domain),"anonymous");
+
+        if (PEAR::isError($result)) {
+            $error_msg  = $result->getMessage();
+            $error_fault= $result->getFault();
+            $error_code = $result->getCode();
+            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_ret=false;
+        } else {
+            $_ret=true;
+            $_msg=sprintf('Caller Id is now hidden for outgoing calls');
+        }
+
+        $return=array('success'       => $_ret,
+                      'error_message' => $_msg
+                      );
+        print (json_encode($return));
+        return true;
+    } else if ($_REQUEST['action'] == 'privacy_off'){
+        $SipSettings->SipPort->addHeader($SipSettings->SoapAuth);
+        $result     = $SipSettings->SipPort->removeFromGroup(array("username" => $SipSettings->username,"domain"=> $SipSettings->domain),"anonymous");
+
+        if (PEAR::isError($result)) {
+            $error_msg  = $result->getMessage();
+            $error_fault= $result->getFault();
+            $error_code = $result->getCode();
+            if ($error_fault->detail->exception->errorcode == 1031) {
+                $_ret=true;
+                $_msg=sprintf('Caller Id is now visible for outgoing calls');
+            } else {
+                $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                $_ret=false;
+            }
+        } else {
+            $_ret=true;
+            $_msg=sprintf('Caller Id is now visible for outgoing calls');
+        }
+
+        $return=array('success'       => $_ret,
+                      'error_message' => $_msg
+                      );
+        print (json_encode($return));
+        return true;
+    } else if ($_REQUEST['action'] == 'add_alias'){
+        $SipSettings->SipPort->addHeader($SipSettings->SoapAuth);
+
+        $username=trim($_REQUEST['username']);
+
+        if (!strlen($username)) {
+            $return=array('success'       => false,
+                          'error_message' => 'Error: missing username'
+                          );
+            print (json_encode($return));
+            return false;
+        }
+
+        $_aliasObject=array("id"=>array("username"=>strtolower($username),
+                                        "domain"=>$SipSettings->domain
+                                        ),
+                            "owner" => intval($SipSettings->owner),
+                            "target"=> array("username" => $SipSettings->username,"domain"=> $SipSettings->domain)
+                            )
+                            ;
+
+        $result     = $SipSettings->SipPort->addAlias($_aliasObject);
+
+        if (PEAR::isError($result)) {
+            $error_msg  = $result->getMessage();
+            $error_fault= $result->getFault();
+            $error_code = $result->getCode();
+            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_ret=false;
+        } else {
+            $_ret=true;
+            $_msg=sprintf('Added alias %s',strtolower($username));
+        }
+
+        $return=array('success'       => $_ret,
+                      'error_message' => $_msg
+                      );
+        print (json_encode($return));
+        return true;
+    } else if ($_REQUEST['action'] == 'set_diversions') {
+        $SipSettings->SipPort->addHeader($SipSettings->SoapAuth);
+        $result     = $SipSettings->SipPort->getCallDiversions($SipSettings->sipId);
+
+        if (PEAR::isError($result)) {
+            $error_msg  = $result->getMessage();
+            $error_fault= $result->getFault();
+            $error_code = $result->getCode();
+            $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+            $_ret=false;
+            $return=array('success'       => $_ret,
+                          'error_message' => $_msg
+                          );
+            print (json_encode($return));
+            return true;
+
+        }
+
+        $SipSettings->getVoicemail();
+
+        foreach(array_keys($SipSettings->diversionType) as $condition) {
+            $old_diversions[$condition]=$result->$condition;
+        }
+
+		$_log='';
+        foreach(array_keys($old_diversions) as $key) {
+
+            if (isset($_REQUEST[$key])) {
+	        	$textboxURI=$_REQUEST[$key];
+				
+                if ($textboxURI && $textboxURI != "<voice-mailbox>" && !preg_match("/@/",$textboxURI)) {
+                    $textboxURI=$textboxURI."@".$SipSettings->domain;
+                }
hunk ./library/sip_settings.php 6650
-        if ($_REQUEST['action']=="save settings") {
-            if ($SipSettings->checkSettings()) {
-                $SipSettings->saveSettings();
-                unset($SipSettings);
-                $SipSettings = new $SipSettings_class($account,$login_credentials,$soapEngines);
+                if (preg_match("/^([\+|0].*)@/",$textboxURI,$m))  {
+                    $textboxURI=$m[1]."@".$SipSettings->domain;
+                }
+
+                if (strlen($textboxURI) && !preg_match("/^sip:/",$textboxURI))  {
+                    $textboxURI='sip:'.$textboxURI;
+                }
+
+                if ($textboxURI) {
+                    $new_diversions[$key]=$textboxURI;
+                }
+
+                $_log.=sprintf("%s=%s ",$key,$textboxURI);
+                $divert_changed=true;
hunk ./library/sip_settings.php 6666
-                print "<font color=red>";
-                printf (_("Error: %s"),$SipSettings->error);
-                print "</font>";
+                if ($old_diversions[$key]) {
+            		$new_diversions[$key]=$old_diversions[$key];
+                }
hunk ./library/sip_settings.php 6670
-        } else if ($_REQUEST['action']=="set diversions") {
-            $SipSettings->setDiversions();
-            unset($SipSettings);
-            $SipSettings = new $SipSettings_class($account,$login_credentials,$soapEngines);
-        } else if ($_REQUEST['action']=="set barring") {
-            $SipSettings->setBarringPrefixes();
-        } else if ($_REQUEST['action']=="set presence") {
-            $SipSettings->setPresence();
-        } else if ($_REQUEST['action']=="set reject") {
-            $SipSettings->setRejectMembers();
-        } else if ($_REQUEST['action']=="set accept rules") {
-            $SipSettings->setAcceptRules();
-        } else if ($_REQUEST['action']=="set aliases") {
-            $SipSettings->setAliases();
-        } else if ($_REQUEST['action']=="send email") {
-            $SipSettings->sendEmail();
hunk ./library/sip_settings.php 6671
+
+        if ($divert_changed) {
+            $SipSettings->SipPort->addHeader($SipSettings->SoapAuth);
+            $result     = $SipSettings->SipPort->setCallDiversions($SipSettings->sipId,$new_diversions);
hunk ./library/sip_settings.php 6676
-        $SipSettings->showAccount();
+            if (PEAR::isError($result)) {
+                $error_msg  = $result->getMessage();
+                $error_fault= $result->getFault();
+                $error_code = $result->getCode();
+                $_msg=sprintf ("Error (SipPort): %s (%s): %s",$error_msg, $error_fault->detail->exception->errorcode,$error_fault->detail->exception->errorstring);
+                $_ret=false;
+            } else {
+                $_ret=true;
+                $_msg=sprintf('Changed diversions %s',$_log);
+            }
+
+            $return=array('success'       => $_ret,
+                          'error_message' => $_msg
+                          );
+            print (json_encode($return));
+            return true;
+        } else {
+            $return=array('success'       => true,
+                          'error_message' => 'Diversions remained the same'
+                          );
+            print (json_encode($return));
+            return true;
+        }
+
+    } else if ($_REQUEST['action']) {
+        $return=array('success'       => false,
+                      'error_message' => "Error: invalid action"
+                      );
+        print (json_encode($return));
+        return false;
+    }
hunk ./library/sip_settings.php 6708
+    if (!$_REQUEST['export']) {
+        $SipSettings->showAccount();
+    
hunk ./library/sip_settings.php 6715
-    
-    } else {
-        if ($_REQUEST['action']=="crt") {
-            $SipSettings->exportCertificateX509();
-        } else if ($_REQUEST['action']=="p12") {
-            $SipSettings->exportCertificateP12();
-        } else if ($_REQUEST['tab']=="prepaid") {
-            $SipSettings->exportBalanceHistory();
-        } else if ($_REQUEST['action'] == 'diversions') {
-            $SipSettings->getDiversions();
-            print json_encode($SipSettings->diversions);
-        } else if ($_REQUEST['action'] == 'prepaid') {
-            $SipSettings->getPrepaidStatus();
-            print json_encode($SipSettings->prepaidAccount);
-        } else if ($_REQUEST['action'] == 'monthly_usage') {
-            $SipSettings->getCallStatistics();
-            print json_encode($SipSettings->thisMonth);
-        } else if ($_REQUEST['action'] == 'balance_history') {
-            $SipSettings->getBalanceHistory();
-            print json_encode($SipSettings->balance_history);
-        } else if ($_REQUEST['action'] == 'accept'){
-            $SipSettings->getAcceptRules();
-            print json_encode($SipSettings->acceptRules);
-        } else if ($_REQUEST['action'] == 'reject'){
-            $SipSettings->getRejectMembers();
-            print json_encode($SipSettings->rejectMembers);
-        } else if ($_REQUEST['action'] == 'calls'){
-            $SipSettings->getCalls();
-            print json_encode($SipSettings->call_history);
-        } else if ($_REQUEST['action'] == 'voicemail'){
-            $SipSettings->getVoicemail();
-            print json_encode($SipSettings->voicemail);
-        } else if ($_REQUEST['action'] == 'aliases'){
-            $SipSettings->getAliases();
-            print json_encode($SipSettings->aliases);
-        } else if ($_REQUEST['action'] == 'enum'){
-            $SipSettings->getEnumMappings();
-            print json_encode($SipSettings->enums);
-        } else if ($_REQUEST['action'] == 'account'){
-            $account=array('email'         => $SipSettings->email,
-                           'first'         => $SipSettings->firstName,
-                           'lastname'      => $SipSettings->lastName,
-                           'mobile_number' => $SipSettings->mobile_number,
-                           'pstn_access'   => $SipSettings->pstn_access,
-                           'prepaid'       => $SipSettings->prepaid,
-                           'quota'         => $SipSettings->quota,
-                           'timezone'      => $SipSettings->timezone,
-                           'groups'        => $SipSettings->groups
-                           );
-            print json_encode($account);
-        } else {
-            print "Error: invalid action";
-        }
hunk ./library/sip_settings.php 6718
-class AccountEnrollment {
+class Enrollment {
hunk ./library/sip_settings.php 6721
-    function AccountEnrollment() {
+    function Enrollment() {
hunk ./library/sip_settings.php 6749
-        $this->sipDomain    = $this->enrollment['sip_domain'];
-		$this->sipEngine    = $this->enrollment['sip_engine'];
-		$this->reseller     = $this->enrollment['reseller'];
+        $this->sipDomain      = $this->enrollment['sip_domain'];
+		$this->sipEngine      = $this->enrollment['sip_engine'];
+		$this->reseller       = $this->enrollment['reseller'];
+
+        $this->outbound_proxy = $this->enrollment['outbound_proxy'];
+        $this->xcap_root      = $this->enrollment['xcap_root'];
hunk ./library/sip_settings.php 6787
-    function add() {
+    function createAccount() {
hunk ./library/sip_settings.php 6854
-        	if (!$identity = $this->generateCertificate($sip_address,$_REQUEST['email'],$_REQUEST['password'])) {
+        	if (!$passport = $this->generateCertificate($sip_address,$_REQUEST['email'],$_REQUEST['password'])) {
hunk ./library/sip_settings.php 6873
-
-            $return=array('success'       => true,
-                          'sip_address'   => $sip_address,
-                          'email'         => $result->email,
-                          'passport'      => $identity
+            $return=array('success'        => true,
+                          'sip_address'    => $sip_address,
+                          'email'          => $result->email,
+                          'passport'       => $passport,
+                          'outbound_proxy' => $this->outbound_proxy,
+                          'xcap_root'      => $this->xcap_root
hunk ./setup/enrollment/config.ini 13
-    		  'organizationalUnitName' => 'N/A'
+    		  'organizationalUnitName' => 'N/A',
+                  'outbound_proxy'         => 'sip.example.com',
+                  'xcap_root'              => 'https://xcap.example.com/xcap-root/'
hunk ./setup/ngnpro_engines.inc.sample 35
+                                         'enrollment_url'      => 'https://enrollment.example.com/',
+                                         'sip_settings_api_url'=> 'https://wiki.example.com',
hunk ./style.css 238
-.border2     	{ border: 1px solid #000000; border-collapse: collapse }
+.border2     	{ border: 1px solid #000000; 
+                  border-collapse: collapse; 
+                  padding: 1px, 1px, 1px, 1px;
+                  -webkit-border-radius: 3px;
+                  }