[Fixes in sip settings page Adrian Georgescu **20070923094825] hunk ./provisioning/sip_settings_lib.phtml 1373 - /* hunk ./provisioning/sip_settings_lib.phtml 1378 - */ hunk ./provisioning/sip_settings_lib.phtml 1379 - print "password\"> "; + //print "password\"> "; hunk ./provisioning/sip_settings_lib.phtml 1418 - print ": $LocalTime + print ": $LocalTime"; + //dprint_r($this->SIPACLS); + print " hunk ./provisioning/sip_settings_lib.phtml 1525 - if ($this->Preferences['LoggedInAsSubscriber'] && !$this->SIPACLS[$key][SubscriberMaySeeIt]) { + if ($this->Preferences['LoggedInAsSubscriber'] && !$this->SIPACLS[$key]['SubscriberMaySeeIt']) { hunk ./provisioning/sip_settings_lib.phtml 1541 - if (!$this->Preferences['LoggedInAsSubscriber'] && !$checked_box[$key] && $key=="free-pstn") { + if ($this->Preferences['LoggedInAsSubscriber'] && !$checked_box[$key] && $key=="free-pstn") { hunk ./provisioning/sip_settings_lib.phtml 1548 - if (!$this->Preferences['LoggedInAsSubscriber']) { + if ($this->Preferences['LoggedInAsSubscriber']) { hunk ./provisioning/sip_settings_lib.phtml 1572 - } else if ($key=="multi-targets" && in_array("multi-targets",$this->groups)) { - $t=0; - print "$elementComment"; - - print "
"; - - print " - - - - - "; - - foreach($this->multiTargets as $a) { - $t++; - print " - - - - - "; - } - - print "
"; - print _("Target"); - print " -
"; - print _("Target"); - print "$t -
"; - - hunk ./provisioning/sip_settings_lib.phtml 1690 - if (!$this->Preferences['LoggedInAsSubscriber']) { + if ($this->Preferences['LoggedInAsSubscriber']) { hunk ./provisioning/sip_settings_lib.phtml 2319 - hunk ./provisioning/sip_settings_lib.phtml 5384 -// array with mappings between User Agents and images - if (file_exists("phone_images.php")) { - include_once("phone_images.php"); - } else { - $userAgentImages = array("Asterisk" => "asterisk.png", - "AVM FRITZ" => "avm-fritzbox-wlan.png", - "Cisco ATA" => "cisco-ata.png", - "Cisco.*Gateway" => "cisco.png", - "CSCO" => "cisco-7960.png", - "DrayTek" => "draytek-vigor2600vg.png", - "eStara" => "eStara.png", - "Eyebeam" => "eyebeam.png", - "Grandstream" => "handytone.png", - "ipDialog" => "ipDialog.png", - "Linksys" => "linksys-pap2.png", - "Session.*Wave" => "session.png", - "SIPPS" => "sipps.png", - "Sipura" => "spa2000.png", - "sjphone" => "sjphone.png", - "Snom100" => "snom100.png", - "Snom(190|200)" => "snom200.png", - "Snom320" => "snom320.png", - "Snom360" => "snom360.png", - "snomSoft" => "snom360.png", - "Talkin" => "xten.png", - "unidata" => "hitachi-wip5000.png", - "Vizufon" => "vizufon.png", - "voipster" => "zoep.png", - "Windows RTC" => "messenger.png", - "X-Lite" => "xten.png", - "X-PRO" => "xten.png", - "ZyXEL P2000W" => "zyxel-p2000.png", - "-IMVP" => "innomedia-mta5000.png", - "3610\/" => "siemens-3610.png", - "cirpack" => "cirpack.png", - "Brcm-Callctrl" => "webstarepx2203.png", - "Audiocodes-Sip-Gateway-MP" => "audiocodes-mp124.png", - "Nokia" => "nokia.png", - "CopperJet" => "copperjet16162p.png", - "Ekiga" => "ekiga.png" - ); - } + // array with mappings between User Agents and images + $userAgentImages = array( + "Asterisk" => "asterisk.png", + "AVM FRITZ" => "avm-fritzbox-wlan.png", + "Cisco ATA" => "cisco-ata.png", + "Cisco.*Gateway" => "cisco.png", + "CSCO" => "cisco-7960.png", + "DrayTek" => "draytek-vigor2600vg.png", + "eStara" => "eStara.png", + "Eyebeam" => "eyebeam.png", + "Grandstream" => "handytone.png", + "ipDialog" => "ipDialog.png", + "Linksys" => "linksys-pap2.png", + "Session.*Wave" => "session.png", + "SIPPS" => "sipps.png", + "Sipura" => "spa2000.png", + "sjphone" => "sjphone.png", + "Snom100" => "snom100.png", + "Snom(190|200)" => "snom200.png", + "Snom320" => "snom320.png", + "Snom360" => "snom360.png", + "snomSoft" => "snom360.png", + "Talkin" => "xten.png", + "unidata" => "hitachi-wip5000.png", + "Vizufon" => "vizufon.png", + "voipster" => "zoep.png", + "Windows RTC" => "messenger.png", + "X-Lite" => "xten.png", + "X-PRO" => "xten.png", + "ZyXEL P2000W" => "zyxel-p2000.png", + "-IMVP" => "innomedia-mta5000.png", + "3610\/" => "siemens-3610.png", + "cirpack" => "cirpack.png", + "Brcm-Callctrl" => "webstarepx2203.png", + "Audiocodes-Sip" => "audiocodes-mp124.png", + "Nokia" => "nokia.png", + "CopperJet" => "copperjet16162p.png", + "Ekiga" => "ekiga.png" + ); hunk ./sip_settings.phtml 3 -$errorReporting = (E_ALL & ~(E_NOTICE | E_WARNING)); -//$errorReporting = 1; // temporary until warnings are fixed -error_reporting($errorReporting); - hunk ./sip_settings.phtml 16 -set_time_limit(600); -$perm->check("admin"); - hunk ./sip_settings.phtml 17 +if ($verbose) { +for (reset ($HTTP_POST_VARS); list ($k, $v) = each ($HTTP_POST_VARS); ) + if ($v) { + $vars=$vars." ".$k."='".$v."', "; + } + for (reset ($HTTP_GET_VARS); list ($k, $v) = each ($HTTP_GET_VARS); ) + if ($v) { + $vars=$vars." ".$k."='".$v."', "; + } + print_r($vars); +} + +$perm->check("provisioning"); + hunk ./sip_settings.phtml 32 +include_once("provisioning/ngnpro_engines.inc"); hunk ./sip_settings.phtml 37 -