chamilo / chamilo-lms

main/inc/lib/magpierss/rss_utils.inc

Spacing +12 added lines, -12 removed lines

@@ -22,35 +22,35 @@
  *
  * NOTE: http://www.w3.org/TR/NOTE-datetime
  */
-function parse_w3cdtf ( $date_str ) {
+function parse_w3cdtf($date_str) {
     
     # regex to match wc3dtf
     $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
     
-    if ( preg_match( $pat, $date_str, $match ) ) {
-        list( $year, $month, $day, $hours, $minutes, $seconds) = 
-            array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
+    if (preg_match($pat, $date_str, $match)) {
+        list($year, $month, $day, $hours, $minutes, $seconds) = 
+            array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
         
         # calc epoch for current date assuming GMT
-        $epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
+        $epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
         
         $offset = 0;
-        if ( $match[10] == 'Z' ) {
+        if ($match[10] == 'Z') {
             # zulu time, aka GMT
         }
         else {
-            list( $tz_mod, $tz_hour, $tz_min ) =
-                array( $match[8], $match[9], $match[10]);
+            list($tz_mod, $tz_hour, $tz_min) =
+                array($match[8], $match[9], $match[10]);
             
             # zero out the variables
-            if ( ! $tz_hour ) { $tz_hour = 0; }
-            if ( ! $tz_min ) { $tz_min = 0; }
+            if (!$tz_hour) { $tz_hour = 0; }
+            if (!$tz_min) { $tz_min = 0; }
         
-            $offset_secs = (($tz_hour*60)+$tz_min)*60;
+            $offset_secs = (($tz_hour * 60) + $tz_min) * 60;
             
             # is timezone ahead of GMT?  then subtract offset
             #
-            if ( $tz_mod == '+' ) {
+            if ($tz_mod == '+') {
                 $offset_secs = $offset_secs * -1;
             }
             

Braces +2 added lines, -4 removed lines

@@ -37,8 +37,7 @@ 
         $offset = 0;
         if ( $match[10] == 'Z' ) {
             # zulu time, aka GMT
-        }
-        else {
+        } else {
             list( $tz_mod, $tz_hour, $tz_min ) =
                 array( $match[8], $match[9], $match[10]);
             
@@ -58,8 +57,7 @@ 
         }
         $epoch = $epoch + $offset;
         return $epoch;
-    }
-    else {
+    } else {
         return -1;
     }
 }

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

Indentation +666 added lines, -666 removed lines

@@ -36,81 +36,81 @@ 
 *************************************************/
 
 class Snoopy {
-	/**** Public variables ****/
+    /**** Public variables ****/
 	
-	/* 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
-												// $cookies["username"]="joe";
-	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.
-												// this only applies to fetchlinks()
-												// or submitlinks()
-	public $passcookies	=	true;				// pass set cookies back through redirects
-												// NOTE: this currently does not respect
-												// dates, domains or paths.
+    /* 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
+                                                // $cookies["username"]="joe";
+    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.
+                                                // this only applies to fetchlinks()
+                                                // or submitlinks()
+    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, */*";
+    // http accept types
+    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
-												// 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 $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	$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.
-												// set to false if you do not have
-												// cURL installed. See http://curl.haxx.se
-												// for details on installing cURL.
-												// Snoopy does *not* use the cURL
-												// library functions built into php,
-												// as these functions are not stable
-												// as of this Snoopy release.
+    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.
+                                                // set to false if you do not have
+                                                // cURL installed. See http://curl.haxx.se
+                                                // for details on installing cURL.
+                                                // Snoopy does *not* use the cURL
+                                                // library functions built into php,
+                                                // as these functions are not stable
+                                                // as of this Snoopy release.
 	
-	// send Accept-encoding: gzip?
-	public $use_gzip		= true;	
+    // send Accept-encoding: gzip?
+    public $use_gzip		= true;	
 	
-	/**** Private variables ****/	
+    /**** 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
@@ -121,136 +121,136 @@ 
 	Output:		$this->results	the output text from the fetch
 \*======================================================================*/
 
-	public function fetch($URI) {
-		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
-		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
-			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
-			$this->pass = $URI_PARTS["pass"];
-		if (!isset($fp)) { $fp = false; }
-		switch ($URI_PARTS["scheme"]) {
-			case "http":
-				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
-				{
-					if($this->_isproxy)
-					{
-						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
-					}
-					else
-					{
-						$path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
-						// no proxy, send only the path
-						$this->_httprequest($path, $fp, $URI, $this->_httpmethod);
-					}
+    public function fetch($URI) {
+        //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
+        $URI_PARTS = parse_url($URI);
+        if (!empty($URI_PARTS["user"]))
+            $this->user = $URI_PARTS["user"];
+        if (!empty($URI_PARTS["pass"]))
+            $this->pass = $URI_PARTS["pass"];
+        if (!isset($fp)) { $fp = false; }
+        switch ($URI_PARTS["scheme"]) {
+            case "http":
+                $this->host = $URI_PARTS["host"];
+                if(!empty($URI_PARTS["port"]))
+                    $this->port = $URI_PARTS["port"];
+                if($this->_connect($fp))
+                {
+                    if($this->_isproxy)
+                    {
+                        // using proxy, send entire URI
+                        $this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
+                    }
+                    else
+                    {
+                        $path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
+                        // no proxy, send only the path
+                        $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
+                    }
 					
-					$this->_disconnect($fp);
-
-					if($this->_redirectaddr)
-					{
-						/* url was redirected, check if we've hit the max depth */
-						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)
-							{
-								/* follow the redirect */
-								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
-								$this->fetch($this->_redirectaddr);
-							}
-						}
-					}
-
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
-					{
-						$frameurls = $this->_frameurls;
-						$this->_frameurls = array();
+                    $this->_disconnect($fp);
+
+                    if($this->_redirectaddr)
+                    {
+                        /* url was redirected, check if we've hit the max depth */
+                        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)
+                            {
+                                /* follow the redirect */
+                                $this->_redirectdepth++;
+                                $this->lastredirectaddr=$this->_redirectaddr;
+                                $this->fetch($this->_redirectaddr);
+                            }
+                        }
+                    }
+
+                    if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+                    {
+                        $frameurls = $this->_frameurls;
+                        $this->_frameurls = array();
 						
-						while(list(,$frameurl) = each($frameurls))
-						{
-							if($this->_framedepth < $this->maxframes)
-							{
-								$this->fetch($frameurl);
-								$this->_framedepth++;
-							}
-							else
-								break;
-						}
-					}					
-				}
-				else
-				{
-					return false;
-				}
-				return true;					
-				break;
-			case "https":
-				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"]))
-					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
-				{
-					// using proxy, send entire URI
-					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
-				}
-				else
-				{
-					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
-					// no proxy, send only the path
-					$this->_httpsrequest($path, $URI, $this->_httpmethod);
-				}
-
-				if($this->_redirectaddr)
-				{
-					/* url was redirected, check if we've hit the max depth */
-					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)
-						{
-							/* follow the redirect */
-							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
-							$this->fetch($this->_redirectaddr);
-						}
-					}
-				}
-
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
-				{
-					$frameurls = $this->_frameurls;
-					$this->_frameurls = array();
-
-					while(list(,$frameurl) = each($frameurls))
-					{
-						if($this->_framedepth < $this->maxframes)
-						{
-							$this->fetch($frameurl);
-							$this->_framedepth++;
-						}
-						else
-							break;
-					}
-				}					
-				return true;					
-				break;
-			default:
-				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
-				return false;
-				break;
-		}		
-		return true;
-	}
+                        while(list(,$frameurl) = each($frameurls))
+                        {
+                            if($this->_framedepth < $this->maxframes)
+                            {
+                                $this->fetch($frameurl);
+                                $this->_framedepth++;
+                            }
+                            else
+                                break;
+                        }
+                    }					
+                }
+                else
+                {
+                    return false;
+                }
+                return true;					
+                break;
+            case "https":
+                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"]))
+                    $this->port = $URI_PARTS["port"];
+                if($this->_isproxy)
+                {
+                    // using proxy, send entire URI
+                    $this->_httpsrequest($URI,$URI,$this->_httpmethod);
+                }
+                else
+                {
+                    $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
+                    // no proxy, send only the path
+                    $this->_httpsrequest($path, $URI, $this->_httpmethod);
+                }
+
+                if($this->_redirectaddr)
+                {
+                    /* url was redirected, check if we've hit the max depth */
+                    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)
+                        {
+                            /* follow the redirect */
+                            $this->_redirectdepth++;
+                            $this->lastredirectaddr=$this->_redirectaddr;
+                            $this->fetch($this->_redirectaddr);
+                        }
+                    }
+                }
+
+                if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+                {
+                    $frameurls = $this->_frameurls;
+                    $this->_frameurls = array();
+
+                    while(list(,$frameurl) = each($frameurls))
+                    {
+                        if($this->_framedepth < $this->maxframes)
+                        {
+                            $this->fetch($frameurl);
+                            $this->_framedepth++;
+                        }
+                        else
+                            break;
+                    }
+                }					
+                return true;					
+                break;
+            default:
+                // not a valid protocol
+                $this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+                return false;
+                break;
+        }		
+        return true;
+    }
 
 
 
@@ -266,32 +266,32 @@ 
 	Output:		$match		an array of the links
 \*======================================================================*/
 
