evolution-cms / evolution

manager/includes/extenders/phpass.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 
         $this->portable_hashes = $portable_hashes;
 
-        $this->random_state = microtime() . uniqid(mt_rand(), true);
+        $this->random_state = microtime().uniqid(mt_rand(), true);
     }
 
     /**
@@ -68,7 +68,7 @@ 
             $output = '';
             for ($i = 0; $i < $count; $i += 16) {
                 $this->random_state =
-                    md5(microtime() . $this->random_state);
+                    md5(microtime().$this->random_state);
                 $output .=
                     pack('H*', md5($this->random_state));
             }
@@ -160,9 +160,9 @@ 
         // consequently in lower iteration counts and hashes that are
         // quicker to crack (by non-PHP code).
 
-        $hash = md5($salt . $password, true);
+        $hash = md5($salt.$password, true);
         do {
-            $hash = md5($hash . $password, true);
+            $hash = md5($hash.$password, true);
         } while (--$count);
 
         $output = substr($setting, 0, 12);

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

Spacing +7 added lines, -7 removed lines

@@ -118,16 +118,16 @@ 
         for ($i = 0; $i < $tablevel; $i++) {
             $tabs .= "\t";
         }
-        $listhtml = $ordered == true ? $tabs . "<ol class='$ulroot'$typestr>\n" : $tabs . "<ul class='$ulroot'$typestr>\n";
+        $listhtml = $ordered == true ? $tabs."<ol class='$ulroot'$typestr>\n" : $tabs."<ul class='$ulroot'$typestr>\n";
         foreach ($array as $key => $value) {
             if (is_array($value)) {
-                $listhtml .= $tabs . "\t<li>" . $key . "\n" . $this->makeList($value, $ulprefix . $ulroot, $ulprefix,
-                        $type, $ordered, $tablevel + 2) . $tabs . "\t</li>\n";
+                $listhtml .= $tabs."\t<li>".$key."\n".$this->makeList($value, $ulprefix.$ulroot, $ulprefix,
+                        $type, $ordered, $tablevel + 2).$tabs."\t</li>\n";
             } else {
-                $listhtml .= $tabs . "\t<li>" . $value . "</li>\n";
+                $listhtml .= $tabs."\t<li>".$value."</li>\n";
             }
         }
-        $listhtml .= $ordered == true ? $tabs . "</ol>\n" : $tabs . "</ul>\n";
+        $listhtml .= $ordered == true ? $tabs."</ol>\n" : $tabs."</ul>\n";
 
         return $listhtml;
     }
@@ -298,9 +298,9 @@ 
         $msg = addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
             $act = "__WebAlert();";
-            $fnc = "function __WebAlert(){" . substr($url, 11) . "};";
+            $fnc = "function __WebAlert(){".substr($url, 11)."};";
         } else {
-            $act = ($url ? "window.location.href='" . addslashes($url) . "';" : "");
+            $act = ($url ? "window.location.href='".addslashes($url)."';" : "");
         }
         $html = "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
         if ($modx->isFrontend()) {

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
      * @deprecated
      *
      * @param $rs
-     * @return int|mixed
+     * @return integer
      */
     public function insertId($rs)
     {

Braces +2 added lines, -1 removed lines

@@ -177,7 +177,8 @@
      * @return bool|string
      */
     public function putChunk($chunkName)
-    { // alias name >.<
+    {
+// alias name >.<
         $modx = DocumentParser::getInstance();
 
         return $modx->getChunk($chunkName);

manager/includes/extenders/ex_modifiers.inc.php

Spacing +1 added lines, -1 removed lines

@@ -9,6 +9,6 @@
     return true;
 }
 
-include_once(MODX_MANAGER_PATH . 'includes/extenders/modifiers.class.inc.php');
+include_once(MODX_MANAGER_PATH.'includes/extenders/modifiers.class.inc.php');
 $this->filter = new MODIFIERS;
 return true;

manager/includes/extenders/ex_managerapi.inc.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * 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 {
     $this->manager = new ManagerAPI;

manager/includes/extenders/ex_modxmailer.inc.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * Time: 14:17
  */
 
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/modxmailer.class.inc.php')) {
+if (!include_once(MODX_MANAGER_PATH.'includes/extenders/modxmailer.class.inc.php')) {
     return false;
 } else {
     $this->mail = new MODxMailer;

manager/includes/accesscontrol.inc.php

Spacing +29 added lines, -29 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');
@@ -82,7 +82,7 @@ 
     $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_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
     $modx->setPlaceholder('year', date('Y'));
     $modx->setPlaceholder('manager_theme_style',
         (isset($_COOKIE['MODX_themeColor']) ? $_COOKIE['MODX_themeColor'] : ''));
@@ -95,11 +95,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;
         }
     }
@@ -107,9 +107,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 . 'includes/veriword.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
+            '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'includes/veriword.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
@@ -127,7 +127,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
@@ -145,29 +145,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);
         }
     }
@@ -187,17 +187,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->db->query($sql);
     }

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 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
+        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');
@@ -163,7 +164,8 @@ 
         } 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
