[Renamed variables Adrian Georgescu **20080105125237] hunk ./provisioning/ngnpro_client_lib.phtml 20 - 'loginType' => 'admin', - 'reseller' => $reseller, - 'customer' => $customer, - 'extraFormElements' => array() + 'login_type' => 'admin', + 'reseller' => $reseller, + 'customer' => $customer, + 'extra_form_elements' => array() hunk ./provisioning/ngnpro_client_lib.phtml 27 - 'loginType' => 'reseller', - 'soapUsername' => $soapUsername, - 'soapPassword' => $soapPassword, - 'reseller' => $reseller, - 'customer' => $customer, - 'extraFormElements' => array() + 'login_type' => 'reseller', + 'soap_username' => $soapUsername, + 'soap_password' => $soapPassword, + 'reseller' => $reseller, + 'customer' => $customer, + 'extra_form_elements' => array() hunk ./provisioning/ngnpro_client_lib.phtml 126 - var $loginType = 'reseller'; + var $login_type = 'reseller'; hunk ./provisioning/ngnpro_client_lib.phtml 297 - if ($this->loginCredentials['loginType'] == 'admin') $this->adminonly = 1; + if ($this->loginCredentials['login_type'] == 'admin') $this->adminonly = 1; hunk ./provisioning/ngnpro_client_lib.phtml 299 - if (strlen($this->loginCredentials['soapFilter'])) { - $this->soapEngines = $this->getSoapEngineAllowed($soapEngines,$this->loginCredentials['soapFilter']); + if (strlen($this->loginCredentials['soap_filter'])) { + $this->soapEngines = $this->getSoapEngineAllowed($soapEngines,$this->loginCredentials['soap_filter']); hunk ./provisioning/ngnpro_client_lib.phtml 319 - $this->extraFormElements = $this->loginCredentials['extraFormElements']; + $this->extraFormElements = $this->loginCredentials['extra_form_elements']; hunk ./provisioning/ngnpro_client_lib.phtml 396 - if (strlen($loginCredentials['soapUsername']) && $this->version > 1) { - $this->soapUsername=$loginCredentials['soapUsername']; + if (strlen($loginCredentials['soap_username']) && $this->version > 1) { + $this->soapUsername=$loginCredentials['soap_username']; hunk ./provisioning/ngnpro_client_lib.phtml 400 - "password" => $loginCredentials['soapPassword'], + "password" => $loginCredentials['soap_password'], hunk ./provisioning/ngnpro_client_lib.phtml 3352 - if ($this->loginCredentials['resellerFilters'][$range->reseller]['record_generator']) { - $generator_link=sprintf('G',$this->url,$this->loginCredentials['resellerFilters'][$range->reseller]['record_generator'],$range->id->prefix,$range->id->tld,$range->maxDigits,$range->reseller); + if ($this->loginCredentials['reseller_filters'][$range->reseller]['record_generator']) { + $generator_link=sprintf('G',$this->url,$this->loginCredentials['reseller_filters'][$range->reseller]['record_generator'],$range->id->prefix,$range->id->tld,$range->maxDigits,$range->reseller); hunk ./provisioning/ngnpro_client_lib.phtml 7819 - if ($this->loginCredentials['loginType'] == 'admin') { + if ($this->loginCredentials['login_type'] == 'admin') { hunk ./provisioning/ngnpro_client_lib.phtml 7827 - } else if ($this->loginCredentials['loginType'] == 'reseller') { + } else if ($this->loginCredentials['login_type'] == 'reseller') { hunk ./provisioning/ngnpro_client_lib.phtml 7853 - if ($this->loginCredentials['loginType'] == 'admin') { + if ($this->loginCredentials['login_type'] == 'admin') { hunk ./provisioning/ngnpro_client_lib.phtml 7875 - } else if ($this->loginCredentials['loginType'] == 'reseller') { + } else if ($this->loginCredentials['login_type'] == 'reseller') { hunk ./provisioning/ngnpro_client_lib.phtml 8653 - if (strlen($this->loginCredentials['soapFilter'])) { - $this->soapEngines = $this->getSoapEngineAllowed($soapEngines,$this->loginCredentials['soapFilter']); + if (strlen($this->loginCredentials['soap_filter'])) { + $this->soapEngines = $this->getSoapEngineAllowed($soapEngines,$this->loginCredentials['soap_filter']); hunk ./provisioning/sip_settings_lib.phtml 15 - var $loginType = 'subscriber'; + var $login_type = 'subscriber'; hunk ./provisioning/sip_settings_lib.phtml 26 - var $proxy = "proxy.example.com"; hunk ./provisioning/sip_settings_lib.phtml 33 + var $proxy = "proxy.example.com"; hunk ./provisioning/sip_settings_lib.phtml 113 - if ($loginCredentials['loginType']) { - $this->loginType = $loginCredentials['loginType']; + if ($loginCredentials['login_type']) { + $this->login_type = $loginCredentials['login_type']; hunk ./provisioning/sip_settings_lib.phtml 117 - if ($this->loginType == "admin") { + if ($this->login_type == "admin") { hunk ./provisioning/sip_settings_lib.phtml 133 - if (strlen($loginCredentials['soapEngine'])) { - $this->soapEngine=$loginCredentials['soapEngine']; + if (strlen($loginCredentials['soap_engine'])) { + $this->soapEngine=$loginCredentials['soap_engine']; hunk ./provisioning/sip_settings_lib.phtml 146 - if ($this->loginType == "admin") { + if ($this->login_type == "admin") { hunk ./provisioning/sip_settings_lib.phtml 155 - } else if ($this->loginType == "reseller") { + } else if ($this->login_type == "reseller") { hunk ./provisioning/sip_settings_lib.phtml 655 - if ($this->loginType == 'reseller') { + if ($this->login_type == 'reseller') { hunk ./provisioning/sip_settings_lib.phtml 657 - } else if ($this->loginType == 'subscriber') { + } else if ($this->login_type == 'subscriber') { hunk ./provisioning/sip_settings_lib.phtml 991 - if ($this->loginType == 'subscriber') { + if ($this->login_type == 'subscriber') { hunk ./provisioning/sip_settings_lib.phtml 1672 - if ($this->loginType != 'subscriber' && in_array("free-pstn",$this->groups)) { + if ($this->login_type != 'subscriber' && in_array("free-pstn",$this->groups)) { hunk ./provisioning/sip_settings_lib.phtml 1724 - if ($this->loginType == 'subscriber' && !$this->SIPACLS[$key]['SubscriberMaySeeIt']) { + if ($this->login_type == 'subscriber' && !$this->SIPACLS[$key]['SubscriberMaySeeIt']) { hunk ./provisioning/sip_settings_lib.phtml 1740 - if ($this->loginType == 'subscriber' && !$checked_box[$key] && $key=="free-pstn") { + if ($this->login_type == 'subscriber' && !$checked_box[$key] && $key=="free-pstn") { hunk ./provisioning/sip_settings_lib.phtml 1747 - if ($this->loginType == 'subscriber') { + if ($this->login_type == 'subscriber') { hunk ./provisioning/sip_settings_lib.phtml 1768 - if ($this->loginType != 'subscriber') { + if ($this->login_type != 'subscriber') { hunk ./provisioning/sip_settings_lib.phtml 1788 - if ($this->loginType != 'subscriber') { + if ($this->login_type != 'subscriber') { hunk ./provisioning/sip_settings_lib.phtml 1904 - ($this->loginType == 'admin' || $this->loginType == 'reseller')) { + ($this->login_type == 'admin' || $this->login_type == 'reseller')) { hunk ./provisioning/sip_settings_lib.phtml 1982 - if ($this->loginType == 'admin' || $this->loginType == 'reseller') { + if ($this->login_type == 'admin' || $this->login_type == 'reseller') { hunk ./provisioning/sip_settings_lib.phtml 2305 - if ($this->loginType != 'subscriber') { + if ($this->login_type != 'subscriber') { hunk ./provisioning/sip_settings_lib.phtml 2346 - if ($this->loginType != 'subscriber' || $this->SIPACLS[$key]['SubscriberMayEditIt']) { + if ($this->login_type != 'subscriber' || $this->SIPACLS[$key]['SubscriberMayEditIt']) { hunk ./provisioning/sip_settings_lib.phtml 2377 - if ($this->loginType == 'subscriber') {; + if ($this->login_type == 'subscriber') {; hunk ./provisioning/sip_settings_lib.phtml 2488 - if ($this->loginType != 'subscriber' && $this->voicemail['Account'] && !$this->createdVoicemailnow) { + if ($this->login_type != 'subscriber' && $this->voicemail['Account'] && !$this->createdVoicemailnow) { hunk ./provisioning/sip_settings_lib.phtml 5671 - if ($this->loginType != 'admin' && $this->loginType != 'reseller' || !in_array("free-pstn",$this->groups)) { + if ($this->login_type != 'admin' && $this->login_type != 'reseller' || !in_array("free-pstn",$this->groups)) { hunk ./provisioning/sip_settings_lib.phtml 5710 - if ($this->loginType != 'admin' && $this->loginType != 'reseller') { + if ($this->login_type != 'admin' && $this->login_type != 'reseller') { hunk ./provisioning.phtml 49 - 'loginType' => 'admin' + 'login_type' => 'admin' hunk ./provisioning.phtml 57 - 'loginType' => 'admin' + 'login_type' => 'admin' hunk ./provisioning.phtml 61 - 'loginType' => 'admin' + 'login_type' => 'admin' hunk ./provisioning.phtml 80 - $loginCredentials['soapFilter'] = $resellerFilters[$loginCredentials['reseller']]['soapFilter']; + $loginCredentials['soap_filter'] = $resellerFilters[$loginCredentials['reseller']]['soap_filter']; hunk ./provisioning.phtml 83 - $loginCredentials['soapFilter'] = $resellerFilters['default']['soapFilter']; + $loginCredentials['soap_filter'] = $resellerFilters['default']['soap_filter']; hunk ./provisioning.phtml 87 -$loginCredentials['resellerFilters'] = $resellerFilters; +$loginCredentials['reseller_filters'] = $resellerFilters; hunk ./sip_settings.phtml 40 - 'loginType' => 'admin', + 'login_type' => 'admin',