evolution-cms / evolution

manager/actions/mutate_settings/tab2_furl_settings.inc.php

Braces +1 added lines, -1 removed lines

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

         // invoke OnFriendlyURLSettingsRender event

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

-        if (is_array($evtOut)) {

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

         }

     ?>

manager/actions/mutate_settings/tab1_site_settings.inc.php

Braces +15 added lines, -15 removed lines

@@ -82,23 +82,23 @@ 
         <?php

 

         $currentCategory = '';

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

+                        while ($row = $modx->db->getRow($rs)) {
                             $thisCategory = $row['category'];

-                            if ($thisCategory == null) {

+                            if ($thisCategory == null) {
                                 $thisCategory = $_lang['no_category'];

                             }

-                            if ($thisCategory != $currentCategory) {

-                                if ($closeOptGroup) {

+                            if ($thisCategory != $currentCategory) {
+                                if ($closeOptGroup) {
                                     echo "\t\t\t\t\t</optgroup>\n";

                                 }

                                 echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";

                                 $closeOptGroup = true;

-                            } else {

+                            } else {
                                 $closeOptGroup = false;

                             }

             

                             $selectedtext = $row['id'] == $default_template ? ' selected="selected"' : '';

-                            if ($selectedtext) {

+                            if ($selectedtext) {
                                 $oldTmpId = $row['id'];

                                 $oldTmpName = $row['templatename'];

                             }

@@ -106,7 +106,7 @@ 
                             echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";

                             $currentCategory = $thisCategory;

                         }

-        if ($thisCategory != '') {

+        if ($thisCategory != '') {
             echo "\t\t\t\t\t</optgroup>\n";

         }

 ?>

@@ -124,13 +124,13 @@ 
         <th><?php echo $_lang['defaulttemplate_logic_title'];?><br><small>[(auto_template_logic)]</small></th>

         <td>

             <p><?php echo $_lang['defaulttemplate_logic_general_message'];?></p>

-            <label><input type="radio" name="auto_template_logic" value="system"<?php if ($auto_template_logic == 'system') {

+            <label><input type="radio" name="auto_template_logic" value="system"<?php if ($auto_template_logic == 'system') {
     echo " checked='checked'";

 }?>/> <?php echo $_lang['defaulttemplate_logic_system_message']; ?></label><br />

-            <label><input type="radio" name="auto_template_logic" value="parent"<?php if ($auto_template_logic == 'parent') {

+            <label><input type="radio" name="auto_template_logic" value="parent"<?php if ($auto_template_logic == 'parent') {
     echo " checked='checked'";

 }?>/> <?php echo $_lang['defaulttemplate_logic_parent_message']; ?></label><br />

-            <label><input type="radio" name="auto_template_logic" value="sibling"<?php if ($auto_template_logic == 'sibling') {

+            <label><input type="radio" name="auto_template_logic" value="sibling"<?php if ($auto_template_logic == 'sibling') {
     echo " checked='checked'";

 }?>/> <?php echo $_lang['defaulttemplate_logic_sibling_message']; ?></label><br />

         </td>

@@ -144,10 +144,10 @@ 
               $modx->db->select('id', '[+prefix+]site_plugins',

               "plugincode LIKE '%phx.parser.class.inc.php%OnParseDocument();%' AND disabled != 1")

             );

-            if ($count) {

+            if ($count) {
                 $disabledFilters = 1;

                 echo '<b>' . $_lang['enable_filter_phx_warning'] . '</b><br/>';

-            } else {

+            } else {
                 $disabledFilters = false;

             }

         ?>

@@ -211,7 +211,7 @@ 
     <select name="lst_custom_contenttype" style="width:200px;height:100px;" size="5">

     <?php

         $ct = explode(",", $custom_contenttype);

-        for ($i=0;$i<count($ct);$i++) {

+        for ($i=0;$i<count($ct);$i++) {
             echo "<option value=\"" . $ct[$i] . "\">" . $ct[$i] . "</option>";

         }

     ?>

@@ -266,7 +266,7 @@ 
       <th><?php echo $_lang['serveroffset_title'] ?><br><small>[(server_offset_time)]</small></th>

       <td> <select name="server_offset_time" size="1" class="inputBox">

           <?php

-      for ($i=-24; $i<25; $i++) {

+      for ($i=-24; $i<25; $i++) {
           $seconds = $i*60*60;

           $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ; ?>

           <option value="<?php echo $seconds; ?>" <?php echo $selectedtext; ?>><?php echo $i; ?></option>

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

             // invoke OnSiteSettingsRender event

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

-            if (is_array($evtOut)) {

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

             }

         ?>

manager/actions/resources/mgrResources.class.php

Braces +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
 
         // Now sort by name
         foreach ($this->itemsPerCategory as $catid=>$items) {
-            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+            usort($this->itemsPerCategory[$catid], function ($a, $b){
                 return strcasecmp($a['name'], $b['name']);
             });
         }

manager/actions/resources/functions.inc.php

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

 }

 

@@ -16,8 +16,8 @@ 
  * @param array $ph

  * @return string

  */

-function parsePh($tpl, $ph)

-{

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

     global $_lang;

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

@@ -28,8 +28,8 @@ 
  * @param string|int $cssId

  * @return string

  */

-function renderViewSwitchButtons($cssId)

-{

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

     global $_lang, $tpl;

 

@@ -43,21 +43,21 @@ 
  * @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);

@@ -65,7 +65,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,

@@ -76,7 +76,7 @@ 
 

         // Prepare content for panel-collapse

         $panelCollapse = '';

-        foreach ($elList as $el) {

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

         }

 

@@ -98,8 +98,8 @@ 
  * @param mgrResources $resources

  * @return string

  */

-function createCombinedView($resources)

-{

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

     global $_lang, $_style, $modx_textdir;

 

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

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

 

-    if (!$itemsPerCategory) {

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

     }

 

@@ -120,10 +120,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);

@@ -157,8 +157,8 @@ 
  * @param mgrResources $resources

  * @return array

  */

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

-{

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

     global $modx_textdir, $_style, $_lang;

 

@@ -166,7 +166,7 @@ 
 

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

 

-    switch ($resourceTable) {

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

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

             $lockElementType = 1;

@@ -203,56 +203,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/modules.static.php

Braces +12 added lines, -12 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('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {

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

 }

 

@@ -10,10 +10,10 @@ 
 $modx->manager->initPageViewState();

 

 // get and save search string

-if ($_REQUEST['op'] == 'reset') {

+if ($_REQUEST['op'] == 'reset') {
     $query = '';

     $_PAGE['vs']['search'] = '';

-} else {

+} else {
     $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

     $sqlQuery = $modx->db->escape($query);

     $_PAGE['vs']['search'] = $query;

@@ -28,7 +28,7 @@ 
 include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";

 $cm = new ContextMenu("cntxm", 150);

 $cm->addItem($_lang["run_module"], "js:menuAction(1)", $_style['actions_run'], (!$modx->hasPermission('exec_module') ? 1 : 0));

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

+if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) {
     $cm->addSeparator();

 }

 $cm->addItem($_lang["edit"], "js:menuAction(2)", $_style['actions_edit'], (!$modx->hasPermission('edit_module') ? 1 : 0));

@@ -107,21 +107,21 @@ 
 <div class="tab-page">

     <div class="table-responsive">

         <?php

-        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
             $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"' . $_lang['yes'] . '","-") as disabled, IF(sm.icon<>"",sm.icon,"' . $_style['icons_modules'] . '") as icon

 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

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

+            if ($modx->hasPermission('edit_module')) {
                 $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } elseif ($modx->hasPermission('exec_module')) {

+            } elseif ($modx->hasPermission('exec_module')) {
                 $title = "<a href='index.php?a=112&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } else {

+            } else {
                 $title = '[+value+]';

             }

-        } else {

+        } else {
             $rs = $modx->db->select("id, name, description, IF(locked,'{$_lang['yes']}','-') as locked, IF(disabled,'{$_lang['yes']}','-') as disabled, IF(icon<>'',icon,'{$_style['icons_module']}') as icon", $modx->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");

             $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

         }

@@ -137,10 +137,10 @@ 
         $grd->colWidths = "34,,,60,60";

         $grd->colAligns = "center,,,center,center";

         $grd->colTypes = "template:<a class='tableRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='[+value+]'></i></a>||template:" . $title;

-        if ($listmode == '1') {

+        if ($listmode == '1') {
             $grd->pageSize = 0;

         }

-        if ($_REQUEST['op'] == 'reset') {

+        if ($_REQUEST['op'] == 'reset') {
             $grd->pageNumber = 1;

         }

         // render grid

manager/actions/sysinfo.static.php

Braces +9 added lines, -9 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('logs')) {

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

 }

 

@@ -55,7 +55,7 @@ 
                 <table class="table data table-sm nowrap">

                     <tbody>

                     <?php

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

+                    foreach ($serverArr as $key => $value) {
                         ?>

                         <tr>

                             <td width="1%"><?= $key ?></td>

@@ -98,7 +98,7 @@ 
                     $sql = "SHOW TABLE STATUS FROM $dbase LIKE '" . $modx->db->escape($modx->db->config['table_prefix']) . "%';";

                     $rs = $modx->db->query($sql);

                     $i = 0;

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

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

                         <tr>

                             <td class="text-primary"><b><?= $log_status['Name'] ?></b></td>

@@ -110,17 +110,17 @@ 
                                 $modx->db->config['table_prefix'] . 'event_log',

                                 $modx->db->config['table_prefix'] . 'manager_log',

                             );

-                        if ($modx->hasPermission('settings') && in_array($log_status['Name'], $truncateable)) {

+                        if ($modx->hasPermission('settings') && in_array($log_status['Name'], $truncateable)) {
                             echo "<td class=\"text-xs-right\">";

                             echo "<a class=\"text-danger\" href='index.php?a=54&mode=$action&u=" . $log_status['Name'] . "' title='" . $_lang['truncate_table'] . "'>" . $modx->nicesize($log_status['Data_length'] + $log_status['Data_free']) . "</a>";

                             echo "</td>";

-                        } else {

+                        } else {
                             echo "<td class=\"text-xs-right\">" . $modx->nicesize($log_status['Data_length'] + $log_status['Data_free']) . "</td>";

                         }

 

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

+                        if ($modx->hasPermission('settings')) {
                             echo "<td class=\"text-xs-right\">" . ($log_status['Data_free'] > 0 ? "<a class=\"text-danger\" href='index.php?a=54&mode=$action&t=" . $log_status['Name'] . "' title='" . $_lang['optimize_table'] . "' ><span>" . $modx->nicesize($log_status['Data_free']) . "</span></a>" : "-") . "</td>";

-                        } else {

+                        } else {
                             echo "<td class=\"text-xs-right\">" . ($log_status['Data_free'] > 0 ? $modx->nicesize($log_status['Data_free']) : "-") . "</td>";

                         } ?>

                             <td class="text-xs-right"><?= $modx->nicesize($log_status['Data_length'] - $log_status['Data_free']) ?></td>

@@ -143,7 +143,7 @@ 
                 </table>

             </div>

         </div>

-        <?php if ($totaloverhead > 0) {

+        <?php if ($totaloverhead > 0) {
                         ?>

             <br>

             <p class="alert alert-danger"><?= $_lang['database_overhead'] ?></p>

manager/actions/mutate_content.dynamic.php

Braces +4 added lines, -2 removed lines

@@ -478,7 +478,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;
 
@@ -695,7 +696,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>

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