chamilo / chamilo-lms

main/inc/lib/magpierss/extlib/Snoopy.class.inc

Spacing +175 added lines, -175 removed lines

@@ -40,47 +40,47 @@ 
 	
 	/* user definable vars */
 
-	public $host			=	"www.php.net";		// host name we are connecting to
-	public $port			=	80;					// port we are connecting to
-	public $proxy_host		=	"";					// proxy host to use
-	public $proxy_port		=	"";					// proxy port to use
-	public $agent			=	"Snoopy v1.0";		// agent we masquerade as
-	public $referer		=	"";					// referer info to pass
-	public $cookies		=	array();			// array of cookies to pass
+	public $host			= "www.php.net"; // host name we are connecting to
+	public $port			= 80; // port we are connecting to
+	public $proxy_host		= ""; // proxy host to use
+	public $proxy_port		= ""; // proxy port to use
+	public $agent = "Snoopy v1.0"; // agent we masquerade as
+	public $referer		= ""; // referer info to pass
+	public $cookies		= array(); // array of cookies to pass
 												// $cookies["username"]="joe";
-	public	$rawheaders		=	array();			// array of raw headers to send
+	public	$rawheaders = array(); // array of raw headers to send
 												// $rawheaders["Content-type"]="text/html";
 
-	public $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
-	public $lastredirectaddr	=	"";				// contains address of last redirected address
-	public	$offsiteok		=	true;				// allows redirection off-site
-	public $maxframes		=	0;					// frame content depth maximum. 0 = disallow
-	public $expandlinks	=	true;				// expand links to fully qualified URLs.
+	public $maxredirs		= 5; // http redirection depth maximum. 0 = disallow
+	public $lastredirectaddr = ""; // contains address of last redirected address
+	public	$offsiteok		= true; // allows redirection off-site
+	public $maxframes		= 0; // frame content depth maximum. 0 = disallow
+	public $expandlinks	= true; // expand links to fully qualified URLs.
 												// this only applies to fetchlinks()
 												// or submitlinks()
-	public $passcookies	=	true;				// pass set cookies back through redirects
+	public $passcookies	= true; // pass set cookies back through redirects
 												// NOTE: this currently does not respect
 												// dates, domains or paths.
 	
-	public	$user			=	"";					// user for http authentication
-	public	$pass			=	"";					// password for http authentication
+	public	$user			= ""; // user for http authentication
+	public	$pass			= ""; // password for http authentication
 	
 	// http accept types
-	public $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+	public $accept			= "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
 	
-	public $results		=	"";					// where the content is put
+	public $results		= ""; // where the content is put
 		
-	public $error			=	"";					// error messages sent here
-	public	$response_code	=	"";					// response code returned from server
-	public	$headers		=	array();			// headers returned from server sent here
-	public	$maxlength		=	500000;				// max return data length (body)
-	public $read_timeout	=	0;					// timeout on read operations, in seconds
+	public $error = ""; // error messages sent here
+	public	$response_code = ""; // response code returned from server
+	public	$headers = array(); // headers returned from server sent here
+	public	$maxlength = 500000; // max return data length (body)
+	public $read_timeout = 0; // timeout on read operations, in seconds
 												// supported only since PHP 4 Beta 4
 												// set to 0 to disallow timeouts
-	public $timed_out		=	false;				// if a read operation timed out
-	public	$status			=	0;					// http request status
+	public $timed_out		= false; // if a read operation timed out
+	public	$status = 0; // http request status
 	
-	public	$curl_path		=	"/usr/bin/curl";
+	public	$curl_path		= "/usr/bin/curl";
 												// Snoopy will use cURL for fetching
 												// SSL content if a full system path to
 												// the cURL binary is supplied here.
@@ -93,24 +93,24 @@ 
 												// as of this Snoopy release.
 	
 	// send Accept-encoding: gzip?
-	public $use_gzip		= true;	
+	public $use_gzip = true;	
 	
 	/**** Private variables ****/	
 	
-	private	$_maxlinelen	=	4096;				// max line length (headers)
+	private	$_maxlinelen	= 4096; // max line length (headers)
 	
-	private $_httpmethod	=	"GET";				// default http request method
-	private $_httpversion	=	"HTTP/1.0";			// default http request version
-	private $_submit_method	=	"POST";				// default submit method
-	private $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
-	private $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
-	private $_redirectaddr	=	false;				// will be set if page fetched is a redirect
-	private $_redirectdepth	=	0;					// increments on an http redirect
-	private $_frameurls		= 	array();			// frame src urls
-	private $_framedepth	=	0;					// increments on frame depth
+	private $_httpmethod	= "GET"; // default http request method
+	private $_httpversion	= "HTTP/1.0"; // default http request version
+	private $_submit_method	= "POST"; // default submit method
+	private $_submit_type	= "application/x-www-form-urlencoded"; // default submit type
+	private $_mime_boundary	= ""; // MIME boundary for multipart/form-data submit type
+	private $_redirectaddr = false; // will be set if page fetched is a redirect
+	private $_redirectdepth	= 0; // increments on an http redirect
+	private $_frameurls		= array(); // frame src urls
+	private $_framedepth	= 0; // increments on frame depth
 	
-	private $_isproxy		=	false;				// set if using a proxy server
-	private $_fp_timeout	=	30;					// timeout for socket connection
+	private $_isproxy = false; // set if using a proxy server
+	private $_fp_timeout	= 30; // timeout for socket connection
 
 /*======================================================================*\
 	Function:	fetch
@@ -132,14 +132,14 @@ 
 		switch ($URI_PARTS["scheme"]) {
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if (!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
+				if ($this->_connect($fp))
 				{
-					if($this->_isproxy)
+					if ($this->_isproxy)
 					{
 						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
+						$this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
 					}
 					else
 					{
@@ -150,30 +150,30 @@ 
 					
 					$this->_disconnect($fp);
 
-					if($this->_redirectaddr)
+					if ($this->_redirectaddr)
 					{
 						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
+						if ($this->maxredirs > $this->_redirectdepth)
 						{
 							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+							if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 							{
 								/* follow the redirect */
 								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
