chamilo / chamilo-lms

app/Resources/public/assets/ckeditor/samples/old/assets/posteddata.php

Braces +9 added lines, -7 removed lines

@@ -29,14 +29,16 @@
 {
 	foreach ( $_POST as $key => $value )
 	{
-		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )
-			continue;
+		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) ) {
+					continue;
+		}
 
-		if ( get_magic_quotes_gpc() )
-			$value = htmlspecialchars( stripslashes((string)$value) );
-		else
-			$value = htmlspecialchars( (string)$value );
-?>
+		if ( get_magic_quotes_gpc() ) {
+					$value = htmlspecialchars( stripslashes((string)$value) );
+		} else {
+					$value = htmlspecialchars( (string)$value );
+		}
+		?>
 		<tr>
 			<th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th>
 			<td><pre class="samples"><?php echo $value; ?></pre></td>

main/auth/openid/xrds.lib.php

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
     if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
         in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
       $xrds_current_service['version'] = 2;
-    }
-    elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
+    } elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
             in_array(OPENID_NS_1_0, $xrds_current_service['types'])) {
       $xrds_current_service['version'] = 1;
     }

main/auth/openid/openid.lib.php

Braces +3 added lines, -2 removed lines

@@ -61,8 +61,9 @@
  */
 function _openid_is_xri($identifier) {
     $firstchar = substr($identifier, 0, 1);
-    if ($firstchar == "@" || $firstchar == "=")
-        return TRUE;
+    if ($firstchar == "@" || $firstchar == "=") {
+            return TRUE;
+    }
 
     if (stristr($identifier, 'xri://') !== FALSE) {
         return TRUE;

main/auth/cas/lib/CAS/PGTStorage/pgt-file.php

Braces +10 added lines, -6 removed lines

@@ -137,8 +137,12 @@ 
       // call the ancestor's constructor

       $this->PGTStorage($cas_parent);

 

-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

+      if (empty($format) ) {
+          $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
+      }
+      if (empty($path) ) {
+          $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
+      }
 

       // check that the path is an absolute path

       if (getenv("OS")=="Windows_NT"){

@@ -147,8 +151,7 @@ 
 	     	phpCAS::error('an absolute path is needed for PGT storage to file');

       	}

       	

-      }

-      else

+      } else

       {

       

       	if ( $path[0] != '/' ) {

@@ -186,8 +189,9 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

-	return;

+      if ( $this->isInitialized() ) {
+      	return;
+      }
       // call the ancestor's method (mark as initialized)

       parent::init();

       phpCAS::traceEnd();      

main/auth/cas/lib/CAS/PGTStorage/pgt-db.php

Braces +18 added lines, -7 removed lines

@@ -166,11 +166,21 @@ 
       // call the ancestor's constructor

       $this->PGTStorage($cas_parent);

 

-      if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;

-      if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;

-      if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;

-      if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;

-      if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;

+      if ( empty($database_type) ) {
+          $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
+      }
+      if ( empty($hostname) ) {
+          $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
+      }
+      if ( $port==0 ) {
+          $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
+      }
+      if ( empty($database) ) {
+          $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
+      }
+      if ( empty($table) ) {
+          $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
+      }
 

       // build and store the PEAR DB URL

       $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;

@@ -192,8 +202,9 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

-		return;

+      if ( $this->isInitialized() ) {
+      		return;
+      }
       // call the ancestor's method (mark as initialized)

       parent::init();

       

main/auth/cas/lib/CAS/domxml-php4-to-php5.php

Braces +124 added lines, -57 removed lines

@@ -55,8 +55,12 @@ 
 {
 	$dom=new php4DOMDocument($mode);
 	$errorMode=(func_num_args()>2)&&defined('LIBXML_VERSION');
-	if ($errorMode) libxml_use_internal_errors(true);
-	if (!$dom->myDOMNode->load($filename)) $dom=null;
+	if ($errorMode) {
+	    libxml_use_internal_errors(true);
+	}
+	if (!$dom->myDOMNode->load($filename)) {
+	    $dom=null;
+	}
 	if ($errorMode)
 	{
 		$error=array_map('_error_report',libxml_get_errors());
@@ -68,8 +72,12 @@ 
 {
 	$dom=new php4DOMDocument($mode);
 	$errorMode=(func_num_args()>2)&&defined('LIBXML_VERSION');
-	if ($errorMode) libxml_use_internal_errors(true);
-	if (!$dom->myDOMNode->loadXML($str)) $dom=null;
+	if ($errorMode) {
+	    libxml_use_internal_errors(true);
+	}
+	if (!$dom->myDOMNode->loadXML($str)) {
+	    $dom=null;
+	}
 	if ($errorMode)
 	{
 		$error=array_map('_error_report',libxml_get_errors());
@@ -80,8 +88,11 @@ 
 function html_doc($html_doc,$from_file=false)
 {
 	$dom=new php4DOMDocument();
-	if ($from_file) $result=$dom->myDOMNode->loadHTMLFile($html_doc);
-	else $result=$dom->myDOMNode->loadHTML($html_doc);
+	if ($from_file) {
+	    $result=$dom->myDOMNode->loadHTMLFile($html_doc);
+	} else {
+	    $result=$dom->myDOMNode->loadHTML($html_doc);
+	}
 	return $result ? $dom : null;
 }
 function html_doc_file($filename) {return html_doc($filename,true);}
@@ -97,8 +108,11 @@ 
 {
 	function __get($name)
 	{
-		if ($name==='name') return $this->myDOMNode->name;
-		else return parent::__get($name);
+		if ($name==='name') {
+		    return $this->myDOMNode->name;
+		} else {
+		    return parent::__get($name);
+		}
 	}
 	function name() {return $this->myDOMNode->name;}
 	function set_content($text) {}
@@ -113,14 +127,24 @@ 
 	{
 		$this->myDOMNode=new DOMDocument();
 		$this->myOwnerDocument=$this;
-		if ($mode & DOMXML_LOAD_VALIDATING) $this->myDOMNode->validateOnParse=true;
-		if ($mode & DOMXML_LOAD_RECOVERING) $this->myDOMNode->recover=true;
-		if ($mode & DOMXML_LOAD_SUBSTITUTE_ENTITIES) $this->myDOMNode->substituteEntities=true;
-		if ($mode & DOMXML_LOAD_DONT_KEEP_BLANKS) $this->myDOMNode->preserveWhiteSpace=false;
+		if ($mode & DOMXML_LOAD_VALIDATING) {
+		    $this->myDOMNode->validateOnParse=true;
+		}
+		if ($mode & DOMXML_LOAD_RECOVERING) {
+		    $this->myDOMNode->recover=true;
+		}
+		if ($mode & DOMXML_LOAD_SUBSTITUTE_ENTITIES) {
+		    $this->myDOMNode->substituteEntities=true;
+		}
+		if ($mode & DOMXML_LOAD_DONT_KEEP_BLANKS) {
+		    $this->myDOMNode->preserveWhiteSpace=false;
+		}
 	}
 	function add_root($name)
 	{
-		if ($this->myDOMNode->hasChildNodes()) $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
+		if ($this->myDOMNode->hasChildNodes()) {
+		    $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
+		}
 		return new php4DOMElement($this->myDOMNode->appendChild($this->myDOMNode->createElement($name)),$this->myOwnerDocument);
 	}
 	function create_attribute($name,$value)
@@ -134,8 +158,12 @@ 
 	function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);}
 	function create_element_ns($uri,$name,$prefix=null)
 	{
-		if ($prefix==null) $prefix=$this->myDOMNode->lookupPrefix($uri);
-		if (($prefix==null)&&(($this->myDOMNode->documentElement==null)||(!$this->myDOMNode->documentElement->isDefaultNamespace($uri)))) $prefix='a'.sprintf('%u',crc32($uri));
+		if ($prefix==null) {
+		    $prefix=$this->myDOMNode->lookupPrefix($uri);
+		}
+		if (($prefix==null)&&(($this->myDOMNode->documentElement==null)||(!$this->myDOMNode->documentElement->isDefaultNamespace($uri)))) {
+		    $prefix='a'.sprintf('%u',crc32($uri));
+		}
 		return new php4DOMElement($this->myDOMNode->createElementNS($uri,$prefix==null ? $name : $prefix.':'.$name),$this);
 	}
 	function create_entity_reference($content) {return new php4DOMNode($this->myDOMNode->createEntityReference($content),$this);} //By Walter Ebert 2007-01-22
@@ -155,15 +183,22 @@ 
 		$format0=$this->myDOMNode->formatOutput;
 		$this->myDOMNode->formatOutput=$format;
 		$encoding0=$this->myDOMNode->encoding;
-		if ($encoding) $this->myDOMNode->encoding=$encoding;
+		if ($encoding) {
+		    $this->myDOMNode->encoding=$encoding;
+		}
 		$dump=$this->myDOMNode->saveXML();
 		$this->myDOMNode->formatOutput=$format0;
-		if ($encoding) $this->myDOMNode->encoding= $encoding0=='' ? 'UTF-8' : $encoding0; //UTF-8 is XML default encoding
+		if ($encoding) {
+		    $this->myDOMNode->encoding= $encoding0=='' ? 'UTF-8' : $encoding0;
+		}
+		//UTF-8 is XML default encoding
 		return $dump;
 	}
 	function free()
 	{
-		if ($this->myDOMNode->hasChildNodes()) $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
+		if ($this->myDOMNode->hasChildNodes()) {
+		    $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
+		}
 		$this->myDOMNode=null;
 		$this->myOwnerDocument=null;
 	}
@@ -173,8 +208,9 @@ 
 		$myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
 		$nodeSet=array();
 		$i=0;
-		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this);
+		if (isset($myDOMNodeList)) {
+					while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this);
+		}
 		return $nodeSet;
 	}
 	function html_dump_mem() {return $this->myDOMNode->saveHTML();}
@@ -187,8 +223,9 @@ 
 {
 	function add_namespace($uri,$prefix)
 	{
-		if ($this->myDOMNode->hasAttributeNS('http://www.w3.org/2000/xmlns/',$prefix)) return false;
-		else
+		if ($this->myDOMNode->hasAttributeNS('http://www.w3.org/2000/xmlns/',$prefix)) {
+		    return false;
+		} else
 		{
 			$this->myDOMNode->setAttributeNS('http://www.w3.org/2000/xmlns/','xmlns:'.$prefix,$uri); //By Daniel Walker 2006-09-08
 			return true;
@@ -201,8 +238,9 @@ 
 		$myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
 		$nodeSet=array();
 		$i=0;
-		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
+		if (isset($myDOMNodeList)) {
+					while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
+		}
 		return $nodeSet;
 	}
 	function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);}
@@ -222,17 +260,23 @@ 
 	}*/
 	function set_name($name)
 	{
-		if ($this->myDOMNode->prefix=='') $newNode=$this->myDOMNode->ownerDocument->createElement($name);
-		else $newNode=$this->myDOMNode->ownerDocument->createElementNS($this->myDOMNode->namespaceURI,$this->myDOMNode->prefix.':'.$name);
+		if ($this->myDOMNode->prefix=='') {
+		    $newNode=$this->myDOMNode->ownerDocument->createElement($name);
+		} else {
+		    $newNode=$this->myDOMNode->ownerDocument->createElementNS($this->myDOMNode->namespaceURI,$this->myDOMNode->prefix.':'.$name);
+		}
 		$myDOMNodeList=$this->myDOMNode->attributes;
 		$i=0;
-		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item($i++))
+		if (isset($myDOMNodeList)) {
+					while ($node=$myDOMNodeList->item($i++))
 				if ($node->namespaceURI=='') $newNode->setAttribute($node->name,$node->value);
-				else $newNode->setAttributeNS($node->namespaceURI,$node->nodeName,$node->value);
+		} else {
+				    $newNode->setAttributeNS($node->namespaceURI,$node->nodeName,$node->value);
+				}
 		$myDOMNodeList=$this->myDOMNode->childNodes;