-	private function _striplinks($document)
-	{	
-		preg_match_all("'<\s*a\s+.*href\s*=\s*			# find <a href=
+    private function _striplinks($document)
+    {	
+        preg_match_all("'<\s*a\s+.*href\s*=\s*			# find <a href=
 						([\"\'])?					# 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);
 						
 
-		// catenate the non-empty matches from the conditional subpattern
+        // catenate the non-empty matches from the conditional subpattern
 
-		while(list($key,$val) = each($links[2]))
-		{
-			if(!empty($val))
-				$match[] = $val;
-		}				
+        while(list($key,$val) = each($links[2]))
+        {
+            if(!empty($val))
+                $match[] = $val;
+        }				
 		
-		while(list($key,$val) = each($links[3]))
-		{
-			if(!empty($val))
-				$match[] = $val;
-		}		
+        while(list($key,$val) = each($links[3]))
+        {
+            if(!empty($val))
+                $match[] = $val;
+        }		
 		
-		// return the links
-		return $match;
-	}
+        // return the links
+        return $match;
+    }
 
 /*======================================================================*\
 	Function:	_stripform
@@ -300,16 +300,16 @@ 
 	Output:		$match		an array of the links
 \*======================================================================*/
 
-	private function _stripform($document)
-	{	
-		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
+    private function _stripform($document)
+    {	
+        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]);
+        // catenate the matches
+        $match = implode("\r\n",$elements[0]);
 				
-		// return the links
-		return $match;
-	}
+        // return the links
+        return $match;
+    }
 
 	
 	
@@ -320,43 +320,43 @@ 
 	Output:		$text		the resulting text
 \*======================================================================*/
 
-	private function _striptext($document)
-	{
+    private function _striptext($document)
+    {
 		
-		// I didn't use preg eval (//e) since that is only available in PHP 4.0.
-		// so, list your entities one by one here. I included some of the
-		// more common ones.
+        // I didn't use preg eval (//e) since that is only available in PHP 4.0.
+        // 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
-						"'&(amp|#38);'i",
-						"'&(lt|#60);'i",
-						"'&(gt|#62);'i",
-						"'&(nbsp|#160);'i",
-						"'&(iexcl|#161);'i",
-						"'&(cent|#162);'i",
-						"'&(pound|#163);'i",
-						"'&(copy|#169);'i"
-						);				
-		$replace = array(	"",
-							"",
-							"\\1",
-							"\"",
-							"&",
-							"<",
-							">",
-							" ",
-							chr(161),
-							chr(162),
-							chr(163),
-							chr(169));
+        $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",
+                        "'&(nbsp|#160);'i",
+                        "'&(iexcl|#161);'i",
+                        "'&(cent|#162);'i",
+                        "'&(pound|#163);'i",
+                        "'&(copy|#169);'i"
+                        );				
+        $replace = array(	"",
+                            "",
+                            "\\1",
+                            "\"",
+                            "&",
+                            "<",
+                            ">",
+                            " ",
+                            chr(161),
+                            chr(162),
+                            chr(163),
+                            chr(169));
 					
-		$text = preg_replace($search,$replace,$document);
+        $text = preg_replace($search,$replace,$document);
 								
-		return $text;
-	}
+        return $text;
+    }
 
 /*======================================================================*\
 	Function:	_expandlinks
@@ -366,29 +366,29 @@ 
 	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",
-							"|^(?!http://)(\/)?(?!mailto:)|i",
-							"|/\./|",
-							"|/[^\/]+/\.\./|"
-						);
+        $search = array( 	"|^http://".preg_quote($this->host)."|i",
+                            "|^(?!http://)(\/)?(?!mailto:)|i",
+                            "|/\./|",
+                            "|/[^\/]+/\.\./|"
+                        );
 						
-		$replace = array(	"",
-							$match."/",
-							"/",
-							"/"
-						);			
+        $replace = array(	"",
+                            $match."/",
+                            "/",
+                            "/"
+                        );			
 				
-		$expandedLinks = preg_replace($search,$replace,$links);
+        $expandedLinks = preg_replace($search,$replace,$links);
 
-		return $expandedLinks;
-	}
+        return $expandedLinks;
+    }
 
 /*======================================================================*\
 	Function:	_httprequest
@@ -400,179 +400,179 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
-	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+    private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
+    {
+        if($this->passcookies && $this->_redirectaddr)
+            $this->setcookies();
 			
-		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
-		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
-		if(!empty($this->agent))
-			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
-			$headers .= "Host: ".$this->host."\r\n";
-		if(!empty($this->accept))
-			$headers .= "Accept: ".$this->accept."\r\n";
+        $URI_PARTS = parse_url($URI);
+        if(empty($url))
+            $url = "/";
+        $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
+        if(!empty($this->agent))
+            $headers .= "User-Agent: ".$this->agent."\r\n";
+        if(!empty($this->host) && !isset($this->rawheaders['Host']))
+            $headers .= "Host: ".$this->host."\r\n";
+        if(!empty($this->accept))
+            $headers .= "Accept: ".$this->accept."\r\n";
 		
-		if($this->use_gzip) {
-			// make sure PHP was built with --with-zlib
-			// and we can handle gzipp'ed data
-			if ( function_exists(gzinflate) ) {
-			   $headers .= "Accept-encoding: gzip\r\n";
-			}
-			else {
-			   trigger_error(
-			   	"use_gzip is on, but PHP was built without zlib support.".
-				"  Requesting file(s) without gzip encoding.", 
-				E_USER_NOTICE);
-			}
-		}
+        if($this->use_gzip) {
+            // make sure PHP was built with --with-zlib
+            // and we can handle gzipp'ed data
+            if ( function_exists(gzinflate) ) {
+                $headers .= "Accept-encoding: gzip\r\n";
+            }
+            else {
+                trigger_error(
+                    "use_gzip is on, but PHP was built without zlib support.".
+                "  Requesting file(s) without gzip encoding.", 
+                E_USER_NOTICE);
+            }
+        }
 		
-		if(!empty($this->referer))
-			$headers .= "Referer: ".$this->referer."\r\n";
-		if(!empty($this->cookies))
-		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+        if(!empty($this->referer))
+            $headers .= "Referer: ".$this->referer."\r\n";
+        if(!empty($this->cookies))
+        {			
+            if(!is_array($this->cookies))
+                $this->cookies = (array)$this->cookies;
 	
-			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
-				$cookie_headers .= 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
-				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
-				}
-				$headers .= substr($cookie_headers,0,-2) . "\r\n";
-			} 
-		}
-		if(!empty($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)) {
-			$headers .= "Content-type: $content_type";
-			if ($content_type == "multipart/form-data")
-				$headers .= "; boundary=".$this->_mime_boundary;
-			$headers .= "\r\n";
-		}
-		if(!empty($body))	
-			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
-
-		$headers .= "\r\n";
+            reset($this->cookies);
+            if ( count($this->cookies) > 0 ) {
+                $cookie_headers .= 'Cookie: ';
+                foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+                $cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
+                }
+                $headers .= substr($cookie_headers,0,-2) . "\r\n";
+            } 
+        }
+        if(!empty($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)) {
+            $headers .= "Content-type: $content_type";
+            if ($content_type == "multipart/form-data")
+                $headers .= "; boundary=".$this->_mime_boundary;
+            $headers .= "\r\n";
+        }
+        if(!empty($body))	
+            $headers .= "Content-length: ".strlen($body)."\r\n";
+        if(!empty($this->user) || !empty($this->pass))	
+            $headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
+
+        $headers .= "\r\n";
 		
-		// set the read timeout if needed
-		if ($this->read_timeout > 0)
-			socket_set_timeout($fp, $this->read_timeout);
-		$this->timed_out = false;
+        // set the read timeout if needed
+        if ($this->read_timeout > 0)
+            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);
+        $this->_redirectaddr = false;
+        unset($this->headers);
 		
-		// content was returned gzip encoded?
-		$is_gzipped = false;
+        // content was returned gzip encoded?
+        $is_gzipped = false;
 						
-		while($currentHeader = fgets($fp,$this->_maxlinelen))
-		{
-			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
-			{
-				$this->status=-100;
-				return false;
-			}
+        while($currentHeader = fgets($fp,$this->_maxlinelen))
+        {
+            if ($this->read_timeout > 0 && $this->_check_timeout($fp))
+            {
+                $this->status=-100;
+                return false;
+            }
 				
-		//	if($currentHeader == "\r\n")
-			if(preg_match("/^\r?\n$/", $currentHeader) )
-			      break;
+        //	if($currentHeader == "\r\n")
+            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))
-			{
-				// get URL portion of the redirect
-				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]))
-				{
-					// no host in the path, so prepend
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
-					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
-				}
-				else
-					$this->_redirectaddr = $matches[2];
-			}
+            // if a header begins with Location: or URI:, set the redirect
+            if(preg_match("/^(Location:|URI:)/i",$currentHeader))
+            {
+                // get URL portion of the redirect
+                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]))
+                {
+                    // no host in the path, so prepend
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
+                    // eliminate double slash
+                    if(!preg_match("|^/|",$matches[2]))
+                            $this->_redirectaddr .= "/".$matches[2];
+                    else
+                            $this->_redirectaddr .= $matches[2];
+                }
+                else
+                    $this->_redirectaddr = $matches[2];
+            }
 		
-			if(preg_match("|^HTTP/|",$currentHeader))
-			{
+            if(preg_match("|^HTTP/|",$currentHeader))
+            {
                 if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
-				{
-					$this->status= $status[1];
+                {
+                    $this->status= $status[1];
                 }				
-				$this->response_code = $currentHeader;
-			}
+                $this->response_code = $currentHeader;
+            }
 			
-			if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
-				$is_gzipped = true;
-			}
+            if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
+                $is_gzipped = true;
+            }
 			
-			$this->headers[] = $currentHeader;
-		}
-
-		# $results = fread($fp, $this->maxlength);
-		$results = "";
-		while ( $data = fread($fp, $this->maxlength) ) {
-		    $results .= $data;
-		    if (
-		        strlen($results) > $this->maxlength ) {
-		        break;
-		    }
-		}
+            $this->headers[] = $currentHeader;
+        }
+
+        # $results = fread($fp, $this->maxlength);
+        $results = "";
+        while ( $data = fread($fp, $this->maxlength) ) {
+            $results .= $data;
+            if (
+                strlen($results) > $this->maxlength ) {
+                break;
+            }
+        }
 		
-		// gunzip
-		if ( $is_gzipped ) {
-			// per http://www.php.net/manual/en/function.gzencode.php
-			$results = substr($results, 10);
-			$results = gzinflate($results);
-		}
+        // gunzip
+        if ( $is_gzipped ) {
+            // per http://www.php.net/manual/en/function.gzencode.php
+            $results = substr($results, 10);
+            $results = gzinflate($results);
+        }
 		
-		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
-		{
-			$this->status=-100;
-			return false;
-		}
+        if ($this->read_timeout > 0 && $this->_check_timeout($fp))
+        {
+            $this->status=-100;
+            return false;
+        }
 		
-		// check if there is a a redirect meta tag
+        // 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))
-		{
-			$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))
-		{
-			$this->results[] = $results;
-			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))
-			$this->results[] = $results;
-		// no framed content
-		else
-			$this->results = $results;
+        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);	
+        }
+
+        // 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))
+        {
+            $this->results[] = $results;
+            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))
+            $this->results[] = $results;
+        // no framed content
+        else
+            $this->results = $results;
 		
-		return true;
-	}
+        return true;
+    }
 
 /*======================================================================*\
 	Function:	_httpsrequest
@@ -583,163 +583,163 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
-	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+    private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
+    {
+        if($this->passcookies && $this->_redirectaddr)
+            $this->setcookies();
 
-		$headers = array();		
+        $headers = array();		
 					
-		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
-		// GET ... header not needed for curl
-		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
-		if(!empty($this->agent))
-			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
-			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
-			$headers[] = "Referer: ".$this->referer;
-		if(!empty($this->cookies))
-		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+        $URI_PARTS = parse_url($URI);
+        if(empty($url))
+            $url = "/";
+        // GET ... header not needed for curl
+        //$headers[] = $http_method." ".$url." ".$this->_httpversion;		
+        if(!empty($this->agent))
+            $headers[] = "User-Agent: ".$this->agent;
+        if(!empty($this->host))
+            $headers[] = "Host: ".$this->host;
+        if(!empty($this->accept))
+            $headers[] = "Accept: ".$this->accept;
+        if(!empty($this->referer))
+            $headers[] = "Referer: ".$this->referer;
+        if(!empty($this->cookies))
+        {			
+            if(!is_array($this->cookies))
+                $this->cookies = (array)$this->cookies;
 	
-			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
-				$cookie_str = 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
-				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
-				}
-				$headers[] = substr($cookie_str,0,-2);
-			}
-		}
-		if(!empty($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 ($content_type == "multipart/form-data")
-				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
-			else
-				$headers[] = "Content-type: $content_type";
-		}
-		if(!empty($body))	
-			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
+            reset($this->cookies);
+            if ( count($this->cookies) > 0 ) {
+                $cookie_str = 'Cookie: ';
+                foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+                $cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
+                }
+                $headers[] = substr($cookie_str,0,-2);
+            }
+        }
+        if(!empty($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 ($content_type == "multipart/form-data")
+                $headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
+            else
+                $headers[] = "Content-type: $content_type";
+        }
+        if(!empty($body))	
+            $headers[] = "Content-length: ".strlen($body);
+        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++) {
-			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
-		}
+        for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
+            $cmdline_params .= " -H \"".$headers[$curr_header]."\"";
+        }
 			  	                         
-		if(!empty($body))
-			$cmdline_params .= " -d \"$body\"";
+        if(!empty($body))
+            $cmdline_params .= " -d \"$body\"";
 		
-		if($this->read_timeout > 0)
-			$cmdline_params .= " -m ".$this->read_timeout;
+        if($this->read_timeout > 0)
+            $cmdline_params .= " -m ".$this->read_timeout;
 		
-		$headerfile = uniqid(time());
+        $headerfile = uniqid(time());
 		
-		# accept self-signed certs
-		$cmdline_params .= " -k";
+        # accept self-signed certs
+        $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)
-		{
-			$this->error = "Error: cURL could not retrieve the document, error $return.";
-			return false;
-		}
+        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");
+        $result_headers = file("/tmp/$headerfile");
 						
-		$this->_redirectaddr = false;
-		unset($this->headers);
+        $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]))
-			{
-				// get URL portion of the redirect
-				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]))
-				{
-					// no host in the path, so prepend
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
-					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
-				}
-				else
-					$this->_redirectaddr = $matches[2];
-			}
+            // if a header begins with Location: or URI:, set the redirect
+            if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
+            {
+                // get URL portion of the redirect
+                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]))
+                {
+                    // no host in the path, so prepend
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
+                    // eliminate double slash
+                    if(!preg_match("|^/|",$matches[2]))
+                            $this->_redirectaddr .= "/".$matches[2];
+                    else
+                            $this->_redirectaddr .= $matches[2];
+                }
+                else
+                    $this->_redirectaddr = $matches[2];
+            }
 		
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
-			{
-			    $this->response_code = $result_headers[$currentHeader];
-			    if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
-			    {
-				$this->status= $match[1];
-                	    }
-			}
-			$this->headers[] = $result_headers[$currentHeader];
-		}
-
-		// check if there is a a redirect meta tag
+            if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
+            {
+                $this->response_code = $result_headers[$currentHeader];
+                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
+                {
+                $this->status= $match[1];
+                        }
+            }
+            $this->headers[] = $result_headers[$currentHeader];
+        }
+
+        // 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))
-		{
-			$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))
-		{
-			$this->results[] = $results;
-			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))
-			$this->results[] = $results;
-		// no framed content
-		else
-			$this->results = $results;
-
-		unlink("/tmp/$headerfile");
+        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);	
+        }
+
+        // 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))
+        {
+            $this->results[] = $results;
+            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))
+            $this->results[] = $results;
+        // no framed content
+        else
+            $this->results = $results;
+
+        unlink("/tmp/$headerfile");
 		
-		return true;
-	}
+        return true;
+    }
 
 /*======================================================================*\
 	Function:	setcookies()
 	Purpose:	set cookies for a redirection
 \*======================================================================*/
 	
