evolution-cms / evolution

manager/includes/mutate_settings.ajax.php

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-require_once(dirname(__FILE__) . '/protect.inc.php');
+require_once(dirname(__FILE__).'/protect.inc.php');
 
 $action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']);
 $lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']);
@@ -23,13 +23,13 @@ 
 
 switch (true) {
     case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',
-            $lang) && file_exists(dirname(__FILE__) . '/lang/' . $lang . '.inc.php')): {
-        include(dirname(__FILE__) . '/lang/' . $lang . '.inc.php');
+            $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')): {
+        include(dirname(__FILE__).'/lang/'.$lang.'.inc.php');
         $str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : "";
         break;
     }
     case ($action == 'setsetting' && !empty($key) && !empty($value)): {
-        $sql = "REPLACE INTO " . $modx->getFullTableName("system_settings") . " (setting_name, setting_value) VALUES('{$key}', '{$value}');";
+        $sql = "REPLACE INTO ".$modx->getFullTableName("system_settings")." (setting_name, setting_value) VALUES('{$key}', '{$value}');";
         $str = "true";
         $modx->getDatabase()->query($sql);
         $emptyCache = true;

manager/includes/categories.inc.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     $newCat = $modx->getDatabase()->escape($newCat);
     $cats = $modx->getDatabase()->select('id', $modx->getFullTableName('categories'), "category='{$newCat}'");
     if ($cat = $modx->getDatabase()->getValue($cats)) {
-        return (int)$cat;
+        return (int) $cat;
     }
 
     return 0;

manager/includes/accesscontrol.inc.php

Spacing +36 added lines, -36 removed lines

@@ -18,13 +18,13 @@ 
 }
 
 // andrazk 20070416 - if installer is running, destroy active sessions
-if (file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
-    include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) {
+    include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
     if (isset($installStartTime)) {
         if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
             unset($installStartTime);
-            @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
-            unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+            @ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755);
+            unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
         } else {
             if ($_SERVER['REQUEST_METHOD'] != 'POST') {
                 if (isset($_COOKIE[session_name()])) {
@@ -50,7 +50,7 @@ 
                         //						setcookie(session_name(), '', 0, MODX_BASE_URL);
                     }
                     header('HTTP/1.0 307 Redirect');
-                    header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
+                    header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2');
                 }
             }
         }
@@ -62,7 +62,7 @@ 
         // establish fallback to English default
         include_once "lang/english.inc.php";
         // include localized overrides
-        include_once "lang/" . $manager_language . ".inc.php";
+        include_once "lang/".$manager_language.".inc.php";
     } else {
         include_once "lang/english.inc.php";
     }