-		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item(0)) $newNode->appendChild($node);
+		if (isset($myDOMNodeList)) {
+					while ($node=$myDOMNodeList->item(0)) $newNode->appendChild($node);
+		}
 		$this->myDOMNode->parentNode->replaceChild($newNode,$this->myDOMNode);
 		$this->myDOMNode=$newNode;
 		return true;
@@ -270,10 +314,14 @@ 
 	function attributes()
 	{
 		$myDOMNodeList=$this->myDOMNode->attributes;
-		if (!(isset($myDOMNodeList)&&$this->myDOMNode->hasAttributes())) return null;
+		if (!(isset($myDOMNodeList)&&$this->myDOMNode->hasAttributes())) {
+		    return null;
+		}
 		$nodeSet=array();
 		$i=0;
-		while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument);
+		while ($node=$myDOMNodeList->item($i++)) {
+		    $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument);
+		}
 		return $nodeSet;
 	}
 	function child_nodes()
@@ -281,8 +329,9 @@ 
 		$myDOMNodeList=$this->myDOMNode->childNodes;
 		$nodeSet=array();
 		$i=0;
-		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=self::_newDOMElement($node,$this->myOwnerDocument);
+		if (isset($myDOMNodeList)) {
+					while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=self::_newDOMElement($node,$this->myOwnerDocument);
+		}
 		return $nodeSet;
 	}
 	function children() {return $this->child_nodes();}
