evolution-cms / evolution

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

Braces +24 added lines, -24 removed lines

@@ -7,55 +7,55 @@ 
  *

  */

 

-class TemplateParser

-{

+class TemplateParser
+{
 

     /**

      * @param array $config [action, tabs, toArray]

      * @param array $data

      * @return string

      */

-    public function output($config = array(), $data = array())

-    {

+    public function output($config = array(), $data = array())
+    {
         $modx = evolutionCMS();

 

         $output = '';

         $action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');

         $tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';

 

-        if ($action) {

+        if ($action) {
             $sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name

 			FROM ' . $modx->getFullTableName('system_templates') . ' AS t1

 			INNER JOIN ' . $modx->getFullTableName('categories') . ' AS t2 ON t2.id=t1.category

 			WHERE t1.action IN(' . $action . ') ' . $tab . '

 			ORDER BY t1.tab ASC, t1.rank ASC');

 

-            if ($modx->db->getRecordCount($sql)) {

+            if ($modx->db->getRecordCount($sql)) {
                 $tabs = array();

-                while ($row = $modx->db->getRow($sql)) {

-                    if (!$row['value'] && !empty($data[$row['name']])) {

+                while ($row = $modx->db->getRow($sql)) {
+                    if (!$row['value'] && !empty($data[$row['name']])) {
                         $row['value'] = $data[$row['name']];

                     }

                     $tabs[$row['tab']]['category_name'] = $row['category_name'];

                     $tabs[$row['tab']][$row['name']] = TemplateParser::render($row);

                 }

 

-                if (!empty($config['toArray'])) {

+                if (!empty($config['toArray'])) {
                     $output = $tabs;

-                } else {

+                } else {
                     $output .= '<div class="tab-pane" id="pane_' . $action . '">';

                     $output .= '

 					<script type="text/javascript">

 						var pane_' . $action . ' = new WebFXTabPane(document.getElementById("pane_' . $action . '"), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');

 					</script>';

 

-                    foreach ($tabs as $idTab => $tab) {

+                    foreach ($tabs as $idTab => $tab) {
                         $output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';

                         $output .= '

 						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']) . '</h2>

 						<script type="text/javascript">pane_' . $action . '.addTabPage(document.getElementById("tab_' . $action . '_' . $idTab . '"));</script>';

                         unset($tab['category_name']);

-                        foreach ($tab as $item) {

+                        foreach ($tab as $item) {
                             $output .= $item;

                         }

                         $output .= '</div>';

@@ -72,8 +72,8 @@ 
      * @param array $data

      * @return string

      */

-    private function render($data)

-    {

+    private function render($data)
+    {
         $modx = evolutionCMS();

         global $_lang, $_country_lang;

 

@@ -84,7 +84,7 @@ 
         $output = '';

         $output .= '<div class="form-group row">';

 

-        switch ($data['type']) {

+        switch ($data['type']) {
 

             case 'text':

                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

@@ -118,16 +118,16 @@ 
                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

                 $output .= '<div class="col-sm-7">';

                 $output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';

-                if ($data['name'] == 'country' && isset($_country_lang)) {

+                if ($data['name'] == 'country' && isset($_country_lang)) {
                     $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];

                     $output .= '<option value=""' . (!isset($chosenCountry) ? ' selected' : '') . '>&nbsp;</option>';

-                    foreach ($_country_lang as $key => $value) {

+                    foreach ($_country_lang as $key => $value) {
                         $output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>';

                     }

-                } else {

-                    if ($data['elements']) {

+                } else {
+                    if ($data['elements']) {
                         $elements = explode('||', $data['elements']);

-                        foreach ($elements as $key => $value) {

+                        foreach ($elements as $key => $value) {
                             $value = explode('==', $value);

                             $output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

                         }

@@ -143,9 +143,9 @@ 
                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

                 $output .= '<div class="col-sm-7">';

                 $output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-                if ($data['elements']) {

+                if ($data['elements']) {
                     $elements = explode('||', $data['elements']);

-                    foreach ($elements as $key => $value) {

+                    foreach ($elements as $key => $value) {
                         $value = explode('==', $value);

                         $output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

                     }

@@ -159,9 +159,9 @@ 
                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

                 $output .= '<div class="col-sm-7">';

                 $output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-                if ($data['elements']) {

+                if ($data['elements']) {
                     $elements = explode('||', $data['elements']);

-                    foreach ($elements as $key => $value) {

+                    foreach ($elements as $key => $value) {
                         $value = explode('==', $value);

                         $output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

                     }

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

Braces +32 added lines, -17 removed lines

@@ -721,13 +721,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;
                 }
@@ -735,7 +737,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;
             }
@@ -1108,7 +1111,8 @@ 
         $where = "pub_date <= {$timeNow} AND pub_date!=0 AND published=0";
         $result_pub = $this->db->select('id', '[+prefix+]site_content', $where);
         $this->db->update($field, '[+prefix+]site_content', $where);
-        if ($this->db->getRecordCount($result_pub) >= 1) { //Event unPublished doc
+        if ($this->db->getRecordCount($result_pub) >= 1) {
+//Event unPublished doc
             while ($row_pub = $this->db->getRow($result_pub)) {
                 $this->invokeEvent("OnDocUnPublished", array(
                     "docid" => $row_pub['id']
@@ -1121,7 +1125,8 @@ 
         $where = "unpub_date <= {$timeNow} AND unpub_date!=0 AND published=1";
         $result_unpub = $this->db->select('id', '[+prefix+]site_content', $where);
         $this->db->update($field, '[+prefix+]site_content', $where);
-        if ($this->db->getRecordCount($result_unpub) >= 1) { //Event unPublished doc
+        if ($this->db->getRecordCount($result_unpub) >= 1) {
+//Event unPublished doc
             while ($row_unpub = $this->db->getRow($result_unpub)) {
                 $this->invokeEvent("OnDocUnPublished", array(
                     "docid" => $row_unpub['id']
@@ -1272,7 +1277,8 @@ 
                         }
                     }
 
-                    if (!in_array($fetch, $tags)) {  // Avoid double Matches
+                    if (!in_array($fetch, $tags)) {
+// Avoid double Matches
                         $tags[] = $fetch; // Fetch
                     };
                     $fetch = ''; // and reset
@@ -2057,7 +2063,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;
@@ -2462,7 +2469,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'];
                 }
@@ -2495,7 +2503,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]];
@@ -4256,7 +4264,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) {
@@ -5234,10 +5243,12 @@ 
             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 {
@@ -5251,7 +5262,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;
@@ -5271,7 +5283,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];
@@ -5396,7 +5409,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();
             }
@@ -5939,7 +5953,8 @@ 
      * @return bool
      */
     public function isSafeCode($phpcode = '', $safe_functions = '')
-    { // return true or false
+    {
+// return true or false
         if ($safe_functions == '') {
             return false;
         }
@@ -6351,7 +6366,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/modifiers.class.inc.php

Braces +4 added lines, -2 removed lines

@@ -194,7 +194,8 @@ 
             $c = substr($modifiers, 0, 1);
             $modifiers = substr($modifiers, 1);
 
-            if ($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+            if ($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) {
+// :=, :!=, :<=, :>=, :!<=, :!>=
                 $c = substr($modifiers, strlen($match[1]), 1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
                 if ($c==='(') {
@@ -209,7 +210,8 @@ 
 
                 $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo);
                 $cmd = '';
-            } elseif (in_array($c, array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
+            } elseif (in_array($c, array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) {
+// :+3, :-3, :*3 ...
                 $modifiers = substr($modifiers, strlen($match[0]));
                 $result[]=array('cmd'=>'math','opt'=>'%s' . $c . $match[0]);
                 $cmd = '';

manager/includes/extenders/dbapi.mysqli.class.inc.php

Braces +2 added lines, -1 removed lines

@@ -373,7 +373,8 @@
      * @return bool|mixed|mysqli_result
      */
     public function save($fields, $table, $where = '')
-    { // This is similar to "replace into table".
+    {
+// This is similar to "replace into table".
 
         if ($where === '') {
             $mode = 'insert';

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

Braces +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
-return preg_replace_callback("~(\b\w+\b)~", function ($m) use ($wrapat) {
+return preg_replace_callback("~(\b\w+\b)~", function ($m) use ($wrapat){
     return wordwrap($m[1], $wrapat, ' ', 1);
 }, $value);

manager/includes/tmplvars.format.inc.php

Braces +2 added lines, -1 removed lines

@@ -363,7 +363,8 @@
  * @return array|string
  */
 function parseInput($src, $delim = "||", $type = "string", $columns = true)
-{ // type can be: string, array
+{
+// type can be: string, array
     $modx = evolutionCMS();
     if ($modx->db->isResult($src)) {
         // must be a recordset

manager/includes/header.inc.php

Braces +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />

     Please use the EVO Content Manager instead of accessing this file directly.");

 }

@@ -10,26 +10,26 @@ 
 $modx_textdir = isset($modx_textdir) ? $modx_textdir : null;

 $onManagerMainFrameHeaderHTMLBlock = is_array($evtOut) ? implode("\n", $evtOut) : '';

 $textdir = $modx_textdir === 'rtl' ? 'rtl' : 'ltr';

-if (!isset($modx->config['mgr_jquery_path'])) {

+if (!isset($modx->config['mgr_jquery_path'])) {
     $modx->config['mgr_jquery_path'] = 'media/script/jquery/jquery.min.js';

 }

-if (!isset($modx->config['mgr_date_picker_path'])) {

+if (!isset($modx->config['mgr_date_picker_path'])) {
     $modx->config['mgr_date_picker_path'] = 'media/script/air-datepicker/datepicker.inc.php';

 }

 

 $body_class = '';

 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');

-if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

+if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
     $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

-} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {

+} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
     $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

 }

 

 $css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;

 

-if ($modx->config['manager_theme'] == 'default') {

+if ($modx->config['manager_theme'] == 'default') {
     if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')

-        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

+        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
         require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

         $minifier = new Formatter\CSSMinify();

         $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');

@@ -49,7 +49,7 @@ 
             $css

         );

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

+    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
         $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

     }

 }

@@ -66,7 +66,7 @@ 
     <link rel="stylesheet" type="text/css" href="<?= $css ?>"/>

     <script type="text/javascript" src="media/script/tabpane.js"></script>

     <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>

-    <?php if ($modx->config['show_picker'] != "0") {

+    <?php if ($modx->config['show_picker'] != "0") {
     ?>

         <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js"

                 type="text/javascript"></script>

@@ -74,7 +74,7 @@ 
 } ?>

     <?php

     $aArr = array('2');

-    if (!in_array($_REQUEST['a'], $aArr)) {

+    if (!in_array($_REQUEST['a'], $aArr)) {
         ?>

         <script src="media/script/mootools/mootools.js" type="text/javascript"></script>

         <script src="media/script/mootools/moodx.js" type="text/javascript"></script>

@@ -111,7 +111,7 @@ 
     <script src="media/script/main.js"></script>

     <script>

         <?php

-        if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {

+        if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
             echo 'doRefresh(' . $_REQUEST['r'] . ");\n";

         }

         ?>

manager/includes/manager.lockout.inc.php

Braces +2 added lines, -1 removed lines

@@ -51,7 +51,8 @@
         } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
             $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
+        } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) {
+// ClipperCMS compatible
             $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
             $lockout_tpl = file_get_contents($target);
         } else {

manager/includes/preload.functions.inc.php

Braces +19 added lines, -19 removed lines

@@ -4,14 +4,14 @@ 
 $site_sessionname = genEvoSessionName(); // For legacy extras not using startCMSSession

 

 

-if (! function_exists('evolutionCMS')) {

+if (! function_exists('evolutionCMS')) {
     /**

      * @return DocumentParser

      */

-    function evolutionCMS()

-    {

-        if (! defined('MODX_CLASS')) {

-            if (! class_exists('DocumentParser')) {

+    function evolutionCMS()
+    {
+        if (! defined('MODX_CLASS')) {
+            if (! class_exists('DocumentParser')) {
                 throw new RuntimeException('MODX_CLASS not defined and DocumentParser class not exists');

             }

             define('MODX_CLASS', 'DocumentParser');

@@ -24,8 +24,8 @@ 
 /**

  * @return string

  */

-function genEvoSessionName()

-{

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

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

 

@@ -35,10 +35,10 @@ 
 /**

  * @return void

  */

-function startCMSSession()

-{

+function startCMSSession()
+{
     global $site_sessionname, $https_port, $session_cookie_path, $session_cookie_domain;

-    if (MODX_CLI) {

+    if (MODX_CLI) {
         return;

     }

 

@@ -51,14 +51,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'];

     }

 }

@@ -68,9 +68,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]);

     }

 }

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

  * @return void

  */

-function removeInvalidCmsSessionIds($session_name)

-{

-    if (MODX_CLI) {

+function removeInvalidCmsSessionIds($session_name)
+{
+    if (MODX_CLI) {
         return;

     }

     // session ids is invalid iff it is empty string