@@ -70,7 +70,7 @@ 
     $modx->setPlaceholder('modx_charset', $modx_manager_charset);
     $modx->setPlaceholder('theme', $manager_theme);
     $modx->setPlaceholder('favicon',
-        (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico'));
+        (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico'));
 
     // invoke OnManagerLoginFormPrerender event
     $evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
@@ -81,25 +81,25 @@ 
     $modx->setPlaceholder('manager_path', MGR_DIR);
     $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
     $modx->setPlaceholder('login_message', $_lang["login_message"]);
-    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
     $modx->setPlaceholder('year', date('Y'));
 
     // set login logo image
-    if ( !empty($modx->config['login_logo']) ) {
-        $modx->setPlaceholder('login_logo', MODX_SITE_URL . $modx->config['login_logo']);
+    if (!empty($modx->config['login_logo'])) {
+        $modx->setPlaceholder('login_logo', MODX_SITE_URL.$modx->config['login_logo']);
     } else {
-        $modx->setPlaceholder('login_logo', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-logo.png');
+        $modx->setPlaceholder('login_logo', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-logo.png');
     }
 
     // set login background image
-    if ( !empty($modx->config['login_bg']) ) {
-        $modx->setPlaceholder('login_bg', MODX_SITE_URL . $modx->config['login_bg']);
+    if (!empty($modx->config['login_bg'])) {
+        $modx->setPlaceholder('login_bg', MODX_SITE_URL.$modx->config['login_bg']);
     } else {
-        $modx->setPlaceholder('login_bg', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-background.jpg');
+        $modx->setPlaceholder('login_bg', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-background.jpg');
     }
 
     // set form position css class
-    $modx->setPlaceholder('login_form_position_class', 'loginbox-' . $modx->config['login_form_position']);
+    $modx->setPlaceholder('login_form_position_class', 'loginbox-'.$modx->config['login_form_position']);
 
     switch ($modx->config['manager_theme_mode']) {
       case '1':
@@ -124,11 +124,11 @@ 
         switch ($installGoingOn) {
             case 1 :
                 $modx->setPlaceholder('login_message',
-                    "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>");
+                    "<p><span class=\"fail\">".$_lang["login_cancelled_install_in_progress"]."</p><p>".$_lang["login_message"]."</p>");
                 break;
             case 2 :
                 $modx->setPlaceholder('login_message',
-                    "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>");
+                    "<p><span class=\"fail\">".$_lang["login_cancelled_site_was_updated"]."</p><p>".$_lang["login_message"]."</p>");
                 break;
         }
     }
@@ -136,9 +136,9 @@ 
     if ($modx->config['use_captcha'] == 1) {
         $modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]);
         $modx->setPlaceholder('captcha_image',
-            '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'captcha.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
+            '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'captcha.php?rand='.rand().'" alt="'.$_lang["login_captcha_message"].'" /></a>');
         $modx->setPlaceholder('captcha_input',
-            '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
+            '<label>'.$_lang["captcha_code"].'</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
     }
 
     // login info
@@ -156,7 +156,7 @@ 
 
     // invoke OnManagerLoginFormRender event
     $evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
-    $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
+    $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : '';
     $modx->setPlaceholder('OnManagerLoginFormRender', $html);
 
     // load template
@@ -174,29 +174,29 @@ 
             $login_tpl = file_get_contents($target);
         }
     } else {
-        $theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/';
-        if (is_file($theme_path . 'style.php')) {
-            include($theme_path . 'style.php');
+        $theme_path = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/';
+        if (is_file($theme_path.'style.php')) {
+            include($theme_path.'style.php');
         }
         $chunk = $modx->getChunk($target);
         if ($chunk !== false && !empty($chunk)) {
             $login_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;
             $login_tpl = file_get_contents($target);
         } elseif (is_file($target)) {
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'login.tpl')) {
-            $target = $theme_path . 'login.tpl';
+        } elseif (is_file($theme_path.'login.tpl')) {
+            $target = $theme_path.'login.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'templates/actions/login.tpl')) {
-            $target = $theme_path . 'templates/actions/login.tpl';
+        } elseif (is_file($theme_path.'templates/actions/login.tpl')) {
+            $target = $theme_path.'templates/actions/login.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
-            $target = $theme_path . 'html/login.html';
+        } elseif (is_file($theme_path.'html/login.html')) { // ClipperCMS compatible
+            $target = $theme_path.'html/login.html';
             $login_tpl = file_get_contents($target);
         } else {
-            $target = MODX_MANAGER_PATH . 'media/style/common/login.tpl';
+            $target = MODX_MANAGER_PATH.'media/style/common/login.tpl';
             $login_tpl = file_get_contents($target);
         }
     }
@@ -216,17 +216,17 @@ 
     $modx->updateValidatedUserSession();
 
     // Update last action in table active_users
-    $itemid = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';
+    $itemid = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';
     $lasthittime = time();
-    $action = isset($_REQUEST['a']) ? (int)$_REQUEST['a'] : 1;
+    $action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
 
     if ($action !== 1) {
-        if ((int)$itemid <= 0) {
+        if ((int) $itemid <= 0) {
             $itemid = null;
         }
         $sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)",
             $modx->getFullTableName('active_users') // Table
-            , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string)$action,
+            , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string) $action,
             $itemid == null ? var_export(null, true) : $itemid);
         $modx->getDatabase()->query($sql);
     }

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

Spacing +1 added lines, -1 removed lines

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

Braces +5 added lines, -2 removed lines

@@ -1,8 +1,11 @@
 <?php
 $userid = (int)$value;
 if (!isset($modx->getModifiers()->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->getModifiers()->cache['ui'][$userid] = $user;
 } else {
     $user = $modx->getModifiers()->cache['ui'][$userid];

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

Spacing +19 added lines, -19 removed lines

@@ -1,43 +1,43 @@
 <?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' ? '。' : '.';
-$limit = (int)$limit;
+if ($delim === '') $delim = $modx->config['manager_language'] === 'japanese-utf8' ? '。' : '.';
+$limit = (int) $limit;
 
 $content = $modx->getModifiers()->parseDocumentSource($value);
 
 $content = strip_tags($content);
 
-$content = str_replace(array("\r\n","\r","\n","\t",'&nbsp;'),' ',$content);
-if(preg_match('/\s+/',$content))
-    $content = preg_replace('/\s+/',' ',$content);
+$content = str_replace(array("\r\n", "\r", "\n", "\t", '&nbsp;'), ' ', $content);
+if (preg_match('/\s+/', $content))
+    $content = preg_replace('/\s+/', ' ', $content);
 $content = trim($content);
 
 $pos = $modx->getModifiers()->strpos($content, $delim);
 
-if($pos!==false && $pos<$limit) {
+if ($pos !== false && $pos < $limit) {
     $_ = explode($delim, $content);
     $text = '';
-    foreach($_ as $v) {
-        if($limit <= $modx->getModifiers()->strlen($text.$v.$delim)) break;
+    foreach ($_ as $v) {
+        if ($limit <= $modx->getModifiers()->strlen($text.$v.$delim)) break;
         $text .= $v.$delim;
     }
-    if($text) $content = $text;
+    if ($text) $content = $text;
 }
 
-if($limit<$modx->getModifiers()->strlen($content) && strpos($content,' ')!==false) {
+if ($limit < $modx->getModifiers()->strlen($content) && strpos($content, ' ') !== false) {
     $_ = explode(' ', $content);
     $text = '';
-    foreach($_ as $v) {
-        if($limit <= $modx->getModifiers()->strlen($text.$v.' ')) break;
-        $text .= $v . ' ';
+    foreach ($_ as $v) {
+        if ($limit <= $modx->getModifiers()->strlen($text.$v.' ')) break;
+        $text .= $v.' ';
     }
-    if($text!=='') $content = $text;
+    if ($text !== '') $content = $text;
 }
 
-if($limit < $modx->getModifiers()->strlen($content)) $content = $modx->getModifiers()->substr($content, 0, $limit);
-if($modx->getModifiers()->substr($content,-1)==$delim) $content = rtrim($content,$delim) . $delim;
+if ($limit < $modx->getModifiers()->strlen($content)) $content = $modx->getModifiers()->substr($content, 0, $limit);
+if ($modx->getModifiers()->substr($content, -1) == $delim) $content = rtrim($content, $delim).$delim;
 
 return $content;

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 = (int)$limit;
 
 $content = $modx->getModifiers()->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->getModifiers()->strpos($content, $delim);
@@ -21,23 +24,35 @@ 
     $_ = explode($delim, $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->getModifiers()->strlen($text.$v.$delim)) break;
+        if($limit <= $modx->getModifiers()->strlen($text.$v.$delim)) {
+            break;
+        }
         $text .= $v.$delim;
     }
-    if($text) $content = $text;
-}
+    if($text) {
+        $content = $text;
+    }
+    }
 
 if($limit<$modx->getModifiers()->strlen($content) && strpos($content,' ')!==false) {
     $_ = explode(' ', $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->getModifiers()->strlen($text.$v.' ')) break;
+        if($limit <= $modx->getModifiers()->strlen($text.$v.' ')) {
+            break;
+        }
         $text .= $v . ' ';
     }
-    if($text!=='') $content = $text;
-}
+    if($text!=='') {
+        $content = $text;
+    }
+    }
 
-if($limit < $modx->getModifiers()->strlen($content)) $content = $modx->getModifiers()->substr($content, 0, $limit);
-if($modx->getModifiers()->substr($content,-1)==$delim) $content = rtrim($content,$delim) . $delim;
+if($limit < $modx->getModifiers()->strlen($content)) {
+    $content = $modx->getModifiers()->substr($content, 0, $limit);
+}
+if($modx->getModifiers()->substr($content,-1)==$delim) {
+    $content = rtrim($content,$delim) . $delim;
+}
 
 return $content;

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

Spacing +7 added lines, -7 removed lines

@@ -2,22 +2,22 @@
 $userID = abs($modx->getLoginUserID('web'));
 $modx->qs_hash = md5($modx->qs_hash."^{$userID}^");
 
-$groupNames = ($this->strlen($opt) > 0 ) ? explode(',',$opt) : array();
+$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->getModifiers()->cache['mo'][$userID])) $grpNames = $modx->getModifiers()->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->getDatabase()->select('wgn.name',$from);
-    $modx->getModifiers()->cache['mo'][$userID] = $grpNames = $modx->getDatabase()->getColumn('name',$rs);
+    $from = sprintf("[+prefix+]webgroup_names wgn INNER JOIN [+prefix+]web_groups wg ON wg.webgroup=wgn.id AND wg.webuser='%s'", $userID);
+    $rs = $modx->getDatabase()->select('wgn.name', $from);
+    $modx->getModifiers()->cache['mo'][$userID] = $grpNames = $modx->getDatabase()->getColumn('name', $rs);
 }
 
 // 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;
+foreach ($groupNames as $k=>$v) {
+    if (in_array(trim($v), $grpNames)) return 1;
 }
 
 // If we get here the above logic did not find a match, so return false

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->getModifiers()->cache['mo'][$userID])) $grpNames = $modx->getModifiers()->cache['mo'][$userID];
-else {
+if (isset($modx->getModifiers()->cache['mo'][$userID])) {
+    $grpNames = $modx->getModifiers()->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->getDatabase()->select('wgn.name',$from);
     $modx->getModifiers()->cache['mo'][$userID] = $grpNames = $modx->getDatabase()->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/modifiers/mdf_addbreak.inc.php

Spacing +6 added lines, -6 removed lines

@@ -1,21 +1,21 @@
 <?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 />";

manager/includes/functions/processors.php

Spacing +32 added lines, -32 removed lines

@@ -36,7 +36,7 @@ 
     }
 }
 
-if(!function_exists('duplicateDocument')) {
+if (!function_exists('duplicateDocument')) {
     /**
      * @param int $docid
      * @param null|int $parent
@@ -90,12 +90,12 @@ 
             $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('pagetitle', $modx->getFullTableName('site_content'),
                 "pagetitle LIKE '{$pagetitle} Duplicate%'"));
             if ($count >= 1) {
-                $count = ' ' . ($count + 1);
+                $count = ' '.($count + 1);
             } else {
                 $count = '';
             }
 
-            $content['pagetitle'] = $_lang['duplicated_el_suffix'] . $count . ' ' . $content['pagetitle'];
+            $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
             $content['alias'] = null;
         } elseif ($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
             $content['alias'] = null;
@@ -153,7 +153,7 @@ 
     }
 }
 
-if(!function_exists('duplicateTVs')) {
+if (!function_exists('duplicateTVs')) {
     /**
      * Duplicate Document TVs
      *
@@ -166,8 +166,8 @@ 
 
         $tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
 
-        $newid = (int)$newid;
-        $oldid = (int)$oldid;
+        $newid = (int) $newid;
+        $oldid = (int) $oldid;
 
         $modx->getDatabase()->insert(
             array('contentid' => '', 'tmplvarid' => '', 'value' => ''), $tbltvc, // Insert into
@@ -176,7 +176,7 @@ 
     }
 }
 
-if(!function_exists('duplicateAccess')) {
+if (!function_exists('duplicateAccess')) {
     /**
      * Duplicate Document Access Permissions
      *
@@ -189,8 +189,8 @@ 
 
         $tbldg = $modx->getFullTableName('document_groups');
 
-        $newid = (int)$newid;
-        $oldid = (int)$oldid;
+        $newid = (int) $newid;
+        $oldid = (int) $oldid;
 
         $modx->getDatabase()->insert(
             array('document' => '', 'document_group' => ''), $tbldg, // Insert into
@@ -199,7 +199,7 @@ 
     }
 }
 
-if(!function_exists('evalModule')) {
+if (!function_exists('evalModule')) {
     /**
      * evalModule
      *
@@ -235,17 +235,17 @@ 
             }
             if ($modx->config['error_reporting'] === '99' || 2 < $error_level) {
                 $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'],
-                    $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
+                    $_SESSION['itemname'].' - Module', $error_info['message'], $error_info['line'], $msg);
                 $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
             }
         }
         unset($modx->event->params);
 
-        return $mod . $msg;
+        return $mod.$msg;
     }
 }
 
-if(!function_exists('allChildren')) {
+if (!function_exists('allChildren')) {
     /**
      * @param int $currDocID
      * @return array
@@ -265,7 +265,7 @@ 
     }
 }
 
-if(!function_exists('jsAlert')) {
+if (!function_exists('jsAlert')) {
     /**
      * show javascript alert
      *
@@ -275,14 +275,14 @@ 
     {
         $modx = evolutionCMS();
         if ($_POST['ajax'] != 1) {
-            echo "<script>window.setTimeout(\"alert('" . addslashes($modx->getDatabase()->escape($msg)) . "')\",10);history.go(-1)</script>";
+            echo "<script>window.setTimeout(\"alert('".addslashes($modx->getDatabase()->escape($msg))."')\",10);history.go(-1)</script>";
         } else {
-            echo $msg . "\n";
+            echo $msg."\n";
         }
     }
 }
 
-if(!function_exists('login')) {
+if (!function_exists('login')) {
     /**
      * @param string $username
      * @param string $givenPassword
@@ -297,7 +297,7 @@ 
     }
 }
 
-if(!function_exists('loginV1')) {
+if (!function_exists('loginV1')) {
     /**
      * @param int $internalKey
      * @param string $givenPassword
@@ -330,7 +330,7 @@ 
     }
 }
 
-if(!function_exists('loginMD5')) {
+if (!function_exists('loginMD5')) {
     /**
      * @param int $internalKey
      * @param string $givenPassword
@@ -351,7 +351,7 @@ 
     }
 }
 
-if(!function_exists('updateNewHash')) {
+if (!function_exists('updateNewHash')) {
     /**
      * @param string $username
      * @param string $password
@@ -366,7 +366,7 @@ 
     }
 }
 
-if(!function_exists('incrementFailedLoginCount')) {
+if (!function_exists('incrementFailedLoginCount')) {
     /**
      * @param int $internalKey
      * @param int $failedlogins
@@ -389,7 +389,7 @@ 
 
         if ($failedlogins < $failed_allowed) {
             //sleep to help prevent brute force attacks
-            $sleep = (int)$failedlogins / 2;
+            $sleep = (int) $failedlogins / 2;
             if ($sleep > 5) {
                 $sleep = 5;
             }
@@ -402,7 +402,7 @@ 
     }
 }
 
-if(!function_exists('saveUserGroupAccessPermissons')) {
+if (!function_exists('saveUserGroupAccessPermissons')) {
     /**
      * saves module user group access
      */
@@ -433,7 +433,7 @@ 
     }
 }
 