+								$this->lastredirectaddr = $this->_redirectaddr;
 								$this->fetch($this->_redirectaddr);
 							}
 						}
 					}
 
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+					if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 					{
 						$frameurls = $this->_frameurls;
 						$this->_frameurls = array();
 						
-						while(list(,$frameurl) = each($frameurls))
+						while (list(,$frameurl) = each($frameurls))
 						{
-							if($this->_framedepth < $this->maxframes)
+							if ($this->_framedepth < $this->maxframes)
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
@@ -190,17 +190,17 @@ 
 				return true;					
 				break;
 			case "https":
-				if(!$this->curl_path || (!is_executable($this->curl_path))) {
+				if (!$this->curl_path || (!is_executable($this->curl_path))) {
 					$this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n";
 					return false;
 				}
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if (!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
+				if ($this->_isproxy)
 				{
 					// using proxy, send entire URI
-					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
+					$this->_httpsrequest($URI, $URI, $this->_httpmethod);
 				}
 				else
 				{
@@ -209,30 +209,30 @@ 
 					$this->_httpsrequest($path, $URI, $this->_httpmethod);
 				}
 
-				if($this->_redirectaddr)
+				if ($this->_redirectaddr)
 				{
 					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
+					if ($this->maxredirs > $this->_redirectdepth)
 					{
 						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+						if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 						{
 							/* follow the redirect */
 							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
+							$this->lastredirectaddr = $this->_redirectaddr;
 							$this->fetch($this->_redirectaddr);
 						}
 					}
 				}
 
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+				if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 				{
 					$frameurls = $this->_frameurls;
 					$this->_frameurls = array();
 
-					while(list(,$frameurl) = each($frameurls))
+					while (list(,$frameurl) = each($frameurls))
 					{
-						if($this->_framedepth < $this->maxframes)
+						if ($this->_framedepth < $this->maxframes)
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
@@ -245,7 +245,7 @@ 
 				break;
 			default:
 				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+				$this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
 				return false;
 				break;
 		}		
@@ -272,20 +272,20 @@ 
 						([\"\'])?					# find single or double quote
 						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
 													# quote, otherwise match up to next space
-						'isx",$document,$links);
+						'isx",$document, $links);
 						
 
 		// catenate the non-empty matches from the conditional subpattern
 
-		while(list($key,$val) = each($links[2]))
+		while (list($key, $val) = each($links[2]))
 		{
-			if(!empty($val))
+			if (!empty($val))
 				$match[] = $val;
 		}				
 		
-		while(list($key,$val) = each($links[3]))
+		while (list($key, $val) = each($links[3]))
 		{
-			if(!empty($val))
+			if (!empty($val))
 				$match[] = $val;
 		}		
 		
@@ -302,10 +302,10 @@ 
 
 	private function _stripform($document)
 	{	
-		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
+		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi", $document, $elements);
 		
 		// catenate the matches
-		$match = implode("\r\n",$elements[0]);
+		$match = implode("\r\n", $elements[0]);
 				
 		// return the links
 		return $match;
@@ -327,10 +327,10 @@ 
 		// so, list your entities one by one here. I included some of the
 		// more common ones.
 								
-		$search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
-						"'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
-						"'([\r\n])[\s]+'",					// strip out white space
-						"'&(quote|#34);'i",					// replace html entities
+		$search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript
+						"'<[\/\!]*?[^<>]*?>'si", // strip out html tags
+						"'([\r\n])[\s]+'", // strip out white space
+						"'&(quote|#34);'i", // replace html entities
 						"'&(amp|#38);'i",
 						"'&(lt|#60);'i",
 						"'&(gt|#62);'i",
@@ -340,7 +340,7 @@ 
 						"'&(pound|#163);'i",
 						"'&(copy|#169);'i"
 						);				
-		$replace = array(	"",
+		$replace = array("",
 							"",
 							"\\1",
 							"\"",
@@ -353,7 +353,7 @@ 
 							chr(163),
 							chr(169));
 					
-		$text = preg_replace($search,$replace,$document);
+		$text = preg_replace($search, $replace, $document);
 								
 		return $text;
 	}
@@ -366,26 +366,26 @@ 
 	Output:		$expandedLinks	the expanded links
 \*======================================================================*/
 
-	private function _expandlinks($links,$URI)
+	private function _expandlinks($links, $URI)
 	{
 		
-		preg_match("/^[^\?]+/",$URI,$match);
+		preg_match("/^[^\?]+/", $URI, $match);
 
-		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
+		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|", "", $match[0]);
 				
-		$search = array( 	"|^http://".preg_quote($this->host)."|i",
+		$search = array("|^http://".preg_quote($this->host)."|i",
 							"|^(?!http://)(\/)?(?!mailto:)|i",
 							"|/\./|",
 							"|/[^\/]+/\.\./|"
 						);
 						
-		$replace = array(	"",
+		$replace = array("",
 							$match."/",
 							"/",
 							"/"
 						);			
 				
-		$expandedLinks = preg_replace($search,$replace,$links);
+		$expandedLinks = preg_replace($search, $replace, $links);
 
 		return $expandedLinks;
 	}
@@ -400,26 +400,26 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
+	private function _httprequest($url, $fp, $URI, $http_method, $content_type = "", $body = "")
 	{
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 			
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
-		if(!empty($this->agent))
+		if (!empty($this->agent))
 			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
+		if (!empty($this->host) && !isset($this->rawheaders['Host']))
 			$headers .= "Host: ".$this->host."\r\n";
-		if(!empty($this->accept))
+		if (!empty($this->accept))
 			$headers .= "Accept: ".$this->accept."\r\n";
 		
-		if($this->use_gzip) {
+		if ($this->use_gzip) {
 			// make sure PHP was built with --with-zlib
 			// and we can handle gzipp'ed data
-			if ( function_exists(gzinflate) ) {
+			if (function_exists(gzinflate)) {
 			   $headers .= "Accept-encoding: gzip\r\n";
 			}
 			else {
@@ -430,38 +430,38 @@ 
 			}
 		}
 		
-		if(!empty($this->referer))
+		if (!empty($this->referer))
 			$headers .= "Referer: ".$this->referer."\r\n";
-		if(!empty($this->cookies))
+		if (!empty($this->cookies))
 		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if (!is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 	
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_headers .= 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers .= substr($cookie_headers,0,-2) . "\r\n";
+				$headers .= substr($cookie_headers, 0, -2)."\r\n";
 			} 
 		}
-		if(!empty($this->rawheaders))
+		if (!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if (!is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers .= $headerKey.": ".$headerVal."\r\n";
 		}
-		if(!empty($content_type)) {
+		if (!empty($content_type)) {
 			$headers .= "Content-type: $content_type";
 			if ($content_type == "multipart/form-data")
 				$headers .= "; boundary=".$this->_mime_boundary;
 			$headers .= "\r\n";
 		}
-		if(!empty($body))	
+		if (!empty($body))	
 			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))	
+		if (!empty($this->user) || !empty($this->pass))	
 			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
 
 		$headers .= "\r\n";
@@ -471,7 +471,7 @@ 
 			socket_set_timeout($fp, $this->read_timeout);
 		$this->timed_out = false;
 		
-		fwrite($fp,$headers.$body,strlen($headers.$body));
+		fwrite($fp, $headers.$body, strlen($headers.$body));
 		
 		$this->_redirectaddr = false;
 		unset($this->headers);
@@ -479,30 +479,30 @@ 
 		// content was returned gzip encoded?
 		$is_gzipped = false;
 						
-		while($currentHeader = fgets($fp,$this->_maxlinelen))
+		while ($currentHeader = fgets($fp, $this->_maxlinelen))
 		{
 			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 			{
-				$this->status=-100;
+				$this->status = -100;
 				return false;
 			}
 				
 		//	if($currentHeader == "\r\n")
-			if(preg_match("/^\r?\n$/", $currentHeader) )
+			if (preg_match("/^\r?\n$/", $currentHeader))
 			      break;
 						
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
+			if (preg_match("/^(Location:|URI:)/i", $currentHeader))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches);
+				preg_match("/^(Location:|URI:)\s+(.*)/", chop($currentHeader), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if (!preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if (!preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -511,16 +511,16 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 		
-			if(preg_match("|^HTTP/|",$currentHeader))
+			if (preg_match("|^HTTP/|", $currentHeader))
 			{
-                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
+                if (preg_match("|^HTTP/[^\s]*\s(.*?)\s|", $currentHeader, $status))
 				{
-					$this->status= $status[1];
+					$this->status = $status[1];
                 }				
 				$this->response_code = $currentHeader;
 			}
 			
-			if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
+			if (preg_match("/Content-Encoding: gzip/", $currentHeader)) {
 				$is_gzipped = true;
 			}
 			
@@ -529,7 +529,7 @@ 
 
 		# $results = fread($fp, $this->maxlength);
 		$results = "";
-		while ( $data = fread($fp, $this->maxlength) ) {
+		while ($data = fread($fp, $this->maxlength)) {
 		    $results .= $data;
 		    if (
 		        strlen($results) > $this->maxlength ) {
@@ -538,7 +538,7 @@ 
 		}
 		
 		// gunzip
-		if ( $is_gzipped ) {
+		if ($is_gzipped) {
 			// per http://www.php.net/manual/en/function.gzencode.php
 			$results = substr($results, 10);
 			$results = gzinflate($results);
@@ -546,26 +546,26 @@ 
 		
 		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 		{
-			$this->status=-100;
+			$this->status = -100;
 			return false;
 		}
 		
 		// check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);	
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -583,66 +583,66 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
+	private function _httpsrequest($url, $URI, $http_method, $content_type = "", $body = "")
 	{
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 
 		$headers = array();		
 					
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		// GET ... header not needed for curl
 		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
-		if(!empty($this->agent))
+		if (!empty($this->agent))
 			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
+		if (!empty($this->host))
 			$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
+		if (!empty($this->accept))
 			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
+		if (!empty($this->referer))
 			$headers[] = "Referer: ".$this->referer;
-		if(!empty($this->cookies))
+		if (!empty($this->cookies))
 		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if (!is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 	
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_str = 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers[] = substr($cookie_str,0,-2);
+				$headers[] = substr($cookie_str, 0, -2);
 			}
 		}
-		if(!empty($this->rawheaders))
+		if (!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if (!is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers[] = $headerKey.": ".$headerVal;
 		}
-		if(!empty($content_type)) {
+		if (!empty($content_type)) {
 			if ($content_type == "multipart/form-data")
 				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
 			else
 				$headers[] = "Content-type: $content_type";
 		}
-		if(!empty($body))	
+		if (!empty($body))	
 			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))	
+		if (!empty($this->user) || !empty($this->pass))	
 			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 			
-		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
+		for ($curr_header = 0; $curr_header < count($headers); $curr_header++) {
 			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
 		}
 			  	                         
-		if(!empty($body))
+		if (!empty($body))
 			$cmdline_params .= " -d \"$body\"";
 		
-		if($this->read_timeout > 0)
+		if ($this->read_timeout > 0)
 			$cmdline_params .= " -m ".$this->read_timeout;
 		
 		$headerfile = uniqid(time());
@@ -651,37 +651,37 @@ 
 		$cmdline_params .= " -k";
         $results = array();
         $return = 0;
-		exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return);
+		exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI), $results, $return);
 		
-		if($return)
+		if ($return)
 		{
 			$this->error = "Error: cURL could not retrieve the document, error $return.";
 			return false;
 		}
 			
 			
-		$results = implode("\r\n",$results);
+		$results = implode("\r\n", $results);
 		
 		$result_headers = file("/tmp/$headerfile");
 						
 		$this->_redirectaddr = false;
 		unset($this->headers);
 						
-		for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
+		for ($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
 		{
 			
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
+			if (preg_match("/^(Location: |URI: )/i", $result_headers[$currentHeader]))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches);
+				preg_match("/^(Location: |URI:)(.*)/", chop($result_headers[$currentHeader]), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if (!preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if (!preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -690,12 +690,12 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 		
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
+			if (preg_match("|^HTTP/|", $result_headers[$currentHeader]))
 			{
 			    $this->response_code = $result_headers[$currentHeader];
-			    if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
+			    if (preg_match("|^HTTP/[^\s]*\s(.*?)\s|", $this->response_code, $match))
 			    {
-				$this->status= $match[1];
+				$this->status = $match[1];
                 	    }
 			}
 			$this->headers[] = $result_headers[$currentHeader];
@@ -703,20 +703,20 @@ 
 
 		// check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);	
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -734,9 +734,9 @@ 
 	
 	public function setcookies()
 	{
-		for($x=0; $x<count($this->headers); $x++)
+		for ($x = 0; $x < count($this->headers); $x++)
 		{
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
+		if (preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x], $match))
 			$this->cookies[$match[1]] = $match[2];
 		}
 	}
@@ -768,7 +768,7 @@ 
 	
 	private function _connect(&$fp)
 	{
-		if(!empty($this->proxy_host) && !empty($this->proxy_port))
+		if (!empty($this->proxy_host) && !empty($this->proxy_port))
 			{
 				$this->_isproxy = true;
 				$host = $this->proxy_host;
@@ -782,7 +782,7 @@ 
 	
 		$this->status = 0;
 		
-		if($fp = fsockopen(
+		if ($fp = fsockopen(
 					$host,
 					$port,
 					$errno,
@@ -798,16 +798,16 @@ 
 		{
 			// socket connection failed
 			$this->status = $errno;
-			switch($errno)
+			switch ($errno)
 			{
 				case -3:
-					$this->error="socket creation failed (-3)";
+					$this->error = "socket creation failed (-3)";
 				case -4:
-					$this->error="dns lookup failure (-4)";
+					$this->error = "dns lookup failure (-4)";
 				case -5:
-					$this->error="connection refused or timed out (-5)";
+					$this->error = "connection refused or timed out (-5)";
 				default:
-					$this->error="connection failed (".$errno.")";
+					$this->error = "connection failed (".$errno.")";
 			}
 			return false;
 		}
@@ -843,7 +843,7 @@ 
 		switch ($this->_submit_type) {
 			case "application/x-www-form-urlencoded":
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
@@ -857,7 +857,7 @@ 
 				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 				
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= "--".$this->_mime_boundary."\r\n";

main/inc/lib/magpierss/rss_parse.inc

Spacing +110 added lines, -110 removed lines

@@ -24,7 +24,7 @@ 
 define('RSS', 'RSS');
 define('ATOM', 'Atom');
 
-require_once (MAGPIE_DIR . 'rss_utils.inc');
+require_once (MAGPIE_DIR.'rss_utils.inc');
 
 /**
 * Hybrid parser, and object, takes RSS as a string and returns a simple object.
@@ -36,16 +36,16 @@ 
 class MagpieRSS {
     public $parser;
     
-    public $current_item   = array();  // item currently being parsed
-    public $items          = array();  // collection of parsed items
-    public $channel        = array();  // hash of channel fields
+    public $current_item   = array(); // item currently being parsed
+    public $items          = array(); // collection of parsed items
+    public $channel        = array(); // hash of channel fields
     public $textinput      = array();
     public $image          = array();
     public $feed_type;
     public $feed_version;
-    public $encoding       = '';       // output encoding of parsed rss
+    public $encoding       = ''; // output encoding of parsed rss
     
-    private $_source_encoding = '';     // only set if we have to parse xml prolog
+    private $_source_encoding = ''; // only set if we have to parse xml prolog
     
     public $ERROR = "";
     public $WARNING = "";
@@ -93,15 +93,15 @@ 
      *                                  source encoding. (caveat emptor)
      *
      */
-    public function MagpieRSS ($source, $output_encoding='ISO-8859-1', 
-                        $input_encoding=null, $detect_encoding=true) 
+    public function MagpieRSS($source, $output_encoding = 'ISO-8859-1', 
+                        $input_encoding = null, $detect_encoding = true) 
     {   
         # if PHP xml isn't compiled in, die
         #
         if (!function_exists('xml_parser_create')) {
-            $this->error( "Failed to load PHP's XML Extension. " . 
+            $this->error("Failed to load PHP's XML Extension. ". 
                           "http://www.php.net/manual/en/ref.xml.php",
-                           E_USER_ERROR );
+                           E_USER_ERROR);
         }
         
         list($parser, $source) = $this->create_parser($source, 
@@ -109,9 +109,9 @@ 
         
         
         if (!is_resource($parser)) {
-            $this->error( "Failed to create an instance of PHP's XML parser. " .
+            $this->error("Failed to create an instance of PHP's XML parser. ".
                           "http://www.php.net/manual/en/ref.xml.php",
-                          E_USER_ERROR );
+                          E_USER_ERROR);
         }
 
         
@@ -120,27 +120,27 @@ 
         # pass in parser, and a reference to this object
         # setup handlers
         #
-        xml_set_object( $this->parser, $this );
+        xml_set_object($this->parser, $this);
         xml_set_element_handler($this->parser, 
-                'feed_start_element', 'feed_end_element' );
+                'feed_start_element', 'feed_end_element');
                         
-        xml_set_character_data_handler( $this->parser, 'feed_cdata' ); 
+        xml_set_character_data_handler($this->parser, 'feed_cdata'); 
     
-        $status = xml_parse( $this->parser, $source );
+        $status = xml_parse($this->parser, $source);
         
-        if (! $status ) {
-            $errorcode = xml_get_error_code( $this->parser );
-            if ( $errorcode != XML_ERROR_NONE ) {
-                $xml_error = xml_error_string( $errorcode );
+        if (!$status) {
+            $errorcode = xml_get_error_code($this->parser);
+            if ($errorcode != XML_ERROR_NONE) {
+                $xml_error = xml_error_string($errorcode);
                 $error_line = xml_get_current_line_number($this->parser);
                 $error_col = xml_get_current_column_number($this->parser);
                 $errormsg = "$xml_error at line $error_line, column $error_col";
 
-                $this->error( $errormsg );
+                $this->error($errormsg);
             }
         }
         
-        xml_parser_free( $this->parser );
+        xml_parser_free($this->parser);
 
         $this->normalize();
     }
@@ -151,26 +151,26 @@ 
         
         // check for a namespace, and split if found
         $ns = false;
-        if ( strpos( $element, ':' ) ) {
-            list($ns, $el) = split( ':', $element, 2); 
+        if (strpos($element, ':')) {
+            list($ns, $el) = split(':', $element, 2); 
         }
-        if ( $ns and $ns != 'rdf' ) {
+        if ($ns and $ns != 'rdf') {
             $this->current_namespace = $ns;
         }
             
         # if feed type isn't set, then this is first element of feed
         # identify feed from root element
         #
-        if (!isset($this->feed_type) ) {
-            if ( $el == 'rdf' ) {
+        if (!isset($this->feed_type)) {
+            if ($el == 'rdf') {
                 $this->feed_type = RSS;
                 $this->feed_version = '1.0';
             }
-            elseif ( $el == 'rss' ) {
+            elseif ($el == 'rss') {
                 $this->feed_type = RSS;
                 $this->feed_version = $attrs['version'];
             }
-            elseif ( $el == 'feed' ) {
+            elseif ($el == 'feed') {
                 $this->feed_type = ATOM;
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -178,14 +178,14 @@ 
             return;
         }
     
-        if ( $el == 'channel' ) 
+        if ($el == 'channel') 
         {
             $this->inchannel = true;
         }
-        elseif ($el == 'item' or $el == 'entry' ) 
+        elseif ($el == 'item' or $el == 'entry') 
         {
             $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
+            if (isset($attrs['rdf:about'])) {
                 $this->current_item['about'] = $attrs['rdf:about']; 
             }
         }
@@ -209,10 +209,10 @@ 
         }
         
         # handle atom content constructs
-        elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
+            if ($el == 'content') {
                 $el = 'atom_content';
             }
             
@@ -222,31 +222,31 @@ 
         }
         
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->feed_type == ATOM and $this->incontent ) 
+        elseif ($this->feed_type == ATOM and $this->incontent) 
         {
             // if tags are inlined, then flatten
             $attrs_str = join(' ', 
                     array_map('map_attrs', 
                     array_keys($attrs), 
-                    array_values($attrs) ) );
+                    array_values($attrs)));
             
-            $this->append_content( "<$element $attrs_str>"  );
+            $this->append_content("<$element $attrs_str>");
                     
-            array_unshift( $this->stack, $el );
+            array_unshift($this->stack, $el);
         }
         
         // Atom support many links per containging element.
         // Magpie treats link elements of type rel='alternate'
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->feed_type == ATOM and $el == 'link' ) 
+        elseif ($this->feed_type == ATOM and $el == 'link') 
         {
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) 
+            if (isset($attrs['rel']) and $attrs['rel'] == 'alternate') 
             {
                 $link_el = 'link';
             }
             else {
-                $link_el = 'link_' . $attrs['rel'];
+                $link_el = 'link_'.$attrs['rel'];
             }
             
             $this->append($link_el, $attrs['href']);
@@ -259,10 +259,10 @@ 
     
 
     
-    public function feed_cdata ($p, $text) {
+    public function feed_cdata($p, $text) {
         if ($this->feed_type == ATOM and $this->incontent) 
         {
-            $this->append_content( $text );
+            $this->append_content($text);
         }
         else {
             $current_el = join('_', array_reverse($this->stack));
@@ -270,35 +270,35 @@ 
         }
     }
     
-    public function feed_end_element ($p, $el) {
+    public function feed_end_element($p, $el) {
         $el = strtolower($el);
         
-        if ( $el == 'item' or $el == 'entry' ) 
+        if ($el == 'item' or $el == 'entry') 
         {
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) 
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput') 
         {
             $this->intextinput = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) 
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image') 
         {
             $this->inimage = false;
         }
-        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {   
             $this->incontent = false;
         }
-        elseif ($el == 'channel' or $el == 'feed' ) 
+        elseif ($el == 'channel' or $el == 'feed') 
         {
             $this->inchannel = false;
         }
-        elseif ($this->feed_type == ATOM and $this->incontent  ) {
+        elseif ($this->feed_type == ATOM and $this->incontent) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el ) 
+            if ($this->stack[0] == $el) 
             {
                 $this->append_content("</$el>");
             }
@@ -306,18 +306,18 @@ 
                 $this->append_content("<$el />");
             }
 
-            array_shift( $this->stack );
+            array_shift($this->stack);
         }
         else {
-            array_shift( $this->stack );
+            array_shift($this->stack);
         }
         
         $this->current_namespace = false;
     }
     
-    public function concat (&$str1, $str2="") {
-        if (!isset($str1) ) {
-            $str1="";
+    public function concat(&$str1, $str2 = "") {
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
@@ -325,11 +325,11 @@ 
     
     
     public function append_content($text) {
-        if ( $this->initem ) {
-            $this->concat( $this->current_item[ $this->incontent ], $text );
+        if ($this->initem) {
+            $this->concat($this->current_item[$this->incontent], $text);
         }
-        elseif ( $this->inchannel ) {
-            $this->concat( $this->channel[ $this->incontent ], $text );
+        elseif ($this->inchannel) {
+            $this->concat($this->channel[$this->incontent], $text);
         }
     }
     
@@ -338,59 +338,59 @@ 
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace ) 
+        if ($this->current_namespace) 
         {
-            if ( $this->initem ) {
+            if ($this->initem) {
                 $this->concat(
-                    $this->current_item[ $this->current_namespace ][ $el ], $text);
+                    $this->current_item[$this->current_namespace][$el], $text);
             }
             elseif ($this->inchannel) {
                 $this->concat(
-                    $this->channel[ $this->current_namespace][ $el ], $text );
+                    $this->channel[$this->current_namespace][$el], $text );
             }
             elseif ($this->intextinput) {
                 $this->concat(
-                    $this->textinput[ $this->current_namespace][ $el ], $text );
+                    $this->textinput[$this->current_namespace][$el], $text );
             }
             elseif ($this->inimage) {
                 $this->concat(
-                    $this->image[ $this->current_namespace ][ $el ], $text );
+                    $this->image[$this->current_namespace][$el], $text );
             }
         }
         else {
-            if ( $this->initem ) {
+            if ($this->initem) {
                 $this->concat(
-                    $this->current_item[ $el ], $text);
+                    $this->current_item[$el], $text);
             }
             elseif ($this->intextinput) {
                 $this->concat(
-                    $this->textinput[ $el ], $text );
+                    $this->textinput[$el], $text );
             }
             elseif ($this->inimage) {
                 $this->concat(
-                    $this->image[ $el ], $text );
+                    $this->image[$el], $text );
             }
             elseif ($this->inchannel) {
                 $this->concat(
-                    $this->channel[ $el ], $text );
+                    $this->channel[$el], $text );
             }
             
         }
     }
     
-    public function normalize () {
+    public function normalize() {
         // if atom populate rss fields
-        if ( $this->is_atom() ) {
+        if ($this->is_atom()) {
             $this->channel['description'] = $this->channel['tagline'];
-            for ( $i = 0; $i < count($this->items); $i++) {
+            for ($i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['summary']) )
+                if (isset($item['summary']))
                     $item['description'] = $item['summary'];
-                if ( isset($item['atom_content']))
+                if (isset($item['atom_content']))
                     $item['content']['encoded'] = $item['atom_content'];
                 
-                $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
-                if ( $atom_date ) {
+                $atom_date = (isset($item['issued'])) ? $item['issued'] : $item['modified'];
+                if ($atom_date) {
                     $epoch = @parse_w3cdtf($atom_date);
                     if ($epoch and $epoch > 0) {
                         $item['date_timestamp'] = $epoch;
@@ -400,22 +400,22 @@ 
                 $this->items[$i] = $item;
             }       
         }
-        elseif ( $this->is_rss() ) {
+        elseif ($this->is_rss()) {
             $this->channel['tagline'] = $this->channel['description'];
-            for ( $i = 0; $i < count($this->items); $i++) {
+            for ($i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['description']))
+                if (isset($item['description']))
                     $item['summary'] = $item['description'];
-                if ( isset($item['content']['encoded'] ) )
+                if (isset($item['content']['encoded']))
                     $item['atom_content'] = $item['content']['encoded'];
                 
-                if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
+                if ($this->is_rss() == '1.0' and isset($item['dc']['date'])) {
                     $epoch = @parse_w3cdtf($item['dc']['date']);
                     if ($epoch and $epoch > 0) {
                         $item['date_timestamp'] = $epoch;
                     }
                 }
-                elseif ( isset($item['pubdate']) ) {
+                elseif (isset($item['pubdate'])) {
                     $epoch = @strtotime($item['pubdate']);
                     if ($epoch > 0) {
                         $item['date_timestamp'] = $epoch;
@@ -428,8 +428,8 @@ 
     }
     
     
-    public function is_rss () {
-        if ( $this->feed_type == RSS ) {
+    public function is_rss() {
+        if ($this->feed_type == RSS) {
             return $this->feed_version; 
         }
         else {
@@ -438,7 +438,7 @@ 
     }
     
     public function is_atom() {
-        if ( $this->feed_type == ATOM ) {
+        if ($this->feed_type == ATOM) {
             return $this->feed_version;
         }
         else {
@@ -451,7 +451,7 @@ 
     *
     */
     public function create_parser($source, $out_enc, $in_enc, $detect) {
-        if ( substr(phpversion(),0,1) == 5) {
+        if (substr(phpversion(), 0, 1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
         }
         else {
@@ -476,7 +476,7 @@ 
     */
     public function php5_create_parser($in_enc, $detect) {
         // by default php5 does a fine job of detecting input encodings
-        if(!$detect && $in_enc) {
+        if (!$detect && $in_enc) {
             return xml_parser_create($in_enc);
         }
         else {
@@ -500,7 +500,7 @@ 
     *
     */
     public function php4_create_parser($source, $in_enc, $detect) {
-        if ( !$detect ) {
+        if (!$detect) {
             return array(xml_parser_create($in_enc), $source);
         }
         
@@ -524,8 +524,8 @@ 
         // cast the XML to a known encoding
         // @see http://php.net/iconv
        
-        if (function_exists('iconv'))  {
-            $encoded_source = iconv($in_enc,'UTF-8', $source);
+        if (function_exists('iconv')) {
+            $encoded_source = iconv($in_enc, 'UTF-8', $source);
             if ($encoded_source) {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
             }
@@ -533,15 +533,15 @@ 
         
         // iconv didn't work, try mb_convert_encoding
         // @see http://php.net/mbstring
-        if(function_exists('mb_convert_encoding')) {
-            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc );
+        if (function_exists('mb_convert_encoding')) {
+            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc);
             if ($encoded_source) {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
             }
         }
         
         // else 
-        $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
+        $this->error("Feed is in an unsupported character encoding. ($in_enc) ".
                      "You may see strange artifacts, and mangled characters.",
                      E_USER_NOTICE);
             
@@ -550,7 +550,7 @@ 
     
     public function known_encoding($enc) {
         $enc = strtoupper($enc);
-        if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
+        if (in_array($enc, $this->_KNOWN_ENCODINGS)) {
             return $enc;
         }
         else {
@@ -558,20 +558,20 @@ 
         }
     }
 
-    public function error ($errormsg, $lvl=E_USER_WARNING) {
+    public function error($errormsg, $lvl = E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if (isset($php_errormsg)) { 
             $errormsg .= " ($php_errormsg)";
         }
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);        
+        if (MAGPIE_DEBUG) {
+            trigger_error($errormsg, $lvl);        
         }
         else {
-            error_log( $errormsg, 0);
+            error_log($errormsg, 0);
         }
         
-        $notices = E_USER_NOTICE|E_NOTICE;
-        if ( $lvl&$notices ) {
+        $notices = E_USER_NOTICE | E_NOTICE;
+        if ($lvl & $notices) {
             $this->WARNING = $errormsg;
         } else {
             $this->ERROR = $errormsg;
@@ -589,15 +589,15 @@ 
 // courtesy, Ryan Currie, ryan@digibliss.com
 
 if (!function_exists('array_change_key_case')) {
-	define("CASE_UPPER",1);
-	define("CASE_LOWER",0);
+	define("CASE_UPPER", 1);
+	define("CASE_LOWER", 0);
 
 
-	function array_change_key_case($array,$case=CASE_LOWER) {
-       if ($case=CASE_LOWER) $cmd=strtolower;
-       elseif ($case=CASE_UPPER) $cmd=strtoupper;
-       foreach($array as $key=>$value) {
-               $output[$cmd($key)]=$value;
+	function array_change_key_case($array, $case = CASE_LOWER) {
+       if ($case = CASE_LOWER) $cmd = strtolower;
+       elseif ($case = CASE_UPPER) $cmd = strtoupper;
+       foreach ($array as $key=>$value) {
+               $output[$cmd($key)] = $value;
        }
        return $output;
 	}

main/inc/lib/conditional_login.class.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
                     if (isset($condition['conditional_function']) && $condition['conditional_function']($user) == false) {
                         $_SESSION['conditional_login']['uid'] = $user['user_id'];
                         $_SESSION['conditional_login']['can_login'] = false;
-                        header("Location:". $condition['url']);
+                        header("Location:".$condition['url']);
                         exit();
                     }
                 }

main/inc/lib/image.lib.php

Spacing +19 added lines, -19 removed lines

@@ -115,7 +115,7 @@ 
             return false;
         }
         $this->path = preg_match(VALID_WEB_PATH, $path) ? (api_is_internal_path($path) ? api_get_path(TO_SYS, $path) : $path) : $path;
-        $this->set_image_wrapper();  //Creates image obj
+        $this->set_image_wrapper(); //Creates image obj
     }
 
     abstract function set_image_wrapper();
@@ -157,7 +157,7 @@ 
         if ($this->debug) error_log('Image::set_image_wrapper loaded');
         try {
             if (file_exists($this->path)) {
-                $this->image     = new Imagick($this->path);
+                $this->image = new Imagick($this->path);
 
                 if ($this->image) {
                     $this->fill_image_info(); //Fills height, width and type
@@ -165,7 +165,7 @@ 
             } else {
                 if ($this->debug) error_log('Image::image does not exist');
             }
-        } catch(ImagickException $e) {
+        } catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
     }
@@ -186,7 +186,7 @@ 
 
 	public function get_image_size()
     {
-		$imagesize = array('width'=>0,'height'=>0);
+		$imagesize = array('width'=>0, 'height'=>0);
 	    if ($this->image_validated) {
             $imagesize = $this->image->getImageGeometry();
 	    }
@@ -203,8 +203,8 @@ 
             $height = $thumbh;
         } else {
             $scale  = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-            $width  = (int)($this->width * $scale);
-            $height = (int)($this->height * $scale);
+            $width  = (int) ($this->width * $scale);
+            $height = (int) ($this->height * $scale);
         }
 		$result = $this->image->resizeImage($width, $height, $this->filter, 1);
 		$this->width  = $thumbw;
@@ -250,7 +250,7 @@ 
 		$result = false;
 		try {
 		    $result = $this->image->writeImage($file);
-		} catch(ImagickException $e) {
+		} catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
 
@@ -311,9 +311,9 @@ 
 
     public function get_image_size()
     {
-        $return_array = array('width'=>0,'height'=>0);
+        $return_array = array('width'=>0, 'height'=>0);
         if ($this->image_validated) {
-	        $return_array = array('width'=>$this->width,'height'=>$this->height);
+	        $return_array = array('width'=>$this->width, 'height'=>$this->height);
         }
         return $return_array;
 	}
@@ -321,7 +321,7 @@ 
     public function fill_image_info()
     {
     	if (file_exists($this->path)) {
-	        $image_info     = getimagesize($this->path);
+	        $image_info = getimagesize($this->path);
 			$this->width    = $image_info[0];
 			$this->height   = $image_info[1];
 			$this->type     = $image_info[2];
@@ -341,11 +341,11 @@ 
                 $height = $thumbh;
             } else {
                 $scale = min($thumbw / $this->width, $thumbh / $this->height);
-                $width = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
-			$deltaw = (int)(($thumbw - $width) / 2);
-			$deltah = (int)(($thumbh - $height) / 2);
+			$deltaw = (int) (($thumbw - $width) / 2);
+			$deltah = (int) (($thumbh - $height) / 2);
 			$dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
             		@imagealphablending($dst_img, false);
 		        @imagesavealpha($dst_img, true);
@@ -360,8 +360,8 @@ 
                 $height = $thumbh;
             } else {
                 $scale = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-                $width  = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width  = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
 			$deltaw = 0;
 			$deltah = 0;
@@ -419,7 +419,7 @@ 
 	public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
 	    if (!$this->image_validated) return false;
-        $compress = (int)$compress;
+        $compress = (int) $compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
@@ -463,11 +463,11 @@ 
          * so that we can use black (0,0,0) as transparent, which is what
          * the image is filled with when created.
          */
-        $transparent = imagecolorallocate($dest_img, 0,0,0);
+        $transparent = imagecolorallocate($dest_img, 0, 0, 0);
         imagealphablending($dest_img, false);
         imagesavealpha($dest_img, true);
         imagecolortransparent($dest_img, $transparent);
-        imagecopy($dest_img, $this->bg, 0,0, 0, 0,imagesx($this->bg), imagesx($this->bg));
+        imagecopy($dest_img, $this->bg, 0, 0, 0, 0, imagesx($this->bg), imagesx($this->bg));
         imagefilter($dest_img, IMG_FILTER_GRAYSCALE);
         $this->bg = $dest_img;
 

main/inc/lib/login.lib.php

Spacing +39 added lines, -39 removed lines

@@ -37,24 +37,24 @@ 
             if ($by_username) {
                 $secret_word = self::get_secret_word($user['email']);
                 if ($reset) {
-                    $reset_link = $portal_url . "main/auth/lostPassword.php?reset=" . $secret_word . "&id=" . $user['uid'];
+                    $reset_link = $portal_url."main/auth/lostPassword.php?reset=".$secret_word."&id=".$user['uid'];
                 } else {
-                    $reset_link = get_lang('Pass') . " : $user[password]";
+                    $reset_link = get_lang('Pass')." : $user[password]";
                 }
-                $user_account_list = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $user['loginName'] . "\n" . get_lang('ResetLink') . ' : ' . $reset_link . '';
+                $user_account_list = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$user['loginName']."\n".get_lang('ResetLink').' : '.$reset_link.'';
 
                 if ($user_account_list) {
-                    $user_account_list = "\n-----------------------------------------------\n" . $user_account_list;
+                    $user_account_list = "\n-----------------------------------------------\n".$user_account_list;
                 }
             } else {
                 foreach ($user as $this_user) {
                     $secret_word = self::get_secret_word($this_user['email']);
                     if ($reset) {
-                        $reset_link = $portal_url . "main/auth/lostPassword.php?reset=" . $secret_word . "&id=" . $this_user['uid'];
+                        $reset_link = $portal_url."main/auth/lostPassword.php?reset=".$secret_word."&id=".$this_user['uid'];
                     } else {
-                        $reset_link = get_lang('Pass') . " : $this_user[password]";
+                        $reset_link = get_lang('Pass')." : $this_user[password]";
                     }
-                    $user_account_list[] = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $this_user['loginName'] . "\n" . get_lang('ResetLink') . ' : ' . $reset_link . '';
+                    $user_account_list[] = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$this_user['loginName']."\n".get_lang('ResetLink').' : '.$reset_link.'';
                 }
                 if ($user_account_list) {
                     $user_account_list = implode("\n-----------------------------------------------\n", $user_account_list);
@@ -64,8 +64,8 @@ 
             if (!$by_username) {
                 $user = $user[0];
             }
-            $reset_link = get_lang('Pass') . " : $user[password]";
-            $user_account_list = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $user['loginName'] . "\n" . $reset_link . '';
+            $reset_link = get_lang('Pass')." : $user[password]";
+            $user_account_list = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$user['loginName']."\n".$reset_link.'';
         }
         return $user_account_list;
     }
@@ -78,7 +78,7 @@ 
      */
     public static function send_password_to_user($user, $by_username = false)
     {
-        $email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT
+        $email_subject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
 
         if ($by_username) { // Show only for lost password
             $user_account_list = self::get_user_account_list($user, false, $by_username); // BODY
@@ -97,7 +97,7 @@ 
             }
         }
 
-        $email_body = get_lang('YourAccountParam') . " " . $portal_url . "\n\n$user_account_list";
+        $email_body = get_lang('YourAccountParam')." ".$portal_url."\n\n$user_account_list";
         // SEND MESSAGE
         $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
         $email_admin = api_get_setting('emailAdministrator');
@@ -131,7 +131,7 @@ 
      */
     public static function handle_encrypted_password($user, $by_username = false)
     {
-        $email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT
+        $email_subject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT
 
         if ($by_username) {
         // Show only for lost password
@@ -141,11 +141,11 @@ 
             $user_account_list = self::get_user_account_list($user, true); // BODY
             $email_to = $user[0]['email'];
         }
-        $email_body = get_lang('DearUser') . " :\n" . get_lang('password_request') . "\n";
-        $email_body .= $user_account_list . "\n-----------------------------------------------\n\n";
+        $email_body = get_lang('DearUser')." :\n".get_lang('password_request')."\n";
+        $email_body .= $user_account_list."\n-----------------------------------------------\n\n";
         $email_body .= get_lang('PasswordEncryptedForSecurity');
 
-        $email_body .= "\n\n" . get_lang('SignatureFormula') . ",\n" . api_get_setting('administratorName') . " " . api_get_setting('administratorSurname') . "\n" . get_lang('PlataformAdmin') . " - " . api_get_setting('siteName');
+        $email_body .= "\n\n".get_lang('SignatureFormula').",\n".api_get_setting('administratorName')." ".api_get_setting('administratorSurname')."\n".get_lang('PlataformAdmin')." - ".api_get_setting('siteName');
 
         $sender_name = api_get_person_name(
             api_get_setting('administratorName'),
@@ -238,7 +238,7 @@ 
                     username AS loginName,
                     password,
                     email
-                FROM " . $tbl_user . "
+                FROM " . $tbl_user."
                 WHERE user_id = $id";
         $result = Database::query($sql);
         $num_rows = Database::num_rows($result);
@@ -291,7 +291,7 @@ 
                         ON user.user_id = a.user_id
                         LEFT JOIN $track_e_login login
                         ON user.user_id  = login.login_user_id
-                        WHERE user.user_id = '" . $_user['user_id'] . "'
+                        WHERE user.user_id = '".$_user['user_id']."'
                         ORDER BY login.login_date DESC LIMIT 1";
 
                 $result = Database::query($sql);
@@ -321,7 +321,7 @@ 
                     Session::write('is_platformAdmin', $is_platformAdmin);
                     Session::write('is_allowedCreateCourse', $is_allowedCreateCourse);
                 } else {
-                    header('location:' . api_get_path(WEB_PATH));
+                    header('location:'.api_get_path(WEB_PATH));
                     //exit("WARNING UNDEFINED UID !! ");
                 }
             } else { // no uid => logout or Anonymous
@@ -368,9 +368,9 @@ 
         global $_course;
         global $_real_cid;
 
-        global $is_courseAdmin;  //course teacher
-        global $is_courseTutor;  //course teacher - some rights
-        global $is_courseCoach;  //course coach
+        global $is_courseAdmin; //course teacher
+        global $is_courseTutor; //course teacher - some rights
+        global $is_courseCoach; //course coach
         global $is_courseMember; //course student
         global $is_sessionAdmin;
         global $is_allowed_in_course;
@@ -427,7 +427,7 @@ 
 
                     if (!empty($_GET['id_session'])) {
                         $_SESSION['id_session'] = intval($_GET['id_session']);
-                        $sql = 'SELECT name FROM ' . $tbl_session . ' WHERE id="' . intval($_SESSION['id_session']) . '"';
+                        $sql = 'SELECT name FROM '.$tbl_session.' WHERE id="'.intval($_SESSION['id_session']).'"';
                         $rs = Database::query($sql);
                         list($_SESSION['session_name']) = Database::fetch_array($rs);
                     } else {
@@ -443,7 +443,7 @@ 
                     }
                 } else {
                     //exit("WARNING UNDEFINED CID !! ");
-                    header('location:' . api_get_path(WEB_PATH));
+                    header('location:'.api_get_path(WEB_PATH));
                 }
             } else {
                 Session::erase('_cid');
@@ -470,7 +470,7 @@ 
         } else {
             // Continue with the previous values
             if (empty($_SESSION['_course']) OR empty($_SESSION['_cid'])) { //no previous values...
-                $_cid = -1;        //set default values that will be caracteristic of being unset
+                $_cid = -1; //set default values that will be caracteristic of being unset
                 $_course = -1;
             } else {
                 $_cid = $_SESSION['_cid'];
@@ -480,7 +480,7 @@ 
                 // Moreover, if we want to track a course with another session it can be usefull
                 if (!empty($_GET['id_session'])) {
                     $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-                    $sql = 'SELECT name FROM ' . $tbl_session . ' WHERE id="' . intval($_SESSION['id_session']) . '"';
+                    $sql = 'SELECT name FROM '.$tbl_session.' WHERE id="'.intval($_SESSION['id_session']).'"';
                     $rs = Database::query($sql);
                     list($_SESSION['session_name']) = Database::fetch_array($rs);
                     $_SESSION['id_session'] = intval($_GET['id_session']);
@@ -520,9 +520,9 @@ 
                             //But only if the login date is < than now + max_life_time
                             $sql = "SELECT course_access_id FROM $course_tracking_table
                                     WHERE
-                                        user_id     = " . intval($_user ['user_id']) . " AND
+                                        user_id     = ".intval($_user ['user_id'])." AND
                                         c_id = '".api_get_course_int_id()."' AND
-                                        session_id  = " . api_get_session_id() . " AND
+                                        session_id  = " . api_get_session_id()." AND
                                         login_course_date > now() - INTERVAL $session_lifetime SECOND
                                     ORDER BY login_course_date DESC LIMIT 0,1";
                             $result = Database::query($sql);
@@ -532,11 +532,11 @@ 
                                 //We update the course tracking table
                                 $sql = "UPDATE $course_tracking_table
                                         SET logout_course_date = '$time', counter = counter+1
-                                        WHERE course_access_id = " . intval($i_course_access_id) . " AND session_id = " . api_get_session_id();
+                                        WHERE course_access_id = ".intval($i_course_access_id)." AND session_id = ".api_get_session_id();
                                 Database::query($sql);
                             } else {
-                                $sql = "INSERT INTO $course_tracking_table (c_id, user_id, login_course_date, logout_course_date, counter, session_id)" .
-                                        "VALUES('" . api_get_course_int_id() . "', '" . $_user['user_id'] . "', '$time', '$time', '1','" . api_get_session_id() . "')";
+                                $sql = "INSERT INTO $course_tracking_table (c_id, user_id, login_course_date, logout_course_date, counter, session_id)".
+                                        "VALUES('".api_get_course_int_id()."', '".$_user['user_id']."', '$time', '$time', '1','".api_get_session_id()."')";
                                 Database::query($sql);
                             }
                         }
@@ -564,8 +564,8 @@ 
                 $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
                 $sql = "SELECT * FROM $course_user_table
                        WHERE
-                        user_id  = '" . $user_id . "' AND
-                        relation_type <> " . COURSE_RELATION_TYPE_RRHH . " AND
+                        user_id  = '".$user_id."' AND
+                        relation_type <> " . COURSE_RELATION_TYPE_RRHH." AND
                         course_code = '$course_id'";
                 $result = Database::query($sql);
 
@@ -585,8 +585,8 @@ 
                             $session_id
                         );
                         if (!$user_is_subscribed) {
-                            $url = api_get_path(WEB_CODE_PATH) . 'course_info/legal.php?course_code=' . $_course['code'] . '&session_id=' . $session_id;
-                            header('Location: ' . $url);
+                            $url = api_get_path(WEB_CODE_PATH).'course_info/legal.php?course_code='.$_course['code'].'&session_id='.$session_id;
+                            header('Location: '.$url);
                             exit;
                         }
                     }
@@ -627,11 +627,11 @@ 
                         } else {
                             //Im a coach or a student?
                             $sql = "SELECT user_id, status
-                                    FROM " . $tbl_session_course_user . "
+                                    FROM " . $tbl_session_course_user."
                                     WHERE
                                         c_id = '$_cid' AND
-                                        user_id = '" . $user_id . "' AND
-                                        session_id = '" . $session_id . "'
+                                        user_id = '".$user_id."' AND
+                                        session_id = '" . $session_id."'
                                     LIMIT 1";
                             $result = Database::query($sql);
 
@@ -777,7 +777,7 @@ 
         if ($reset) { // session data refresh requested
             if ($group_id && $_cid && !empty($_course['real_id'])) { // have keys to search data
                 $group_table = Database::get_course_table(TABLE_GROUP);
-                $sql = "SELECT * FROM $group_table WHERE c_id = " . $_course['real_id'] . " AND id = '$group_id'";
+                $sql = "SELECT * FROM $group_table WHERE c_id = ".$_course['real_id']." AND id = '$group_id'";
                 $result = Database::query($sql);
                 if (Database::num_rows($result) > 0) { // This group has recorded status related to this course
                     $gpData = Database::fetch_array($result);
@@ -830,7 +830,7 @@ 
      */
     public static function get_user_accounts_by_username($username)
     {
-        if (strpos($username,'@')){
+        if (strpos($username, '@')) {
             $username = api_strtolower($username);
             $email = true;
         } else {

main/inc/lib/specific_fields_manager.lib.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 function delete_specific_field($id)
 {
     $table_sf = Database:: get_main_table(TABLE_MAIN_SPECIFIC_FIELD);
-    $id = (int)$id;
+    $id = (int) $id;
     if (!is_numeric($id)) {
         return false;
     }
@@ -60,7 +60,7 @@ 
 function edit_specific_field($id, $name)
 {
     $table_sf = Database:: get_main_table(TABLE_MAIN_SPECIFIC_FIELD);
-    $id = (int)$id;
+    $id = (int) $id;
     if (!is_numeric($id)) {
         return false;
     }

main/inc/lib/timeline.lib.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 
 	public function __construct()
     {
-        $this->table =  Database::get_course_table(TABLE_TIMELINE);
+        $this->table = Database::get_course_table(TABLE_TIMELINE);
 	}
 
     /**
@@ -46,7 +46,7 @@ 
      */
     public function get_all($where_conditions = array())
     {
-        return Database::select('*',$this->table, array('where'=>$where_conditions,'order' =>'headline ASC'));
+        return Database::select('*', $this->table, array('where'=>$where_conditions, 'order' =>'headline ASC'));
     }
 
     /**
@@ -57,7 +57,7 @@ 
 		// action links
 		$html = '<div class="actions">';
         //$html .= '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
-		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
+		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', '32').'</a>';
 		$html .= '</div>';
         $html .= Display::grid_html('timelines');
         return $html;
@@ -244,7 +244,7 @@ 
         }
         unset($item['end_date']);
         // Assets
-        $item['asset'] = array( 'media'     => $item['media'],
+        $item['asset'] = array('media'     => $item['media'],
                                 'credit'    => $item['media_credit'],
                                 'caption'   => $item['media_caption'],
          );

main/inc/lib/classmanager.lib.php

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
         $table_user = Database :: get_main_table(TABLE_MAIN_USER);
         $sql = "SELECT * FROM $table_class_user cu, $table_user u WHERE cu.class_id = '".$class_id."' AND cu.user_id = u.user_id";
         $res = Database::query($sql);
-        $users = array ();
+        $users = array();
         while ($user = Database::fetch_array($res, 'ASSOC')) {
             $users[] = $user;
         }
@@ -117,7 +117,7 @@ 
         $table_course_class = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS);
         $courses = ClassManager :: get_courses($class_id);
         if (count($courses) != 0) {
-            $course_codes = array ();
+            $course_codes = array();
             foreach ($courses as $index => $course) {
                 $course_codes[] = $course['course_code'];
                 $sql = "SELECT DISTINCT user_id FROM $table_class_user t1, $table_course_class t2 WHERE t1.class_id=t2.class_id AND course_code = '".$course['course_code']."' AND user_id = $user_id AND t2.class_id<>'$class_id'";
@@ -142,7 +142,7 @@ 
         $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
         $sql = "SELECT * FROM $table_class_course cc, $table_course c WHERE cc.class_id = '".$class_id."' AND cc.course_code = c.code";
         $res = Database::query($sql);
-        $courses = array ();
+        $courses = array();
         while ($course = Database::fetch_array($res, 'ASSOC')) {
             $courses[] = $course;
         }
@@ -217,7 +217,7 @@ 
         $table_course_class = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS);
         $sql = "SELECT cl.* FROM $table_class cl, $table_course_class cc WHERE cc.course_code = '".Database::escape_string($course_code)."' AND cc.class_id = cl.id";
         $res = Database::query($sql);
-        $classes = array ();
+        $classes = array();
         while ($class = Database::fetch_array($res, 'ASSOC')) {
             $classes[] = $class;
         }

main/inc/lib/app_view.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
      * Constructor, init tool path for rendering
      * @param string  tool name (optional)
      */
-    public function __construct($toolname = '', $template_path=null)
+    public function __construct($toolname = '', $template_path = null)
     {
         if (!empty($toolname)) {
             if (isset($template_path)) {
@@ -30,7 +30,7 @@ 
             if (is_dir($path)) {
                 $this->tool_path = $path;
             } else {
-                throw new ViewException('View::__construct() $path directory does not exist ' . $path);
+                throw new ViewException('View::__construct() $path directory does not exist '.$path);
             }
         }
     }
@@ -42,7 +42,7 @@ 
     public function set_data($data)
     {
         if (!is_array($data)) {
-            throw new ViewException('View::set_data() $data must to be an array, you have sent a' . gettype( $data ));
+            throw new ViewException('View::set_data() $data must to be an array, you have sent a'.gettype($data));
         }
         $this->data = $data;
     }
@@ -51,7 +51,7 @@ 
      * Set layout view sent from a controller
      * @param string layout view
      */
-    public function set_layout( $layout )
+    public function set_layout($layout)
     {
         $this->layout = $layout;
     }