evolution-cms / evolution

Completed

Pull Request — develop (#747)

by

unknown

created 2018-06-29 09:39 UTC

Status

Category

Toggle Patches

manager/includes/extenders/modifiers/mdf_wordwrap.inc.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

		@@ -1,2 +1,2 @@
		block discarded – undo
1	1	<?php
2		-return preg_replace_callback("~(\b\w+\b)~",function($m) use($wrapat) {return wordwrap($m[1],$wrapat,' ',1);},$value);
	2	+return preg_replace_callback("~(\b\w+\b)~", function($m) use($wrapat) {return wordwrap($m[1], $wrapat, ' ', 1); },$value);

Please login to merge, or discard this patch.

manager/includes/extenders/modifiers/mdf_addbreak.inc.php 2 patches

Braces +8 added lines, -7 removed lines patch added patch discarded remove patch

@@ -9,14 +9,15 @@
 block discarded – undo
 $blockElms = explode(',', $blockElms);
 $lines = explode("\n",$text);
 $c = count($lines);
-foreach($lines as $i=>$line)
-{
+foreach($lines as $i=>$line) {
     $line = rtrim($line);
-    if($i===$c-1) break;
-    foreach($blockElms as $block)
-    {
-        if(preg_match("@</?{$block}" . '[^>]*>$@',$line))
-            continue 2;
+    if($i===$c-1) {
+        break;
+    }
+    foreach($blockElms as $block) {
+        if(preg_match("@</?{$block}" . '[^>]*>$@',$line)) {
+                    continue 2;
+        }
     }
     $lines[$i] = "{$line}<br />";
 }

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,21 +1,21 @@
 block discarded – undo
 <?php
 $text = $modx->getModifiers()->parseDocumentSource($value);
-$text = str_replace(array("\r\n","\r"),"\n",$text);
+$text = str_replace(array("\r\n", "\r"), "\n", $text);
 
 $blockElms  = 'br,table,tbody,tr,td,th,thead,tfoot,caption,colgroup,div';
 $blockElms .= ',dl,dd,dt,ul,ol,li,pre,select,option,form,map,area,blockquote';
 $blockElms .= ',address,math,style,input,p,h1,h2,h3,h4,h5,h6,hr,object,param,embed';
 $blockElms .= ',noframes,noscript,section,article,aside,hgroup,footer,address,code';
 $blockElms = explode(',', $blockElms);
-$lines = explode("\n",$text);
+$lines = explode("\n", $text);
 $c = count($lines);
-foreach($lines as $i=>$line)
+foreach ($lines as $i=>$line)
 {
     $line = rtrim($line);
-    if($i===$c-1) break;
-    foreach($blockElms as $block)
+    if ($i === $c - 1) break;
+    foreach ($blockElms as $block)
     {
-        if(preg_match("@</?{$block}" . '[^>]*>$@',$line))
+        if (preg_match("@</?{$block}".'[^>]*>$@', $line))
             continue 2;
     }
     $lines[$i] = "{$line}<br />";

Please login to merge, or discard this patch.

manager/includes/extenders/message.quit.inc.php 2 patches

Indentation +34 added lines, -34 removed lines patch added patch discarded remove patch

@@ -19,60 +19,60 @@
 block discarded – undo
 </head><body>
 ";
 if($is_error) {
-	$parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
+    $parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>MODX encountered the following error while attempting to parse the requested resource:</td></tr>
 	<tr><td colspan='3'><b style='color:red;'>&laquo; $msg &raquo;</b></td></tr>";
 } else {
-	$parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'>&nbsp;MODX Debug/ stop message </h3>
+    $parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'>&nbsp;MODX Debug/ stop message </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>The MODX parser recieved the following debug/ stop message:</td></tr>
 	<tr><td colspan='3'><b style='color:#003399;'>&laquo; $msg &raquo;</b></td></tr>";
 }
 
 if(!empty($query)) {
-	$parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
+    $parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:copyToClip();' style='color:#821517;font-size: 9px; text-decoration: none'>[Copy SQL to ClipBoard]</a><textarea id='holdtext' style='display:none;'></textarea></td></tr>";
 }
 
 if($text!='') {
 
-	$errortype = array (
-		E_ERROR          => "Error",
-		E_WARNING        => "Warning",
-		E_PARSE          => "Parsing Error",
-		E_NOTICE          => "Notice",
-		E_CORE_ERROR      => "Core Error",
-		E_CORE_WARNING    => "Core Warning",
-		E_COMPILE_ERROR  => "Compile Error",
-		E_COMPILE_WARNING => "Compile Warning",
-		E_USER_ERROR      => "User Error",
-		E_USER_WARNING    => "User Warning",
-		E_USER_NOTICE    => "User Notice",
-	);
+    $errortype = array (
+        E_ERROR          => "Error",
+        E_WARNING        => "Warning",
+        E_PARSE          => "Parsing Error",
+        E_NOTICE          => "Notice",
+        E_CORE_ERROR      => "Core Error",
+        E_CORE_WARNING    => "Core Warning",
+        E_COMPILE_ERROR  => "Compile Error",
+        E_COMPILE_WARNING => "Compile Warning",
+        E_USER_ERROR      => "User Error",
+        E_USER_WARNING    => "User Warning",
+        E_USER_NOTICE    => "User Notice",
+    );
 
-	$parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>";
+    $parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>";
 
-	$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error: </td>";
-	$parsedMessageString .= "<td colspan='2'>$text</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
+    $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error: </td>";
+    $parsedMessageString .= "<td colspan='2'>$text</td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
 
-	$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error type/ Nr.: </td>";
-	$parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
+    $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error type/ Nr.: </td>";
+    $parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
 
-	$parsedMessageString .= "<tr><td>&nbsp;&nbsp;File: </td>";
-	$parsedMessageString .= "<td colspan='2'>$file</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
+    $parsedMessageString .= "<tr><td>&nbsp;&nbsp;File: </td>";
+    $parsedMessageString .= "<td colspan='2'>$file</td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
 
-	$parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
-	$parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
-	$parsedMessageString .= "</tr>";
-	if($source!='') {
-		$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
-		$parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
-		$parsedMessageString .= "</tr>";
-	}
+    $parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
+    $parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
+    $parsedMessageString .= "</tr>";
+    if($source!='') {
+        $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
+        $parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
+        $parsedMessageString .= "</tr>";
+    }
 }
 
 $parsedMessageString .= "<tr><td>&nbsp;</td></tr><tr><td colspan='3'><b>Parser timing</b></td></tr>";

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
  * Message Quit Template
  *
  */
-if(( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) && IN_PARSER_MODE!="true") {
+if ((!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) && IN_PARSER_MODE != "true") {
     die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited.");
 }
 
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 </script>
 </head><body>
 ";
-if($is_error) {
+if ($is_error) {
 	$parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>MODX encountered the following error while attempting to parse the requested resource:</td></tr>
@@ -32,14 +32,14 @@  discard block
 block discarded – undo
 	<tr><td colspan='3'><b style='color:#003399;'>&laquo; $msg &raquo;</b></td></tr>";
 }
 
-if(!empty($query)) {
+if (!empty($query)) {
 	$parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:copyToClip();' style='color:#821517;font-size: 9px; text-decoration: none'>[Copy SQL to ClipBoard]</a><textarea id='holdtext' style='display:none;'></textarea></td></tr>";
 }
 
-if($text!='') {
+if ($text != '') {
 
-	$errortype = array (
+	$errortype = array(
 		E_ERROR          => "Error",
 		E_WARNING        => "Warning",
 		E_PARSE          => "Parsing Error",
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
 	$parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
 	$parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
 	$parsedMessageString .= "</tr>";
-	if($source!='') {
+	if ($source != '') {
 		$parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
 		$parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
 		$parsedMessageString .= "</tr>";

Please login to merge, or discard this patch.

manager/media/rss/rss_cache.inc 4 patches

Doc Comments +12 added lines patch added patch discarded remove patch

@@ -48,6 +48,9 @@  discard block
 block discarded – undo
     Input:      url from wich the rss file was fetched
     Output:     true on sucess
 \*=======================================================================*/
+    /**
+     * @param string $url
+     */
     function set ($url, $rss) {
         $this->ERROR = "";
         $cache_file = $this->file_name( $url );
@@ -74,6 +77,9 @@  discard block
 block discarded – undo
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS
 \*=======================================================================*/
+    /**
+     * @param string $url
+     */
     function get ($url) {
         $this->ERROR = "";
         $cache_file = $this->file_name( $url );
@@ -110,6 +116,9 @@  discard block
 block discarded – undo
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS
 \*=======================================================================*/
+    /**
+     * @param string $url
+     */
     function check_cache ( $url ) {
         $this->ERROR = "";
         $filename = $this->file_name( $url );
@@ -156,6 +165,9 @@  discard block
 block discarded – undo
 /*=======================================================================*\
     Function:   unserialize
 \*=======================================================================*/
+    /**
+     * @param string $data
+     */
     function unserialize ( $data ) {
         return unserialize( $data );
     }

Please login to merge, or discard this patch.

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -94,13 +94,13 @@  discard block
 block discarded – undo
         }
 
         if ($filesize = filesize($cache_file) ) {
-        	$data = fread( $fp, filesize($cache_file) );
-        	$rss = $this->unserialize( $data );
+            $data = fread( $fp, filesize($cache_file) );
+            $rss = $this->unserialize( $data );
 
-        	return $rss;
-    	}
+            return $rss;
+        }
 
-    	return 0;
+        return 0;
     }
 
 /*=======================================================================*\
@@ -134,17 +134,17 @@  discard block
 block discarded – undo
         }
     }
 
-	function cache_age( $cache_key ) {
-		$filename = $this->file_name( $url );
-		if ( file_exists( $filename ) ) {
-			$mtime = filemtime( $filename );
+    function cache_age( $cache_key ) {
+        $filename = $this->file_name( $url );
+        if ( file_exists( $filename ) ) {
+            $mtime = filemtime( $filename );
             $age = time() - $mtime;
-			return $age;
-		}
-		else {
-			return -1;
-		}
-	}
+            return $age;
+        }
+        else {
+            return -1;
+        }
+    }
 
 /*=======================================================================*\
     Function:   serialize

Please login to merge, or discard this patch.

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -16,27 +16,27 @@  discard block
 block discarded – undo
  *
  */
 
-class RSSCache {
-    var $BASE_CACHE = './cache';    // where the cache files are stored
-    var $MAX_AGE    = 3600;         // when are files stale, default one hour
-    var $ERROR      = "";           // accumulate error messages
+class RSSCache{
+    var $BASE_CACHE = './cache'; // where the cache files are stored
+    var $MAX_AGE    = 3600; // when are files stale, default one hour
+    var $ERROR      = ""; // accumulate error messages
 
-    function __construct($base='', $age='') {
-        if ( $base ) {
+    function __construct($base = '', $age = ''){
+        if ($base) {
             $this->BASE_CACHE = $base;
         }
-        if ( $age ) {
+        if ($age) {
             $this->MAX_AGE = $age;
         }
 
         // attempt to make the cache directory
-        if ( ! file_exists( $this->BASE_CACHE ) ) {
-            $status = @mkdir( $this->BASE_CACHE, 0755 );
+        if (!file_exists($this->BASE_CACHE)) {
+            $status = @mkdir($this->BASE_CACHE, 0755);
 
             // if make failed
-            if ( ! $status ) {
+            if (!$status) {
                 $this->error(
-                    "Cache couldn't make dir '" . $this->BASE_CACHE . "'."
+                    "Cache couldn't make dir '".$this->BASE_CACHE."'."
                 );
             }
         }
@@ -48,12 +48,12 @@  discard block
 block discarded – undo
     Input:      url from wich the rss file was fetched
     Output:     true on sucess
 \*=======================================================================*/
-    function set ($url, $rss) {
+    function set($url, $rss){
         $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
-        $fp = @fopen( $cache_file, 'w' );
+        $cache_file = $this->file_name($url);
+        $fp = @fopen($cache_file, 'w');
 
-        if ( ! $fp ) {
+        if (!$fp) {
             $this->error(
                 "Cache unable to open file for writing: $cache_file"
             );
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
         }
 
 
-        $data = $this->serialize( $rss );
-        fwrite( $fp, $data );
-        fclose( $fp );
+        $data = $this->serialize($rss);
+        fwrite($fp, $data);
+        fclose($fp);
 
         return $cache_file;
     }
@@ -74,11 +74,11 @@  discard block
 block discarded – undo
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS
 \*=======================================================================*/
-    function get ($url) {
+    function get($url){
         $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
+        $cache_file = $this->file_name($url);
 
-        if ( ! file_exists( $cache_file ) ) {
+        if (!file_exists($cache_file)) {
             $this->debug(
                 "Cache doesn't contain: $url (cache file: $cache_file)"
             );
@@ -86,16 +86,16 @@  discard block
 block discarded – undo
         }
 
         $fp = @fopen($cache_file, 'r');
-        if ( ! $fp ) {
+        if (!$fp) {
             $this->error(
                 "Failed to open cache file for reading: $cache_file"
             );
             return 0;
         }
 
-        if ($filesize = filesize($cache_file) ) {
-        	$data = fread( $fp, filesize($cache_file) );
-        	$rss = $this->unserialize( $data );
+        if ($filesize = filesize($cache_file)) {
+        	$data = fread($fp, filesize($cache_file));
+        	$rss = $this->unserialize($data);
 
         	return $rss;
     	}
@@ -110,16 +110,16 @@  discard block
 block discarded – undo
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS
 \*=======================================================================*/
-    function check_cache ( $url ) {
+    function check_cache($url){
         $this->ERROR = "";
-        $filename = $this->file_name( $url );
+        $filename = $this->file_name($url);
 
-        if ( file_exists( $filename ) ) {
+        if (file_exists($filename)) {
             // find how long ago the file was added to the cache
             // and whether that is longer then MAX_AGE
-            $mtime = filemtime( $filename );
+            $mtime = filemtime($filename);
             $age = time() - $mtime;
-            if ( $this->MAX_AGE > $age ) {
+            if ($this->MAX_AGE > $age) {
                 // object exists and is current
                 return 'HIT';
             }
@@ -134,10 +134,10 @@  discard block
 block discarded – undo
         }
     }
 
-	function cache_age( $cache_key ) {
-		$filename = $this->file_name( $url );
-		if ( file_exists( $filename ) ) {
-			$mtime = filemtime( $filename );
+	function cache_age($cache_key){
+		$filename = $this->file_name($url);
+		if (file_exists($filename)) {
+			$mtime = filemtime($filename);
             $age = time() - $mtime;
 			return $age;
 		}
@@ -149,15 +149,15 @@  discard block
 block discarded – undo
 /*=======================================================================*\
     Function:   serialize
 \*=======================================================================*/
-    function serialize ( $rss ) {
-        return serialize( $rss );
+    function serialize($rss){
+        return serialize($rss);
     }
 
 /*=======================================================================*\
     Function:   unserialize
 \*=======================================================================*/
-    function unserialize ( $data ) {
-        return unserialize( $data );
+    function unserialize($data){
+        return unserialize($data);
     }
 
 /*=======================================================================*\
@@ -166,31 +166,31 @@  discard block
 block discarded – undo
     Input:      url from wich the rss file was fetched
     Output:     a file name
 \*=======================================================================*/
-    function file_name ($url) {
-        $filename = md5( $url );
-        return implode( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) );
+    function file_name($url){
+        $filename = md5($url);
+        return implode(DIRECTORY_SEPARATOR, array($this->BASE_CACHE, $filename));
     }
 
 /*=======================================================================*\
     Function:   error
     Purpose:    register error
 \*=======================================================================*/
-    function error ($errormsg, $lvl=E_USER_WARNING) {
+    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)";
         }
         $this->ERROR = $errormsg;
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);
+        if (MAGPIE_DEBUG) {
+            trigger_error($errormsg, $lvl);
         }
         else {
-            error_log( $errormsg, 0);
+            error_log($errormsg, 0);
         }
     }
 
-    function debug ($debugmsg, $lvl=E_USER_NOTICE) {
-        if ( MAGPIE_DEBUG ) {
+    function debug($debugmsg, $lvl = E_USER_NOTICE){
+        if (MAGPIE_DEBUG) {
             $this->error("MagpieRSS [debug] $debugmsg", $lvl);
         }
     }

Please login to merge, or discard this patch.

Braces +26 added lines, -19 removed lines patch added patch discarded remove patch

@@ -16,12 +16,14 @@  discard block
 block discarded – undo
  *
  */
 
-class RSSCache {
+class RSSCache
+{
     var $BASE_CACHE = './cache';    // where the cache files are stored
     var $MAX_AGE    = 3600;         // when are files stale, default one hour
     var $ERROR      = "";           // accumulate error messages
 
-    function __construct($base='', $age='') {
+    function __construct($base='', $age='')
+    {
         if ( $base ) {
             $this->BASE_CACHE = $base;
         }
@@ -48,7 +50,8 @@  discard block
 block discarded – undo
     Input:      url from wich the rss file was fetched
     Output:     true on sucess
 \*=======================================================================*/
-    function set ($url, $rss) {
+    function set ($url, $rss)
+    {
         $this->ERROR = "";
         $cache_file = $this->file_name( $url );
         $fp = @fopen( $cache_file, 'w' );
@@ -74,7 +77,8 @@  discard block
 block discarded – undo
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS
 \*=======================================================================*/
-    function get ($url) {
+    function get ($url)
+    {
         $this->ERROR = "";
         $cache_file = $this->file_name( $url );
 
@@ -110,7 +114,8 @@  discard block
 block discarded – undo
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS
 \*=======================================================================*/
-    function check_cache ( $url ) {
+    function check_cache ( $url )
+    {
         $this->ERROR = "";
         $filename = $this->file_name( $url );
 
@@ -122,26 +127,24 @@  discard block
 block discarded – undo
             if ( $this->MAX_AGE > $age ) {
                 // object exists and is current
                 return 'HIT';
-            }
-            else {
+            } else {
                 // object exists but is old
                 return 'STALE';
             }
-        }
-        else {
+        } else {
             // object does not exist
             return 'MISS';
         }
     }
 
-	function cache_age( $cache_key ) {
+	function cache_age( $cache_key )
+	{
 		$filename = $this->file_name( $url );
 		if ( file_exists( $filename ) ) {
 			$mtime = filemtime( $filename );
             $age = time() - $mtime;
 			return $age;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -149,14 +152,16 @@  discard block
 block discarded – undo
 /*=======================================================================*\
     Function:   serialize
 \*=======================================================================*/
-    function serialize ( $rss ) {
+    function serialize ( $rss )
+    {
         return serialize( $rss );
     }
 
 /*=======================================================================*\
     Function:   unserialize
 \*=======================================================================*/
-    function unserialize ( $data ) {
+    function unserialize ( $data )
+    {
         return unserialize( $data );
     }
 
@@ -166,7 +171,8 @@  discard block
 block discarded – undo
     Input:      url from wich the rss file was fetched
     Output:     a file name
 \*=======================================================================*/
-    function file_name ($url) {
+    function file_name ($url)
+    {
         $filename = md5( $url );
         return implode( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) );
     }
@@ -175,7 +181,8 @@  discard block
 block discarded – undo
     Function:   error
     Purpose:    register error
 \*=======================================================================*/
-    function error ($errormsg, $lvl=E_USER_WARNING) {
+    function error ($errormsg, $lvl=E_USER_WARNING)
+    {
         // append PHP's error message if track_errors enabled
         if ( isset($php_errormsg) ) {
             $errormsg .= " ($php_errormsg)";
@@ -183,13 +190,13 @@  discard block
 block discarded – undo
         $this->ERROR = $errormsg;
         if ( MAGPIE_DEBUG ) {
             trigger_error( $errormsg, $lvl);
-        }
-        else {
+        } else {
             error_log( $errormsg, 0);
         }
     }
 
-    function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+    function debug ($debugmsg, $lvl=E_USER_NOTICE)
+    {
         if ( MAGPIE_DEBUG ) {
             $this->error("MagpieRSS [debug] $debugmsg", $lvl);
         }

Please login to merge, or discard this patch.

manager/includes/manager.lockout.inc.php 3 patches

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 
     // load template
     if(!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
-    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+        $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
     }
 
     $target = $modx->config['manager_lockout_tpl'];
@@ -30,40 +30,40 @@  discard block
 block discarded – undo
     $target = $modx->mergeSettingsContent($target);
 
     if(substr($target,0,1)==='@') {
-    	if(substr($target,0,6)==='@CHUNK') {
-    		$target = trim(substr($target,7));
-    		$lockout_tpl = $modx->getChunk($target);
-    	}
-    	elseif(substr($target,0,5)==='@FILE') {
-    		$target = trim(substr($target,6));
-    		$lockout_tpl = file_get_contents($target);
-    	}
-	} else {
-    	$chunk = $modx->getChunk($target);
-    	if($chunk!==false && !empty($chunk)) {
-    		$lockout_tpl = $chunk;
-    	}
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
-    		$target = MODX_BASE_PATH . $target;
-    		$lockout_tpl = file_get_contents($target);
-    	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
-    		$lockout_tpl = file_get_contents($target);
-    	}
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
-		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
-		$login_tpl = file_get_contents($target);
-	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
-    		$lockout_tpl = file_get_contents($target);
-    	}
-    	else {
-    		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
-    		$lockout_tpl = file_get_contents($target);
-    	}
-	}
+        if(substr($target,0,6)==='@CHUNK') {
+            $target = trim(substr($target,7));
+            $lockout_tpl = $modx->getChunk($target);
+        }
+        elseif(substr($target,0,5)==='@FILE') {
+            $target = trim(substr($target,6));
+            $lockout_tpl = file_get_contents($target);
+        }
+    } else {
+        $chunk = $modx->getChunk($target);
+        if($chunk!==false && !empty($chunk)) {
+            $lockout_tpl = $chunk;
+        }
+        elseif(is_file(MODX_BASE_PATH . $target)) {
+            $target = MODX_BASE_PATH . $target;
+            $lockout_tpl = file_get_contents($target);
+        }
+        elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
+            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
+            $lockout_tpl = file_get_contents($target);
+        }
+    elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
+        $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
+        $login_tpl = file_get_contents($target);
+    }
+        elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
+            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
+            $lockout_tpl = file_get_contents($target);
+        }
+        else {
+            $target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+            $lockout_tpl = file_get_contents($target);
+        }
+    }
 
     // merge placeholders
     $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);

Please login to merge, or discard this patch.

Braces +8 added lines, -13 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if($modx->getManagerApi()->action!='8' && isset($_SESSION['mgrValidated'])){
+if($modx->getManagerApi()->action!='8' && isset($_SESSION['mgrValidated'])) {
 
     $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
     $logouturl = MODX_MANAGER_URL.'index.php?a=8';
@@ -35,8 +35,7 @@  discard block
 block discarded – undo
     	if(substr($target,0,6)==='@CHUNK') {
     		$target = trim(substr($target,7));
     		$lockout_tpl = $modx->getChunk($target);
-    	}
-    	elseif(substr($target,0,5)==='@FILE') {
+    	} elseif(substr($target,0,5)==='@FILE') {
     		$target = trim(substr($target,6));
     		$lockout_tpl = file_get_contents($target);
     	}
@@ -44,24 +43,20 @@  discard block
 block discarded – undo
     	$chunk = $modx->getChunk($target);
     	if($chunk!==false && !empty($chunk)) {
     		$lockout_tpl = $chunk;
-    	}
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
+    	} elseif(is_file(MODX_BASE_PATH . $target)) {
     		$target = MODX_BASE_PATH . $target;
     		$lockout_tpl = file_get_contents($target);
-    	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
+    	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
     		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
-    	}
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
+    	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
 		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
 		$login_tpl = file_get_contents($target);
-	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
+	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) {
+// ClipperCMS compatible
     		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
     		$lockout_tpl = file_get_contents($target);
-    	}
-    	else {
+    	} else {
     		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}

Please login to merge, or discard this patch.

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

@@ -1,75 +1,75 @@
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if($modx->getManagerApi()->action!='8' && isset($_SESSION['mgrValidated'])){
+if ($modx->getManagerApi()->action != '8' && isset($_SESSION['mgrValidated'])) {
 
-    $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
+    $homeurl = $modx->makeUrl($manager_login_startup > 0 ? $manager_login_startup : $site_start);
     $logouturl = MODX_MANAGER_URL.'index.php?a=8';
 
-    $modx->setPlaceholder('modx_charset',$modx_manager_charset);
-    $modx->setPlaceholder('theme',$manager_theme);
+    $modx->setPlaceholder('modx_charset', $modx_manager_charset);
+    $modx->setPlaceholder('theme', $manager_theme);
 
-    $modx->setPlaceholder('site_name',$modx->getPhpCompat()->entities($site_name));
-    $modx->setPlaceholder('logo_slogan',$_lang["logo_slogan"]);
-    $modx->setPlaceholder('manager_lockout_message',$_lang["manager_lockout_message"]);
+    $modx->setPlaceholder('site_name', $modx->getPhpCompat()->entities($site_name));
+    $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
+    $modx->setPlaceholder('manager_lockout_message', $_lang["manager_lockout_message"]);
 
-    $modx->setPlaceholder('home',$_lang["home"]);
-    $modx->setPlaceholder('homeurl',$homeurl);
-    $modx->setPlaceholder('logout',$_lang["logout"]);
-    $modx->setPlaceholder('logouturl',$logouturl);
-    $modx->setPlaceholder('manager_theme_url',MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
-    $modx->setPlaceholder('year',date('Y'));
+    $modx->setPlaceholder('home', $_lang["home"]);
+    $modx->setPlaceholder('homeurl', $homeurl);
+    $modx->setPlaceholder('logout', $_lang["logout"]);
+    $modx->setPlaceholder('logouturl', $logouturl);
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
+    $modx->setPlaceholder('year', date('Y'));
 
     // load template
-    if(!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
-    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+    if (!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
+    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
     }
 
     $target = $modx->config['manager_lockout_tpl'];
     $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
     $target = $modx->mergeSettingsContent($target);
 
-    if(substr($target,0,1)==='@') {
-    	if(substr($target,0,6)==='@CHUNK') {
-    		$target = trim(substr($target,7));
+    if (substr($target, 0, 1) === '@') {
+    	if (substr($target, 0, 6) === '@CHUNK') {
+    		$target = trim(substr($target, 7));
     		$lockout_tpl = $modx->getChunk($target);
     	}
-    	elseif(substr($target,0,5)==='@FILE') {
-    		$target = trim(substr($target,6));
+    	elseif (substr($target, 0, 5) === '@FILE') {
+    		$target = trim(substr($target, 6));
     		$lockout_tpl = file_get_contents($target);
     	}
 	} else {
     	$chunk = $modx->getChunk($target);
-    	if($chunk!==false && !empty($chunk)) {
+    	if ($chunk !== false && !empty($chunk)) {
     		$lockout_tpl = $chunk;
     	}
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
-    		$target = MODX_BASE_PATH . $target;
+    	elseif (is_file(MODX_BASE_PATH.$target)) {
+    		$target = MODX_BASE_PATH.$target;
     		$lockout_tpl = file_get_contents($target);
     	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl')) {
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
-		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
+	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl')) {
+		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl';
 		$login_tpl = file_get_contents($target);
 	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html')) { // ClipperCMS compatible
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html';
     		$lockout_tpl = file_get_contents($target);
     	}
     	else {
-    		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+    		$target = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}
 	}
 
     // merge placeholders
     $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);
-    $regx = strpos($lockout_tpl,'[[+')!==false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
+    $regx = strpos($lockout_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
     $lockout_tpl = preg_replace($regx, '', $lockout_tpl); //cleanup
 
     echo $lockout_tpl;

Please login to merge, or discard this patch.

manager/media/rss/rss_parse.inc 4 patches

Indentation +40 added lines, -40 removed lines patch added patch discarded remove patch

@@ -98,8 +98,8 @@  discard block
 block discarded – undo
         #
         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,
@@ -108,8 +108,8 @@  discard block
 block discarded – undo
 
         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 );
         }
 
 
@@ -445,9 +445,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * return XML parser, and possibly re-encoded source
-    *
-    */
+     * return XML parser, and possibly re-encoded source
+     *
+     */
     function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
@@ -464,14 +464,14 @@  discard block
 block discarded – undo
     }
 
     /**
-    * 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!
+     *
+     */
     function php5_create_parser($in_enc, $detect) {
         // by default php5 does a fine job of detecting input encodings
         if(!$detect && $in_enc) {
@@ -483,20 +483,20 @@  discard block
 block discarded – undo
     }
 
     /**
-    * 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
+     *
+     */
     function php4_create_parser($source, $in_enc, $detect) {
         if ( !$detect ) {
             return array(xml_parser_create($in_enc), $source);
@@ -540,8 +540,8 @@  discard block
 block discarded – undo
 
         // 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);
     }
@@ -587,26 +587,26 @@  discard block
 block discarded – undo
 // courtesy, Ryan Currie, [email protected]
 
 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) {
+    function array_change_key_case($array, $case=CASE_LOWER) {
         $output = array();
         switch($case){
-           case CASE_LOWER:
+            case CASE_LOWER:
                $cmd='strtolower';
-               break;
-           case CASE_UPPER:
+                break;
+            case CASE_UPPER:
                $cmd='strtoupper';
-               break;
-           default:
+                break;
+            default:
                $cmd = '';
         }
         foreach($array as $key=>$value) {
             $output[empty($cmd) ? $key : $cmd($key)] = $value;
         }
         return $output;
-	}
+    }
 
 }

Please login to merge, or discard this patch.

Doc Comments +14 added lines patch added patch discarded remove patch

@@ -332,6 +332,10 @@  discard block
 block discarded – undo
     }
 
     // smart append - field and namespace aware
+
+    /**
+     * @param string $el
+     */
     function append($el, $text) {
         if (!$el) {
             return;
@@ -447,6 +451,10 @@  discard block
 block discarded – undo
     /**
     * return XML parser, and possibly re-encoded source
     *
+    * @param string $source
+    * @param string $out_enc
+    * @param string|null $in_enc
+    * @param boolean $detect
     */
     function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
@@ -556,6 +564,9 @@  discard block
 block discarded – undo
         }
     }
 
+    /**
+     * @param integer $lvl
+     */
     function error ($errormsg, $lvl=E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
         if ( isset($php_errormsg) ) {
@@ -591,6 +602,9 @@  discard block
 block discarded – undo
 	define('CASE_LOWER', 0);
 
 
+	/**
+	 * @param integer $case
+	 */
 	function array_change_key_case($array, $case=CASE_LOWER) {
         $output = array();
         switch($case){

Please login to merge, or discard this patch.

Spacing +118 added lines, -118 removed lines patch added patch discarded remove patch

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
 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.
@@ -31,19 +31,19 @@  discard block
 block discarded – undo
 * see: rss_fetch.inc for a simpler interface with integrated caching support
 *
 */
-class MagpieRSS {
+class MagpieRSS{
     var $parser;
 
-    var $current_item   = array();  // item currently being parsed
-    var $items          = array();  // collection of parsed items
-    var $channel        = array();  // hash of channel fields
+    var $current_item   = array(); // item currently being parsed
+    var $items          = array(); // collection of parsed items
+    var $channel        = array(); // hash of channel fields
     var $textinput      = array();
     var $image          = array();
     var $feed_type;
     var $feed_version;
-    var $encoding       = '';       // output encoding of parsed rss
+    var $encoding       = ''; // output encoding of parsed rss
 
-    var $_source_encoding = '';     // only set if we have to parse xml prolog
+    var $_source_encoding = ''; // only set if we have to parse xml prolog
 
     var $ERROR = "";
     var $WARNING = "";
@@ -91,15 +91,15 @@  discard block
 block discarded – undo
      *                                  source encoding. (caveat emptor)
      *
      */
-    function __construct($source, $output_encoding='ISO-8859-1',
-                        $input_encoding=null, $detect_encoding=true)
+    function __construct($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,
@@ -107,9 +107,9 @@  discard block
 block discarded – undo
 
 
         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);
         }
 
 
@@ -118,57 +118,57 @@  discard block
 block discarded – undo
         # 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();
     }
 
-    function feed_start_element($p, $element, &$attrs) {
+    function feed_start_element($p, $element, &$attrs){
         $el = $element = strtolower($element);
         $attrs = array_change_key_case($attrs, CASE_LOWER);
 
         // check for a namespace, and split if found
         $ns = false;
-        if ( strpos( $element, ':' ) ) {
-            list($ns, $el) = explode( ':', $element, 2);
+        if (strpos($element, ':')) {
+            list($ns, $el) = explode(':', $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;
@@ -176,14 +176,14 @@  discard block
 block discarded – undo
             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'];
             }
         }
@@ -207,10 +207,10 @@  discard block
 block discarded – undo
         }
 
         # 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';
             }
 
@@ -220,31 +220,31 @@  discard block
 block discarded – undo
         }
 
         // 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 = implode(' ',
                     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']);
@@ -257,10 +257,10 @@  discard block
 block discarded – undo
 
 
 
-    function feed_cdata ($p, $text) {
+    function feed_cdata($p, $text){
         if ($this->feed_type == ATOM and $this->incontent)
         {
-            $this->append_content( $text );
+            $this->append_content($text);
         }
         else {
             $current_el = implode('_', array_reverse($this->stack));
@@ -268,35 +268,35 @@  discard block
 block discarded – undo
         }
     }
 
-    function feed_end_element ($p, $el) {
+    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>");
             }
@@ -304,91 +304,91 @@  discard block
 block discarded – undo
                 $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;
     }
 
-    function concat (&$str1, $str2="") {
-        if (!isset($str1) ) {
-            $str1="";
+    function concat(&$str1, $str2 = ""){
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
 
 
 
-    function append_content($text) {
-        if ( $this->initem ) {
-            $this->concat( $this->current_item[ $this->incontent ], $text );
+    function append_content($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);
         }
     }
 
     // smart append - field and namespace aware
-    function append($el, $text) {
+    function append($el, $text){
         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 );
             }
 
         }
     }
 
-    function normalize () {
+    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;
@@ -398,22 +398,22 @@  discard block
 block discarded – undo
                 $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;
@@ -426,8 +426,8 @@  discard block
 block discarded – undo
     }
 
 
-    function is_rss () {
-        if ( $this->feed_type == RSS ) {
+    function is_rss(){
+        if ($this->feed_type == RSS) {
             return $this->feed_version;
         }
         else {
@@ -435,8 +435,8 @@  discard block
 block discarded – undo
         }
     }
 
-    function is_atom() {
-        if ( $this->feed_type == ATOM ) {
+    function is_atom(){
+        if ($this->feed_type == ATOM) {
             return $this->feed_version;
         }
         else {
@@ -448,8 +448,8 @@  discard block
 block discarded – undo
     * return XML parser, and possibly re-encoded source
     *
     */
-    function create_parser($source, $out_enc, $in_enc, $detect) {
-        if ( substr(phpversion(),0,1) == 5) {
+    function create_parser($source, $out_enc, $in_enc, $detect){
+        if (substr(phpversion(), 0, 1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
         }
         else {
@@ -472,9 +472,9 @@  discard block
 block discarded – undo
     * All hail libxml2!
     *
     */
-    function php5_create_parser($in_enc, $detect) {
+    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 {
@@ -497,8 +497,8 @@  discard block
 block discarded – undo
     * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
     *
     */
-    function php4_create_parser($source, $in_enc, $detect) {
-        if ( !$detect ) {
+    function php4_create_parser($source, $in_enc, $detect){
+        if (!$detect) {
             return array(xml_parser_create($in_enc), $source);
         }
 
@@ -522,8 +522,8 @@  discard block
 block discarded – undo
         // 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);
             }
@@ -531,24 +531,24 @@  discard block
 block discarded – undo
 
         // 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);
 
         return array(xml_parser_create(), $source);
     }
 
-    function known_encoding($enc) {
+    function known_encoding($enc){
         $enc = strtoupper($enc);
-        if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
+        if (in_array($enc, $this->_KNOWN_ENCODINGS)) {
             return $enc;
         }
         else {
@@ -556,20 +556,20 @@  discard block
 block discarded – undo
         }
     }
 
-    function error ($errormsg, $lvl=E_USER_WARNING) {
+    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;
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
 
 } // end class RSS
 
-function map_attrs($k, $v) {
+function map_attrs($k, $v){
     return "$k=\"$v\"";
 }
 
@@ -591,19 +591,19 @@  discard block
 block discarded – undo
 	define('CASE_LOWER', 0);
 
 
-	function array_change_key_case($array, $case=CASE_LOWER) {
+	function array_change_key_case($array, $case = CASE_LOWER){
         $output = array();
-        switch($case){
+        switch ($case) {
            case CASE_LOWER:
-               $cmd='strtolower';
+               $cmd = 'strtolower';
                break;
            case CASE_UPPER:
-               $cmd='strtoupper';
+               $cmd = 'strtoupper';
                break;
            default:
                $cmd = '';
         }
-        foreach($array as $key=>$value) {
+        foreach ($array as $key=>$value) {
             $output[empty($cmd) ? $key : $cmd($key)] = $value;
         }
         return $output;

Please login to merge, or discard this patch.

Braces +89 added lines, -115 removed lines patch added patch discarded remove patch

@@ -31,7 +31,8 @@  discard block
 block discarded – undo
 * see: rss_fetch.inc for a simpler interface with integrated caching support
 *
 */
-class MagpieRSS {
+class MagpieRSS
+{
     var $parser;
 
     var $current_item   = array();  // item currently being parsed
@@ -143,7 +144,8 @@  discard block
 block discarded – undo
         $this->normalize();
     }
 
-    function feed_start_element($p, $element, &$attrs) {
+    function feed_start_element($p, $element, &$attrs)
+    {
         $el = $element = strtolower($element);
         $attrs = array_change_key_case($attrs, CASE_LOWER);
 
@@ -163,12 +165,10 @@  discard block
 block discarded – undo
             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;
@@ -176,12 +176,9 @@  discard block
 block discarded – undo
             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']) ) {
                 $this->current_item['about'] = $attrs['rdf:about'];
@@ -193,22 +190,17 @@  discard block
 block discarded – undo
         elseif (
             $this->feed_type == RSS and
             $this->current_namespace == '' and
-            $el == 'textinput' )
-        {
+            $el == 'textinput' ) {
             $this->intextinput = true;
-        }
-
-        elseif (
+        } elseif (
             $this->feed_type == RSS and
             $this->current_namespace == '' and
-            $el == 'image' )
-        {
+            $el == 'image' ) {
             $this->inimage = true;
         }
 
         # 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' ) {
                 $el = 'atom_content';
@@ -220,8 +212,7 @@  discard block
 block discarded – undo
         }
 
         // 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 = implode(' ',
                     array_map('map_attrs',
@@ -237,13 +228,10 @@  discard block
 block discarded – undo
         // 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' )
-        {
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
-            {
+        elseif ($this->feed_type == ATOM and $el == 'link' ) {
+            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
 
@@ -257,63 +245,51 @@  discard block
 block discarded – undo
 
 
 
-    function feed_cdata ($p, $text) {
-        if ($this->feed_type == ATOM and $this->incontent)
-        {
+    function feed_cdata ($p, $text)
+    {
+        if ($this->feed_type == ATOM and $this->incontent) {
             $this->append_content( $text );
-        }
-        else {
+        } else {
             $current_el = implode('_', array_reverse($this->stack));
             $this->append($current_el, $text);
         }
     }
 
-    function feed_end_element ($p, $el) {
+    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>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift( $this->stack );
-        }
-        else {
+        } else {
             array_shift( $this->stack );
         }
 
         $this->current_namespace = false;
     }
 
-    function concat (&$str1, $str2="") {
+    function concat (&$str1, $str2="")
+    {
         if (!isset($str1) ) {
             $str1="";
         }
@@ -322,53 +298,46 @@  discard block
 block discarded – undo
 
 
 
-    function append_content($text) {
+    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 );
         }
     }
 
     // smart append - field and namespace aware
-    function append($el, $text) {
+    function append($el, $text)
+    {
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace )
-        {
+        if ( $this->current_namespace ) {
             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 );
             }
@@ -376,16 +345,19 @@  discard block
 block discarded – undo
         }
     }
 
-    function normalize () {
+    function normalize ()
+    {
         // if atom populate rss fields
         if ( $this->is_atom() ) {
             $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 ) {
@@ -397,23 +369,23 @@  discard block
 block discarded – undo
 
                 $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;
@@ -426,20 +398,20 @@  discard block
 block discarded – undo
     }
 
 
-    function is_rss () {
+    function is_rss ()
+    {
         if ( $this->feed_type == RSS ) {
             return $this->feed_version;
-        }
-        else {
+        } else {
             return false;
         }
     }
 
-    function is_atom() {
+    function is_atom()
+    {
         if ( $this->feed_type == ATOM ) {
             return $this->feed_version;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -448,11 +420,11 @@  discard block
 block discarded – undo
     * return XML parser, and possibly re-encoded source
     *
     */
-    function create_parser($source, $out_enc, $in_enc, $detect) {
+    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) {
@@ -472,12 +444,12 @@  discard block
 block discarded – undo
     * All hail libxml2!
     *
     */
-    function php5_create_parser($in_enc, $detect) {
+    function php5_create_parser($in_enc, $detect)
+    {
         // 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('');
         }
     }
@@ -497,7 +469,8 @@  discard block
 block discarded – undo
     * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
     *
     */
-    function php4_create_parser($source, $in_enc, $detect) {
+    function php4_create_parser($source, $in_enc, $detect)
+    {
         if ( !$detect ) {
             return array(xml_parser_create($in_enc), $source);
         }
@@ -506,8 +479,7 @@  discard block
 block discarded – undo
             if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
                 $in_enc = strtoupper($m[1]);
                 $this->source_encoding = $in_enc;
-            }
-            else {
+            } else {
                 $in_enc = 'UTF-8';
             }
         }
@@ -522,7 +494,7 @@  discard block
 block discarded – undo
         // cast the XML to a known encoding
         // @see http://php.net/iconv
 
-        if (function_exists('iconv'))  {
+        if (function_exists('iconv')) {
             $encoded_source = iconv($in_enc,'UTF-8', $source);
             if ($encoded_source) {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
@@ -546,25 +518,25 @@  discard block
 block discarded – undo
         return array(xml_parser_create(), $source);
     }
 
-    function known_encoding($enc) {
+    function known_encoding($enc)
+    {
         $enc = strtoupper($enc);
         if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
             return $enc;
-        }
-        else {
+        } else {
             return false;
         }
     }
 
-    function error ($errormsg, $lvl=E_USER_WARNING) {
+    function error ($errormsg, $lvl=E_USER_WARNING)
+    {
         // append PHP's error message if track_errors enabled
         if ( isset($php_errormsg) ) {
             $errormsg .= " ($php_errormsg)";
         }
         if ( MAGPIE_DEBUG ) {
             trigger_error( $errormsg, $lvl);
-        }
-        else {
+        } else {
             error_log( $errormsg, 0);
         }
 
@@ -579,7 +551,8 @@  discard block
 block discarded – undo
 
 } // end class RSS
 
-function map_attrs($k, $v) {
+function map_attrs($k, $v)
+{
     return "$k=\"$v\"";
 }
 
@@ -591,9 +564,10 @@  discard block
 block discarded – undo
 	define('CASE_LOWER', 0);
 
 
-	function array_change_key_case($array, $case=CASE_LOWER) {
+	function array_change_key_case($array, $case=CASE_LOWER)
+	{
         $output = array();
-        switch($case){
+        switch($case) {
            case CASE_LOWER:
                $cmd='strtolower';
                break;

Please login to merge, or discard this patch.

manager/actions/help.static.php 3 patches

Indentation +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 $helpBasePath = "actions/help/";
 ?>
@@ -16,36 +16,36 @@  discard block
 block discarded – undo
 		</script>
 
 		<?php
-		if($handle = opendir('actions/help')) {
-			while(false !== ($file = readdir($handle))) {
-				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
-					$help[] = $file;
-				}
-			}
-			closedir($handle);
-		}
-
-		natcasesort($help);
-
-		foreach($help as $k => $v) {
-
-			$helpname = substr($v, 0, strrpos($v, '.'));
-
-			$prefix = substr($helpname, 0, 2);
-			if(is_numeric($prefix)) {
-				$helpname = substr($helpname, 2, strlen($helpname) - 1);
-			}
-
-			$hnLower = strtolower($helpname);
-			$helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);
-
-			echo '<div class="tab-page" id="tab' . $k . 'Help">';
-			echo '<h2 class="tab">' . $helpname . '</h2>';
-			echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';
-			include_once($helpBasePath . "{$v}");
-			echo '</div>';
-		}
-		?>
+        if($handle = opendir('actions/help')) {
+            while(false !== ($file = readdir($handle))) {
+                if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
+                    $help[] = $file;
+                }
+            }
+            closedir($handle);
+        }
+
+        natcasesort($help);
+
+        foreach($help as $k => $v) {
+
+            $helpname = substr($v, 0, strrpos($v, '.'));
+
+            $prefix = substr($helpname, 0, 2);
+            if(is_numeric($prefix)) {
+                $helpname = substr($helpname, 2, strlen($helpname) - 1);
+            }
+
+            $hnLower = strtolower($helpname);
+            $helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);
+
+            echo '<div class="tab-page" id="tab' . $k . 'Help">';
+            echo '<h2 class="tab">' . $helpname . '</h2>';
+            echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';
+            include_once($helpBasePath . "{$v}");
+            echo '</div>';
+        }
+        ?>
 	</div>
 </div>
 <script>

Please login to merge, or discard this patch.

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,12 +1,12 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 $helpBasePath = "actions/help/";
 ?>
 
 <h1>
-	<?php echo $_style['page_help'];  echo $_lang['help']; ?>
+	<?php echo $_style['page_help']; echo $_lang['help']; ?>
 </h1>
 
 <div class="sectionBody">
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
 		</script>
 
 		<?php
-		if($handle = opendir('actions/help')) {
-			while(false !== ($file = readdir($handle))) {
-				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
+		if ($handle = opendir('actions/help')) {
+			while (false !== ($file = readdir($handle))) {
+				if ($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath.$file)) {
 					$help[] = $file;
 				}
 			}
@@ -27,22 +27,22 @@  discard block
 block discarded – undo
 
 		natcasesort($help);
 
-		foreach($help as $k => $v) {
+		foreach ($help as $k => $v) {
 
 			$helpname = substr($v, 0, strrpos($v, '.'));
 
 			$prefix = substr($helpname, 0, 2);
-			if(is_numeric($prefix)) {
+			if (is_numeric($prefix)) {
 				$helpname = substr($helpname, 2, strlen($helpname) - 1);
 			}
 
 			$hnLower = strtolower($helpname);
 			$helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);
 
-			echo '<div class="tab-page" id="tab' . $k . 'Help">';
-			echo '<h2 class="tab">' . $helpname . '</h2>';
-			echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';
-			include_once($helpBasePath . "{$v}");
+			echo '<div class="tab-page" id="tab'.$k.'Help">';
+			echo '<h2 class="tab">'.$helpname.'</h2>';
+			echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab'.$k.'Help" ) );</script>';
+			include_once($helpBasePath."{$v}");
 			echo '</div>';
 		}
 		?>

Please login to merge, or discard this patch.

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 $helpBasePath = "actions/help/";
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
 		</script>
 
 		<?php
-		if($handle = opendir('actions/help')) {
-			while(false !== ($file = readdir($handle))) {
-				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
+		if($handle = opendir('actions/help')) {
+			while(false !== ($file = readdir($handle))) {
+				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
 					$help[] = $file;
 				}
 			}
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
 
 		natcasesort($help);
 
-		foreach($help as $k => $v) {
+		foreach($help as $k => $v) {
 
 			$helpname = substr($v, 0, strrpos($v, '.'));
 
 			$prefix = substr($helpname, 0, 2);
-			if(is_numeric($prefix)) {
+			if(is_numeric($prefix)) {
 				$helpname = substr($helpname, 2, strlen($helpname) - 1);
 			}
 

Please login to merge, or discard this patch.

manager/actions/phpinfo.static.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 ?>

Please login to merge, or discard this patch.

manager/actions/export_site.static.php 2 patches

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -1,9 +1,9 @@  discard block
 block discarded – undo
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('export_static')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // figure out the base of the server, so we know where to get the documents in order to export them
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
 
 		<div class="container container-body">
 			<?php
-			if(isset($_POST['export'])) {
-				$rs = include_once(MODX_MANAGER_PATH . 'processors/export_site.processor.php');
-				echo $rs;
-			} else {
-				?>
+            if(isset($_POST['export'])) {
+                $rs = include_once(MODX_MANAGER_PATH . 'processors/export_site.processor.php');
+                echo $rs;
+            } else {
+                ?>
 				<form action="index.php" method="post" name="exportFrm">
 					<input type="hidden" name="export" value="export" />
 					<input type="hidden" name="a" value="83" />
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
 					</script>
 				</form>
 				<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 	</div>
 

Please login to merge, or discard this patch.

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('export_static')) {
+if (!$modx->hasPermission('export_static')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
 
 		<div class="container container-body">
 			<?php
-			if(isset($_POST['export'])) {
-				$rs = include_once(MODX_MANAGER_PATH . 'processors/export_site.processor.php');
+			if (isset($_POST['export'])) {
+				$rs = include_once(MODX_MANAGER_PATH.'processors/export_site.processor.php');
 				echo $rs;
 			} else {
 				?>
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
 					<a href="javascript:;" class="btn btn-primary" onclick="document.exportFrm.submit();jQuery(this).hide();"><i class="<?= $_style["actions_save"] ?>"></i> <?= $_lang["export_site_start"] ?></a>
 					<script>
 						jQuery('#exportButton a').click(function() {
-							jQuery(this).parent().html('<?= $_style['ajax_loader'];?>');
+							jQuery(this).parent().html('<?= $_style['ajax_loader']; ?>');
 						});
 					</script>
 				</form>

Please login to merge, or discard this patch.