evolution-cms / evolution

manager/actions/site_schedule.static.php

Braces +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?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.");

 }

-if (!$modx->hasPermission('view_eventlog')) {

+if (!$modx->hasPermission('view_eventlog')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 ?>

@@ -19,11 +19,11 @@ 
 			<?php

             $rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');

             $limit = $modx->db->getRecordCount($rs);

-            if ($limit < 1) {

+            if ($limit < 1) {
                 ?>

 				<p><?= $_lang["no_docs_pending_publishing"] ?></p>

 				<?php

-            } else {

+            } else {
                 ?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-1">

@@ -36,7 +36,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

+                        while ($row = $modx->db->getRow($rs)) {
                             ?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

@@ -57,11 +57,11 @@ 
 			<?php

             $rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');

             $limit = $modx->db->getRecordCount($rs);

-            if ($limit < 1) {

+            if ($limit < 1) {
                 ?>

 				<p><?= $_lang["no_docs_pending_unpublishing"] ?></p>

 				<?php

-            } else {

+            } else {
                 ?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-2">

@@ -74,7 +74,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

+                        while ($row = $modx->db->getRow($rs)) {
                             ?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

@@ -95,11 +95,11 @@ 
 			<?php

             $rs = $modx->db->select('id, pagetitle, pub_date, unpub_date', $modx->getFullTableName('site_content'), "pub_date > 0 OR unpub_date > 0", "pub_date DESC");

             $limit = $modx->db->getRecordCount($rs);

-            if ($limit < 1) {

+            if ($limit < 1) {
                 ?>

 				<p><?= $_lang["no_docs_pending_pubunpub"] ?></p>

 				<?php

-            } else {

+            } else {
                 ?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-3">

@@ -113,7 +113,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

+                        while ($row = $modx->db->getRow($rs)) {
                             ?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

manager/actions/welcome.static.php

Braces +79 added lines, -76 removed lines

@@ -1,11 +1,11 @@ 
 <?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.');

 }

 

 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes

 

-if ($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

+if ($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
     // seems to be a new install - send the user to the configuration page

     exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

 }

@@ -16,7 +16,7 @@ 
 $_SESSION['nrnewmessages'] = 0;

 

 // setup message info

-if ($modx->hasPermission('messages')) {

+if ($modx->hasPermission('messages')) {
     include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

     $_SESSION['nrtotalmessages'] = $nrtotalmessages;

     $_SESSION['nrnewmessages'] = $nrnewmessages;

@@ -32,46 +32,46 @@ 
 }

 

 // setup icons

-if ($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {

+if ($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
     $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

     $ph['SecurityIcon'] = wrapIcon($icon, 75);

 }

-if ($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {

+if ($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
     $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

     $ph['WebUserIcon'] = wrapIcon($icon, 99);

 }

-if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {

+if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
     $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

     $ph['ModulesIcon'] = wrapIcon($icon, 106);

 }

-if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

+if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
     $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

     $ph['ResourcesIcon'] = wrapIcon($icon, 76);

 }

-if ($modx->hasPermission('bk_manager')) {

+if ($modx->hasPermission('bk_manager')) {
     $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

     $ph['BackupIcon'] = wrapIcon($icon, 93);

 }

-if ($modx->hasPermission('help')) {

+if ($modx->hasPermission('help')) {
     $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

     $ph['HelpIcon'] = wrapIcon($icon, 9);

 }

 

-if ($modx->hasPermission('new_document')) {

+if ($modx->hasPermission('new_document')) {
     $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';

     $ph['ResourceIcon'] = wrapIcon($icon, 4);

     $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';

     $ph['WeblinkIcon'] = wrapIcon($icon, 72);

 }

-if ($modx->hasPermission('assets_images')) {

+if ($modx->hasPermission('assets_images')) {
     $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';

     $ph['ImagesIcon'] = wrapIcon($icon, 72);

 }

-if ($modx->hasPermission('assets_files')) {

+if ($modx->hasPermission('assets_files')) {
     $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';

     $ph['FilesIcon'] = wrapIcon($icon, 72);

 }

-if ($modx->hasPermission('change_password')) {

+if ($modx->hasPermission('change_password')) {
     $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';

     $ph['PasswordIcon'] = wrapIcon($icon, 28);

 }

@@ -79,21 +79,21 @@ 
 $ph['LogoutIcon'] = wrapIcon($icon, 8);

 

 // do some config checks

-if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

+if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
     include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

-    if ($config_check_results != $_lang['configcheck_ok']) {

+    if ($config_check_results != $_lang['configcheck_ok']) {
         $ph['config_check_results'] = $config_check_results;

         $ph['config_display'] = 'block';

-    } else {

+    } else {
         $ph['config_display'] = 'none';

     }

-} else {

+} else {
     $ph['config_display'] = 'none';

 }

 

 // Check logout-reminder

-if (isset($_SESSION['show_logout_reminder'])) {

-    switch ($_SESSION['show_logout_reminder']['type']) {

+if (isset($_SESSION['show_logout_reminder'])) {
+    switch ($_SESSION['show_logout_reminder']['type']) {
         case 'logout_reminder':

             $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

             $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

@@ -101,7 +101,7 @@ 
     }

     $ph['show_logout_reminder'] = 'block';

     unset($_SESSION['show_logout_reminder']);

-} else {

+} else {
     $ph['show_logout_reminder'] = 'none';

 }

 

@@ -162,9 +162,9 @@ 
 $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";

 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');

 

-if ($modx->db->getRecordCount($rs) < 1) {

+if ($modx->db->getRecordCount($rs) < 1) {
     $html = '<p>[%no_active_users_found%]</p>';

-} else {

+} else {
     include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

     $now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

     $ph['now'] = strftime('%H:%M:%S', $now);

@@ -190,7 +190,7 @@ 
     $userList = array();

     $userCount = array();

     // Create userlist with session-count first before output

-    while ($activeusers = $modx->db->getRow($rs)) {

+    while ($activeusers = $modx->db->getRow($rs)) {
         $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

 

         $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

@@ -208,7 +208,7 @@ 
             $currentaction

         );

     }

-    foreach ($userList as $params) {

+    foreach ($userList as $params) {
         $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

         $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

     }

@@ -253,7 +253,7 @@ 
 

 // invoke event OnManagerWelcomePrerender

 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');

-if (is_array($evtOut)) {

+if (is_array($evtOut)) {
     $output = implode('', $evtOut);

     $ph['OnManagerWelcomePrerender'] = $output;

 }

@@ -358,7 +358,7 @@ 
     'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

     'hide'=>'0'

 );

-if ($modx->config['rss_url_news']) {

+if ($modx->config['rss_url_news']) {
     $widgets['news'] = array(

         'menuindex' => '40',

         'id' => 'news',

@@ -369,7 +369,7 @@ 
         'hide'=>'0'

     );

 }

-if ($modx->config['rss_url_security']) {

+if ($modx->config['rss_url_security']) {
     $widgets['security'] = array(

         'menuindex' => '50',

         'id' => 'security',

@@ -383,29 +383,29 @@ 
 

 // invoke OnManagerWelcomeHome event

 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));

-if (is_array($sitewidgets)) {

+if (is_array($sitewidgets)) {
     $newwidgets = array();

-    foreach ($sitewidgets as $widget) {

+    foreach ($sitewidgets as $widget) {
         $newwidgets = array_merge($newwidgets, unserialize($widget));

     }

     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;

 }

 

-usort($widgets, function ($a, $b) {

+usort($widgets, function ($a, $b){
     return $a['menuindex'] - $b['menuindex'];

 });

 

 $tpl = getTplWidget();

 $output = '';

-foreach ($widgets as $widget) {

-    if ($widget['hide'] != '1') {

+foreach ($widgets as $widget) {
+    if ($widget['hide'] != '1') {
         $output .= $modx->parseText($tpl, $widget);

     }

 }

 $ph['widgets'] = $output;

 

 // load template

-if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

+if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
     $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

 }

 

@@ -413,26 +413,27 @@ 
 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);

 $target = $modx->mergeSettingsContent($target);

 

-if (substr($target, 0, 1) === '@') {

-    if (substr($target, 0, 6) === '@CHUNK') {

+if (substr($target, 0, 1) === '@') {
+    if (substr($target, 0, 6) === '@CHUNK') {
         $content = $modx->getChunk(trim(substr($target, 7)));

-    } elseif (substr($target, 0, 5) === '@FILE') {

+    } elseif (substr($target, 0, 5) === '@FILE') {
         $content = file_get_contents(trim(substr($target, 6)));

-    } else {

+    } else {
         $content = '';

     }

-} else {

+} else {
     $chunk = $modx->getChunk($target);

-    if ($chunk !== false && !empty($chunk)) {

+    if ($chunk !== false && !empty($chunk)) {
         $content = $chunk;

-    } elseif (is_file(MODX_BASE_PATH . $target)) {

+    } elseif (is_file(MODX_BASE_PATH . $target)) {
         $content = file_get_contents(MODX_BASE_PATH . $target);

-    } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

+    } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
         $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

-    } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) { // ClipperCMS compatible
+    } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) {
+// ClipperCMS compatible
 

         $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

-    } else {

+    } else {
         $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

     }

 }

@@ -441,7 +442,7 @@ 
 $content = $modx->mergeConditionalTagsContent($content);

 $content = $modx->mergeSettingsContent($content);

 $content = $modx->parseText($content, $ph);

-if (strpos($content, '[+') !== false) {

+if (strpos($content, '[+') !== false) {
     $modx->toPlaceholders($ph);

     $content = $modx->mergePlaceholderContent($content);

 }

@@ -450,7 +451,7 @@ 
 $content = $modx->parseText($content, $_style, '[&', '&]');

 $content = $modx->cleanUpMODXTags($content); //cleanup

 

-if ($js = $modx->getRegisteredClientScripts()) {

+if ($js = $modx->getRegisteredClientScripts()) {
     $content .= $js;

 }

 

@@ -460,8 +461,9 @@ 
 //	<a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a>

 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>

 //</span>

-function getTplWidget()

-{ // recent document info

+function getTplWidget()
+{
+// recent document info

     return '

 		<div class="[+cols+]" id="[+id+]">

 			<div class="card"[+cardAttr+]>

@@ -472,8 +474,9 @@ 
 ';

 }

 

-function getRecentInfo()

-{ // recent document info

+function getRecentInfo()
+{
+// recent document info

     $modx = evolutionCMS();

 

     $modx->addSnippet('recentInfoList', 'getRecentInfoList');

@@ -499,13 +502,13 @@ 
     return $html;

 }

 

-function getRecentInfoList()

-{

+function getRecentInfoList()
+{
     $modx = evolutionCMS();

 

     $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

 

-    if ($modx->db->getRecordCount($rs) < 1) {

+    if ($modx->db->getRecordCount($rs) < 1) {
         return '<tr><td>[%no_activity_message%]</td></tr>';

     }

 

@@ -515,22 +518,22 @@ 
     $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

 

     $output = array();

-    while ($ph = $modx->db->getRow($rs)) {

+    while ($ph = $modx->db->getRow($rs)) {
         $docid = $ph['id'];

         $_ = $modx->getUserInfo($ph['editedby']);

         $ph['username'] = $_['username'];

 

-        if ($ph['deleted'] == 1) {

+        if ($ph['deleted'] == 1) {
             $ph['status'] = 'deleted text-danger';

-        } elseif ($ph['published'] == 0) {

+        } elseif ($ph['published'] == 0) {
             $ph['status'] = 'unpublished font-italic text-muted';

-        } else {

+        } else {
             $ph['status'] = 'published';

         }

 

-        if ($modx->hasPermission('edit_document')) {

+        if ($modx->hasPermission('edit_document')) {
             $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

-        } else {

+        } else {
             $ph['edit_btn'] = '';

         }

 

@@ -543,40 +546,40 @@ 
             $preview_disabled

         ), $btntpl['preview_btn']);

 

-        if ($modx->hasPermission('delete_document')) {

-            if ($ph['deleted'] == 0) {

+        if ($modx->hasPermission('delete_document')) {
+            if ($ph['deleted'] == 0) {
                 $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

-            } else {

+            } else {
                 $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

             }

             $ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);

-        } else {

+        } else {
             $ph['delete_btn'] = '';

         }

 

-        if ($ph['deleted'] == 1 && $ph['published'] == 0) {

+        if ($ph['deleted'] == 1 && $ph['published'] == 0) {
             $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-        } elseif ($ph['deleted'] == 1 && $ph['published'] == 1) {

+        } elseif ($ph['deleted'] == 1 && $ph['published'] == 1) {
             $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-        } elseif ($ph['deleted'] == 0 && $ph['published'] == 0) {

+        } elseif ($ph['deleted'] == 0 && $ph['published'] == 0) {
             $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-        } else {

+        } else {
             $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

         }

         $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);

 

         $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

 

-        if ($ph['longtitle'] == '') {

+        if ($ph['longtitle'] == '') {
             $ph['longtitle'] = '(<i>[%not_set%]</i>)';

         }

-        if ($ph['description'] == '') {

+        if ($ph['description'] == '') {
             $ph['description'] = '(<i>[%not_set%]</i>)';

         }

-        if ($ph['introtext'] == '') {

+        if ($ph['introtext'] == '') {
             $ph['introtext'] = '(<i>[%not_set%]</i>)';

         }

-        if ($ph['alias'] == '') {

+        if ($ph['alias'] == '') {
             $ph['alias'] = '(<i>[%not_set%]</i>)';

         }

 

@@ -585,8 +588,8 @@ 
     return implode("\n", $output);

 }

 

-function getRecentInfoRowTpl()

-{

+function getRecentInfoRowTpl()
+{
     $tpl = '

 						<tr>

 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>

@@ -615,13 +618,13 @@ 
 }

 

 // setup icons

-function wrapIcon($i, $action)

-{

+function wrapIcon($i, $action)
+{
     return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

 }

 

-function getStartUpScript()

-{

+function getStartUpScript()
+{
     $script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {

manager/processors/login.processor.php

Braces +2 added lines, -1 removed lines

@@ -393,7 +393,8 @@
     $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);
     }

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