evolution-cms / evolution

install/setup.info.php

Braces +23 added lines, -15 removed lines

@@ -4,7 +4,9 @@ 
 if (is_file($base_path . 'assets/cache/siteManager.php')) {
     include_once($base_path . 'assets/cache/siteManager.php');
 }
-if(!defined('MGR_DIR')) define('MGR_DIR', 'manager');
+if(!defined('MGR_DIR')) {
+    define('MGR_DIR', 'manager');
+}
 
 require_once('../'.MGR_DIR.'/includes/version.inc.php');
 
@@ -19,12 +21,12 @@ 
 $mt = &$moduleTemplates;
 if(is_dir($templatePath) && is_readable($templatePath)) {
     $d = dir($templatePath);
-    while (false !== ($tplfile = $d->read()))
-    {
-        if(substr($tplfile, -4) != '.tpl') continue;
+    while (false !== ($tplfile = $d->read())) {
+        if(substr($tplfile, -4) != '.tpl') {
+            continue;
+        }
         $params = parse_docblock($templatePath, $tplfile);
-        if(is_array($params) && (count($params)>0))
-        {
+        if(is_array($params) && (count($params)>0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mt[] = array
             (
@@ -48,7 +50,9 @@ 
 if(is_dir($tvPath) && is_readable($tvPath)) {
     $d = dir($tvPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if(substr($tplfile, -4) != '.tpl') {
+            continue;
+        }
         $params = parse_docblock($tvPath, $tplfile);
         if(is_array($params) && (count($params)>0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
@@ -241,7 +245,8 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser)
+{
     $ids = array();
 
     // secure web documents - privateweb
@@ -254,9 +259,10 @@ 
     $ds = mysqli_query($sqlParser->conn,$sql);
     if(!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
-    }
-    else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
+    } else {
+        while($r = mysqli_fetch_assoc($ds)) {
+            $ids[]=$r["id"];
+        }
         if(count($ids)>0) {
             mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")");
             unset($ids);
@@ -273,9 +279,10 @@ 
     $ds = mysqli_query($sqlParser->conn,$sql);
     if(!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
-    }
-    else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
+    } else {
+        while($r = mysqli_fetch_assoc($ds)) {
+            $ids[]=$r["id"];
+        }
         if(count($ids)>0) {
             mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")");
             unset($ids);
@@ -283,7 +290,8 @@ 
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename)
+{
     $params = array();
     $fullpath = $element_dir . '/' . $filename;
     if(is_readable($fullpath)) {

manager/actions/help/03Version_Notices.php

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
     foreach($notices as $v) {
         if ($v >= '1.3.0') {
             $cms = 'EVO';
-        }
-        else {
+        } else {
             $cms = 'MODX EVO';
         }
         echo '<div class="sectionHeader"> '.$cms.' '.$v.'</div><div class="sectionBody">';

manager/actions/help/04Changelog.php

Braces +4 added lines, -3 removed lines

@@ -8,7 +8,8 @@
 <div class="sectionBody">
 <?php
 	$changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt';
-	if(is_readable($changeLog))
-		echo str_replace("\n",'<br>',file_get_contents($changeLog));
-?>
+	if(is_readable($changeLog)) {
+			echo str_replace("\n",'<br>',file_get_contents($changeLog));
+	}
+	?>
 </div>

install/sqlParser.class.php

Braces +23 added lines, -10 removed lines

@@ -3,7 +3,8 @@ 
 // MySQL Dump Parser
 // SNUFFKIN/ Alex 2004
 
-class SqlParser {
+class SqlParser
+{
 	public $host;
 	public $dbname;
 	public $prefix;
@@ -28,7 +29,8 @@ 
     public $ignoreDuplicateErrors;
     public $autoTemplateLogic;
 
-	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent')
+	{
 		$this->host = $host;
 		$this->dbname = $db;
 		$this->prefix = $prefix;
@@ -44,10 +46,13 @@ 
         $this->autoTemplateLogic = $auto_template_logic;
 	}
 
-	public function connect() {
+	public function connect()
+	{
 		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
 		mysqli_select_db($this->conn, $this->dbname);
-		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
+		if (function_exists('mysqli_set_charset')) {
+		    mysqli_set_charset($this->conn, $this->connection_charset);
+		}
 
 		$this->dbVersion = 3.23; // assume version 3.23
 		if(function_exists("mysqli_get_server_info")) {
@@ -59,7 +64,8 @@ 
         mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
 	}
 
-    public function process($filename) {
+    public function process($filename)
+    {
 	    global $custom_placeholders;
 
 		// check to make sure file exists
@@ -114,7 +120,9 @@ 
 		foreach($sql_array as $sql_entry) {
 			$sql_do = trim($sql_entry, "\r\n; ");
 
-			if (preg_match('/^\#/', $sql_do)) continue;
+			if (preg_match('/^\#/', $sql_do)) {
+			    continue;
+			}
 
 			// strip out comments and \n for mysql 3.x
 			if ($this->dbVersion <4.0) {
@@ -125,11 +133,15 @@ 
 
 
 			$num = $num + 1;
-			if ($sql_do) mysqli_query($this->conn, $sql_do);
+			if ($sql_do) {
+			    mysqli_query($this->conn, $sql_do);
+			}
 			if(mysqli_error($this->conn)) {
 				// Ignore duplicate and drop errors - Raymond
-				if ($this->ignoreDuplicateErrors){
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
+				if ($this->ignoreDuplicateErrors) {
+					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) {
+					    continue;
+					}
 				}
 				// End Ignore duplicate
 				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
@@ -138,7 +150,8 @@ 
 		}
 	}
 
-    public function close() {
+    public function close()
+    {
 		mysqli_close($this->conn);
 	}
 }

install/actions/action_connection.php

Braces +12 added lines, -9 removed lines

@@ -9,21 +9,24 @@
     $table_prefix = base_convert(rand(10, 20), 10, 36).substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), rand(0, 33), 3).'_';
 } else {
     $database_name = '';
-    if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) $upgradeable = 0;
-    else {
+    if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) {
+        $upgradeable = 0;
+    } else {
         // Include the file so we can test its validity
         include($base_path.MGR_DIR.'/includes/config.inc.php');
         // We need to have all connection settings - but prefix may be empty so we have to ignore it
         if ($dbase) {
             $database_name = trim($dbase, '`');
-            if (!$conn = mysqli_connect($database_server, $database_user, $database_password))
-                $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
-            elseif (! mysqli_select_db($conn, trim($dbase, '`')))
-                $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
-            else
-                $upgradeable = 1;
+            if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) {
+                            $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
+            } elseif (! mysqli_select_db($conn, trim($dbase, '`'))) {
+                            $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
+            } else {
+                            $upgradeable = 1;
+            }
+        } else {
+            $upgradable= 2;
         }
-        else $upgradable= 2;
     }
 }
 

manager/media/rss/rss_parse.inc

Braces +89 added lines, -115 removed lines

@@ -31,7 +31,8 @@ 
 * 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 @@ 
         $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 @@ 
             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 @@ 
             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 @@ 
         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 @@ 
         }
 
         // 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 @@ 
         // 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 @@ 
 
 
 
-    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 @@ 
 
 
 
-    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 @@ 
         }
     }
 
-    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 @@ 
 
                 $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 @@ 
     }
 
 
-    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 @@ 
     * 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 @@ 
     * 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 @@ 
     * @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 @@ 
             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 @@ 
         // 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 @@ 
         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 @@ 
 
 } // end class RSS
 
-function map_attrs($k, $v) {
+function map_attrs($k, $v)
+{
     return "$k=\"$v\"";
 }
 
@@ -591,9 +564,10 @@ 
 	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;

manager/media/rss/rss_cache.inc

Braces +26 added lines, -19 removed lines

@@ -16,12 +16,14 @@ 
  *
  */
 
-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 @@ 
     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 @@ 
     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 @@ 
     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 @@ 
             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 @@ 
 /*=======================================================================*\
     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 @@ 
     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 @@ 
     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 @@ 
         $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);
         }

install/instprocessor.php

Braces +61 added lines, -38 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if (file_exists(dirname(__FILE__)."/../assets/cache/siteManager.php")) {
     include_once(dirname(__FILE__)."/../assets/cache/siteManager.php");
-}else{
+} else {
     define('MGR_DIR', 'manager');
 }
 
@@ -58,13 +58,15 @@ 
 
 // get base path and url
 $a = explode("install", str_replace("\\", "/", dirname($_SERVER["PHP_SELF"])));
-if (count($a) > 1)
+if (count($a) > 1) {
     array_pop($a);
+}
 $url = implode("install", $a);
 reset($a);
 $a = explode("install", str_replace("\\", "/", realpath(dirname(__FILE__))));
-if (count($a) > 1)
+if (count($a) > 1) {
     array_pop($a);
+}
 $pth = implode("install", $a);
 unset ($a);
 $base_url = $url . (substr($url, -1) != "/" ? "/" : "");
@@ -85,7 +87,9 @@ 
     echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>";
     $create = true;
 } else {
-	if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset);
+	if (function_exists('mysqli_set_charset')) {
+	    mysqli_set_charset($conn, $database_charset);
+	}
     mysqli_query($conn, "{$database_connection_method} {$database_connection_charset}");
     echo '<span class="ok">'.$_lang['ok']."</span></p>";
 }
@@ -132,7 +136,8 @@ 
      * @param string $propertyString
      * @return array
      */
-    function parseProperties($propertyString) {
+    function parseProperties($propertyString)
+    {
         $parameter= array ();
         if (!empty ($propertyString)) {
             $tmpParams= explode("&", $propertyString);
@@ -141,11 +146,14 @@ 
                 if (strpos($tmpParams[$x], '=', 0)) {
                     $pTmp= explode("=", $tmpParams[$x]);
                     $pvTmp= explode(";", trim($pTmp[1]));
-                    if ($pvTmp[1] == 'list' && $pvTmp[3] != "")
-                        $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default
+                    if ($pvTmp[1] == 'list' && $pvTmp[3] != "") {
+                                            $parameter[trim($pTmp[0])]= $pvTmp[3];
+                    }
+                    //list default
                     else
-                        if ($pvTmp[1] != 'list' && $pvTmp[2] != "")
-                            $parameter[trim($pTmp[0])]= $pvTmp[2];
+                        if ($pvTmp[1] != 'list' && $pvTmp[2] != "") {
+                                                    $parameter[trim($pTmp[0])]= $pvTmp[2];
+                        }
                 }
             }
         }
@@ -216,7 +224,7 @@ 
 // custom or not
 if (file_exists(dirname(__FILE__)."/../../assets/cache/siteManager.php")) {
     $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");';
-}else{
+} else {
     $mgrdir = 'define(\'MGR_DIR\', \'manager\');';
 }
 
@@ -352,7 +360,9 @@ 
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                         return;
                     }
-                    if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    if(!is_null($save_sql_id_as)) {
+                        $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    }
                     echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
                 }
             }
@@ -446,9 +456,9 @@ 
             $overwrite = mysqli_real_escape_string($conn, $moduleChunk[4]);
             $filecontent = $moduleChunk[2];
 
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category_id = getCreateDbCategory($category, $sqlParser);
@@ -500,9 +510,9 @@ 
             $guid = mysqli_real_escape_string($conn, $moduleModule[4]);
             $shared = mysqli_real_escape_string($conn, $moduleModule[5]);
             $category = mysqli_real_escape_string($conn, $moduleModule[6]);
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -552,9 +562,9 @@ 
                 // parse comma-separated legacy names and prepare them for sql IN clause
                 $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'";
             }
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // disable legacy versions based on legacy_names provided
                 if(!empty($leg_names)) {
@@ -573,7 +583,7 @@ 
                     $insert = true;
                     while($row = mysqli_fetch_assoc($rs)) {
                         $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                        if($row['description'] == $desc){
+                        if($row['description'] == $desc) {
                             if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
                                 echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                                 return;
@@ -631,9 +641,9 @@ 
             $filecontent = $moduleSnippet[2];
             $properties = $moduleSnippet[3];
             $category = mysqli_real_escape_string($conn, $moduleSnippet[4]);
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -741,13 +751,16 @@ 
 }
 
 // call back function
-if ($callBackFnc != "")
+if ($callBackFnc != "") {
     $callBackFnc ($sqlParser);
+}
 
 // Setup the MODX API -- needed for the cache processor
 define('MODX_API_MODE', true);
 define('MODX_BASE_PATH', $base_path);
-if (!defined('MODX_MANAGER_PATH')) define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
+if (!defined('MODX_MANAGER_PATH')) {
+    define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
+}
 $database_type = 'mysqli';
 // initiate a new document parser
 include_once('../'.MGR_DIR.'/includes/document.parser.class.inc.php');
@@ -792,11 +805,12 @@ 
  * @param string $old
  * @return string
  */
-function propUpdate($new,$old){
+function propUpdate($new,$old)
+{
     $newArr = parseProperties($new);
     $oldArr = parseProperties($old);
-    foreach ($oldArr as $k => $v){
-        if (isset($v['0']['options'])){
+    foreach ($oldArr as $k => $v) {
+        if (isset($v['0']['options'])) {
             $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options'];
         }
     }
@@ -811,12 +825,17 @@ 
  * @param bool|mixed $json
  * @return string
  */
-function parseProperties($propertyString, $json=false) {
+function parseProperties($propertyString, $json=false)
+{
     $propertyString = str_replace('{}', '', $propertyString );
     $propertyString = str_replace('} {', ',', $propertyString );
 
-    if(empty($propertyString)) return array();
-    if($propertyString=='{}' || $propertyString=='[]') return array();
+    if(empty($propertyString)) {
+        return array();
+    }
+    if($propertyString=='{}' || $propertyString=='[]') {
+        return array();
+    }
 
     $jsonFormat = isJson($propertyString, true);
     $property = array();
@@ -858,7 +877,7 @@ 
 
         }
     // new json-format
-    } else if(!empty($jsonFormat)){
+    } else if(!empty($jsonFormat)) {
         $property = $jsonFormat;
     }
     if ($json) {
@@ -873,7 +892,8 @@ 
  * @param bool $returnData
  * @return bool|mixed
  */
-function isJson($string, $returnData=false) {
+function isJson($string, $returnData=false)
+{
     $data = json_decode($string, true);
     return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false;
 }
@@ -883,7 +903,8 @@ 
  * @param SqlParser $sqlParser
  * @return int
  */
-function getCreateDbCategory($category, $sqlParser) {
+function getCreateDbCategory($category, $sqlParser)
+{
     $dbase = $sqlParser->dbname;
     $dbase = '`' . trim($dbase,'`') . '`';
     $table_prefix = $sqlParser->prefix;
@@ -911,7 +932,8 @@ 
  * @param string $type
  * @return string
  */
-function removeDocblock($code, $type) {
+function removeDocblock($code, $type)
+{
 
     $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1);
 
@@ -932,8 +954,9 @@ 
         default:
             return $cleaned;
     };
-    if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/')
-        return $cleaned;
+    if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') {
+            return $cleaned;
+    }
 
     // fileBinding not found - return code incl docblock
     return $code;

manager/actions/mutate_settings/functions.inc.php

Braces +27 added lines, -27 removed lines

@@ -5,13 +5,13 @@ 
  * @param string $filename

  * @return array of keys from a language file

  */

-function get_lang_keys($filename)

-{

+function get_lang_keys($filename)
+{
     $file = MODX_MANAGER_PATH . 'includes/lang' . DIRECTORY_SEPARATOR . $filename;

-    if (is_file($file) && is_readable($file)) {

+    if (is_file($file) && is_readable($file)) {
         include($file);

         $out = isset($_lang) ? array_keys($_lang) : array();

-    } else {

+    } else {
         $out = array();

     }

 

@@ -24,12 +24,12 @@ 
  * @param string $key

  * @return array of languages that define the key in their file

  */

-function get_langs_by_key($key)

-{

+function get_langs_by_key($key)
+{
     global $lang_keys;

     $lang_return = array();

-    foreach ($lang_keys as $lang => $keys) {

-        if (in_array($key, $keys)) {

+    foreach ($lang_keys as $lang => $keys) {
+        if (in_array($key, $keys)) {
             $lang_return[] = $lang;

         }

     }

@@ -46,25 +46,25 @@ 
  * @param string $selected_lang specify language to select in option list, default none

  * @return string html option list

  */

-function get_lang_options($key = '', $selected_lang = '')

-{

+function get_lang_options($key = '', $selected_lang = '')
+{
     global $lang_keys, $_lang;

     $lang_options = '';

-    if (!empty($key)) {

+    if (!empty($key)) {
         $languages = get_langs_by_key($key);

         sort($languages);

         $lang_options .= '<option value="">' . $_lang['language_title'] . '</option>';

 

-        foreach ($languages as $language_name) {

+        foreach ($languages as $language_name) {
             $uclanguage_name = ucwords(str_replace("_", " ", $language_name));

             $lang_options .= '<option value="' . $language_name . '">' . $uclanguage_name . '</option>';

         }

 

         return $lang_options;

-    } else {

+    } else {
         $languages = array_keys($lang_keys);

         sort($languages);

-        foreach ($languages as $language_name) {

+        foreach ($languages as $language_name) {
             $uclanguage_name = ucwords(str_replace("_", " ", $language_name));

             $sel = $language_name === $selected_lang ? ' selected="selected"' : '';

             $lang_options .= '<option value="' . $language_name . '" ' . $sel . '>' . $uclanguage_name . '</option>';

@@ -81,17 +81,17 @@ 
  * @param bool $disabled

  * @return string

  */

-function form_radio($name, $value, $add = '', $disabled = false)

-{

+function form_radio($name, $value, $add = '', $disabled = false)
+{
     global ${$name};

     $var = ${$name};

     $checked = ($var == $value) ? ' checked="checked"' : '';

-    if ($disabled) {

+    if ($disabled) {
         $disabled = ' disabled';

-    } else {

+    } else {
         $disabled = '';

     }

-    if ($add) {

+    if ($add) {
         $add = ' ' . $add;

     }

 

@@ -104,8 +104,8 @@ 
  * @param string $object

  * @return string

  */

-function wrap_label($str = '', $object)

-{

+function wrap_label($str = '', $object)
+{
     return "<label>{$object}\n{$str}</label>";

 }

 

@@ -114,13 +114,13 @@ 
  * @param array $ph

  * @return string

  */

-function parseText($tpl = '', $ph = array())

-{

-    if (empty($ph) || empty($tpl)) {

+function parseText($tpl = '', $ph = array())
+{
+    if (empty($ph) || empty($tpl)) {
         return $tpl;

     }

 

-    foreach ($ph as $k => $v) {

+    foreach ($ph as $k => $v) {
         $k = "[+{$k}+]";

         $tpl = str_replace($k, $v, $tpl);

     }

@@ -132,8 +132,8 @@ 
  * @param bool $cond

  * @return string

  */

-function showHide($cond = true)

-{

+function showHide($cond = true)
+{
     global $displayStyle;

     $showHide = $cond ? $displayStyle : 'none';