@@ -342,15 +391,20 @@ 
 			$parent->removeAttributeNode($this->myDOMNode);
 			$parent->setAttributeNS($uri,$nsprefix.':'.$this->myDOMNode->localName,$this->myDOMNode->nodeValue);
 			$this->myDOMNode=$parent->getAttributeNodeNS($uri,$this->myDOMNode->localName);
-		}
-		elseif ($this->myDOMNode->nodeType===XML_ELEMENT_NODE)
+		} elseif ($this->myDOMNode->nodeType===XML_ELEMENT_NODE)
 		{
 			$NewNode=$this->myDOMNode->ownerDocument->createElementNS($uri,$nsprefix.':'.$this->myDOMNode->localName);
-			foreach ($this->myDOMNode->attributes as $n) $NewNode->appendChild($n->cloneNode(true));
-			foreach ($this->myDOMNode->childNodes as $n) $NewNode->appendChild($n->cloneNode(true));
+			foreach ($this->myDOMNode->attributes as $n) {
+			    $NewNode->appendChild($n->cloneNode(true));
+			}
+			foreach ($this->myDOMNode->childNodes as $n) {
+			    $NewNode->appendChild($n->cloneNode(true));
+			}
 			$xpath=new DOMXPath($this->myDOMNode->ownerDocument);
 			$myDOMNodeList=$xpath->query('namespace::*[name()!="xml"]',$this->myDOMNode); //Add old namespaces
-			foreach ($myDOMNodeList as $n) $NewNode->setAttributeNS('http://www.w3.org/2000/xmlns/',$n->nodeName,$n->nodeValue); 
+			foreach ($myDOMNodeList as $n) {
+			    $NewNode->setAttributeNS('http://www.w3.org/2000/xmlns/',$n->nodeName,$n->nodeValue);
+			}
 			$this->myDOMNode->parentNode->replaceChild($NewNode,$this->myDOMNode);
 			$this->myDOMNode=$NewNode;
 		}
@@ -359,14 +413,19 @@ 
 	{
 		if ($this->myDOMNode->parentNode!=null)
 		{
-			if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE) $this->myDOMNode->parentNode->removeAttributeNode($this->myDOMNode);
-			else $this->myDOMNode->parentNode->removeChild($this->myDOMNode);
+			if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE) {
+			    $this->myDOMNode->parentNode->removeAttributeNode($this->myDOMNode);
+			} else {
+			    $this->myDOMNode->parentNode->removeChild($this->myDOMNode);
+			}
 		}
 	}
 	protected function _importNode($newnode) {return $this->myOwnerDocument===$newnode->myOwnerDocument ? $newnode->myDOMNode : $this->myOwnerDocument->myDOMNode->importNode($newnode->myDOMNode,true);} //To import DOMNode from another DOMDocument
 	static function _newDOMElement($aDOMNode,$aOwnerDocument)
 	{//Check the PHP5 DOMNode before creating a new associated PHP4 DOMNode wrapper
-		if ($aDOMNode==null) return null;
+		if ($aDOMNode==null) {
+		    return null;
+		}
 		switch ($aDOMNode->nodeType)
 		{
 			case XML_ELEMENT_NODE: return new php4DOMElement($aDOMNode,$aOwnerDocument);
@@ -388,8 +447,11 @@ 
 {
 	function __get($name)
 	{
-		if ($name==='tagname') return '#text';
-		else return parent::__get($name);
+		if ($name==='tagname') {
+		    return '#text';
+		} else {
+		    return parent::__get($name);
+		}
 	}
 	function tagname() {return '#text';}
 	function set_content($text) {$this->myDOMNode->nodeValue=$text; return true;}
@@ -417,8 +479,9 @@ 
 	public $value;
 	function php4DOMNodelist($aDOMNodelist,$aOwnerDocument)
 	{
-		if (!isset($aDOMNodelist)) return; 
-		elseif (is_object($aDOMNodelist)||is_array($aDOMNodelist))
+		if (!isset($aDOMNodelist)) {
+		    return;
+		} elseif (is_object($aDOMNodelist)||is_array($aDOMNodelist))
 		{
 			if ($aDOMNodelist->length>0)
 			{
@@ -426,20 +489,19 @@ 
 				$this->nodeset=array();
 				$this->type=XPATH_NODESET;
 				$i=0;
-				while ($node=$this->myDOMNodelist->item($i++)) $this->nodeset[]=php4DOMNode::_newDOMElement($node,$aOwnerDocument);
+				while ($node=$this->myDOMNodelist->item($i++)) {
+				    $this->nodeset[]=php4DOMNode::_newDOMElement($node,$aOwnerDocument);
+				}
 			}
-		}
-		elseif (is_int($aDOMNodelist)||is_float($aDOMNodelist))
+		} elseif (is_int($aDOMNodelist)||is_float($aDOMNodelist))
 		{
 			$this->type=XPATH_NUMBER;
 			$this->value=$aDOMNodelist;
-		}
-		elseif (is_bool($aDOMNodelist))
+		} elseif (is_bool($aDOMNodelist))
 		{
 			$this->type=XPATH_BOOLEAN;
 			$this->value=$aDOMNodelist;
-		}
-		elseif (is_string($aDOMNodelist))
+		} elseif (is_string($aDOMNodelist))
 		{
 			$this->type=XPATH_STRING;
 			$this->value=$aDOMNodelist;
@@ -459,8 +521,11 @@ 
 	}
 	function xpath_eval($eval_str,$contextnode=null)
 	{
-		if (method_exists($this->myDOMXPath,'evaluate')) $xp=isset($contextnode) ? $this->myDOMXPath->evaluate($eval_str,$contextnode->myDOMNode) : $this->myDOMXPath->evaluate($eval_str);
-		else $xp=isset($contextnode) ? $this->myDOMXPath->query($eval_str,$contextnode->myDOMNode) : $this->myDOMXPath->query($eval_str);
+		if (method_exists($this->myDOMXPath,'evaluate')) {
+		    $xp=isset($contextnode) ? $this->myDOMXPath->evaluate($eval_str,$contextnode->myDOMNode) : $this->myDOMXPath->evaluate($eval_str);
+		} else {
+		    $xp=isset($contextnode) ? $this->myDOMXPath->query($eval_str,$contextnode->myDOMNode) : $this->myDOMXPath->query($eval_str);
+		}
 		$xp=new php4DOMNodelist($xp,$this->myOwnerDocument);
 		return ($xp->type===XPATH_UNDEFINED) ? false : $xp;
 	}
@@ -482,7 +547,9 @@ 
 		}
 		function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false)
 		{
-			foreach ($xslt_parameters as $param=>$value) $this->myxsltProcessor->setParameter('',$param,$value);
+			foreach ($xslt_parameters as $param=>$value) {
+			    $this->myxsltProcessor->setParameter('',$param,$value);
+			}
 			$myphp4DOMDocument=new php4DOMDocument();
 			$myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode);
 			return $myphp4DOMDocument;

main/auth/cas/lib/CAS/client.php

Braces +31 added lines, -31 removed lines

@@ -193,8 +193,9 @@ 
 	 */
 	function getLang()
 		{
-		if ( empty($this->_lang) )
-			$this->setLang(PHPCAS_LANG_DEFAULT);
+		if ( empty($this->_lang) ) {
+					$this->setLang(PHPCAS_LANG_DEFAULT);
+		}
 		return $this->_lang;
 		}
 	
@@ -596,14 +597,14 @@ 
 					phpCAS::trace("No session found, creating new session");
 					session_start();
 				}
-			}else{
+			} else{
 				phpCAS::trace("Ticket found");
 				// We have to copy any old data before renaming the session
 				if (session_id()) {
 					phpCAS::trace("Old active session found, saving old data and destroying session");
 					$old_session = $_SESSION;
 					session_destroy();	
-				}else{
+				} else{
 					session_start();
 					phpCAS::trace("Starting possible old session to copy variables");
 					$old_session = $_SESSION;
@@ -620,7 +621,7 @@ 
 					$_SESSION = $old_session;
 				}
 			}
-		}else{
+		} else{
 			phpCAS::trace("Skipping session creation");
 		}
 		
@@ -631,9 +632,10 @@ 
 		//check version
 		switch ($server_version) {
 			case CAS_VERSION_1_0:
-				if ( $this->isProxy() )
-					phpCAS::error('CAS proxies are not supported in CAS '
+				if ( $this->isProxy() ) {
+									phpCAS::error('CAS proxies are not supported in CAS '
 						.$server_version);
+				}
 				break;
 			case CAS_VERSION_2_0:
 				break;
@@ -817,8 +819,9 @@ 
 	function renewAuthentication(){
 		phpCAS::traceBegin();
 		// Either way, the user is authenticated by CAS
-		if( isset( $_SESSION['phpCAS']['auth_checked'] ) )
-			unset($_SESSION['phpCAS']['auth_checked']);
+		if( isset( $_SESSION['phpCAS']['auth_checked'] ) ) {
+					unset($_SESSION['phpCAS']['auth_checked']);
+		}
 		if ( $this->isAuthenticated() ) {
 			phpCAS::trace('user already authenticated; renew');
 			$this->redirectToCas(false,true);
@@ -897,8 +900,10 @@ 
 			//	    // never reached
 			//	    $res = FALSE;
 			// avoid a check against CAS on every request
-			if (! isset($_SESSION['phpCAS']['unauth_count']) )
-				$_SESSION['phpCAS']['unauth_count'] = -2; // uninitialized
+			if (! isset($_SESSION['phpCAS']['unauth_count']) ) {
+							$_SESSION['phpCAS']['unauth_count'] = -2;
+			}
+			// uninitialized
 			
 			if (($_SESSION['phpCAS']['unauth_count'] != -2 && $this->_cache_times_for_auth_recheck == -1) 
 					|| ($_SESSION['phpCAS']['unauth_count'] >= 0 && $_SESSION['phpCAS']['unauth_count'] < $this->_cache_times_for_auth_recheck))
@@ -909,13 +914,11 @@ 
 				{
 					$_SESSION['phpCAS']['unauth_count']++;
 					phpCAS::trace('user is not authenticated (cached for '.$_SESSION['phpCAS']['unauth_count'].' times of '.$this->_cache_times_for_auth_recheck.')');
-				}
-				else
+				} else
 				{
 					phpCAS::trace('user is not authenticated (cached for until login pressed)');
 				}
-			}
-			else
+			} else
 			{
 				$_SESSION['phpCAS']['unauth_count'] = 0;
 				$_SESSION['phpCAS']['auth_checked'] = true;
@@ -948,8 +951,7 @@ 
 			// authenticated, nothing to be done.
 			phpCAS::trace('user was already authenticated, no need to look for tickets');
 			$res = TRUE;
-		}
-		else {
+		} else {
 			if ( $this->hasST() ) {
 				// if a Service Ticket was given, validate it
 				phpCAS::trace('ST `'.$this->getST().'\' is present');
@@ -962,8 +964,7 @@ 
 				}
 				$_SESSION['phpCAS']['user'] = $this->getUser();
 				$res = TRUE;
-			}
-			elseif ( $this->hasPT() ) {
+			} elseif ( $this->hasPT() ) {
 				// if a Proxy Ticket was given, validate it
 				phpCAS::trace('PT `'.$this->getPT().'\' is present');
 				$this->validatePT($validate_url,$text_response,$tree_response); // note: if it fails, it halts
@@ -975,8 +976,7 @@ 
 				}
 				$_SESSION['phpCAS']['user'] = $this->getUser();
 				$res = TRUE;
-			}
-			elseif ( $this->hasSA() ) {
+			} elseif ( $this->hasSA() ) {
 				// if we have a SAML ticket, validate it.
 				phpCAS::trace('SA `'.$this->getSA().'\' is present');
 				$this->validateSA($validate_url,$text_response,$tree_response); // if it fails, it halts
@@ -984,8 +984,7 @@ 
 				$_SESSION['phpCAS']['user'] = $this->getUser();
 				$_SESSION['phpCAS']['attributes'] = $this->getAttributes();
 				$res = TRUE;
-			}
-			else {
+			} else {
 				// no ticket given, not authenticated
 				phpCAS::trace('no ticket found');
 			}
