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()) {

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/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/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>';

manager/includes/categories.inc.php

Spacing +1 added lines, -1 removed lines

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

manager/processors/user_documents_permissions.class.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
         $role = $this->role;
 
         if ($role == 1) {
-            return true;  // administrator - grant all document permissions
+            return true; // administrator - grant all document permissions
         }
 
         if ($modx->config['use_udperms'] == 0 || $modx->config['use_udperms'] == "" || !isset($modx->config['use_udperms'])) {
@@ -63,14 +63,14 @@ 
             are private to the manager users will not be private to web users if the
             document group is not assigned to a web user group and visa versa.
          */
-        $permissionsok = false;  // set permissions to false
+        $permissionsok = false; // set permissions to false
 
         $rs = $modx->db->select(
             'count(DISTINCT sc.id)',
             "{$tblsc} AS sc 
 				LEFT JOIN {$tbldg} AS dg on dg.document = sc.id 
 				LEFT JOIN {$tbldgn} dgn ON dgn.id = dg.document_group",
-            "sc.id='{$this->document}' AND (" . (empty($docgrp) ? '' : "dg.document_group = " . $docgrp . " ||") . " sc.privatemgr = 0)"
+            "sc.id='{$this->document}' AND (".(empty($docgrp) ? '' : "dg.document_group = ".$docgrp." ||")." sc.privatemgr = 0)"
         );
         $limit = $modx->db->getValue($rs);
         if ($limit == 1) {