[Improved look and feel of SIP settings page Adrian Georgescu **20091101115835] hunk ./header_sip.phtml 14 -printf (" - -"); +printf (""); + +//print ""); +print ""); hunk ./library/sip_settings.php 4 - Copyright (c) 2007-2008 AG Projects + Copyright (c) 2007-2009 AG Projects hunk ./library/sip_settings.php 149 - if ($_SERVER[SSL_CLIENT_CERT]) { + if ($this->isEmbedded()) { hunk ./library/sip_settings.php 183 - //dprint("Using engine: $this->sip_engine"); - hunk ./library/sip_settings.php 184 - $this->tab = $_REQUEST['tab']; + if ($_REQUEST['tab']) { + $this->tab = $_REQUEST['tab']; + } else { + $this->tab = 'calls'; + } hunk ./library/sip_settings.php 223 - if (!$_SERVER[SSL_CLIENT_CERT]) { + if (!$this->isEmbedded()) { hunk ./library/sip_settings.php 772 - if ($this->tab=="locations") $this->showLocationsTab(); + if ($this->tab=="locations") $this->showDevicesTab(); hunk ./library/sip_settings.php 774 - if ($this->tab=="phonebook") $this->showPhonebookTab(); - if ($this->tab=="prepaid") $this->showPrepaidTab(); + if ($this->tab=="phonebook") $this->showContactsTab(); + if ($this->tab=="prepaid") $this->showCreditTab(); hunk ./library/sip_settings.php 1105 - if ($this->login_type == 'subscriber' && !$_SERVER[SSL_CLIENT_CERT]) { + if ($this->login_type == 'subscriber' && !$this->isEmbedded()) { hunk ./library/sip_settings.php 1520 - $tabcolor="orange"; - $fontcolor="white"; + $_class='selected_tab'; hunk ./library/sip_settings.php 1522 - $tabcolor="#4A69A5"; - $fontcolor="white"; + $_class='tab'; hunk ./library/sip_settings.php 1524 - print " "; - print "url&tab=$k>$v"; - print " "; + print "url&tab=$k>$v"; hunk ./library/sip_settings.php 1614 - XCAP Root + "; + print _("XCAP Root"); + print " hunk ./library/sip_settings.php 1624 - if ($this->pstn_access) { + if ($this->pstn_access && $this->rpid) { hunk ./library/sip_settings.php 1630 - Caller Id + "; + print _("Caller Id"); + print " hunk ./library/sip_settings.php 1643 - Phone Number + "; + print _("Phone Number"); + print " hunk ./library/sip_settings.php 1664 - /* - if (!$t) { - print " - - Phone Number - "; - print _("None"); - print " - - - "; - } - */ hunk ./library/sip_settings.php 1676 - print _("SIP address"); + print _("SIP Alias"); hunk ./library/sip_settings.php 1687 - print _("New SIP Address"); + print _("New SIP Alias"); hunk ./library/sip_settings.php 1716 - - if ($this->enrollment_url) { - include("/etc/cdrtool/enrollment/config.ini"); + if (!$this->isEmbedded()) { + if ($this->enrollment_url) { + include("/etc/cdrtool/enrollment/config.ini"); hunk ./library/sip_settings.php 1720 - if (is_array($enrollment)) { - $chapter=sprintf(_("TLS Certificate")); - $this->showChapter($chapter); - if ($this->sip_settings_api_url) { + if (is_array($enrollment)) { + $chapter=sprintf(_("TLS Certificate")); + $this->showChapter($chapter); + if ($this->sip_settings_api_url) { + print " + + "; + printf (_("The certificate is used for accessing SIP Settings API"),$this->sip_settings_api_url); + printf (" + + + "); + } + + print " + + "; + print _("X.509 PEM format"); + printf (" + + %s.crt + + + ",$this->url, $this->account); hunk ./library/sip_settings.php 1746 - "; - printf (_("The certificate is used for accessing SIP Settings API"),$this->sip_settings_api_url); + "; + print _("PKCS#12 store format"); hunk ./library/sip_settings.php 1750 + %s.p12 + hunk ./library/sip_settings.php 1753 - "); + + + ",$this->url, $this->account); hunk ./library/sip_settings.php 1757 - - print " - - "; - print _("X.509 PEM format"); - printf (" - - %s.crt - - - ",$this->url, $this->account); - print " - - "; - print _("PKCS#12 store format"); - printf (" - - %s.p12 - - - - - ",$this->url, $this->account); hunk ./library/sip_settings.php 1779 - printf (_("Subscriber may login using the SIP credentials at: - %s"),$this->sip_settings_page,$this->sip_settings_page); + printf (_("Login using SIP credentials at %s"),$this->sip_settings_page,$this->sip_settings_page); hunk ./library/sip_settings.php 1819 - /* - $this->getEnumMappings(); - $this->getDivertTargets(); - $this->getDiversions(); - */ - hunk ./library/sip_settings.php 1826 - /* - print " - - "; - print _("Name"); - print " - - "; - - print "$this->firstName $this->lastName"; - - print " - - - "; - - */ - hunk ./library/sip_settings.php 1834 - "; + "; hunk ./library/sip_settings.php 1849 - "; + "; hunk ./library/sip_settings.php 1866 - "; + "; hunk ./library/sip_settings.php 1869 + print _("Enter text to change the current password"); hunk ./library/sip_settings.php 2008 - print _("De-block"); + print _("Un-block"); hunk ./library/sip_settings.php 2050 - Prepaid + "; + print _("Prepaid"); + print " hunk ./library/sip_settings.php 2149 -