-	public function setcookies()
-	{
-		for($x=0; $x<count($this->headers); $x++)
-		{
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
-			$this->cookies[$match[1]] = $match[2];
-		}
-	}
+    public function setcookies()
+    {
+        for($x=0; $x<count($this->headers); $x++)
+        {
+        if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
+            $this->cookies[$match[1]] = $match[2];
+        }
+    }
 
 	
 /*======================================================================*\
@@ -748,17 +748,17 @@ 
 	Input:		$fp	file pointer
 \*======================================================================*/
 
-	private function _check_timeout($fp)
-	{
-		if ($this->read_timeout > 0) {
-			$fp_status = socket_get_status($fp);
-			if ($fp_status["timed_out"]) {
-				$this->timed_out = true;
-				return true;
-			}
-		}
-		return false;
-	}
+    private function _check_timeout($fp)
+    {
+        if ($this->read_timeout > 0) {
+            $fp_status = socket_get_status($fp);
+            if ($fp_status["timed_out"]) {
+                $this->timed_out = true;
+                return true;
+            }
+        }
+        return false;
+    }
 
 /*======================================================================*\
 	Function:	_connect
@@ -766,62 +766,62 @@ 
 	Input:		$fp	file pointer
 \*======================================================================*/
 	
-	private function _connect(&$fp)
-	{
-		if(!empty($this->proxy_host) && !empty($this->proxy_port))
-			{
-				$this->_isproxy = true;
-				$host = $this->proxy_host;
-				$port = $this->proxy_port;
-			}
-		else
-		{
-			$host = $this->host;
-			$port = $this->port;
-		}
+    private function _connect(&$fp)
+    {
+        if(!empty($this->proxy_host) && !empty($this->proxy_port))
+            {
+                $this->_isproxy = true;
+                $host = $this->proxy_host;
+                $port = $this->proxy_port;
+            }
+        else
+        {
+            $host = $this->host;
+            $port = $this->port;
+        }
 	
-		$this->status = 0;
+        $this->status = 0;
 		
-		if($fp = fsockopen(
-					$host,
-					$port,
-					$errno,
-					$errstr,
-					$this->_fp_timeout
-					))
-		{
-			// socket connection succeeded
-
-			return true;
-		}
-		else
-		{
-			// socket connection failed
-			$this->status = $errno;
-			switch($errno)
-			{
-				case -3:
-					$this->error="socket creation failed (-3)";
-				case -4:
-					$this->error="dns lookup failure (-4)";
-				case -5:
-					$this->error="connection refused or timed out (-5)";
-				default:
-					$this->error="connection failed (".$errno.")";
-			}
-			return false;
-		}
-	}
+        if($fp = fsockopen(
+                    $host,
+                    $port,
+                    $errno,
+                    $errstr,
+                    $this->_fp_timeout
+                    ))
+        {
+            // socket connection succeeded
+
+            return true;
+        }
+        else
+        {
+            // socket connection failed
+            $this->status = $errno;
+            switch($errno)
+            {
+                case -3:
+                    $this->error="socket creation failed (-3)";
+                case -4:
+                    $this->error="dns lookup failure (-4)";
+                case -5:
+                    $this->error="connection refused or timed out (-5)";
+                default:
+                    $this->error="connection failed (".$errno.")";
+            }
+            return false;
+        }
+    }
 /*======================================================================*\
 	Function:	_disconnect
 	Purpose:	disconnect a socket connection
 	Input:		$fp	file pointer
 \*======================================================================*/
 	
-	private function _disconnect($fp)
-	{
-		return(fclose($fp));
-	}
+    private function _disconnect($fp)
+    {
+        return(fclose($fp));
+    }
 
 	
 /*======================================================================*\
@@ -832,65 +832,65 @@ 
 	Output:		post body
 \*======================================================================*/
 	
-	private function _prepare_post_body($formvars, $formfiles)
-	{
-		settype($formvars, "array");
-		settype($formfiles, "array");
+    private function _prepare_post_body($formvars, $formfiles)
+    {
+        settype($formvars, "array");
+        settype($formfiles, "array");
 
-		if (count($formvars) == 0 && count($formfiles) == 0)
-			return;
+        if (count($formvars) == 0 && count($formfiles) == 0)
+            return;
 		
-		switch ($this->_submit_type) {
-			case "application/x-www-form-urlencoded":
-				reset($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)."&";
-						}
-					} else
-						$postdata .= urlencode($key)."=".urlencode($val)."&";
-				}
-				break;
-
-			case "multipart/form-data":
-				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
+        switch ($this->_submit_type) {
+            case "application/x-www-form-urlencoded":
+                reset($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)."&";
+                        }
+                    } else
+                        $postdata .= urlencode($key)."=".urlencode($val)."&";
+                }
+                break;
+
+            case "multipart/form-data":
+                $this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 				
-				reset($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";
-							$postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
-							$postdata .= "$cur_val\r\n";
-						}
-					} else {
-						$postdata .= "--".$this->_mime_boundary."\r\n";
-						$postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
-						$postdata .= "$val\r\n";
-					}
-				}
+                reset($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";
+                            $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
+                            $postdata .= "$cur_val\r\n";
+                        }
+                    } else {
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
+                        $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
+                        $postdata .= "$val\r\n";
+                    }
+                }
 				
-				reset($formfiles);
-				while (list($field_name, $file_names) = each($formfiles)) {
-					settype($file_names, "array");
-					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
-
-						$fp = fopen($file_name, "r");
-						$file_content = fread($fp, filesize($file_name));
-						fclose($fp);
-						$base_name = basename($file_name);
-
-						$postdata .= "--".$this->_mime_boundary."\r\n";
-						$postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
-						$postdata .= "$file_content\r\n";
-					}
-				}
-				$postdata .= "--".$this->_mime_boundary."--\r\n";
-				break;
-		}
-
-		return $postdata;
-	}
+                reset($formfiles);
+                while (list($field_name, $file_names) = each($formfiles)) {
+                    settype($file_names, "array");
+                    while (list(, $file_name) = each($file_names)) {
+                        if (!is_readable($file_name)) continue;
+
+                        $fp = fopen($file_name, "r");
+                        $file_content = fread($fp, filesize($file_name));
+                        fclose($fp);
+                        $base_name = basename($file_name);
+
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
+                        $postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
+                        $postdata .= "$file_content\r\n";
+                    }
+                }
+                $postdata .= "--".$this->_mime_boundary."--\r\n";
+                break;
+        }
+
+        return $postdata;
+    }
 }
\ No newline at end of file

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";

Braces +159 added lines, -118 removed lines

@@ -124,24 +124,26 @@ 
 	public function fetch($URI) {
 		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
-			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
-			$this->pass = $URI_PARTS["pass"];
+		if (!empty($URI_PARTS["user"])) {
+					$this->user = $URI_PARTS["user"];
+		}
+		if (!empty($URI_PARTS["pass"])) {
+					$this->pass = $URI_PARTS["pass"];
+		}
 		if (!isset($fp)) { $fp = false; }
 		switch ($URI_PARTS["scheme"]) {
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_connect($fp))
 				{
 					if($this->_isproxy)
 					{
 						// using proxy, send entire URI
 						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
-					}
-					else
+					} else
 					{
 						$path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
 						// no proxy, send only the path
@@ -177,13 +179,12 @@ 
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
+							} else {
+															break;
 							}
-							else
-								break;
 						}
 					}					
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -195,14 +196,14 @@ 
 					return false;
 				}
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_isproxy)
 				{
 					// using proxy, send entire URI
 					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
-				}
-				else
+				} else
 				{
 					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 					// no proxy, send only the path
@@ -236,9 +237,9 @@ 
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
+						} else {
+													break;
 						}
-						else
-							break;
 					}
 				}					
 				return true;					
@@ -279,14 +280,16 @@ 
 
 		while(list($key,$val) = each($links[2]))
 		{
-			if(!empty($val))
-				$match[] = $val;
+			if(!empty($val)) {
+							$match[] = $val;
+			}
 		}				
 		
 		while(list($key,$val) = each($links[3]))
 		{
-			if(!empty($val))
-				$match[] = $val;
+			if(!empty($val)) {
+							$match[] = $val;
+			}
 		}		
 		
 		// return the links
@@ -402,27 +405,31 @@ 
 	
 	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
 	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+		if($this->passcookies && $this->_redirectaddr) {
+					$this->setcookies();
+		}
 			
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
+		if(empty($url)) {
+					$url = "/";
+		}
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
-		if(!empty($this->agent))
-			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
-			$headers .= "Host: ".$this->host."\r\n";
-		if(!empty($this->accept))
-			$headers .= "Accept: ".$this->accept."\r\n";
+		if(!empty($this->agent)) {
+					$headers .= "User-Agent: ".$this->agent."\r\n";
+		}
+		if(!empty($this->host) && !isset($this->rawheaders['Host'])) {
+					$headers .= "Host: ".$this->host."\r\n";
+		}
+		if(!empty($this->accept)) {
+					$headers .= "Accept: ".$this->accept."\r\n";
+		}
 		
 		if($this->use_gzip) {
 			// make sure PHP was built with --with-zlib
 			// and we can handle gzipp'ed data
 			if ( function_exists(gzinflate) ) {
 			   $headers .= "Accept-encoding: gzip\r\n";
-			}
-			else {
+			} else {
 			   trigger_error(
 			   	"use_gzip is on, but PHP was built without zlib support.".
 				"  Requesting file(s) without gzip encoding.", 
@@ -430,12 +437,14 @@ 
 			}
 		}
 		
-		if(!empty($this->referer))
-			$headers .= "Referer: ".$this->referer."\r\n";
+		if(!empty($this->referer)) {
+					$headers .= "Referer: ".$this->referer."\r\n";
+		}
 		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 ) {
@@ -448,27 +457,33 @@ 
 		}
 		if(!empty($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(!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)) {
 			$headers .= "Content-type: $content_type";
-			if ($content_type == "multipart/form-data")
-				$headers .= "; boundary=".$this->_mime_boundary;
+			if ($content_type == "multipart/form-data") {
+							$headers .= "; boundary=".$this->_mime_boundary;
+			}
 			$headers .= "\r\n";
 		}
-		if(!empty($body))	
-			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
+		if(!empty($body)) {
+					$headers .= "Content-length: ".strlen($body)."\r\n";
+		}
+		if(!empty($this->user) || !empty($this->pass)) {
+					$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
+		}
 
 		$headers .= "\r\n";
 		
 		// set the read timeout if needed
-		if ($this->read_timeout > 0)
-			socket_set_timeout($fp, $this->read_timeout);
+		if ($this->read_timeout > 0) {
+					socket_set_timeout($fp, $this->read_timeout);
+		}
 		$this->timed_out = false;
 		
 		fwrite($fp,$headers.$body,strlen($headers.$body));
@@ -488,8 +503,9 @@ 
 			}
 				
 		//	if($currentHeader == "\r\n")