@@ -1581,8 +1580,7 @@ 
 			foreach($attr_array as $attr_key => $attr_value) {
 				if(count($attr_value) > 1) {
 					$this->_attributes[$attr_key] = $attr_value;
-				}
-				else {
+				} else {
 					$this->_attributes[$attr_key] = $attr_value[0];
 				}
 			}
@@ -2601,8 +2599,9 @@ 
 				$query_string	= $this->removeParameterFromQueryString('ticket', $request_uri[1]);
 				
 				// If the query string still has anything left, append it to the final URI
-				if ($query_string !== '')
-					$final_uri	.= "?$query_string";
+				if ($query_string !== '') {
+									$final_uri	.= "?$query_string";
+				}
 				
 			}
 			
@@ -2680,10 +2679,11 @@ 
 						phpCAS::trace('Reason: CAS error');
 						break;
 					case CAS_VERSION_2_0:
-						if ( empty($err_code) )
-							phpCAS::trace('Reason: no CAS error');
-						else
-							phpCAS::trace('Reason: ['.$err_code.'] CAS error: '.$err_msg);
+						if ( empty($err_code) ) {
+													phpCAS::trace('Reason: no CAS error');
+						} else {
+													phpCAS::trace('Reason: ['.$err_code.'] CAS error: '.$err_msg);
+						}
 						break;
 				}
 			}

