chamilo / chamilo-lms

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

Spacing +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@
 /**

  * a phpCAS string index

  */

-define("CAS_STR_USING_SERVER",                1);

-define("CAS_STR_AUTHENTICATION_WANTED",       2);

-define("CAS_STR_LOGOUT",                      3);

+define("CAS_STR_USING_SERVER", 1);

+define("CAS_STR_AUTHENTICATION_WANTED", 2);

+define("CAS_STR_LOGOUT", 3);

 define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4);

-define("CAS_STR_AUTHENTICATION_FAILED",       5);

-define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED",  6);

-define("CAS_STR_SERVICE_UNAVAILABLE",         7);

+define("CAS_STR_AUTHENTICATION_FAILED", 5);

+define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED", 6);

+define("CAS_STR_SERVICE_UNAVAILABLE", 7);

 //@}

 

 ?>
\ No newline at end of file

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

Spacing +229 added lines, -229 removed lines

@@ -42,178 +42,178 @@ 
 	http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
 */
 
-define('DOMXML_LOAD_PARSING',0);
-define('DOMXML_LOAD_VALIDATING',1);
-define('DOMXML_LOAD_RECOVERING',2);
-define('DOMXML_LOAD_SUBSTITUTE_ENTITIES',4);
+define('DOMXML_LOAD_PARSING', 0);
+define('DOMXML_LOAD_VALIDATING', 1);
+define('DOMXML_LOAD_RECOVERING', 2);
+define('DOMXML_LOAD_SUBSTITUTE_ENTITIES', 4);
 //define('DOMXML_LOAD_COMPLETE_ATTRS',8);
-define('DOMXML_LOAD_DONT_KEEP_BLANKS',16);
+define('DOMXML_LOAD_DONT_KEEP_BLANKS', 16);
 
-function domxml_new_doc($version) {return new php4DOMDocument();}
-function domxml_new_xmldoc($version) {return new php4DOMDocument();}
-function domxml_open_file($filename,$mode=DOMXML_LOAD_PARSING,&$error=null)
+function domxml_new_doc($version) {return new php4DOMDocument(); }
+function domxml_new_xmldoc($version) {return new php4DOMDocument(); }
+function domxml_open_file($filename, $mode = DOMXML_LOAD_PARSING, &$error = null)
 {
-	$dom=new php4DOMDocument($mode);
-	$errorMode=(func_num_args()>2)&&defined('LIBXML_VERSION');
+	$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 (!$dom->myDOMNode->load($filename)) $dom = null;
 	if ($errorMode)
 	{
-		$error=array_map('_error_report',libxml_get_errors());
+		$error = array_map('_error_report', libxml_get_errors());
 		libxml_clear_errors();
 	}
 	return $dom;
 }
-function domxml_open_mem($str,$mode=DOMXML_LOAD_PARSING,&$error=null)
+function domxml_open_mem($str, $mode = DOMXML_LOAD_PARSING, &$error = null)
 {
-	$dom=new php4DOMDocument($mode);
-	$errorMode=(func_num_args()>2)&&defined('LIBXML_VERSION');
+	$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 (!$dom->myDOMNode->loadXML($str)) $dom = null;
 	if ($errorMode)
 	{
-		$error=array_map('_error_report',libxml_get_errors());
+		$error = array_map('_error_report', libxml_get_errors());
 		libxml_clear_errors();
 	}
 	return $dom;
 }
-function html_doc($html_doc,$from_file=false)
+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);
+	$dom = new php4DOMDocument();
+	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);}
-function xmldoc($str) {return domxml_open_mem($str);}
-function xmldocfile($filename) {return domxml_open_file($filename);}
-function xpath_eval($xpath_context,$eval_str,$contextnode=null) {return $xpath_context->xpath_eval($eval_str,$contextnode);}
-function xpath_new_context($dom_document) {return new php4DOMXPath($dom_document);}
-function xpath_register_ns($xpath_context,$prefix,$namespaceURI) {return $xpath_context->myDOMXPath->registerNamespace($prefix,$namespaceURI);}
-function _entityDecode($text) {return html_entity_decode(strtr($text,array('''=>'\'')),ENT_QUOTES,'UTF-8');}
-function _error_report($error) {return array('errormessage'=>$error->message,'nodename'=>'','line'=>$error->line,'col'=>$error->column)+($error->file==''?array():array('directory'=>dirname($error->file),'file'=>basename($error->file)));}
+function html_doc_file($filename) {return html_doc($filename, true); }
+function xmldoc($str) {return domxml_open_mem($str); }
+function xmldocfile($filename) {return domxml_open_file($filename); }
+function xpath_eval($xpath_context, $eval_str, $contextnode = null) {return $xpath_context->xpath_eval($eval_str, $contextnode); }
+function xpath_new_context($dom_document) {return new php4DOMXPath($dom_document); }
+function xpath_register_ns($xpath_context, $prefix, $namespaceURI) {return $xpath_context->myDOMXPath->registerNamespace($prefix, $namespaceURI); }
+function _entityDecode($text) {return html_entity_decode(strtr($text, array('''=>'\'')), ENT_QUOTES, 'UTF-8'); }
+function _error_report($error) {return array('errormessage'=>$error->message, 'nodename'=>'', 'line'=>$error->line, 'col'=>$error->column) + ($error->file == '' ? array() : array('directory'=>dirname($error->file), 'file'=>basename($error->file))); }
 
 class php4DOMAttr extends php4DOMNode
 {
 	function __get($name)
 	{
-		if ($name==='name') return $this->myDOMNode->name;
+		if ($name === 'name') return $this->myDOMNode->name;
 		else return parent::__get($name);
 	}
-	function name() {return $this->myDOMNode->name;}
+	function name() {return $this->myDOMNode->name; }
 	function set_content($text) {}
 	//function set_value($content) {return $this->myDOMNode->value=htmlspecialchars($content,ENT_QUOTES);}
-	function specified() {return $this->myDOMNode->specified;}
-	function value() {return $this->myDOMNode->value;}
+	function specified() {return $this->myDOMNode->specified; }
+	function value() {return $this->myDOMNode->value; }
 }
 
 class php4DOMDocument extends php4DOMNode
 {
-	function php4DOMDocument($mode=DOMXML_LOAD_PARSING)
+	function php4DOMDocument($mode = DOMXML_LOAD_PARSING)
 	{
-		$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;
+		$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;
 	}
 	function add_root($name)
 	{
 		if ($this->myDOMNode->hasChildNodes()) $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
-		return new php4DOMElement($this->myDOMNode->appendChild($this->myDOMNode->createElement($name)),$this->myOwnerDocument);
+		return new php4DOMElement($this->myDOMNode->appendChild($this->myDOMNode->createElement($name)), $this->myOwnerDocument);
 	}
-	function create_attribute($name,$value)
+	function create_attribute($name, $value)
 	{
-		$myAttr=$this->myDOMNode->createAttribute($name);
-		$myAttr->value=htmlspecialchars($value,ENT_QUOTES);
-		return new php4DOMAttr($myAttr,$this);
+		$myAttr = $this->myDOMNode->createAttribute($name);
+		$myAttr->value = htmlspecialchars($value, ENT_QUOTES);
+		return new php4DOMAttr($myAttr, $this);
 	}
-	function create_cdata_section($content) {return new php4DOMNode($this->myDOMNode->createCDATASection($content),$this);}
-	function create_comment($data) {return new php4DOMNode($this->myDOMNode->createComment($data),$this);}
-	function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);}
-	function create_element_ns($uri,$name,$prefix=null)
+	function create_cdata_section($content) {return new php4DOMNode($this->myDOMNode->createCDATASection($content), $this); }
+	function create_comment($data) {return new php4DOMNode($this->myDOMNode->createComment($data), $this); }
+	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));
-		return new php4DOMElement($this->myDOMNode->createElementNS($uri,$prefix==null ? $name : $prefix.':'.$name),$this);
+		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
-	function create_processing_instruction($target,$data=''){return new php4DomProcessingInstruction($this->myDOMNode->createProcessingInstruction($target,$data),$this);}
-	function create_text_node($content) {return new php4DOMText($this->myDOMNode->createTextNode($content),$this);}
-	function document_element() {return parent::_newDOMElement($this->myDOMNode->documentElement,$this);}
-	function dump_file($filename,$compressionmode=false,$format=false)
+	function create_entity_reference($content) {return new php4DOMNode($this->myDOMNode->createEntityReference($content), $this); } //By Walter Ebert 2007-01-22
+	function create_processing_instruction($target, $data = '') {return new php4DomProcessingInstruction($this->myDOMNode->createProcessingInstruction($target, $data), $this); }
+	function create_text_node($content) {return new php4DOMText($this->myDOMNode->createTextNode($content), $this); }
+	function document_element() {return parent::_newDOMElement($this->myDOMNode->documentElement, $this); }
+	function dump_file($filename, $compressionmode = false, $format = false)
 	{
-		$format0=$this->myDOMNode->formatOutput;
-		$this->myDOMNode->formatOutput=$format;
-		$res=$this->myDOMNode->save($filename);
-		$this->myDOMNode->formatOutput=$format0;
+		$format0 = $this->myDOMNode->formatOutput;
+		$this->myDOMNode->formatOutput = $format;
+		$res = $this->myDOMNode->save($filename);
+		$this->myDOMNode->formatOutput = $format0;
 		return $res;
 	}
-	function dump_mem($format=false,$encoding=false)
+	function dump_mem($format = false, $encoding = false)
 	{
-		$format0=$this->myDOMNode->formatOutput;
-		$this->myDOMNode->formatOutput=$format;
-		$encoding0=$this->myDOMNode->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
+		$format0 = $this->myDOMNode->formatOutput;
+		$this->myDOMNode->formatOutput = $format;
+		$encoding0 = $this->myDOMNode->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
 		return $dump;
 	}
 	function free()
 	{
 		if ($this->myDOMNode->hasChildNodes()) $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
-		$this->myDOMNode=null;
-		$this->myOwnerDocument=null;
+		$this->myDOMNode = null;
+		$this->myOwnerDocument = null;
 	}
-	function get_element_by_id($id) {return parent::_newDOMElement($this->myDOMNode->getElementById($id),$this);}
+	function get_element_by_id($id) {return parent::_newDOMElement($this->myDOMNode->getElementById($id), $this); }
 	function get_elements_by_tagname($name)
 	{
-		$myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
-		$nodeSet=array();
-		$i=0;
+		$myDOMNodeList = $this->myDOMNode->getElementsByTagName($name);
+		$nodeSet = array();
+		$i = 0;
 		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this);
+			while ($node = $myDOMNodeList->item($i++)) $nodeSet[] = new php4DOMElement($node, $this);
 		return $nodeSet;
 	}
-	function html_dump_mem() {return $this->myDOMNode->saveHTML();}
-	function root() {return parent::_newDOMElement($this->myDOMNode->documentElement,$this);}
-	function xinclude() {return $this->myDOMNode->xinclude();}
-	function xpath_new_context() {return new php4DOMXPath($this);}
+	function html_dump_mem() {return $this->myDOMNode->saveHTML(); }
+	function root() {return parent::_newDOMElement($this->myDOMNode->documentElement, $this); }
+	function xinclude() {return $this->myDOMNode->xinclude(); }
+	function xpath_new_context() {return new php4DOMXPath($this); }
 }
 
 class php4DOMElement extends php4DOMNode
 {
-	function add_namespace($uri,$prefix)
+	function add_namespace($uri, $prefix)
 	{
-		if ($this->myDOMNode->hasAttributeNS('http://www.w3.org/2000/xmlns/',$prefix)) return false;
+		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
+			$this->myDOMNode->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:'.$prefix, $uri); //By Daniel Walker 2006-09-08
 			return true;
 		}
 	}
-	function get_attribute($name) {return $this->myDOMNode->getAttribute($name);}
-	function get_attribute_node($name) {return parent::_newDOMElement($this->myDOMNode->getAttributeNode($name),$this->myOwnerDocument);}
+	function get_attribute($name) {return $this->myDOMNode->getAttribute($name); }
+	function get_attribute_node($name) {return parent::_newDOMElement($this->myDOMNode->getAttributeNode($name), $this->myOwnerDocument); }
 	function get_elements_by_tagname($name)
 	{
-		$myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
-		$nodeSet=array();
-		$i=0;
+		$myDOMNodeList = $this->myDOMNode->getElementsByTagName($name);
+		$nodeSet = array();
+		$i = 0;
 		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
+			while ($node = $myDOMNodeList->item($i++)) $nodeSet[] = new php4DOMElement($node, $this->myOwnerDocument);
 		return $nodeSet;
 	}
-	function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);}
-	function remove_attribute($name) {return $this->myDOMNode->removeAttribute($name);}
-	function set_attribute($name,$value)
+	function has_attribute($name) {return $this->myDOMNode->hasAttribute($name); }
+	function remove_attribute($name) {return $this->myDOMNode->removeAttribute($name); }
+	function set_attribute($name, $value)
 	{
 		//return $this->myDOMNode->setAttribute($name,$value); //Does not return a DomAttr
-		$myAttr=$this->myDOMNode->ownerDocument->createAttribute($name);
-		$myAttr->value=htmlspecialchars($value,ENT_QUOTES); //Entity problem reported by AL-DesignWorks 2007-09-07
+		$myAttr = $this->myDOMNode->ownerDocument->createAttribute($name);
+		$myAttr->value = htmlspecialchars($value, ENT_QUOTES); //Entity problem reported by AL-DesignWorks 2007-09-07
 		$this->myDOMNode->setAttributeNode($myAttr);
-		return new php4DOMAttr($myAttr,$this->myOwnerDocument);
+		return new php4DOMAttr($myAttr, $this->myOwnerDocument);
 	}
 	/*function set_attribute_node($attr)
 	{
@@ -222,186 +222,186 @@ 
 	}*/
 	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);
-		$myDOMNodeList=$this->myDOMNode->attributes;
-		$i=0;
+		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 ($node->namespaceURI=='') $newNode->setAttribute($node->name,$node->value);
-				else $newNode->setAttributeNS($node->namespaceURI,$node->nodeName,$node->value);
-		$myDOMNodeList=$this->myDOMNode->childNodes;
+			while ($node = $myDOMNodeList->item($i++))
+				if ($node->namespaceURI == '') $newNode->setAttribute($node->name, $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);
-		$this->myDOMNode->parentNode->replaceChild($newNode,$this->myDOMNode);
-		$this->myDOMNode=$newNode;
+			while ($node = $myDOMNodeList->item(0)) $newNode->appendChild($node);
+		$this->myDOMNode->parentNode->replaceChild($newNode, $this->myDOMNode);
+		$this->myDOMNode = $newNode;
 		return true;
 	}
