evolution-cms / evolution

manager/includes/document.parser.class.inc.php

Braces +55 added lines, -26 removed lines

@@ -695,13 +695,15 @@ 
             $this->virtualDir = '';
         }
 
-        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
+        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) {
+/* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
                 if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
-                } else { /* not a valid id in terms of virtualDir, treat as alias */
+                } else {
+/* not a valid id in terms of virtualDir, treat as alias */
                     $this->documentMethod = 'alias';
                     return $q;
                 }
@@ -709,7 +711,8 @@ 
                 $this->documentMethod = 'id';
                 return $q;
             }
-        } else { /* we didn't get an ID back, so instead we assume it's an alias */
+        } else {
+/* we didn't get an ID back, so instead we assume it's an alias */
             if ($this->config['friendly_alias_urls'] != 1) {
                 $q = $qOrig;
             }
@@ -739,13 +742,14 @@ 
      * @param $id
      * @return array|mixed|null|string
      */
-    public function makePageCacheKey($id){
+    public function makePageCacheKey($id)
+    {
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if(!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -754,7 +758,7 @@ 
             }
         }
         $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -1165,10 +1169,18 @@ 
             return array();
         }
         $spacer = md5('<<<EVO>>>');
-        if($left==='{{' && strpos($content,';}}')!==false)  $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
-        if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
-        if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
-        if($left==='[[' && strpos($content,']]]')!==false)  $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        if($left==='{{' && strpos($content,';}}')!==false) {
+            $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
+        }
+        if($left==='{{' && strpos($content,'{{}}')!==false) {
+            $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]]')!==false) {
+            $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]')!==false) {
+            $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        }
 
         $pos['<![CDATA['] = strpos($content, '<![CDATA[');
         $pos[']]>'] = strpos($content, ']]>');
@@ -1221,7 +1233,8 @@ 
                         }
                     }
 
-                    if (!in_array($fetch, $tags)) {  // Avoid double Matches
+                    if (!in_array($fetch, $tags)) {
+// Avoid double Matches
                         $tags[] = $fetch; // Fetch
                     };
                     $fetch = ''; // and reset
@@ -1239,7 +1252,9 @@ 
             }
         }
         foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+            if(strpos($tag,$spacer)!==false) {
+                $tags[$i] = str_replace($spacer, '', $tag);
+            }
         }
         return $tags;
     }
