evolution-cms / evolution

manager/includes/extenders/ex_managerapi.inc.php

Braces +2 added lines, -2 removed lines

@@ -5,9 +5,9 @@
  * Time: 14:16
  */
 
-if (!include_once MODX_MANAGER_PATH . 'includes/extenders/manager.api.class.inc.php'){
+if (!include_once MODX_MANAGER_PATH . 'includes/extenders/manager.api.class.inc.php') {
     return false;
-}else{
+} else {
     $this->manager= new ManagerAPI;
     return true;
 }
\ No newline at end of file

manager/includes/extenders/modifiers/mdf_moduser.inc.php

Braces +5 added lines, -2 removed lines

@@ -1,8 +1,11 @@
 <?php
 $userid = intval($value);
 if (!isset($modx->filter->cache['ui'][$userid])) {
-    if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
-    else             $user = $modx->getUserInfo($userid);
+    if ($userid < 0) {
+        $user = $modx->getWebUserInfo(abs($userid));
+    } else {
+        $user = $modx->getUserInfo($userid);
+    }
     $modx->filter->cache['ui'][$userid] = $user;
 } else {
     $user = $modx->filter->cache['ui'][$userid];

manager/includes/extenders/modifiers/mdf_getimage.inc.php

Braces +11 added lines, -10 removed lines

@@ -1,16 +1,17 @@
 <?php
 $pattern = '/<img[\s\n]+.*src=[\s\n]*"([^"]+\.(jpg|jpeg|png|gif))"[^>]+>/i';
 preg_match_all($pattern , $value , $images);
-if($opt==='')
-{
-    if($images[1][0])  return $images[1][0];
-    else               return '';
-}
-else
-{
-    foreach($images[0] as $i=>$image)
-    {
-        if(strpos($image,$opt)!==false) return $images[1][$i];
+if($opt==='') {
+    if($images[1][0]) {
+        return $images[1][0];
+    } else {
+        return '';
+    }
+    } else {
+    foreach($images[0] as $i=>$image) {
+        if(strpos($image,$opt)!==false) {
+            return $images[1][$i];
+        }
     }
 }
 

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

Braces +8 added lines, -7 removed lines

@@ -9,14 +9,15 @@
 $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 />";
 }

manager/includes/extenders/modifiers/mdf_summary.inc.php

Braces +28 added lines, -13 removed lines

@@ -1,9 +1,11 @@ 
 <?php
-if(strpos($opt,',')) list($limit,$delim) = explode(',', $opt);
-elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';}
-else {$limit=124;$delim='';}
+if(strpos($opt,',')) {
+    list($limit,$delim) = explode(',', $opt);
+} elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';} else {$limit=124;$delim='';}
 
-if($delim==='') $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
+if($delim==='') {
+    $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
+}
 $limit = intval($limit);
 
 $content = $modx->filter->parseDocumentSource($value);
@@ -11,8 +13,9 @@ 
 $content = strip_tags($content);
 
 $content = str_replace(array("\r\n","\r","\n","\t",'&nbsp;'),' ',$content);
-if(preg_match('/\s+/',$content))
+if(preg_match('/\s+/',$content)) {
     $content = preg_replace('/\s+/',' ',$content);
+}
 $content = trim($content);
 
 $pos = $modx->filter->strpos($content, $delim);
@@ -21,23 +24,35 @@ 
     $_ = explode($delim, $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.$delim)) break;
+        if($limit <= $modx->filter->strlen($text.$v.$delim)) {
+            break;
+        }
         $text .= $v.$delim;
     }
-    if($text) $content = $text;
-}
+    if($text) {
+        $content = $text;
+    }
+    }
 
 if($limit<$modx->filter->strlen($content) && strpos($content,' ')!==false) {
     $_ = explode(' ', $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.' ')) break;
+        if($limit <= $modx->filter->strlen($text.$v.' ')) {
+            break;
+        }
         $text .= $v . ' ';
     }
-    if($text!=='') $content = $text;
-}
+    if($text!=='') {
+        $content = $text;
+    }
+    }
 
-if($limit < $modx->filter->strlen($content)) $content = $modx->filter->substr($content, 0, $limit);
-if($modx->filter->substr($content,-1)==$delim) $content = rtrim($content,$delim) . $delim;
+if($limit < $modx->filter->strlen($content)) {
+    $content = $modx->filter->substr($content, 0, $limit);
+}
+if($modx->filter->substr($content,-1)==$delim) {
+    $content = rtrim($content,$delim) . $delim;
+}
 
 return $content;

manager/includes/extenders/modifiers/mdf_memberof.inc.php

Braces +10 added lines, -5 removed lines

@@ -5,11 +5,14 @@ 
 $groupNames = ($this->strlen($opt) > 0 ) ? explode(',',$opt) : array();
 
 // if $groupNames is not an array return false
-if(!is_array($groupNames)) return 0;
+if(!is_array($groupNames)) {
+    return 0;
+}
 
 // Creates an array with all webgroups the user id is in
-if (isset($modx->filter->cache['mo'][$userID])) $grpNames = $modx->filter->cache['mo'][$userID];
-else {
+if (isset($modx->filter->cache['mo'][$userID])) {
+    $grpNames = $modx->filter->cache['mo'][$userID];
+} else {
     $from = sprintf("[+prefix+]webgroup_names wgn INNER JOIN [+prefix+]web_groups wg ON wg.webgroup=wgn.id AND wg.webuser='%s'",$userID);
     $rs = $modx->db->select('wgn.name',$from);
     $modx->filter->cache['mo'][$userID] = $grpNames = $modx->db->getColumn('name',$rs);
@@ -17,8 +20,10 @@ 
 
 // Check if a supplied group matches a webgroup from the array we just created
 foreach($groupNames as $k=>$v) {
-    if(in_array(trim($v),$grpNames)) return 1;
-}
+    if(in_array(trim($v),$grpNames)) {
+        return 1;
+    }
+    }
 
 // If we get here the above logic did not find a match, so return false
 return 0;

manager/includes/extenders/ex_phpcompat.inc.php

Braces +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
  * Time: 12:25
  */
 
-if (isset($this->phpcompat) && is_object($this->phpcompat)){
+if (isset($this->phpcompat) && is_object($this->phpcompat)) {
     return true;
 }
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpcompat.class.inc.php')){
+if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpcompat.class.inc.php')) {
     return false;
-}else{
+} else {
     $this->phpcompat = new PHPCOMPAT;
     return true;
 }

manager/includes/extenders/ex_phpass.inc.php

Braces +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
  * Time: 19:14
  */
 
-if (isset($this->phpass) && is_object($this->phpass)){
+if (isset($this->phpass) && is_object($this->phpass)) {
     return true;
 }
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpass.class.inc.php')){
+if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpass.class.inc.php')) {
     return false;
-}else{
+} else {
     $this->phpass = new PasswordHash;
     return true;
 }
\ No newline at end of file

manager/includes/extenders/deprecated.functions.inc.php

Braces +66 added lines, -35 removed lines

@@ -1,16 +1,32 @@ 
 <?php
 $this->old = new OldFunctions();
-class OldFunctions {
+class OldFunctions
+{
     
-    function dbConnect()                 {global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
-    function dbQuery($sql)               {global $modx;return $modx->db->query($sql);}
-    function recordCount($rs)            {global $modx;return $modx->db->getRecordCount($rs);}
-    function fetchRow($rs,$mode='assoc') {global $modx;return $modx->db->getRow($rs, $mode);}
-    function affectedRows($rs)           {global $modx;return $modx->db->getAffectedRows($rs);}
-    function insertId($rs)               {global $modx;return $modx->db->getInsertId($rs);}
-    function dbClose()                   {global $modx;       $modx->db->disconnect();}
+    function dbConnect()
+    {
+global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
+    function dbQuery($sql)
+    {
+global $modx;return $modx->db->query($sql);}
+    function recordCount($rs)
+    {
+global $modx;return $modx->db->getRecordCount($rs);}
+    function fetchRow($rs,$mode='assoc')
+    {
+global $modx;return $modx->db->getRow($rs, $mode);}
+    function affectedRows($rs)
+    {
+global $modx;return $modx->db->getAffectedRows($rs);}
+    function insertId($rs)
+    {
+global $modx;return $modx->db->getInsertId($rs);}
+    function dbClose()
+    {
+global $modx;       $modx->db->disconnect();}
     
-    function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) {
+    function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0)
+    {
         // first find out whether the value passed is an array
         if (!is_array($array)) {
             return "<ul><li>Bad list</li></ul>";
@@ -37,7 +53,8 @@ 
     }
 
     
-    function getUserData() {
+    function getUserData()
+    {
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
     	return $client;
@@ -45,35 +62,42 @@ 
     
     # Returns true, install or interact when inside manager
     // deprecated
-    function insideManager() {
+    function insideManager()
+    {
         $m= false;
         if (defined('IN_MANAGER_MODE') && IN_MANAGER_MODE == 'true') {
             $m= true;
-            if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true')
-                $m= "interact";
-            else
-                if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true')
-                    $m= "install";
+            if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true') {
+                            $m= "interact";
+            } else
+                if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true') {
+                                    $m= "install";
+                }
         }
         return $m;
     }
 
     // deprecated
-    function putChunk($chunkName) { // alias name >.<
+    function putChunk($chunkName)
+    {
+// alias name >.<
     	global $modx;
         return $modx->getChunk($chunkName);
     }
 
-    function getDocGroups() {
+    function getDocGroups()
+    {
     	global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
-    function changePassword($o, $n) {
+    function changePassword($o, $n)
+    {
         return changeWebUserPassword($o, $n);
     } // deprecated
     
-    function userLoggedIn() {
+    function userLoggedIn()
+    {
     	global $modx;
         $userdetails= array ();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
@@ -96,18 +120,22 @@ 
             }
     }
     
-    function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
+    function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD)
+    {
         //  function to retrieve form results into an associative array
     	global $modx;
         $results= array ();
         $method= strtoupper($method);
-        if ($method == "")
-            $method= $REQUEST_METHOD;
-        if ($method == "POST")
-            $method= & $_POST;
-        elseif ($method == "GET") $method= & $_GET;
-        else
-            return false;
+        if ($method == "") {
+                    $method= $REQUEST_METHOD;
+        }
+        if ($method == "POST") {
+                    $method= & $_POST;
+        } elseif ($method == "GET") {
+            $method= & $_GET;
+        } else {
+                    return false;
+        }
         reset($method);
         foreach ($method as $key => $value) {
             if (($prefix != "") && (substr($key, 0, strlen($prefix)) == $prefix)) {
@@ -115,10 +143,12 @@ 
                     $pieces= explode($prefix, $key, 2);
                     $key= $pieces[1];
                     $results[$key]= $value;
-                } else
-                    $results[$key]= $value;
+                } else {
+                                    $results[$key]= $value;
+                }
+            } elseif ($prefix == "") {
+                $results[$key]= $value;
             }
-            elseif ($prefix == "") $results[$key]= $value;
         }
         return $results;
     }
@@ -129,7 +159,8 @@ 
      * @param string $msg Message to show
      * @param string $url URL to redirect to
      */
-    function webAlert($msg, $url= "") {
+    function webAlert($msg, $url= "")
+    {
     	global $modx;
         $msg= addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
@@ -139,9 +170,9 @@ 
             $act= ($url ? "window.location.href='" . addslashes($url) . "';" : "");
         }
         $html= "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
-        if ($modx->isFrontend())
-            $modx->regClientScript($html);
-        else {
+        if ($modx->isFrontend()) {
+                    $modx->regClientScript($html);
+        } else {
             echo $html;
         }
     }