-if(!function_exists('saveEventListeners')) {
+if (!function_exists('saveEventListeners')) {
 # Save Plugin Event Listeners
     function saveEventListeners($id, $sysevents, $mode)
     {
@@ -486,7 +486,7 @@ 
     }
 }
 
-if(!function_exists('getEventIdByName')) {
+if (!function_exists('getEventIdByName')) {
     /**
      * @param string $name
      * @return string|int
@@ -509,7 +509,7 @@ 
     }
 }
 
-if(!function_exists('saveTemplateAccess')) {
+if (!function_exists('saveTemplateAccess')) {
     /**
      * @param int $id
      */
@@ -548,7 +548,7 @@ 
     }
 }
 
-if(!function_exists('saveTemplateVarAccess')) {
+if (!function_exists('saveTemplateVarAccess')) {
     /**
      * @return void
      */
@@ -587,7 +587,7 @@ 
     }
 }
 
-if(!function_exists('saveDocumentAccessPermissons')) {
+if (!function_exists('saveDocumentAccessPermissons')) {
     function saveDocumentAccessPermissons()
     {
         global $id, $newid;
@@ -756,10 +756,10 @@ 
         }
 
         foreach ($defaults as $k) {
-            if (isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
+            if (isset($settings['default_'.$k]) && $settings['default_'.$k] == '1') {
                 unset($settings[$k]);
             }
-            unset($settings['default_' . $k]);
+            unset($settings['default_'.$k]);
         }
 
         $modx->getDatabase()->delete($tbl_user_settings, "user='{$id}'");
@@ -791,7 +791,7 @@ 
         global $id, $modx;
         $mode = $_POST['mode'];
         $modx->getManagerApi()->saveFormValues($mode);
-        $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode === $action ? "&id={$id}" : ''));
+        $modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode === $action ? "&id={$id}" : ''));
     }
 }
 
