evolution-cms / evolution

manager/frames/1.php

Braces +32 added lines, -29 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.");

 }

 header("X-XSS-Protection: 0");

@@ -11,22 +11,22 @@ 
 

 $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en';

 

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

+if (!isset($modx->config['manager_menu_height'])) {
     $modx->config['manager_menu_height'] = 2.2; // rem

 }

 

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

+if (!isset($modx->config['manager_tree_width'])) {
     $modx->config['manager_tree_width'] = 20; // rem

 }

 

-if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {

+if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {
     $initMainframeAction = $_SESSION['onLoginForwardToAction'];

     unset($_SESSION['onLoginForwardToAction']);

-} else {

+} else {
     $initMainframeAction = 2; // welcome.static

 }

 

-if (!isset($_SESSION['tree_show_only_folders'])) {

+if (!isset($_SESSION['tree_show_only_folders'])) {
     $_SESSION['tree_show_only_folders'] = 0;

 }

 

@@ -35,29 +35,29 @@ 
 $tree_width = $modx->config['manager_tree_width'];

 $tree_min_width = 0;

 

-if (isset($_COOKIE['MODX_widthSideBar'])) {

+if (isset($_COOKIE['MODX_widthSideBar'])) {
     $MODX_widthSideBar = $_COOKIE['MODX_widthSideBar'];

-} else {

+} else {
     $MODX_widthSideBar = $tree_width;

 }

 

-if (!$MODX_widthSideBar) {

+if (!$MODX_widthSideBar) {
     $body_class .= 'sidebar-closed';

 }

 

 $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']];

 }

 

 $navbar_position = $modx->config['manager_menu_position'];

-if ($navbar_position == 'left') {

+if ($navbar_position == 'left') {
     $body_class .= ' navbar-left navbar-left-icon-and-text';

 }

 

-if (isset($modx->pluginCache['ElementsInTree'])) {

+if (isset($modx->pluginCache['ElementsInTree'])) {
     $body_class .= ' ElementsInTree';

 }

 

@@ -73,19 +73,19 @@ 
     'type8' => $_lang["lock_element_type_8"]

 );

 

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

+foreach ($unlockTranslations as $key => $value) {
     $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);

 }

 

 $user = $modx->getUserInfo($modx->getLoginUserID());

-if ($user['which_browser'] == 'default') {

+if ($user['which_browser'] == 'default') {
     $user['which_browser'] = $modx->config['which_browser'];

 }

 

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

 

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

+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')) {
         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');

@@ -102,7 +102,7 @@ 
         $css = $minifier->minify();

         file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $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;

     }

 }

@@ -257,7 +257,7 @@ 
     <?php

     // invoke OnManagerTopPrerender event

     $evtOut = $modx->invokeEvent('OnManagerTopPrerender', $_REQUEST);

-    if (is_array($evtOut)) {

+    if (is_array($evtOut)) {
         echo implode("\n", $evtOut);

     }

     ?>

@@ -428,11 +428,14 @@ 
             <div id="evo-tab-page-home" class="evo-tab-page show iframe-scroller">

                 <iframe id="mainframe" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>

             </div>

-        <?php else: ?>

+        <?php else {
+    : ?>

             <div class="iframe-scroller">

                 <iframe id="mainframe" name="main" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>

             </div>

-        <?php endif; ?>

+        <?php endif;
+}
+?>

         <script>

             if (/iPhone|iPad|iPod/i.test(navigator.userAgent)) {

                 document.getElementById('mainframe').setAttribute('scrolling', 'no');

@@ -451,11 +454,11 @@ 
             'tree_sortdir',

             'tree_nodename'

         );

-        foreach ($sortParams as $param) {

-            if (isset($_REQUEST[$param])) {

+        foreach ($sortParams as $param) {
+            if (isset($_REQUEST[$param])) {
                 $modx->manager->saveLastUserSetting($param, $_REQUEST[$param]);

                 $_SESSION[$param] = $_REQUEST[$param];

-            } else if (!isset($_SESSION[$param])) {

+            } else if (!isset($_SESSION[$param])) {
                 $_SESSION[$param] = $modx->manager->getLastUserSetting($param);

             }

         }

@@ -535,16 +538,16 @@ 
     </div>

 

     <?php

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

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

          * @param string $action

          * @param string $img

          * @param string $text

          * @param bool $allowed

          */

-        function constructLink($action, $img, $text, $allowed)

-        {

-            if ((bool)$allowed) {

+        function constructLink($action, $img, $text, $allowed)
+        {
+            if ((bool)$allowed) {
                 echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action,

                     $action);

                 echo sprintf('<i class="%s"></i> %s</div>', $img, $text);

@@ -651,7 +654,7 @@ 
     ?>

 

 </div>

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

+<?php if ($modx->config['show_picker'] != "0") {
     include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');

 } ?>

 </body>

manager/actions/mutate_content.dynamic.php

Braces +10 added lines, -4 removed lines

@@ -476,7 +476,8 @@ 
 			return s;
 		}
 
-		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
+		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') {
+// Web Link specific ?>
 		var lastImageCtrl;
 		var lastFileCtrl;
 
@@ -692,7 +693,8 @@ 
 									</td>
 								</tr>
 
-								<?php if($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
+								<?php if($content['type'] == 'reference' || $modx->manager->action == '72') {
+// Web Link specific ?>
 
 									<tr>
 										<td><span class="warning"><?= $_lang['weblink'] ?></span>
@@ -1370,7 +1372,9 @@ 
 						if($documentId > 0) {
 							// Load up, the permissions from the parent (if new document) or existing document
 							$rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							while($currentgroup = $modx->db->getRow($rs)) {
+							    $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							}
 
 							// Load up the current permissions and names
 							$vs = array(
@@ -1432,7 +1436,9 @@ 
 
 							// Create attribute string list
 							$inputString = array();
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
+							foreach($inputAttributes as $k => $v) {
+							    $inputString[] = $k . '="' . $v . '"';
+							}
 
 							// Make the <input> HTML
 							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';

manager/actions/mutate_categories.dynamic.php

Braces +2 added lines, -4 removed lines

@@ -27,16 +27,14 @@
 $cm = new EvolutionCMS\Legacy\ModuleCategoriesManager();
 
 // assign module_params to internal params
-foreach( $_module_params as $param => $value )
-{
+foreach( $_module_params as $param => $value ) {
 	$cm->set( $param, $value );
 }
 
 // catch the request actions
 include_once $cm->get('inc_dir') . 'request_trigger.inc.php';
 
-if( !$categories = $cm->getCategories() )
-{
+if( !$categories = $cm->getCategories() ) {
 	setcookie('webfxtab_manage-categories-pane', 0 );
 	$cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' );
 }

manager/actions/resources/mgrResources.class.php

Braces +3 added lines, -1 removed lines

@@ -3,4 +3,6 @@
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-class mgrResources extends EvolutionCMS\Legacy\mgrResources{}
+class mgrResources extends EvolutionCMS\Legacy\mgrResources
+{
+}

manager/actions/resources/functions.inc.php

Braces +37 added lines, -37 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.");

 }

 

@@ -11,14 +11,14 @@ 
 	'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')

 );

 

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

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

      * @param string $tpl

      * @param array $ph

      * @return string

      */

-    function parsePh($tpl, $ph)

-    {

+    function parsePh($tpl, $ph)
+    {
         $modx = evolutionCMS();

         global $_lang;

         $tpl = $modx->parseText($tpl, $_lang, '[%', '%]');

@@ -27,13 +27,13 @@ 
     }

 }

 

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

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

      * @param string|int $cssId

      * @return string

      */

-    function renderViewSwitchButtons($cssId)

-    {

+    function renderViewSwitchButtons($cssId)
+    {
         $modx = evolutionCMS();

         global $_lang, $tpl;

 

@@ -43,27 +43,27 @@ 
     }

 }

 

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

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

      * @param string $resourceTable

      * @param mgrResources $resources

      * @return string

      */

-    function createResourceList($resourceTable, $resources)

-    {

+    function createResourceList($resourceTable, $resources)
+    {
         $modx = evolutionCMS();

         global $_lang, $_style, $modx_textdir, $tpl;

 

         $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

 

-        if (!is_array($items) || empty($items)) {

+        if (!is_array($items) || empty($items)) {
             return $_lang['no_results'];

         }

 

         // Prepare elements- and categories-list

         $elements = array();

         $categories = array();

-        foreach ($items as $row) {

+        foreach ($items as $row) {
             $catid = $row['catid'] ? $row['catid'] : 0;

             $categories[$catid] = array('name' => stripslashes($row['category']));

             $elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

@@ -71,7 +71,7 @@ 
 

         // Now render categories / panel-collapse

         $panelGroup = '';

-        foreach ($elements as $catid => $elList) {

+        foreach ($elements as $catid => $elList) {
             // Add panel-heading / category-collapse to output

             $panelGroup .= parsePh($tpl['panelHeading'], array(

                 'tab'        => $resourceTable,

@@ -82,7 +82,7 @@ 
 

             // Prepare content for panel-collapse

             $panelCollapse = '';

-            foreach ($elList as $el) {

+            foreach ($elList as $el) {
                 $panelCollapse .= parsePh($tpl['elementsRow'], $el);

             }

 

@@ -101,13 +101,13 @@ 
     }

 }

 

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

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

      * @param mgrResources $resources

      * @return string

      */

-    function createCombinedView($resources)

-    {

+    function createCombinedView($resources)
+    {
         $modx = evolutionCMS();

         global $_lang, $_style, $modx_textdir;

 

@@ -115,7 +115,7 @@ 
         $types = isset($resources->types) ? $resources->types : false;

         $categories = isset($resources->categories) ? $resources->categories : false;

 

-        if (!$itemsPerCategory) {

+        if (!$itemsPerCategory) {
             return $_lang['no_results'];

         }

 

@@ -128,10 +128,10 @@ 
 

         // Easily loop through $itemsPerCategory-Array

         $panelGroup = '';

-        foreach ($categories as $catid => $category) {

+        foreach ($categories as $catid => $category) {
             // Prepare collapse content / elements-list

             $panelCollapse = '';

-            foreach ($itemsPerCategory[$catid] as $el) {

+            foreach ($itemsPerCategory[$catid] as $el) {
                 $resourceTable = $el['type'];

                 $ph = prepareElementRowPh($el, $resourceTable, $resources);

                 $panelCollapse .= parsePh($tpl['elementsRow'], $ph);

@@ -160,15 +160,15 @@ 
     }

 }

 

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

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

      * @param array $row

      * @param string $resourceTable

      * @param mgrResources $resources

      * @return array

      */

-    function prepareElementRowPh($row, $resourceTable, $resources)

-    {

+    function prepareElementRowPh($row, $resourceTable, $resources)
+    {
         $modx = evolutionCMS();

         global $modx_textdir, $_style, $_lang;

 

@@ -176,7 +176,7 @@ 
 

         $_lang["confirm_delete"] = $_lang["delete"];

 

-        switch ($resourceTable) {

+        switch ($resourceTable) {
             case 'site_templates':

                 $class = $row['selectable'] ? '' : 'disabledPlugin';

                 $lockElementType = 1;

@@ -213,56 +213,56 @@ 
         // Prepare displaying user-locks

         $lockedByUser = '';

         $rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

-        if ($rowLock && $modx->hasPermission('display_locks')) {

-            if ($rowLock['sid'] == $modx->sid) {

+        if ($rowLock && $modx->hasPermission('display_locks')) {
+            if ($rowLock['sid'] == $modx->sid) {
                 $title = $modx->parseText($_lang["lock_element_editing"], array(

                     'element_type' => $_lang["lock_element_type_" . $lockElementType],

                     'lasthit_df'   => $rowLock['lasthit_df']

                 ));

                 $lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

-            } else {

+            } else {
                 $title = $modx->parseText($_lang["lock_element_locked_by"], array(

                     'element_type' => $_lang["lock_element_type_" . $lockElementType],

                     'username'     => $rowLock['username'],

                     'lasthit_df'   => $rowLock['lasthit_df']

                 ));

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

+                if ($modx->hasPermission('remove_locks')) {
                     $lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

-                } else {

+                } else {
                     $lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

                 }

             }

         }

-        if ($lockedByUser) {

+        if ($lockedByUser) {
             $lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

         }

 

         // Caption

-        if ($resourceTable == 'site_tmplvars') {

+        if ($resourceTable == 'site_tmplvars') {
             $caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

-        } else {

+        } else {
             $caption = !empty($row['description']) ? ' ' . $row['description'] : '';

         }

 

         // Special marks

         $tplInfo = array();

-        if ($row['locked']) {

+        if ($row['locked']) {
             $tplInfo[] = $_lang['locked'];

         }

-        if ($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

+        if ($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
             $tplInfo[] = $_lang['defaulttemplate_title'];

         }

         $marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

 

         /* row buttons */

         $buttons = '';

-        if ($modx->hasPermission($types['actions']['edit'][1])) {

+        if ($modx->hasPermission($types['actions']['edit'][1])) {
             $buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

         }

-        if ($modx->hasPermission($types['actions']['duplicate'][1])) {

+        if ($modx->hasPermission($types['actions']['duplicate'][1])) {
             $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

         }

-        if ($modx->hasPermission($types['actions']['remove'][1])) {

+        if ($modx->hasPermission($types['actions']['remove'][1])) {
             $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

         }

         $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

manager/actions/bkmanager.static.php

Braces +3 added lines, -1 removed lines

@@ -491,7 +491,9 @@
 /**
  * @deprecated use EvolutionCMS\Support\MysqlDumper
  */
-class Mysqldumper extends EvolutionCMS\Support\MysqlDumper{}
+class Mysqldumper extends EvolutionCMS\Support\MysqlDumper
+{
+}
 
 if(!function_exists('import_sql')) {
     /**

manager/actions/category_mgr/inc/Categories.php

Braces +3 added lines, -1 removed lines

@@ -4,4 +4,6 @@
  * Class to handle the modx-categories
  * @deprecated use EvolutionCMS\Legacy\Categories
  */
-class Categories extends EvolutionCMS\Legacy\Categories{}
+class Categories extends EvolutionCMS\Legacy\Categories
+{
+}

manager/actions/mutate_module.dynamic.php

Braces +23 added lines, -23 removed lines

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

 }

-switch($modx->manager->action) {

+switch($modx->manager->action) {
 	case 107:

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

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

 		}

 		break;

 	case 108:

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

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

 		}

 		break;

@@ -29,14 +29,14 @@ 
 $tbl_site_templates = $modx->getFullTableName('site_templates');

 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');

 

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

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

      * create globally unique identifiers (guid)

      *

      * @return string

      */

-    function createGUID()

-    {

+    function createGUID()
+    {
         srand((double)microtime() * 1000000);

         $r = rand();

         $u = uniqid(getmypid() . $r . (double)microtime() * 1000000, 1);

@@ -47,7 +47,7 @@ 
 }

 

 // check to see the module editor isn't locked

-if($lockedEl = $modx->elementIsLocked(6, $id)) {

+if($lockedEl = $modx->elementIsLocked(6, $id)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));

 }

 // end check for lock

@@ -55,22 +55,22 @@ 
 // Lock snippet for other users to edit

 $modx->lockElement(6, $id);

 

-if(isset($_GET['id'])) {

+if(isset($_GET['id'])) {
 	$rs = $modx->db->select('*', $tbl_site_modules, "id='{$id}'");

 	$content = $modx->db->getRow($rs);

-	if(!$content) {

+	if(!$content) {
 		$modx->webAlertAndQuit("Module not found for id '{$id}'.");

 	}

 	$content['properties'] = str_replace("&", "&amp;", $content['properties']);

 	$_SESSION['itemname'] = $content['name'];

-	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {

+	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 	}

-} else {

+} else {
 	$_SESSION['itemname'] = $_lang["new_module"];

 	$content['wrap'] = '1';

 }

-if($modx->manager->hasFormValues()) {

+if($modx->manager->hasFormValues()) {
 	$modx->manager->loadFormValues();

 }

 

@@ -444,7 +444,7 @@ 
 	<?php

 	// invoke OnModFormPrerender event

 	$evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));

-	if(is_array($evtOut)) {

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

 	}

 

@@ -507,7 +507,7 @@ 
 								<option>&nbsp;</option>

 								<?php

 								include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');

-								foreach(getCategories() as $n => $v) {

+								foreach(getCategories() as $n => $v) {
 									echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";

 								}

 								?>

@@ -659,7 +659,7 @@ 
 					$rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");

 					$groupsarray = $modx->db->getColumn('usergroup', $rs);

 

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

+					if($modx->hasPermission('access_permissions')) {
 						?>

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

@@ -687,21 +687,21 @@ 
 					}

 					$chk = '';

 					$rs = $modx->db->select('name, id', $tbl_membergroup_names, '', 'name');

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

+					while($row = $modx->db->getRow($rs)) {
 						$groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();

 						$checked = in_array($row['id'], $groupsarray);

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

-							if($checked) {

+						if($modx->hasPermission('access_permissions')) {
+							if($checked) {
 								$notPublic = true;

 							}

 							$chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";

-						} else {

-							if($checked) {

+						} else {
+							if($checked) {
 								$chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;

 							}

 						}

 					}

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

+					if($modx->hasPermission('access_permissions')) {
 						$chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;

 					}

 					echo $chks;

@@ -723,7 +723,7 @@ 
 		<?php

 		// invoke OnModFormRender event

 		$evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));

-		if(is_array($evtOut)) {

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

 		}

 		?>

manager/actions/welcome.static.php

Braces +87 added lines, -83 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,28 @@ 
 $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 {

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

 	}

 }

@@ -441,7 +443,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 +452,7 @@ 
 $content = $modx->parseText($content, $_style, '[&', '&]');

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

 

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

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

 }

 

@@ -460,9 +462,10 @@ 
 //	<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>

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

-    function getTplWidget()

-    { // recent document info

+if(!function_exists('getTplWidget')) {
+    function getTplWidget()
+    {
+// recent document info

         return '

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

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

@@ -474,9 +477,10 @@ 
     }

 }

 

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

-    function getRecentInfo()

-    { // recent document info

+if(!function_exists('getRecentInfo')) {
+    function getRecentInfo()
+    {
+// recent document info

         $modx = evolutionCMS();

 

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

@@ -504,14 +508,14 @@ 
     }

 }

 

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

-    function getRecentInfoList()

-    {

+if(!function_exists('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>';

         }

 

@@ -521,22 +525,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'] = '';

             }

 

@@ -549,24 +553,24 @@ 
                 $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);

@@ -574,16 +578,16 @@ 
             $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>)';

             }

 

@@ -594,9 +598,9 @@ 
     }

 }

 

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

-    function getRecentInfoRowTpl()

-    {

+if(!function_exists('getRecentInfoRowTpl')) {
+    function getRecentInfoRowTpl()
+    {
         $tpl = '

 						<tr>

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

@@ -626,18 +630,18 @@ 
     }

 }

 

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

+if(!function_exists('wrapIcon')) {
 // 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);

     }

 }

 

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

-    function getStartUpScript()

-    {

+if(!function_exists('getStartUpScript')) {
+    function getStartUpScript()
+    {
         $script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {