chamilo / chamilo-lms

main/inc/lib/nusoap/class.wsdl.php

Spacing +205 added lines, -207 removed lines

@@ -47,13 +47,13 @@ 
 	var $proxypassword = '';

 	var $timeout = 0;

 	var $response_timeout = 30;

-	var $curl_options = array();	// User-specified cURL options

-	var $use_curl = false;			// whether to always try to use cURL

+	var $curl_options = array(); // User-specified cURL options

+	var $use_curl = false; // whether to always try to use cURL

 	// for HTTP authentication

-	var $username = '';				// Username for HTTP authentication

-	var $password = '';				// Password for HTTP authentication

-	var $authtype = '';				// Type of HTTP authentication

-	var $certRequest = array();		// Certificate for HTTP SSL authentication

+	var $username = ''; // Username for HTTP authentication

+	var $password = ''; // Password for HTTP authentication

+	var $authtype = ''; // Type of HTTP authentication

+	var $certRequest = array(); // Certificate for HTTP SSL authentication

 

     /**

      * constructor

@@ -69,7 +69,7 @@ 
 	 * @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){

+    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();

 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");

         $this->proxyhost = $proxyhost;

@@ -105,19 +105,19 @@ 
     		// Schema imports

     		foreach ($this->schemas as $ns => $list) {

     			foreach ($list as $xs) {

-					$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!

+					$wsdlparts = parse_url($this->wsdl); // this is bogusly simple!

 		            foreach ($xs->imports as $ns2 => $list2) {

 		                for ($ii = 0; $ii < count($list2); $ii++) {

-		                	if (! $list2[$ii]['loaded']) {

+		                	if (!$list2[$ii]['loaded']) {

 		                		$this->schemas[$ns]->imports[$ns2][$ii]['loaded'] = true;

 		                		$url = $list2[$ii]['location'];

 								if ($url != '') {

 									$urlparts = parse_url($url);

 									if (!isset($urlparts['host'])) {

-										$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' .$wsdlparts['port'] : '') .

-												substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];

+										$url = $wsdlparts['scheme'].'://'.$wsdlparts['host'].(isset($wsdlparts['port']) ? ':'.$wsdlparts['port'] : '').

+												substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1).$urlparts['path'];

 									}

-									if (! in_array($url, $imported_urls)) {

+									if (!in_array($url, $imported_urls)) {

 					                	$this->parseWSDL($url);

 				                		$imported++;

 				                		$imported_urls[] = $url;

@@ -131,19 +131,19 @@ 
     			}

     		}

     		// WSDL imports

-			$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!

+			$wsdlparts = parse_url($this->wsdl); // this is bogusly simple!

             foreach ($this->import as $ns => $list) {

                 for ($ii = 0; $ii < count($list); $ii++) {

-                	if (! $list[$ii]['loaded']) {

+                	if (!$list[$ii]['loaded']) {

                 		$this->import[$ns][$ii]['loaded'] = true;

                 		$url = $list[$ii]['location'];

 						if ($url != '') {

 							$urlparts = parse_url($url);

 							if (!isset($urlparts['host'])) {

-								$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .

-										substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];

+								$url = $wsdlparts['scheme'].'://'.$wsdlparts['host'].(isset($wsdlparts['port']) ? ':'.$wsdlparts['port'] : '').

+										substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1).$urlparts['path'];

 							}

-							if (! in_array($url, $imported_urls)) {

+							if (!in_array($url, $imported_urls)) {

 			                	$this->parseWSDL($url);

 		                		$imported++;

 		                		$imported_urls[] = $url;

@@ -156,30 +156,28 @@ 
             }

 		}

         // add new data to operation data

-        foreach($this->bindings as $binding => $bindingData) {

+        foreach ($this->bindings as $binding => $bindingData) {

             if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {

-                foreach($bindingData['operations'] as $operation => $data) {

-                    $this->debug('post-parse data gathering for ' . $operation);

+                foreach ($bindingData['operations'] as $operation => $data) {

+                    $this->debug('post-parse data gathering for '.$operation);

                     $this->bindings[$binding]['operations'][$operation]['input'] =

 						isset($this->bindings[$binding]['operations'][$operation]['input']) ?

-						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :

-						$this->portTypes[ $bindingData['portType'] ][$operation]['input'];

+						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[$bindingData['portType']][$operation]['input']) : $this->portTypes[$bindingData['portType']][$operation]['input'];

                     $this->bindings[$binding]['operations'][$operation]['output'] =

 						isset($this->bindings[$binding]['operations'][$operation]['output']) ?

-						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :

-						$this->portTypes[ $bindingData['portType'] ][$operation]['output'];

-                    if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ])){

-						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ];

+						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[$bindingData['portType']][$operation]['output']) : $this->portTypes[$bindingData['portType']][$operation]['output'];

+                    if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']])) {

+						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']];

 					}

-					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){

-                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];

+					if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']])) {

+                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']];

                     }

                     // Set operation style if necessary, but do not override one already provided

 					if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {

                         $this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];

                     }

                     $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';

-                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';

+                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[$bindingData['portType']][$operation]['documentation']) ? $this->portTypes[$bindingData['portType']][$operation]['documentation'] : '';

                     $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';

                 }

             }

@@ -205,13 +203,13 @@ 
         $wsdl_props = parse_url($wsdl);

 

         if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {

-            $this->debug('getting WSDL http(s) URL ' . $wsdl);

+            $this->debug('getting WSDL http(s) URL '.$wsdl);

         	// get wsdl

 	        $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);

 			$tr->request_method = 'GET';

 			$tr->useSOAPAction = false;

-			if($this->proxyhost && $this->proxyport){

-				$tr->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);

+			if ($this->proxyhost && $this->proxyport) {

+				$tr->setProxy($this->proxyhost, $this->proxyport, $this->proxyusername, $this->proxypassword);

 			}

 			if ($this->authtype != '') {

 				$tr->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);

@@ -222,8 +220,8 @@ 
 			//$this->debug("WSDL response\n" . $tr->incoming_payload);

 			$this->appendDebug($tr->getDebug());

 			// catch errors

-			if($err = $tr->getError() ){

-				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;

+			if ($err = $tr->getError()) {

+				$errstr = 'Getting '.$wsdl.' - HTTP ERROR: '.$err;

 				$this->debug($errstr);

 	            $this->setError($errstr);

 				unset($tr);

@@ -234,11 +232,11 @@ 
         } else {

             // $wsdl is not http(s), so treat it as a file URL or plain file path

         	if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {

-        		$path = isset($wsdl_props['host']) ? ($wsdl_props['host'] . ':' . $wsdl_props['path']) : $wsdl_props['path'];

+        		$path = isset($wsdl_props['host']) ? ($wsdl_props['host'].':'.$wsdl_props['path']) : $wsdl_props['path'];

         	} else {

         		$path = $wsdl;

         	}

-            $this->debug('getting WSDL file ' . $path);

+            $this->debug('getting WSDL file '.$path);

             if ($fp = @fopen($path, 'r')) {

                 $wsdl_string = '';

                 while ($data = fread($fp, 32768)) {

@@ -274,7 +272,7 @@ 
                 xml_error_string(xml_get_error_code($this->parser))

                 );

             $this->debug($errstr);

-			$this->debug("XML payload:\n" . $wsdl_string);

+			$this->debug("XML payload:\n".$wsdl_string);

             $this->setError($errstr);

             return false;

         }

@@ -282,7 +280,7 @@ 
         xml_parser_free($this->parser);

         $this->debug('Parsing WSDL done');

 		// catch wsdl parse errors

-		if($this->getError()){

+		if ($this->getError()) {

 			return false;

 		}

         return true;

@@ -320,21 +318,21 @@ 
             // process attributes

             if (count($attrs) > 0) {

 				// register namespace declarations

-                foreach($attrs as $k => $v) {

-                    if (preg_match('/^xmlns/',$k)) {

+                foreach ($attrs as $k => $v) {

+                    if (preg_match('/^xmlns/', $k)) {

                         if ($ns_prefix = substr(strrchr($k, ':'), 1)) {

                             $this->namespaces[$ns_prefix] = $v;

                         } else {

-                            $this->namespaces['ns' . (count($this->namespaces) + 1)] = $v;

+                            $this->namespaces['ns'.(count($this->namespaces) + 1)] = $v;

                         }

                         if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema') {

                             $this->XMLSchemaVersion = $v;

-                            $this->namespaces['xsi'] = $v . '-instance';

+                            $this->namespaces['xsi'] = $v.'-instance';

                         }

                     }

                 }

                 // expand each attribute prefix to its namespace

-                foreach($attrs as $k => $v) {

+                foreach ($attrs as $k => $v) {

                     $k = strpos($k, ':') ? $this->expandQname($k) : $k;

                     if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {

                         $v = strpos($v, ':') ? $this->expandQname($v) : $v;

@@ -360,12 +358,12 @@ 
                 case 'message':

                     if ($name == 'part') {

 			            if (isset($attrs['type'])) {

-		                    $this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));

+		                    $this->debug("msg ".$this->currentMessage.": found part (with type) $attrs[name]: ".implode(',', $attrs));

 		                    $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];

             			}

 			            if (isset($attrs['element'])) {

-		                    $this->debug("msg " . $this->currentMessage . ": found part (with element) $attrs[name]: " . implode(',', $attrs));

-			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'] . '^';

+		                    $this->debug("msg ".$this->currentMessage.": found part (with element) $attrs[name]: ".implode(',', $attrs));

+			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'].'^';

 			            }

         			}

         			break;

@@ -434,15 +432,15 @@ 
 					switch ($name) {

 					    case 'port':

 					        $this->currentPort = $attrs['name'];

-					        $this->debug('current port: ' . $this->currentPort);

+					        $this->debug('current port: '.$this->currentPort);

 					        $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);

 

 					        break;

 					    case 'address':

 					        $this->ports[$this->currentPort]['location'] = $attrs['location'];

 					        $this->ports[$this->currentPort]['bindingType'] = $namespace;

-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;

-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];

+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['bindingType'] = $namespace;

+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['endpoint'] = $attrs['location'];

 					        break;

 					}

 					break;

@@ -452,13 +450,13 @@ 
 			case 'import':

 			    if (isset($attrs['location'])) {

                     $this->import[$attrs['namespace']][] = array('location' => $attrs['location'], 'loaded' => false);

-                    $this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');

+                    $this->debug('parsing import '.$attrs['namespace'].' - '.$attrs['location'].' ('.count($this->import[$attrs['namespace']]).')');

 				} else {

                     $this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);

-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {

-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];

+					if (!$this->getPrefixFromNamespace($attrs['namespace'])) {

+						$this->namespaces['ns'.(count($this->namespaces) + 1)] = $attrs['namespace'];

 					}

-                    $this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');

+                    $this->debug('parsing import '.$attrs['namespace'].' - [no location] ('.count($this->import[$attrs['namespace']]).')');

 				}

 				break;

 			//wait for schema

@@ -485,13 +483,13 @@ 
 					}

 					$this->status = 'binding';

 					$this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);

-					$this->debug("current binding: $this->currentBinding of portType: " . $attrs['type']);

+					$this->debug("current binding: $this->currentBinding of portType: ".$attrs['type']);

 				}

 				break;

 			case 'service':

 				$this->serviceName = $attrs['name'];

 				$this->status = 'service';

-				$this->debug('current service: ' . $this->serviceName);

+				$this->debug('current service: '.$this->serviceName);

 				break;

 			case 'definitions':

 				foreach ($attrs as $name => $value) {

@@ -509,7 +507,7 @@ 
 	* @param string $name element name

 	* @access private

 	*/