+        } elseif (is_file($theme_path . 'html/login.html')) {
+// ClipperCMS compatible
             $target = $theme_path . 'html/login.html';
             $login_tpl = file_get_contents($target);
         } else {

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->db->query($sql);
         $emptyCache = true;

manager/includes/preload.functions.inc.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     $_ = crc32(__FILE__);

     $_ = sprintf('%u', $_);

 

-    return 'evo' . base_convert($_, 10, 36);

+    return 'evo'.base_convert($_, 10, 36);

 }

 

 /**

@@ -32,7 +32,7 @@ 
     session_start();

     $key = "modx.mgr.session.cookie.lifetime";

     if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {

-        $cookieLifetime = (int)$_SESSION[$key];

+        $cookieLifetime = (int) $_SESSION[$key];

         if ($cookieLifetime) {

             $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;

         }

Braces +12 added lines, -12 removed lines

@@ -6,8 +6,8 @@ 
 /**

  * @return string

  */

-function genEvoSessionName()

-{

+function genEvoSessionName()
+{
     $_ = crc32(__FILE__);

     $_ = sprintf('%u', $_);

 

@@ -17,8 +17,8 @@ 
 /**

  * @return void

  */

-function startCMSSession()

-{

+function startCMSSession()
+{
 

     global $site_sessionname, $https_port, $session_cookie_path, $session_cookie_domain;

 

@@ -31,14 +31,14 @@ 
     session_set_cookie_params($cookieExpiration, $cookiePath, $cookieDomain, $secure, true);

     session_start();

     $key = "modx.mgr.session.cookie.lifetime";

-    if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {

+    if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {
         $cookieLifetime = (int)$_SESSION[$key];

-        if ($cookieLifetime) {

+        if ($cookieLifetime) {
             $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;

         }

         setcookie(session_name(), session_id(), $cookieExpiration, $cookiePath, $cookieDomain, $secure, true);

     }

-    if (!isset($_SESSION['modx.session.created.time'])) {

+    if (!isset($_SESSION['modx.session.created.time'])) {
         $_SESSION['modx.session.created.time'] = $_SERVER['REQUEST_TIME'];

     }

 }

@@ -48,9 +48,9 @@ 
  * @param $session_name

  * @return void

  */

-function removeInvalidCmsSessionFromStorage(&$storage, $session_name)

-{

-    if (isset($storage[$session_name]) && ($storage[$session_name] === '' || $storage[$session_name] === 'deleted')) {

+function removeInvalidCmsSessionFromStorage(&$storage, $session_name)
+{
+    if (isset($storage[$session_name]) && ($storage[$session_name] === '' || $storage[$session_name] === 'deleted')) {
         unset($storage[$session_name]);

     }

 }

@@ -59,8 +59,8 @@ 
  * @param $session_name

  * @return void

  */

-function removeInvalidCmsSessionIds($session_name)

-{

+function removeInvalidCmsSessionIds($session_name)
+{
     // session ids is invalid iff it is empty string

     // storage priorioty can see in PHP source ext/session/session.c

     removeInvalidCmsSessionFromStorage($_COOKIE, $session_name);

manager/includes/rss.inc.php

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 ---------------------------------------------- */
 
 // include MagPieRSS
-require_once(MODX_MANAGER_PATH . 'media/rss/rss_fetch.inc');
+require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc');
 /**
  * Convert relative path into absolute url
  *
@@ -41,7 +41,7 @@ 
     $tmp = parse_url($base);
     extract($tmp);
     if (strpos($rel, "//") === 0) {
-        return $scheme . ':' . $rel;
+        return $scheme.':'.$rel;
     }
     // return if already absolute URL
     if (parse_url($rel, PHP_URL_SCHEME) != '') {
@@ -49,7 +49,7 @@ 
     }
     // queries and anchors
     if ($rel[0] == '#' || $rel[0] == '?') {
-        return $base . $rel;
+        return $base.$rel;
     }
     // remove non-directory element from path
     $path = preg_replace('#/[^/]*$#', '', $path);
@@ -58,13 +58,13 @@ 
         $path = '';
     }
     // dirty absolute URL
-    $abs = $host . $path . "/" . $rel;
+    $abs = $host.$path."/".$rel;
     // replace '//' or  '/./' or '/foo/../' with '/'
     $abs = preg_replace("/(\/\.?\/)/", "/", $abs);
     $abs = preg_replace("/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs);
 
     // absolute URL is ready!
-    return $scheme . '://' . $abs;
+    return $scheme.'://'.$abs;
 }
 
 $feedData = array();
@@ -74,7 +74,7 @@ 
     $output = '';
     $rss = @fetch_rss($url);
     if (!$rss) {
-        $feedData[$section] = 'Failed to retrieve ' . $url;
+        $feedData[$section] = 'Failed to retrieve '.$url;
         continue;
     }
     $output .= '<ul>';
@@ -88,9 +88,9 @@ 
         $description = strip_tags($item['description']);
         if (strlen($description) > 199) {
             $description = substr($description, 0, 200);
-            $description .= '...<br />Read <a href="' . $href . '" target="_blank">more</a>.';
+            $description .= '...<br />Read <a href="'.$href.'" target="_blank">more</a>.';
         }
-        $output .= '<li><a href="' . $href . '" target="_blank">' . $title . '</a> - <b>' . $pubdate . '</b><br />' . $description . '</li>';
+        $output .= '<li><a href="'.$href.'" target="_blank">'.$title.'</a> - <b>'.$pubdate.'</b><br />'.$description.'</li>';
     }
 
     $output .= '</ul>';