-			if(preg_match("/^\r?\n$/", $currentHeader) )
-			      break;
+			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))
@@ -502,13 +518,14 @@ 
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 		
 			if(preg_match("|^HTTP/|",$currentHeader))
@@ -561,15 +578,18 @@ 
 		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))
-			$this->results[] = $results;
+		elseif(is_array($this->results)) {
+					$this->results[] = $results;
+		}
 		// no framed content
-		else
-			$this->results = $results;
+		else {
+					$this->results = $results;
+		}
 		
 		return true;
 	}
@@ -585,28 +605,35 @@ 
 	
 	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
 	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+		if($this->passcookies && $this->_redirectaddr) {
+					$this->setcookies();
+		}
 
 		$headers = array();		
 					
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
+		if(empty($url)) {
+					$url = "/";
+		}
 		// GET ... header not needed for curl
 		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
-		if(!empty($this->agent))
-			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
-			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
-			$headers[] = "Referer: ".$this->referer;
+		if(!empty($this->agent)) {
+					$headers[] = "User-Agent: ".$this->agent;
+		}
+		if(!empty($this->host)) {
+					$headers[] = "Host: ".$this->host;
+		}
+		if(!empty($this->accept)) {
+					$headers[] = "Accept: ".$this->accept;
+		}
+		if(!empty($this->referer)) {
+					$headers[] = "Referer: ".$this->referer;
+		}
 		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 ) {
@@ -619,31 +646,38 @@ 
 		}
 		if(!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers[] = $headerKey.": ".$headerVal;
+			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 ($content_type == "multipart/form-data")
-				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
-			else
-				$headers[] = "Content-type: $content_type";
-		}
-		if(!empty($body))	
-			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
+			if ($content_type == "multipart/form-data") {
+							$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
+			} else {
+							$headers[] = "Content-type: $content_type";
+			}
+		}
+		if(!empty($body)) {
+					$headers[] = "Content-length: ".strlen($body);
+		}
+		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++) {
 			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
 		}
 			  	                         
-		if(!empty($body))
-			$cmdline_params .= " -d \"$body\"";
+		if(!empty($body)) {
+					$cmdline_params .= " -d \"$body\"";
+		}
 		
-		if($this->read_timeout > 0)
-			$cmdline_params .= " -m ".$this->read_timeout;
+		if($this->read_timeout > 0) {
+					$cmdline_params .= " -m ".$this->read_timeout;
+		}
 		
 		$headerfile = uniqid(time());
 		
@@ -681,13 +715,14 @@ 
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 		
 			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
@@ -712,15 +747,18 @@ 
 		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))
-			$this->results[] = $results;
+		elseif(is_array($this->results)) {
+					$this->results[] = $results;
+		}
 		// no framed content
-		else
-			$this->results = $results;
+		else {
+					$this->results = $results;
+		}
 
 		unlink("/tmp/$headerfile");
 		
@@ -736,8 +774,9 @@ 
 	{
 		for($x=0; $x<count($this->headers); $x++)
 		{
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
-			$this->cookies[$match[1]] = $match[2];
+		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match)) {
+					$this->cookies[$match[1]] = $match[2];
+		}
 		}
 	}
 
@@ -773,8 +812,7 @@ 
 				$this->_isproxy = true;
 				$host = $this->proxy_host;
 				$port = $this->proxy_port;
-			}
-		else
+			} else
 		{
 			$host = $this->host;
 			$port = $this->port;
@@ -793,8 +831,7 @@ 
 			// socket connection succeeded
 
 			return true;
-		}
-		else
+		} else
 		{
 			// socket connection failed
 			$this->status = $errno;
@@ -837,8 +874,9 @@ 
 		settype($formvars, "array");
 		settype($formfiles, "array");
 
-		if (count($formvars) == 0 && count($formfiles) == 0)
-			return;
+		if (count($formvars) == 0 && count($formfiles) == 0) {
+					return;
+		}
 		
 		switch ($this->_submit_type) {
 			case "application/x-www-form-urlencoded":
@@ -848,8 +886,9 @@ 
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
 						}
-					} else
-						$postdata .= urlencode($key)."=".urlencode($val)."&";
+					} else {
+											$postdata .= urlencode($key)."=".urlencode($val)."&";
+					}
 				}
 				break;
 
@@ -875,7 +914,9 @@ 
 				while (list($field_name, $file_names) = each($formfiles)) {
 					settype($file_names, "array");
 					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
+						if (!is_readable($file_name)) {
+						    continue;
+						}
 
 						$fp = fopen($file_name, "r");
 						$file_content = fread($fp, filesize($file_name));

Doc Comments +12 added lines

@@ -366,6 +366,9 @@ 
 	Output:		$expandedLinks	the expanded links
 \*======================================================================*/
 
+	/**
+	 * @param string $links
+	 */
 	private function _expandlinks($links,$URI)
 	{
 		
@@ -400,6 +403,9 @@ 
 	Output:		
 \*======================================================================*/
 	
+	/**
+	 * @param string $http_method
+	 */
 	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
 	{
 		if($this->passcookies && $this->_redirectaddr)
@@ -583,6 +589,9 @@ 
 	Output:		
 \*======================================================================*/
 	
+	/**
+	 * @param string $http_method
+	 */
 	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
 	{
 		if($this->passcookies && $this->_redirectaddr)
@@ -766,6 +775,9 @@ 
 	Input:		$fp	file pointer
 \*======================================================================*/
 	
+	/**
+	 * @param boolean $fp
+	 */
 	private function _connect(&$fp)
 	{
 		if(!empty($this->proxy_host) && !empty($this->proxy_port))

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;
 	}

Braces +47 added lines, -71 removed lines

@@ -165,12 +165,10 @@ 
             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;
@@ -181,8 +179,7 @@ 
         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']) ) {
@@ -198,9 +195,7 @@ 
             $el == 'textinput' ) 
         {
             $this->intextinput = true;
-        }
-        
-        elseif (
+        } elseif (
             $this->feed_type == RSS and 
             $this->current_namespace == '' and 
             $el == 'image' ) 
@@ -244,8 +239,7 @@ 
             if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) 
             {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
             
@@ -263,8 +257,7 @@ 
         if ($this->feed_type == ATOM and $this->incontent) 
         {
             $this->append_content( $text );
-        }
-        else {
+        } else {
             $current_el = join('_', array_reverse($this->stack));
             $this->append($current_el, $text);
         }
@@ -278,37 +271,30 @@ 
             $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 ) 
             {
                 $this->append_content("</$el>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift( $this->stack );
-        }
-        else {
+        } else {
             array_shift( $this->stack );
         }
         
@@ -327,8 +313,7 @@ 
     public function append_content($text) {
         if ( $this->initem ) {
             $this->concat( $this->current_item[ $this->incontent ], $text );
-        }
-        elseif ( $this->inchannel ) {
+        } elseif ( $this->inchannel ) {
             $this->concat( $this->channel[ $this->incontent ], $text );
         }
     }
@@ -343,34 +328,27 @@ 
             if ( $this->initem ) {
                 $this->concat(
                     $this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat(
                     $this->channel[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat(
                     $this->textinput[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat(
                     $this->image[ $this->current_namespace ][ $el ], $text );
             }
-        }
-        else {
+        } else {
             if ( $this->initem ) {
                 $this->concat(
                     $this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat(
                     $this->textinput[ $el ], $text );
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat(
                     $this->image[ $el ], $text );
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat(
                     $this->channel[ $el ], $text );
             }
@@ -384,10 +362,12 @@ 
             $this->channel['description'] = $this->channel['tagline'];
             for ( $i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['summary']) )
-                    $item['description'] = $item['summary'];
-                if ( isset($item['atom_content']))
-                    $item['content']['encoded'] = $item['atom_content'];
+                if ( isset($item['summary']) ) {
+                                    $item['description'] = $item['summary'];
+                }
+                if ( isset($item['atom_content'])) {
+                                    $item['content']['encoded'] = $item['atom_content'];
+                }
                 
                 $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
                 if ( $atom_date ) {
@@ -399,23 +379,23 @@ 
                 
                 $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++) {
                 $item = $this->items[$i];
-                if ( isset($item['description']))
-                    $item['summary'] = $item['description'];
-                if ( isset($item['content']['encoded'] ) )
-                    $item['atom_content'] = $item['content']['encoded'];
+                if ( isset($item['description'])) {
+                                    $item['summary'] = $item['description'];
+                }
+                if ( isset($item['content']['encoded'] ) ) {
+                                    $item['atom_content'] = $item['content']['encoded'];
+                }
                 
                 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;
@@ -431,8 +411,7 @@ 
     public function is_rss () {
         if ( $this->feed_type == RSS ) {
             return $this->feed_version; 
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -440,8 +419,7 @@ 
     public function is_atom() {
         if ( $this->feed_type == ATOM ) {
             return $this->feed_version;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -453,8 +431,7 @@ 
     public function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
-        }
-        else {
+        } else {
             list($parser, $source) = $this->php4_create_parser($source, $in_enc, $detect);
         }
         if ($out_enc) {
@@ -478,8 +455,7 @@ 
         // by default php5 does a fine job of detecting input encodings
         if(!$detect && $in_enc) {
             return xml_parser_create($in_enc);
-        }
-        else {
+        } else {
             return xml_parser_create('');
         }
     }
@@ -508,8 +484,7 @@ 
             if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
                 $in_enc = strtoupper($m[1]);
                 $this->source_encoding = $in_enc;
-            }
-            else {
+            } else {
                 $in_enc = 'UTF-8';
             }
         }
@@ -552,8 +527,7 @@ 
         $enc = strtoupper($enc);
         if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
             return $enc;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -565,8 +539,7 @@ 
         }
         if ( MAGPIE_DEBUG ) {
             trigger_error( $errormsg, $lvl);        
-        }
-        else {
+        } else {
             error_log( $errormsg, 0);
         }
         
@@ -594,8 +567,11 @@ 
 
 
 	function array_change_key_case($array,$case=CASE_LOWER) {
-       if ($case=CASE_LOWER) $cmd=strtolower;
-       elseif ($case=CASE_UPPER) $cmd=strtoupper;
+       if ($case=CASE_LOWER) {
+           $cmd=strtolower;
+       } elseif ($case=CASE_UPPER) {
+           $cmd=strtoupper;
+       }
        foreach($array as $key=>$value) {
                $output[$cmd($key)]=$value;
        }

Indentation +41 added lines, -41 removed lines

@@ -100,8 +100,8 @@ 
         #
         if (!function_exists('xml_parser_create')) {
             $this->error( "Failed to load PHP's XML Extension. " . 
-                          "http://www.php.net/manual/en/ref.xml.php",
-                           E_USER_ERROR );
+                            "http://www.php.net/manual/en/ref.xml.php",
+                            E_USER_ERROR );
         }
         
         list($parser, $source) = $this->create_parser($source, 
@@ -110,8 +110,8 @@ 
         
         if (!is_resource($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 );
+                            "http://www.php.net/manual/en/ref.xml.php",
+                            E_USER_ERROR );
         }
 
         
@@ -447,9 +447,9 @@ 
     }
 
     /**
-    * return XML parser, and possibly re-encoded source
-    *
-    */
+     * return XML parser, and possibly re-encoded source
+     *
+     */
     public function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
@@ -466,14 +466,14 @@ 
     }
     
     /**
-    * Instantiate an XML parser under PHP5
-    *
-    * PHP5 will do a fine job of detecting input encoding
-    * if passed an empty string as the encoding. 
-    *
-    * All hail libxml2!
-    *
-    */
+     * Instantiate an XML parser under PHP5
+     *
+     * PHP5 will do a fine job of detecting input encoding
+     * if passed an empty string as the encoding. 
+     *
+     * All hail libxml2!
+     *
+     */
     public function php5_create_parser($in_enc, $detect) {
         // by default php5 does a fine job of detecting input encodings
         if(!$detect && $in_enc) {
@@ -485,20 +485,20 @@ 
     }
     
     /**
-    * Instaniate an XML parser under PHP4
-    *
-    * Unfortunately PHP4's support for character encodings
-    * and especially XML and character encodings sucks.  As
-    * long as the documents you parse only contain characters
-    * from the ISO-8859-1 character set (a superset of ASCII,
-    * and a subset of UTF-8) you're fine.  However once you
-    * step out of that comfy little world things get mad, bad,
-    * and dangerous to know.
-    *
-    * The following code is based on SJM's work with FoF
-    * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
-    *
-    */
+     * Instaniate an XML parser under PHP4
+     *
+     * Unfortunately PHP4's support for character encodings
+     * and especially XML and character encodings sucks.  As
+     * long as the documents you parse only contain characters
+     * from the ISO-8859-1 character set (a superset of ASCII,
+     * and a subset of UTF-8) you're fine.  However once you
+     * step out of that comfy little world things get mad, bad,
+     * and dangerous to know.
+     *
+     * The following code is based on SJM's work with FoF
+     * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
+     *
+     */
     public function php4_create_parser($source, $in_enc, $detect) {
         if ( !$detect ) {
             return array(xml_parser_create($in_enc), $source);
@@ -542,8 +542,8 @@ 
         
         // else 
         $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
-                     "You may see strange artifacts, and mangled characters.",
-                     E_USER_NOTICE);
+                        "You may see strange artifacts, and mangled characters.",
+                        E_USER_NOTICE);
             
         return array(xml_parser_create(), $source);
     }
@@ -589,17 +589,17 @@ 
 // 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;
-       }
-       return $output;
-	}
+    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;
+    }
 
 }

Doc Comments +10 added lines

@@ -449,6 +449,10 @@ 
     /**
     * return XML parser, and possibly re-encoded source
     *
+    * @param string $source
+    * @param string $out_enc
+    * @param string|null $in_enc
+    * @param boolean $detect
     */
     public function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
@@ -558,6 +562,9 @@ 
         }
     }
 
+    /**
+     * @param integer $lvl
+     */
     public function error ($errormsg, $lvl=E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
         if ( isset($php_errormsg) ) { 
@@ -593,6 +600,9 @@ 
 	define("CASE_LOWER",0);
 
 
+	/**
+	 * @param integer $case
+	 */
 	function array_change_key_case($array,$case=CASE_LOWER) {
        if ($case=CASE_LOWER) $cmd=strtolower;
        elseif ($case=CASE_UPPER) $cmd=strtoupper;

main/inc/lib/banner.lib.php

Indentation +20 added lines, -20 removed lines

@@ -42,20 +42,20 @@ 
     $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
     $navigation['myprofile']['title'] = get_lang('ModifyProfile');
     $navigation['myprofile']['key'] = 'profile';
-	// Link to my agenda
+    // Link to my agenda
     $navigation['myagenda']['url'] = api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=personal';
     $navigation['myagenda']['title'] = get_lang('MyAgenda');
     $navigation['myagenda']['key'] = 'agenda';
 
-	// Gradebook
-	if (api_get_setting('gradebook_enable') == 'true') {
+    // Gradebook
+    if (api_get_setting('gradebook_enable') == 'true') {
         $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
         $navigation['mygradebook']['title'] = get_lang('MyGradebook');
         $navigation['mygradebook']['key'] = 'gradebook';
-	}
+    }
 
-	// Reporting
-	if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
+    // Reporting
+    if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
         // Link to my space
         $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':'');
         $navigation['session_my_space']['title'] = get_lang('MySpace');
@@ -79,21 +79,21 @@ 
         $navigation['session_my_progress']['key'] = 'my-progress';
     }
 
-	// Social
-	if (api_get_setting('allow_social_tool')=='true') {
+    // Social
+    if (api_get_setting('allow_social_tool')=='true') {
         $navigation['social']['url'] = api_get_path(WEB_CODE_PATH).'social/home.php';
         $navigation['social']['title'] = get_lang('SocialNetwork');
         $navigation['social']['key'] = 'social-network';
-	}
+    }
 
-	// Dashboard
-	if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
+    // Dashboard
+    if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
         $navigation['dashboard']['url'] = api_get_path(WEB_CODE_PATH).'dashboard/index.php';
         $navigation['dashboard']['title'] = get_lang('Dashboard');
         $navigation['dashboard']['key'] = 'dashboard';
-	}
+    }
 
-	// Reports
+    // Reports
     /*
 	if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
         $navigation['reports']['url'] = api_get_path(WEB_CODE_PATH).'reports/index.php';
@@ -116,14 +116,14 @@ 
     }
     // End Custom Tabs
 
-	// Platform administration
-	if (api_is_platform_admin(true)) {
+    // Platform administration
+    if (api_is_platform_admin(true)) {
         $navigation['platform_admin']['url'] = api_get_path(WEB_CODE_PATH).'admin/';
         $navigation['platform_admin']['title'] = get_lang('PlatformAdmin');
         $navigation['platform_admin']['key'] = 'admin';
-	}
+    }
 
-	return $navigation;
+    return $navigation;
 }
 
 /**
@@ -351,7 +351,7 @@ 
             }
         }
 
-		// Reports
+        // Reports
         if (!empty($possible_tabs['reports'])) {
             if (api_get_setting('show_tabs', 'reports') == 'true') {
                 if ((api_is_platform_admin() || api_is_drh() || api_is_session_admin()) && Rights::hasRight('show_tabs:reports')) {
@@ -492,7 +492,7 @@ 
 
     $menu = null;
     if (!empty($lis)) {
-         $menu .= $lis;
+            $menu .= $lis;
     }
     return $menu;
 }
@@ -548,7 +548,7 @@ 
         $navigation_item_my_courses['title'] = get_lang('MyCourses');
         $navigation_item_my_courses['url'] = api_get_path(WEB_PATH).'user_portal.php';
         $navigation[] = $navigation_item_my_courses;
-        */
+         */
         $navigation[] = $navigation_item;
     }
 