-	function tagname() {return $this->tagname;}
+	function tagname() {return $this->tagname; }
 }
 
 class php4DOMNode
 {
 	public $myDOMNode;
 	public $myOwnerDocument;
-	function php4DOMNode($aDomNode,$aOwnerDocument)
+	function php4DOMNode($aDomNode, $aOwnerDocument)
 	{
-		$this->myDOMNode=$aDomNode;
-		$this->myOwnerDocument=$aOwnerDocument;
+		$this->myDOMNode = $aDomNode;
+		$this->myOwnerDocument = $aOwnerDocument;
 	}
 	function __get($name)
 	{
 		switch ($name)
 		{
 			case 'type': return $this->myDOMNode->nodeType;
-			case 'tagname': return ($this->myDOMNode->nodeType===XML_ELEMENT_NODE) ? $this->myDOMNode->localName : $this->myDOMNode->tagName; //Avoid namespace prefix for DOMElement
+			case 'tagname': return ($this->myDOMNode->nodeType === XML_ELEMENT_NODE) ? $this->myDOMNode->localName : $this->myDOMNode->tagName; //Avoid namespace prefix for DOMElement
 			case 'content': return $this->myDOMNode->textContent;
 			case 'value': return $this->myDOMNode->value;
 			default:
-				$myErrors=debug_backtrace();
-				trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']',E_USER_NOTICE);
+				$myErrors = debug_backtrace();
+				trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']', E_USER_NOTICE);
 				return false;
 		}
 	}
-	function add_child($newnode) {return append_child($newnode);}
-	function add_namespace($uri,$prefix) {return false;}
-	function append_child($newnode) {return self::_newDOMElement($this->myDOMNode->appendChild($this->_importNode($newnode)),$this->myOwnerDocument);}
-	function append_sibling($newnode) {return self::_newDOMElement($this->myDOMNode->parentNode->appendChild($this->_importNode($newnode)),$this->myOwnerDocument);}
+	function add_child($newnode) {return append_child($newnode); }
+	function add_namespace($uri, $prefix) {return false; }
+	function append_child($newnode) {return self::_newDOMElement($this->myDOMNode->appendChild($this->_importNode($newnode)), $this->myOwnerDocument); }
+	function append_sibling($newnode) {return self::_newDOMElement($this->myDOMNode->parentNode->appendChild($this->_importNode($newnode)), $this->myOwnerDocument); }
 	function attributes()
 	{
-		$myDOMNodeList=$this->myDOMNode->attributes;
-		if (!(isset($myDOMNodeList)&&$this->myDOMNode->hasAttributes())) return null;
-		$nodeSet=array();
-		$i=0;
-		while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument);
+		$myDOMNodeList = $this->myDOMNode->attributes;
+		if (!(isset($myDOMNodeList) && $this->myDOMNode->hasAttributes())) return null;
+		$nodeSet = array();
+		$i = 0;
+		while ($node = $myDOMNodeList->item($i++)) $nodeSet[] = new php4DOMAttr($node, $this->myOwnerDocument);
 		return $nodeSet;
 	}
 	function child_nodes()
 	{
-		$myDOMNodeList=$this->myDOMNode->childNodes;
-		$nodeSet=array();
-		$i=0;
+		$myDOMNodeList = $this->myDOMNode->childNodes;
+		$nodeSet = array();
+		$i = 0;
 		if (isset($myDOMNodeList))
-			while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=self::_newDOMElement($node,$this->myOwnerDocument);
+			while ($node = $myDOMNodeList->item($i++)) $nodeSet[] = self::_newDOMElement($node, $this->myOwnerDocument);
 		return $nodeSet;
 	}
-	function children() {return $this->child_nodes();}
-	function clone_node($deep=false) {return self::_newDOMElement($this->myDOMNode->cloneNode($deep),$this->myOwnerDocument);}
+	function children() {return $this->child_nodes(); }
+	function clone_node($deep = false) {return self::_newDOMElement($this->myDOMNode->cloneNode($deep), $this->myOwnerDocument); }
 	//dump_node($node) should only be called on php4DOMDocument
-	function dump_node($node=null) {return $node==null ? $this->myOwnerDocument->myDOMNode->saveXML($this->myDOMNode) : $this->myOwnerDocument->myDOMNode->saveXML($node->myDOMNode);}
-	function first_child() {return self::_newDOMElement($this->myDOMNode->firstChild,$this->myOwnerDocument);}
-	function get_content() {return $this->myDOMNode->textContent;}
-	function has_attributes() {return $this->myDOMNode->hasAttributes();}
-	function has_child_nodes() {return $this->myDOMNode->hasChildNodes();}
-	function insert_before($newnode,$refnode) {return self::_newDOMElement($this->myDOMNode->insertBefore($this->_importNode($newnode),$refnode==null?null:$refnode->myDOMNode),$this->myOwnerDocument);}
-	function is_blank_node() {return ($this->myDOMNode->nodeType===XML_TEXT_NODE)&&preg_match('%^\s*$%',$this->myDOMNode->nodeValue);}
-	function last_child() {return self::_newDOMElement($this->myDOMNode->lastChild,$this->myOwnerDocument);}
-	function new_child($name,$content)
+	function dump_node($node = null) {return $node == null ? $this->myOwnerDocument->myDOMNode->saveXML($this->myDOMNode) : $this->myOwnerDocument->myDOMNode->saveXML($node->myDOMNode); }
+	function first_child() {return self::_newDOMElement($this->myDOMNode->firstChild, $this->myOwnerDocument); }
+	function get_content() {return $this->myDOMNode->textContent; }
+	function has_attributes() {return $this->myDOMNode->hasAttributes(); }
+	function has_child_nodes() {return $this->myDOMNode->hasChildNodes(); }
+	function insert_before($newnode, $refnode) {return self::_newDOMElement($this->myDOMNode->insertBefore($this->_importNode($newnode), $refnode == null ? null : $refnode->myDOMNode), $this->myOwnerDocument); }
+	function is_blank_node() {return ($this->myDOMNode->nodeType === XML_TEXT_NODE) && preg_match('%^\s*$%', $this->myDOMNode->nodeValue); }
+	function last_child() {return self::_newDOMElement($this->myDOMNode->lastChild, $this->myOwnerDocument); }
+	function new_child($name, $content)
 	{
-		$mySubNode=$this->myDOMNode->ownerDocument->createElement($name);
+		$mySubNode = $this->myDOMNode->ownerDocument->createElement($name);
 		$mySubNode->appendChild($this->myDOMNode->ownerDocument->createTextNode(_entityDecode($content)));
 		$this->myDOMNode->appendChild($mySubNode);
-		return new php4DOMElement($mySubNode,$this->myOwnerDocument);
+		return new php4DOMElement($mySubNode, $this->myOwnerDocument);
 	}
-	function next_sibling() {return self::_newDOMElement($this->myDOMNode->nextSibling,$this->myOwnerDocument);}
-	function node_name() {return ($this->myDOMNode->nodeType===XML_ELEMENT_NODE) ? $this->myDOMNode->localName : $this->myDOMNode->nodeName;} //Avoid namespace prefix for DOMElement
-	function node_type() {return $this->myDOMNode->nodeType;}
-	function node_value() {return $this->myDOMNode->nodeValue;}
-	function owner_document() {return $this->myOwnerDocument;}
-	function parent_node() {return self::_newDOMElement($this->myDOMNode->parentNode,$this->myOwnerDocument);}
-	function prefix() {return $this->myDOMNode->prefix;}
-	function previous_sibling() {return self::_newDOMElement($this->myDOMNode->previousSibling,$this->myOwnerDocument);}
-	function remove_child($oldchild) {return self::_newDOMElement($this->myDOMNode->removeChild($oldchild->myDOMNode),$this->myOwnerDocument);}
-	function replace_child($newnode,$oldnode) {return self::_newDOMElement($this->myDOMNode->replaceChild($this->_importNode($newnode),$oldnode->myDOMNode),$this->myOwnerDocument);}
-	function replace_node($newnode) {return self::_newDOMElement($this->myDOMNode->parentNode->replaceChild($this->_importNode($newnode),$this->myDOMNode),$this->myOwnerDocument);}
-	function set_content($text) {return $this->myDOMNode->appendChild($this->myDOMNode->ownerDocument->createTextNode(_entityDecode($text)));} //Entity problem reported by AL-DesignWorks 2007-09-07
+	function next_sibling() {return self::_newDOMElement($this->myDOMNode->nextSibling, $this->myOwnerDocument); }
+	function node_name() {return ($this->myDOMNode->nodeType === XML_ELEMENT_NODE) ? $this->myDOMNode->localName : $this->myDOMNode->nodeName; } //Avoid namespace prefix for DOMElement
+	function node_type() {return $this->myDOMNode->nodeType; }
+	function node_value() {return $this->myDOMNode->nodeValue; }
+	function owner_document() {return $this->myOwnerDocument; }
+	function parent_node() {return self::_newDOMElement($this->myDOMNode->parentNode, $this->myOwnerDocument); }
+	function prefix() {return $this->myDOMNode->prefix; }
+	function previous_sibling() {return self::_newDOMElement($this->myDOMNode->previousSibling, $this->myOwnerDocument); }
+	function remove_child($oldchild) {return self::_newDOMElement($this->myDOMNode->removeChild($oldchild->myDOMNode), $this->myOwnerDocument); }
+	function replace_child($newnode, $oldnode) {return self::_newDOMElement($this->myDOMNode->replaceChild($this->_importNode($newnode), $oldnode->myDOMNode), $this->myOwnerDocument); }
+	function replace_node($newnode) {return self::_newDOMElement($this->myDOMNode->parentNode->replaceChild($this->_importNode($newnode), $this->myDOMNode), $this->myOwnerDocument); }
+	function set_content($text) {return $this->myDOMNode->appendChild($this->myDOMNode->ownerDocument->createTextNode(_entityDecode($text))); } //Entity problem reported by AL-DesignWorks 2007-09-07
 	//function set_name($name) {return $this->myOwnerDocument->renameNode($this->myDOMNode,$this->myDOMNode->namespaceURI,$name);}
-	function set_namespace($uri,$prefix=null)
+	function set_namespace($uri, $prefix = null)
 	{//Contributions by Daniel Walker 2006-09-08
-		$nsprefix=$this->myDOMNode->lookupPrefix($uri);
-		if ($nsprefix==null)
+		$nsprefix = $this->myDOMNode->lookupPrefix($uri);
+		if ($nsprefix == null)
 		{
-			$nsprefix= $prefix==null ? $nsprefix='a'.sprintf('%u',crc32($uri)) : $prefix;
-			if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE)
+			$nsprefix = $prefix == null ? $nsprefix = 'a'.sprintf('%u', crc32($uri)) : $prefix;
+			if ($this->myDOMNode->nodeType === XML_ATTRIBUTE_NODE)
 			{
-				if (($prefix!=null)&&$this->myDOMNode->ownerElement->hasAttributeNS('http://www.w3.org/2000/xmlns/',$nsprefix)&&
-					($this->myDOMNode->ownerElement->getAttributeNS('http://www.w3.org/2000/xmlns/',$nsprefix)!=$uri))
+				if (($prefix != null) && $this->myDOMNode->ownerElement->hasAttributeNS('http://www.w3.org/2000/xmlns/', $nsprefix) &&
+					($this->myDOMNode->ownerElement->getAttributeNS('http://www.w3.org/2000/xmlns/', $nsprefix) != $uri))
 				{//Remove namespace
-					$parent=$this->myDOMNode->ownerElement;
+					$parent = $this->myDOMNode->ownerElement;
 					$parent->removeAttributeNode($this->myDOMNode);
-					$parent->setAttribute($this->myDOMNode->localName,$this->myDOMNode->nodeValue);
-					$this->myDOMNode=$parent->getAttributeNode($this->myDOMNode->localName);
+					$parent->setAttribute($this->myDOMNode->localName, $this->myDOMNode->nodeValue);
+					$this->myDOMNode = $parent->getAttributeNode($this->myDOMNode->localName);
 					return;
 				}
-				$this->myDOMNode->ownerElement->setAttributeNS('http://www.w3.org/2000/xmlns/','xmlns:'.$nsprefix,$uri);
+				$this->myDOMNode->ownerElement->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:'.$nsprefix, $uri);
 			}
 		}