@@ -1279,7 +1294,10 @@ 
         }
 
         foreach ($matches[1] as $i => $key) {
-            if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
+            if(strpos($key,'[+')!==false) {
+                continue;
+            }
+            // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
             if (substr($key, 0, 1) == '#') {
                 $key = substr($key, 1);
             } // remove # for QuickEdit format
@@ -2004,7 +2022,8 @@ 
      * @return mixed|string
      */
     public function _getSGVar($value)
-    { // Get super globals
+    {
+// Get super globals
         $key = $value;
         $_ = $this->config['enable_filter'];
         $this->config['enable_filter'] = 1;
@@ -2409,7 +2428,8 @@ 
         if ($this->config['friendly_urls'] == 1) {
             $aliases = array();
             if (is_array($this->documentListing)) {
-                foreach ($this->documentListing as $path => $docid) { // This is big Loop on large site!
+                foreach ($this->documentListing as $path => $docid) {
+// This is big Loop on large site!
                     $aliases[$docid] = $path;
                     $isfolder[$docid] = $this->aliasListing[$docid]['isfolder'];
                 }
@@ -2442,7 +2462,7 @@ 
             $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
             $pref = $this->config['friendly_url_prefix'];
             $suff = $this->config['friendly_url_suffix'];
-            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
+            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff){
                 global $modx;
                 $thealias = $aliases[$m[1]];
                 $thefolder = $isfolder[$m[1]];
@@ -4214,7 +4234,8 @@ 
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
             $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
-        } else { // not in cache so let's check the db
+        } else {
+// not in cache so let's check the db
             $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "'  AND ss.disabled=0;";
             $result = $this->db->query($sql);
             if ($this->db->getRecordCount($result) == 1) {
@@ -4718,7 +4739,7 @@ 
             $result = $this->db->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if(is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -5197,12 +5218,16 @@ 
             return '';
         } // nothing to register
         if (!is_array($options)) {
-            if (is_bool($options))  // backward compatibility with old plaintext parameter
+            if (is_bool($options)) {
+                // backward compatibility with old plaintext parameter
             {
                 $options = array('plaintext' => $options);
-            } elseif (is_string($options)) // Also allow script name as 2nd param
+            }
+            } elseif (is_string($options)) {
+                // Also allow script name as 2nd param
             {
                 $options = array('name' => $options);
+            }
             } else {
                 $options = array();
             }
@@ -5214,7 +5239,8 @@ 
         unset($overwritepos); // probably unnecessary--just making sure
 
         $useThisVer = true;
-        if (isset($this->loadedjscripts[$key])) { // a matching script was found
+        if (isset($this->loadedjscripts[$key])) {
+// a matching script was found
             // if existing script is a startup script, make sure the candidate is also a startup script
             if ($this->loadedjscripts[$key]['startup']) {
                 $startup = true;
@@ -5234,7 +5260,8 @@ 
                     // overwrite the old script (the position may be important for dependent scripts)
                     $overwritepos = $this->loadedjscripts[$key]['pos'];
                 }
-            } else { // Use the original version
+            } else {
+// Use the original version
                 if ($startup == true && $this->loadedjscripts[$key]['startup'] == false) {
                     // need to move the exisiting script to the head
                     $version = $this->loadedjscripts[$key][$version];
@@ -5358,7 +5385,8 @@ 
         }
 
         $results = null;
-        foreach ($this->pluginEvent[$evtName] as $pluginName) { // start for loop
+        foreach ($this->pluginEvent[$evtName] as $pluginName) {
+// start for loop
             if ($this->dumpPlugins) {
                 $eventtime = $this->getMicroTime();
             }
@@ -5906,7 +5934,8 @@ 
      * @return bool
      */
     public function isSafeCode($phpcode = '', $safe_functions = '')
-    { // return true or false
+    {
+// return true or false
         if ($safe_functions == '') {
             return false;
         }
@@ -6322,7 +6351,7 @@ 
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val){
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg): {

manager/includes/extenders/ex_modifiers.inc.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * Time: 10:00
  */
 
-if (isset($this->filter) && is_object($this->filter)) return true;
+if (isset($this->filter) && is_object($this->filter)) {
+    return true;
+}
 
 include_once(MODX_MANAGER_PATH.'includes/extenders/modifiers.class.inc.php');
 $this->filter = new MODIFIERS;

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/includes/veriword.php

Braces +16 added lines, -8 removed lines

@@ -41,7 +41,8 @@ 
 ## see sample.php for test and usage
 ## sample URL: http://www.program-ruti.org/veriword/
 ####
-class VeriWord {
+class VeriWord
+{
 
     /* path to font directory*/
     public $dir_font   = "ttf/";
@@ -51,7 +52,8 @@ 
     public $im_width   = 0;
     public $im_height  = 0;
 
-    public function __construct($w=200, $h=80) {
+    public function __construct($w=200, $h=80)
+    {
         /* create session to set word for verification */
         $this->set_veriword();
         $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font;
@@ -59,21 +61,24 @@ 
         $this->im_height        = $h;
     }
 
-    public function set_veriword() {
+    public function set_veriword()
+    {
         /* create session variable for verification,
            you may change the session variable name */
         $this->word             = $this->pick_word();
         $_SESSION['veriword']   = $this->word;
     }
 
-    public function output_image() {
+    public function output_image()
+    {
         /* output the image as jpeg */
         $this->draw_image();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    public function pick_word() {
+    public function pick_word()
+    {
         global $modx;
         // set default words
         $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
@@ -84,7 +89,8 @@ 
         return (string) $arr_words[array_rand($arr_words)].rand(10,999);
     }
 
-    public function draw_text() {
+    public function draw_text()
+    {
         $dir = dir($this->dir_font);
         $fontstmp = array();
         while (false !== ($file = $dir->read())) {
@@ -139,7 +145,8 @@ 
     }
 
 
-    public function draw_image() {
+    public function draw_image()
+    {
 
         /* pick one background image randomly from image directory */
         $img_file       = $this->dir_noise."noise".rand(1,4).".jpg";
@@ -170,7 +177,8 @@ 
         return $this->im;
     }
 
-    public function destroy_image() {
+    public function destroy_image()
+    {
 
         imagedestroy($this->im);