Spacing +38 added lines, -38 removed lines

@@ -39,7 +39,7 @@ 
     $navigation['mycourses']['key'] = 'my-course';
 
     // My Profile
-    $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
+    $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '');
     $navigation['myprofile']['title'] = get_lang('ModifyProfile');
     $navigation['myprofile']['key'] = 'profile';
 	// Link to my agenda
@@ -49,7 +49,7 @@ 
 
 	// Gradebook
 	if (api_get_setting('gradebook_enable') == 'true') {
-        $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
+        $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '');
         $navigation['mygradebook']['title'] = get_lang('MyGradebook');
         $navigation['mygradebook']['key'] = 'gradebook';
 	}
@@ -57,11 +57,11 @@ 
 	// Reporting
 	if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
         // Link to my space
-        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':'');
+        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh() ? 'session.php' : '');
         $navigation['session_my_space']['title'] = get_lang('MySpace');
         $navigation['session_my_space']['key'] = 'my-space';
     } else if (api_is_student_boss()) {
-        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH) . 'mySpace/student.php';
+        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/student.php';
         $navigation['session_my_space']['title'] = get_lang('MySpace');
         $navigation['session_my_space']['key'] = 'my-space';
     } else {
@@ -80,7 +80,7 @@ 
     }
 
 	// Social
-	if (api_get_setting('allow_social_tool')=='true') {
+	if (api_get_setting('allow_social_tool') == 'true') {
         $navigation['social']['url'] = api_get_path(WEB_CODE_PATH).'social/home.php';
         $navigation['social']['title'] = get_lang('SocialNetwork');
         $navigation['social']['key'] = 'social-network';
@@ -161,14 +161,14 @@ 
         'id' => 'header-logo'
     );
     $testServer = api_get_setting('server_type');
-    if ($testServer == 'test' && is_file($logoBase . 'svg')) {
-        $logo = $logoBase . 'svg';
+    if ($testServer == 'test' && is_file($logoBase.'svg')) {
+        $logo = $logoBase.'svg';
         $attributes['width'] = '245';
         $attributes['height'] = '68';
         $imageUrl = api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/header-logo.svg';
     } else {
-        $logo = $logoBase . 'png';
-        $customLogo = $customLogoBase . 'png';
+        $logo = $logoBase.'png';
+        $customLogo = $customLogoBase.'png';
         $imageUrl = api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/header-logo.png';
         $customImageUrl = api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/header-logo-custom.png';
     }
@@ -218,7 +218,7 @@ 
     $_course = api_get_course_info();
     $course_id = 0;
     if (!empty($_course)) {
-        $course_id  = $_course['code'];
+        $course_id = $_course['code'];
     }
 
     $user_id = api_get_user_id();
@@ -315,7 +315,7 @@ 
         if (api_get_setting('gradebook_enable') == 'true') {
             if (api_get_setting('show_tabs', 'my_gradebook') == 'true') {
                 $navigation['mygradebook'] = $possible_tabs['mygradebook'];
-            } else{
+            } else {
                 $menu_navigation['mygradebook'] = $possible_tabs['mygradebook'];
             }
         }
@@ -340,7 +340,7 @@ 
             if (api_get_setting('allow_social_tool') == 'true') {
                 $navigation['social'] = isset($possible_tabs['social']) ? $possible_tabs['social'] : null;
             }
-        } else{
+        } else {
             $menu_navigation['social'] = isset($possible_tabs['social']) ? $possible_tabs['social'] : null;
         }
 
@@ -349,7 +349,7 @@ 
             if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
                 $navigation['dashboard'] = isset($possible_tabs['dashboard']) ? $possible_tabs['dashboard'] : null;
             }
-        } else{
+        } else {
             $menu_navigation['dashboard'] = isset($possible_tabs['dashboard']) ? $possible_tabs['dashboard'] : null;
         }
 
@@ -440,32 +440,32 @@ 
     $home_top = '';
 
     if (is_file($homep.$menutabs.'_'.$lang.$ext) && is_readable($homep.$menutabs.'_'.$lang.$ext)) {
-        $home_top = @(string)file_get_contents($homep.$menutabs.'_'.$lang.$ext);
+        $home_top = @(string) file_get_contents($homep.$menutabs.'_'.$lang.$ext);
     } elseif (is_file($homep.$menutabs.$lang.$ext) && is_readable($homep.$menutabs.$lang.$ext)) {
-        $home_top = @(string)file_get_contents($homep.$menutabs.$lang.$ext);
+        $home_top = @(string) file_get_contents($homep.$menutabs.$lang.$ext);
     } else {
         //$errorMsg = get_lang('HomePageFilesNotReadable');
     }
 
     $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
 
-    $open = str_replace('{rel_path}',api_get_path(REL_PATH), $home_top);
+    $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top);
     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
 
     $open_mtloggedin = '';
     if (api_get_user_id() && !api_is_anonymous()) {
         if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) {
-            $home_top = @(string)file_get_contents($homep.$mtloggedin.'_'.$lang.$ext);
+            $home_top = @(string) file_get_contents($homep.$mtloggedin.'_'.$lang.$ext);
             $home_top = str_replace('::private', '', $home_top);
         } elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) {
-            $home_top = @(string)file_get_contents($homep.$mtloggedin.$lang.$ext);
+            $home_top = @(string) file_get_contents($homep.$mtloggedin.$lang.$ext);
             $home_top = str_replace('::private', '', $home_top);
         } else {
             //$errorMsg = get_lang('HomePageFilesNotReadable');
         }
 
         $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
-        $open_mtloggedin = str_replace('{rel_path}',api_get_path(REL_PATH), $home_top);
+        $open_mtloggedin = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top);
         $open_mtloggedin = api_to_system_encoding($open_mtloggedin, api_detect_encoding(strip_tags($open_mtloggedin)));
     }
 
