[Improved settings of various sip related pages
Adrian Georgescu <ag@ag-projects.com>**20110320130935
 Ignore-this: a2bd2dcd7f1ece637abdd6502cac65fe
] hunk ./library/ngnpro_client.php 464
-            if (strlen($this->soapEngines[$this->soapEngine]['blink_settings_page'])) {
-                $this->blink_settings_page=$this->soapEngines[$this->soapEngine]['blink_settings_page'];
+            if (strlen($this->soapEngines[$this->soapEngine]['digest_settings_page'])) {
+                $this->digest_settings_page=$this->soapEngines[$this->soapEngine]['digest_settings_page'];
hunk ./library/ngnpro_client.php 722
-        if (strlen($this->SoapEngine->blink_settings_page)) {
-            $this->blink_settings_page=$this->SoapEngine->blink_settings_page;
+        if (strlen($this->SoapEngine->digest_settings_page)) {
+            $this->digest_settings_page=$this->SoapEngine->digest_settings_page;
hunk ./library/ngnpro_client.php 11103
-                                 'blink_settings_page' => array('name'      => 'Blink Settings Page',
+                                 'digest_settings_page' => array('name'     => 'Settings Page (Digest Auth)',
hunk ./library/sip_settings.php 14
-
hunk ./library/sip_settings.php 38
-    var $blink_settings_page       = "https://cdrtool.example.com/sip_settings_digest.phtml";
hunk ./library/sip_settings.php 62
-    var $show_download_tab  = true;
+    var $show_tls_section   = false;
hunk ./library/sip_settings.php 73
+    var $show_download_tab    = 'Blink';     // set it to name of the tab or false to disable it
+    var $digest_settings_page = "https://blink.sipthor.net/settings.phtml";
+
hunk ./library/sip_settings.php 169
+    var $enrollment_configuration = "/etc/cdrtool/enrollment/config.ini";
+
hunk ./library/sip_settings.php 363
-        	$this->tabs['download'] = 'Blink';
+        	$this->tabs['download'] = $this->show_download_tab;
hunk ./library/sip_settings.php 541
-        if (strlen($this->soapEngines[$this->sip_engine]['blink_settings_page'])) {
-            $this->blink_settings_page = $this->soapEngines[$this->sip_engine]['blink_settings_page'];
+        if (strlen($this->soapEngines[$this->sip_engine]['digest_settings_page'])) {
+            $this->digest_settings_page = $this->soapEngines[$this->sip_engine]['digest_settings_page'];
hunk ./library/sip_settings.php 1567
-        if ($this->resellerProperties['blink_settings_page']) {
-            $this->blink_settings_page = $this->resellerProperties['blink_settings_page'];
+        if ($this->resellerProperties['digest_settings_page']) {
+            $this->digest_settings_page = $this->resellerProperties['digest_settings_page'];
hunk ./library/sip_settings.php 2483
-        if (!$this->isEmbedded()) {
+        if (!$this->isEmbedded() && $this->show_tls_section) {
hunk ./library/sip_settings.php 2486
-                include("/etc/cdrtool/enrollment/config.ini");
+                include($this->enrollment_configuration);
hunk ./library/sip_settings.php 2491
-                    if ($this->sip_settings_api_url) {
-                        /*
-                        print "
-                        <tr>
-                        <td colspan=2>";
-                        printf (_("The certificate is used for accessing <a href=%s target=sip_api>SIP Settings API</a>"),$this->sip_settings_api_url);
-                        printf ("
-                        </td>
-                        </tr>
-                        ");
-                        */
-                    }
-    
-                    print "
-                    <tr>
-                    <td>";
-                    print _("X.509 Format");
-                    printf ("
-                    </td>
-                    <td><a href=%s&action=get_crt>%s.crt</a>
-                    </td>
-                    </tr>
-                    ",$this->url, $this->account);
-
-                    /*
-                    print "
-                    <tr>
-                    <td>";
-                    print _("PKCS#12 store format");
-                    printf ("
-                    </td>
-                    <td><a href=%s&action=get_p12>%s.p12</a>
-                    </td>
-                    </tr>
-                    <tr>
-                      <td height=3 colspan=2></td>
-                    </tr>",$this->url, $this->account);
-                    */
-
-                }
-            }
-        }
-
-        if (!$this->isEmbedded()) {
-
-            if ($this->enrollment_url) {
-                include("/etc/cdrtool/enrollment/config.ini");
-    
-                if (is_array($enrollment)) {
-                    $chapter=sprintf(_("TLS Certificate"));
-                    $this->showChapter($chapter);
-                    if ($this->sip_settings_api_url) {
-                        /*
-                        print "
-                        <tr>
-                        <td colspan=2>";
-                        printf (_("The certificate is used for accessing <a href=%s target=sip_api>SIP Settings API</a>"),$this->sip_settings_api_url);
-                        printf ("
-                        </td>
-                        </tr>
-                        ");
-                        */
-                    }
-    
hunk ./library/sip_settings.php 2846
-        $_account['settings_url']   = $this->blink_settings_page;
+        $_account['settings_url']   = $this->digest_settings_page;
hunk ./library/sip_settings.php 8625
-    var $init=false;
+    var $init                       = false;
hunk ./library/sip_settings.php 8632
+    var $configuration_file         = '/etc/cdrtool/enrollment/config.ini';
hunk ./library/sip_settings.php 8636
-        include("/etc/cdrtool/enrollment/config.ini");
-        include("/etc/cdrtool/ngnpro_engines.inc");
+        require($this->configuration_file);
+        require("/etc/cdrtool/ngnpro_engines.inc");