-		if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE)
+		if ($this->myDOMNode->nodeType === XML_ATTRIBUTE_NODE)
 		{
-			$parent=$this->myDOMNode->ownerElement;
+			$parent = $this->myDOMNode->ownerElement;
 			$parent->removeAttributeNode($this->myDOMNode);
-			$parent->setAttributeNS($uri,$nsprefix.':'.$this->myDOMNode->localName,$this->myDOMNode->nodeValue);
-			$this->myDOMNode=$parent->getAttributeNodeNS($uri,$this->myDOMNode->localName);
+			$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);
+			$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));
-			$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); 
-			$this->myDOMNode->parentNode->replaceChild($NewNode,$this->myDOMNode);
-			$this->myDOMNode=$NewNode;
+			$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); 
+			$this->myDOMNode->parentNode->replaceChild($NewNode, $this->myDOMNode);
+			$this->myDOMNode = $NewNode;
 		}
 	}
 	function unlink_node()
 	{
-		if ($this->myDOMNode->parentNode!=null)
+		if ($this->myDOMNode->parentNode != null)
 		{
-			if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE) $this->myDOMNode->parentNode->removeAttributeNode($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)
+	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);
-			case XML_TEXT_NODE: return new php4DOMText($aDOMNode,$aOwnerDocument);
-			case XML_ATTRIBUTE_NODE: return new php4DOMAttr($aDOMNode,$aOwnerDocument);
-			case XML_PI_NODE: return new php4DomProcessingInstruction($aDOMNode,$aOwnerDocument);
-			default: return new php4DOMNode($aDOMNode,$aOwnerDocument);
+			case XML_ELEMENT_NODE: return new php4DOMElement($aDOMNode, $aOwnerDocument);
+			case XML_TEXT_NODE: return new php4DOMText($aDOMNode, $aOwnerDocument);
+			case XML_ATTRIBUTE_NODE: return new php4DOMAttr($aDOMNode, $aOwnerDocument);
+			case XML_PI_NODE: return new php4DomProcessingInstruction($aDOMNode, $aOwnerDocument);
+			default: return new php4DOMNode($aDOMNode, $aOwnerDocument);
 		}
 	}
 }
 
 class php4DomProcessingInstruction extends php4DOMNode
 {
-	function data() {return $this->myDOMNode->data;}
-	function target() {return $this->myDOMNode->target;}
+	function data() {return $this->myDOMNode->data; }
+	function target() {return $this->myDOMNode->target; }
 }
 
 class php4DOMText extends php4DOMNode
 {
 	function __get($name)
 	{
-		if ($name==='tagname') return '#text';
+		if ($name === 'tagname') return '#text';
 		else return parent::__get($name);
 	}
-	function tagname() {return '#text';}
-	function set_content($text) {$this->myDOMNode->nodeValue=$text; return true;}
+	function tagname() {return '#text'; }
+	function set_content($text) {$this->myDOMNode->nodeValue = $text; return true; }
 }
 
 if (!defined('XPATH_NODESET'))
 {
-	define('XPATH_UNDEFINED',0);
-	define('XPATH_NODESET',1);
-	define('XPATH_BOOLEAN',2);
-	define('XPATH_NUMBER',3);
-	define('XPATH_STRING',4);
+	define('XPATH_UNDEFINED', 0);
+	define('XPATH_NODESET', 1);
+	define('XPATH_BOOLEAN', 2);
+	define('XPATH_NUMBER', 3);
+	define('XPATH_STRING', 4);
 	/*define('XPATH_POINT',5);
 	define('XPATH_RANGE',6);
 	define('XPATH_LOCATIONSET',7);
@@ -413,36 +413,36 @@ 
 {
 	private $myDOMNodelist;
 	public $nodeset;
-	public $type=XPATH_UNDEFINED;
+	public $type = XPATH_UNDEFINED;
 	public $value;
-	function php4DOMNodelist($aDOMNodelist,$aOwnerDocument)
+	function php4DOMNodelist($aDOMNodelist, $aOwnerDocument)
 	{
 		if (!isset($aDOMNodelist)) return; 
-		elseif (is_object($aDOMNodelist)||is_array($aDOMNodelist))
+		elseif (is_object($aDOMNodelist) || is_array($aDOMNodelist))
 		{
-			if ($aDOMNodelist->length>0)
+			if ($aDOMNodelist->length > 0)
 			{
-				$this->myDOMNodelist=$aDOMNodelist;
-				$this->nodeset=array();
-				$this->type=XPATH_NODESET;
-				$i=0;
-				while ($node=$this->myDOMNodelist->item($i++)) $this->nodeset[]=php4DOMNode::_newDOMElement($node,$aOwnerDocument);
+				$this->myDOMNodelist = $aDOMNodelist;
+				$this->nodeset = array();
+				$this->type = XPATH_NODESET;
+				$i = 0;
+				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;
+			$this->type = XPATH_NUMBER;
+			$this->value = $aDOMNodelist;
 		}
 		elseif (is_bool($aDOMNodelist))
 		{
-			$this->type=XPATH_BOOLEAN;
-			$this->value=$aDOMNodelist;
+			$this->type = XPATH_BOOLEAN;
+			$this->value = $aDOMNodelist;
 		}
 		elseif (is_string($aDOMNodelist))
 		{
-			$this->type=XPATH_STRING;
-			$this->value=$aDOMNodelist;
+			$this->type = XPATH_STRING;
+			$this->value = $aDOMNodelist;
 		}
 	}
 }
@@ -454,46 +454,46 @@ 
 	function php4DOMXPath($dom_document)
 	{
 		//TODO: If $dom_document is a DomElement, make that default $contextnode and modify XPath. Ex: '/test'
-		$this->myOwnerDocument=$dom_document->myOwnerDocument;
-		$this->myDOMXPath=new DOMXPath($this->myOwnerDocument->myDOMNode);
+		$this->myOwnerDocument = $dom_document->myOwnerDocument;
+		$this->myDOMXPath = new DOMXPath($this->myOwnerDocument->myDOMNode);
 	}
-	function xpath_eval($eval_str,$contextnode=null)
+	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);
-		$xp=new php4DOMNodelist($xp,$this->myOwnerDocument);
-		return ($xp->type===XPATH_UNDEFINED) ? false : $xp;
+		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;
 	}
-	function xpath_register_ns($prefix,$namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix,$namespaceURI);}
+	function xpath_register_ns($prefix, $namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix, $namespaceURI); }
 }
 
 if (extension_loaded('xsl'))
 {//See also: http://alexandre.alapetite.net/doc-alex/xslt-php4-php5/
-	function domxml_xslt_stylesheet($xslstring) {return new php4DomXsltStylesheet(DOMDocument::loadXML($xslstring));}
-	function domxml_xslt_stylesheet_doc($dom_document) {return new php4DomXsltStylesheet($dom_document);}
-	function domxml_xslt_stylesheet_file($xslfile) {return new php4DomXsltStylesheet(DOMDocument::load($xslfile));}
+	function domxml_xslt_stylesheet($xslstring) {return new php4DomXsltStylesheet(DOMDocument::loadXML($xslstring)); }
+	function domxml_xslt_stylesheet_doc($dom_document) {return new php4DomXsltStylesheet($dom_document); }
+	function domxml_xslt_stylesheet_file($xslfile) {return new php4DomXsltStylesheet(DOMDocument::load($xslfile)); }
 	class php4DomXsltStylesheet
 	{
 		private $myxsltProcessor;
 		function php4DomXsltStylesheet($dom_document)
 		{
-			$this->myxsltProcessor=new xsltProcessor();
+			$this->myxsltProcessor = new xsltProcessor();
 			$this->myxsltProcessor->importStyleSheet($dom_document);
 		}
-		function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false)
+		function process($dom_document, $xslt_parameters = array(), $param_is_xpath = false)
 		{
-			foreach ($xslt_parameters as $param=>$value) $this->myxsltProcessor->setParameter('',$param,$value);
-			$myphp4DOMDocument=new php4DOMDocument();
-			$myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode);
+			foreach ($xslt_parameters as $param=>$value) $this->myxsltProcessor->setParameter('', $param, $value);
+			$myphp4DOMDocument = new php4DOMDocument();
+			$myphp4DOMDocument->myDOMNode = $this->myxsltProcessor->transformToDoc($dom_document->myDOMNode);
 			return $myphp4DOMDocument;
 		}
-		function result_dump_file($dom_document,$filename)
+		function result_dump_file($dom_document, $filename)
 		{
-			$html=$dom_document->myDOMNode->saveHTML();
-			file_put_contents($filename,$html);
+			$html = $dom_document->myDOMNode->saveHTML();
+			file_put_contents($filename, $html);
 			return $html;
 		}
-		function result_dump_mem($dom_document) {return $dom_document->myDOMNode->saveHTML();}
+		function result_dump_mem($dom_document) {return $dom_document->myDOMNode->saveHTML(); }
 	}
 }
 ?>

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

Spacing +196 added lines, -196 removed lines

@@ -80,9 +80,9 @@ 
 	 */
 	function HTMLFilterOutput($str)
 		{
-		$str = str_replace('__CAS_VERSION__',$this->getServerVersion(),$str);
-		$str = str_replace('__PHPCAS_VERSION__',phpCAS::getVersion(),$str);
-		$str = str_replace('__SERVER_BASE_URL__',$this->getServerBaseURL(),$str);
+		$str = str_replace('__CAS_VERSION__', $this->getServerVersion(), $str);
+		$str = str_replace('__PHPCAS_VERSION__', phpCAS::getVersion(), $str);
+		$str = str_replace('__SERVER_BASE_URL__', $this->getServerBaseURL(), $str);
 		echo $str;
 		}
 	
@@ -136,7 +136,7 @@ 
 	function printHTMLFooter()
 		{
 		$this->HTMLFilterOutput(empty($this->_output_footer)
-			?('<hr><address>phpCAS __PHPCAS_VERSION__ '.$this->getString(CAS_STR_USING_SERVER).' <a href="__SERVER_BASE_URL__">__SERVER_BASE_URL__</a> (CAS __CAS_VERSION__)</a></address></body></html>')
+			? ('<hr><address>phpCAS __PHPCAS_VERSION__ '.$this->getString(CAS_STR_USING_SERVER).' <a href="__SERVER_BASE_URL__">__SERVER_BASE_URL__</a> (CAS __CAS_VERSION__)</a></address></body></html>')
 					:$this->_output_footer);
 		}
 	
@@ -193,7 +193,7 @@ 
 	 */
 	function getLang()
 		{
-		if ( empty($this->_lang) )
+		if (empty($this->_lang))
 			$this->setLang(PHPCAS_LANG_DEFAULT);
 		return $this->_lang;
 		}
@@ -223,8 +223,8 @@ 
 		// call CASclient::getLang() to be sure the language is initialized
 		$this->getLang();
 		
-		if ( !isset($this->_strings[$str]) ) {
-			trigger_error('string `'.$str.'\' not defined for language `'.$this->getLang().'\'',E_USER_ERROR);
+		if (!isset($this->_strings[$str])) {
+			trigger_error('string `'.$str.'\' not defined for language `'.$this->getLang().'\'', E_USER_ERROR);
 		}
 		return $this->_strings[$str];
 		}
@@ -243,8 +243,8 @@ 
 		// include the corresponding language file
 		include_once(dirname(__FILE__).'/languages/'.$lang.'.php');
 		
-		if ( !is_array($this->_strings) ) {
-			trigger_error('language `'.$lang.'\' is not implemented',E_USER_ERROR);
+		if (!is_array($this->_strings)) {
+			trigger_error('language `'.$lang.'\' is not implemented', E_USER_ERROR);
 		}
 		$this->_lang = $lang;
 		}
@@ -331,7 +331,7 @@ 
 	function getServerBaseURL()
 		{ 
 		// the URL is build only when needed
-		if ( empty($this->_server['base_url']) ) {
+		if (empty($this->_server['base_url'])) {
 			$this->_server['base_url'] = 'https://'
 				.$this->getServerHostname()
 				.':'
@@ -350,15 +350,15 @@ 
 	 * @return a URL.
 	 * @private
 	 */
-	function getServerLoginURL($gateway=false,$renew=false) {
+	function getServerLoginURL($gateway = false, $renew = false) {
 		phpCAS::traceBegin();
 		// the URL is build only when needed
-		if ( empty($this->_server['login_url']) ) {
+		if (empty($this->_server['login_url'])) {
 			$this->_server['login_url'] = $this->getServerBaseURL();
 			$this->_server['login_url'] .= 'login?service=';
 			// $this->_server['login_url'] .= preg_replace('/&/','%26',$this->getURL());
 			$this->_server['login_url'] .= urlencode($this->getURL());
-			if($renew) {
+			if ($renew) {
 				// It is recommended that when the "renew" parameter is set, its value be "true"
 				$this->_server['login_url'] .= '&renew=true';
 			} elseif ($gateway) {
@@ -426,7 +426,7 @@ 
 	function getServerServiceValidateURL()
 		{ 
 		// the URL is build only when needed
-		if ( empty($this->_server['service_validate_url']) ) {
+		if (empty($this->_server['service_validate_url'])) {
 			switch ($this->getServerVersion()) {
 				case CAS_VERSION_1_0:
 					$this->_server['service_validate_url'] = $this->getServerBaseURL().'validate';
@@ -448,7 +448,7 @@ 
 		{
 		phpCAS::traceBegin();
 		// the URL is build only when needed
-		if ( empty($this->_server['saml_validate_url']) ) {
+		if (empty($this->_server['saml_validate_url'])) {
 			switch ($this->getServerVersion()) {
 				case SAML_VERSION_1_1:
 					$this->_server['saml_validate_url'] = $this->getServerBaseURL().'samlValidate';
@@ -466,7 +466,7 @@ 
 	function getServerProxyValidateURL()
 		{ 
 		// the URL is build only when needed
-		if ( empty($this->_server['proxy_validate_url']) ) {
+		if (empty($this->_server['proxy_validate_url'])) {
 			switch ($this->getServerVersion()) {
 				case CAS_VERSION_1_0:
 					$this->_server['proxy_validate_url'] = '';
@@ -488,7 +488,7 @@ 
 	function getServerProxyURL()
 		{ 
 		// the URL is build only when needed
-		if ( empty($this->_server['proxy_url']) ) {
+		if (empty($this->_server['proxy_url'])) {
 			switch ($this->getServerVersion()) {
 				case CAS_VERSION_1_0:
 					$this->_server['proxy_url'] = '';
@@ -509,7 +509,7 @@ 
 	function getServerLogoutURL()
 		{ 
 		// the URL is build only when needed
-		if ( empty($this->_server['logout_url']) ) {
+		if (empty($this->_server['logout_url'])) {
 			$this->_server['logout_url'] = $this->getServerBaseURL().'logout';
 		}
 		return $this->_server['logout_url']; 
@@ -547,7 +547,7 @@ 
 	function isHttps() {
 		//if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) ) {
 		//0.4.24 by Hinnack
-		if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+		if (isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
 			return true;
 		} else {
 			return false;
@@ -582,45 +582,45 @@ 
 		phpCAS::traceBegin();
 		
 		// the redirect header() call and DOM parsing code from domxml-php4-php5.php won't work in PHP4 compatibility mode
-		if (version_compare(PHP_VERSION,'5','>=') && ini_get('zend.ze1_compatibility_mode')) {
+		if (version_compare(PHP_VERSION, '5', '>=') && ini_get('zend.ze1_compatibility_mode')) {
 			phpCAS::error('phpCAS cannot support zend.ze1_compatibility_mode. Sorry.');
 		}
 		// skip Session Handling for logout requests and if don't want it'
 		if ($start_session && !$this->isLogoutRequest()) {
 			phpCAS::trace("Starting session handling");
 			// Check for Tickets from the CAS server
-			if (empty($_GET['ticket'])){
+			if (empty($_GET['ticket'])) {
 				phpCAS::trace("No ticket found");
 				// only create a session if necessary
 				if (!session_id()) {
 					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;
 					session_destroy();	
 				}
 				// set up a new session, of name based on the ticket
-				$session_id = preg_replace('/[^\w]/','',$_GET['ticket']);
-				phpCAS::LOG("Session ID: " . $session_id);
+				$session_id = preg_replace('/[^\w]/', '', $_GET['ticket']);
+				phpCAS::LOG("Session ID: ".$session_id);
 				session_id($session_id);
 				session_start();
 				// restore old session vars
-				if(isset($old_session)){
+				if (isset($old_session)) {
 					phpCAS::trace("Restoring old session vars");
 					$_SESSION = $old_session;
 				}
 			}
-		}else{
+		} else {
 			phpCAS::trace("Skipping session creation");
 		}
 		
@@ -631,7 +631,7 @@ 
 		//check version
 		switch ($server_version) {
 			case CAS_VERSION_1_0:
-				if ( $this->isProxy() )
+				if ($this->isProxy())
 					phpCAS::error('CAS proxies are not supported in CAS '
 						.$server_version);
 				break;
@@ -648,35 +648,35 @@ 
 		$this->_server['version'] = $server_version;
 		
 		// check hostname
-		if ( empty($server_hostname) 
-				|| !preg_match('/[\.\d\-abcdefghijklmnopqrstuvwxyz]*/',$server_hostname) ) {
+		if (empty($server_hostname) 
+				|| !preg_match('/[\.\d\-abcdefghijklmnopqrstuvwxyz]*/', $server_hostname)) {
 			phpCAS::error('bad CAS server hostname (`'.$server_hostname.'\')');
 		}
 		$this->_server['hostname'] = $server_hostname;
 		
 		// check port
-		if ( $server_port == 0 
-			|| !is_int($server_port) ) {
+		if ($server_port == 0 
+			|| !is_int($server_port)) {
 			phpCAS::error('bad CAS server port (`'.$server_hostname.'\')');
 		}
 		$this->_server['port'] = $server_port;
 		
 		// check URI
-		if ( !preg_match('/[\.\d\-_abcdefghijklmnopqrstuvwxyz\/]*/',$server_uri) ) {
+		if (!preg_match('/[\.\d\-_abcdefghijklmnopqrstuvwxyz\/]*/', $server_uri)) {
 			phpCAS::error('bad CAS server URI (`'.$server_uri.'\')');
 		}
 		// add leading and trailing `/' and remove doubles      
-		$server_uri = preg_replace('/\/\//','/','/'.$server_uri.'/');
+		$server_uri = preg_replace('/\/\//', '/', '/'.$server_uri.'/');
 		$this->_server['uri'] = $server_uri;
 		
 		// set to callback mode if PgtIou and PgtId CGI GET parameters are provided 
-		if ( $this->isProxy() ) {
-			$this->setCallbackMode(!empty($_GET['pgtIou'])&&!empty($_GET['pgtId']));
+		if ($this->isProxy()) {
+			$this->setCallbackMode(!empty($_GET['pgtIou']) && !empty($_GET['pgtId']));
 		}
 		
-		if ( $this->isCallbackMode() ) {
+		if ($this->isCallbackMode()) {
 			//callback mode: check that phpCAS is secured
-			if ( !$this->isHttps() ) {
+			if (!$this->isHttps()) {
 				phpCAS::error('CAS proxies must be secured to use phpCAS; PGT\'s will not be received from the CAS server');
 			}
 		} else {
@@ -684,33 +684,33 @@ 
 			$ticket = (isset($_GET['ticket']) ? $_GET['ticket'] : null);
 			switch ($this->getServerVersion()) {
 				case CAS_VERSION_1_0: // check for a Service Ticket
-					if( preg_match('/^ST-/',$ticket) ) {
+					if (preg_match('/^ST-/', $ticket)) {
 						phpCAS::trace('ST \''.$ticket.'\' found');
 						//ST present
 						$this->setST($ticket);
 						//ticket has been taken into account, unset it to hide it to applications
 						unset($_GET['ticket']);
-					} else if ( !empty($ticket) ) {
+					} else if (!empty($ticket)) {
 						//ill-formed ticket, halt
 						phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')');
 					}
 					break;
 				case CAS_VERSION_2_0: // check for a Service or Proxy Ticket
-					if( preg_match('/^[SP]T-/',$ticket) ) {
+					if (preg_match('/^[SP]T-/', $ticket)) {
 						phpCAS::trace('ST or PT \''.$ticket.'\' found');
 						$this->setPT($ticket);
 						unset($_GET['ticket']);
-					} else if ( !empty($ticket) ) {
+					} else if (!empty($ticket)) {
 						//ill-formed ticket, halt
 						phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')');
 					} 
 					break;
 				case SAML_VERSION_1_1: // SAML just does Service Tickets
-					if( preg_match('/^[SP]T-/',$ticket) ) {
+					if (preg_match('/^[SP]T-/', $ticket)) {
 						phpCAS::trace('SA \''.$ticket.'\' found');
 						$this->setSA($ticket);
 						unset($_GET['ticket']);
-					} else if ( !empty($ticket) ) {
+					} else if (!empty($ticket)) {
 						//ill-formed ticket, halt
 						phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')');
 					}
@@ -763,7 +763,7 @@ 
 	 */
 	function getUser()
 		{
-		if ( empty($this->_user) ) {
+		if (empty($this->_user)) {
 			phpCAS::error('this method should be used only after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');
 		}
 		return $this->_user;
@@ -790,7 +790,7 @@ 
 		{ $this->_attributes = $attributes; }
 	
 	function getAttributes() {
-		if ( empty($this->_user) ) { // if no user is set, there shouldn't be any attributes also...
+		if (empty($this->_user)) { // if no user is set, there shouldn't be any attributes also...
 			phpCAS::error('this method should be used only after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');
 		}
 		return $this->_attributes;
@@ -802,8 +802,8 @@ 
 	function hasAttribute($key)
 		{ return (is_array($this->_attributes) && array_key_exists($key, $this->_attributes)); }
 	
-	function getAttribute($key)	{
-		if($this->hasAttribute($key)) {
+	function getAttribute($key) {
+		if ($this->hasAttribute($key)) {
 			return $this->_attributes[$key];
 		}
 	}
@@ -814,14 +814,14 @@ 
 	 * If not, redirect to CAS
 	 * @public
 	 */
-	function renewAuthentication(){
+	function renewAuthentication() {
 		phpCAS::traceBegin();
 		// Either way, the user is authenticated by CAS
-		if( isset( $_SESSION['phpCAS']['auth_checked'] ) )
+		if (isset($_SESSION['phpCAS']['auth_checked']))
 			unset($_SESSION['phpCAS']['auth_checked']);
-		if ( $this->isAuthenticated() ) {
+		if ($this->isAuthenticated()) {
 			phpCAS::trace('user already authenticated; renew');
-			$this->redirectToCas(false,true);
+			$this->redirectToCas(false, true);
 		} else {
 			$this->redirectToCas();
 		}
@@ -838,7 +838,7 @@ 
 		{
 		phpCAS::traceBegin();
 		
-		if ( $this->isAuthenticated() ) {
+		if ($this->isAuthenticated()) {
 			// the user is authenticated, nothing to be done.
 			phpCAS::trace('no need to authenticate');
 			$res = TRUE;
@@ -883,7 +883,7 @@ 
 	function checkAuthentication()
 		{
 		phpCAS::traceBegin();
-		if ( $this->isAuthenticated() ) {
+		if ($this->isAuthenticated()) {
             phpCAS::trace('user is authenticated');
 			$res = TRUE;
 		} else if (isset($_SESSION['phpCAS']['auth_checked'])) {
@@ -897,7 +897,7 @@ 
 			//	    // never reached
 			//	    $res = FALSE;
 			// avoid a check against CAS on every request
-			if (! isset($_SESSION['phpCAS']['unauth_count']) )
+			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) 
@@ -943,43 +943,43 @@ 
 		$res = FALSE;
 		$validate_url = '';
 		
-		if ( $this->wasPreviouslyAuthenticated() ) {
+		if ($this->wasPreviouslyAuthenticated()) {
 			// the user has already (previously during the session) been
 			// authenticated, nothing to be done.
 			phpCAS::trace('user was already authenticated, no need to look for tickets');
 			$res = TRUE;
 		}
 		else {
-			if ( $this->hasST() ) {
+			if ($this->hasST()) {
 				// if a Service Ticket was given, validate it
 				phpCAS::trace('ST `'.$this->getST().'\' is present');
-				$this->validateST($validate_url,$text_response,$tree_response); // if it fails, it halts
+				$this->validateST($validate_url, $text_response, $tree_response); // if it fails, it halts
 				phpCAS::trace('ST `'.$this->getST().'\' was validated');
-				if ( $this->isProxy() ) {
-					$this->validatePGT($validate_url,$text_response,$tree_response); // idem
+				if ($this->isProxy()) {
+					$this->validatePGT($validate_url, $text_response, $tree_response); // idem
 					phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
 					$_SESSION['phpCAS']['pgt'] = $this->getPGT();
 				}
 				$_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
+				$this->validatePT($validate_url, $text_response, $tree_response); // note: if it fails, it halts
 				phpCAS::trace('PT `'.$this->getPT().'\' was validated');
-				if ( $this->isProxy() ) {
-					$this->validatePGT($validate_url,$text_response,$tree_response); // idem
+				if ($this->isProxy()) {
+					$this->validatePGT($validate_url, $text_response, $tree_response); // idem
 					phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
 					$_SESSION['phpCAS']['pgt'] = $this->getPGT();
 				}
 				$_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
+				$this->validateSA($validate_url, $text_response, $tree_response); // if it fails, it halts
 				phpCAS::trace('SA `'.$this->getSA().'\' was validated');
 				$_SESSION['phpCAS']['user'] = $this->getUser();
 				$_SESSION['phpCAS']['attributes'] = $this->getAttributes();
@@ -993,7 +993,7 @@ 
 				// if called with a ticket parameter, we need to redirect to the app without the ticket so that CAS-ification is transparent to the browser (for later POSTS)
 				// most of the checks and errors should have been made now, so we're safe for redirect without masking error messages.
 				header('Location: '.$this->getURL());
-				phpCAS::log( "Prepare redirect to : ".$this->getURL() );
+				phpCAS::log("Prepare redirect to : ".$this->getURL());
 			}
 		}
 		
@@ -1006,7 +1006,7 @@ 
 	 * @return true if authenticated based soley on $_SESSION variable
 	 * @since 0.4.22 by Brendan Arnold
 	 */
-	function isSessionAuthenticated ()
+	function isSessionAuthenticated()
 		{
 		return !empty($_SESSION['phpCAS']['user']);
 		}
@@ -1025,28 +1025,28 @@ 
 		{
 		phpCAS::traceBegin();
 		
-		if ( $this->isCallbackMode() ) {
+		if ($this->isCallbackMode()) {
 			$this->callback();
 		}
 		
 		$auth = FALSE;
 		
-		if ( $this->isProxy() ) {
+		if ($this->isProxy()) {
 			// CAS proxy: username and PGT must be present
-			if ( $this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) {
+			if ($this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt'])) {
 				// authentication already done
 				$this->setUser($_SESSION['phpCAS']['user']);
 				$this->setPGT($_SESSION['phpCAS']['pgt']);
 				phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\', PGT = `'.$_SESSION['phpCAS']['pgt'].'\''); 
 				$auth = TRUE;
-			} elseif ( $this->isSessionAuthenticated() && empty($_SESSION['phpCAS']['pgt']) ) {
+			} elseif ($this->isSessionAuthenticated() && empty($_SESSION['phpCAS']['pgt'])) {
 				// these two variables should be empty or not empty at the same time
 				phpCAS::trace('username found (`'.$_SESSION['phpCAS']['user'].'\') but PGT is empty');
 				// unset all tickets to enforce authentication
 				unset($_SESSION['phpCAS']);
 				$this->setST('');
 				$this->setPT('');
-			} elseif ( !$this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) {
+			} elseif (!$this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt'])) {
 				// these two variables should be empty or not empty at the same time
 				phpCAS::trace('PGT found (`'.$_SESSION['phpCAS']['pgt'].'\') but username is empty'); 
 				// unset all tickets to enforce authentication
@@ -1058,10 +1058,10 @@ 
 			}
 		} else {
 			// `simple' CAS client (not a proxy): username must be present
-			if ( $this->isSessionAuthenticated() ) {
+			if ($this->isSessionAuthenticated()) {
 				// authentication already done
 				$this->setUser($_SESSION['phpCAS']['user']);
-				if(isset($_SESSION['phpCAS']['attributes'])){
+				if (isset($_SESSION['phpCAS']['attributes'])) {
 					$this->setAttributes($_SESSION['phpCAS']['attributes']);
 				}
 				phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\''); 
@@ -1082,15 +1082,15 @@ 
 	 * @param $renew true to force the authentication with the CAS server
 	 * @public
 	 */
-	function redirectToCas($gateway=false,$renew=false){
+	function redirectToCas($gateway = false, $renew = false) {
 		phpCAS::traceBegin();
-		$cas_url = $this->getServerLoginURL($gateway,$renew);
+		$cas_url = $this->getServerLoginURL($gateway, $renew);
 		header('Location: '.$cas_url);
-		phpCAS::log( "Redirect to : ".$cas_url );
+		phpCAS::log("Redirect to : ".$cas_url);
 		
 		$this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_WANTED));
 		
-		printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>',$cas_url);
+		printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>', $cas_url);
 		$this->printHTMLFooter();
 		
 		phpCAS::traceExit();
@@ -1108,20 +1108,20 @@ 
 		$cas_url = $this->getServerLogoutURL();
 		$paramSeparator = '?';
 		if (isset($params['url'])) {
-			$cas_url = $cas_url . $paramSeparator . "url=" . urlencode($params['url']); 
+			$cas_url = $cas_url.$paramSeparator."url=".urlencode($params['url']); 
 			$paramSeparator = '&';
 		}
 		if (isset($params['service'])) {
-			$cas_url = $cas_url . $paramSeparator . "service=" . urlencode($params['service']); 
+			$cas_url = $cas_url.$paramSeparator."service=".urlencode($params['service']); 
 		}
 		header('Location: '.$cas_url);
-		phpCAS::log( "Prepare redirect to : ".$cas_url );
+		phpCAS::log("Prepare redirect to : ".$cas_url);
 		
 		session_unset();
 		session_destroy();
 		
 		$this->printHTMLHeader($this->getString(CAS_STR_LOGOUT));
-		printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>',$cas_url);
+		printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>', $cas_url);
 		$this->printHTMLFooter();
 		
 		phpCAS::traceExit();
@@ -1151,7 +1151,7 @@ 
 	 * By default, only the CAs server (declared in the constructor) will be allowed.
 	 * @public
 	 */
-	function handleLogoutRequests($check_client=true, $allowed_clients=false) {
+	function handleLogoutRequests($check_client = true, $allowed_clients = false) {
 		phpCAS::traceBegin();
 		if (!$this->isLogoutRequest()) {
 			phpCAS::log("Not a logout request");
@@ -1162,7 +1162,7 @@ 
 		phpCAS::log("SAML REQUEST: ".$_POST['logoutRequest']);
 		if ($check_client) {
 			if (!$allowed_clients) {
-				$allowed_clients = array( $this->getServerHostname() ); 
+				$allowed_clients = array($this->getServerHostname()); 
 			}
 			$client_ip = $_SERVER['REMOTE_ADDR'];
 			$client = gethostbyaddr($client_ip);
@@ -1188,21 +1188,21 @@ 
 		}
 		// Extract the ticket from the SAML Request
 		preg_match("|<samlp:SessionIndex>(.*)</samlp:SessionIndex>|", $_POST['logoutRequest'], $tick, PREG_OFFSET_CAPTURE, 3);
-		$wrappedSamlSessionIndex = preg_replace('|<samlp:SessionIndex>|','',$tick[0][0]);
-		$ticket2logout = preg_replace('|</samlp:SessionIndex>|','',$wrappedSamlSessionIndex);
+		$wrappedSamlSessionIndex = preg_replace('|<samlp:SessionIndex>|', '', $tick[0][0]);
+		$ticket2logout = preg_replace('|</samlp:SessionIndex>|', '', $wrappedSamlSessionIndex);
 		phpCAS::log("Ticket to logout: ".$ticket2logout);
-		$session_id = preg_replace('/[^\w]/','',$ticket2logout);
+		$session_id = preg_replace('/[^\w]/', '', $ticket2logout);
 		phpCAS::log("Session id: ".$session_id);
 		
 		// destroy a possible application session created before phpcas
-		if(session_id()){
+		if (session_id()) {
 			session_unset();
 			session_destroy();
 		}
 		// fix session ID
 		session_id($session_id);
-		$_COOKIE[session_name()]=$session_id;
-		$_GET[session_name()]=$session_id;
+		$_COOKIE[session_name()] = $session_id;
+		$_GET[session_name()] = $session_id;
 		
 		// Overwrite session
 		session_start();	
@@ -1338,18 +1338,18 @@ 
 	 *
 	 * @private
 	 */
-	function validateST($validate_url,&$text_response,&$tree_response)
+	function validateST($validate_url, &$text_response, &$tree_response)
 		{
 		phpCAS::traceBegin();
 		// build the URL to validate the ticket
 		$validate_url = $this->getServerServiceValidateURL().'&ticket='.$this->getST();
-		if ( $this->isProxy() ) {
+		if ($this->isProxy()) {
 			// pass the callback url for CAS proxies
 			$validate_url .= '&pgtUrl='.$this->getCallbackURL();
 		}
 		
 		// open and read the URL
-		if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) {
+		if (!$this->readURL($validate_url, ''/*cookies*/, $headers, $text_response, $err_msg)) {
 			phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
 			$this->authError('ST not validated',
 				$validate_url,
@@ -1359,7 +1359,7 @@ 
 		// analyze the result depending on the version
 		switch ($this->getServerVersion()) {
 			case CAS_VERSION_1_0:
-				if (preg_match('/^no\n/',$text_response)) {
+				if (preg_match('/^no\n/', $text_response)) {
 					phpCAS::trace('ST has not been validated');
 					$this->authError('ST not validated',
 						$validate_url,
@@ -1367,7 +1367,7 @@ 
 						FALSE/*$bad_response*/,
 						$text_response);
 				}
-				if (!preg_match('/^yes\n/',$text_response)) {
+				if (!preg_match('/^yes\n/', $text_response)) {
 					phpCAS::trace('ill-formed response');
 					$this->authError('ST not validated',
 						$validate_url,
@@ -1376,12 +1376,12 @@ 
 						$text_response);
 				}
 				// ST has been validated, extract the user name
-				$arr = preg_split('/\n/',$text_response);
+				$arr = preg_split('/\n/', $text_response);
 				$this->setUser(trim($arr[1]));
 				break;
 			case CAS_VERSION_2_0:
 				// read the response of the CAS server into a DOM object
-				if ( !($dom = domxml_open_mem($text_response))) {
+				if (!($dom = domxml_open_mem($text_response))) {
 					phpCAS::trace('domxml_open_mem() failed');
 					$this->authError('ST not validated',
 						$validate_url,
@@ -1390,7 +1390,7 @@ 
 						$text_response);
 				}
 				// read the root node of the XML tree
-				if ( !($tree_response = $dom->document_element()) ) {
+				if (!($tree_response = $dom->document_element())) {
 					phpCAS::trace('document_element() failed');
 					$this->authError('ST not validated',
 						$validate_url,
@@ -1399,7 +1399,7 @@ 
 						$text_response);
 				}
 				// insure that tag name is 'serviceResponse'
-				if ( $tree_response->node_name() != 'serviceResponse' ) {
+				if ($tree_response->node_name() != 'serviceResponse') {
 					phpCAS::trace('bad XML root node (should be `serviceResponse\' instead of `'.$tree_response->node_name().'\'');
 					$this->authError('ST not validated',
 						$validate_url,
@@ -1407,9 +1407,9 @@ 
 						TRUE/*$bad_response*/,
 						$text_response);
 				}
-				if ( sizeof($success_elements = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) {
+				if (sizeof($success_elements = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) {
 					// authentication succeded, extract the user name
-					if ( sizeof($user_elements = $success_elements[0]->get_elements_by_tagname("user")) == 0) {
+					if (sizeof($user_elements = $success_elements[0]->get_elements_by_tagname("user")) == 0) {
 						phpCAS::trace('<authenticationSuccess> found, but no <user>');
 						$this->authError('ST not validated',
 							$validate_url,
@@ -1421,7 +1421,7 @@ 
 					phpCAS::trace('user = `'.$user);
 					$this->setUser($user);
 					
-				} else if ( sizeof($failure_elements = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) {
+				} else if (sizeof($failure_elements = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) {
 					phpCAS::trace('<authenticationFailure> found');
 					// authentication failed, extract the error code and message
 					$this->authError('ST not validated',
@@ -1468,7 +1468,7 @@ 
 	 *
 	 * @private
 	 */
-	function validateSA($validate_url,&$text_response,&$tree_response)
+	function validateSA($validate_url, &$text_response, &$tree_response)
 		{
 		phpCAS::traceBegin();
 		
@@ -1476,7 +1476,7 @@ 
 		$validate_url = $this->getServerSamlValidateURL();
 		
 		// open and read the URL
-		if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) {
+		if (!$this->readURL($validate_url, ''/*cookies*/, $headers, $text_response, $err_msg)) {
 			phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
 			$this->authError('SA not validated', $validate_url, TRUE/*$no_response*/);
 		}
@@ -1488,7 +1488,7 @@ 
 			case SAML_VERSION_1_1:
 				
 				// read the response of the CAS server into a DOM object
-				if ( !($dom = domxml_open_mem($text_response))) {
+				if (!($dom = domxml_open_mem($text_response))) {
 					phpCAS::trace('domxml_open_mem() failed');
 					$this->authError('SA not validated',
 						$validate_url,
@@ -1497,7 +1497,7 @@ 
 						$text_response);
 				}
 				// read the root node of the XML tree
-				if ( !($tree_response = $dom->document_element()) ) {
+				if (!($tree_response = $dom->document_element())) {
 					phpCAS::trace('document_element() failed');
 					$this->authError('SA not validated',
 						$validate_url,
@@ -1506,7 +1506,7 @@ 
 						$text_response);
 				}
 				// insure that tag name is 'Envelope'
-				if ( $tree_response->node_name() != 'Envelope' ) {
+				if ($tree_response->node_name() != 'Envelope') {
 					phpCAS::trace('bad XML root node (should be `Envelope\' instead of `'.$tree_response->node_name().'\'');
 					$this->authError('SA not validated',
 						$validate_url,
@@ -1515,7 +1515,7 @@ 
 						$text_response);
 				}
 				// check for the NameIdentifier tag in the SAML response
-				if ( sizeof($success_elements = $tree_response->get_elements_by_tagname("NameIdentifier")) != 0) {
+				if (sizeof($success_elements = $tree_response->get_elements_by_tagname("NameIdentifier")) != 0) {
 					phpCAS::trace('NameIdentifier found');
 					$user = trim($success_elements[0]->get_content());
 					phpCAS::trace('user = `'.$user.'`');
@@ -1553,7 +1553,7 @@ 
 		$result = FALSE;
 		
 		if (isset($_SESSION[SAML_ATTRIBUTES])) {
-			phpCAS::trace("session attrs already set.");  //testbml - do we care?
+			phpCAS::trace("session attrs already set."); //testbml - do we care?
 		}
 		
 		$attr_array = array();
@@ -1565,21 +1565,21 @@ 
 			$nodelist = $xPath->xpath_eval("//saml:Attribute");
 			$attrs = $nodelist->nodeset;
 			phpCAS::trace($text_response);
-			foreach($attrs as $attr){
+			foreach ($attrs as $attr) {
 				$xres = $xPath->xpath_eval("saml:AttributeValue", $attr);
 				$name = $attr->get_attribute("AttributeName");
 				$value_array = array();
-				foreach($xres->nodeset as $node){
+				foreach ($xres->nodeset as $node) {
 					$value_array[] = $node->get_content();
 					
 				}
-				phpCAS::trace("* " . $name . "=" . $value_array);
+				phpCAS::trace("* ".$name."=".$value_array);
 				$attr_array[$name] = $value_array;
 			}
 			$_SESSION[SAML_ATTRIBUTES] = $attr_array;
 			// UGent addition...
-			foreach($attr_array as $attr_key => $attr_value) {
-				if(count($attr_value) > 1) {
+			foreach ($attr_array as $attr_key => $attr_value) {
+				if (count($attr_value) > 1) {
 					$this->_attributes[$attr_key] = $attr_value;
 				}
 				else {
@@ -1741,14 +1741,14 @@ 
 	function getCallbackURL()
 		{
 		// the URL is built when needed only
-		if ( empty($this->_callback_url) ) {
+		if (empty($this->_callback_url)) {
 			$final_uri = '';
 			// remove the ticket if present in the URL
 			$final_uri = 'https://';
 			/* replaced by Julien Marchal - v0.4.6
 			 * $this->uri .= $_SERVER['SERVER_NAME'];
 			 */
-			if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){
+			if (empty($_SERVER['HTTP_X_FORWARDED_SERVER'])) {
 				/* replaced by teedog - v0.4.12
 				 * $final_uri .= $_SERVER['SERVER_NAME'];
 				 */
@@ -1760,13 +1760,13 @@ 
 			} else {
 				$final_uri .= $_SERVER['HTTP_X_FORWARDED_SERVER'];
 			}
-			if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443)
-					|| (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) {
+			if (($this->isHttps() && $_SERVER['SERVER_PORT'] != 443)
+					|| (!$this->isHttps() && $_SERVER['SERVER_PORT'] != 80)) {
 				$final_uri .= ':';
 				$final_uri .= $_SERVER['SERVER_PORT'];
 			}
 			$request_uri = $_SERVER['REQUEST_URI'];
-			$request_uri = preg_replace('/\?.*$/','',$request_uri);
+			$request_uri = preg_replace('/\?.*$/', '', $request_uri);
 			$final_uri .= $request_uri;
 			$this->setCallbackURL($final_uri);
 		}
@@ -1799,7 +1799,7 @@ 
 		$pgt = $_GET['pgtId'];
 		phpCAS::trace('Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\')');
 		echo '<p>Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\').</p>';
-		$this->storePGT($pgt,$pgt_iou);
+		$this->storePGT($pgt, $pgt_iou);
 		$this->printHTMLFooter();
 		phpCAS::traceExit();
 		exit();
@@ -1834,7 +1834,7 @@ 
 	function initPGTStorage()
 		{
 		// if no SetPGTStorageXxx() has been used, default to file
-		if ( !is_object($this->_pgt_storage) ) {
+		if (!is_object($this->_pgt_storage)) {
 			$this->setPGTStorageFile();
 		}
 		
@@ -1850,12 +1850,12 @@ 
 	 *
 	 * @private
 	 */
-	function storePGT($pgt,$pgt_iou)
+	function storePGT($pgt, $pgt_iou)
 		{
 		// ensure that storage is initialized
 		$this->initPGTStorage();
 		// writes the PGT
-		$this->_pgt_storage->write($pgt,$pgt_iou);
+		$this->_pgt_storage->write($pgt, $pgt_iou);
 		}
 	
 	/**
@@ -1884,16 +1884,16 @@ 
 	 *
 	 * @public
 	 */
-	function setPGTStorageFile($format='',
-		$path='')
+	function setPGTStorageFile($format = '',
+		$path = '')
 		{
 		// check that the storage has not already been set
-		if ( is_object($this->_pgt_storage) ) {
+		if (is_object($this->_pgt_storage)) {
 			phpCAS::error('PGT storage already defined');
 		}
 		
 		// create the storage object
-		$this->_pgt_storage = new PGTStorageFile($this,$format,$path);
+		$this->_pgt_storage = new PGTStorageFile($this, $format, $path);
 		}
 	
 	/**
@@ -1922,15 +1922,15 @@ 
 							 $table)
 		{
 		// check that the storage has not already been set
-		if ( is_object($this->_pgt_storage) ) {
+		if (is_object($this->_pgt_storage)) {
 			phpCAS::error('PGT storage already defined');
 		}
 		
 		// warn the user that he should use file storage...
-		trigger_error('PGT storage into database is an experimental feature, use at your own risk',E_USER_WARNING);
+		trigger_error('PGT storage into database is an experimental feature, use at your own risk', E_USER_WARNING);
 		
 		// create the storage object
-		$this->_pgt_storage = new PGTStorageDB($this,$user,$password,$database_type,$hostname,$port,$database,$table);
+		$this->_pgt_storage = new PGTStorageDB($this, $user, $password, $database_type, $hostname, $port, $database, $table);
 		}
 	
 	// ########################################################################
@@ -1949,11 +1949,11 @@ 
 	 *
 	 * @private
 	 */
-	function validatePGT(&$validate_url,$text_response,$tree_response)
+	function validatePGT(&$validate_url, $text_response, $tree_response)
 		{
 		// here cannot use phpCAS::traceBegin(); alongside domxml-php4-to-php5.php
 		phpCAS::log('start validatePGT()');
-		if ( sizeof($arr = $tree_response->get_elements_by_tagname("proxyGrantingTicket")) == 0) {
+		if (sizeof($arr = $tree_response->get_elements_by_tagname("proxyGrantingTicket")) == 0) {
 			phpCAS::trace('<proxyGrantingTicket> not found');
 			// authentication succeded, but no PGT Iou was transmitted
 			$this->authError('Ticket validated but no PGT Iou transmitted',
@@ -1965,7 +1965,7 @@ 
 			// PGT Iou transmitted, extract it
 			$pgt_iou = trim($arr[0]->get_content());
 			$pgt = $this->loadPGT($pgt_iou);
-			if ( $pgt == FALSE ) {
+			if ($pgt == FALSE) {
 				phpCAS::trace('could not load PGT');
 				$this->authError('PGT Iou was transmitted but PGT could not be retrieved',
 					$validate_url,
@@ -1995,7 +1995,7 @@ 
 	 *
 	 * @private
 	 */
-	function retrievePT($target_service,&$err_code,&$err_msg)
+	function retrievePT($target_service, &$err_code, &$err_msg)
 		{
 		phpCAS::traceBegin();
 		
@@ -2010,7 +2010,7 @@ 
 		$cas_url = $this->getServerProxyURL().'?targetService='.urlencode($target_service).'&pgt='.$this->getPGT();
 		
 		// open and read the URL
-		if ( !$this->readURL($cas_url,''/*cookies*/,$headers,$cas_response,$err_msg) ) {
+		if (!$this->readURL($cas_url, ''/*cookies*/, $headers, $cas_response, $err_msg)) {
 			phpCAS::trace('could not open URL \''.$cas_url.'\' to validate ('.$err_msg.')');
 			$err_code = PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE;
 			$err_msg = 'could not retrieve PT (no response from the CAS server)';
@@ -2020,38 +2020,38 @@ 
 		
 		$bad_response = FALSE;
 		
-		if ( !$bad_response ) {
+		if (!$bad_response) {
 			// read the response of the CAS server into a DOM object
-			if ( !($dom = @domxml_open_mem($cas_response))) {
+			if (!($dom = @domxml_open_mem($cas_response))) {
 				phpCAS::trace('domxml_open_mem() failed');
 				// read failed
 				$bad_response = TRUE;
 			} 
 		}
 		
-		if ( !$bad_response ) {
+		if (!$bad_response) {
 			// read the root node of the XML tree
-			if ( !($root = $dom->document_element()) ) {
+			if (!($root = $dom->document_element())) {
 				phpCAS::trace('document_element() failed');
 				// read failed
 				$bad_response = TRUE;
 			} 
 		}
 		
-		if ( !$bad_response ) {
+		if (!$bad_response) {
 			// insure that tag name is 'serviceResponse'
-			if ( $root->node_name() != 'serviceResponse' ) {
+			if ($root->node_name() != 'serviceResponse') {
 				phpCAS::trace('node_name() failed');
 				// bad root node
 				$bad_response = TRUE;
 			} 
 		}
 		
-		if ( !$bad_response ) {
+		if (!$bad_response) {
 			// look for a proxySuccess tag
-			if ( sizeof($arr = $root->get_elements_by_tagname("proxySuccess")) != 0) {
+			if (sizeof($arr = $root->get_elements_by_tagname("proxySuccess")) != 0) {
 				// authentication succeded, look for a proxyTicket tag
-				if ( sizeof($arr = $root->get_elements_by_tagname("proxyTicket")) != 0) {
+				if (sizeof($arr = $root->get_elements_by_tagname("proxyTicket")) != 0) {
 					$err_code = PHPCAS_SERVICE_OK;
 					$err_msg = '';
 					phpCAS::trace('original PT: '.trim($arr[0]->get_content()));
@@ -2063,7 +2063,7 @@ 
 				}
 			} 
 			// look for a proxyFailure tag
-			else if ( sizeof($arr = $root->get_elements_by_tagname("proxyFailure")) != 0) {
+			else if (sizeof($arr = $root->get_elements_by_tagname("proxyFailure")) != 0) {
 				// authentication failed, extract the error
 				$err_code = PHPCAS_SERVICE_PT_FAILURE;
 				$err_msg = 'PT retrieving failed (code=`'
@@ -2105,7 +2105,7 @@ 
 	 *
 	 * @private
 	 */
-	function readURL($url,$cookies,&$headers,&$body,&$err_msg)
+	function readURL($url, $cookies, &$headers, &$body, &$err_msg)
 		{
 		phpCAS::traceBegin();
 		$headers = '';
@@ -2117,7 +2117,7 @@ 
 		// initialize the CURL session
 		$ch = curl_init($url);
 		
-		if (version_compare(PHP_VERSION,'5.1.3','>=')) {
+		if (version_compare(PHP_VERSION, '5.1.3', '>=')) {
 			//only avaible in php5
 			curl_setopt_array($ch, $this->_curl_options);
 		} else {
@@ -2137,7 +2137,7 @@ 
 			curl_setopt($ch, CURLOPT_CAINFO, $this->_cas_server_ca_cert);
 			curl_setopt($ch, CURLOPT_VERBOSE, '1');
 			phpCAS::trace('CURL: Set all required opts for mutual authentication ------');
-		} else if ($this->_cas_server_cert != '' ) {
+		} else if ($this->_cas_server_cert != '') {
 			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
 			curl_setopt($ch, CURLOPT_SSLCERT, $this->_cas_server_cert);
 		} else if ($this->_cas_server_ca_cert != '') {
@@ -2154,12 +2154,12 @@ 
 		$this->_curl_headers = array(); // empty the headers array
 		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array($this, '_curl_read_headers'));
 		// add cookies headers
-		if ( is_array($cookies) ) {
-			curl_setopt($ch,CURLOPT_COOKIE,implode(';',$cookies));
+		if (is_array($cookies)) {
+			curl_setopt($ch, CURLOPT_COOKIE, implode(';', $cookies));
 		}
 		// add extra stuff if SAML
 		if ($this->hasSA()) {
-			$more_headers = array ("soapaction: http://www.oasis-open.org/committees/security",
+			$more_headers = array("soapaction: http://www.oasis-open.org/committees/security",
 				"cache-control: no-cache",
 				"pragma: no-cache",
 				"accept: text/xml",
@@ -2173,18 +2173,18 @@ 
 			curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
 		}
 		// perform the query
-		$buf = curl_exec ($ch);
+		$buf = curl_exec($ch);
 		//phpCAS::trace('CURL: Call completed. Response body is: \''.$buf.'\'');
-		if ( $buf === FALSE ) {
+		if ($buf === FALSE) {
 			phpCAS::trace('curl_exec() failed');
 			$err_msg = 'CURL error #'.curl_errno($ch).': '.curl_error($ch);
 			//phpCAS::trace('curl error: '.$err_msg);
 			// close the CURL session
-			curl_close ($ch);
+			curl_close($ch);
 			$res = FALSE;
 		} else {
 			// close the CURL session
-			curl_close ($ch);
+			curl_close($ch);
 			
 			$headers = $this->_curl_headers;
 			$body = $buf;
@@ -2209,7 +2209,7 @@ 
 		$sa = $this->getSA();
 		//phpCAS::trace("SA: ".$sa);
 		
-		$body=SAML_SOAP_ENV.SAML_SOAP_BODY.SAMLP_REQUEST.SAML_ASSERTION_ARTIFACT.$sa.SAML_ASSERTION_ARTIFACT_CLOSE.SAMLP_REQUEST_CLOSE.SAML_SOAP_BODY_CLOSE.SAML_SOAP_ENV_CLOSE;
+		$body = SAML_SOAP_ENV.SAML_SOAP_BODY.SAMLP_REQUEST.SAML_ASSERTION_ARTIFACT.$sa.SAML_ASSERTION_ARTIFACT_CLOSE.SAMLP_REQUEST_CLOSE.SAML_SOAP_BODY_CLOSE.SAML_SOAP_ENV_CLOSE;
 		
 		phpCAS::traceEnd($body);
 		return ($body);
@@ -2240,36 +2240,36 @@ 
 	 *
 	 * @public
 	 */
-	function serviceWeb($url,&$err_code,&$output)
+	function serviceWeb($url, &$err_code, &$output)
 		{
 		phpCAS::traceBegin();
 		// at first retrieve a PT
-		$pt = $this->retrievePT($url,$err_code,$output);
+		$pt = $this->retrievePT($url, $err_code, $output);
 		
 		$res = TRUE;
 		
 		// test if PT was retrieved correctly
-		if ( !$pt ) {
+		if (!$pt) {
 			// note: $err_code and $err_msg are filled by CASClient::retrievePT()
 			phpCAS::trace('PT was not retrieved correctly');
 			$res = FALSE;
 		} else {
 			// add cookies if necessary
-			if ( is_array($_SESSION['phpCAS']['services'][$url]['cookies']) ) {
-				foreach ( $_SESSION['phpCAS']['services'][$url]['cookies'] as $name => $val ) { 
+			if (is_array($_SESSION['phpCAS']['services'][$url]['cookies'])) {
+				foreach ($_SESSION['phpCAS']['services'][$url]['cookies'] as $name => $val) { 
 					$cookies[] = $name.'='.$val;
 				}
 			}
 			
 			// build the URL including the PT
-			if ( strstr($url,'?') === FALSE ) {
+			if (strstr($url, '?') === FALSE) {
 				$service_url = $url.'?ticket='.$pt;
 			} else {
 				$service_url = $url.'&ticket='.$pt;
 			}
 			
 			phpCAS::trace('reading URL`'.$service_url.'\'');
-			if ( !$this->readURL($service_url,$cookies,$headers,$output,$err_msg) ) {
+			if (!$this->readURL($service_url, $cookies, $headers, $output, $err_msg)) {
 				phpCAS::trace('could not read URL`'.$service_url.'\'');
 				$err_code = PHPCAS_SERVICE_NOT_AVAILABLE;
 				// give an error message
@@ -2280,15 +2280,15 @@ 
 			} else {
 				// URL has been fetched, extract the cookies
 				phpCAS::trace('URL`'.$service_url.'\' has been read, storing cookies:');
-				foreach ( $headers as $header ) {
+				foreach ($headers as $header) {
 					// test if the header is a cookie
-					if ( preg_match('/^Set-Cookie:/',$header) ) {
+					if (preg_match('/^Set-Cookie:/', $header)) {
 						// the header is a cookie, remove the beginning
-						$header_val = preg_replace('/^Set-Cookie: */','',$header);
+						$header_val = preg_replace('/^Set-Cookie: */', '', $header);
 						// extract interesting information
-						$name_val = strtok($header_val,'; ');
+						$name_val = strtok($header_val, '; ');
 						// extract the name and the value of the cookie
-						$cookie_name = strtok($name_val,'=');
+						$cookie_name = strtok($name_val, '=');
 						$cookie_val = strtok('=');
 						// store the cookie 
 						$_SESSION['phpCAS']['services'][$url]['cookies'][$cookie_name] = $cookie_val;
@@ -2321,28 +2321,28 @@ 
 	 *
 	 * @public
 	 */
-	function serviceMail($url,$service,$flags,&$err_code,&$err_msg,&$pt)
+	function serviceMail($url, $service, $flags, &$err_code, &$err_msg, &$pt)
 		{
 		phpCAS::traceBegin();
 		// at first retrieve a PT
-		$pt = $this->retrievePT($service,$err_code,$output);
+		$pt = $this->retrievePT($service, $err_code, $output);
 		
 		$stream = FALSE;
 		
 		// test if PT was retrieved correctly
-		if ( !$pt ) {
+		if (!$pt) {
 			// note: $err_code and $err_msg are filled by CASClient::retrievePT()
 			phpCAS::trace('PT was not retrieved correctly');
 		} else {
 			phpCAS::trace('opening IMAP URL `'.$url.'\'...');
-			$stream = @imap_open($url,$this->getUser(),$pt,$flags);
-			if ( !$stream ) {
+			$stream = @imap_open($url, $this->getUser(), $pt, $flags);
+			if (!$stream) {
 				phpCAS::trace('could not open URL');
 				$err_code = PHPCAS_SERVICE_NOT_AVAILABLE;
 				// give an error message
 				$err_msg = sprintf($this->getString(CAS_STR_SERVICE_UNAVAILABLE),
 					$service_url,
-					var_export(imap_errors(),TRUE));
+					var_export(imap_errors(), TRUE));
 				$pt = FALSE;
 				$stream = FALSE;
 			} else {
@@ -2446,19 +2446,19 @@ 
 	 *
 	 * @private
 	 */
-	function validatePT(&$validate_url,&$text_response,&$tree_response)
+	function validatePT(&$validate_url, &$text_response, &$tree_response)
 		{
 		phpCAS::traceBegin();
 		// build the URL to validate the ticket
 		$validate_url = $this->getServerProxyValidateURL().'&ticket='.$this->getPT();
 		
-		if ( $this->isProxy() ) {
+		if ($this->isProxy()) {
 			// pass the callback url for CAS proxies
 			$validate_url .= '&pgtUrl='.$this->getCallbackURL();
 		}
 		
 		// open and read the URL
-		if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) {
+		if (!$this->readURL($validate_url, ''/*cookies*/, $headers, $text_response, $err_msg)) {
 			phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
 			$this->authError('PT not validated',
 				$validate_url,
@@ -2466,7 +2466,7 @@ 
 		}
 		
 		// read the response of the CAS server into a DOM object
-		if ( !($dom = domxml_open_mem($text_response))) {
+		if (!($dom = domxml_open_mem($text_response))) {
 			// read failed
 			$this->authError('PT not validated',
 				$validate_url,
@@ -2475,7 +2475,7 @@ 
 				$text_response);
 		}
 		// read the root node of the XML tree
-		if ( !($tree_response = $dom->document_element()) ) {
+		if (!($tree_response = $dom->document_element())) {
 			// read failed
 			$this->authError('PT not validated',
 				$validate_url,
@@ -2484,7 +2484,7 @@ 
 				$text_response);
 		}
 		// insure that tag name is 'serviceResponse'
-		if ( $tree_response->node_name() != 'serviceResponse' ) {
+		if ($tree_response->node_name() != 'serviceResponse') {
 			// bad root node
 			$this->authError('PT not validated',
 				$validate_url,
@@ -2492,9 +2492,9 @@ 
 				TRUE/*$bad_response*/,
 				$text_response);
 		}
-		if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) {
+		if (sizeof($arr = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) {
 			// authentication succeded, extract the user name
-			if ( sizeof($arr = $tree_response->get_elements_by_tagname("user")) == 0) {
+			if (sizeof($arr = $tree_response->get_elements_by_tagname("user")) == 0) {
 				// no user specified => error
 				$this->authError('PT not validated',
 					$validate_url,
@@ -2504,7 +2504,7 @@ 
 			}
 			$this->setUser(trim($arr[0]->get_content()));
 			
-		} else if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) {
+		} else if (sizeof($arr = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) {
 			// authentication succeded, extract the error code and message
 			$this->authError('PT not validated',
 				$validate_url,
@@ -2564,7 +2564,7 @@ 
 		{
 		phpCAS::traceBegin();
 		// the URL is built when needed only
-		if ( empty($this->_url) ) {
+		if (empty($this->_url)) {
 			$final_uri = '';
 			// remove the ticket if present in the URL
 			$final_uri = ($this->isHttps()) ? 'https' : 'http';
@@ -2572,7 +2572,7 @@ 
 			/* replaced by Julien Marchal - v0.4.6
 			 * $this->_url .= $_SERVER['SERVER_NAME'];
 			 */
-			if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){
+			if (empty($_SERVER['HTTP_X_FORWARDED_SERVER'])) {
 				/* replaced by teedog - v0.4.12
 				 * $this->_url .= $_SERVER['SERVER_NAME'];
 				 */
@@ -2586,8 +2586,8 @@ 
 			}
 			$final_uri .= $server_name;
 			if (!strpos($server_name, ':')) {
-				if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443)
-						|| (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) {
+				if (($this->isHttps() && $_SERVER['SERVER_PORT'] != 443)
+						|| (!$this->isHttps() && $_SERVER['SERVER_PORT'] != 80)) {
 					$final_uri .= ':';
 					$final_uri .= $_SERVER['SERVER_PORT'];
 				}
@@ -2598,11 +2598,11 @@ 
 			
 			if (isset($request_uri[1]) && $request_uri[1])
 			{
-				$query_string	= $this->removeParameterFromQueryString('ticket', $request_uri[1]);
+				$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";
+					$final_uri .= "?$query_string";
 				
 			}
 			
@@ -2626,7 +2626,7 @@ 
 	 */
 	function removeParameterFromQueryString($parameterName, $queryString)
 	{
-		$parameterName	= preg_quote($parameterName);
+		$parameterName = preg_quote($parameterName);
 		return preg_replace("/&$parameterName(=[^&]*)?|^$parameterName(=[^&]*)?&?/", '', $queryString);
 	}
 
@@ -2661,18 +2661,18 @@ 
 	 *
 	 * @private
 	 */
-	function authError($failure,$cas_url,$no_response,$bad_response='',$cas_response='',$err_code='',$err_msg='')
+	function authError($failure, $cas_url, $no_response, $bad_response = '', $cas_response = '', $err_code = '', $err_msg = '')
 		{
 		phpCAS::traceBegin();
 		
 		$this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_FAILED));
-		printf($this->getString(CAS_STR_YOU_WERE_NOT_AUTHENTICATED),htmlentities($this->getURL()),$_SERVER['SERVER_ADMIN']);
+		printf($this->getString(CAS_STR_YOU_WERE_NOT_AUTHENTICATED), htmlentities($this->getURL()), $_SERVER['SERVER_ADMIN']);
 		phpCAS::trace('CAS URL: '.$cas_url);
 		phpCAS::trace('Authentication failure: '.$failure);
-		if ( $no_response ) {
+		if ($no_response) {
 			phpCAS::trace('Reason: no response from the CAS server');
 		} else {
-			if ( $bad_response ) {
+			if ($bad_response) {
 				phpCAS::trace('Reason: bad response from the CAS server');
 			} else {
 				switch ($this->getServerVersion()) {
@@ -2680,7 +2680,7 @@ 
 						phpCAS::trace('Reason: CAS error');
 						break;
 					case CAS_VERSION_2_0:
-						if ( empty($err_code) )
+						if (empty($err_code))
 							phpCAS::trace('Reason: no CAS error');
 						else
 							phpCAS::trace('Reason: ['.$err_code.'] CAS error: '.$err_msg);

main/auth/cas/lib/CAS.php

Spacing +87 added lines, -87 removed lines

@@ -33,14 +33,14 @@ 
 // hack by Vangelis Haniotakis to handle the absence of $_SERVER['REQUEST_URI'] in IIS

 //

 if (!$_SERVER['REQUEST_URI']) {

-	$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['QUERY_STRING'];

+	$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'].'?'.$_SERVER['QUERY_STRING'];

 }

 

 //

 // another one by Vangelis Haniotakis also to make phpCAS work with PHP5

 //

 if (version_compare(PHP_VERSION, '5', '>=')) {

-	require_once (dirname(__FILE__) . '/CAS/domxml-php4-to-php5.php');

+	require_once (dirname(__FILE__).'/CAS/domxml-php4-to-php5.php');

 }

 

 /**

@@ -281,7 +281,7 @@ 
  *

  * @hideinitializer

  */

-$GLOBALS['PHPCAS_INIT_CALL'] = array (

+$GLOBALS['PHPCAS_INIT_CALL'] = array(

 	'done' => FALSE,

 	'file' => '?',

 	'line' => -1,

@@ -294,7 +294,7 @@ 
  *

  * @hideinitializer

  */

-$GLOBALS['PHPCAS_AUTH_CHECK_CALL'] = array (

+$GLOBALS['PHPCAS_AUTH_CHECK_CALL'] = array(

 	'done' => FALSE,

 	'file' => '?',

 	'line' => -1,

@@ -307,7 +307,7 @@ 
  *

  * @hideinitializer

  */

-$GLOBALS['PHPCAS_DEBUG'] = array (

+$GLOBALS['PHPCAS_DEBUG'] = array(

 	'filename' => '/tmp/cas.log',

 	'indent' => 0,

 	'unique_id' => ''

@@ -320,7 +320,7 @@ 
 // ########################################################################

 

 // include client class

-include_once (dirname(__FILE__) . '/CAS/client.php');

+include_once (dirname(__FILE__).'/CAS/client.php');

 

 // ########################################################################

 //  INTERFACE CLASS

@@ -368,7 +368,7 @@ 
 

 		phpCAS :: traceBegin();

 		if (is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error($PHPCAS_INIT_CALL['method'] . '() has already been called (at ' . $PHPCAS_INIT_CALL['file'] . ':' . $PHPCAS_INIT_CALL['line'] . ')');

+			phpCAS :: error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')');

 		}

 		if (gettype($server_version) != 'string') {

 			phpCAS :: error('type mismatched for parameter $server_version (should be `string\')');

@@ -385,11 +385,11 @@ 
 

 		// store where the initializer is called from

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_INIT_CALL = array (

+		$PHPCAS_INIT_CALL = array(

 			'done' => TRUE,

 			'file' => $dbg[0]['file'],

 			'line' => $dbg[0]['line'],

-			'method' => __CLASS__ . '::' . __FUNCTION__

+			'method' => __CLASS__.'::'.__FUNCTION__

 		);

 

 		// initialize the global object $PHPCAS_CLIENT

@@ -417,7 +417,7 @@ 
 

 		phpCAS :: traceBegin();

 		if (is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error($PHPCAS_INIT_CALL['method'] . '() has already been called (at ' . $PHPCAS_INIT_CALL['file'] . ':' . $PHPCAS_INIT_CALL['line'] . ')');

+			phpCAS :: error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')');

 		}

 		if (gettype($server_version) != 'string') {

 			phpCAS :: error('type mismatched for parameter $server_version (should be `string\')');

@@ -434,11 +434,11 @@ 
 

 		// store where the initialzer is called from

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_INIT_CALL = array (

+		$PHPCAS_INIT_CALL = array(

 			'done' => TRUE,

 			'file' => $dbg[0]['file'],

 			'line' => $dbg[0]['line'],

-			'method' => __CLASS__ . '::' . __FUNCTION__

+			'method' => __CLASS__.'::'.__FUNCTION__

 		);

 

 		// initialize the global object $PHPCAS_CLIENT

@@ -472,17 +472,17 @@ 
 		if (empty ($filename)) {

 			if (preg_match('/^Win.*/', getenv('OS'))) {

 				if (isset ($_ENV['TMP'])) {

-					$debugDir = $_ENV['TMP'] . '/';

+					$debugDir = $_ENV['TMP'].'/';

 				} else

 					if (isset ($_ENV['TEMP'])) {

-						$debugDir = $_ENV['TEMP'] . '/';

+						$debugDir = $_ENV['TEMP'].'/';

 					} else {

 						$debugDir = '';

 					}

 			} else {

 				$debugDir = DEFAULT_DEBUG_DIR;

 			}

-			$filename = $debugDir . 'phpCAS.log';

+			$filename = $debugDir.'phpCAS.log';

 		}

 

 		if (empty ($PHPCAS_DEBUG['unique_id'])) {

@@ -509,7 +509,7 @@ 
 			return debug_backtrace();

 		} else {

 			// poor man's hack ... but it does work ...

-			return array ();

+			return array();

 		}

 	}

 

@@ -528,7 +528,7 @@ 
 			for ($i = 0; $i < $PHPCAS_DEBUG['indent']; $i++) {

 				$indent_str .= '|    ';

 			}

-			error_log($PHPCAS_DEBUG['unique_id'] . ' ' . $indent_str . $str . "\n", 3, $PHPCAS_DEBUG['filename']);

+			error_log($PHPCAS_DEBUG['unique_id'].' '.$indent_str.$str."\n", 3, $PHPCAS_DEBUG['filename']);

 		}

 

 	}

@@ -557,7 +557,7 @@ 
 				}

 			}

 		}

-		echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>" . __CLASS__ . "::" . $function . '(): ' . htmlentities($msg) . "</b></font> in <b>" . $file . "</b> on line <b>" . $line . "</b><br />\n";

+		echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>".__CLASS__."::".$function.'(): '.htmlentities($msg)."</b></font> in <b>".$file."</b> on line <b>".$line."</b><br />\n";

 		phpCAS :: trace($msg);

 		phpCAS :: traceExit();

 		exit ();

@@ -568,7 +568,7 @@ 
 	 */

 	function trace($str) {

 		$dbg = phpCAS :: backtrace();

-		phpCAS :: log($str . ' [' . basename($dbg[1]['file']) . ':' . $dbg[1]['line'] . ']');

+		phpCAS :: log($str.' ['.basename($dbg[1]['file']).':'.$dbg[1]['line'].']');

 	}

 

 	/**

@@ -580,9 +580,9 @@ 
 		$dbg = phpCAS :: backtrace();

 		$str = '=> ';

 		if (!empty ($dbg[2]['class'])) {

-			$str .= $dbg[2]['class'] . '::';

+			$str .= $dbg[2]['class'].'::';

 		}

-		$str .= $dbg[2]['function'] . '(';

+		$str .= $dbg[2]['function'].'(';

 		if (is_array($dbg[2]['args'])) {

 			foreach ($dbg[2]['args'] as $index => $arg) {

 				if ($index != 0) {

@@ -591,7 +591,7 @@ 
 				$str .= str_replace("\n", "", var_export($arg, TRUE));

 			}

 		}

-		$str .= ') [' . basename($dbg[2]['file']) . ':' . $dbg[2]['line'] . ']';

+		$str .= ') ['.basename($dbg[2]['file']).':'.$dbg[2]['line'].']';

 		phpCAS :: log($str);

 		$PHPCAS_DEBUG['indent']++;

 	}

@@ -607,7 +607,7 @@ 
 		$PHPCAS_DEBUG['indent']--;

 		$dbg = phpCAS :: backtrace();

 		$str = '';

-		$str .= '<= ' . str_replace("\n", "", var_export($res, TRUE));

+		$str .= '<= '.str_replace("\n", "", var_export($res, TRUE));

 		phpCAS :: log($str);

 	}

 

@@ -644,7 +644,7 @@ 
 	function setLang($lang) {

 		global $PHPCAS_CLIENT;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 		if (gettype($lang) != 'string') {

 			phpCAS :: error('type mismatched for parameter $lang (should be `string\')');

@@ -687,7 +687,7 @@ 
 	function setHTMLHeader($header) {

 		global $PHPCAS_CLIENT;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 		if (gettype($header) != 'string') {

 			phpCAS :: error('type mismatched for parameter $header (should be `string\')');

@@ -703,7 +703,7 @@ 
 	function setHTMLFooter($footer) {

 		global $PHPCAS_CLIENT;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 		if (gettype($footer) != 'string') {

 			phpCAS :: error('type mismatched for parameter $footer (should be `string\')');

@@ -732,13 +732,13 @@ 
 

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if (!$PHPCAS_CLIENT->isProxy()) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if ($PHPCAS_AUTH_CHECK_CALL['done']) {

-			phpCAS :: error('this method should only be called before ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() (called at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ')');

+			phpCAS :: error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')');

 		}

 		if (gettype($format) != 'string') {

 			phpCAS :: error('type mismatched for parameter $format (should be `string\')');

@@ -770,13 +770,13 @@ 
 

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if (!$PHPCAS_CLIENT->isProxy()) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if ($PHPCAS_AUTH_CHECK_CALL['done']) {

-			phpCAS :: error('this method should only be called before ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() (called at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ')');

+			phpCAS :: error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')');

 		}

 		if (gettype($user) != 'string') {

 			phpCAS :: error('type mismatched for parameter $user (should be `string\')');

@@ -830,16 +830,16 @@ 
 

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if (!$PHPCAS_CLIENT->isProxy()) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-			phpCAS :: error('this method should only be called after the programmer is sure the user has been authenticated (by calling ' . __CLASS__ . '::checkAuthentication() or ' . __CLASS__ . '::forceAuthentication()');

+			phpCAS :: error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()');

 		}

 		if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-			phpCAS :: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+			phpCAS :: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

 		}

 		if (gettype($url) != 'string') {

 			phpCAS :: error('type mismatched for parameter $url (should be `string\')');

@@ -873,16 +873,16 @@ 
 

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if (!$PHPCAS_CLIENT->isProxy()) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-			phpCAS :: error('this method should only be called after the programmer is sure the user has been authenticated (by calling ' . __CLASS__ . '::checkAuthentication() or ' . __CLASS__ . '::forceAuthentication()');

+			phpCAS :: error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()');

 		}

 		if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-			phpCAS :: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+			phpCAS :: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

 		}

 		if (gettype($url) != 'string') {

 			phpCAS :: error('type mismatched for parameter $url (should be `string\')');

@@ -918,7 +918,7 @@ 
 	function setCacheTimesForAuthRecheck($n) {

 		global $PHPCAS_CLIENT;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 		if (gettype($n) != 'integer') {

 			phpCAS :: error('type mismatched for parameter $header (should be `string\')');

@@ -935,18 +935,18 @@ 
 

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 

 		$auth = $PHPCAS_CLIENT->checkAuthentication();

 

 		// store where the authentication has been checked and the result

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_AUTH_CHECK_CALL = array (

+		$PHPCAS_AUTH_CHECK_CALL = array(

 			'done' => TRUE,

 			'file' => $dbg[0]['file'],

 			'line' => $dbg[0]['line'],

-			'method' => __CLASS__ . '::' . __FUNCTION__,

+			'method' => __CLASS__.'::'.__FUNCTION__,

 			'result' => $auth

 		);

 		phpCAS :: traceEnd($auth);

@@ -963,18 +963,18 @@ 
 

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 

 		$auth = $PHPCAS_CLIENT->forceAuthentication();

 

 		// store where the authentication has been checked and the result

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_AUTH_CHECK_CALL = array (

+		$PHPCAS_AUTH_CHECK_CALL = array(

 			'done' => TRUE,

 			'file' => $dbg[0]['file'],

 			'line' => $dbg[0]['line'],

-			'method' => __CLASS__ . '::' . __FUNCTION__,

+			'method' => __CLASS__.'::'.__FUNCTION__,

 			'result' => $auth

 		);

 

@@ -982,7 +982,7 @@ 
 			phpCAS :: trace('user is not authenticated, redirecting to the CAS server');

 			$PHPCAS_CLIENT->forceAuthentication();

 		} else {

-			phpCAS :: trace('no need to authenticate (user `' . phpCAS :: getUser() . '\' is already authenticated)');

+			phpCAS :: trace('no need to authenticate (user `'.phpCAS :: getUser().'\' is already authenticated)');

 		}

 

 		phpCAS :: traceEnd();

@@ -997,16 +997,16 @@ 
 

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before'.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 

 		// store where the authentication has been checked and the result

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_AUTH_CHECK_CALL = array (

+		$PHPCAS_AUTH_CHECK_CALL = array(

 			'done' => TRUE,

 			'file' => $dbg[0]['file'],

 			'line' => $dbg[0]['line'],

-			'method' => __CLASS__ . '::' . __FUNCTION__,

+			'method' => __CLASS__.'::'.__FUNCTION__,

 			'result' => $auth

 		);

 

@@ -1018,7 +1018,7 @@ 
 	 * This method has been left from version 0.4.1 for compatibility reasons.

 	 */

 	function authenticate() {

-		phpCAS :: error('this method is deprecated. You should use ' . __CLASS__ . '::forceAuthentication() instead');

+		phpCAS :: error('this method is deprecated. You should use '.__CLASS__.'::forceAuthentication() instead');

 	}

 

 	/**

@@ -1032,7 +1032,7 @@ 
 

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 

 		// call the isAuthenticated method of the global $PHPCAS_CLIENT object

@@ -1040,11 +1040,11 @@ 
 

 		// store where the authentication has been checked and the result

 		$dbg = phpCAS :: backtrace();

-		$PHPCAS_AUTH_CHECK_CALL = array (

+		$PHPCAS_AUTH_CHECK_CALL = array(

 			'done' => TRUE,

 			'file' => $dbg[0]['file'],

 			'line' => $dbg[0]['line'],

-			'method' => __CLASS__ . '::' . __FUNCTION__,

+			'method' => __CLASS__.'::'.__FUNCTION__,

 			'result' => $auth

 		);

 		phpCAS :: traceEnd($auth);

@@ -1060,7 +1060,7 @@ 
 	function isSessionAuthenticated() {

 		global $PHPCAS_CLIENT;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 		return ($PHPCAS_CLIENT->isSessionAuthenticated());

 	}

@@ -1075,13 +1075,13 @@ 
 	function getUser() {

 		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 		if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::forceAuthentication() or ' . __CLASS__ . '::isAuthenticated()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');

 		}

 		if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-			phpCAS :: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+			phpCAS :: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

 		}

 		return $PHPCAS_CLIENT->getUser();

 	}

@@ -1096,13 +1096,13 @@ 
 	function getAttributes() {

 		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 		if (!$PHPCAS_AUTH_CHECK_CALL['done']) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::forceAuthentication() or ' . __CLASS__ . '::isAuthenticated()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');

 		}

 		if (!$PHPCAS_AUTH_CHECK_CALL['result']) {

-			phpCAS :: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');

+			phpCAS :: error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');

 		}

 		return $PHPCAS_CLIENT->getAttributes();

 	}

@@ -1112,7 +1112,7 @@ 
 	function handleLogoutRequests($check_client = true, $allowed_clients = false) {

 		global $PHPCAS_CLIENT;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 		return ($PHPCAS_CLIENT->handleLogoutRequests($check_client, $allowed_clients));

 	}

@@ -1126,7 +1126,7 @@ 
 	function getServerLoginURL() {

 		global $PHPCAS_CLIENT;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 		return $PHPCAS_CLIENT->getServerLoginURL();

 	}

@@ -1141,7 +1141,7 @@ 
 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

 			phpCAS :: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

 		}

 		if (gettype($url) != 'string') {

 			phpCAS :: error('type mismatched for parameter $url (should be

@@ -1162,7 +1162,7 @@ 
 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

 			phpCAS :: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

 		}

 		if (gettype($url) != 'string') {

 			phpCAS :: error('type mismatched for parameter $url (should be

@@ -1183,7 +1183,7 @@ 
 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

 			phpCAS :: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

 		}

 		if (gettype($url) != 'string') {

 			phpCAS :: error('type mismatched for parameter $url (should be

@@ -1203,7 +1203,7 @@ 
 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

 			phpCAS :: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

 		}

 		if (gettype($url) != 'string') {

 			phpCAS :: error('type mismatched for parameter $url (should be

@@ -1222,7 +1222,7 @@ 
 	function getServerLogoutURL() {

 		global $PHPCAS_CLIENT;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');

 		}

 		return $PHPCAS_CLIENT->getServerLogoutURL();

 	}

@@ -1237,7 +1237,7 @@ 
 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

 			phpCAS :: error('this method should only be called after

-							' . __CLASS__ . '::client()');

+							' . __CLASS__.'::client()');

 		}

 		if (gettype($url) != 'string') {

 			phpCAS :: error('type mismatched for parameter $url (should be

@@ -1256,9 +1256,9 @@ 
 		global $PHPCAS_CLIENT;

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

 		}

-		$parsedParams = array ();

+		$parsedParams = array();

 		if ($params != "") {

 			if (is_string($params)) {

 				phpCAS :: error('method `phpCAS::logout($url)\' is now deprecated, use `phpCAS::logoutWithUrl($url)\' instead');

@@ -1286,12 +1286,12 @@ 
 		global $PHPCAS_CLIENT;

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

 		}

 		if (!is_string($service)) {

 			phpCAS :: error('type mismatched for parameter $service (should be `string\')');

 		}

-		$PHPCAS_CLIENT->logout(array (

+		$PHPCAS_CLIENT->logout(array(

 			"service" => $service

 		));

 		// never reached

@@ -1306,12 +1306,12 @@ 
 		global $PHPCAS_CLIENT;

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

 		}

 		if (!is_string($url)) {

 			phpCAS :: error('type mismatched for parameter $url (should be `string\')');

 		}

-		$PHPCAS_CLIENT->logout(array (

+		$PHPCAS_CLIENT->logout(array(

 			"url" => $url

 		));

 		// never reached

@@ -1327,7 +1327,7 @@ 
 		global $PHPCAS_CLIENT;

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

 		}

 		if (!is_string($service)) {

 			phpCAS :: error('type mismatched for parameter $service (should be `string\')');

@@ -1335,7 +1335,7 @@ 
 		if (!is_string($url)) {

 			phpCAS :: error('type mismatched for parameter $url (should be `string\')');

 		}

-		$PHPCAS_CLIENT->logout(array (

+		$PHPCAS_CLIENT->logout(array(

 			"service" => $service,

 			"url" => $url

 		));

@@ -1353,10 +1353,10 @@ 
 		global $PHPCAS_CLIENT;

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if (!$PHPCAS_CLIENT->isProxy()) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if (gettype($url) != 'string') {

 			phpCAS :: error('type mismatched for parameter $url (should be `string\')');

@@ -1375,7 +1375,7 @@ 
 		global $PHPCAS_CLIENT;

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if (gettype($url) != 'string') {

 			phpCAS :: error('type mismatched for parameter $url (should be `string\')');

@@ -1390,7 +1390,7 @@ 
 	function getServiceURL() {

 		global $PHPCAS_CLIENT;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		return ($PHPCAS_CLIENT->getURL());

 	}

@@ -1401,7 +1401,7 @@ 
 	function retrievePT($target_service, & $err_code, & $err_msg) {

 		global $PHPCAS_CLIENT;

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::proxy()');

 		}

 		if (gettype($target_service) != 'string') {

 			phpCAS :: error('type mismatched for parameter $target_service(should be `string\')');

@@ -1418,7 +1418,7 @@ 
 		global $PHPCAS_CLIENT;

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

 		}

 		if (gettype($cert) != 'string') {

 			phpCAS :: error('type mismatched for parameter $cert (should be `string\')');

@@ -1436,7 +1436,7 @@ 
 		global $PHPCAS_CLIENT;

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

 		}

 		if (gettype($cert) != 'string') {

 			phpCAS :: error('type mismatched for parameter $cert (should be `string\')');

@@ -1452,7 +1452,7 @@ 
 		global $PHPCAS_CLIENT;

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

 		}

 		$PHPCAS_CLIENT->setNoCasServerValidation();

 		phpCAS :: traceEnd();

@@ -1470,7 +1470,7 @@ 
 		global $PHPCAS_CLIENT;

 		phpCAS :: traceBegin();

 		if (!is_object($PHPCAS_CLIENT)) {

-			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');

+			phpCAS :: error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');

 		}

 		$PHPCAS_CLIENT->setExtraCurlOption($key, $value);

 		phpCAS :: traceEnd();

main/auth/courses_controller.php

Spacing +17 added lines, -18 removed lines

@@ -61,7 +61,7 @@ 
      * @param string   $message confirmation message(optional)
      * @param string   $error error message(optional)
      */
-    public function categories_list($action, $message='', $error='')
+    public function categories_list($action, $message = '', $error = '')
     {
         $data = array();
         $data['user_course_categories'] = $this->model->get_user_course_categories();
@@ -116,7 +116,7 @@ 
 
         // we need only the course codes as these will be used to match against the courses of the category
         if ($user_courses != '') {
-            foreach($user_courses as $key => $value) {
+            foreach ($user_courses as $key => $value) {
                 $user_coursecodes[] = $value['code'];
             }
         }
@@ -385,13 +385,13 @@ 
                     $html .= '</strong>';
                 } else {
                     if (!empty($categoryCourses)) {
-                        $html .= '<a href="' . getCourseCategoryUrl(
+                        $html .= '<a href="'.getCourseCategoryUrl(
                                 1,
                                 $limit['length'],
                                 $categoryCode,
                                 $hiddenLinks,
                                 $action
-                            ) . '">';
+                            ).'">';
                         $html .= "$categoryName ($categoryCourses)";
                         $html .= '</a>';
                     } else {
@@ -412,13 +412,13 @@ 
                         if ($code == $subCategory1Code) {
                             $html .= "<strong>$subCategory1Name ($subCategory1Courses)</strong>";
                         } else {
-                            $html .= '<a href="' . getCourseCategoryUrl(
+                            $html .= '<a href="'.getCourseCategoryUrl(
                                     1,
                                     $limit['length'],
                                     $categoryCode,
                                     $hiddenLinks,
                                     $action
-                                ) . '">';
+                                ).'">';
                             $html .= "$subCategory1Name ($subCategory1Courses)";
                             $html .= '</a>';
                         }
@@ -436,13 +436,13 @@ 
                                 if ($code == $subCategory2Code) {
                                     $html .= "<strong>$subCategory2Name ($subCategory2Courses)</strong>";
                                 } else {
-                                    $html .= '<a href="' . getCourseCategoryUrl(
+                                    $html .= '<a href="'.getCourseCategoryUrl(
                                             1,
                                             $limit['length'],
                                             $categoryCode,
                                             $hiddenLinks,
                                             $action
-                                        ) . '">';
+                                        ).'">';
                                     $html .= "$subCategory2Name ($subCategory2Courses)";
                                     $html .= '</a>';
                                 }
@@ -460,13 +460,13 @@ 
                                         if ($code == $subCategory3Code) {
                                             $html .= "<strong>$subCategory3Name ($subCategory3Courses)</strong>";
                                         } else {
-                                            $html .= '<a href="' . getCourseCategoryUrl(
+                                            $html .= '<a href="'.getCourseCategoryUrl(
                                                     1,
                                                     $limit['length'],
                                                     $categoryCode,
                                                     $hiddenLinks,
                                                     $action
-                                                ) . '">';
+                                                ).'">';
                                             $html .= "$subCategory3Name ($subCategory3Courses)";
                                             $html .= '</a>';
                                         }
@@ -593,7 +593,7 @@ 
         $icon = '<em class="fa fa-smile-o"></em>';
 
         return Display::div(
-            $icon . ' ' . get_lang("AlreadyRegisteredToSession"),
+            $icon.' '.get_lang("AlreadyRegisteredToSession"),
             array('class' => 'info-catalog')
         );
     }
@@ -605,7 +605,7 @@ 
      */
     public function getSessionIcon($sessionName)
     {
-        return Display::return_icon('window_list.png', $sessionName, null,ICON_SIZE_MEDIUM);
+        return Display::return_icon('window_list.png', $sessionName, null, ICON_SIZE_MEDIUM);
     }
 
     /**
@@ -626,8 +626,7 @@ 
         $pageTotal = intval(ceil(intval($countSessions) / $limit['length']));
         // Do NOT show pagination if only one page or less
         $cataloguePagination = $pageTotal > 1 ?
-            getCataloguePagination($limit['current'], $limit['length'], $pageTotal) :
-            '';
+            getCataloguePagination($limit['current'], $limit['length'], $pageTotal) : '';
         $sessionsBlocks = $this->getFormatedSessionsBlock($sessions);
 
         // Get session list catalogue URL
@@ -638,13 +637,13 @@ 
         $tpl = new Template();
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('catalog_pagination', $cataloguePagination);
         $tpl->assign('hidden_links', $hiddenLinks);
         $tpl->assign('search_token', Security::get_token());
         $tpl->assign('search_date', $date);
-        $tpl->assign('web_session_courses_ajax_url', api_get_path(WEB_AJAX_PATH) . 'course.ajax.php');
+        $tpl->assign('web_session_courses_ajax_url', api_get_path(WEB_AJAX_PATH).'course.ajax.php');
         $tpl->assign('sessions', $sessionsBlocks);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
 
@@ -671,7 +670,7 @@ 
 
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
         $tpl->assign('hidden_links', $hiddenLinks);
@@ -702,7 +701,7 @@ 
         $tpl = new Template();
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
         $tpl->assign('hidden_links', $hiddenLinks);

main/auth/courses.php

Spacing +6 added lines, -6 removed lines

@@ -203,7 +203,7 @@ 
                 $limit
             );
         } else {
-            header('Location: ' . api_get_self());
+            header('Location: '.api_get_self());
         }
         break;
     case 'display_random_courses':
@@ -278,7 +278,7 @@ 
                 $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
 
                 if (!$continueWithSubscription) {
-                    header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
+                    header('Location: '.api_get_path(WEB_CODE_PATH).'auth/courses.php');
                     exit;
                 }
             }
@@ -296,16 +296,16 @@ 
 
             if ($count <= 0) {
                 // no course in session -> return to catalog
-                $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
+                $url = api_get_path(WEB_CODE_PATH).'auth/courses.php';
             } elseif ($count == 1) {
                 // only one course, so redirect directly to this course
                 foreach ($coursesList as $course) {
-                    $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
+                    $url = api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.intval($_GET['session_id']);
                 }
             } else {
-                $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
+                $url = api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.intval($_GET['session_id']);
             }
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit;
         }
         //else show error message?

main/auth/gotocourse.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 

     $msg .= '<div class="well_login">';

     $msg .= $form->return_form();

-    $msg .='</div>';

+    $msg .= '</div>';

     if (api_is_cas_activated()) {

         $msg .= "</div>";

     }

main/auth/conditional_login/complete_phone_number.php

Spacing +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@ 
 /* For licensing terms, see /license.txt */
 
 require_once dirname(__FILE__).'/../../inc/global.inc.php';
-$url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.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">
@@ -20,7 +20,7 @@ 
   </body>
 </html>
 <?php
-if (isset($_POST['submit'])){
+if (isset($_POST['submit'])) {
     $u = api_get_user_info($_SESSION['conditional_login']['uid']);
     $u['phone'] = $_POST['phone_number'];
     $password = null; // we don't want to change the password

main/auth/my_progress.php

Spacing +6 added lines, -6 removed lines

@@ -54,16 +54,16 @@ 
         }
         $course_info = api_get_course_info_by_id($result['c_id']);
         $course_image = '<img src="'.$course_info['course_image_large'].'">';
-        $dates .= '<li><a href="#'.$login.'">' . api_convert_and_format_date($login, DATE_FORMAT_SHORT) . '</a></li>';
+        $dates .= '<li><a href="#'.$login.'">'.api_convert_and_format_date($login, DATE_FORMAT_SHORT).'</a></li>';
         $issues .= '<li id ="'.$login.'">';
         $issues .= '<div class="img-course">'.$course_image.'</div>';
         
         $issues .= '<div class="text-course">';
-        $issues .= '<p>' . sprintf(
+        $issues .= '<p>'.sprintf(
                 get_lang('YouHaveEnteredTheCourseXInY'),
-                '" '. $courseInfo['name'] .' "',
+                '" '.$courseInfo['name'].' "',
                 api_convert_and_format_date($login, DATE_TIME_FORMAT_LONG) 
-                ) . '</p>';
+                ).'</p>';
         $issues .= '</div>'; 
         $issues .= '</li>';
         $count++;
@@ -82,8 +82,8 @@ 
     $content .= '<div class="row">';
     $content .= '<div class="col-md-12">';
     $content .= '<div id="my_timeline">';
-    $content .= '<ul id="dates">' . $dates . '</ul>';
-    $content .= '<ul id="issues">' . $issues . '</ul>';
+    $content .= '<ul id="dates">'.$dates.'</ul>';
+    $content .= '<ul id="issues">'.$issues.'</ul>';
     $content .= '<div id="grad_left"></div>';
     $content .= '<div id="grad_right"></div>';
     $content .= '<a href="#" id="prev"></a>';