@@ -807,7 +807,7 @@ 
         global $deltime;
 
         $rs = $modx->getDatabase()->select('id', $modx->getFullTableName('site_content'),
-            "parent='" . (int)$parent . "' AND deleted=1 AND deletedon='" . (int)$deltime . "'");
+            "parent='".(int) $parent."' AND deleted=1 AND deletedon='".(int) $deltime."'");
         // the document has children documents, we'll need to delete those too
         while ($row = $modx->getDatabase()->getRow($rs)) {
             $children[] = $row['id'];

Braces +3 added lines, -1 removed lines

@@ -380,10 +380,12 @@
         $failedlogins += 1;
 
         $fields = array('failedlogincount' => $failedlogins);
-        if ($failedlogins >= $failed_allowed) //block user for too many fail attempts
+        if ($failedlogins >= $failed_allowed) {
+            //block user for too many fail attempts
         {
             $fields['blockeduntil'] = time() + ($blocked_minutes * 60);
         }
+        }
 
         $modx->getDatabase()->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 

manager/includes/functions/actions/import.php

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!function_exists('run')) {
+if (!function_exists('run')) {
     /**
      * @return string
      */
@@ -28,12 +28,12 @@ 
             $modx->getDatabase()->query("ALTER TABLE {$tbl_site_content} AUTO_INCREMENT = 1");
         }
 
-        $parent = (int)$_POST['parent'];
+        $parent = (int) $_POST['parent'];
 
-        if (is_dir(MODX_BASE_PATH . 'temp/import')) {
-            $filedir = MODX_BASE_PATH . 'temp/import/';
-        } elseif (is_dir(MODX_BASE_PATH . 'assets/import')) {
-            $filedir = MODX_BASE_PATH . 'assets/import/';
+        if (is_dir(MODX_BASE_PATH.'temp/import')) {
+            $filedir = MODX_BASE_PATH.'temp/import/';
+        } elseif (is_dir(MODX_BASE_PATH.'assets/import')) {
+            $filedir = MODX_BASE_PATH.'assets/import/';
         } else {
             $filedir = '';
         }
@@ -44,7 +44,7 @@ 
         $files = pop_index($files);
 
         // no. of files to import
-        $output .= sprintf('<p>' . $_lang['import_files_found'] . '</p>', $filesfound);
+        $output .= sprintf('<p>'.$_lang['import_files_found'].'</p>', $filesfound);
 
         // import files
         if (0 < count($files)) {
@@ -57,7 +57,7 @@ 
         $mtime = $mtime[1] + $mtime[0];
         $importend = $mtime;
         $totaltime = ($importend - $importstart);
-        $output .= sprintf('<p>' . $_lang['import_site_time'] . '</p>', round($totaltime, 3));
+        $output .= sprintf('<p>'.$_lang['import_site_time'].'</p>', round($totaltime, 3));
 
         if ($_POST['convert_link'] == 'on') {
             convertLink();
@@ -67,7 +67,7 @@ 
     }
 }
 
-if(!function_exists('importFiles')) {
+if (!function_exists('importFiles')) {
     /**
      * @param int $parent
      * @param string $filedir
@@ -98,7 +98,7 @@ 
             if (is_array($value)) {
                 // create folder
                 $alias = $id;
-                printf('<span>' . $_lang['import_site_importing_document'] . '</span>', $alias);
+                printf('<span>'.$_lang['import_site_importing_document'].'</span>', $alias);
                 $field = array();
                 $field['type'] = 'document';
                 $field['contentType'] = 'text/html';
@@ -117,7 +117,7 @@ 
                              'index.html',
                              'index.htm'
                          ) as $filename) {
-                    $filepath = $filedir . $alias . '/' . $filename;
+                    $filepath = $filedir.$alias.'/'.$filename;
                     if ($find === false && file_exists($filepath)) {
                         $file = getFileContent($filepath);
                         list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
@@ -132,10 +132,10 @@ 
                         $newid = $modx->getDatabase()->insert($field, $tbl_site_content);
                         if ($newid) {
                             $find = true;
-                            echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-                            importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+                            echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
+                            importFiles($newid, $filedir.$alias.'/', $value, 'sub');
                         } else {
-                            echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->getDatabase()->getLastError();
+                            echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->getDatabase()->getLastError();
                             exit;
                         }
                     }
@@ -150,10 +150,10 @@ 
                     $newid = $modx->getDatabase()->insert($field, $tbl_site_content);
                     if ($newid) {
                         $find = true;
-                        echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-                        importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+                        echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
+                        importFiles($newid, $filedir.$alias.'/', $value, 'sub');
                     } else {
-                        echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->getDatabase()->getLastError();
+                        echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->getDatabase()->getLastError();
                         exit;
                     }
                 }
@@ -166,12 +166,12 @@ 
                 $fparts = explode('.', $value);
                 $alias = $fparts[0];
                 $ext = (count($fparts) > 1) ? $fparts[count($fparts) - 1] : "";
-                printf("<span>" . $_lang['import_site_importing_document'] . "</span>", $filename);
+                printf("<span>".$_lang['import_site_importing_document']."</span>", $filename);
 
                 if (!in_array($ext, $allowedfiles)) {
-                    echo ' - <span class="fail">' . $_lang["import_site_skip"] . '</span><br />' . "\n";
+                    echo ' - <span class="fail">'.$_lang["import_site_skip"].'</span><br />'."\n";
                 } else {
-                    $filepath = $filedir . $filename;
+                    $filepath = $filedir.$filename;
                     $file = getFileContent($filepath);
                     list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
 
@@ -197,9 +197,9 @@ 
                     $field['menuindex'] = ($alias == 'index') ? 0 : 2;
                     $newid = $modx->getDatabase()->insert($field, $tbl_site_content);
                     if ($newid) {
-                        echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
+                        echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
                     } else {
-                        echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->getDatabase()->getLastError();
+                        echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->getDatabase()->getLastError();
                         exit;
                     }
 
@@ -218,7 +218,7 @@ 
     }
 }
 
-if(!function_exists('getFiles')) {
+if (!function_exists('getFiles')) {
     /**
      * @param string $directory
      * @param array $listing
@@ -234,10 +234,10 @@ 
             foreach ($files as $file) {
                 if ($file == '.' || $file == '..') {
                     continue;
-                } elseif ($h = @opendir($directory . $file . "/")) {
+                } elseif ($h = @opendir($directory.$file."/")) {
                     closedir($h);
                     $count = -1;
-                    $listing[$file] = getFiles($directory . $file . "/", array(), $count + 1);
+                    $listing[$file] = getFiles($directory.$file."/", array(), $count + 1);
                 } elseif (strpos($file, '.htm') !== false) {
                     $listing[$dummy] = $file;
                     $dummy = $dummy + 1;
@@ -245,14 +245,14 @@ 
                 }
             }
         } else {
-            echo '<p><span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_no_open_dir"] . $directory . ".</p>";
+            echo '<p><span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_no_open_dir"].$directory.".</p>";
         }
 
         return ($listing);
     }
 }
 
-if(!function_exists('getFileContent')) {
+if (!function_exists('getFileContent')) {
     /**
      * @param string $filepath
      * @return bool|string
@@ -262,14 +262,14 @@ 
         global $_lang;
         // get the file
         if (!$buffer = file_get_contents($filepath)) {
-            echo '<p><span class="fail">' . $_lang['import_site_failed'] . "</span> " . $_lang["import_site_failed_no_retrieve_file"] . $filepath . ".</p>";
+            echo '<p><span class="fail">'.$_lang['import_site_failed']."</span> ".$_lang["import_site_failed_no_retrieve_file"].$filepath.".</p>";
         } else {
             return $buffer;
         }
     }
 }
 
-if(!function_exists('pop_index')) {
+if (!function_exists('pop_index')) {
     /**
      * @param array $array
      * @return array
@@ -294,7 +294,7 @@ 
     }
 }
 
-if(!function_exists('treatContent')) {
+if (!function_exists('treatContent')) {
     /**
      * @param string $src
      * @param string $filename
@@ -329,7 +329,7 @@ 
         } else {
             $content = $src;
             $s = '/(<meta[^>]+charset\s*=)[^>"\'=]+(.+>)/i';
-            $r = '$1' . $modx->config['modx_charset'] . '$2';
+            $r = '$1'.$modx->config['modx_charset'].'$2';
             $content = preg_replace($s, $r, $content);
             $content = preg_replace('@<title>.*</title>@i', "<title>[*pagetitle*]</title>", $content);
         }
@@ -345,7 +345,7 @@ 
     }
 }
 
-if(!function_exists('convertLink')) {
+if (!function_exists('convertLink')) {
     /**
      * @return void
      */
@@ -368,7 +368,7 @@ 
                     list($href, $v) = explode('"', $v, 2);
                     $_ = $href;
                     if (strpos($_, $modx->config['site_url']) !== false) {
-                        $_ = $modx->config['base_url'] . str_replace($modx->config['site_url'], '', $_);
+                        $_ = $modx->config['base_url'].str_replace($modx->config['site_url'], '', $_);
                     }
                     if ($_[0] === '/') {
                         $_ = substr($_, 1);
@@ -395,15 +395,15 @@ 
                     if (strpos($_, '/') !== false) {
                         $_ = substr($_, strrpos($_, '/'));
                     }
-                    $_ = $dir . str_replace('.html', '', $_);
+                    $_ = $dir.str_replace('.html', '', $_);
                     if (!isset($target[$_])) {
                         $target[$_] = $modx->getIdFromAlias($_);
                     }
                     $target[$_] = trim($target[$_]);
                     if (!empty($target[$_])) {
-                        $href = '[~' . $target[$_] . '~]';
+                        $href = '[~'.$target[$_].'~]';
                     }
-                    $array[$c] = '<a href="' . $href . '"' . $v;
+                    $array[$c] = '<a href="'.$href.'"'.$v;
                 }
                 $c++;
             }