-	function end_element($parser, $name){

+	function end_element($parser, $name) {

 		// unset schema status

 		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {

 			$this->status = "";

@@ -594,8 +592,8 @@ 
 		}

 		$this->debug("getOperations for port '$portName' bindingType $bindingType");

 		// loop thru ports

-		foreach($this->ports as $port => $portData) {

-			$this->debug("getOperations checking port $port bindingType " . $portData['bindingType']);

+		foreach ($this->ports as $port => $portData) {

+			$this->debug("getOperations checking port $port bindingType ".$portData['bindingType']);

 			if ($portName == '' || $port == $portName) {

 				// binding type of port matches parameter

 				if ($portData['bindingType'] == $bindingType) {

@@ -603,8 +601,8 @@ 
 					//$this->debug("port data: " . $this->varDump($portData));

 					//$this->debug("bindings: " . $this->varDump($this->bindings[ $portData['binding'] ]));

 					// merge bindings

-					if (isset($this->bindings[ $portData['binding'] ]['operations'])) {

-						$ops = array_merge ($ops, $this->bindings[ $portData['binding'] ]['operations']);

+					if (isset($this->bindings[$portData['binding']]['operations'])) {

+						$ops = array_merge($ops, $this->bindings[$portData['binding']]['operations']);

 					}

 				}

 			}

@@ -631,15 +629,15 @@ 
 			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

 		}

 		// loop thru ports

-		foreach($this->ports as $port => $portData) {

+		foreach ($this->ports as $port => $portData) {

 			// binding type of port matches parameter

 			if ($portData['bindingType'] == $bindingType) {

 				// get binding

 				//foreach($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {

-				foreach(array_keys($this->bindings[ $portData['binding'] ]['operations']) as $bOperation) {

+				foreach (array_keys($this->bindings[$portData['binding']]['operations']) as $bOperation) {

 					// note that we could/should also check the namespace here

 					if ($operation == $bOperation) {

-						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];

+						$opData = $this->bindings[$portData['binding']]['operations'][$operation];

 					    return $opData;

 					}

 				}

@@ -662,11 +660,11 @@ 
 			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';

 		}

 		// loop thru ports

-		foreach($this->ports as $port => $portData) {

+		foreach ($this->ports as $port => $portData) {

 			// binding type of port matches parameter

 			if ($portData['bindingType'] == $bindingType) {

 				// loop through operations for the binding

-				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {

+				foreach ($this->bindings[$portData['binding']]['operations'] as $bOperation => $opData) {

 					if ($opData['soapAction'] == $soapAction) {

 					    return $opData;

 					}

@@ -695,7 +693,7 @@ 
     */

 	function getTypeDef($type, $ns) {

 		$this->debug("in getTypeDef: type=$type, ns=$ns");

-		if ((! $ns) && isset($this->namespaces['tns'])) {

+		if ((!$ns) && isset($this->namespaces['tns'])) {

 			$ns = $this->namespaces['tns'];

 			$this->debug("in getTypeDef: type namespace forced to $ns");

 		}

@@ -753,7 +751,7 @@ 
     *

     * @access private

     */

-    function webDescription(){

+    function webDescription() {

     	global $HTTP_SERVER_VARS;

 

 		if (isset($_SERVER)) {

@@ -847,19 +845,19 @@ 
 				<p>View the <a href="'.$PHP_SELF.'?wsdl">WSDL</a> for the service.

 				Click on an operation name to view it&apos;s details.</p>

 				<ul>';

-				foreach($this->getOperations() as $op => $data){

+				foreach ($this->getOperations() as $op => $data) {

 				    $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";

 				    // create hidden div

 				    $b .= "<div id='$op' class='hidden'>

 				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";

-				    foreach($data as $donnie => $marie){ // loop through opdata

-						if($donnie == 'input' || $donnie == 'output'){ // show input/output data

+				    foreach ($data as $donnie => $marie) { // loop through opdata

+						if ($donnie == 'input' || $donnie == 'output') { // show input/output data

 						    $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';

-						    foreach($marie as $captain => $tenille){ // loop through data

-								if($captain == 'parts'){ // loop thru parts

+						    foreach ($marie as $captain => $tenille) { // loop through data

+								if ($captain == 'parts') { // loop thru parts

 								    $b .= "&nbsp;&nbsp;$captain:<br>";

 					                //if(is_array($tenille)){

-								    	foreach($tenille as $joanie => $chachi){

+								    	foreach ($tenille as $joanie => $chachi) {

 											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";

 								    	}

 					        		//}

@@ -891,31 +889,31 @@ 
 	{

 		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';

 		$xml .= "\n<definitions";

-		foreach($this->namespaces as $k => $v) {

+		foreach ($this->namespaces as $k => $v) {

 			$xml .= " xmlns:$k=\"$v\"";

 		}

 		// 10.9.02 - add poulter fix for wsdl and tns declarations

 		if (isset($this->namespaces['wsdl'])) {

-			$xml .= " xmlns=\"" . $this->namespaces['wsdl'] . "\"";

+			$xml .= " xmlns=\"".$this->namespaces['wsdl']."\"";

 		}

 		if (isset($this->namespaces['tns'])) {

-			$xml .= " targetNamespace=\"" . $this->namespaces['tns'] . "\"";

+			$xml .= " targetNamespace=\"".$this->namespaces['tns']."\"";

 		}

 		$xml .= '>';

 		// imports

 		if (sizeof($this->import) > 0) {

-			foreach($this->import as $ns => $list) {

+			foreach ($this->import as $ns => $list) {

 				foreach ($list as $ii) {

 					if ($ii['location'] != '') {

-						$xml .= '<import location="' . $ii['location'] . '" namespace="' . $ns . '" />';

+						$xml .= '<import location="'.$ii['location'].'" namespace="'.$ns.'" />';

 					} else {

-						$xml .= '<import namespace="' . $ns . '" />';

+						$xml .= '<import namespace="'.$ns.'" />';

 					}

 				}

 			}

 		}

 		// types

-		if (count($this->schemas)>=1) {

+		if (count($this->schemas) >= 1) {

 			$xml .= "\n<types>\n";

 			foreach ($this->schemas as $ns => $list) {

 				foreach ($list as $xs) {

@@ -926,10 +924,10 @@ 
 		}

 		// messages

 		if (count($this->messages) >= 1) {

-			foreach($this->messages as $msgName => $msgParts) {

-				$xml .= "\n<message name=\"" . $msgName . '">';

-				if(is_array($msgParts)){

-					foreach($msgParts as $partName => $partType) {

+			foreach ($this->messages as $msgName => $msgParts) {

+				$xml .= "\n<message name=\"".$msgName.'">';

+				if (is_array($msgParts)) {

+					foreach ($msgParts as $partName => $partType) {

 						// print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';

 						if (strpos($partType, ':')) {

 						    $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));

@@ -937,7 +935,7 @@ 
 						    // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';

 						    $typePrefix = 'xsd';

 						} else {

-						    foreach($this->typemap as $ns => $types) {

+						    foreach ($this->typemap as $ns => $types) {

 						        if (isset($types[$partType])) {

 						            $typePrefix = $this->getPrefixFromNamespace($ns);

 						        }

@@ -957,7 +955,7 @@ 
 						} else {

 							$elementortype = 'type';

 						}

-						$xml .= "\n" . '  <part name="' . $partName . '" ' . $elementortype . '="' . $typePrefix . ':' . $localPart . '" />';

+						$xml .= "\n".'  <part name="'.$partName.'" '.$elementortype.'="'.$typePrefix.':'.$localPart.'" />';

 					}

 				}

 				$xml .= '</message>';

@@ -967,54 +965,54 @@ 
 		if (count($this->bindings) >= 1) {

 			$binding_xml = '';

 			$portType_xml = '';

-			foreach($this->bindings as $bindingName => $attrs) {

-				$binding_xml .= "\n<binding name=\"" . $bindingName . '" type="tns:' . $attrs['portType'] . '">';

-				$binding_xml .= "\n" . '  <soap:binding style="' . $attrs['style'] . '" transport="' . $attrs['transport'] . '"/>';

-				$portType_xml .= "\n<portType name=\"" . $attrs['portType'] . '">';

-				foreach($attrs['operations'] as $opName => $opParts) {

-					$binding_xml .= "\n" . '  <operation name="' . $opName . '">';

-					$binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="'. $opParts['style'] . '"/>';

+			foreach ($this->bindings as $bindingName => $attrs) {

+				$binding_xml .= "\n<binding name=\"".$bindingName.'" type="tns:'.$attrs['portType'].'">';

+				$binding_xml .= "\n".'  <soap:binding style="'.$attrs['style'].'" transport="'.$attrs['transport'].'"/>';

+				$portType_xml .= "\n<portType name=\"".$attrs['portType'].'">';

+				foreach ($attrs['operations'] as $opName => $opParts) {

+					$binding_xml .= "\n".'  <operation name="'.$opName.'">';

+					$binding_xml .= "\n".'    <soap:operation soapAction="'.$opParts['soapAction'].'" style="'.$opParts['style'].'"/>';

 					if (isset($opParts['input']['encodingStyle']) && $opParts['input']['encodingStyle'] != '') {

-						$enc_style = ' encodingStyle="' . $opParts['input']['encodingStyle'] . '"';

+						$enc_style = ' encodingStyle="'.$opParts['input']['encodingStyle'].'"';

 					} else {

 						$enc_style = '';

 					}

-					$binding_xml .= "\n" . '    <input><soap:body use="' . $opParts['input']['use'] . '" namespace="' . $opParts['input']['namespace'] . '"' . $enc_style . '/></input>';

+					$binding_xml .= "\n".'    <input><soap:body use="'.$opParts['input']['use'].'" namespace="'.$opParts['input']['namespace'].'"'.$enc_style.'/></input>';

 					if (isset($opParts['output']['encodingStyle']) && $opParts['output']['encodingStyle'] != '') {

-						$enc_style = ' encodingStyle="' . $opParts['output']['encodingStyle'] . '"';

+						$enc_style = ' encodingStyle="'.$opParts['output']['encodingStyle'].'"';

 					} else {

 						$enc_style = '';

 					}

-					$binding_xml .= "\n" . '    <output><soap:body use="' . $opParts['output']['use'] . '" namespace="' . $opParts['output']['namespace'] . '"' . $enc_style . '/></output>';

-					$binding_xml .= "\n" . '  </operation>';

-					$portType_xml .= "\n" . '  <operation name="' . $opParts['name'] . '"';

+					$binding_xml .= "\n".'    <output><soap:body use="'.$opParts['output']['use'].'" namespace="'.$opParts['output']['namespace'].'"'.$enc_style.'/></output>';

+					$binding_xml .= "\n".'  </operation>';

+					$portType_xml .= "\n".'  <operation name="'.$opParts['name'].'"';

 					if (isset($opParts['parameterOrder'])) {

-					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';

+					    $portType_xml .= ' parameterOrder="'.$opParts['parameterOrder'].'"';

 					}

 					$portType_xml .= '>';

-					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {

-						$portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';

+					if (isset($opParts['documentation']) && $opParts['documentation'] != '') {

+						$portType_xml .= "\n".'    <documentation>'.htmlspecialchars($opParts['documentation']).'</documentation>';

 					}

-					$portType_xml .= "\n" . '    <input message="tns:' . $opParts['input']['message'] . '"/>';

-					$portType_xml .= "\n" . '    <output message="tns:' . $opParts['output']['message'] . '"/>';

-					$portType_xml .= "\n" . '  </operation>';

+					$portType_xml .= "\n".'    <input message="tns:'.$opParts['input']['message'].'"/>';

+					$portType_xml .= "\n".'    <output message="tns:'.$opParts['output']['message'].'"/>';

+					$portType_xml .= "\n".'  </operation>';

 				}

-				$portType_xml .= "\n" . '</portType>';

-				$binding_xml .= "\n" . '</binding>';

+				$portType_xml .= "\n".'</portType>';

+				$binding_xml .= "\n".'</binding>';

 			}

-			$xml .= $portType_xml . $binding_xml;

+			$xml .= $portType_xml.$binding_xml;

 		}

 		// services

-		$xml .= "\n<service name=\"" . $this->serviceName . '">';

+		$xml .= "\n<service name=\"".$this->serviceName.'">';

 		if (count($this->ports) >= 1) {

-			foreach($this->ports as $pName => $attrs) {

-				$xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';

-				$xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';

-				$xml .= "\n" . '  </port>';

+			foreach ($this->ports as $pName => $attrs) {

+				$xml .= "\n".'  <port name="'.$pName.'" binding="tns:'.$attrs['binding'].'">';

+				$xml .= "\n".'    <soap:address location="'.$attrs['location'].($debug ? '?debug=1' : '').'"/>';

+				$xml .= "\n".'  </port>';

 			}

 		}

-		$xml .= "\n" . '</service>';

-		return $xml . "\n</definitions>";

+		$xml .= "\n".'</service>';

+		return $xml."\n</definitions>";

 	}

 

 	/**

@@ -1111,7 +1109,7 @@ 
 	 */

 	function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap') {

 		$this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType");

-		$this->appendDebug('parameters=' . $this->varDump($parameters));

+		$this->appendDebug('parameters='.$this->varDump($parameters));

 

 		if ($direction != 'input' && $direction != 'output') {

 			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');

@@ -1119,8 +1117,8 @@ 
 			return false;

 		}

 		if (!$opData = $this->getOperationData($operation, $bindingType)) {

-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);

-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);

+			$this->debug('Unable to retrieve WSDL data for operation: '.$operation.' bindingType: '.$bindingType);

+			$this->setError('Unable to retrieve WSDL data for operation: '.$operation.' bindingType: '.$bindingType);

 			return false;

 		}

 		$this->debug('in serializeRPCParameters: opData:');

@@ -1128,7 +1126,7 @@ 
 

 		// Get encoding style for output and set to current

 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

+		if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

 			$encodingStyle = $opData['output']['encodingStyle'];

 			$enc_style = $encodingStyle;

 		}

@@ -1213,7 +1211,7 @@ 
 	function serializeParameters($operation, $direction, $parameters)

 	{

 		$this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion");

-		$this->appendDebug('parameters=' . $this->varDump($parameters));

+		$this->appendDebug('parameters='.$this->varDump($parameters));

 

 		if ($direction != 'input' && $direction != 'output') {

 			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');

@@ -1221,8 +1219,8 @@ 
 			return false;

 		}

 		if (!$opData = $this->getOperationData($operation)) {

-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation);

-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation);

+			$this->debug('Unable to retrieve WSDL data for operation: '.$operation);

+			$this->setError('Unable to retrieve WSDL data for operation: '.$operation);

 			return false;

 		}

 		$this->debug('opData:');

@@ -1230,7 +1228,7 @@ 
 

 		// Get encoding style for output and set to current

 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

+		if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {

 			$encodingStyle = $opData['output']['encodingStyle'];

 			$enc_style = $encodingStyle;

 		}

@@ -1241,14 +1239,14 @@ 
 

 			$use = $opData[$direction]['use'];

 			$this->debug("use=$use");

-			$this->debug('got ' . count($opData[$direction]['parts']) . ' part(s)');

+			$this->debug('got '.count($opData[$direction]['parts']).' part(s)');

 			if (is_array($parameters)) {

 				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);

-				$this->debug('have ' . $parametersArrayType . ' parameters');

-				foreach($opData[$direction]['parts'] as $name => $type) {

+				$this->debug('have '.$parametersArrayType.' parameters');

+				foreach ($opData[$direction]['parts'] as $name => $type) {

 					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');

 					// Track encoding style

-					if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {

+					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {

 						$encodingStyle = $opData[$direction]['encodingStyle'];

 						$enc_style = $encodingStyle;

 					} else {

@@ -1289,18 +1287,18 @@ 
 	 * @return string value serialized as an XML string

 	 * @access private

 	 */

-	function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false)

+	function serializeType($name, $type, $value, $use = 'encoded', $encodingStyle = false, $unqualified = false)

 	{

-		$this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified"));

-		$this->appendDebug("value=" . $this->varDump($value));

-		if($use == 'encoded' && $encodingStyle) {

-			$encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"';

+		$this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=".($unqualified ? "unqualified" : "qualified"));

+		$this->appendDebug("value=".$this->varDump($value));

+		if ($use == 'encoded' && $encodingStyle) {

+			$encodingStyle = ' SOAP-ENV:encodingStyle="'.$encodingStyle.'"';

 		}

 

 		// if a soapval has been supplied, let its type override the WSDL

     	if (is_object($value) && get_class($value) == 'soapval') {

     		if ($value->type_ns) {

-    			$type = $value->type_ns . ':' . $value->type;

+    			$type = $value->type_ns.':'.$value->type;

 		    	$forceType = true;

 		    	$this->debug("in serializeType: soapval overrides type to $type");

     		} elseif ($value->type) {

@@ -1319,7 +1317,7 @@ 
 	    			$value['!'] = $value;

 	    		}

 	    		foreach ($attrs as $n => $v) {

-	    			$value['!' . $n] = $v;

+	    			$value['!'.$n] = $v;

 	    		}

 		    	$this->debug("in serializeType: soapval provides attributes");

 		    }

@@ -1337,7 +1335,7 @@ 
 				$this->debug("in serializeType: expanded prefixed type: $uqType, $ns");

 			}

 

-			if($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/'){

+			if ($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/') {

 				$this->debug('in serializeType: type namespace indicates XML Schema or SOAP Encoding type');

 				if ($unqualified && $use == 'literal') {

 					$elementNS = " xmlns=\"\"";

@@ -1350,7 +1348,7 @@ 
 						$xml = "<$name$elementNS/>";

 					} else {

 						// TODO: depends on nillable, which should be checked before calling this method

-						$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";

+						$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"/>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1360,7 +1358,7 @@ 
 					return $this->serialize_val($value, $name, false, false, false, false, $use);

 				}

 		    	if ($uqType == 'boolean') {

-		    		if ((is_string($value) && $value == 'false') || (! $value)) {

+		    		if ((is_string($value) && $value == 'false') || (!$value)) {

 						$value = 'false';

 					} else {

 						$value = 'true';

@@ -1378,12 +1376,12 @@ 
 				if (!$this->getTypeDef($uqType, $ns)) {

 					if ($use == 'literal') {

 						if ($forceType) {

-							$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";

+							$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\">$value</$name>";

 						} else {

 							$xml = "<$name$elementNS>$value</$name>";

 						}

 					} else {

-						$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";

+						$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>$value</$name>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1393,29 +1391,29 @@ 
 				$this->debug('in serializeType: appears to be Apache SOAP type');

 				if ($uqType == 'Map') {

 					$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');

-					if (! $tt_prefix) {

+					if (!$tt_prefix) {

 						$this->debug('in serializeType: Add namespace for Apache SOAP type');

-						$tt_prefix = 'ns' . rand(1000, 9999);

+						$tt_prefix = 'ns'.rand(1000, 9999);

 						$this->namespaces[$tt_prefix] = 'http://xml.apache.org/xml-soap';

 						// force this to be added to usedNamespaces

 						$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');

 					}

 					$contents = '';

-					foreach($value as $k => $v) {

+					foreach ($value as $k => $v) {

 						$this->debug("serializing map element: key $k, value $v");

 						$contents .= '<item>';

-						$contents .= $this->serialize_val($k,'key',false,false,false,false,$use);

-						$contents .= $this->serialize_val($v,'value',false,false,false,false,$use);

+						$contents .= $this->serialize_val($k, 'key', false, false, false, false, $use);

+						$contents .= $this->serialize_val($v, 'value', false, false, false, false, $use);

 						$contents .= '</item>';

 					}

 					if ($use == 'literal') {

 						if ($forceType) {

-							$xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\">$contents</$name>";

+							$xml = "<$name xsi:type=\"".$tt_prefix.":$uqType\">$contents</$name>";

 						} else {

 							$xml = "<$name>$contents</$name>";

 						}

 					} else {

-						$xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\"$encodingStyle>$contents</$name>";

+						$xml = "<$name xsi:type=\"".$tt_prefix.":$uqType\"$encodingStyle>$contents</$name>";

 					}

 					$this->debug("in serializeType: returning: $xml");

 					return $xml;

@@ -1429,13 +1427,13 @@ 
 			$ns = '';

 			$uqType = $type;

 		}

-		if(!$typeDef = $this->getTypeDef($uqType, $ns)){

+		if (!$typeDef = $this->getTypeDef($uqType, $ns)) {

 			$this->setError("$type ($uqType) is not a supported type.");

 			$this->debug("in serializeType: $type ($uqType) is not a supported type.");

 			return false;

 		} else {

 			$this->debug("in serializeType: found typeDef");

-			$this->appendDebug('typeDef=' . $this->varDump($typeDef));

+			$this->appendDebug('typeDef='.$this->varDump($typeDef));

 			if (substr($uqType, -1) == '^') {

 				$uqType = substr($uqType, 0, -1);

 			}

@@ -1446,7 +1444,7 @@ 
 			return false;

 		}

 		$phpType = $typeDef['phpType'];

-		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') );

+		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: ".(isset($typeDef['arrayType']) ? $typeDef['arrayType'] : ''));

 		// if php type == struct, map value to the <all> element names

 		if ($phpType == 'struct') {

 			if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {

@@ -1469,7 +1467,7 @@ 
 					// TODO: depends on minOccurs and nillable

 					$xml = "<$elementName$elementNS/>";

 				} else {

-					$xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";

+					$xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"/>";

 				}

 				$this->debug("in serializeType: returning: $xml");

 				return $xml;

@@ -1481,12 +1479,12 @@ 
 				$elementAttrs = $this->serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType);

 				if ($use == 'literal') {

 					if ($forceType) {

-						$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">";

+						$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\">";

 					} else {

 						$xml = "<$elementName$elementNS$elementAttrs>";

 					}

 				} else {

-					$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>";

+					$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>";

 				}

 

 				if (isset($typeDef['simpleContent']) && $typeDef['simpleContent'] == 'true') {

@@ -1521,13 +1519,13 @@ 
 					// TODO: depends on minOccurs

 					$xml = "<$name$elementNS/>";

 				} else {

-					$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" .

-						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .

-						":Array\" " .

-						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .

-						':arrayType="' .

-						$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])) .

-						':' .

+					$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"".

+						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').

+						":Array\" ".

+						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').

+						':arrayType="'.

+						$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])).

+						':'.

 						$this->getLocalPart($typeDef['arrayType'])."[0]\"/>";

 				}

 				$this->debug("in serializeType: returning: $xml");

@@ -1535,8 +1533,8 @@ 
 			}

 			if (isset($typeDef['multidimensional'])) {

 				$nv = array();

-				foreach($value as $v) {

-					$cols = ',' . sizeof($v);

+				foreach ($value as $v) {

+					$cols = ','.sizeof($v);

 					$nv = array_merge($nv, $v);

 				}

 				$value = $nv;

@@ -1546,10 +1544,10 @@ 
 			if (is_array($value) && sizeof($value) >= 1) {

 				$rows = sizeof($value);

 				$contents = '';

-				foreach($value as $k => $v) {

+				foreach ($value as $k => $v) {

 					//$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");

 					//if (strpos($typeDef['arrayType'], ':') ) {

-					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {

+					if (!in_array($typeDef['arrayType'], $this->typemap['http://www.w3.org/2001/XMLSchema'])) {

 					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);

 					} else {

 					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);

@@ -1586,12 +1584,12 @@ 
 			}

 			if ($use == 'literal') {

 				if ($forceType) {

-					$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";

+					$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\">$value</$name>";

 				} else {

 					$xml = "<$name$elementNS>$value</$name>";

 				}

 			} else {

-				$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";

+				$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace($ns).":$uqType\"$encodingStyle>$value</$name>";

 			}

 		}

 		$this->debug("in serializeType: returning: $xml");

@@ -1635,22 +1633,22 @@ 
 				$xvalue = array();

 			}

 			foreach ($typeDef['attrs'] as $aName => $attrs) {

-				if (isset($xvalue['!' . $aName])) {

-					$xname = '!' . $aName;

+				if (isset($xvalue['!'.$aName])) {

+					$xname = '!'.$aName;

 					$this->debug("value provided for attribute $aName with key $xname");

 				} elseif (isset($xvalue[$aName])) {

 					$xname = $aName;

 					$this->debug("value provided for attribute $aName with key $xname");

 				} elseif (isset($attrs['default'])) {

-					$xname = '!' . $aName;

+					$xname = '!'.$aName;

 					$xvalue[$xname] = $attrs['default'];

-					$this->debug('use default value of ' . $xvalue[$aName] . ' for attribute ' . $aName);

+					$this->debug('use default value of '.$xvalue[$aName].' for attribute '.$aName);

 				} else {

 					$xname = '';

 					$this->debug("no value provided for attribute $aName");

 				}

 				if ($xname) {

-					$xml .=  " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";

+					$xml .= " $aName=\"".$this->expandEntities($xvalue[$xname])."\"";

 				}

 			}

 		} else {

@@ -1671,7 +1669,7 @@ 
 	 * @return string value serialized as an XML string

 	 * @access private

 	 */

-	function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='encoded', $encodingStyle=false) {

+	function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use = 'encoded', $encodingStyle = false) {

 		$this->debug("in serializeComplexTypeElements for XML Schema type $ns:$uqType");

 		$xml = '';

 		if (isset($typeDef['extensionBase'])) {

@@ -1698,23 +1696,23 @@ 
 				$xvalue = array();

 			}

 			// toggle whether all elements are present - ideally should validate against schema

-			if (count($typeDef['elements']) != count($xvalue)){

+			if (count($typeDef['elements']) != count($xvalue)) {

 				$optionals = true;

 			}

 			foreach ($typeDef['elements'] as $eName => $attrs) {

 				if (!isset($xvalue[$eName])) {

 					if (isset($attrs['default'])) {

 						$xvalue[$eName] = $attrs['default'];

-						$this->debug('use default value of ' . $xvalue[$eName] . ' for element ' . $eName);

+						$this->debug('use default value of '.$xvalue[$eName].' for element '.$eName);

 					}

 				}

 				// if user took advantage of a minOccurs=0, then only serialize named parameters

 				if (isset($optionals)

 				    && (!isset($xvalue[$eName]))

-					&& ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')

-					){

+					&& ((!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')

+					) {

 					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {

-						$this->debug("apparent error: no value provided for element $eName with minOccurs=" . $attrs['minOccurs']);

+						$this->debug("apparent error: no value provided for element $eName with minOccurs=".$attrs['minOccurs']);

 					}

 					// do nothing

 					$this->debug("no value provided for complexType element $eName and element is not nillable, so serialize nothing");

@@ -1779,15 +1777,15 @@ 
 	* @see nusoap_xmlschema

 	* @access public

 	*/

-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType='') {

+	function addComplexType($name, $typeClass = 'complexType', $phpType = 'array', $compositor = '', $restrictionBase = '', $elements = array(), $attrs = array(), $arrayType = '') {

 		if (count($elements) > 0) {

 			$eElements = array();

-	    	foreach($elements as $n => $e){

+	    	foreach ($elements as $n => $e) {

 	            // expand each element

 	            $ee = array();

 	            foreach ($e as $k => $v) {

-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;

-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;

+		            $k = strpos($k, ':') ? $this->expandQname($k) : $k;

+		            $v = strpos($v, ':') ? $this->expandQname($v) : $v;

 		            $ee[$k] = $v;

 		    	}

 	    		$eElements[$n] = $ee;

@@ -1796,11 +1794,11 @@ 
 		}

 

 		if (count($attrs) > 0) {

-	    	foreach($attrs as $n => $a){

+	    	foreach ($attrs as $n => $a) {

 	            // expand each attribute

 	            foreach ($a as $k => $v) {

-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;

-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;

+		            $k = strpos($k, ':') ? $this->expandQname($k) : $k;

+		            $v = strpos($v, ':') ? $this->expandQname($v) : $v;

 		            $aa[$k] = $v;

 		    	}

 	    		$eAttrs[$n] = $aa;

@@ -1808,11 +1806,11 @@ 
 	    	$attrs = $eAttrs;

 		}

 

-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;

-		$arrayType = strpos($arrayType,':') ? $this->expandQname($arrayType) : $arrayType;

+		$restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;

+		$arrayType = strpos($arrayType, ':') ? $this->expandQname($arrayType) : $arrayType;

 

 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

-		$this->schemas[$typens][0]->addComplexType($name,$typeClass,$phpType,$compositor,$restrictionBase,$elements,$attrs,$arrayType);

+		$this->schemas[$typens][0]->addComplexType($name, $typeClass, $phpType, $compositor, $restrictionBase, $elements, $attrs, $arrayType);

 	}

 

 	/**

@@ -1826,8 +1824,8 @@ 
 	* @see nusoap_xmlschema

 	* @access public

 	*/

-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {

-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;

+	function addSimpleType($name, $restrictionBase = '', $typeClass = 'simpleType', $phpType = 'scalar', $enumeration = array()) {

+		$restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;

 

 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];

 		$this->schemas[$typens][0]->addSimpleType($name, $restrictionBase, $typeClass, $phpType, $enumeration);

@@ -1859,7 +1857,7 @@ 
 	* @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)

 	* @access public

 	*/

-	function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = ''){

+	function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = '') {

 		if ($use == 'encoded' && $encodingStyle == '') {

 			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

 		}

@@ -1869,24 +1867,24 @@ 
 			foreach ($in as $n => $t) {

 				$elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');

 			}

-			$this->addComplexType($name . 'RequestType', 'complexType', 'struct', 'all', '', $elements);

-			$this->addElement(array('name' => $name, 'type' => $name . 'RequestType'));

-			$in = array('parameters' => 'tns:' . $name . '^');

+			$this->addComplexType($name.'RequestType', 'complexType', 'struct', 'all', '', $elements);

+			$this->addElement(array('name' => $name, 'type' => $name.'RequestType'));

+			$in = array('parameters' => 'tns:'.$name.'^');

 

 			$elements = array();

 			foreach ($out as $n => $t) {

 				$elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');

 			}

-			$this->addComplexType($name . 'ResponseType', 'complexType', 'struct', 'all', '', $elements);

-			$this->addElement(array('name' => $name . 'Response', 'type' => $name . 'ResponseType', 'form' => 'qualified'));

-			$out = array('parameters' => 'tns:' . $name . 'Response' . '^');

+			$this->addComplexType($name.'ResponseType', 'complexType', 'struct', 'all', '', $elements);

+			$this->addElement(array('name' => $name.'Response', 'type' => $name.'ResponseType', 'form' => 'qualified'));

+			$out = array('parameters' => 'tns:'.$name.'Response'.'^');

 		}

 

 		// get binding

-		$this->bindings[ $this->serviceName . 'Binding' ]['operations'][$name] =

+		$this->bindings[$this->serviceName.'Binding']['operations'][$name] =

 		array(

 		'name' => $name,

-		'binding' => $this->serviceName . 'Binding',

+		'binding' => $this->serviceName.'Binding',

 		'endpoint' => $this->endpoint,

 		'soapAction' => $soapaction,

 		'style' => $style,

@@ -1894,42 +1892,42 @@ 
 			'use' => $use,

 			'namespace' => $namespace,

 			'encodingStyle' => $encodingStyle,

-			'message' => $name . 'Request',

+			'message' => $name.'Request',

 			'parts' => $in),

 		'output' => array(

 			'use' => $use,

 			'namespace' => $namespace,

 			'encodingStyle' => $encodingStyle,

-			'message' => $name . 'Response',

+			'message' => $name.'Response',

 			'parts' => $out),

 		'namespace' => $namespace,

 		'transport' => 'http://schemas.xmlsoap.org/soap/http',

 		'documentation' => $documentation);

 		// add portTypes

 		// add messages

-		if($in)

+		if ($in)

 		{

-			foreach($in as $pName => $pType)

+			foreach ($in as $pName => $pType)

 			{

-				if(strpos($pType,':')) {

+				if (strpos($pType, ':')) {

 					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);

 				}

 				$this->messages[$name.'Request'][$pName] = $pType;

 			}

 		} else {

-            $this->messages[$name.'Request']= '0';

+            $this->messages[$name.'Request'] = '0';

         }

-		if($out)

+		if ($out)

 		{

-			foreach($out as $pName => $pType)

+			foreach ($out as $pName => $pType)

 			{

-				if(strpos($pType,':')) {

+				if (strpos($pType, ':')) {

 					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);

 				}

 				$this->messages[$name.'Response'][$pName] = $pType;

 			}

 		} else {

-            $this->messages[$name.'Response']= '0';

+            $this->messages[$name.'Response'] = '0';

         }

 		return true;

 	}

main/inc/lib/nusoap/class.nusoap_base.php

Spacing +115 added lines, -115 removed lines

@@ -183,26 +183,26 @@ 
 	*/

 	var $typemap = array(

 	'http://www.w3.org/2001/XMLSchema' => array(

-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',

-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',

-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',

+		'string'=>'string', 'boolean'=>'boolean', 'float'=>'double', 'double'=>'double', 'decimal'=>'double',

+		'duration'=>'', 'dateTime'=>'string', 'time'=>'string', 'date'=>'string', 'gYearMonth'=>'',

+		'gYear'=>'', 'gMonthDay'=>'', 'gDay'=>'', 'gMonth'=>'', 'hexBinary'=>'string', 'base64Binary'=>'string',

 		// abstract "any" types

-		'anyType'=>'string','anySimpleType'=>'string',

+		'anyType'=>'string', 'anySimpleType'=>'string',

 		// derived datatypes

-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',

-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',

-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',

-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),

+		'normalizedString'=>'string', 'token'=>'string', 'language'=>'', 'NMTOKEN'=>'', 'NMTOKENS'=>'', 'Name'=>'', 'NCName'=>'', 'ID'=>'',

+		'IDREF'=>'', 'IDREFS'=>'', 'ENTITY'=>'', 'ENTITIES'=>'', 'integer'=>'integer', 'nonPositiveInteger'=>'integer',

+		'negativeInteger'=>'integer', 'long'=>'integer', 'int'=>'integer', 'short'=>'integer', 'byte'=>'integer', 'nonNegativeInteger'=>'integer',

+		'unsignedLong'=>'', 'unsignedInt'=>'', 'unsignedShort'=>'', 'unsignedByte'=>'', 'positiveInteger'=>''),

 	'http://www.w3.org/2000/10/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+		'i4'=>'', 'int'=>'integer', 'boolean'=>'boolean', 'string'=>'string', 'double'=>'double',

+		'float'=>'double', 'dateTime'=>'string',

+		'timeInstant'=>'string', 'base64Binary'=>'string', 'base64'=>'string', 'ur-type'=>'array'),

 	'http://www.w3.org/1999/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+		'i4'=>'', 'int'=>'integer', 'boolean'=>'boolean', 'string'=>'string', 'double'=>'double',

+		'float'=>'double', 'dateTime'=>'string',

+		'timeInstant'=>'string', 'base64Binary'=>'string', 'base64'=>'string', 'ur-type'=>'array'),

 	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),

-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),

+	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string', 'array'=>'array', 'Array'=>'array'),

     'http://xml.apache.org/xml-soap' => array('Map')

 	);

 

@@ -214,8 +214,8 @@ 
 	* @deprecated

 	* @see	expandEntities

 	*/

-	var $xmlEntities = array('quot' => '"','amp' => '&',

-		'lt' => '<','gt' => '>','apos' => "'");

+	var $xmlEntities = array('quot' => '"', 'amp' => '&',

+		'lt' => '<', 'gt' => '>', 'apos' => "'");

 

 	/**

 	* constructor

@@ -272,7 +272,7 @@ 
 	* @param    string $string debug data

 	* @access   private

 	*/

-	function debug($string){

+	function debug($string) {

 		if ($this->debugLevel > 0) {

 			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");

 		}

@@ -284,7 +284,7 @@ 
 	* @param    string $string debug data

 	* @access   public

 	*/

-	function appendDebug($string){

+	function appendDebug($string) {

 		if ($this->debugLevel > 0) {

 			// it would be nice to use a memory stream here to use

 			// memory more efficiently

@@ -328,7 +328,7 @@ 
 		while (strpos($this->debug_str, '--')) {

 			$this->debug_str = str_replace('--', '- -', $this->debug_str);

 		}

-		$ret = "<!--\n" . $this->debug_str . "\n-->";

+		$ret = "<!--\n".$this->debug_str."\n-->";

     	return $ret;

 	}

 

@@ -355,8 +355,8 @@ 
 	* @return   mixed error string or false

 	* @access   public

 	*/

-	function getError(){

-		if($this->error_str != ''){

+	function getError() {

+		if ($this->error_str != '') {

 			return $this->error_str;

 		}

 		return false;

@@ -368,7 +368,7 @@ 
 	* @return   boolean $string error string

 	* @access   private

 	*/

-	function setError($str){

+	function setError($str) {

 		$this->error_str = $str;

 	}

 

@@ -404,12 +404,12 @@ 
 	* @return	string	The serialized element, possibly with child elements

     * @access	public

 	*/

-	function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {

+	function serialize_val($val, $name = false, $type = false, $name_ns = false, $type_ns = false, $attributes = false, $use = 'encoded', $soapval = false) {

 		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");

-		$this->appendDebug('value=' . $this->varDump($val));

-		$this->appendDebug('attributes=' . $this->varDump($attributes));

+		$this->appendDebug('value='.$this->varDump($val));

+		$this->appendDebug('attributes='.$this->varDump($attributes));

 

-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {

+    	if (is_object($val) && get_class($val) == 'soapval' && (!$soapval)) {

     		$this->debug("serialize_val: serialize soapval");

         	$xml = $val->serialize($use);

 			$this->appendDebug($val->getDebug());

@@ -419,30 +419,30 @@ 
         }

 		// force valid name if necessary

 		if (is_numeric($name)) {

-			$name = '__numeric_' . $name;

-		} elseif (! $name) {

+			$name = '__numeric_'.$name;

+		} elseif (!$name) {

 			$name = 'noname';

 		}

 		// if name has ns, add ns prefix to name

 		$xmlns = '';

-        if($name_ns){

-			$prefix = 'nu'.rand(1000,9999);

+        if ($name_ns) {

+			$prefix = 'nu'.rand(1000, 9999);

 			$name = $prefix.':'.$name;

 			$xmlns .= " xmlns:$prefix=\"$name_ns\"";

 		}

 		// if type is prefixed, create type prefix

-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){

+		if ($type_ns != '' && $type_ns == $this->namespaces['xsd']) {

 			// need to fix this. shouldn't default to xsd if no ns specified

 		    // w/o checking against typemap

 			$type_prefix = 'xsd';

-		} elseif($type_ns){

-			$type_prefix = 'ns'.rand(1000,9999);

+		} elseif ($type_ns) {

+			$type_prefix = 'ns'.rand(1000, 9999);

 			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";

 		}

 		// serialize attributes if present

 		$atts = '';

-		if($attributes){

-			foreach($attributes as $k => $v){

+		if ($attributes) {

+			foreach ($attributes as $k => $v) {

 				$atts .= " $k=\"".$this->expandEntities($v).'"';

 			}

 		}

@@ -466,12 +466,12 @@ 
         	}

 		}

         // serialize if an xsd built-in primitive type

-        if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){

+        if ($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])) {

     		$this->debug("serialize_val: serialize xsd built-in primitive type");

         	if (is_bool($val)) {

         		if ($type == 'boolean') {

 	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

+	        	} elseif (!$val) {

 	        		$val = 0;

 	        	}

 			} else if (is_string($val)) {

@@ -489,12 +489,12 @@ 
         }

 		// detect type and serialize

 		$xml = '';

-		switch(true) {

+		switch (true) {

 			case (is_bool($val) || $type == 'boolean'):

 		   		$this->debug("serialize_val: serialize boolean");

         		if ($type == 'boolean') {

 	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

+	        	} elseif (!$val) {

 	        		$val = 0;

 	        	}

 				if ($use == 'literal') {

@@ -511,7 +511,7 @@ 
 					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";

 				}

 				break;

-			case (is_float($val)|| is_double($val) || $type == 'float'):

+			case (is_float($val) || is_double($val) || $type == 'float'):

 		   		$this->debug("serialize_val: serialize float");

 				if ($use == 'literal') {

 					$xml .= "<$name$xmlns$atts>$val</$name>";

@@ -536,17 +536,17 @@ 
 					$this->appendDebug($val->getDebug());

 					$val->clearDebug();

 		        } else {

-					if (! $name) {

+					if (!$name) {

 						$name = get_class($val);

 						$this->debug("In serialize_val, used class name $name as element name");

 					} else {

-						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));

+						$this->debug("In serialize_val, do not override name $name for element name for class ".get_class($val));

 					}

-					foreach(get_object_vars($val) as $k => $v){

-						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);

+					foreach (get_object_vars($val) as $k => $v) {

+						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v, $k, false, false, false, false, $use) : $this->serialize_val($v, $k, false, false, false, false, $use);

 					}

 				}

-				if(isset($type) && isset($type_prefix)){

+				if (isset($type) && isset($type_prefix)) {

 					$type_str = " xsi:type=\"$type_prefix:$type\"";

 				} else {

 					$type_str = '';

@@ -561,12 +561,12 @@ 
 			case (is_array($val) || $type):

 				// detect if struct or array

 				$valueType = $this->isArraySimpleOrStruct($val);

-                if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){

+                if ($valueType == 'arraySimple' || preg_match('/^ArrayOf/', $type)) {

 			   		$this->debug("serialize_val: serialize array");

 					$i = 0;

-					if(is_array($val) && count($val)> 0){

-						foreach($val as $v){

-	                    	if(is_object($v) && get_class($v) ==  'soapval'){

+					if (is_array($val) && count($val) > 0) {

+						foreach ($val as $v) {

+	                    	if (is_object($v) && get_class($v) == 'soapval') {

 								$tt_ns = $v->type_ns;

 								$tt = $v->type;

 							} elseif (is_array($v)) {

@@ -576,26 +576,26 @@ 
 	                        }

 							$array_types[$tt] = 1;

 							// TODO: for literal, the name should be $name

-							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);

+							$xml .= $this->serialize_val($v, 'item', false, false, false, false, $use);

 							++$i;

 						}

-						if(count($array_types) > 1){

+						if (count($array_types) > 1) {

 							$array_typename = 'xsd:anyType';

-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

+						} elseif (isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

 							if ($tt == 'integer') {

 								$tt = 'int';

 							}

 							$array_typename = 'xsd:'.$tt;

-						} elseif(isset($tt) && $tt == 'arraySimple'){

+						} elseif (isset($tt) && $tt == 'arraySimple') {

 							$array_typename = 'SOAP-ENC:Array';

-						} elseif(isset($tt) && $tt == 'arrayStruct'){

+						} elseif (isset($tt) && $tt == 'arrayStruct') {

 							$array_typename = 'unnamed_struct_use_soapval';

 						} else {

 							// if type is prefixed, create type prefix

-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){

-								 $array_typename = 'xsd:' . $tt;

+							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']) {

+								 $array_typename = 'xsd:'.$tt;

 							} elseif ($tt_ns) {

-								$tt_prefix = 'ns' . rand(1000, 9999);

+								$tt_prefix = 'ns'.rand(1000, 9999);

 								$array_typename = "$tt_prefix:$tt";

 								$xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";

 							} else {

@@ -625,7 +625,7 @@ 
 				} else {

 					// got a struct

 			   		$this->debug("serialize_val: serialize struct");

-					if(isset($type) && isset($type_prefix)){

+					if (isset($type) && isset($type_prefix)) {

 						$type_str = " xsi:type=\"$type_prefix:$type\"";

 					} else {

 						$type_str = '';

@@ -635,15 +635,15 @@ 
 					} else {

 						$xml .= "<$name$xmlns$type_str$atts>";

 					}

-					foreach($val as $k => $v){

+					foreach ($val as $k => $v) {

 						// Apache Map

 						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {

 							$xml .= '<item>';

-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);

-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);

+							$xml .= $this->serialize_val($k, 'key', false, false, false, false, $use);

+							$xml .= $this->serialize_val($v, 'value', false, false, false, false, $use);

 							$xml .= '</item>';

 						} else {

-							$xml .= $this->serialize_val($v,$k,false,false,false,false,$use);

+							$xml .= $this->serialize_val($v, $k, false, false, false, false, $use);

 						}

 					}

 					$xml .= "</$name>";

@@ -670,12 +670,12 @@ 
     * @return string the message

     * @access public

     */

-    function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){

+    function serializeEnvelope($body, $headers = false, $namespaces = array(), $style = 'rpc', $use = 'encoded', $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/') {

     // TODO: add an option to automatically run utf8_encode on $body and $headers

     // if $this->soap_defencoding is UTF-8.  Not doing this automatically allows

     // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1

 

-	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");

+	$this->debug("In serializeEnvelope length=".strlen($body)." body (max 1000 characters)=".substr($body, 0, 1000)." style=$style use=$use encodingStyle=$encodingStyle");

 	$this->debug("headers:");

 	$this->appendDebug($this->varDump($headers));

 	$this->debug("namespaces:");

@@ -683,15 +683,15 @@ 
 

 	// serialize namespaces

     $ns_string = '';

-	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){

+	foreach (array_merge($this->namespaces, $namespaces) as $k => $v) {

 		$ns_string .= " xmlns:$k=\"$v\"";

 	}

-	if($encodingStyle) {

+	if ($encodingStyle) {

 		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";

 	}

 

 	// serialize headers

-	if($headers){

+	if ($headers) {

 		if (is_array($headers)) {

 			$xml = '';

 			foreach ($headers as $k => $v) {

@@ -708,7 +708,7 @@ 
 	}

 	// serialize envelope

 	return

-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".

+	'<?xml version="1.0" encoding="'.$this->soap_defencoding.'"?'.">".

 	'<SOAP-ENV:Envelope'.$ns_string.">".

 	$headers.

 	"<SOAP-ENV:Body>".

@@ -725,7 +725,7 @@ 
 	 * @access public

 	 * @deprecated

 	 */

-    function formatDump($str){

+    function formatDump($str) {

 		$str = htmlspecialchars($str);

 		return nl2br($str);

     }

@@ -737,7 +737,7 @@ 
 	* @return	string contracted qname

 	* @access   private

 	*/

-	function contractQname($qname){

+	function contractQname($qname) {

 		// get element namespace

 		//$this->xdebug("Contract $qname");

 		if (strrpos($qname, ':')) {

@@ -747,7 +747,7 @@ 
 			$ns = substr($qname, 0, strrpos($qname, ':'));

 			$p = $this->getPrefixFromNamespace($ns);

 			if ($p) {

-				return $p . ':' . $name;

+				return $p.':'.$name;

 			}

 			return $qname;

 		} else {

@@ -762,14 +762,14 @@ 
 	* @return	string expanded qname

 	* @access   private

 	*/

-	function expandQname($qname){

+	function expandQname($qname) {

 		// get element prefix

-		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){

+		if (strpos($qname, ':') && !preg_match('/^http:\/\//', $qname)) {

 			// get unqualified name

-			$name = substr(strstr($qname,':'),1);

+			$name = substr(strstr($qname, ':'), 1);

 			// get ns prefix

-			$prefix = substr($qname,0,strpos($qname,':'));

-			if(isset($this->namespaces[$prefix])){

+			$prefix = substr($qname, 0, strpos($qname, ':'));

+			if (isset($this->namespaces[$prefix])) {

 				return $this->namespaces[$prefix].':'.$name;

 			} else {

 				return $qname;

@@ -787,10 +787,10 @@ 
     * @return string The local part

     * @access public

     */

-	function getLocalPart($str){

-		if($sstr = strrchr($str,':')){

+	function getLocalPart($str) {

+		if ($sstr = strrchr($str, ':')) {

 			// get unqualified name

-			return substr( $sstr, 1 );

+			return substr($sstr, 1);

 		} else {

 			return $str;

 		}

@@ -804,10 +804,10 @@ 
     * @return mixed The prefix or false if there is no prefix

     * @access public

     */

-	function getPrefix($str){

-		if($pos = strrpos($str,':')){

+	function getPrefix($str) {

+		if ($pos = strrpos($str, ':')) {

 			// get prefix

-			return substr($str,0,$pos);

+			return substr($str, 0, $pos);

 		}

 		return false;

 	}

@@ -819,7 +819,7 @@ 
     * @return mixed The namespace, false if no namespace has the specified prefix

     * @access public

     */

-	function getNamespaceFromPrefix($prefix){

+	function getNamespaceFromPrefix($prefix) {

 		if (isset($this->namespaces[$prefix])) {

 			return $this->namespaces[$prefix];

 		}

@@ -860,7 +860,7 @@ 
 			$sec = time();

 			$usec = 0;

 		}

-		return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);

+		return strftime('%Y-%m-%d %H:%M:%S', $sec).'.'.sprintf('%06d', $usec);

 	}

 

 	/**

@@ -901,31 +901,31 @@ 
 * @return	mixed ISO 8601 date string or false

 * @access   public

 */

-function timestamp_to_iso8601($timestamp,$utc=true){

-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);

+function timestamp_to_iso8601($timestamp, $utc = true) {

+	$datestr = date('Y-m-d\TH:i:sO', $timestamp);

 	$pos = strrpos($datestr, "+");

 	if ($pos === FALSE) {

 		$pos = strrpos($datestr, "-");

 	}

 	if ($pos !== FALSE) {

 		if (strlen($datestr) == $pos + 5) {

-			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);

+			$datestr = substr($datestr, 0, $pos + 3).':'.substr($datestr, -2);

 		}

 	}

-	if($utc){

+	if ($utc) {

 		$pattern = '/'.

-		'([0-9]{4})-'.	// centuries & years CCYY-

-		'([0-9]{2})-'.	// months MM-

-		'([0-9]{2})'.	// days DD

-		'T'.			// separator T

-		'([0-9]{2}):'.	// hours hh:

-		'([0-9]{2}):'.	// minutes mm:

-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...

-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+		'([0-9]{4})-'.// centuries & years CCYY-

+		'([0-9]{2})-'.// months MM-

+		'([0-9]{2})'.// days DD

+		'T'.// separator T

+		'([0-9]{2}):'.// hours hh:

+		'([0-9]{2}):'.// minutes mm:

+		'([0-9]{2})(\.[0-9]*)?'.// seconds ss.ss...

+		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'.// Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

 		'/';

 

-		if(preg_match($pattern,$datestr,$regs)){

-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);

+		if (preg_match($pattern, $datestr, $regs)) {

+			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ', $regs[1], $regs[2], $regs[3], $regs[4], $regs[5], $regs[6]);

 		}

 		return false;

 	} else {

@@ -940,27 +940,27 @@ 
 * @return	mixed Unix timestamp (int) or false

 * @access   public

 */

-function iso8601_to_timestamp($datestr){

+function iso8601_to_timestamp($datestr) {

 	$pattern = '/'.

-	'([0-9]{4})-'.	// centuries & years CCYY-

-	'([0-9]{2})-'.	// months MM-

-	'([0-9]{2})'.	// days DD

-	'T'.			// separator T

-	'([0-9]{2}):'.	// hours hh:

-	'([0-9]{2}):'.	// minutes mm:

-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...

-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+	'([0-9]{4})-'.// centuries & years CCYY-

+	'([0-9]{2})-'.// months MM-

+	'([0-9]{2})'.// days DD

+	'T'.// separator T

+	'([0-9]{2}):'.// hours hh:

+	'([0-9]{2}):'.// minutes mm:

+	'([0-9]{2})(\.[0-9]+)?'.// seconds ss.ss...

+	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'.// Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

 	'/';

-	if(preg_match($pattern,$datestr,$regs)){

+	if (preg_match($pattern, $datestr, $regs)) {

 		// not utc

-		if($regs[8] != 'Z'){

-			$op = substr($regs[8],0,1);

-			$h = substr($regs[8],1,2);

-			$m = substr($regs[8],strlen($regs[8])-2,2);

-			if($op == '-'){

+		if ($regs[8] != 'Z') {

+			$op = substr($regs[8], 0, 1);

+			$h = substr($regs[8], 1, 2);

+			$m = substr($regs[8], strlen($regs[8]) - 2, 2);

+			if ($op == '-') {

 				$regs[4] = $regs[4] + $h;

 				$regs[5] = $regs[5] + $m;

-			} elseif($op == '+'){

+			} elseif ($op == '+') {

 				$regs[4] = $regs[4] - $h;

 				$regs[5] = $regs[5] - $m;

 			}

main/inc/lib/link.lib.php

Spacing +108 added lines, -108 removed lines

@@ -77,11 +77,11 @@ 
         $params['session_id'] = api_get_session_id();
         $params['category_id'] = isset($params['category_id']) ? $params['category_id'] : 0;
 
-        $sql =  "SELECT MAX(display_order)
+        $sql = "SELECT MAX(display_order)
                 FROM  ".$this->table."
                 WHERE
                     c_id = $courseId AND
-                    category_id = '" . intval($params['category_id'])."'";
+                    category_id = '".intval($params['category_id'])."'";
         $result = Database:: query($sql);
         list ($orderMax) = Database:: fetch_row($result);
         $order = $orderMax + 1;
@@ -185,7 +185,7 @@ 
 
             // We ensure URL to be absolute.
             if (strpos($urllink, '://') === false) {
-                $urllink = 'http://' . $urllink;
+                $urllink = 'http://'.$urllink;
             }
 
             // If the title is empty, we use the URL as title.
@@ -207,7 +207,7 @@ 
                     'c_id' => $course_id,
                     'url' => $urllink,
                     'title' => $title,
-                    'description' => $description ,
+                    'description' => $description,
                     'category_id' => $selectcategory,
                     'on_homepage' => $onhomepage,
                     'target' => $target,
@@ -220,9 +220,9 @@ 
                 if ((api_get_setting('search_enabled') == 'true') &&
                     $link_id && extension_loaded('xapian')
                 ) {
-                    require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
-                    require_once api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php';
-                    require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+                    require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
+                    require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
+                    require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
                     $course_int_id = $_course['real_id'];
                     $courseCode = $_course['code'];
@@ -235,7 +235,7 @@ 
                         if (isset ($_REQUEST[$specific_field['code']])) {
                             $sterms = trim($_REQUEST[$specific_field['code']]);
                             if (!empty ($sterms)) {
-                                $all_specific_terms .= ' ' . $sterms;
+                                $all_specific_terms .= ' '.$sterms;
                                 $sterms = explode(',', $sterms);
                                 foreach ($sterms as $sterm) {
                                     $ic_slide->addTerm(
@@ -262,12 +262,12 @@ 
                         SE_COURSE_ID => $courseCode,
                         SE_TOOL_ID => TOOL_LINK,
                         SE_DATA => array(
-                            'link_id' => (int)$link_id
+                            'link_id' => (int) $link_id
                         ),
-                        SE_USER => (int)api_get_user_id(),
+                        SE_USER => (int) api_get_user_id(),
                     );
                     $ic_slide->xapian_data = serialize($xapian_data);
-                    $description = $all_specific_terms . ' ' . $description;
+                    $description = $all_specific_terms.' '.$description;
                     $ic_slide->addValue('content', $description);
 
                     // Add category name if set.
@@ -279,7 +279,7 @@ 
                         $sql_cat = sprintf(
                             $sql_cat,
                             $table_link_category,
-                            (int)$selectcategory,
+                            (int) $selectcategory,
                             $course_int_id
                         );
                         $result = Database:: query($sql_cat);
@@ -399,7 +399,7 @@ 
                 // This will make a restore function possible for the platform administrator.
 
                 $sql = "UPDATE $tbl_link SET on_homepage='0'
-                        WHERE c_id = $course_id AND id='" . $id . "'";
+                        WHERE c_id = $course_id AND id='".$id."'";
                 Database:: query($sql);
 
                 api_item_property_update(
@@ -415,12 +415,12 @@ 
                 break;
             case 'category':
                 // First we delete the category itself and afterwards all the links of this category.
-                $sql = "DELETE FROM " . $tbl_categories . "
-                        WHERE c_id = $course_id AND id='" . $id . "'";
+                $sql = "DELETE FROM ".$tbl_categories."
+                        WHERE c_id = $course_id AND id='".$id."'";
                 Database:: query($sql);
 
-                $sql = "DELETE FROM " . $tbl_link . "
-                        WHERE c_id = $course_id AND category_id='" . $id . "'";
+                $sql = "DELETE FROM ".$tbl_link."
+                        WHERE c_id = $course_id AND category_id='".$id."'";
                 Database:: query($sql);
 
                 api_item_property_update(
@@ -459,16 +459,16 @@ 
                 $row = Database:: fetch_array($res);
                 require_once api_get_path(
                         LIBRARY_PATH
-                    ) . 'search/ChamiloIndexer.class.php';
+                    ).'search/ChamiloIndexer.class.php';
                 $di = new ChamiloIndexer();
-                $di->remove_document((int)$row['search_did']);
+                $di->remove_document((int) $row['search_did']);
             }
             $sql = 'DELETE FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s LIMIT 1';
             $sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_LINK, $link_id);
             Database:: query($sql);
 
             // Remove terms from db.
-            require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+            require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
             delete_all_values_for_item($course_id, TOOL_DOCUMENT, $link_id);
         }
     }
@@ -484,8 +484,8 @@ 
     {
         $tbl_link = Database:: get_course_table(TABLE_LINK);
         $course_id = api_get_course_int_id();
-        $sql = "SELECT * FROM " . $tbl_link . "
-                WHERE c_id = $course_id AND id='" . intval($id) . "' ";
+        $sql = "SELECT * FROM ".$tbl_link."
+                WHERE c_id = $course_id AND id='".intval($id)."' ";
         $result = Database::query($sql);
         $data = array();
         if (Database::num_rows($result)) {
@@ -514,7 +514,7 @@ 
 
         // We ensure URL to be absolute.
         if (strpos($values['url'], '://') === false) {
-            $values['url'] = 'http://' . $_POST['url'];
+            $values['url'] = 'http://'.$_POST['url'];
         }
 
         // If the title is empty, we use the URL as title.
@@ -532,18 +532,18 @@ 
         }
 
         // Finding the old category_id.
-        $sql = "SELECT * FROM " . $tbl_link . "
-                WHERE c_id = $course_id AND id='" . $id . "'";
+        $sql = "SELECT * FROM ".$tbl_link."
+                WHERE c_id = $course_id AND id='".$id."'";
         $result = Database:: query($sql);
         $row = Database:: fetch_array($result);
         $category_id = $row['category_id'];
 
         if ($category_id != $values['category_id']) {
             $sql = "SELECT MAX(display_order)
-                    FROM " . $tbl_link . "
+                    FROM " . $tbl_link."
                     WHERE
                         c_id = $course_id AND
-                        category_id='" . intval($values['category_id']) . "'";
+                        category_id='".intval($values['category_id'])."'";
             $result = Database:: query($sql);
             list ($max_display_order) = Database:: fetch_row($result);
             $max_display_order++;
@@ -560,7 +560,7 @@ 
             'target' => $values['target'],
             'category_id' => $values['category_id'],
         ];
-        Database::update($tbl_link, $params, ['c_id = ? AND id = ?' => [$course_id, $id] ]);
+        Database::update($tbl_link, $params, ['c_id = ? AND id = ?' => [$course_id, $id]]);
 
         // Update search enchine and its values table if enabled.
         if (api_get_setting('search_enabled') == 'true') {
@@ -613,7 +613,7 @@ 
                             $_REQUEST[$specific_field['code']]
                         );
                         if (!empty ($sterms)) {
-                            $all_specific_terms .= ' ' . $sterms;
+                            $all_specific_terms .= ' '.$sterms;
                             $sterms = explode(',', $sterms);
                             foreach ($sterms as $sterm) {
                                 $ic_slide->addTerm(
@@ -640,13 +640,13 @@ 
                     SE_COURSE_ID => $course_id,
                     SE_TOOL_ID => TOOL_LINK,
                     SE_DATA => array(
-                        'link_id' => (int)$id
+                        'link_id' => (int) $id
                     ),
-                    SE_USER => (int)api_get_user_id(),
+                    SE_USER => (int) api_get_user_id(),
 
                 );
                 $ic_slide->xapian_data = serialize($xapian_data);
-                $link_description = $all_specific_terms . ' ' . $link_description;
+                $link_description = $all_specific_terms.' '.$link_description;
                 $ic_slide->addValue('content', $link_description);
 
                 // Add category name if set.
@@ -674,7 +674,7 @@ 
                 $di = new ChamiloIndexer();
                 isset ($_POST['language']) ? $lang = Database:: escape_string($_POST['language']) : $lang = 'english';
                 $di->connectDb(null, null, $lang);
-                $di->remove_document((int)$se_ref['search_did']);
+                $di->remove_document((int) $se_ref['search_did']);
                 $di->addChunk($ic_slide);
 
                 // Index and return search engine document id.
@@ -791,7 +791,7 @@ 
         $sql = "SELECT *, linkcat.id
                 FROM $tblLinkCategory linkcat
                 WHERE
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                     $sessionCondition
                 ORDER BY linkcat.display_order DESC";
 
@@ -803,10 +803,10 @@ 
                 INNER JOIN $tblItemProperty itemproperties
                 ON (linkcat.id = itemproperties.ref AND linkcat.c_id = itemproperties.c_id)
                 WHERE
-                    itemproperties.tool = '" . TOOL_LINK_CATEGORY . "' AND
+                    itemproperties.tool = '".TOOL_LINK_CATEGORY."' AND
                     (itemproperties.visibility = '0' OR itemproperties.visibility = '1')
                     $sessionCondition AND
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                 ORDER BY linkcat.display_order DESC";
 
         $result = Database::query($sql);
@@ -829,10 +829,10 @@ 
                 INNER JOIN $tblItemProperty itemproperties
                 ON (linkcat.id = itemproperties.ref AND linkcat.c_id = itemproperties.c_id)
                 WHERE
-                    itemproperties.tool = '" . TOOL_LINK_CATEGORY . "' AND
+                    itemproperties.tool = '".TOOL_LINK_CATEGORY."' AND
                     (itemproperties.visibility = '0' OR itemproperties.visibility = '1')
                     $sessionCondition AND
-                    linkcat.c_id = " . $courseId . "
+                    linkcat.c_id = ".$courseId."
                 ORDER BY linkcat.display_order DESC
                 ";
         $result = Database::query($sql);
@@ -864,12 +864,12 @@ 
                 INNER JOIN $TABLE_ITEM_PROPERTY itemproperties
                 ON (link.id=itemproperties.ref AND link.c_id = itemproperties.c_id )
                 WHERE
-                    itemproperties.tool='" . TOOL_LINK . "' AND
-                    link.category_id='" . $catid . "' AND
+                    itemproperties.tool='".TOOL_LINK."' AND
+                    link.category_id='" . $catid."' AND
                     (itemproperties.visibility='0' OR itemproperties.visibility='1')
                     $condition_session AND
-                    link.c_id = " . $course_id . " AND
-                    itemproperties.c_id = " . $course_id . "
+                    link.c_id = ".$course_id." AND
+                    itemproperties.c_id = " . $course_id."
                 ORDER BY link.display_order DESC";
         $result = Database:: query($sql);
         $numberoflinks = Database:: num_rows($result);
@@ -892,14 +892,14 @@ 
                             'retweet',
                             'default btn-sm',
                             array(
-                                'onclick' => "check_url('" . $myrow['id'] . "', '" . addslashes($myrow['url']) . "');",
+                                'onclick' => "check_url('".$myrow['id']."', '".addslashes($myrow['url'])."');",
                                 'title' => get_lang('CheckURL')
                                 )
                             );
                     $link_validator .= Display::span(
                         '',
                         array(
-                            'id' => 'url_id_' . $myrow['id'],
+                            'id' => 'url_id_'.$myrow['id'],
                             'class' => 'check-link'
                             )
                     );
@@ -909,10 +909,10 @@ 
                 if (api_is_allowed_to_edit(null, true)) {
 
                     if ($session_id == $myrow['session_id']) {
-                        $url = api_get_self() . '?' . api_get_cidreq() .
-                            '&action=editlink&category=' . (!empty ($category) ? $category : '') .
-                            '&id=' . $myrow['id'] .
-                            '&category_id=' . $myrow['id'];
+                        $url = api_get_self().'?'.api_get_cidreq().
+                            '&action=editlink&category='.(!empty ($category) ? $category : '').
+                            '&id='.$myrow['id'].
+                            '&category_id='.$myrow['id'];
                         $title = get_lang('Edit');
                         $toolbar .= Display::toolbarButton(
                             '',
@@ -940,10 +940,10 @@ 
                         }*/
 
                         if ($myrow['visibility'] == '1') {
-                            $url .= 'link.php?' . api_get_cidreq() .
-                                '&sec_token=' . $token .
-                                '&action=invisible&id=' . $myrow['id'] .
-                                '&scope=link&category_id=' . $myrow['category_id'];
+                            $url .= 'link.php?'.api_get_cidreq().
+                                '&sec_token='.$token.
+                                '&action=invisible&id='.$myrow['id'].
+                                '&scope=link&category_id='.$myrow['category_id'];
                             $title = get_lang('MakeInvisible');
                             $toolbar .= Display::toolbarButton(
                                 '',
@@ -957,7 +957,7 @@ 
 
                         }
                         if ($myrow['visibility'] == '0') {
-                            $url .= 'link.php?' . api_get_cidreq() .'&sec_token=' . $token .'&action=visible&id=' . $myrow['id'] .'&scope=link&category_id=' . $myrow['category_id'];
+                            $url .= 'link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=visible&id='.$myrow['id'].'&scope=link&category_id='.$myrow['category_id'];
                             $title = get_lang('MakeVisible');
                             $toolbar .= Display::toolbarButton(
                                 '',
@@ -970,8 +970,8 @@ 
                             );
                         }
 
-                        $url .= api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=deletelink&id=' . $myrow['id'] .'&category_id=' . $myrow['category_id'];
-                        $event = "javascript: if(!confirm('" . get_lang('LinkDelconfirm') . "'))return false;";
+                        $url .= api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=deletelink&id='.$myrow['id'].'&category_id='.$myrow['category_id'];
+                        $event = "javascript: if(!confirm('".get_lang('LinkDelconfirm')."'))return false;";
                         $title = get_lang('Delete');
 
                         $toolbar .= Display::toolbarButton(
@@ -1012,7 +1012,7 @@ 
                     $content .= '<div class="pull-right"><div class="btn-group">'.$toolbar.'</div></div>';
                     $content .= '<h4 class="list-group-item-heading">';
                     $content .= $iconLink;
-                    $url =  'link_goto.php?' . api_get_cidreq() .'&link_id=' . $myrow['id'] .'&link_url=' . urlencode($myrow['url']);
+                    $url = 'link_goto.php?'.api_get_cidreq().'&link_id='.$myrow['id'].'&link_url='.urlencode($myrow['url']);
                     $content .= Display::tag(
                             'a',
                             Security:: remove_XSS($myrow['title']),
@@ -1025,7 +1025,7 @@ 
                     $content .= $session_img;
                     $content .= '</h4>';
 
-                    $content .= '<p class="list-group-item-text">' . $myrow['description'] . '</p>';
+                    $content .= '<p class="list-group-item-text">'.$myrow['description'].'</p>';
                     $content .= '</div>';
                 } else {
                     if (api_is_allowed_to_edit(null, true)) {
@@ -1033,7 +1033,7 @@ 
                         $content .= '<div class="pull-right"><div class="btn-group">'.$toolbar.'</div></div>';
                         $content .= '<h4 class="list-group-item-heading">';
                         $content .= $iconLink;
-                        $url = 'link_goto.php?' . api_get_cidreq() .'&link_id=' . $myrow['id'] . "&link_url=" . urlencode($myrow['url']);
+                        $url = 'link_goto.php?'.api_get_cidreq().'&link_id='.$myrow['id']."&link_url=".urlencode($myrow['url']);
                         $content .= Display::tag(
                                 'a',
                                 Security:: remove_XSS($myrow['title']),
@@ -1046,7 +1046,7 @@ 
                         $content .= $link_validator;
                         $content .= $session_img;
                         $content .= '</h4>';
-                        $content .= '<p class="list-group-item-text">' . $myrow['description'] . '</p>';
+                        $content .= '<p class="list-group-item-text">'.$myrow['description'].'</p>';
                         $content .= '</div>';
                     }
                 }
@@ -1068,58 +1068,58 @@ 
     {
         $categoryId = $category['id'];
         $token = null;
-        $tools = '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&sec_token=' . $token . '&action=editcategory&id=' . $categoryId . '&category_id=' . $categoryId . '" title=' . get_lang('Modify') . '">' .
+        $tools = '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=editcategory&id='.$categoryId.'&category_id='.$categoryId.'" title='.get_lang('Modify').'">'.
             Display:: return_icon(
                 'edit.png',
                 get_lang('Modify'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
 
         // DISPLAY MOVE UP COMMAND only if it is not the top link.
         if ($currentCategory != 0) {
-            $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&sec_token=' . $token . '&action=up&up='.$categoryId.'&category_id='.$categoryId.'" title="'.get_lang('Up').'">'.
+            $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=up&up='.$categoryId.'&category_id='.$categoryId.'" title="'.get_lang('Up').'">'.
                 Display:: return_icon(
                     'up.png',
                     get_lang('Up'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         } else {
             $tools .= Display:: return_icon(
                 'up_na.png',
                 get_lang('Up'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
         }
 
         // DISPLAY MOVE DOWN COMMAND only if it is not the bottom link.
-        if ($currentCategory < $countCategories-1) {
-            $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=down&down=' . $categoryId .'&category_id=' . $categoryId . '">'.
+        if ($currentCategory < $countCategories - 1) {
+            $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=down&down='.$categoryId.'&category_id='.$categoryId.'">'.
                 Display:: return_icon(
                     'down.png',
                     get_lang('Down'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         } else {
             $tools .= Display:: return_icon(
                     'down_na.png',
                     get_lang('Down'),
                     array(),
                     ICON_SIZE_SMALL
-                ) . '</a>';
+                ).'</a>';
         }
 
-        $tools .= '<a href="' . api_get_self() . '?' . api_get_cidreq() .'&sec_token=' . $token .'&action=deletecategory&id='.$categoryId.            "&category_id=$categoryId\"
-            onclick=\"javascript: if(!confirm('" . get_lang('CategoryDelconfirm') . "')) return false;\">".
+        $tools .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&sec_token='.$token.'&action=deletecategory&id='.$categoryId."&category_id=$categoryId\"
+            onclick=\"javascript: if(!confirm('".get_lang('CategoryDelconfirm')."')) return false;\">".
             Display:: return_icon(
                 'delete.png',
                 get_lang('Delete'),
                 array(),
                 ICON_SIZE_SMALL
-            ) . '</a>';
+            ).'</a>';
 
         return $tools;
     }
@@ -1166,7 +1166,7 @@ 
             $movetable = $tbl_link;
             // Getting the category of the link.
             if (!empty ($thiscatlinkId)) {
-                $sql = "SELECT category_id FROM " . $movetable . "
+                $sql = "SELECT category_id FROM ".$movetable."
                         WHERE c_id = $courseId AND id='$thiscatlinkId'";
                 $result = Database:: query($sql);
                 $catid = Database:: fetch_array($result);
@@ -1186,7 +1186,7 @@ 
                         ORDER BY display_order $sortDirection";
             } else {
                 $sql = "SELECT id, display_order FROM  $movetable
-                        WHERE c_id = $courseId AND category_id='" . $catid[0] . "'
+                        WHERE c_id = $courseId AND category_id='".$catid[0]."'
                         ORDER BY display_order $sortDirection";
             }
             $linkresult = Database:: query($sql);
@@ -1200,12 +1200,12 @@ 
                     $nextlinkOrder = $sortrow['display_order'];
 
                     Database:: query(
-                        "UPDATE " . $movetable . "
+                        "UPDATE ".$movetable."
                         SET display_order = '$nextlinkOrder'
                         WHERE c_id = $courseId  AND id =  '$thiscatlinkId'"
                     );
                     Database:: query(
-                        "UPDATE " . $movetable . "
+                        "UPDATE ".$movetable."
                         SET display_order = '$thislinkOrder'
                         WHERE c_id = $courseId  AND id =  '$nextlinkId'"
                     );
@@ -1233,10 +1233,10 @@ 
         $course_id = api_get_course_int_id();
 
         $result = Database:: query(
-            "SELECT id FROM " . $tbl_categories . "
-            WHERE c_id = $course_id AND category_title='" . Database::escape_string(
+            "SELECT id FROM ".$tbl_categories."
+            WHERE c_id = $course_id AND category_title='".Database::escape_string(
                 $catname
-            ) . "'"
+            )."'"
         );
         if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array(
                 $result
@@ -1246,7 +1246,7 @@ 
         }
 
         $result = Database:: query(
-            "SELECT MAX(display_order) FROM " . $tbl_categories . " WHERE c_id = $course_id "
+            "SELECT MAX(display_order) FROM ".$tbl_categories." WHERE c_id = $course_id "
         );
         list ($max_order) = Database:: fetch_row($result);
 
@@ -1273,12 +1273,12 @@ 
         $tbl_link = Database:: get_course_table(TABLE_LINK);
         $course_id = api_get_course_int_id();
 
-        $urleq = "url='" . Database:: escape_string($url) . "'";
-        $cateq = "category_id=" . intval($cat);
+        $urleq = "url='".Database:: escape_string($url)."'";
+        $cateq = "category_id=".intval($cat);
 
         $result = Database:: query("
             SELECT id FROM $tbl_link
-            WHERE c_id = $course_id AND " . $urleq . ' AND ' . $cateq
+            WHERE c_id = $course_id AND ".$urleq.' AND '.$cateq
         );
 
         if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array(
@@ -1286,14 +1286,14 @@ 
             ))
         ) {
             Database:: query(
-                "UPDATE $tbl_link set title='" . Database:: escape_string(
+                "UPDATE $tbl_link set title='".Database:: escape_string(
                     $title
-                ) . "', description='" . Database:: escape_string(
+                )."', description='".Database:: escape_string(
                     $description
-                ) . "'
-                WHERE c_id = $course_id AND  id='" . Database:: escape_string(
+                )."'
+                WHERE c_id = $course_id AND  id='".Database:: escape_string(
                     $row['id']
-                ) . "'"
+                )."'"
             );
 
             $ipu = 'LinkUpdated';
@@ -1302,18 +1302,18 @@ 
             // Add new link
             $result = Database:: query(
                 "SELECT MAX(display_order) FROM  $tbl_link
-                WHERE c_id = $course_id AND category_id='" . intval($cat) . "'"
+                WHERE c_id = $course_id AND category_id='".intval($cat)."'"
             );
             list ($max_order) = Database:: fetch_row($result);
 
             Database:: query(
                 "INSERT INTO $tbl_link (c_id, url, title, description, category_id, display_order, on_homepage)
-                VALUES (" . api_get_course_int_id() . ",
-                '" . Database:: escape_string($url) . "',
-                '" . Database:: escape_string($title) . "',
-                '" . Database:: escape_string($description) . "',
-                '" . intval($cat) . "','" . (intval($max_order) + 1) . "',
-                '" . intval($on_homepage) .
+                VALUES (".api_get_course_int_id().",
+                '" . Database:: escape_string($url)."',
+                '" . Database:: escape_string($title)."',
+                '" . Database:: escape_string($description)."',
+                '" . intval($cat)."','".(intval($max_order) + 1)."',
+                '" . intval($on_homepage).
                 "')"
             );
 
@@ -1391,30 +1391,30 @@ 
                     )
                 ) { // possibly in <...>
                     if (($kwlist = trim($regs[1])) != '') {
-                        $kw = '<i kw="' . htmlspecialchars($kwlist) . '">';
+                        $kw = '<i kw="'.htmlspecialchars($kwlist).'">';
                     } else {
                         $kw = '';
                     }
                     // i.e. assume only one of the $hide_fields will be present
                     // and if found, hide the value as expando property of an <i> tag
                 } elseif (trim($value)) {
-                    $d .= ', ' . $key . ':' . $value;
+                    $d .= ', '.$key.':'.$value;
                 }
             }
         }
         if (!empty($d)) {
-            $d = substr($d, 2) . ' - ';
+            $d = substr($d, 2).' - ';
         }
 
         return Link::put_link(
             $url,
             $cat,
             $title,
-            $kw . ereg_replace(
+            $kw.ereg_replace(
                 '\[((/?(b|big|i|small|sub|sup|u))|br/)\]',
                 '<\\1>',
-                htmlspecialchars($d . $linkdata['description'])
-            ) . ($kw ? '</i>' : ''),
+                htmlspecialchars($d.$linkdata['description'])
+            ).($kw ? '</i>' : ''),
             $linkdata['on_homepage'] ? '1' : '0',
             $linkdata['hidden'] ? '1' : '0'
         );
@@ -1535,19 +1535,19 @@ 
         echo '<div class="actions">';
         if (api_is_allowed_to_edit(null, true)) {
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addlink&category_id='.$categoryId.'">'.
-                Display::return_icon('new_link.png', get_lang('LinkAdd'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_link.png', get_lang('LinkAdd'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addcategory&category_id='.$categoryId.'">'.
-                Display::return_icon('new_folder.png', get_lang('CategoryAdd'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_folder.png', get_lang('CategoryAdd'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $categories = Link::getLinkCategories($course_id, $session_id);
         $count = count($categories);
         if (!empty($count)) {
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=none">';
-            echo Display::return_icon('forum_listview.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . ' </a>';
+            echo Display::return_icon('forum_listview.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).' </a>';
 
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=all">';
-            echo Display::return_icon('forum_nestedview.png', get_lang('NestedView'), '', ICON_SIZE_MEDIUM) . '</a>';
+            echo Display::return_icon('forum_nestedview.png', get_lang('NestedView'), '', ICON_SIZE_MEDIUM).'</a>';
         }
         echo '</div>';
 
@@ -1579,12 +1579,12 @@ 
             $strVisibility = '';
             $visibilityClass = null;
             if ($myrow['visibility'] == '1') {
-                $strVisibility =  '<a href="link.php?' . api_get_cidreq() .  '&sec_token='.$token.'&action=invisible&id=' . $myrow['id'] . '&scope=' . TOOL_LINK_CATEGORY . '" title="' . get_lang('Hide') . '">' .
-                    Display :: return_icon('visible.png', get_lang('Hide'), array (), ICON_SIZE_SMALL) . '</a>';
+                $strVisibility = '<a href="link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=invisible&id='.$myrow['id'].'&scope='.TOOL_LINK_CATEGORY.'" title="'.get_lang('Hide').'">'.
+                    Display :: return_icon('visible.png', get_lang('Hide'), array(), ICON_SIZE_SMALL).'</a>';
             } elseif ($myrow['visibility'] == '0') {
                 $visibilityClass = 'invisible';
-                $strVisibility =  ' <a href="link.php?' . api_get_cidreq() .  '&sec_token='.$token.'&action=visible&id=' . $myrow['id'] . '&scope=' . TOOL_LINK_CATEGORY . '" title="' . get_lang('Show') . '">' .
-                    Display :: return_icon('invisible.png', get_lang('Show'), array (), ICON_SIZE_SMALL) . '</a>';
+                $strVisibility = ' <a href="link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=visible&id='.$myrow['id'].'&scope='.TOOL_LINK_CATEGORY.'" title="'.get_lang('Show').'">'.
+                    Display :: return_icon('invisible.png', get_lang('Show'), array(), ICON_SIZE_SMALL).'</a>';
             }
 
             $header = '';

main/inc/lib/add_many_session_to_category_functions.lib.php

Spacing +5 added lines, -5 removed lines

@@ -21,12 +21,12 @@ 
      * @assert () !== ''
      * @assert ('abc','single') !== ''
      */
-    function search_courses($needle,$type)
+    function search_courses($needle, $type)
     {
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 		$xajax_response = new xajaxResponse();
 		$return = '';
-		if(!empty($needle) && !empty($type)) {
+		if (!empty($needle) && !empty($type)) {
 			// xajax send utf8 datas... datas in db can be non-utf8 datas
 			$charset = api_get_system_encoding();
 			$needle = api_convert_encoding($needle, $charset, 'utf-8');
@@ -38,12 +38,12 @@ 
 			$course_list = array();
 
 			$return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
-			while($course = Database :: fetch_array($rs)) {
+			while ($course = Database :: fetch_array($rs)) {
 				$course_list[] = $course['id'];
-				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
+				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'], ENT_QUOTES).'">'.$course['name'].'</option>';
 			}
 			$return .= '</select>';
-			$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+			$xajax_response -> addAssign('ajax_list_courses_multiple', 'innerHTML', api_utf8_encode($return));
 		}
 		$_SESSION['course_list'] = $course_list;
 		return $xajax_response;

main/inc/lib/statistics.lib.php

Spacing +43 added lines, -43 removed lines

@@ -104,10 +104,10 @@ 
         $course_user_table = Database:: get_main_table(TABLE_MAIN_COURSE_USER);
         $course_table = Database:: get_main_table(TABLE_MAIN_COURSE);
         $user_table = Database:: get_main_table(TABLE_MAIN_USER);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
-        $active_filter = $onlyActive?' AND active=1':'';
-        $status_filter = isset($status)?' AND status = '.intval($status):'';
+        $active_filter = $onlyActive ? ' AND active=1' : '';
+        $status_filter = isset($status) ? ' AND status = '.intval($status) : '';
 
         if (api_is_multiple_url_enabled()) {
             $sql = "SELECT COUNT(DISTINCT(u.user_id)) AS number
@@ -131,7 +131,7 @@ 
                     FROM $user_table
                     WHERE 1=1 $status_filter $active_filter";
             if (isset ($categoryCode)) {
-                $status_filter = isset($status)?' AND status = '.intval($status):'';
+                $status_filter = isset($status) ? ' AND status = '.intval($status) : '';
                 $sql = "SELECT COUNT(DISTINCT(cu.user_id)) AS number
                         FROM $course_user_table cu, $course_table c
                         WHERE
@@ -156,7 +156,7 @@ 
     public static function countSessions()
     {
         $session_table = Database :: get_main_table(TABLE_MAIN_SESSION);
-        $access_url_rel_session_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+        $access_url_rel_session_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         if (api_is_multiple_url_enabled()) {
             $current_url_id = api_get_current_access_url_id();
             $sql = "SELECT COUNT(id) AS number
@@ -179,9 +179,9 @@ 
     public static function getNumberOfActivities()
     {
         // Database table definitions
-        $track_e_default  = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
+        $track_e_default = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
         $table_user = Database::get_main_table(TABLE_MAIN_USER);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
         if (api_is_multiple_url_enabled()) {
             $sql = "SELECT count(default_id) AS total_number_of_items
@@ -225,7 +225,7 @@ 
         $from = intval($from);
         $numberOfItems = intval($numberOfItems);
 
-        if (!in_array($direction, array('ASC','DESC'))) {
+        if (!in_array($direction, array('ASC', 'DESC'))) {
             $direction = 'DESC';
         }
 
@@ -276,7 +276,7 @@ 
         $sql .= " LIMIT $from,$numberOfItems ";
 
         $res = Database::query($sql);
-        $activities = array ();
+        $activities = array();
         while ($row = Database::fetch_row($res)) {
 
             if (strpos($row[1], '_object') === false && strpos($row[1], '_array') === false) {
@@ -343,7 +343,7 @@ 
         $sql = "SELECT code, name FROM $categoryTable
                 ORDER BY tree_pos";
         $res = Database::query($sql);
-        $categories = array ();
+        $categories = array();
         while ($category = Database::fetch_object($res)) {
             $categories[$category->code] = $category->name;
         }
@@ -364,7 +364,7 @@ 
             $data_max = ($data_max < $value ? $value : $data_max);
         }
         reset($data);
-        $result = array ();
+        $result = array();
         $delta = $max / $data_max;
         foreach ($data as $index => $value) {
             $result[$index] = (int) round($value * $delta);
@@ -398,9 +398,9 @@ 
             } else {
                 $number_label = Statistics::makeSizeString($number);
             }
-            $percentage = ($total>0?number_format(100*$number/$total, 1, ',', '.'):'0');
+            $percentage = ($total > 0 ? number_format(100 * $number / $total, 1, ',', '.') : '0');
 
-            echo '<tr class="row_'.($i%2 == 0 ? 'odd' : 'even').'">
+            echo '<tr class="row_'.($i % 2 == 0 ? 'odd' : 'even').'">
                     <td width="150">'.$subtitle.'</td>
                     <td width="550">'.Display::bar_progress($percentage, false).'</td>
                     <td align="right">'.$number_label.'</td>';
@@ -408,7 +408,7 @@ 
                 echo '<td align="right"> '.$percentage.'%</td>';
             }
             echo '</tr>';
-            $i ++;
+            $i++;
         }
         if ($showTotal) {
             if (!$isFileSize) {
@@ -428,17 +428,17 @@ 
     public static function printLoginStats($type)
     {
         $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
 
         $table_url = null;
         $where_url = null;
         $now = api_get_utc_datetime();
-        $where_url_last = ' WHERE login_date > DATE_SUB("' . $now . '",INTERVAL 1 %s)';
+        $where_url_last = ' WHERE login_date > DATE_SUB("'.$now.'",INTERVAL 1 %s)';
         if (api_is_multiple_url_enabled()) {
             $table_url = ", $access_url_rel_user_table";
             $where_url = " WHERE login_user_id=user_id AND access_url_id='".$current_url_id."'";
-            $where_url_last = ' AND login_date > DATE_SUB("' . $now . '",INTERVAL 1 %s)';
+            $where_url_last = ' AND login_date > DATE_SUB("'.$now.'",INTERVAL 1 %s)';
         }
 
         $period = get_lang('PeriodMonth');
@@ -453,13 +453,13 @@ 
             case 'hour':
                 $period = get_lang('PeriodHour');
                 $sql = "SELECT DATE_FORMAT( login_date, '%H' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url." GROUP BY stat_date ORDER BY stat_date ";
-                $sql_last_x = "SELECT DATE_FORMAT( login_date, '%H' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last,'DAY')." GROUP BY stat_date ORDER BY stat_date ";
+                $sql_last_x = "SELECT DATE_FORMAT( login_date, '%H' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last, 'DAY')." GROUP BY stat_date ORDER BY stat_date ";
                 break;
             case 'day':
                 $periodCollection = api_get_week_days_long();
                 $period = get_lang('PeriodDay');
                 $sql = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url." GROUP BY stat_date ORDER BY DATE_FORMAT( login_date, '%w' ) ";
-                $sql_last_x = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last,'WEEK')." GROUP BY stat_date ORDER BY DATE_FORMAT( login_date, '%w' ) ";
+                $sql_last_x = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table.$table_url.$where_url.sprintf($where_url_last, 'WEEK')." GROUP BY stat_date ORDER BY DATE_FORMAT( login_date, '%w' ) ";
                 break;
         }
         if ($sql_last_x) {
@@ -501,14 +501,14 @@ 
     {
         $totalLogin = array();
         $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
         if (api_is_multiple_url_enabled()) {
             $table_url = ", $access_url_rel_user_table";
             $where_url = " AND login_user_id=user_id AND access_url_id='".$current_url_id."'";
         } else {
             $table_url = '';
-            $where_url='';
+            $where_url = '';
         }
         $now = api_get_utc_datetime();
         $field = 'login_user_id';
@@ -540,14 +540,14 @@ 
     {
         $totalLogin = [];
         $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
         if (api_is_multiple_url_enabled()) {
             $table_url = ", $access_url_rel_user_table";
             $where_url = " AND login_user_id=user_id AND access_url_id='".$current_url_id."'";
         } else {
             $table_url = '';
-            $where_url='';
+            $where_url = '';
         }
         $now = api_get_utc_datetime();
         $field = 'login_user_id';
@@ -557,7 +557,7 @@ 
         $sql = "SELECT count($field) AS number, date(login_date) as login_date FROM $table $table_url WHERE DATE_ADD(login_date, INTERVAL 15 DAY) >= '$now' $where_url GROUP BY date(login_date)";
         
         $res = Database::query($sql);
-        while($row = Database::fetch_array($res,'ASSOC')){
+        while ($row = Database::fetch_array($res, 'ASSOC')) {
             $totalLogin[$row['login_date']] = $row['number'];
         }
         
@@ -652,13 +652,13 @@ 
     public static function printUserPicturesStats()
     {
         $user_table = Database :: get_main_table(TABLE_MAIN_USER);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
         $url_condition = null;
         $url_condition2 = null;
         $table = null;
         if (api_is_multiple_url_enabled()) {
-            $url_condition =  ", $access_url_rel_user_table as url WHERE url.user_id=u.user_id AND access_url_id='".$current_url_id."'";
+            $url_condition = ", $access_url_rel_user_table as url WHERE url.user_id=u.user_id AND access_url_id='".$current_url_id."'";
             $url_condition2 = " AND url.user_id=u.user_id AND access_url_id='".$current_url_id."'";
             $table = ", $access_url_rel_user_table as url ";
         }
@@ -690,7 +690,7 @@ 
             'width=200px',
             false
         );
-        $renderer =& $form->defaultRenderer();
+        $renderer = & $form->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $form->addElement('hidden', 'report', 'activities');
         $form->addElement('hidden', 'activities_direction', 'DESC');
@@ -740,10 +740,10 @@ 
         $columns[1] = 'access_date';
         $sql_order[SORT_ASC] = 'ASC';
         $sql_order[SORT_DESC] = 'DESC';
-        $per_page = isset($_GET['per_page'])?intval($_GET['per_page']) : 10;
-        $page_nr = isset($_GET['page_nr'])?intval($_GET['page_nr']) : 1;
-        $column = isset($_GET['column'])?intval($_GET['column']) : 0;
-        $date_diff = isset($_GET['date_diff'])?intval($_GET['date_diff']) : 60;
+        $per_page = isset($_GET['per_page']) ? intval($_GET['per_page']) : 10;
+        $page_nr = isset($_GET['page_nr']) ? intval($_GET['page_nr']) : 1;
+        $column = isset($_GET['column']) ? intval($_GET['column']) : 0;
+        $date_diff = isset($_GET['date_diff']) ? intval($_GET['date_diff']) : 60;
 
         $direction = isset($_GET['direction']) ? $_GET['direction'] : SORT_ASC;
 
@@ -772,25 +772,25 @@ 
                         access_url_id='".$current_url_id."'
                    GROUP BY c_id
                    HAVING c_id <> ''
-                   AND DATEDIFF( '".date('Y-m-d h:i:s')."' , access_date ) <= ". $date_diff;
+                   AND DATEDIFF( '".date('Y-m-d h:i:s')."' , access_date ) <= ".$date_diff;
         } else {
             $sql = "SELECT * FROM $table
                    GROUP BY c_id
                    HAVING c_id <> ''
-                   AND DATEDIFF( '".date('Y-m-d h:i:s')."' , access_date ) <= ". $date_diff;
+                   AND DATEDIFF( '".date('Y-m-d h:i:s')."' , access_date ) <= ".$date_diff;
         }
         $sql .= ' ORDER BY '.$columns[$column].' '.$sql_order[$direction];
-        $from = ($page_nr -1) * $per_page;
+        $from = ($page_nr - 1) * $per_page;
         $sql .= ' LIMIT '.$from.','.$per_page;
 
         echo '<p>'.get_lang('LastAccess').' &gt;= '.$date_diff.' '.get_lang('Days').'</p>';
         $res = Database::query($sql);
         if (Database::num_rows($res) > 0) {
-            $courses = array ();
+            $courses = array();
             while ($obj = Database::fetch_object($res)) {
                 $courseInfo = api_get_course_info_by_id($obj->c_id);
-                $course = array ();
-                $course[]= '<a href="'.api_get_path(WEB_COURSE_PATH).$courseInfo['code'].'">'.$courseInfo['code'].' <a>';
+                $course = array();
+                $course[] = '<a href="'.api_get_path(WEB_COURSE_PATH).$courseInfo['code'].'">'.$courseInfo['code'].' <a>';
                 // Allow sort by date hiding the numerical date
                 $course[] = '<span style="display:none;">'.$obj->access_date.'</span>'.api_convert_and_format_date($obj->access_date);
                 $courses[] = $course;
@@ -863,7 +863,7 @@ 
     {
         $user_friend_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
         $user_table = Database::get_main_table(TABLE_MAIN_USER);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
 
         if (api_is_multiple_url_enabled()) {
@@ -895,7 +895,7 @@ 
     {
         $totalLogin = array();
         $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
         $total = self::countUsers();
         if (api_is_multiple_url_enabled()) {
@@ -903,14 +903,14 @@ 
             $where_url = " AND login_user_id=user_id AND access_url_id='".$current_url_id."'";
         } else {
             $table_url = '';
-            $where_url='';
+            $where_url = '';
         }
         $now = api_get_utc_datetime();
-        $sql[get_lang('ThisDay')]    =
+        $sql[get_lang('ThisDay')] =
             "SELECT count(distinct(login_user_id)) AS number ".
             " FROM $table $table_url ".
             " WHERE DATE_ADD(login_date, INTERVAL 1 DAY) >= '$now' $where_url";
-        $sql[get_lang('Last7days')]  =
+        $sql[get_lang('Last7days')] =
             "SELECT count(distinct(login_user_id)) AS number ".
             " FROM $table $table_url ".
             " WHERE DATE_ADD(login_date, INTERVAL 7 DAY) >= '$now' $where_url";
@@ -922,7 +922,7 @@ 
             "SELECT count(distinct(login_user_id)) AS number ".
             " FROM $table $table_url ".
             " WHERE DATE_ADD(login_date, INTERVAL 6 MONTH) >= '$now' $where_url";
-        $sql[get_lang('NeverConnected')]      =
+        $sql[get_lang('NeverConnected')] =
             "SELECT count(distinct(login_user_id)) AS number ".
             " FROM $table $table_url WHERE 1=1 $where_url";
         foreach ($sql as $index => $query) {

main/inc/lib/javascript/chat/video.php

Spacing +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
 $idUserLocal = api_get_user_id();
 $userLocal = api_get_user_info($idUserLocal, true);
 $htmlHeadXtra[] = '<script type="text/javascript" src="'
-    . api_get_path(WEB_PATH) . 'web/assets/SimpleWebRTC/latest.js'
-    . '"></script>' . "\n";
+    . api_get_path(WEB_PATH).'web/assets/SimpleWebRTC/latest.js'
+    . '"></script>'."\n";
 
 $template = new Template();
 $template->assign('room_name', $chatVideo->getRoomName());

main/inc/lib/thematic.lib.php

Spacing +62 added lines, -62 removed lines

@@ -74,7 +74,7 @@ 
         $from = intval($from);
         $number_of_items = intval($number_of_items);
 
-        if (!in_array($direction, array('ASC','DESC'))) {
+        if (!in_array($direction, array('ASC', 'DESC'))) {
             $direction = 'ASC';
         }
 
@@ -97,24 +97,24 @@ 
             $thematic[1] = '<a href="index.php?'.api_get_cidreq().'&action=thematic_details&thematic_id='.$thematic[0].'">'.
                 Security::remove_XSS($thematic[1], STUDENT).$session_star.'</a>';
             if (api_is_allowed_to_edit(null, true)) {
-                $actions  = '';
+                $actions = '';
 
                 if (api_get_session_id()) {
                     if (api_get_session_id() == $thematic[3]) {
                         $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('lesson_plan.png',get_lang('ThematicPlan'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                            Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
                         $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('lesson_plan_calendar.png',get_lang('ThematicAdvance'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                            Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
 
                         $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
+                            Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
                         $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions .= Display::return_icon('lesson_plan_na.png',get_lang('ThematicPlan'),'',ICON_SIZE_SMALL).'&nbsp;';
-                        $actions .= Display::return_icon('lesson_plan_calendar_na.png',get_lang('ThematicAdvance'),'',ICON_SIZE_SMALL).'&nbsp;';
-                        $actions .= Display::return_icon('edit_na.png',get_lang('Edit'),'',ICON_SIZE_SMALL);
-                        $actions .= Display::return_icon('delete_na.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'&nbsp;';
+                        $actions .= Display::return_icon('lesson_plan_na.png', get_lang('ThematicPlan'), '', ICON_SIZE_SMALL).'&nbsp;';
+                        $actions .= Display::return_icon('lesson_plan_calendar_na.png', get_lang('ThematicAdvance'), '', ICON_SIZE_SMALL).'&nbsp;';
+                        $actions .= Display::return_icon('edit_na.png', get_lang('Edit'), '', ICON_SIZE_SMALL);
+                        $actions .= Display::return_icon('delete_na.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'&nbsp;';
                         $actions .= Display::url(
                             Display::return_icon('cd.gif', get_lang('Copy')),
                             'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$thematic[0]
@@ -122,26 +122,26 @@ 
                     }
                 } else {
                     $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic[0].'">'.
-                        Display::return_icon('lesson_plan.png',get_lang('ThematicPlan'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                        Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
                     $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic[0].'">'.
-                        Display::return_icon('lesson_plan_calendar.png',get_lang('ThematicAdvance'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                        Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
 
                     if ($thematic[2] > 1) {
                         $actions .= '<a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('up.png', get_lang('Up'),'',ICON_SIZE_SMALL).'</a>';
+                            Display::return_icon('up.png', get_lang('Up'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions .= Display::return_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
+                        $actions .= Display::return_icon('up_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
                     }
                     if ($thematic[2] < self::get_max_thematic_item()) {
                         $actions .= '<a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$thematic[0].'">'.
-                            Display::return_icon('down.png',get_lang('Down'),'',ICON_SIZE_SMALL).'</a>';
+                            Display::return_icon('down.png', get_lang('Down'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions .= Display::return_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
+                        $actions .= Display::return_icon('down_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
                     }
                     $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$thematic[0].'">'.
-                        Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
+                        Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
                     $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$thematic[0].'">'.
-                        Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+                        Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
                 }
                 $thematics[] = array($thematic[0], $thematic[1], $actions);
             }
@@ -278,9 +278,9 @@ 
         $res = Database::query($sql);
         if (Database::num_rows($res) > 0) {
             if (!empty($thematic_id)) {
-                $data = Database::fetch_array($res,'ASSOC');
+                $data = Database::fetch_array($res, 'ASSOC');
             } else {
-                while ($row = Database::fetch_array($res,'ASSOC')) {
+                while ($row = Database::fetch_array($res, 'ASSOC')) {
                     $data[$row['id']] = $row;
                 }
             }
@@ -375,7 +375,7 @@ 
 
         if (is_array($thematic_id)) {
             foreach ($thematic_id as $id) {
-                $id	= intval($id);
+                $id = intval($id);
                 $sql = "UPDATE $tbl_thematic SET active = 0
                         WHERE c_id = $course_id AND id = $id";
                 $result = Database::query($sql);
@@ -391,8 +391,8 @@ 
                     );
                 }
             }
-        } else  {
-            $thematic_id	= intval($thematic_id);
+        } else {
+            $thematic_id = intval($thematic_id);
             $sql = "UPDATE $tbl_thematic SET active = 0
                     WHERE c_id = $course_id AND id = $thematic_id";
             $result = Database::query($sql);
@@ -428,8 +428,8 @@ 
         $new_thematic_id = $thematic_copy->thematic_save();
         if (!empty($new_thematic_id)) {
             $thematic_advanced = self::get_thematic_advance_by_thematic_id($thematic_id);
-            if(!empty($thematic_advanced)) {
-                foreach($thematic_advanced as $item) {
+            if (!empty($thematic_advanced)) {
+                foreach ($thematic_advanced as $item) {
                     $thematic = new Thematic();
                     $thematic->set_thematic_advance_attributes(
                         0,
@@ -492,7 +492,7 @@ 
         $column = intval($column);
         $from   = intval($from);
         $number_of_items = intval($number_of_items);
-        if (!in_array($direction, array('ASC','DESC'))) {
+        if (!in_array($direction, array('ASC', 'DESC'))) {
             $direction = 'ASC';
         }
         $data = array();
@@ -525,8 +525,8 @@ 
                     $thematic_advance[1] = api_get_local_time($thematic_advance[1]);
                     $thematic_advance[1] = api_format_date($thematic_advance[1], DATE_TIME_FORMAT_LONG);
                     $actions  = '';
-                    $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_edit&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
-                    $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('delete.png',get_lang('Delete'),'',22).'</a></center>';
+                    $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_edit&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('edit.png', get_lang('Edit'), '', 22).'</a>';
+                    $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('delete.png', get_lang('Delete'), '', 22).'</a></center>';
                     $data[] = array($i, $thematic_advance[1], $thematic_advance[2], $thematic_advance[3], $actions);
                     $i++;
                 }
@@ -590,7 +590,7 @@ 
 
                 $session_star = '';
                 if (api_is_allowed_to_edit(null, true)) {
-                    if ($thematic_advance['session_id'] !=0) {
+                    if ($thematic_advance['session_id'] != 0) {
                         $session_star = api_get_session_image(api_get_session_id(), $uinfo['status']);
                     }
                 }
@@ -616,13 +616,13 @@ 
 
         foreach ($data as $thematic_id => $thematic_plan_data) {
             $new_thematic_plan_data = array();
-            foreach($thematic_plan_data as $thematic_item) {
+            foreach ($thematic_plan_data as $thematic_item) {
                 $thematic_simple_list[] = $thematic_item['description_type'];
                 $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
             }
 
             if (!empty($thematic_simple_list)) {
-                foreach($thematic_simple_list as $item) {
+                foreach ($thematic_simple_list as $item) {
                     $default_thematic_plan_title[$item] = $new_thematic_plan_data[$item]['title'];
                 }
             }
@@ -638,7 +638,7 @@ 
                     }
                     if (!empty($data[$thematic_id][$id]['title']) && !empty($data[$thematic_id][$id]['description'])) {
                         if (api_is_allowed_to_edit(null, true)) {
-                            if ($data[$thematic_id][$id]['session_id'] !=0) {
+                            if ($data[$thematic_id][$id]['session_id'] != 0) {
                                 $session_star = api_get_session_image(api_get_session_id(), $uinfo['status']);
                             }
                         }
@@ -651,7 +651,7 @@ 
             if ($no_data) {
                 $return .= '<div><em>'.get_lang('StillDoNotHaveAThematicPlan').'</em></div>';
             }
-            $return  .= '</div>';
+            $return .= '</div>';
             $final_return[$thematic_id] = $return;
         }
         return $final_return;
@@ -691,7 +691,7 @@ 
                 api_get_session_id()
             );
             foreach ($list as $value) {
-                $elements[$value['ref']]= $value;
+                $elements[$value['ref']] = $value;
             }
         }
 
@@ -865,18 +865,18 @@ 
             api_get_session_id()
         );
 
-        $thematic_plan_complete_list  = array();
+        $thematic_plan_complete_list = array();
         $thematic_plan_id_list = array();
 
         if (!empty($items_from_course)) {
-            foreach($items_from_course as $item) {
+            foreach ($items_from_course as $item) {
                 $thematic_plan_id_list[] = $item['ref'];
                 $thematic_plan_complete_list[$item['ref']] = $item;
             }
         }
 
         if (!empty($items_from_session)) {
-            foreach($items_from_session as $item) {
+            foreach ($items_from_session as $item) {
                 $thematic_plan_id_list[] = $item['ref'];
                 $thematic_plan_complete_list[$item['ref']] = $item;
             }
@@ -898,7 +898,7 @@ 
                 if (!isset($thematic_id) && !isset($description_type)) {
                     // group all data group by thematic id
                     $tmp = array();
-                    while ($row = Database::fetch_array($rs,'ASSOC')) {
+                    while ($row = Database::fetch_array($rs, 'ASSOC')) {
                         $tmp[] = $row['thematic_id'];
                         if (in_array($row['thematic_id'], $tmp)) {
                             $row['session_id'] = $thematic_plan_complete_list[$row['id']];
@@ -906,7 +906,7 @@ 
                         }
                     }
                 } else {
-                    while ($row = Database::fetch_array($rs,'ASSOC')) {
+                    while ($row = Database::fetch_array($rs, 'ASSOC')) {
                         $row['session_id'] = $thematic_plan_complete_list[$row['id']];
                         $data[] = $row;
                     }
@@ -941,8 +941,8 @@ 
         );
 
         $elements_to_show = array();
-        foreach($list as $value) {
-            $elements_to_show[]= $value['ref'];
+        foreach ($list as $value) {
+            $elements_to_show[] = $value['ref'];
         }
         $condition = '';
         if (!empty($elements_to_show)) {
@@ -954,7 +954,7 @@ 
                     c_id = $course_id AND
                     thematic_id = $thematic_id AND
                     description_type = '$description_type'";
-        $rs	 = Database::query($sql);
+        $rs = Database::query($sql);
 
         $affected_rows = 0;
         if (Database::num_rows($rs) > 0) {
@@ -1190,7 +1190,7 @@ 
             $diff = array_diff($all, $a_thematic_advance_ids);
             if (!empty($diff)) {
                 $upd = "UPDATE $tbl_thematic_advance SET done_advance = 0
-    			        WHERE c_id = $course_id AND id IN(".implode(',',$diff).") ";
+    			        WHERE c_id = $course_id AND id IN(".implode(',', $diff).") ";
                 Database::query($upd);
             }
 
@@ -1304,7 +1304,7 @@ 
             $course_code = api_get_course_id();
         }
         if (api_get_session_id()) {
-            $thematic_data = $this->get_thematic_list(null, $course_code );
+            $thematic_data = $this->get_thematic_list(null, $course_code);
         } else {
             $thematic_data = $this->get_thematic_list(null, $course_code, 0);
         }
@@ -1356,7 +1356,7 @@ 
             }
             // calculate average by thematic
             $count_total_advances = count($advances);
-            $average = round(($count_done_advances*100)/$count_total_advances);
+            $average = round(($count_done_advances * 100) / $count_total_advances);
         }
 
         return $average;
@@ -1447,12 +1447,12 @@ 
     public function get_default_thematic_plan_title()
     {
         $default_thematic_plan_titles = array();
-        $default_thematic_plan_titles[1]= get_lang('Objectives');
-        $default_thematic_plan_titles[2]= get_lang('SkillToAcquire');
-        $default_thematic_plan_titles[3]= get_lang('Methodology');
-        $default_thematic_plan_titles[4]= get_lang('Infrastructure');
-        $default_thematic_plan_titles[5]= get_lang('Assessment');
-        $default_thematic_plan_titles[6]= get_lang('Others');
+        $default_thematic_plan_titles[1] = get_lang('Objectives');
+        $default_thematic_plan_titles[2] = get_lang('SkillToAcquire');
+        $default_thematic_plan_titles[3] = get_lang('Methodology');
+        $default_thematic_plan_titles[4] = get_lang('Infrastructure');
+        $default_thematic_plan_titles[5] = get_lang('Assessment');
+        $default_thematic_plan_titles[6] = get_lang('Others');
 
         return $default_thematic_plan_titles;
     }
@@ -1464,12 +1464,12 @@ 
     public function get_default_thematic_plan_icon()
     {
         $default_thematic_plan_icon = array();
-        $default_thematic_plan_icon[1]= 'icons/32/objective.png';
-        $default_thematic_plan_icon[2]= 'icons/32/skills.png';
-        $default_thematic_plan_icon[3]= 'icons/32/strategy.png';
-        $default_thematic_plan_icon[4]= 'icons/32/laptop.png';
-        $default_thematic_plan_icon[5]= 'icons/32/assessment.png';
-        $default_thematic_plan_icon[6]= 'icons/32/wizard.png';
+        $default_thematic_plan_icon[1] = 'icons/32/objective.png';
+        $default_thematic_plan_icon[2] = 'icons/32/skills.png';
+        $default_thematic_plan_icon[3] = 'icons/32/strategy.png';
+        $default_thematic_plan_icon[4] = 'icons/32/laptop.png';
+        $default_thematic_plan_icon[5] = 'icons/32/assessment.png';
+        $default_thematic_plan_icon[6] = 'icons/32/wizard.png';
 
         return $default_thematic_plan_icon;
     }
@@ -1481,11 +1481,11 @@ 
     public function get_default_question()
     {
         $question = array();
-        $question[1]= get_lang('ObjectivesQuestions');
-        $question[2]= get_lang('SkillToAcquireQuestions');
-        $question[3]= get_lang('MethodologyQuestions');
-        $question[4]= get_lang('InfrastructureQuestions');
-        $question[5]= get_lang('AssessmentQuestions');
+        $question[1] = get_lang('ObjectivesQuestions');
+        $question[2] = get_lang('SkillToAcquireQuestions');
+        $question[3] = get_lang('MethodologyQuestions');
+        $question[4] = get_lang('InfrastructureQuestions');
+        $question[5] = get_lang('AssessmentQuestions');
 
         return $question;
     }

main/inc/lib/rights.lib.php

Spacing +2 added lines, -2 removed lines

@@ -6,9 +6,9 @@
  */
 class Rights {
 	private static $rights_cache = array();
-	private static $rights = array (
+	private static $rights = array(
 		'show_tabs:reports' =>
-			array (
+			array(
 				'type' => 'const',
 				'const' => 'true' )
 		);

main/inc/lib/table_sort.class.php

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
 
                 $new_data_order = array();
                 if (!empty($docs_to_sort)) {
-                    foreach($docs_to_sort as $id => $document) {
+                    foreach ($docs_to_sort as $id => $document) {
                         if (isset($new_data[$id])) {
                             $new_data_order[] = $new_data[$id];
                         }
@@ -165,7 +165,7 @@ 
                 }
 
                 if (!empty($folder_to_sort)) {
-                    foreach($folder_to_sort as $id => $document) {
+                    foreach ($folder_to_sort as $id => $document) {
                         if (isset($new_data[$id])) {
                             $new_data_order[] = $new_data[$id];
                         }