From 70b3629ee54b4cad11cf6eab6bf3c2e29fabddc2 Mon Sep 17 00:00:00 2001 From: Dimitri Date: Fri, 7 Apr 2017 11:52:14 +0200 Subject: [PATCH] replacing constructors --- lib/class.nusoap_base.php | 2 +- lib/class.soap_fault.php | 4 ++-- lib/class.soap_parser.php | 4 ++-- lib/class.soap_server.php | 4 ++-- lib/class.soap_transport_http.php | 4 ++-- lib/class.soap_val.php | 4 ++-- lib/class.soapclient.php | 4 ++-- lib/class.wsdl.php | 4 ++-- lib/class.wsdlcache.php | 2 +- lib/class.xmlschema.php | 4 ++-- lib/nusoap.php | 34 +++++++++++++++---------------- 11 files changed, 35 insertions(+), 35 deletions(-) mode change 100644 => 100755 lib/class.nusoap_base.php mode change 100644 => 100755 lib/class.soap_fault.php mode change 100644 => 100755 lib/class.soap_parser.php mode change 100644 => 100755 lib/class.soap_server.php mode change 100644 => 100755 lib/class.soap_transport_http.php mode change 100644 => 100755 lib/class.soap_val.php mode change 100644 => 100755 lib/class.soapclient.php mode change 100644 => 100755 lib/class.wsdl.php mode change 100644 => 100755 lib/class.wsdlcache.php mode change 100644 => 100755 lib/class.xmlschema.php mode change 100644 => 100755 lib/nusoap.php diff --git a/lib/class.nusoap_base.php b/lib/class.nusoap_base.php old mode 100644 new mode 100755 index 318c6ef..77f6528 --- a/lib/class.nusoap_base.php +++ b/lib/class.nusoap_base.php @@ -222,7 +222,7 @@ class nusoap_base { * * @access public */ - function nusoap_base() { + function __construct() { $this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel']; } diff --git a/lib/class.soap_fault.php b/lib/class.soap_fault.php old mode 100644 new mode 100755 index 1515b50..cb905fe --- a/lib/class.soap_fault.php +++ b/lib/class.soap_fault.php @@ -45,8 +45,8 @@ class nusoap_fault extends nusoap_base { * @param string $faultstring human readable error message * @param mixed $faultdetail detail, typically a string or array of string */ - function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){ - parent::nusoap_base(); + function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){ + parent::__construct(); $this->faultcode = $faultcode; $this->faultactor = $faultactor; $this->faultstring = $faultstring; diff --git a/lib/class.soap_parser.php b/lib/class.soap_parser.php old mode 100644 new mode 100755 index f6932aa..0f4d857 --- a/lib/class.soap_parser.php +++ b/lib/class.soap_parser.php @@ -57,8 +57,8 @@ class nusoap_parser extends nusoap_base { * @param string $decode_utf8 whether to decode UTF-8 to ISO-8859-1 * @access public */ - function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){ - parent::nusoap_base(); + function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true){ + parent::__construct(); $this->xml = $xml; $this->xml_encoding = $encoding; $this->method = $method; diff --git a/lib/class.soap_server.php b/lib/class.soap_server.php old mode 100644 new mode 100755 index 4f1321d..0e5fb39 --- a/lib/class.soap_server.php +++ b/lib/class.soap_server.php @@ -170,8 +170,8 @@ class nusoap_server extends nusoap_base { * @param mixed $wsdl file path or URL (string), or wsdl instance (object) * @access public */ - function nusoap_server($wsdl=false){ - parent::nusoap_base(); + function __construct($wsdl=false){ + parent::__construct(); // turn on debugging? global $debug; global $HTTP_SERVER_VARS; diff --git a/lib/class.soap_transport_http.php b/lib/class.soap_transport_http.php old mode 100644 new mode 100755 index 12043c7..7c654be --- a/lib/class.soap_transport_http.php +++ b/lib/class.soap_transport_http.php @@ -57,8 +57,8 @@ class soap_transport_http extends nusoap_base { * @param boolean $use_curl Whether to try to force cURL use * @access public */ - function soap_transport_http($url, $curl_options = NULL, $use_curl = false){ - parent::nusoap_base(); + function __construct($url, $curl_options = NULL, $use_curl = false){ + parent::__construct(); $this->debug("ctor url=$url use_curl=$use_curl curl_options:"); $this->appendDebug($this->varDump($curl_options)); $this->setURL($url); diff --git a/lib/class.soap_val.php b/lib/class.soap_val.php old mode 100644 new mode 100755 index 4438f5c..753e5bf --- a/lib/class.soap_val.php +++ b/lib/class.soap_val.php @@ -69,8 +69,8 @@ class soapval extends nusoap_base { * @param mixed $attributes associative array of attributes to add to element serialization * @access public */ - function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) { - parent::nusoap_base(); + function __construct($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) { + parent::__construct(); $this->name = $name; $this->type = $type; $this->value = $value; diff --git a/lib/class.soapclient.php b/lib/class.soapclient.php old mode 100644 new mode 100755 index 3361a03..50e628c --- a/lib/class.soapclient.php +++ b/lib/class.soapclient.php @@ -95,8 +95,8 @@ class nusoap_client extends nusoap_base { * @param string $portName optional portName in WSDL document * @access public */ - function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){ - parent::nusoap_base(); + function __construct($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){ + parent::__construct(); $this->endpoint = $endpoint; $this->proxyhost = $proxyhost; $this->proxyport = $proxyport; diff --git a/lib/class.wsdl.php b/lib/class.wsdl.php old mode 100644 new mode 100755 index b7ab216..a81b0a0 --- a/lib/class.wsdl.php +++ b/lib/class.wsdl.php @@ -69,8 +69,8 @@ class wsdl extends nusoap_base { * @param boolean $use_curl try to use cURL * @access public */ - function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){ - parent::nusoap_base(); + function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){ + parent::__construct(); $this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout"); $this->proxyhost = $proxyhost; $this->proxyport = $proxyport; diff --git a/lib/class.wsdlcache.php b/lib/class.wsdlcache.php old mode 100644 new mode 100755 index 9824bb3..a38dcf1 --- a/lib/class.wsdlcache.php +++ b/lib/class.wsdlcache.php @@ -44,7 +44,7 @@ class nusoap_wsdlcache { * @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited * @access public */ - function nusoap_wsdlcache($cache_dir='.', $cache_lifetime=0) { + function __construct($cache_dir='.', $cache_lifetime=0) { $this->fplock = array(); $this->cache_dir = $cache_dir != '' ? $cache_dir : '.'; $this->cache_lifetime = $cache_lifetime; diff --git a/lib/class.xmlschema.php b/lib/class.xmlschema.php old mode 100644 new mode 100755 index 02866bf..fdfc683 --- a/lib/class.xmlschema.php +++ b/lib/class.xmlschema.php @@ -51,8 +51,8 @@ class nusoap_xmlschema extends nusoap_base { * @param string $namespaces namespaces defined in enclosing XML * @access public */ - function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){ - parent::nusoap_base(); + function __construct($schema='',$xml='',$namespaces=array()){ + parent::__construct(); $this->debug('nusoap_xmlschema class instantiated, inside constructor'); // files $this->schema = $schema; diff --git a/lib/nusoap.php b/lib/nusoap.php old mode 100644 new mode 100755 index dac53a8..a619479 --- a/lib/nusoap.php +++ b/lib/nusoap.php @@ -222,7 +222,7 @@ class nusoap_base { * * @access public */ - function nusoap_base() { + function __construct() { $this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel']; } @@ -1038,8 +1038,8 @@ class nusoap_fault extends nusoap_base { * @param string $faultstring human readable error message * @param mixed $faultdetail detail, typically a string or array of string */ - function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){ - parent::nusoap_base(); + function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){ + parent::__construct(); $this->faultcode = $faultcode; $this->faultactor = $faultactor; $this->faultstring = $faultstring; @@ -1131,8 +1131,8 @@ class nusoap_xmlschema extends nusoap_base { * @param string $namespaces namespaces defined in enclosing XML * @access public */ - function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){ - parent::nusoap_base(); + function __construct($schema='',$xml='',$namespaces=array()){ + parent::__construct(); $this->debug('nusoap_xmlschema class instantiated, inside constructor'); // files $this->schema = $schema; @@ -2119,8 +2119,8 @@ class soapval extends nusoap_base { * @param mixed $attributes associative array of attributes to add to element serialization * @access public */ - function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) { - parent::nusoap_base(); + function __construct($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) { + parent::__construct(); $this->name = $name; $this->type = $type; $this->value = $value; @@ -2211,8 +2211,8 @@ class soap_transport_http extends nusoap_base { * @param boolean $use_curl Whether to try to force cURL use * @access public */ - function soap_transport_http($url, $curl_options = NULL, $use_curl = false){ - parent::nusoap_base(); + function __construct($url, $curl_options = NULL, $use_curl = false){ + parent::__construct(); $this->debug("ctor url=$url use_curl=$use_curl curl_options:"); $this->appendDebug($this->varDump($curl_options)); $this->setURL($url); @@ -3628,8 +3628,8 @@ class nusoap_server extends nusoap_base { * @param mixed $wsdl file path or URL (string), or wsdl instance (object) * @access public */ - function nusoap_server($wsdl=false){ - parent::nusoap_base(); + function __construct($wsdl=false){ + parent::__construct(); // turn on debugging? global $debug; global $HTTP_SERVER_VARS; @@ -4651,8 +4651,8 @@ class wsdl extends nusoap_base { * @param boolean $use_curl try to use cURL * @access public */ - function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){ - parent::nusoap_base(); + function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){ + parent::__construct(); $this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout"); $this->proxyhost = $proxyhost; $this->proxyport = $proxyport; @@ -6580,8 +6580,8 @@ class nusoap_parser extends nusoap_base { * @param string $decode_utf8 whether to decode UTF-8 to ISO-8859-1 * @access public */ - function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){ - parent::nusoap_base(); + function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true){ + parent::__construct(); $this->xml = $xml; $this->xml_encoding = $encoding; $this->method = $method; @@ -7258,8 +7258,8 @@ class nusoap_client extends nusoap_base { * @param string $portName optional portName in WSDL document * @access public */ - function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){ - parent::nusoap_base(); + function __construct($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){ + parent::__construct(); $this->endpoint = $endpoint; $this->proxyhost = $proxyhost; $this->proxyport = $proxyport;