@@ -474,7 +474,7 @@ 
     if (!empty($open) OR !empty($open_mtloggedin)) {
         if (strpos($open.$open_mtloggedin, 'show_menu') === false) {
             if (api_is_anonymous()) {
-                $navigation[SECTION_CAMPUS]  = null;
+                $navigation[SECTION_CAMPUS] = null;
             }
         } else {
             if (api_get_user_id() && !api_is_anonymous()) {
@@ -488,7 +488,7 @@ 
     if (count($navigation) > 0 || !empty($lis)) {
         $pre_lis = '';
         foreach ($navigation as $section => $navigation_info) {
-            $key = (!empty($navigation_info['key'])?'tab-'.$navigation_info['key']:'');
+            $key = (!empty($navigation_info['key']) ? 'tab-'.$navigation_info['key'] : '');
             if (isset($GLOBALS['this_section'])) {
                 $current = $section == $GLOBALS['this_section'] ? ' id="current" class="active '.$key.'" ' : ' class="'.$key.'"';
             } else {
@@ -532,7 +532,7 @@ 
 
     if (!empty($_course) && !isset($_GET['hide_course_breadcrumb'])) {
 
-        $navigation_item['url'] = $web_course_path . $_course['path'].'/index.php'.(!empty($session_id) ? '?id_session='.$session_id : '');
+        $navigation_item['url'] = $web_course_path.$_course['path'].'/index.php'.(!empty($session_id) ? '?id_session='.$session_id : '');
         $_course['name'] = api_htmlentities($_course['name']);
         $course_title = cut($_course['name'], MAX_LENGTH_BREADCRUMB);
 
@@ -547,7 +547,7 @@ 
                 $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name;
                 break;
             default:
-                if (api_get_session_id() != -1 ) {
+                if (api_get_session_id() != -1) {
                     $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name;
                 } else {
                     $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name']).' '.$course_title;
@@ -581,22 +581,22 @@ 
             // titles for shared folders
             if ($breadcrumb_step['name'] == 'shared_folder') {
                 $navigation_item['title'] = get_lang('UserFolders');
-            } elseif(strstr($breadcrumb_step['name'], 'shared_folder_session_')) {
+            } elseif (strstr($breadcrumb_step['name'], 'shared_folder_session_')) {
                 $navigation_item['title'] = get_lang('UserFolders');
-            } elseif(strstr($breadcrumb_step['name'], 'sf_user_')) {
+            } elseif (strstr($breadcrumb_step['name'], 'sf_user_')) {
                 $userinfo = api_get_user_info(substr($breadcrumb_step['name'], 8));
                 $navigation_item['title'] = $userinfo['complete_name'];
-            } elseif($breadcrumb_step['name'] == 'chat_files') {
+            } elseif ($breadcrumb_step['name'] == 'chat_files') {
                 $navigation_item['title'] = get_lang('ChatFiles');
-            } elseif($breadcrumb_step['name'] == 'images') {
+            } elseif ($breadcrumb_step['name'] == 'images') {
                 $navigation_item['title'] = get_lang('Images');
-            } elseif($breadcrumb_step['name'] == 'video') {
+            } elseif ($breadcrumb_step['name'] == 'video') {
                 $navigation_item['title'] = get_lang('Video');
-            } elseif($breadcrumb_step['name'] == 'audio') {
+            } elseif ($breadcrumb_step['name'] == 'audio') {
                 $navigation_item['title'] = get_lang('Audio');
-            } elseif($breadcrumb_step['name'] == 'flash') {
+            } elseif ($breadcrumb_step['name'] == 'flash') {
                 $navigation_item['title'] = get_lang('Flash');
-            } elseif($breadcrumb_step['name'] == 'gallery') {
+            } elseif ($breadcrumb_step['name'] == 'gallery') {
                 $navigation_item['title'] = get_lang('Gallery');
             }
             // Fixes breadcrumb title now we applied the Security::remove_XSS and
@@ -663,35 +663,35 @@ 
         if (!empty($final_navigation)) {
             // $home_link.= '<span class="divider">/</span>';
             if (!empty($home_link)) {
-                $lis.= Display::tag('li', $home_link);
+                $lis .= Display::tag('li', $home_link);
             }
 
             foreach ($final_navigation as $bread) {
                 $bread_check = trim(strip_tags($bread));
                 if (!empty($bread_check)) {
-                    if ($final_navigation_count-1 > $i) {
+                    if ($final_navigation_count - 1 > $i) {
                         $bread .= '';
                     }
-                    $lis.= Display::tag('li', $bread,array('class'=>'active'));
+                    $lis .= Display::tag('li', $bread, array('class'=>'active'));
                     $i++;
                 }
             }
         } else {
             if (!empty($home_link)) {
-                $lis.= Display::tag('li', $home_link);
+                $lis .= Display::tag('li', $home_link);
             }
         }
 
         // View as student/teacher link
         $view = null;
         if (!empty($view_as_student_link)) {
-            $view .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right'));
+            $view .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link', 'class' => 'pull-right'));
         }
 
         if (!empty($navigation_right)) {
-            foreach($navigation_right as $item){
+            foreach ($navigation_right as $item) {
                 $extra_class = isset($item['class']) ? $item['class'] : null;
-                $lis.= Display::tag('li', $item['title'], array('class' => $extra_class.' pull-right'));
+                $lis .= Display::tag('li', $item['title'], array('class' => $extra_class.' pull-right'));
             }
         }
 

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/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;
     }

main/inc/lib/kses-0.2.2/kses.php

Indentation +6 added lines, -6 removed lines

@@ -97,8 +97,8 @@ 
  * @return string
  */
 function kses($string, $allowed_html, $allowed_protocols =
-               array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
-                     'gopher', 'mailto'))
+                array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
+                        'gopher', 'mailto'))
 {
     $string = kses_no_null($string);
     $string = kses_js_entities($string);
@@ -218,7 +218,7 @@ 
     // No attributes are allowed for closing elements
 
     return kses_attr("$slash$elem", $attrlist, $allowed_html,
-                   $allowed_protocols);
+                    $allowed_protocols);
 }
 
 /**
@@ -261,11 +261,11 @@ 
     foreach ($attrarr as $arreach)
     {
         if (!@isset($allowed_html[strtolower($element)]
-                              [strtolower($arreach['name'])]))
+                                [strtolower($arreach['name'])]))
             continue; // the attribute is not allowed
 
         $current = $allowed_html[strtolower($element)]
-                              [strtolower($arreach['name'])];
+                                [strtolower($arreach['name'])];
         if ($current == '')
             continue; // the attribute is not allowed
 
@@ -279,7 +279,7 @@ 
             $ok = true;
             foreach ($current as $currkey => $currval)
                 if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
-                                 $currkey, $currval))
+                                    $currkey, $currval))
                 { $ok = false; break; }
 
             if ( strtolower($arreach['name']) == 'style' ) {

Spacing +92 added lines, -92 removed lines

@@ -35,47 +35,47 @@ 
  */
 
 $kses_allowedentitynames = array(
-    'nbsp',    'iexcl',  'cent',    'pound',  'curren', 'yen',
-    'brvbar',  'sect',   'uml',     'copy',   'ordf',   'laquo',
-    'not',     'shy',    'reg',     'macr',   'deg',    'plusmn',
-    'acute',   'micro',  'para',    'middot', 'cedil',  'ordm',
-    'raquo',   'iquest', 'Agrave',  'Aacute', 'Acirc',  'Atilde',
-    'Auml',    'Aring',  'AElig',   'Ccedil', 'Egrave', 'Eacute',
-    'Ecirc',   'Euml',   'Igrave',  'Iacute', 'Icirc',  'Iuml',
-    'ETH',     'Ntilde', 'Ograve',  'Oacute', 'Ocirc',  'Otilde',
-    'Ouml',    'times',  'Oslash',  'Ugrave', 'Uacute', 'Ucirc',
-    'Uuml',    'Yacute', 'THORN',   'szlig',  'agrave', 'aacute',
-    'acirc',   'atilde', 'auml',    'aring',  'aelig',  'ccedil',
-    'egrave',  'eacute', 'ecirc',   'euml',   'igrave', 'iacute',
-    'icirc',   'iuml',   'eth',     'ntilde', 'ograve', 'oacute',
-    'ocirc',   'otilde', 'ouml',    'divide', 'oslash', 'ugrave',
-    'uacute',  'ucirc',  'uuml',    'yacute', 'thorn',  'yuml',
-    'quot',    'amp',    'lt',      'gt',     'apos',   'OElig',
-    'oelig',   'Scaron', 'scaron',  'Yuml',   'circ',   'tilde',
-    'ensp',    'emsp',   'thinsp',  'zwnj',   'zwj',    'lrm',
-    'rlm',     'ndash',  'mdash',   'lsquo',  'rsquo',  'sbquo',
-    'ldquo',   'rdquo',  'bdquo',   'dagger', 'Dagger', 'permil',
-    'lsaquo',  'rsaquo', 'euro',    'fnof',   'Alpha',  'Beta',
-    'Gamma',   'Delta',  'Epsilon', 'Zeta',   'Eta',    'Theta',
-    'Iota',    'Kappa',  'Lambda',  'Mu',     'Nu',     'Xi',
-    'Omicron', 'Pi',     'Rho',     'Sigma',  'Tau',    'Upsilon',
-    'Phi',     'Chi',    'Psi',     'Omega',  'alpha',  'beta',
-    'gamma',   'delta',  'epsilon', 'zeta',   'eta',    'theta',
-    'iota',    'kappa',  'lambda',  'mu',     'nu',     'xi',
-    'omicron', 'pi',     'rho',     'sigmaf', 'sigma',  'tau',
-    'upsilon', 'phi',    'chi',     'psi',    'omega',  'thetasym',
-    'upsih',   'piv',    'bull',    'hellip', 'prime',  'Prime',
-    'oline',   'frasl',  'weierp',  'image',  'real',   'trade',
-    'alefsym', 'larr',   'uarr',    'rarr',   'darr',   'harr',
-    'crarr',   'lArr',   'uArr',    'rArr',   'dArr',   'hArr',
-    'forall',  'part',   'exist',   'empty',  'nabla',  'isin',
-    'notin',   'ni',     'prod',    'sum',    'minus',  'lowast',
-    'radic',   'prop',   'infin',   'ang',    'and',    'or',
-    'cap',     'cup',    'int',     'sim',    'cong',   'asymp',
-    'ne',      'equiv',  'le',      'ge',     'sub',    'sup',
-    'nsub',    'sube',   'supe',    'oplus',  'otimes', 'perp',
-    'sdot',    'lceil',  'rceil',   'lfloor', 'rfloor', 'lang',
-    'rang',    'loz',    'spades',  'clubs',  'hearts', 'diams',
+    'nbsp', 'iexcl', 'cent', 'pound', 'curren', 'yen',
+    'brvbar', 'sect', 'uml', 'copy', 'ordf', 'laquo',
+    'not', 'shy', 'reg', 'macr', 'deg', 'plusmn',
+    'acute', 'micro', 'para', 'middot', 'cedil', 'ordm',
+    'raquo', 'iquest', 'Agrave', 'Aacute', 'Acirc', 'Atilde',
+    'Auml', 'Aring', 'AElig', 'Ccedil', 'Egrave', 'Eacute',
+    'Ecirc', 'Euml', 'Igrave', 'Iacute', 'Icirc', 'Iuml',
+    'ETH', 'Ntilde', 'Ograve', 'Oacute', 'Ocirc', 'Otilde',
+    'Ouml', 'times', 'Oslash', 'Ugrave', 'Uacute', 'Ucirc',
+    'Uuml', 'Yacute', 'THORN', 'szlig', 'agrave', 'aacute',
+    'acirc', 'atilde', 'auml', 'aring', 'aelig', 'ccedil',
+    'egrave', 'eacute', 'ecirc', 'euml', 'igrave', 'iacute',
+    'icirc', 'iuml', 'eth', 'ntilde', 'ograve', 'oacute',
+    'ocirc', 'otilde', 'ouml', 'divide', 'oslash', 'ugrave',
+    'uacute', 'ucirc', 'uuml', 'yacute', 'thorn', 'yuml',
+    'quot', 'amp', 'lt', 'gt', 'apos', 'OElig',
+    'oelig', 'Scaron', 'scaron', 'Yuml', 'circ', 'tilde',
+    'ensp', 'emsp', 'thinsp', 'zwnj', 'zwj', 'lrm',
+    'rlm', 'ndash', 'mdash', 'lsquo', 'rsquo', 'sbquo',
+    'ldquo', 'rdquo', 'bdquo', 'dagger', 'Dagger', 'permil',
+    'lsaquo', 'rsaquo', 'euro', 'fnof', 'Alpha', 'Beta',
+    'Gamma', 'Delta', 'Epsilon', 'Zeta', 'Eta', 'Theta',
+    'Iota', 'Kappa', 'Lambda', 'Mu', 'Nu', 'Xi',
+    'Omicron', 'Pi', 'Rho', 'Sigma', 'Tau', 'Upsilon',
+    'Phi', 'Chi', 'Psi', 'Omega', 'alpha', 'beta',
+    'gamma', 'delta', 'epsilon', 'zeta', 'eta', 'theta',
+    'iota', 'kappa', 'lambda', 'mu', 'nu', 'xi',
+    'omicron', 'pi', 'rho', 'sigmaf', 'sigma', 'tau',
+    'upsilon', 'phi', 'chi', 'psi', 'omega', 'thetasym',
+    'upsih', 'piv', 'bull', 'hellip', 'prime', 'Prime',
+    'oline', 'frasl', 'weierp', 'image', 'real', 'trade',
+    'alefsym', 'larr', 'uarr', 'rarr', 'darr', 'harr',
+    'crarr', 'lArr', 'uArr', 'rArr', 'dArr', 'hArr',
+    'forall', 'part', 'exist', 'empty', 'nabla', 'isin',
+    'notin', 'ni', 'prod', 'sum', 'minus', 'lowast',
+    'radic', 'prop', 'infin', 'ang', 'and', 'or',
+    'cap', 'cup', 'int', 'sim', 'cong', 'asymp',
+    'ne', 'equiv', 'le', 'ge', 'sub', 'sup',
+    'nsub', 'sube', 'supe', 'oplus', 'otimes', 'perp',
+    'sdot', 'lceil', 'rceil', 'lfloor', 'rfloor', 'lang',
+    'rang', 'loz', 'spades', 'clubs', 'hearts', 'diams',
 );
 
 /**
@@ -145,7 +145,7 @@ 
     global $pass_allowed_html, $pass_allowed_protocols;
     $pass_allowed_html = $allowed_html;
     $pass_allowed_protocols = $allowed_protocols;
-    return preg_replace_callback( '%((<!--.*?(-->|$))|(<[^>]*(>|$)|>))%', '_kses_split_callback', $string );
+    return preg_replace_callback('%((<!--.*?(-->|$))|(<[^>]*(>|$)|>))%', '_kses_split_callback', $string);
 }
 
 /**
@@ -153,10 +153,10 @@ 
  *
  * @access private
  */
-function _kses_split_callback( $match )
+function _kses_split_callback($match)
 {
     global $pass_allowed_html, $pass_allowed_protocols;
-    return kses_split2( $match[1], $pass_allowed_html, $pass_allowed_protocols );
+    return kses_split2($match[1], $pass_allowed_html, $pass_allowed_protocols);
 }
 
 /**
@@ -189,9 +189,9 @@ 
 
     if (preg_match('%^<!--(.*?)(-->)?$%', $string, $matches)) {
         $string = str_replace(array('<!--', '-->'), '', $matches[1]);
-        while ( $string != $newstring = kses($string, $allowed_html, $allowed_protocols) )
+        while ($string != $newstring = kses($string, $allowed_html, $allowed_protocols))
             $string = $newstring;
-        if ( $string == '' )
+        if ($string == '')
             return '';
         // prevent multiple dashes in comments
         $string = preg_replace('/--+/', '-', $string);
@@ -282,12 +282,12 @@ 
                                  $currkey, $currval))
                 { $ok = false; break; }
 
-            if ( strtolower($arreach['name']) == 'style' ) {
+            if (strtolower($arreach['name']) == 'style') {
                 $orig_value = $arreach['value'];
 
                 $value = kses_safecss_filter_attr($orig_value);
 
-                if ( empty($value) )
+                if (empty($value))
                     continue;
 
                 $arreach['value'] = $value;
@@ -361,8 +361,8 @@ 
                 if (preg_match('/^\s+/', $attr)) // valueless
                 {
                     $working = 1; $mode = 0;
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
-                        $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
                     }
                     $attr = preg_replace('/^\s+/', '', $attr);
                 }
@@ -379,12 +379,12 @@ 
                         $thisval = $match[1];
                     } else {
                         $thisval = $match[1];
-                        if ( in_array(strtolower($attrname), $uris) )
+                        if (in_array(strtolower($attrname), $uris))
                             $thisval = kses_bad_protocol($thisval, $allowed_protocols);
                     }
 
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
-                        $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
                     }
                     $working = 1; $mode = 0;
                     $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
@@ -395,11 +395,11 @@ 
                     // 'value'
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
+                    if (in_array(strtolower($attrname), $uris))
                         $thisval = kses_bad_protocol($thisval, $allowed_protocols);
 
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
-                        $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
                     }
                     $working = 1; $mode = 0;
                     $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
@@ -410,11 +410,11 @@ 
                     // value
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
+                    if (in_array(strtolower($attrname), $uris))
                         $thisval = kses_bad_protocol($thisval, $allowed_protocols);
 
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
-                        $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
                     }
                     // We add quotes to conform to W3C's HTML spec.
                     $working = 1; $mode = 0;
@@ -434,7 +434,7 @@ 
     if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
         // special case, for when the attribute list ends with a valueless
         // attribute like "selected"
-        $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+        $attrarr[$attrname] = array('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
 
     return $attrarr;
 }
@@ -579,12 +579,12 @@ 
 {
     $outarray = array();
 
-    foreach ( (array) $inarray as $inkey => $inval)
+    foreach ((array) $inarray as $inkey => $inval)
     {
         $outkey = strtolower($inkey);
         $outarray[$outkey] = array();
 
-        foreach ( (array) $inval as $inkey2 => $inval2)
+        foreach ((array) $inval as $inkey2 => $inval2)
         {
             $outkey2 = strtolower($inkey2);
             $outarray[$outkey][$outkey2] = $inval2;
@@ -632,9 +632,9 @@ 
 function kses_bad_protocol_once($string, $allowed_protocols)
 {
     $string2 = preg_split('/:|&#0*58;|&#x0*3a;/i', $string, 2);
-    if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+    if (isset($string2[1]) && !preg_match('%/\?%', $string2[0]))
     {
-        $string = kses_bad_protocol_once2($string2[0],$allowed_protocols).trim($string2[1]);
+        $string = kses_bad_protocol_once2($string2[0], $allowed_protocols).trim($string2[1]);
     }
     return $string;
 }
@@ -660,7 +660,7 @@ 
     $string2 = strtolower($string2);
 
     $allowed = false;
-    foreach ( (array) $allowed_protocols as $one_protocol)
+    foreach ((array) $allowed_protocols as $one_protocol)
         if (strtolower($one_protocol) == $string2)
         {
             $allowed = true;
@@ -711,11 +711,11 @@ 
 function kses_named_entities($matches) {
     global $kses_allowedentitynames;
 
-    if ( empty($matches[1]) )
+    if (empty($matches[1]))
         return '';
 
     $i = $matches[1];
-    return ( ( ! in_array($i, $kses_allowedentitynames) ) ? "&amp;$i;" : "&$i;" );
+    return ((!in_array($i, $kses_allowedentitynames)) ? "&amp;$i;" : "&$i;");
 }
 
 /**
@@ -730,12 +730,12 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities2($matches) {
-    if ( empty($matches[1]) )
+    if (empty($matches[1]))
         return '';
 
     $i = $matches[1];
     if (kses_valid_unicode($i)) {
-        $i = str_pad(ltrim($i,'0'), 3, '0', STR_PAD_LEFT);
+        $i = str_pad(ltrim($i, '0'), 3, '0', STR_PAD_LEFT);
         $i = "&#$i;";
     } else {
         $i = "&amp;#$i;";
@@ -756,11 +756,11 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities3($matches) {
-    if ( empty($matches[1]) )
+    if (empty($matches[1]))
         return '';
 
     $hexchars = $matches[1];
-    return ( ( ! kses_valid_unicode(hexdec($hexchars)) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';' );
+    return ((!kses_valid_unicode(hexdec($hexchars))) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars, '0').';');
 }
 
 /**
@@ -770,10 +770,10 @@ 
  * @return bool true if the value was a valid Unicode number
  */
 function kses_valid_unicode($i) {
-    return ( $i == 0x9 || $i == 0xa || $i == 0xd ||
+    return ($i == 0x9 || $i == 0xa || $i == 0xd ||
             ($i >= 0x20 && $i <= 0xd7ff) ||
             ($i >= 0xe000 && $i <= 0xfffd) ||
-            ($i >= 0x10000 && $i <= 0x10ffff) );
+            ($i >= 0x10000 && $i <= 0x10ffff));
 }
 
 /**
@@ -800,8 +800,8 @@ 
  * @param array $match preg match
  * @return string
  */
-function _kses_decode_entities_chr( $match ) {
-    return chr( $match[1] );
+function _kses_decode_entities_chr($match) {
+    return chr($match[1]);
 }
 
 /**
@@ -810,24 +810,24 @@ 
  * @param array $match preg match
  * @return string
  */
-function _kses_decode_entities_chr_hexdec( $match ) {
-    return chr( hexdec( $match[1] ) );
+function _kses_decode_entities_chr_hexdec($match) {
+    return chr(hexdec($match[1]));
 }
 
 /**
  * Inline CSS filter
  *
  */
-function kses_safecss_filter_attr( $css ) {
+function kses_safecss_filter_attr($css) {
 
     $css = kses_no_null($css);
-    $css = str_replace(array("\n","\r","\t"), '', $css);
+    $css = str_replace(array("\n", "\r", "\t"), '', $css);
 
-    if ( preg_match( '%[\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments
+    if (preg_match('%[\\(&=}]|/\*%', $css)) // remove any inline css containing \ ( & } = or comments
         return '';
 
-    $css_array = explode( ';', trim( $css ) );
-    $allowed_attr = array( 'text-align', 'margin', 'color', 'float',
+    $css_array = explode(';', trim($css));
+    $allowed_attr = array('text-align', 'margin', 'color', 'float',
         'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color',
         'border-bottom-style', 'border-bottom-width', 'border-collapse', 'border-color', 'border-left',
         'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color',
@@ -837,26 +837,26 @@ 
         'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom',
         'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom',
         'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
-        'width' );
+        'width');
 
-    if ( empty($allowed_attr) )
+    if (empty($allowed_attr))
         return $css;
 
     $css = '';
-    foreach ( $css_array as $css_item ) {
-        if ( $css_item == '' )
+    foreach ($css_array as $css_item) {
+        if ($css_item == '')
             continue;
-        $css_item = trim( $css_item );
+        $css_item = trim($css_item);
         $found = false;
-        if ( strpos( $css_item, ':' ) === false ) {
+        if (strpos($css_item, ':') === false) {
             $found = true;
         } else {
-            $parts = split( ':', $css_item );
-            if ( in_array( strtolower( trim( $parts[0] ) ), $allowed_attr ) )
+            $parts = split(':', $css_item);
+            if (in_array(strtolower(trim($parts[0])), $allowed_attr))
                 $found = true;
         }
-        if ( $found ) {
-            if( $css != '' )
+        if ($found) {
+            if ($css != '')
                 $css .= ';';
             $css .= $css_item;
         }

Braces +135 added lines, -84 removed lines

@@ -183,16 +183,19 @@ 
 {
     $string = kses_stripslashes($string);
 
-    if (substr($string, 0, 1) != '<')
-        return '&gt;';
+    if (substr($string, 0, 1) != '<') {
+            return '&gt;';
+    }
     // It matched a ">" character
 
     if (preg_match('%^<!--(.*?)(-->)?$%', $string, $matches)) {
         $string = str_replace(array('<!--', '-->'), '', $matches[1]);
-        while ( $string != $newstring = kses($string, $allowed_html, $allowed_protocols) )
-            $string = $newstring;
-        if ( $string == '' )
-            return '';
+        while ( $string != $newstring = kses($string, $allowed_html, $allowed_protocols) ) {
+                    $string = $newstring;
+        }
+        if ( $string == '' ) {
+                    return '';
+        }
         // prevent multiple dashes in comments
         $string = preg_replace('/--+/', '-', $string);
         // prevent three dashes closing a comment
@@ -201,20 +204,23 @@ 
     }
     // Allow HTML comments
 
-    if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
-        return '';
+    if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) {
+            return '';
+    }
     // It's seriously malformed
 
     $slash = trim($matches[1]);
     $elem = $matches[2];
     $attrlist = $matches[3];
 
-    if (!@isset($allowed_html[strtolower($elem)]))
-        return '';
+    if (!@isset($allowed_html[strtolower($elem)])) {
+            return '';
+    }
     // They are using a not allowed HTML element
 
-    if ($slash != '')
-        return "<$slash$elem>";
+    if ($slash != '') {
+            return "<$slash$elem>";
+    }
     // No attributes are allowed for closing elements
 
     return kses_attr("$slash$elem", $attrlist, $allowed_html,
@@ -241,13 +247,15 @@ 
     // Is there a closing XHTML slash at the end of the attributes?
 
     $xhtml_slash = '';
-    if (preg_match('%\s*/\s*$%', $attr))
-        $xhtml_slash = ' /';
+    if (preg_match('%\s*/\s*$%', $attr)) {
+            $xhtml_slash = ' /';
+    }
 
     // Are any attributes allowed at all for this element?
 
-    if (@count($allowed_html[strtolower($element)]) == 0)
-        return "<$element$xhtml_slash>";
+    if (@count($allowed_html[strtolower($element)]) == 0) {
+            return "<$element$xhtml_slash>";
+    }
 
     // Split it
 
@@ -261,42 +269,52 @@ 
     foreach ($attrarr as $arreach)
     {
         if (!@isset($allowed_html[strtolower($element)]
-                              [strtolower($arreach['name'])]))
-            continue; // the attribute is not allowed
+                              [strtolower($arreach['name'])])) {
+                    continue;
+        }
+        // the attribute is not allowed
 
         $current = $allowed_html[strtolower($element)]
                               [strtolower($arreach['name'])];
-        if ($current == '')
-            continue; // the attribute is not allowed
+        if ($current == '') {
+                    continue;
+        }
+        // the attribute is not allowed
 
-        if (!is_array($current))
-            $attr2 .= ' '.$arreach['whole'];
+        if (!is_array($current)) {
+                    $attr2 .= ' '.$arreach['whole'];
+        }
         // there are no checks
 
         else
         {
             // there are some checks
             $ok = true;
-            foreach ($current as $currkey => $currval)
-                if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
+            foreach ($current as $currkey => $currval) {
+                            if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
                                  $currkey, $currval))
-                { $ok = false; break; }
+                { $ok = false;
+            }
+            break; }
 
             if ( strtolower($arreach['name']) == 'style' ) {
                 $orig_value = $arreach['value'];
 
                 $value = kses_safecss_filter_attr($orig_value);
 
-                if ( empty($value) )
-                    continue;
+                if ( empty($value) ) {
+                                    continue;
+                }
 
                 $arreach['value'] = $value;
 
                 $arreach['whole'] = str_replace($orig_value, $value, $arreach['whole']);
             }
 
-            if ($ok)
-                $attr2 .= ' '.$arreach['whole']; // it passed them
+            if ($ok) {
+                            $attr2 .= ' '.$arreach['whole'];
+            }
+            // it passed them
         } // if !is_array($current)
     } // foreach
 
@@ -351,16 +369,22 @@ 
 
             case 1: // equals sign or valueless ("selected")
 
-                if (preg_match('/^\s*=\s*/', $attr)) // equals sign
+                if (preg_match('/^\s*=\s*/', $attr)) {
+                    // equals sign
                 {
-                    $working = 1; $mode = 2;
+                    $working = 1;
+                }
+                $mode = 2;
                     $attr = preg_replace('/^\s*=\s*/', '', $attr);
                     break;
                 }
 
-                if (preg_match('/^\s+/', $attr)) // valueless
+                if (preg_match('/^\s+/', $attr)) {
+                    // valueless
                 {
-                    $working = 1; $mode = 0;
+                    $working = 1;
+                }
+                $mode = 0;
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
                     }
@@ -371,16 +395,18 @@ 
 
             case 2: // attribute value, a URL after href= for instance
 
-                if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match))
-                    // "value"
+                if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match)) {
+                                    // "value"
                 {
                     // MDL-2684 - kses stripping CSS styles that it thinks look like protocols
                     if ($attrname == 'style') {
                         $thisval = $match[1];
+                }
                     } else {
                         $thisval = $match[1];
-                        if ( in_array(strtolower($attrname), $uris) )
-                            $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                        if ( in_array(strtolower($attrname), $uris) ) {
+                                                    $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                        }
                     }
 
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
@@ -391,12 +417,14 @@ 
                     break;
                 }
 
-                if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match))
-                    // 'value'
+                if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match)) {
+                                    // 'value'
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
-                        $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                }
+                    if ( in_array(strtolower($attrname), $uris) ) {
+                                            $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                    }
 
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
@@ -406,12 +434,14 @@ 
                     break;
                 }
 
-                if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match))
-                    // value
+                if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match)) {
+                                    // value
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
-                        $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                }
+                    if ( in_array(strtolower($attrname), $uris) ) {
+                                            $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                    }
 
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
@@ -424,17 +454,20 @@ 
                 break;
         } // switch
 