main/auth/conditional_login/complete_phone_number.php

Braces +2 added lines, -1 removed lines

@@ -4,8 +4,9 @@
 require_once dirname(__FILE__).'/../../inc/global.inc.php';
 $url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
 
-if (! isset($_SESSION['conditional_login']['uid']))
+if (! isset($_SESSION['conditional_login']['uid'])) {
   die("Not Authorised");
+}
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml">

main/auth/external_login/functions.inc.php

Braces +37 added lines, -24 removed lines

@@ -95,30 +95,43 @@
  * */
 function external_add_user($u) {
     //Setting default
-    if (empty($u['password']))
-        $u['password'] = null;
-    if (empty($u['status']))
-        $u['status'] = 5;
-    if (!isset($u['official_code']))
-        $u['official_code'] = '';
-    if (!isset($u['language']))
-        $u['language'] = '';
-    if (!isset($u['phone']))
-        $u['phone'] = '';
-    if (!isset($u['picture_uri']))
-        $u['picture_uri'] = '';
-    if (!isset($u['auth_source']))
-        $u['auth_source'] = PLATFORM_AUTH_SOURCE;
-    if (!isset($u['expiration_date']))
-        $u['expiration_date'] = '0000-00-00 00:00:00';
-    if (!isset($u['active']))
-        $u['active'] = 1;
-    if (!isset($u['hr_dept_id']))
-        $u['hr_dept_id'] = 0; //id of responsible HR
-    if (!isset($u['extra']))
-        $u['extra'] = null;
-    if (!isset($u['encrypt_method']))
-        $u['encrypt_method'] = '';
+    if (empty($u['password'])) {
+            $u['password'] = null;
+    }
+    if (empty($u['status'])) {
+            $u['status'] = 5;
+    }
+    if (!isset($u['official_code'])) {
+            $u['official_code'] = '';
+    }
+    if (!isset($u['language'])) {
+            $u['language'] = '';
+    }
+    if (!isset($u['phone'])) {
+            $u['phone'] = '';
+    }
+    if (!isset($u['picture_uri'])) {
+            $u['picture_uri'] = '';
+    }
+    if (!isset($u['auth_source'])) {
+            $u['auth_source'] = PLATFORM_AUTH_SOURCE;
+    }
+    if (!isset($u['expiration_date'])) {
+            $u['expiration_date'] = '0000-00-00 00:00:00';
+    }
+    if (!isset($u['active'])) {
+            $u['active'] = 1;
+    }
+    if (!isset($u['hr_dept_id'])) {
+            $u['hr_dept_id'] = 0;
+    }
+    //id of responsible HR
+    if (!isset($u['extra'])) {
+            $u['extra'] = null;
+    }
+    if (!isset($u['encrypt_method'])) {
+            $u['encrypt_method'] = '';
+    }
 
     $chamilo_uid = UserManager::create_user($u['firstname'], $u['lastname'], $u['status'], $u['email'], $u['username'], $u['password'], $u['official_code'], $u['language'], $u['phone'], $u['picture_uri'], $u['auth_source'], $u['expiration_date'], $u['active'], $u['hr_dept_id'], $u['extra'], $u['encrypt_method']);
     return $chamilo_uid;