-        if ($working == 0) // not well formed, remove and try again
+        if ($working == 0) {
+            // not well formed, remove and try again
         {
             $attr = kses_html_error($attr);
+        }
             $mode = 0;
         }
     } // while
 
-    if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
-        // special case, for when the attribute list ends with a valueless
+    if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr)) {
+            // special case, for when the attribute list ends with a valueless
         // attribute like "selected"
         $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+    }
 
     return $attrarr;
 }
@@ -462,16 +495,18 @@ 
             // greater than the given value. This can be used to avoid Buffer Overflows
             // in WWW clients and various Internet servers.
 
-            if (strlen($value) > $checkvalue)
-                $ok = false;
+            if (strlen($value) > $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'minlen':
             // The minlen check makes sure that the attribute value has a length not
             // smaller than the given value.
 
-            if (strlen($value) < $checkvalue)
-                $ok = false;
+            if (strlen($value) < $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'maxval':
@@ -481,20 +516,24 @@ 
             // value is not greater than the given value.
             // This check can be used to avoid Denial of Service attacks.
 
-            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-                $ok = false;
-            if ($value > $checkvalue)
-                $ok = false;
+            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+                            $ok = false;
+            }
+            if ($value > $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'minval':
             // The minval check checks that the attribute value is a positive integer,
             // and that it is not smaller than the given value.
 
-            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-                $ok = false;
-            if ($value < $checkvalue)
-                $ok = false;
+            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+                            $ok = false;
+            }
+            if ($value < $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'valueless':
@@ -503,8 +542,9 @@ 
             // is a "y" or a "Y", the attribute must not have a value.
             // If the given value is an "n" or an "N", the attribute must have one.
 
-            if (strtolower($checkvalue) != $vless)
-                $ok = false;
+            if (strtolower($checkvalue) != $vless) {
+                            $ok = false;
+            }
             break;
     } // switch
 
@@ -660,18 +700,20 @@ 
     $string2 = strtolower($string2);
 
     $allowed = false;
-    foreach ( (array) $allowed_protocols as $one_protocol)
-        if (strtolower($one_protocol) == $string2)
+    foreach ( (array) $allowed_protocols as $one_protocol) {
+            if (strtolower($one_protocol) == $string2)
         {
             $allowed = true;
+    }
             break;
         }
 
-    if ($allowed)
-        return "$string2:";
-    else
-        return '';
-}
+    if ($allowed) {
+            return "$string2:";
+    } else {
+            return '';
+    }
+    }
 
 /**
  * Converts and fixes HTML entities.
@@ -711,8 +753,9 @@ 
 function kses_named_entities($matches) {
     global $kses_allowedentitynames;
 
-    if ( empty($matches[1]) )
-        return '';
+    if ( empty($matches[1]) ) {
+            return '';
+    }
 
     $i = $matches[1];
     return ( ( ! in_array($i, $kses_allowedentitynames) ) ? "&amp;$i;" : "&$i;" );
@@ -730,8 +773,9 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities2($matches) {
-    if ( empty($matches[1]) )
-        return '';
+    if ( empty($matches[1]) ) {
+            return '';
+    }
 
     $i = $matches[1];
     if (kses_valid_unicode($i)) {
@@ -756,8 +800,9 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities3($matches) {
-    if ( empty($matches[1]) )
-        return '';
+    if ( empty($matches[1]) ) {
+            return '';
+    }
 
     $hexchars = $matches[1];
     return ( ( ! kses_valid_unicode(hexdec($hexchars)) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';' );
@@ -823,8 +868,10 @@ 
     $css = kses_no_null($css);
     $css = str_replace(array("\n","\r","\t"), '', $css);
 
-    if ( preg_match( '%[\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments
+    if ( preg_match( '%[\\(&=}]|/\*%', $css ) ) {
+        // remove any inline css containing \ ( & } = or comments
         return '';
+    }
 
     $css_array = explode( ';', trim( $css ) );
     $allowed_attr = array( 'text-align', 'margin', 'color', 'float',
@@ -839,25 +886,29 @@ 
         'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
         'width' );
 
-    if ( empty($allowed_attr) )
-        return $css;
+    if ( empty($allowed_attr) ) {
+            return $css;
+    }
 
     $css = '';
     foreach ( $css_array as $css_item ) {
-        if ( $css_item == '' )
-            continue;
+        if ( $css_item == '' ) {
+                    continue;
+        }
         $css_item = trim( $css_item );
         $found = false;
         if ( strpos( $css_item, ':' ) === false ) {
             $found = true;
         } else {
             $parts = split( ':', $css_item );
-            if ( in_array( strtolower( trim( $parts[0] ) ), $allowed_attr ) )
-                $found = true;
+            if ( in_array( strtolower( trim( $parts[0] ) ), $allowed_attr ) ) {
+                            $found = true;
+            }
         }
         if ( $found ) {
-            if( $css != '' )
-                $css .= ';';
+            if( $css != '' ) {
+                            $css .= ';';
+            }
             $css .= $css_item;
         }
     }

main/inc/lib/fileDisplay.lib.php

Spacing +2 added lines, -2 removed lines

@@ -211,7 +211,7 @@ 
     $last_modified = 0;
     $return = 0;
     if (is_dir($dir)) {
-        while(($entry = $dir->read()) !== false)
+        while (($entry = $dir->read()) !== false)
         {
             if ($entry != '.' && $entry != '..')
                 continue;
@@ -284,7 +284,7 @@ 
         'props.session_id'
     );
 
-    $visibility_rule = ' props.visibility ' . ($can_see_invisible ? '<> 2' : '= 1');
+    $visibility_rule = ' props.visibility '.($can_see_invisible ? '<> 2' : '= 1');
 
     $sql = "SELECT SUM(table1.size) FROM (
                 SELECT size

Braces +11 added lines, -8 removed lines

@@ -213,16 +213,19 @@
     if (is_dir($dir)) {
         while(($entry = $dir->read()) !== false)
         {
-            if ($entry != '.' && $entry != '..')
-                continue;
+            if ($entry != '.' && $entry != '..') {
+                            continue;
+            }
 
-            if (!is_dir($dir_name.'/'.$entry))
-                $current_modified = filemtime($dir_name.'/'.$entry);
-            elseif ($do_recursive)
-                $current_modified = recent_modified_file_time($dir_name.'/'.$entry, true);
+            if (!is_dir($dir_name.'/'.$entry)) {
+                            $current_modified = filemtime($dir_name.'/'.$entry);
+            } elseif ($do_recursive) {
+                            $current_modified = recent_modified_file_time($dir_name.'/'.$entry, true);
+            }
 
-            if ($current_modified > $last_modified)
-                $last_modified = $current_modified;
+            if ($current_modified > $last_modified) {
+                            $last_modified = $current_modified;
+            }
         }
 
         $dir->close();