evolution-cms / evolution

manager/views/page/3.blade.php

Spacing +56 added lines, -56 removed lines

@@ -3,13 +3,13 @@ 
 @section('content')
     <?php /*include_once evolutionCMS()->get('ManagerTheme')->getFileProcessor("actions/document_data.static.php"); */?>
     <?php
-    if(isset($_REQUEST['id'])) {
+    if (isset($_REQUEST['id'])) {
         $id = (int) $_REQUEST['id'];
     } else {
         $id = 0;
     }
 
-    if(isset($_GET['opened'])) {
+    if (isset($_GET['opened'])) {
         $_SESSION['openedArray'] = $_GET['opened'];
     }
 
@@ -20,16 +20,16 @@ 
     $tbl_site_templates = $modx->getDatabase()->getFullTableName('site_templates');
 
     // Get access permissions
-    if($_SESSION['mgrDocgroups']) {
+    if ($_SESSION['mgrDocgroups']) {
         $docgrp = implode(",", $_SESSION['mgrDocgroups']);
     }
-    $access = "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0" . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+    $access = "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0".(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
 
     //
-    if($_SESSION['tree_show_only_folders']) {
-        $parent = $id ? ($modx->getDatabase()->getValue("SELECT parent FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1")) : 0;
-        $isfolder = $modx->getDatabase()->getValue("SELECT isfolder FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1");
-        if(!$isfolder && $parent != 0) {
+    if ($_SESSION['tree_show_only_folders']) {
+        $parent = $id ? ($modx->getDatabase()->getValue("SELECT parent FROM ".$tbl_site_content." WHERE id=$id LIMIT 1")) : 0;
+        $isfolder = $modx->getDatabase()->getValue("SELECT isfolder FROM ".$tbl_site_content." WHERE id=$id LIMIT 1");
+        if (!$isfolder && $parent != 0) {
             $id = $_REQUEST['id'] = $parent;
         }
     }
@@ -38,7 +38,7 @@ 
     $rs = $modx->getDatabase()->select('DISTINCT sc.*', "{$tbl_site_content} AS sc
 		LEFT JOIN {$tbl_document_groups} AS dg ON dg.document = sc.id", "sc.id ='{$id}' AND ({$access})");
     $content = $modx->getDatabase()->getRow($rs);
-    if(!$content) {
+    if (!$content) {
         $modx->webAlertAndQuit($_lang["access_permission_denied"]);
     }
 
@@ -80,11 +80,11 @@ 
     );
     $filter_sort = '';
     $filter_dir = '';
-    if($numRecords > 0) {
-        $filter_sort = '<select size="1" name="sort" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&dir=' . $dir . '&sort=\'+this.options[this.selectedIndex].value">' . '<option value="createdon"' . (($sort == 'createdon') ? ' selected' : '') . '>' . $_lang['createdon'] . '</option>' . '<option value="pub_date"' . (($sort == 'pub_date') ? ' selected' : '') . '>' . $_lang["page_data_publishdate"] . '</option>' . '<option value="pagetitle"' . (($sort == 'pagetitle') ? ' selected' : '') . '>' . $_lang['pagetitle'] . '</option>' . '<option value="menuindex"' . (($sort == 'menuindex') ? ' selected' : '') . '>' . $_lang['resource_opt_menu_index'] . '</option>' . //********  resource_opt_is_published - //
-            '<option value="published"' . (($sort == 'published') ? ' selected' : '') . '>' . $_lang['resource_opt_is_published'] . '</option>' . //********//
+    if ($numRecords > 0) {
+        $filter_sort = '<select size="1" name="sort" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id='.$id.'&dir='.$dir.'&sort=\'+this.options[this.selectedIndex].value">'.'<option value="createdon"'.(($sort == 'createdon') ? ' selected' : '').'>'.$_lang['createdon'].'</option>'.'<option value="pub_date"'.(($sort == 'pub_date') ? ' selected' : '').'>'.$_lang["page_data_publishdate"].'</option>'.'<option value="pagetitle"'.(($sort == 'pagetitle') ? ' selected' : '').'>'.$_lang['pagetitle'].'</option>'.'<option value="menuindex"'.(($sort == 'menuindex') ? ' selected' : '').'>'.$_lang['resource_opt_menu_index'].'</option>'.//********  resource_opt_is_published - //
+            '<option value="published"'.(($sort == 'published') ? ' selected' : '').'>'.$_lang['resource_opt_is_published'].'</option>'.//********//
             '</select>';
-        $filter_dir = '<select size="1" name="dir" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&sort=' . $sort . '&dir=\'+this.options[this.selectedIndex].value">' . '<option value="DESC"' . (($dir == 'DESC') ? ' selected' : '') . '>' . $_lang['sort_desc'] . '</option>' . '<option value="ASC"' . (($dir == 'ASC') ? ' selected' : '') . '>' . $_lang['sort_asc'] . '</option>' . '</select>';
+        $filter_dir = '<select size="1" name="dir" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id='.$id.'&sort='.$sort.'&dir=\'+this.options[this.selectedIndex].value">'.'<option value="DESC"'.(($dir == 'DESC') ? ' selected' : '').'>'.$_lang['sort_desc'].'</option>'.'<option value="ASC"'.(($dir == 'ASC') ? ' selected' : '').'>'.$_lang['sort_asc'].'</option>'.'</select>';
         $resource = $modx->getDatabase()->makeArray($rs);
 
         // CSS style for table
@@ -128,10 +128,10 @@ 
         );
         $modx->getMakeTable()->setColumnWidths($tbWidth);
 
-        $sd = isset($_REQUEST['dir']) ? '&amp;dir=' . $_REQUEST['dir'] : '&amp;dir=DESC';
-        $sb = isset($_REQUEST['sort']) ? '&amp;sort=' . $_REQUEST['sort'] : '&amp;sort=createdon';
-        $pg = isset($_REQUEST['page']) ? '&amp;page=' . (int) $_REQUEST['page'] : '';
-        $add_path = $sd . $sb . $pg;
+        $sd = isset($_REQUEST['dir']) ? '&amp;dir='.$_REQUEST['dir'] : '&amp;dir=DESC';
+        $sb = isset($_REQUEST['sort']) ? '&amp;sort='.$_REQUEST['sort'] : '&amp;sort=createdon';
+        $pg = isset($_REQUEST['page']) ? '&amp;page='.(int) $_REQUEST['page'] : '';
+        $add_path = $sd.$sb.$pg;
 
         $icons = array(
             'text/html' => $_style['tree_page_html'],
@@ -149,9 +149,9 @@ 
         );
 
         $listDocs = array();
-        foreach($resource as $k => $children) {
+        foreach ($resource as $k => $children) {
 
-            switch($children['id']) {
+            switch ($children['id']) {
                 case $modx->getConfig('site_start')            :
                     $icon = $_style['tree_page_home'];
                     break;
@@ -165,10 +165,10 @@ 
                     $icon = $_style['tree_page_info'];
                     break;
                 default:
-                    if($children['isfolder']) {
+                    if ($children['isfolder']) {
                         $icon = $_style['tree_folder_new'];
                     } else {
-                        if(isset($icons[$children['contentType']])) {
+                        if (isset($icons[$children['contentType']])) {
                             $icon = $icons[$children['contentType']];
                         } else {
                             $icon = $_style['tree_page'];
@@ -183,32 +183,32 @@ 
             $class = ($children['deleted'] ? 'text-danger text-decoration-through' : (!$children['published'] ? ' font-italic text-muted' : ' publish'));
             //$class .= ($children['hidemenu'] ? ' text-muted' : ' text-primary');
             //$class .= ($children['isfolder'] ? ' font-weight-bold' : '');
-            if($modx->hasPermission('edit_document')) {
-                $title = '<span class="doc-item' . $private . '">' . $icon . '<a href="index.php?a=27&amp;id=' . $children['id'] . $add_path . '">' . '<span class="' . $class . '">' . entities($children['pagetitle'], $modx->getConfig('modx_charset')) . '</span></a></span>';
+            if ($modx->hasPermission('edit_document')) {
+                $title = '<span class="doc-item'.$private.'">'.$icon.'<a href="index.php?a=27&amp;id='.$children['id'].$add_path.'">'.'<span class="'.$class.'">'.entities($children['pagetitle'], $modx->getConfig('modx_charset')).'</span></a></span>';
             } else {
-                $title = '<span class="doc-item' . $private . '">' . $icon . '<span class="' . $class . '">' . entities($children['pagetitle'], $modx->getConfig('modx_charset')) . '</span></span>';
+                $title = '<span class="doc-item'.$private.'">'.$icon.'<span class="'.$class.'">'.entities($children['pagetitle'], $modx->getConfig('modx_charset')).'</span></span>';
             }
 
-            $icon_pub_unpub = (!$children['published']) ? '<a href="index.php?a=61&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang["publish_resource"] . '"><i class="' . $_style["icons_publish_document"] . '"></i></a>' : '<a href="index.php?a=62&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang["unpublish_resource"] . '"><i class="' . $_style["icons_unpublish_resource"] . '" ></i></a>';
+            $icon_pub_unpub = (!$children['published']) ? '<a href="index.php?a=61&amp;id='.$children['id'].$add_path.'" title="'.$_lang["publish_resource"].'"><i class="'.$_style["icons_publish_document"].'"></i></a>' : '<a href="index.php?a=62&amp;id='.$children['id'].$add_path.'" title="'.$_lang["unpublish_resource"].'"><i class="'.$_style["icons_unpublish_resource"].'" ></i></a>';
 
-            $icon_del_undel = (!$children['deleted']) ? '<a onclick="return confirm(\'' . $_lang["confirm_delete_resource"] . '\')" href="index.php?a=6&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['delete_resource'] . '"><i class="' . $_style["icons_delete_resource"] . '"></i></a>' : '<a onclick="return confirm(\'' . $_lang["confirm_undelete"] . '\')" href="index.php?a=63&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['undelete_resource'] . '"><i class="' . $_style["icons_undelete_resource"] . '"></i></a>';
+            $icon_del_undel = (!$children['deleted']) ? '<a onclick="return confirm(\''.$_lang["confirm_delete_resource"].'\')" href="index.php?a=6&amp;id='.$children['id'].$add_path.'" title="'.$_lang['delete_resource'].'"><i class="'.$_style["icons_delete_resource"].'"></i></a>' : '<a onclick="return confirm(\''.$_lang["confirm_undelete"].'\')" href="index.php?a=63&amp;id='.$children['id'].$add_path.'" title="'.$_lang['undelete_resource'].'"><i class="'.$_style["icons_undelete_resource"].'"></i></a>';
 
             $listDocs[] = array(
-                'docid' => '<div class="text-right">' . $children['id'] . '</div>',
+                'docid' => '<div class="text-right">'.$children['id'].'</div>',
                 'title' => $title,
-                'createdon' => '<div class="text-right">' . ($modx->toDateFormat($children['createdon'] + $server_offset_time, 'dateOnly')) . '</div>',
-                'pub_date' => '<div class="text-right">' . ($children['pub_date'] ? ($modx->toDateFormat($children['pub_date'] + $server_offset_time, 'dateOnly')) : '') . '</div>',
-                'status' => '<div class="text-nowrap">' . ($children['published'] == 0 ? '<span class="unpublishedDoc">' . $_lang['page_data_unpublished'] . '</span>' : '<span class="publishedDoc">' . $_lang['page_data_published'] . '</span>') . '</div>',
-                'edit' => '<div class="actions text-center text-nowrap">' . ($modx->hasPermission('edit_document') ? '<a href="index.php?a=27&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['edit'] . '"><i class="' . $_style["icons_edit_resource"] . '"></i></a><a href="index.php?a=51&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['move'] . '"><i
-				class="' . $_style["icons_move_document"] . '"></i></a>' . $icon_pub_unpub : '') . ($modx->hasPermission('delete_document') ? $icon_del_undel : '') . '</div>'
+                'createdon' => '<div class="text-right">'.($modx->toDateFormat($children['createdon'] + $server_offset_time, 'dateOnly')).'</div>',
+                'pub_date' => '<div class="text-right">'.($children['pub_date'] ? ($modx->toDateFormat($children['pub_date'] + $server_offset_time, 'dateOnly')) : '').'</div>',
+                'status' => '<div class="text-nowrap">'.($children['published'] == 0 ? '<span class="unpublishedDoc">'.$_lang['page_data_unpublished'].'</span>' : '<span class="publishedDoc">'.$_lang['page_data_published'].'</span>').'</div>',
+                'edit' => '<div class="actions text-center text-nowrap">'.($modx->hasPermission('edit_document') ? '<a href="index.php?a=27&amp;id='.$children['id'].$add_path.'" title="'.$_lang['edit'].'"><i class="'.$_style["icons_edit_resource"].'"></i></a><a href="index.php?a=51&amp;id='.$children['id'].$add_path.'" title="'.$_lang['move'].'"><i
+				class="' . $_style["icons_move_document"].'"></i></a>'.$icon_pub_unpub : '').($modx->hasPermission('delete_document') ? $icon_del_undel : '').'</div>'
             );
         }
 
-        $modx->getMakeTable()->createPagingNavigation($numRecords, 'a=3&id=' . $content['id'] . '&dir=' . $dir . '&sort=' . $sort);
-        $children_output = $modx->getMakeTable()->create($listDocs, $listTableHeader, 'index.php?a=3&amp;id=' . $content['id']);
+        $modx->getMakeTable()->createPagingNavigation($numRecords, 'a=3&id='.$content['id'].'&dir='.$dir.'&sort='.$sort);
+        $children_output = $modx->getMakeTable()->create($listDocs, $listTableHeader, 'index.php?a=3&amp;id='.$content['id']);
     } else {
         // No Child documents
-        $children_output = '<div class="container"><p>' . $_lang['resources_in_container_no'] . '</p></div>';
+        $children_output = '<div class="container"><p>'.$_lang['resources_in_container_no'].'</p></div>';
     }
     ?>
     <script type="text/javascript">
@@ -234,7 +234,7 @@ 
             },
             cancel: function() {
                 documentDirty = false;
-                document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id=' . $id . $add_path) ?>';
+                document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id='.$id.$add_path) ?>';
             },
             move: function() {
                 document.location.href = "index.php?id=<?= $_REQUEST['id'] ?>&a=51";
@@ -245,7 +245,7 @@ 
                 }
             },
             view: function() {
-                window.open('<?= ($modx->getConfig('friendly_urls')) ? UrlProcessor::makeUrl($id) : MODX_SITE_URL . 'index.php?id=' . $id ?>', 'previeWin');
+                window.open('<?= ($modx->getConfig('friendly_urls')) ? UrlProcessor::makeUrl($id) : MODX_SITE_URL.'index.php?id='.$id ?>', 'previeWin');
             }
         };
 
@@ -253,7 +253,7 @@ 
     <script type="text/javascript" src="media/script/tablesort.js"></script>
 
     <h1>
-        <i class="fa fa-info"></i><?= entities(iconv_substr($content['pagetitle'], 0, 50, $modx->getConfig('modx_charset')), $modx->getConfig('modx_charset')) . (iconv_strlen($content['pagetitle'], $modx->getConfig('modx_charset')) > 50 ? '...' : '') . ' <small>(' . (int)$_REQUEST['id'] . ')</small>' ?>
+        <i class="fa fa-info"></i><?= entities(iconv_substr($content['pagetitle'], 0, 50, $modx->getConfig('modx_charset')), $modx->getConfig('modx_charset')).(iconv_strlen($content['pagetitle'], $modx->getConfig('modx_charset')) > 50 ? '...' : '').' <small>('.(int) $_REQUEST['id'].')</small>' ?>
     </h1>
 
     <?= $_style['actionbuttons']['static']['document'] ?>
@@ -280,16 +280,16 @@ 
                     <tr>
                         <td width="200" valign="top">{{ ManagerTheme::getLexicon('long_title') }}:</td>
                         <td>
-                            <small><?= $content['longtitle'] != '' ? entities($content['longtitle'], $modx->getConfig('modx_charset')) : "(<i>" . $_lang['not_set'] . "</i>)" ?></small>
+                            <small><?= $content['longtitle'] != '' ? entities($content['longtitle'], $modx->getConfig('modx_charset')) : "(<i>".$_lang['not_set']."</i>)" ?></small>
                         </td>
                     </tr>
                     <tr>
                         <td valign="top">{{ ManagerTheme::getLexicon('resource_description') }}:</td>
-                        <td><?= $content['description'] != '' ? entities($content['description'], $modx->getConfig('modx_charset')) : "(<i>" . $_lang['not_set'] . "</i>)" ?></td>
+                        <td><?= $content['description'] != '' ? entities($content['description'], $modx->getConfig('modx_charset')) : "(<i>".$_lang['not_set']."</i>)" ?></td>
                     </tr>
                     <tr>
                         <td valign="top">{{ ManagerTheme::getLexicon('resource_summary') }}:</td>
-                        <td><?= $content['introtext'] != '' ? entities($content['introtext'], $modx->getConfig('modx_charset')) : "(<i>" . $_lang['not_set'] . "</i>)" ?></td>
+                        <td><?= $content['introtext'] != '' ? entities($content['introtext'], $modx->getConfig('modx_charset')) : "(<i>".$_lang['not_set']."</i>)" ?></td>
                     </tr>
                     <tr>
                         <td valign="top">{{ ManagerTheme::getLexicon('type') }}:</td>
@@ -297,7 +297,7 @@ 
                     </tr>
                     <tr>
                         <td valign="top">{{ ManagerTheme::getLexicon('resource_alias') }}:</td>
-                        <td><?= $content['alias'] != '' ? entities($content['alias'], $modx->getConfig('modx_charset')) : "(<i>" . $_lang['not_set'] . "</i>)" ?></td>
+                        <td><?= $content['alias'] != '' ? entities($content['alias'], $modx->getConfig('modx_charset')) : "(<i>".$_lang['not_set']."</i>)" ?></td>
                     </tr>
                     <tr>
                         <td colspan="2">&nbsp;</td>
@@ -310,7 +310,7 @@ 
                         <td><?= $modx->toDateFormat($content['createdon'] + $server_offset_time) ?> (<b><?= entities($createdbyname, $modx->getConfig('modx_charset')) ?></b>)
                         </td>
                     </tr>
-                    <?php if($editedbyname != '') { ?>
+                    <?php if ($editedbyname != '') { ?>
                     <tr>
                         <td>{{ ManagerTheme::getLexicon('page_data_edited') }}:</td>
                         <td><?= $modx->toDateFormat($content['editedon'] + $server_offset_time) ?> (<b><?= entities($editedbyname, $modx->getConfig('modx_charset')) ?></b>)
@@ -325,15 +325,15 @@ 
                     </tr>
                     <tr>
                         <td>{{ ManagerTheme::getLexicon('page_data_status') }}:</td>
-                        <td><?= $content['published'] == 0 ? '<span class="unpublishedDoc">' . $_lang['page_data_unpublished'] . '</span>' : '<span class="publisheddoc">' . $_lang['page_data_published'] . '</span>' ?></td>
+                        <td><?= $content['published'] == 0 ? '<span class="unpublishedDoc">'.$_lang['page_data_unpublished'].'</span>' : '<span class="publisheddoc">'.$_lang['page_data_published'].'</span>' ?></td>
                     </tr>
                     <tr>
                         <td>{{ ManagerTheme::getLexicon('page_data_publishdate') }}:</td>
-                        <td><?= $content['pub_date'] == 0 ? "(<i>" . $_lang['not_set'] . "</i>)" : $modx->toDateFormat($content['pub_date']) ?></td>
+                        <td><?= $content['pub_date'] == 0 ? "(<i>".$_lang['not_set']."</i>)" : $modx->toDateFormat($content['pub_date']) ?></td>
                     </tr>
                     <tr>
                         <td>{{ ManagerTheme::getLexicon('page_data_unpublishdate') }}:</td>
-                        <td><?= $content['unpub_date'] == 0 ? "(<i>" . $_lang['not_set'] . "</i>)" : $modx->toDateFormat($content['unpub_date']) ?></td>
+                        <td><?= $content['unpub_date'] == 0 ? "(<i>".$_lang['not_set']."</i>)" : $modx->toDateFormat($content['unpub_date']) ?></td>
                     </tr>
                     <tr>
                         <td>{{ ManagerTheme::getLexicon('page_data_cacheable') }}:</td>
@@ -353,11 +353,11 @@ 
                     </tr>
                     <tr>
                         <td>{{ ManagerTheme::getLexicon('page_data_web_access') }}:</td>
-                        <td><?= $content['privateweb'] == 0 ? $_lang['public'] : '<b style="color: #821517">' . $_lang['private'] . '</b> ' . $_style["icons_secured"] ?></td>
+                        <td><?= $content['privateweb'] == 0 ? $_lang['public'] : '<b style="color: #821517">'.$_lang['private'].'</b> '.$_style["icons_secured"] ?></td>
                     </tr>
                     <tr>
                         <td>{{ ManagerTheme::getLexicon('page_data_mgr_access') }}:</td>
-                        <td><?= $content['privatemgr'] == 0 ? $_lang['public'] : '<b style="color: #821517">' . $_lang['private'] . '</b> ' . $_style["icons_secured"] ?></td>
+                        <td><?= $content['privatemgr'] == 0 ? $_lang['public'] : '<b style="color: #821517">'.$_lang['private'].'</b> '.$_style["icons_secured"] ?></td>
                     </tr>
                     <tr>
                         <td colspan="2">&nbsp;</td>
@@ -387,13 +387,13 @@ 
             <script type="text/javascript">docSettings.addTabPage(document.getElementById("tabChildren"));</script>
             <div class="container container-body">
                 <div class="form-group clearfix">
-                    <?php if($numRecords > 0) : ?>
+                    <?php if ($numRecords > 0) : ?>
                     <div class="float-xs-left">
-                        <span class="publishedDoc"><?= $numRecords . ' ' . $_lang['resources_in_container'] ?> (<strong><?= entities($content['pagetitle'], $modx->getConfig('modx_charset')) ?></strong>)</span>
+                        <span class="publishedDoc"><?= $numRecords.' '.$_lang['resources_in_container'] ?> (<strong><?= entities($content['pagetitle'], $modx->getConfig('modx_charset')) ?></strong>)</span>
                     </div>
                     <?php endif; ?>
                     <div class="float-xs-right">
-                        <?= $filter_sort . ' ' . $filter_dir ?>
+                        <?= $filter_sort.' '.$filter_dir ?>
                     </div>
 
                 </div>
@@ -410,16 +410,16 @@ 
             <script type="text/javascript">docSettings.addTabPage(document.getElementById("tabSource"));</script>
             <?php
             $buffer = "";
-            $filename = MODX_BASE_PATH . "assets/cache/docid_" . $id . ".pageCache.php";
+            $filename = MODX_BASE_PATH."assets/cache/docid_".$id.".pageCache.php";
             $handle = @fopen($filename, "r");
-            if(!$handle) {
-                $buffer = '<div class="container container-body">' . $_lang['page_data_notcached'] . '</div>';
+            if (!$handle) {
+                $buffer = '<div class="container container-body">'.$_lang['page_data_notcached'].'</div>';
             } else {
-                while(!feof($handle)) {
+                while (!feof($handle)) {
                     $buffer .= fgets($handle, 4096);
                 }
                 fclose($handle);
-                $buffer = '<div class="navbar navbar-editor">' . $_lang['page_data_cached'] . '</div><div class="section-editor clearfix"><textarea rows="20" wrap="soft">' . $modx->getPhpCompat()->htmlspecialchars($buffer) . "</textarea></div>\n";
+                $buffer = '<div class="navbar navbar-editor">'.$_lang['page_data_cached'].'</div><div class="section-editor clearfix"><textarea rows="20" wrap="soft">'.$modx->getPhpCompat()->htmlspecialchars($buffer)."</textarea></div>\n";
             }
             echo $buffer;
             ?>

manager/views/page/plugin.blade.php

Spacing +3 added lines, -3 removed lines

@@ -636,7 +636,7 @@ 
                                     echoEventRows($evtnames);
                                 }
                                 echo '<hr class="clear">';
-                                echo '<div class="form-group"><b>' . $services[$srv - 1] . '</b></div>';
+                                echo '<div class="form-group"><b>'.$services[$srv - 1].'</b></div>';
                             }
                             // display group name
                             if ($grp != $row['groupname']) {
@@ -645,9 +645,9 @@ 
                                     echoEventRows($evtnames);
                                 }
                                 echo '<hr class="clear">';
-                                echo '<div class="form-group"><b>' . $row['groupname'] . '</b></div>';
+                                echo '<div class="form-group"><b>'.$row['groupname'].'</b></div>';
                             }
-                            $evtnames[] = '<input name="sysevents[]" id="' . $row['name'] . '" type="checkbox" ' . (in_array($row['id'], $evts) ? ' checked="checked" ' : '') . 'class="inputBox" value="' . $row['id'] . '" /> <label for="' . $row['name'] . '" ' . bold(in_array($row['id'], $evts)) . '> ' . $row['name'] . '</label>' . "\n";
+                            $evtnames[] = '<input name="sysevents[]" id="'.$row['name'].'" type="checkbox" '.(in_array($row['id'], $evts) ? ' checked="checked" ' : '').'class="inputBox" value="'.$row['id'].'" /> <label for="'.$row['name'].'" '.bold(in_array($row['id'], $evts)).'> '.$row['name'].'</label>'."\n";
                             if (count($evtnames) == 2) {
                                 echoEventRows($evtnames);
                             }

manager/views/page/2.blade.php

Spacing +54 added lines, -54 removed lines

@@ -4,7 +4,7 @@ 
     <?php
     unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
 
-    if($modx->hasPermission('settings') && $modx->getConfig('settings_version') !== $modx->getVersionData('version')) {
+    if ($modx->hasPermission('settings') && $modx->getConfig('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>');
     }
@@ -15,16 +15,16 @@ 
     $_SESSION['nrnewmessages'] = 0;
 
     // setup message info
-    if($modx->hasPermission('messages')) {
-        include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');
+    if ($modx->hasPermission('messages')) {
+        include_once(MODX_MANAGER_PATH.'includes/messageCount.inc.php');
         $_SESSION['nrtotalmessages'] = $nrtotalmessages;
         $_SESSION['nrnewmessages'] = $nrnewmessages;
 
         $msg = array();
         $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
-        $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';
+        $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">'.$_SESSION['nrnewmessages'].'</span>)' : '';
         $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
-        $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';
+        $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">'.$_SESSION['nrnewmessages'].'</span>' : '0';
         $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);
         $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
         $ph['MessageInfo'] = implode("\n", $msg);
@@ -32,56 +32,56 @@ 
 
     $iconTpl = $modx->getChunk('manager#welcome\WrapIcon');
     // 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'] = sprintf($iconTpl,$icon, 75);
+        $ph['SecurityIcon'] = sprintf($iconTpl, $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'] = sprintf($iconTpl,$icon, 99);
+        $ph['WebUserIcon'] = sprintf($iconTpl, $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'] = sprintf($iconTpl,$icon, 106);
+        $ph['ModulesIcon'] = sprintf($iconTpl, $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'] = sprintf($iconTpl,$icon, 76);
+        $ph['ResourcesIcon'] = sprintf($iconTpl, $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'] = sprintf($iconTpl,$icon, 93);
+        $ph['BackupIcon'] = sprintf($iconTpl, $icon, 93);
     }
-    if($modx->hasPermission('help')) {
+    if ($modx->hasPermission('help')) {
         $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
-        $ph['HelpIcon'] = sprintf($iconTpl,$icon, 9);
+        $ph['HelpIcon'] = sprintf($iconTpl, $icon, 9);
     }
 
-    if($modx->hasPermission('new_document')) {
+    if ($modx->hasPermission('new_document')) {
         $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';
-        $ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4);
+        $ph['ResourceIcon'] = sprintf($iconTpl, $icon, 4);
         $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';
-        $ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72);
+        $ph['WeblinkIcon'] = sprintf($iconTpl, $icon, 72);
     }
-    if($modx->hasPermission('assets_images')) {
+    if ($modx->hasPermission('assets_images')) {
         $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';
-        $ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72);
+        $ph['ImagesIcon'] = sprintf($iconTpl, $icon, 72);
     }
-    if($modx->hasPermission('assets_files')) {
+    if ($modx->hasPermission('assets_files')) {
         $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';
-        $ph['FilesIcon'] = sprintf($iconTpl,$icon, 72);
+        $ph['FilesIcon'] = sprintf($iconTpl, $icon, 72);
     }
-    if($modx->hasPermission('change_password')) {
+    if ($modx->hasPermission('change_password')) {
         $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';
-        $ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28);
+        $ph['PasswordIcon'] = sprintf($iconTpl, $icon, 28);
     }
     $icon = '<i class="[&icons_logout_large&]"></i>[%logout%]';
-    $ph['LogoutIcon'] = sprintf($iconTpl,$icon, 8);
+    $ph['LogoutIcon'] = sprintf($iconTpl, $icon, 8);
 
     // do some config checks
-    if($modx->getConfig('warning_visibility') || $_SESSION['mgrRole'] == 1) {
-        include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');
-        if($config_check_results != $_lang['configcheck_ok']) {
+    if ($modx->getConfig('warning_visibility') || $_SESSION['mgrRole'] == 1) {
+        include_once(MODX_MANAGER_PATH.'includes/config_check.inc.php');
+        if ($config_check_results != $_lang['configcheck_ok']) {
             $ph['config_check_results'] = $config_check_results;
             $ph['config_display'] = 'block';
         } else {
@@ -92,8 +92,8 @@ 
     }
 
     // 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']);
@@ -147,7 +147,7 @@ 
 	</tr>
 </table>';
 
-    $nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';
+    $nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>';
 
     $ph['UserInfo'] = $modx->parseText($tpl, array(
         'username' => $modx->getLoginUserName(),
@@ -159,10 +159,10 @@ 
 
     $from = array();
     $from[] = $modx->getDatabase()->getFullTableName('active_user_sessions');
-    $from[] = " us LEFT JOIN " . $modx->getDatabase()->getFullTableName('active_users') . " au ON au.sid=us.sid WHERE au.action <> '8'";
+    $from[] = " us LEFT JOIN ".$modx->getDatabase()->getFullTableName('active_users')." au ON au.sid=us.sid WHERE au.action <> '8'";
     $rs = $modx->getDatabase()->select('*', $from, '', 'username ASC, au.sid ASC');
 
-    if($modx->getDatabase()->getRecordCount($rs) < 1) {
+    if ($modx->getDatabase()->getRecordCount($rs) < 1) {
         $html = '<p>[%no_active_users_found%]</p>';
     } else {
         $now = $modx->timestamp($_SERVER['REQUEST_TIME']);
@@ -189,7 +189,7 @@ 
         $userList = array();
         $userCount = array();
         // Create userlist with session-count first before output
-        while($activeusers = $modx->getDatabase()->getRow($rs)) {
+        while ($activeusers = $modx->getDatabase()->getRow($rs)) {
             $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;
 
             $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';
@@ -207,9 +207,9 @@ 
                 $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);
+            $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);
         }
 
         $html .= '
@@ -236,7 +236,7 @@ 
         $output = '';
         $items = fetchRssChannelItems($url);
         if (empty($items)) {
-            $feedData[$section] = 'Failed to retrieve ' . $url;
+            $feedData[$section] = 'Failed to retrieve '.$url;
             continue;
         }
         $output .= '<ul>';
@@ -250,9 +250,9 @@ 
             $description = strip_tags($item['description']);
             if (strlen($description) > 199) {
                 $description = substr($description, 0, 200);
-                $description .= '...<br />Read <a href="' . $href . '" target="_blank">more</a>.';
+                $description .= '...<br />Read <a href="'.$href.'" target="_blank">more</a>.';
             }
-            $output .= '<li><a href="' . $href . '" target="_blank">' . $title . '</a> - <b>' . $pubdate . '</b><br />' . $description . '</li>';
+            $output .= '<li><a href="'.$href.'" target="_blank">'.$title.'</a> - <b>'.$pubdate.'</b><br />'.$description.'</li>';
         }
 
         $output .= '</ul>';
@@ -288,7 +288,7 @@ 
 
     // invoke event OnManagerWelcomePrerender
     $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
-    if(is_array($evtOut)) {
+    if (is_array($evtOut)) {
         $output = implode('', $evtOut);
         $ph['OnManagerWelcomePrerender'] = $output;
     }
@@ -314,7 +314,7 @@ 
                         <span>[%add_weblink%]</span>
                     </a>
                 </span>
-                ' : '') .
+                ' : '').
                 ($modx->hasPermission("assets_images") ? '
                 <span class="wm_button">
                     <a target="main" href="media/browser/mcpuk/browse.php?filemanager=media/browser/mcpuk/browse.php&type=images">
@@ -322,7 +322,7 @@ 
                         <span>[%images_management%]</span>
                     </a>
                 </span>
-                ' : '') .
+                ' : '').
                 ($modx->hasPermission("assets_files") ? '
                 <span class="wm_button">
                     <a target="main" href="media/browser/mcpuk/browse.php?filemanager=media/browser/mcpuk/browse.php&type=files">
@@ -330,7 +330,7 @@ 
                         <span>[%files_management%]</span>
                     </a>
                 </span>
-                ' : '') .
+                ' : '').
                 ($modx->hasPermission("change_password") ? '
                 <span class="wm_button">
                     <a target="main" href="index.php?a=28">
@@ -338,7 +338,7 @@ 
                         <span>[%change_password%]</span>
                     </a>
                 </span>
-                ' : '') . '
+                ' : '').'
                 <span class="wm_button">
                     <a target="_top" href="index.php?a=8">
                         <i class="[&icons_logout_large&]"></i>
@@ -350,7 +350,7 @@ 
                 <table>
                     <tr>
                         <td width="150">[%yourinfo_username%]</td>
-                        <td><b>' . $modx->getLoginUserName() . '</b></td>
+                        <td><b>' . $modx->getLoginUserName().'</b></td>
                     </tr>
                     <tr>
                         <td>[%yourinfo_role%]</td>
@@ -367,9 +367,9 @@ 
                     ($modx->hasPermission("change_password") ? '
                     <tr>
                         <td>[%inbox%]</td>
-                        <td><a href="index.php?a=10" target="main"><b>' . ($_SESSION["nrtotalmessages"] ? sprintf($_lang["welcome_messages"], $_SESSION["nrtotalmessages"], '<span style="color:red;">' . $_SESSION["nrnewmessages"] . "</span>") : $_lang["messages_no_messages"]) . '</b></a></td>
+                        <td><a href="index.php?a=10" target="main"><b>' . ($_SESSION["nrtotalmessages"] ? sprintf($_lang["welcome_messages"], $_SESSION["nrtotalmessages"], '<span style="color:red;">'.$_SESSION["nrnewmessages"]."</span>") : $_lang["messages_no_messages"]).'</b></a></td>
                     </tr>
-                    ' : '') . '
+                    ' : '').'
                 </table>
             </div>
 		',
@@ -418,22 +418,22 @@ 
 
     // 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 = $modx->getChunk('manager#welcome\Widget');
     $output = '';
-    foreach($widgets as $widget) {
-        if ($widget['hide'] != '1'){
+    foreach ($widgets as $widget) {
+        if ($widget['hide'] != '1') {
             $output .= $modx->parseText($tpl, $widget);
         }
     }

Braces +3 added lines, -3 removed lines

@@ -420,20 +420,20 @@
     $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
     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 = $modx->getChunk('manager#welcome\Widget');
     $output = '';
     foreach($widgets as $widget) {
-        if ($widget['hide'] != '1'){
+        if ($widget['hide'] != '1') {
             $output .= $modx->parseText($tpl, $widget);
         }
     }

manager/views/page/eventlog.blade.php

Spacing +3 added lines, -3 removed lines

@@ -132,7 +132,7 @@ 
                         <?php
                         $ds = $modx->getDatabase()->select("el.id, ELT(el.type , 'text-info fa fa-info-circle' , 'text-warning fa fa-exclamation-triangle' , 'text-danger fa fa-times-circle' ) as icon, el.createdon, el.source, el.eventid,IFNULL(wu.username,mu.username) as username", "{$tbl_event_log} AS el
 			LEFT JOIN {$tbl_manager_users} AS mu ON mu.id=el.user AND el.usertype=0
-			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "" . (is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '') . "(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");
+			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "".(is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '')."(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");
                         $grd = new \EvolutionCMS\Support\DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
                         $grd->pagerClass = '';
                         $grd->pageClass = 'page-item';
@@ -143,10 +143,10 @@ 
                         $grd->itemClass = "tableItem";
                         $grd->altItemClass = "tableAltItem";
                         $grd->fields = "type,source,createdon,eventid,username";
-                        $grd->columns = ManagerTheme::getLexicon('type') . " ," . ManagerTheme::getLexicon('source') . " ," . ManagerTheme::getLexicon('date') . " ," . ManagerTheme::getLexicon('event_id') . " ," . ManagerTheme::getLexicon('sysinfo_userid');
+                        $grd->columns = ManagerTheme::getLexicon('type')." ,".ManagerTheme::getLexicon('source')." ,".ManagerTheme::getLexicon('date')." ,".ManagerTheme::getLexicon('event_id')." ,".ManagerTheme::getLexicon('sysinfo_userid');
                         $grd->colWidths = "1%,,1%,1%,1%";
                         $grd->colAligns = "center,,,center,center";
-                        $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . ManagerTheme::getLexicon('click_to_context') . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . ManagerTheme::getLexicon('click_to_view_details') . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';
+                        $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='".ManagerTheme::getLexicon('click_to_context')."'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='".ManagerTheme::getLexicon('click_to_view_details')."'>[+source+]</a>||date: ".$modx->toDateFormat(null, 'formatOnly').' %I:%M %p';
                         if ($listmode == '1') {
                             $grd->pageSize = 0;
                         }

manager/index.php

Spacing +15 added lines, -15 removed lines

@@ -52,7 +52,7 @@ 
 }
 $mstart = memory_get_usage();
 
-if(mb_strtoupper($_SERVER['REQUEST_METHOD']) === 'GET' && count($_GET) === 1 && !empty($_GET['time'])) {
+if (mb_strtoupper($_SERVER['REQUEST_METHOD']) === 'GET' && count($_GET) === 1 && !empty($_GET['time'])) {
     die();
 }
 // we use this to make sure files are accessed through
@@ -61,32 +61,32 @@ 
     define('IN_MANAGER_MODE', true);
 }
 
-if (file_exists(__DIR__ . '/config.php')) {
-    $config = require __DIR__ . '/config.php';
-} elseif (file_exists(dirname(__DIR__) . '/config.php')) {
-    $config = require dirname(__DIR__) . '/config.php';
+if (file_exists(__DIR__.'/config.php')) {
+    $config = require __DIR__.'/config.php';
+} elseif (file_exists(dirname(__DIR__).'/config.php')) {
+    $config = require dirname(__DIR__).'/config.php';
 } else {
     $config = [
-        'core' => dirname(__DIR__) . '/core'
+        'core' => dirname(__DIR__).'/core'
     ];
 }
 
-if (!empty($config['core']) && file_exists($config['core'] . '/bootstrap.php')) {
-    require_once $config['core'] . '/bootstrap.php';
+if (!empty($config['core']) && file_exists($config['core'].'/bootstrap.php')) {
+    require_once $config['core'].'/bootstrap.php';
 } else {
     echo "<h3>Unable to load configuration settings</h3>";
     echo "Please run the EVO <a href='../install'>install utility</a>";
     exit;
 }
 
-if (! isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
     header('HTTP/1.0 404 Not Found');
     exit;
 }
 
 // send anti caching headers
 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
 header('Pragma: no-cache');
@@ -113,7 +113,7 @@ 
             $_SERVER['PATH_INFO'],
             "",
             preg_replace("/\\\\/", "/", $_SERVER['PATH_TRANSLATED'])
-        ) . "/";
+        )."/";
 }
 
 // initiate the content manager class
@@ -125,12 +125,12 @@ 
 //extract($settings, EXTR_OVERWRITE);
 
 // attempt to foil some simple types of CSRF attacks
-if ((int)$modx->getConfig('validate_referer') !== 0) {
+if ((int) $modx->getConfig('validate_referer') !== 0) {
     if (isset($_SERVER['HTTP_REFERER'])) {
         $referer = $_SERVER['HTTP_REFERER'];
 
         if (!empty($referer)) {
-            if (!preg_match('/^' . preg_quote(MODX_SITE_URL, '/') . '/i', $referer)) {
+            if (!preg_match('/^'.preg_quote(MODX_SITE_URL, '/').'/i', $referer)) {
                 $modx->webAlertAndQuit(
                     "A possible CSRF attempt was detected from referer: {$referer}.",
                     "index.php"
@@ -159,7 +159,7 @@ 
 $_lang = ManagerTheme::getLexicon();
 
 // send the charset header
-header('Content-Type: text/html; charset=' . ManagerTheme::getCharset());
+header('Content-Type: text/html; charset='.ManagerTheme::getCharset());
 
 // Update last action in table active_users
 $action = ManagerTheme::getActionId();
@@ -190,7 +190,7 @@ 
         $output = ManagerTheme::handle(1, ['frame' => 1]);
     } else {
         if ($modx->hasPermission('messages')) {
-            include_once __DIR__ . '/includes/messageCount.inc.php';
+            include_once __DIR__.'/includes/messageCount.inc.php';
         }
     }
 } else {

manager/media/script/air-datepicker/datepicker.inc.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
         $load_script = file_get_contents(__DIR__.'/datepicker.tpl');
         if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
-		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
+        $modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
 

Spacing +4 added lines, -4 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-class DATEPICKER {
+class DATEPICKER{
     /**
      * @return string
      */
-    public function getDP() {
+    public function getDP(){
         $modx = evolutionCMS();
 
         $load_script = file_get_contents(__DIR__.'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        if (!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
@@ -15,7 +15,7 @@ 
     /**
      * @return string
      */
-    public function getLangCode() {
+    public function getLangCode(){
         $lang = evolutionCMS()->get('ManagerTheme')->getLang();
 
         if ($lang === 'uk') {

Braces +9 added lines, -4 removed lines

@@ -1,13 +1,17 @@ 
 <?php
-class DATEPICKER {
+class DATEPICKER
+{
     /**
      * @return string
      */
-    public function getDP() {
+    public function getDP()
+    {
         $modx = evolutionCMS();
 
         $load_script = file_get_contents(__DIR__.'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        if(!isset($modx->config['lang_code'])) {
+            $modx->config['lang_code'] = $this->getLangCode();
+        }
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
@@ -15,7 +19,8 @@ 
     /**
      * @return string
      */
-    public function getLangCode() {
+    public function getLangCode()
+    {
         $lang = evolutionCMS()->get('ManagerTheme')->getLang();
 
         if ($lang === 'uk') {

manager/media/calendar/datepicker.inc.php

Indentation +7 added lines, -7 removed lines

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

 

 class DATEPICKER {

-	function __construct() {

-	}

+    function __construct() {

+    }

 

-	function getDP() {

-		$modx = evolutionCMS(); global $_lang;

+    function getDP() {

+        $modx = evolutionCMS(); global $_lang;

 

-		$tpl = file_get_contents(__DIR__ . '/datepicker.tpl');

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

-	}

+        $tpl = file_get_contents(__DIR__ . '/datepicker.tpl');

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

+    }

 }

Spacing +4 added lines, -4 removed lines

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

 

-class DATEPICKER {

-	function __construct() {

+class DATEPICKER{

+	function __construct(){

 	}

 

-	function getDP() {

+	function getDP(){

 		$modx = evolutionCMS(); global $_lang;

 

-		$tpl = file_get_contents(__DIR__ . '/datepicker.tpl');

+		$tpl = file_get_contents(__DIR__.'/datepicker.tpl');

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

 	}

 }

Braces +6 added lines, -3 removed lines

@@ -1,10 +1,13 @@
 <?php

 

-class DATEPICKER {

-	function __construct() {

+class DATEPICKER
+{
+	function __construct()
+	{
 	}

 

-	function getDP() {

+	function getDP()
+	{
 		$modx = evolutionCMS(); global $_lang;

 

 		$tpl = file_get_contents(__DIR__ . '/datepicker.tpl');

manager/media/style/default/ajax.php

Spacing +105 added lines, -105 removed lines

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

-define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through

+define('IN_MANAGER_MODE', true); // we use this to make sure files are accessed through

 define('MODX_API_MODE', true);

 

-if (file_exists(dirname(__DIR__, 3) . '/config.php')) {

-    $config = require dirname(__DIR__) . '/config.php';

-} elseif (file_exists(dirname(__DIR__, 4) . '/config.php')) {

-    $config = require dirname(__DIR__, 4) . '/config.php';

+if (file_exists(dirname(__DIR__, 3).'/config.php')) {

+    $config = require dirname(__DIR__).'/config.php';

+} elseif (file_exists(dirname(__DIR__, 4).'/config.php')) {

+    $config = require dirname(__DIR__, 4).'/config.php';

 } else {

     $config = [

         'root' => dirname(__DIR__, 4)

     ];

 }

 

-if (!empty($config['root']) && file_exists($config['root']. '/index.php')) {

-    require_once $config['root'] . '/index.php';

+if (!empty($config['root']) && file_exists($config['root'].'/index.php')) {

+    require_once $config['root'].'/index.php';

 } else {

     echo "<h3>Unable to load configuration settings</h3>";

     echo "Please run the EVO <a href='../install'>install utility</a>";

@@ -53,9 +53,9 @@ 
                         exit('send some data');

                     } //??

 

-                    $indent = (int)$_REQUEST['indent'];

-                    $parent = (int)$_REQUEST['parent'];

-                    $expandAll = (int)$_REQUEST['expandAll'];

+                    $indent = (int) $_REQUEST['indent'];

+                    $parent = (int) $_REQUEST['parent'];

+                    $expandAll = (int) $_REQUEST['expandAll'];

                     $output = '';

                     $hereid = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? $_REQUEST['id'] : '';

 

@@ -114,21 +114,21 @@ 
                 $sql = '';

                 $a = '';

                 $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '%*_') : '';

-                $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : '';

-                $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

+                $sqlLike = $filter ? 'WHERE t1.name LIKE "'.$modx->getDatabase()->escape($filter).'%"' : '';

+                $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;

 

                 switch ($elements) {

                     case 'element_templates':

                         $a = 16;

-                        $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : '';

+                        $sqlLike = $filter ? 'WHERE t1.templatename LIKE "'.$modx->getDatabase()->escape($filter).'%"' : '';

                         $sql = $modx->getDatabase()->query('SELECT t1.id, t1.templatename AS name, t1.locked, 0 AS disabled

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

-                        ' . $sqlLike . '

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

+                        ' . $sqlLike.'

                         ORDER BY t1.templatename ASC

                         ' . $sqlLimit);

 

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

-                            $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>';

+                            $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>'.$_lang['new_template'].'</a></li>';

                         }

 

                         break;

@@ -136,15 +136,15 @@ 
                     case 'element_tplvars':

                         $a = 301;

                         $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, IF(MIN(t2.tmplvarid),0,1) AS disabled

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

-                        LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates') . ' AS t2 ON t1.id=t2.tmplvarid

-                        ' . $sqlLike . '

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

+                        LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates').' AS t2 ON t1.id=t2.tmplvarid

+                        ' . $sqlLike.'

                         GROUP BY t1.id

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

                         if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

-                            $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>';

+                            $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>'.$_lang['new_tmplvars'].'</a></li>';

                         }

 

                         break;

@@ -152,13 +152,13 @@ 
                     case 'element_htmlsnippets':

                         $a = 78;

                         $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, t1.disabled

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

-                        ' . $sqlLike . '

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

+                        ' . $sqlLike.'

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

-                            $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>';

+                            $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>'.$_lang['new_htmlsnippet'].'</a></li>';

                         }

 

                         break;

@@ -166,13 +166,13 @@ 
                     case 'element_snippets':

                         $a = 22;

                         $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, t1.disabled

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

-                        ' . $sqlLike . '

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

+                        ' . $sqlLike.'

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

-                            $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>';

+                            $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>'.$_lang['new_snippet'].'</a></li>';

                         }

 

                         break;

@@ -180,13 +180,13 @@ 
                     case 'element_plugins':

                         $a = 102;

                         $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, t1.disabled

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

-                        ' . $sqlLike . '

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

+                        ' . $sqlLike.'

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

-                            $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>';

+                            $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>'.$_lang['new_plugin'].'</a></li>';

                         }

 

                         break;

@@ -201,7 +201,7 @@ 
                             continue;

                         }

 

-                        $items .= '<li class="item ' . ($row['disabled'] ? 'disabled' : '') . ($row['locked'] ? ' locked' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main" data-parent-id="a_76__elements_' . $elements . '">' . entities($row['name'], $modx->getConfig('modx_charset')) . ' <small>(' . $row['id'] . ')</small></a></li>' . "\n";

+                        $items .= '<li class="item '.($row['disabled'] ? 'disabled' : '').($row['locked'] ? ' locked' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main" data-parent-id="a_76__elements_'.$elements.'">'.entities($row['name'], $modx->getConfig('modx_charset')).' <small>('.$row['id'].')</small></a></li>'."\n";

                     }

                 }

 

@@ -222,23 +222,23 @@ 
             $output = '';

             $items = '';

             $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : '';

-            $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : '';

-            $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

+            $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->getDatabase()->escape($filter).'%"' : '';

+            $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;

 

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

+            if (!$modx->hasPermission('save_role')) {

                 $sqlLike .= $sqlLike ? ' AND ' : 'WHERE ';

                 $sqlLike .= 't2.role != 1';

             }

 

             $sql = $modx->getDatabase()->query('SELECT t1.*, t1.username AS name, t2.blocked

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

-				LEFT JOIN ' . $modx->getFullTableName('user_attributes') . ' AS t2 ON t1.id=t2.internalKey

-				' . $sqlLike . '

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

+				LEFT JOIN ' . $modx->getFullTableName('user_attributes').' AS t2 ON t1.id=t2.internalKey

+				' . $sqlLike.'

 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

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

-                $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>';

+                $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>'.$_lang['new_user'].'</a></li>';

             }

 

             if ($count = $modx->getDatabase()->getRecordCount($sql)) {

@@ -246,7 +246,7 @@ 
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

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

-                    $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . entities($row['name'], $modx->getConfig('modx_charset')) . ' <small>(' . $row['id'] . ')</small></a></li>';

+                    $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.entities($row['name'], $modx->getConfig('modx_charset')).' <small>('.$row['id'].')</small></a></li>';

                 }

             }

 

@@ -266,18 +266,18 @@ 
             $output = '';

             $items = '';

             $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : '';

-            $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : '';

-            $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

+            $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->getDatabase()->escape($filter).'%"' : '';

+            $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;

 

             $sql = $modx->getDatabase()->query('SELECT t1.*, t1.username AS name, t2.blocked

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

-				LEFT JOIN ' . $modx->getFullTableName('web_user_attributes') . ' AS t2 ON t1.id=t2.internalKey

-				' . $sqlLike . '

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

+				LEFT JOIN ' . $modx->getFullTableName('web_user_attributes').' AS t2 ON t1.id=t2.internalKey

+				' . $sqlLike.'

 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

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

-                $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>';

+                $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>'.$_lang['new_web_user'].'</a></li>';

             }

 

             if ($count = $modx->getDatabase()->getRecordCount($sql)) {

@@ -285,7 +285,7 @@ 
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

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

-                    $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . entities($row['name'], $modx->getConfig('modx_charset')) . ' <small>(' . $row['id'] . ')</small></a></li>';

+                    $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.entities($row['name'], $modx->getConfig('modx_charset')).' <small>('.$row['id'].')</small></a></li>';

                 }

             }

 

@@ -311,35 +311,35 @@ 
                     case 'SnippetNoCache': {

 

                         $sql = $modx->getDatabase()->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_snippets') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_snippets').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

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

                             $row = $modx->getDatabase()->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-code"></i> ' . entities($row['name'], $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-code"></i> '.entities($row['name'], $modx->getConfig('modx_charset'))

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=22&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=22&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

                         } else {

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-code"></i> ' . entities($name, $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-code"></i> '.entities($name, $modx->getConfig('modx_charset'))

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'],

-                                    'url' => "index.php?a=23&itemname=" . entities($name, $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'],

+                                    'url' => "index.php?a=23&itemname=".entities($name, $modx->getConfig('modx_charset'))

                                 )

                             );

                         }

@@ -349,35 +349,35 @@ 
                     case 'Chunk' : {

 

                         $sql = $modx->getDatabase()->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_htmlsnippets') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_htmlsnippets').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

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

                             $row = $modx->getDatabase()->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-th-large"></i> ' . entities($row['name'], $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-th-large"></i> '.entities($row['name'], $modx->getConfig('modx_charset'))

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=78&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=78&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

                         } else {

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-th-large"></i> ' . entities($name, $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-th-large"></i> '.entities($name, $modx->getConfig('modx_charset'))

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'],

-                                    'url' => "index.php?a=77&itemname=" . entities($name, $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'],

+                                    'url' => "index.php?a=77&itemname=".entities($name, $modx->getConfig('modx_charset'))

                                 )

                             );

                         }

@@ -386,8 +386,8 @@ 
                     }

                     case 'AttributeValue': {

                         $sql = $modx->getDatabase()->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_htmlsnippets') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_htmlsnippets').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

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

@@ -397,52 +397,52 @@ 
                                     'innerText' => entities($row['name'], $modx->getConfig('modx_charset'))

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=78&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=78&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

                         } else {

 

                             $sql = $modx->getDatabase()->query('SELECT *

-							FROM ' . $modx->getFullTableName('site_snippets') . '

-							WHERE name="' . $name . '"

+							FROM ' . $modx->getFullTableName('site_snippets').'

+							WHERE name="' . $name.'"

 							LIMIT 1');

 

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

                                 $row = $modx->getDatabase()->getRow($sql);

                                 $contextmenu = array(

                                     'header' => array(

-                                        'innerHTML' => '<i class="fa fa-code"></i> ' . entities($row['name'], $modx->getConfig('modx_charset'))

+                                        'innerHTML' => '<i class="fa fa-code"></i> '.entities($row['name'], $modx->getConfig('modx_charset'))

                                     ),

                                     'item' => array(

-                                        'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                        'url' => "index.php?a=22&id=" . $row['id']

+                                        'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                        'url' => "index.php?a=22&id=".$row['id']

                                     )

                                 );

                                 if (!empty($row['description'])) {

                                     $contextmenu['seperator'] = '';

                                     $contextmenu['description'] = array(

-                                        'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

+                                        'innerHTML' => '<i class="fa fa-info"></i> '.entities($row['description'], $modx->getConfig('modx_charset'))

                                     );

                                 }

                             } else {

                                 $contextmenu = array(

                                     'header' => array(

-                                        'innerHTML' => '<i class="fa fa-code"></i> ' . entities($name, $modx->getConfig('modx_charset'))

+                                        'innerHTML' => '<i class="fa fa-code"></i> '.entities($name, $modx->getConfig('modx_charset'))

                                     ),

                                     'item' => array(

-                                        'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'],

-                                        'url' => "index.php?a=77&itemname=" . entities($name, $modx->getConfig('modx_charset'))

+                                        'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'],

+                                        'url' => "index.php?a=77&itemname=".entities($name, $modx->getConfig('modx_charset'))

                                     ),

                                     'item2' => array(

-                                        'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'],

-                                        'url' => "index.php?a=23&itemname=" . entities($name, $modx->getConfig('modx_charset'))

+                                        'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'],

+                                        'url' => "index.php?a=23&itemname=".entities($name, $modx->getConfig('modx_charset'))

                                     )

                                 );

                             }

@@ -498,35 +498,35 @@ 
                         }

 

                         $sql = $modx->getDatabase()->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_tmplvars') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_tmplvars').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

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

                             $row = $modx->getDatabase()->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-list-alt"></i> ' . entities($row['name'], $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-list-alt"></i> '.entities($row['name'], $modx->getConfig('modx_charset'))

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=301&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=301&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

                         } else {

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-list-alt"></i> ' . entities($name, $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-list-alt"></i> '.entities($name, $modx->getConfig('modx_charset'))

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_tmplvars'],

-                                    'url' => "index.php?a=300&itemname=" . entities($name, $modx->getConfig('modx_charset'))

+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_tmplvars'],

+                                    'url' => "index.php?a=300&itemname=".entities($name, $modx->getConfig('modx_charset'))

                                 )

                             );

                         }

@@ -545,15 +545,15 @@ 
             $json = array();

 

             if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {

-                $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';

-                $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0;

+                $id = !empty($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';

+                $parent = isset($_REQUEST['parent']) ? (int) $_REQUEST['parent'] : 0;

                 $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0;

 

                 // set parent

                 if ($id && $parent >= 0) {

 

                     // find older parent

-                    $parentOld = $modx->getDatabase()->getValue($modx->getDatabase()->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));

+                    $parentOld = $modx->getDatabase()->getValue($modx->getDatabase()->select('parent', $modx->getFullTableName('site_content'), 'id='.$id));

 

                     $eventOut = $modx->invokeEvent('onBeforeMoveDocument', [

                         'id_document' => $id,

@@ -574,7 +574,7 @@ 
                     if (empty($json['errors'])) {

                         // check privileges user for move docs

                         if (!empty($modx->config['tree_show_protected']) && $role != 1) {

-                            $sql = $modx->getDatabase()->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');

+                            $sql = $modx->getDatabase()->select('*', $modx->getFullTableName('document_groups'), 'document IN('.$id.','.$parent.','.$parentOld.')');

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

                                 $document_groups = array();

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

@@ -599,22 +599,22 @@ 
                             // set new parent

                             $modx->getDatabase()->update(array(

                                 'parent' => $parent

-                            ), $modx->getFullTableName('site_content'), 'id=' . $id);

+                            ), $modx->getFullTableName('site_content'), 'id='.$id);

                             // set parent isfolder = 1

                             $modx->getDatabase()->update(array(

                                 'isfolder' => 1

-                            ), $modx->getFullTableName('site_content'), 'id=' . $parent);

+                            ), $modx->getFullTableName('site_content'), 'id='.$parent);

 

                             if ($parent != $parentOld) {

                                 // check children docs and set parent isfolder

-                                if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {

+                                if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getFullTableName('site_content'), 'parent='.$parentOld))) {

                                     $modx->getDatabase()->update(array(

                                         'isfolder' => 1

-                                    ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

+                                    ), $modx->getFullTableName('site_content'), 'id='.$parentOld);

                                 } else {

                                     $modx->getDatabase()->update(array(

                                         'isfolder' => 0

-                                    ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

+                                    ), $modx->getFullTableName('site_content'), 'id='.$parentOld);

                                 }

                             }

 

@@ -622,7 +622,7 @@ 
                             if (!empty($menuindex)) {

                                 $menuindex = explode(',', $menuindex);

                                 foreach ($menuindex as $key => $value) {

-                                    $modx->getDatabase()->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);

+                                    $modx->getDatabase()->query('UPDATE '.$modx->getFullTableName('site_content').' SET menuindex='.$key.' WHERE id='.$value);

                                 }

                             } else {

                                 // TODO: max(*) menuindex

@@ -651,19 +651,19 @@ 
         }

 

         case 'getLockedElements': {

-            $type = isset($_REQUEST['type']) ? (int)$_REQUEST['type'] : 0;

-            $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

+            $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : 0;

+            $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;

 

             $output = !!$modx->elementIsLocked($type, $id, true);

 

             if (!$output) {

                 $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';

-                $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';

+                $docgrp_cond = $docgrp ? ' OR dg.document_group IN ('.$docgrp.')' : '';

                 $sql = '

-                    SELECT MAX(IF(1=' . $role . ' OR sc.privatemgr=0' . $docgrp_cond . ', 0, 1)) AS locked

-                    FROM ' . $modx->getFullTableName('site_content') . ' AS sc 

-                    LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id

-                    WHERE sc.id=' . $id . ' GROUP BY sc.id';

+                    SELECT MAX(IF(1=' . $role.' OR sc.privatemgr=0'.$docgrp_cond.', 0, 1)) AS locked

+                    FROM ' . $modx->getFullTableName('site_content').' AS sc 

+                    LEFT JOIN ' . $modx->getFullTableName('document_groups').' dg ON dg.document=sc.id

+                    WHERE sc.id=' . $id.' GROUP BY sc.id';

                 $sql = $modx->getDatabase()->query($sql);

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

                     $row = $modx->getDatabase()->getRow($sql);

Braces +86 added lines, -86 removed lines

@@ -2,19 +2,19 @@ 
 define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through

 define('MODX_API_MODE', true);

 

-if (file_exists(dirname(__DIR__, 3) . '/config.php')) {

+if (file_exists(dirname(__DIR__, 3) . '/config.php')) {
     $config = require dirname(__DIR__) . '/config.php';

-} elseif (file_exists(dirname(__DIR__, 4) . '/config.php')) {

+} elseif (file_exists(dirname(__DIR__, 4) . '/config.php')) {
     $config = require dirname(__DIR__, 4) . '/config.php';

-} else {

+} else {
     $config = [

         'root' => dirname(__DIR__, 4)

     ];

 }

 

-if (!empty($config['root']) && file_exists($config['root']. '/index.php')) {

+if (!empty($config['root']) && file_exists($config['root']. '/index.php')) {
     require_once $config['root'] . '/index.php';

-} else {

+} else {
     echo "<h3>Unable to load configuration settings</h3>";

     echo "Please run the EVO <a href='../install'>install utility</a>";

     exit;

@@ -22,7 +22,7 @@ 
 

 $modx->getSettings();

 

-if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {

+if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {
     $modx->sendErrorPage();

 }

 

@@ -40,16 +40,16 @@ 
 $limit = $modx->getConfig('number_of_results', 100);

 header('Content-Type: text/html; charset='.$modx->getConfig('modx_charset'), true);

 

-if (isset($action)) {

-    switch ($action) {

+if (isset($action)) {
+    switch ($action) {
         case '1': {

-            switch ($frame) {

+            switch ($frame) {
                 case 'nodes':

                     // save folderstate

-                    if (isset($_REQUEST['opened'])) {

+                    if (isset($_REQUEST['opened'])) {
                         $_SESSION['openedArray'] = $_REQUEST['opened'];

                     }

-                    if (isset($_REQUEST['savestateonly'])) {

+                    if (isset($_REQUEST['savestateonly'])) {
                         exit('send some data');

                     } //??

 

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

                     $hereid = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? $_REQUEST['id'] : '';

 

-                    if (isset($_REQUEST['showonlyfolders'])) {

+                    if (isset($_REQUEST['showonlyfolders'])) {
                         $_SESSION['tree_show_only_folders'] = $_REQUEST['showonlyfolders'];

                     }

 

@@ -69,8 +69,8 @@ 
                         'tree_sortdir',

                         'tree_nodename'

                     );

-                    foreach ($sortParams as $param) {

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

+                    foreach ($sortParams as $param) {
+                        if (isset($_REQUEST[$param])) {
                             $_SESSION[$param] = $_REQUEST[$param];

                             $modx->getManagerApi()->saveLastUserSetting($param, $_REQUEST[$param]);

                         }

@@ -79,9 +79,9 @@ 
                     // icons by content type

                     $icons = getIconInfo($_style);

 

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

+                    if (isset($_SESSION['openedArray'])) {
                         $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));

-                    } else {

+                    } else {
                         $opened = array();

                     }

 

@@ -92,9 +92,9 @@ 
                     echo makeHTML($indent, $parent, $expandAll, $hereid);

 

                     // check for deleted documents on reload

-                    if ($expandAll == 2) {

+                    if ($expandAll == 2) {
                         $rs = $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('site_content'), 'deleted=1 LIMIT 1');

-                        if ($modx->getDatabase()->getRecordCount($rs)) {

+                        if ($modx->getDatabase()->getRecordCount($rs)) {
                             echo '<span id="binFull"></span>'; // add a special element to let system now that the bin is full

                         }

                     }

@@ -108,7 +108,7 @@ 
 

             $elements = isset($_REQUEST['elements']) && is_scalar($_REQUEST['elements']) ? htmlentities($_REQUEST['elements']) : '';

 

-            if ($elements) {

+            if ($elements) {
                 $output = '';

                 $items = '';

                 $sql = '';

@@ -117,7 +117,7 @@ 
                 $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : '';

                 $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

 

-                switch ($elements) {

+                switch ($elements) {
                     case 'element_templates':

                         $a = 16;

                         $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : '';

@@ -127,7 +127,7 @@ 
                         ORDER BY t1.templatename ASC

                         ' . $sqlLimit);

 

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

+                        if ($modx->hasPermission('new_template')) {
                             $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>';

                         }

 

@@ -143,7 +143,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

-                        if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

+                        if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
                             $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>';

                         }

 

@@ -157,7 +157,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

+                        if ($modx->hasPermission('new_chunk')) {
                             $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>';

                         }

 

@@ -171,7 +171,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

+                        if ($modx->hasPermission('new_snippet')) {
                             $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>';

                         }

 

@@ -185,19 +185,19 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

+                        if ($modx->hasPermission('new_plugin')) {
                             $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>';

                         }

 

                         break;

                 }

 

-                if ($count = $modx->getDatabase()->getRecordCount($sql)) {

-                    if ($count == $limit) {

+                if ($count = $modx->getDatabase()->getRecordCount($sql)) {
+                    if ($count == $limit) {
                         $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                     }

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

-                        if (($row['disabled'] || $row['locked']) && $role != 1) {

+                    while ($row = $modx->getDatabase()->getRow($sql)) {
+                        if (($row['disabled'] || $row['locked']) && $role != 1) {
                             continue;

                         }

 

@@ -205,9 +205,9 @@ 
                     }

                 }

 

-                if (isset($_REQUEST['filter'])) {

+                if (isset($_REQUEST['filter'])) {
                     $output = $items;

-                } else {

+                } else {
                     $output .= $items;

                 }

 

@@ -225,7 +225,7 @@ 
             $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : '';

             $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

 

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

+            if(!$modx->hasPermission('save_role')) {
                 $sqlLike .= $sqlLike ? ' AND ' : 'WHERE ';

                 $sqlLike .= 't2.role != 1';

             }

@@ -237,22 +237,22 @@ 
 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

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

+            if ($modx->hasPermission('new_user')) {
                 $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>';

             }

 

-            if ($count = $modx->getDatabase()->getRecordCount($sql)) {

-                if ($count == $limit) {

+            if ($count = $modx->getDatabase()->getRecordCount($sql)) {
+                if ($count == $limit) {
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

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

+                while ($row = $modx->getDatabase()->getRow($sql)) {
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . entities($row['name'], $modx->getConfig('modx_charset')) . ' <small>(' . $row['id'] . ')</small></a></li>';

                 }

             }

 

-            if (isset($_REQUEST['filter'])) {

+            if (isset($_REQUEST['filter'])) {
                 $output = $items;

-            } else {

+            } else {
                 $output .= $items;

             }

 

@@ -276,22 +276,22 @@ 
 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

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

+            if ($modx->hasPermission('new_web_user')) {
                 $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>';

             }

 

-            if ($count = $modx->getDatabase()->getRecordCount($sql)) {

-                if ($count == $limit) {

+            if ($count = $modx->getDatabase()->getRecordCount($sql)) {
+                if ($count == $limit) {
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

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

+                while ($row = $modx->getDatabase()->getRow($sql)) {
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . entities($row['name'], $modx->getConfig('modx_charset')) . ' <small>(' . $row['id'] . ')</small></a></li>';

                 }

             }

 

-            if (isset($_REQUEST['filter'])) {

+            if (isset($_REQUEST['filter'])) {
                 $output = $items;

-            } else {

+            } else {
                 $output .= $items;

             }

 

@@ -305,8 +305,8 @@ 
             $type = isset($_REQUEST['type']) && is_scalar($_REQUEST['type']) ? $modx->getDatabase()->escape($_REQUEST['type']) : false;

             $contextmenu = '';

 

-            if ($role && $name && $type) {

-                switch ($type) {

+            if ($role && $name && $type) {
+                switch ($type) {
                     case 'Snippet':

                     case 'SnippetNoCache': {

 

@@ -315,7 +315,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

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

+                        if ($modx->getDatabase()->getRecordCount($sql)) {
                             $row = $modx->getDatabase()->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -326,13 +326,13 @@ 
                                     'url' => "index.php?a=22&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-code"></i> ' . entities($name, $modx->getConfig('modx_charset'))

@@ -353,7 +353,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

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

+                        if ($modx->getDatabase()->getRecordCount($sql)) {
                             $row = $modx->getDatabase()->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -364,13 +364,13 @@ 
                                     'url' => "index.php?a=78&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-th-large"></i> ' . entities($name, $modx->getConfig('modx_charset'))

@@ -390,7 +390,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

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

+                        if ($modx->getDatabase()->getRecordCount($sql)) {
                             $row = $modx->getDatabase()->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -401,20 +401,20 @@ 
                                     'url' => "index.php?a=78&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

-                        } else {

+                        } else {
 

                             $sql = $modx->getDatabase()->query('SELECT *

 							FROM ' . $modx->getFullTableName('site_snippets') . '

 							WHERE name="' . $name . '"

 							LIMIT 1');

 

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

+                            if ($modx->getDatabase()->getRecordCount($sql)) {
                                 $row = $modx->getDatabase()->getRow($sql);

                                 $contextmenu = array(

                                     'header' => array(

@@ -425,13 +425,13 @@ 
                                         'url' => "index.php?a=22&id=" . $row['id']

                                     )

                                 );

-                                if (!empty($row['description'])) {

+                                if (!empty($row['description'])) {
                                     $contextmenu['seperator'] = '';

                                     $contextmenu['description'] = array(

                                         'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

                                     );

                                 }

-                            } else {

+                            } else {
                                 $contextmenu = array(

                                     'header' => array(

                                         'innerHTML' => '<i class="fa fa-code"></i> ' . entities($name, $modx->getConfig('modx_charset'))

@@ -493,7 +493,7 @@ 
                             'alias_visible'

                         );

 

-                        if (in_array($name, $default_field)) {

+                        if (in_array($name, $default_field)) {
                             return;

                         }

 

@@ -502,7 +502,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

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

+                        if ($modx->getDatabase()->getRecordCount($sql)) {
                             $row = $modx->getDatabase()->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -513,13 +513,13 @@ 
                                     'url' => "index.php?a=301&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-list-alt"></i> ' . entities($name, $modx->getConfig('modx_charset'))

@@ -544,13 +544,13 @@ 
         case 'movedocument' : {

             $json = array();

 

-            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {

+            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
                 $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';

                 $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0;

                 $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0;

 

                 // set parent

-                if ($id && $parent >= 0) {

+                if ($id && $parent >= 0) {
 

                     // find older parent

                     $parentOld = $modx->getDatabase()->getValue($modx->getDatabase()->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));

@@ -561,31 +561,31 @@ 
                         'new_parent'  => $parent,

                     ]);

 

-                    if (is_array($eventOut) && count($eventOut) > 0) {

+                    if (is_array($eventOut) && count($eventOut) > 0) {
                         $eventParent = array_pop($eventOut);

 

-                        if ($eventParent == $parentOld) {

+                        if ($eventParent == $parentOld) {
                             $json['errors'] = $_lang['error_movedocument2'];

-                        } else {

+                        } else {
                             $parent = $eventParent;

                         }

                     }

 

-                    if (empty($json['errors'])) {

+                    if (empty($json['errors'])) {
                         // check privileges user for move docs

-                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {

+                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {
                             $sql = $modx->getDatabase()->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');

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

+                            if ($modx->getDatabase()->getRecordCount($sql)) {
                                 $document_groups = array();

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

+                                while ($row = $modx->getDatabase()->getRow($sql)) {
                                     $document_groups[$row['document']]['groups'][] = $row['document_group'];

                                 }

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

-                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {

+                                foreach ($document_groups as $key => $value) {
+                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {
                                         $json['errors'] = $_lang["error_no_privileges"];

                                     }

                                 }

-                                if ($json['errors']) {

+                                if ($json['errors']) {
                                     header('content-type: application/json');

                                     echo json_encode($json, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE);

                                     break;

@@ -593,9 +593,9 @@ 
                             }

                         }

 

-                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {

+                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {
                             $json['errors'] = $_lang["error_no_privileges"];

-                        } else {

+                        } else {
                             // set new parent

                             $modx->getDatabase()->update(array(

                                 'parent' => $parent

@@ -605,13 +605,13 @@ 
                                 'isfolder' => 1

                             ), $modx->getFullTableName('site_content'), 'id=' . $parent);

 

-                            if ($parent != $parentOld) {

+                            if ($parent != $parentOld) {
                                 // check children docs and set parent isfolder

-                                if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {

+                                if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
                                     $modx->getDatabase()->update(array(

                                         'isfolder' => 1

                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

-                                } else {

+                                } else {
                                     $modx->getDatabase()->update(array(

                                         'isfolder' => 0

                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

@@ -619,16 +619,16 @@ 
                             }

 

                             // set menuindex

-                            if (!empty($menuindex)) {

+                            if (!empty($menuindex)) {
                                 $menuindex = explode(',', $menuindex);

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

+                                foreach ($menuindex as $key => $value) {
                                     $modx->getDatabase()->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);

                                 }

-                            } else {

+                            } else {
                                 // TODO: max(*) menuindex

                             }

 

-                            if (!$json['errors']) {

+                            if (!$json['errors']) {
                                 $json['success'] = $_lang["actioncomplete"];

 

                                 $modx->invokeEvent('onAfterMoveDocument', [

@@ -640,7 +640,7 @@ 
                         }

                     }

                 }

-            } else {

+            } else {
                 $json['errors'] = $_lang["error_no_privileges"];

             }

 

@@ -656,7 +656,7 @@ 
 

             $output = !!$modx->elementIsLocked($type, $id, true);

 

-            if (!$output) {

+            if (!$output) {
                 $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';

                 $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';

                 $sql = '

@@ -665,7 +665,7 @@ 
                     LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id

                     WHERE sc.id=' . $id . ' GROUP BY sc.id';

                 $sql = $modx->getDatabase()->query($sql);

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

+                if ($modx->getDatabase()->getRecordCount($sql)) {
                     $row = $modx->getDatabase()->getRow($sql);

                     $output = !!$row['locked'];

                 }

manager/media/style/default/style.php

Indentation +70 added lines, -70 removed lines

@@ -238,66 +238,66 @@ 
 $addnew = 0;

 $run = 0;

 switch($action) {

-	case '3':

-	case '4':

-	case '27':

-	case '72':

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

-			$addnew = 1;

-		}

-		break;

-	case '16':

-	case '19':

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

-			$addnew = 1;

-		}

-		break;

-	case '300':

-	case '301':

-		if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {

-			$addnew = 1;

-		}

-		break;

-	case '77':

-	case '78':

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

-			$addnew = 1;

-		}

-		break;

-	case '22':

-	case '23':

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

-			$addnew = 1;

-		}

-		break;

-	case '101':

-	case '102':

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

-			$addnew = 1;

-		}

-		break;

-	case '106':

-	case '107':

-	case '108':

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

-			$addnew = 1;

-		}

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

-			$run = 1;

-		}

-		break;

-	case '88':

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

-			$addnew = 1;

-		}

-		break;

+    case '3':

+    case '4':

+    case '27':

+    case '72':

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

+            $addnew = 1;

+        }

+        break;

+    case '16':

+    case '19':

+        if($modx->hasPermission('new_template')) {

+            $addnew = 1;

+        }

+        break;

+    case '300':

+    case '301':

+        if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {

+            $addnew = 1;

+        }

+        break;

+    case '77':

+    case '78':

+        if($modx->hasPermission('new_chunk')) {

+            $addnew = 1;

+        }

+        break;

+    case '22':

+    case '23':

+        if($modx->hasPermission('new_snippet')) {

+            $addnew = 1;

+        }

+        break;

+    case '101':

+    case '102':

+        if($modx->hasPermission('new_plugin')) {

+            $addnew = 1;

+        }

+        break;

+    case '106':

+    case '107':

+    case '108':

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

+            $addnew = 1;

+        }

+        if($modx->hasPermission('exec_module')) {

+            $run = 1;

+        }

+        break;

+    case '88':

+        if($modx->hasPermission('new_web_user')) {

+            $addnew = 1;

+        }

+        break;

 }

 

 $disabled = ($action == '19' || $action == '300' || $action == '77' || $action == '23' || $action == '101' || $action == '4' || $action == '72' || $action == '87' || $action == '11' || $action == '107' || $action == '38') ? ' disabled' : '';

 

 $_style['actionbuttons'] = array(

-	'dynamic' => array(

-		'document' => '<div id="actions">

+    'dynamic' => array(

+        'document' => '<div id="actions">

 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

@@ -312,7 +312,7 @@ 
 						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>

 					</select>

 				</div>' .

-					($addnew ? '

+                    ($addnew ? '

 					<a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();">

 						<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>

 					</a>

@@ -328,7 +328,7 @@ 
 				</a>

 			</div>

 		</div>',

-		'user' => '<div id="actions">

+        'user' => '<div id="actions">

 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

@@ -351,7 +351,7 @@ 
 				</a>

 			</div>

 		</div>',

-		'element' => '<div id="actions">

+        'element' => '<div id="actions">

 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

@@ -384,21 +384,21 @@ 
 				' : '') . '

 			</div>

 		</div>',

-		'newmodule' => ($addnew ? '<div id="actions">

+        'newmodule' => ($addnew ? '<div id="actions">

 			<div class="btn-group">

 				<a id="newModule" class="btn btn-secondary" href="javascript:;" onclick="actions.new();">

 					<i class="fa fa-plus-circle"></i><span>' . $_lang['new_module'] . '</span>

 				</a>

 			</div>

 		</div>' : ''),

-		'close' => '<div id="actions">

+        'close' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.close();">

 					<i class="' . $_style["actions_close"] . '"></i><span>' . $_lang['close'] . '</span>

 				</a>

 			</div>

 		</div>',

-		'save' => '<div id="actions">

+        'save' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

 					<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

@@ -408,7 +408,7 @@ 
 				</a>

 			</div>

 		</div>',

-		'savedelete' => '<div id="actions">

+        'savedelete' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

 					<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

@@ -421,14 +421,14 @@ 
 				</a>

 			</div>

 		</div>',

-		'cancel' => '<div id="actions">

+        'cancel' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

 					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

 				</a>

 			</div>

 		</div>',

-		'canceldelete' => '<div id="actions">

+        'canceldelete' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

 					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

@@ -438,11 +438,11 @@ 
 				</a>

 			</div>

 		</div>',

-	),

-	'static' => array(

-		'document' => '<div id="actions">

+    ),

+    'static' => array(

+        'document' => '<div id="actions">

 			<div class="btn-group">' .

-				($addnew ? '

+                ($addnew ? '

 					<a class="btn btn-secondary" href="javascript:;" onclick="actions.new();">

 						<i class="' . $_style["icons_new_document"] . '"></i><span>' . $_lang['create_resource_here'] . '</span>

 					</a>

@@ -467,12 +467,12 @@ 
 				</a>

 			</div>

 		</div>',

-		'cancel' => '<div id="actions">

+        'cancel' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

 					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

 				</a>

 			</div>

 		</div>',

-	)

+    )

 );

Spacing +79 added lines, -79 removed lines

@@ -8,21 +8,21 @@ 
  * Version:        1.1

  * MODX version:   1.0.3

  */

-$style_path = 'media/style/' . ManagerTheme::getTheme() . '/images/';

+$style_path = 'media/style/'.ManagerTheme::getTheme().'/images/';

 $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php';

 

-if(!empty($_GET['a']) && $_GET['a'] == 2) {

+if (!empty($_GET['a']) && $_GET['a'] == 2) {

     $modx->config['enable_filter'] = 1;

 

-    $modx->addSnippet('hasPermission','return $modx->hasPermission($key);');

+    $modx->addSnippet('hasPermission', 'return $modx->hasPermission($key);');

 

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

         $hasAnyPermission = 1;

     else $hasAnyPermission = 0;

-    $modx->addSnippet('hasAnyPermission','global $hasAnyPermission; return $hasAnyPermission;');

-    $modx->addSnippet('getLoginUserName','return $modx->getLoginUserName();');

+    $modx->addSnippet('hasAnyPermission', 'global $hasAnyPermission; return $hasAnyPermission;');

+    $modx->addSnippet('getLoginUserName', 'return $modx->getLoginUserName();');

     $code = 'global $_lang;return $_SESSION["nrtotalmessages"] ? sprintf($_lang["welcome_messages"], $_SESSION["nrtotalmessages"], \'<span style="color:red;">\' . $_SESSION["nrnewmessages"] . "</span>") : $_lang["messages_no_messages"];';

-    $modx->addSnippet('getMessageCount',$code);

+    $modx->addSnippet('getMessageCount', $code);

 

 // Large Icons

     $_style['icons_backup_large']       = 'fa fa-database fa-fw fa-2x';

@@ -41,7 +41,7 @@ 
 }

 

 // Favicon

-$_style['favicon']                  = (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . ManagerTheme::getTheme() . '/images/favicon.ico');

+$_style['favicon']                  = (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.ManagerTheme::getTheme().'/images/favicon.ico');

 

 // Tree Menu Toolbar

 $_style['show_tree']                = $style_path.'tree/expand.png';

@@ -70,10 +70,10 @@ 
 $_style['tree_page_word']           = "<i class='fa fa-file-word-o'></i>";

 $_style['tree_page_excel']          = "<i class='fa fa-file-excel-o'></i>";

 

-$_style['tree_minusnode']           = "<i class='fa fa-angle-down'></i>";//$style_path.'tree/angle-down.png';

-$_style['tree_plusnode']            = "<i class='fa fa-angle-right'></i>";//$style_path.'tree/angle-right.png';

+$_style['tree_minusnode']           = "<i class='fa fa-angle-down'></i>"; //$style_path.'tree/angle-down.png';

+$_style['tree_plusnode']            = "<i class='fa fa-angle-right'></i>"; //$style_path.'tree/angle-right.png';

 $_style['tree_weblink']             = $style_path.'tree/link.png';

-$_style['tree_preview_resource']    = "<i class='fa fa-eye'></i>";//$style_path.'icons/eye.png';

+$_style['tree_preview_resource']    = "<i class='fa fa-eye'></i>"; //$style_path.'icons/eye.png';

 

 $_style['tree_showtree']            = '<i class="fa fa-sitemap"></i>';

 $_style['tree_working']             = '<i class="fa fa-warning"></i>';

@@ -105,8 +105,8 @@ 
 $_style['icons_edit_document']      = $style_path.'icons/save.png';

 $_style['icons_delete_document']    = $style_path.'icons/trash.png';

 //locks

-$_style['icons_preview_resource']   = $style_path.'icons/eye.png';//$style_path.'icons/eye.png';

-$_style['icons_secured']            = "<i class='fa fa-lock'></i>";//$style_path.'icons/lock.png';

+$_style['icons_preview_resource']   = $style_path.'icons/eye.png'; //$style_path.'icons/eye.png';

+$_style['icons_secured']            = "<i class='fa fa-lock'></i>"; //$style_path.'icons/lock.png';

 

 //file manager icons

 $_style['files_save']               = 'fa fa-floppy-o';

@@ -177,7 +177,7 @@ 
 $_style['icons_set_parent']         = $style_path.'icons/folder-open.png';

 

 //modules

-$_style['icons_module']            = 'fa fa-cube';

+$_style['icons_module'] = 'fa fa-cube';

 $_style['icons_modules']            = 'fa fa-cubes'; //$style_path.'icons/modules.png';

 $_style['icons_run']                = $style_path.'icons/play.png';

 

@@ -237,57 +237,57 @@ 
 $stay = isset($_REQUEST['stay']) ? $_REQUEST['stay'] : '';

 $addnew = 0;

 $run = 0;

-switch($action) {

+switch ($action) {

 	case '3':

 	case '4':

 	case '27':

 	case '72':

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

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

 			$addnew = 1;

 		}

 		break;

 	case '16':

 	case '19':

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

+		if ($modx->hasPermission('new_template')) {

 			$addnew = 1;

 		}

 		break;

 	case '300':

 	case '301':

-		if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {

+		if ($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {

 			$addnew = 1;

 		}

 		break;

 	case '77':

 	case '78':

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

+		if ($modx->hasPermission('new_chunk')) {

 			$addnew = 1;

 		}

 		break;

 	case '22':

 	case '23':

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

+		if ($modx->hasPermission('new_snippet')) {

 			$addnew = 1;

 		}

 		break;

 	case '101':

 	case '102':

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

+		if ($modx->hasPermission('new_plugin')) {

 			$addnew = 1;

 		}

 		break;

 	case '106':

 	case '107':

 	case '108':

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

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

 			$addnew = 1;

 		}

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

+		if ($modx->hasPermission('exec_module')) {

 			$run = 1;

 		}

 		break;

 	case '88':

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

+		if ($modx->hasPermission('new_web_user')) {

 			$addnew = 1;

 		}

 		break;

@@ -301,30 +301,30 @@ 
 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-						<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 					</a>

 					<span class="btn btn-success plus dropdown-toggle"></span>

 					<select id="stay" name="stay">

 						' . ($addnew ? '

-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>

-						' : '') . '

-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>

-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>

+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>

+						' : '').'

+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>

+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>

 					</select>

 				</div>' .

 					($addnew ? '

-					<a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();">

-						<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>

+					<a id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();">

+						<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>

 					</a>

-					' : '') . '

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+					' : '').'

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 				<a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();">

-					<i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span>

+					<i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span>

 				</a>

 			</div>

 		</div>',

@@ -332,22 +332,22 @@ 
 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-						<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 					</a>

 					<span class="btn btn-success plus dropdown-toggle"></span>

 					<select id="stay" name="stay">

 						' . ($addnew ? '

-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>

-						' : '') . '

-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>

-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>

+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>

+						' : '').'

+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>

+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>

 					</select>

 				</div>

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

@@ -355,86 +355,86 @@ 
 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-						<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 					</a>

 					<span class="btn btn-success plus dropdown-toggle"></span>

 					<select id="stay" name="stay">

 						' . ($addnew ? '

-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>

-						' : '') . '

-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>

-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>

+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>

+						' : '').'

+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>

+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>

 					</select>

 				</div>

 				' . ($addnew ? '

-				<a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();">

-					<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>

+				<a id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();">

+					<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>

 				</a>

-				' : '') . '

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				' : '').'

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 				' . ($run ? '

-				<a id="Button4" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.run();">

-					<i class="' . $_style["actions_run"] . '"></i><span>' . $_lang['run_module'] . '</span>

+				<a id="Button4" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.run();">

+					<i class="' . $_style["actions_run"].'"></i><span>'.$_lang['run_module'].'</span>

 				</a>

-				' : '') . '

+				' : '').'

 			</div>

 		</div>',

 		'newmodule' => ($addnew ? '<div id="actions">

 			<div class="btn-group">

 				<a id="newModule" class="btn btn-secondary" href="javascript:;" onclick="actions.new();">

-					<i class="fa fa-plus-circle"></i><span>' . $_lang['new_module'] . '</span>

+					<i class="fa fa-plus-circle"></i><span>' . $_lang['new_module'].'</span>

 				</a>

 			</div>

 		</div>' : ''),

 		'close' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.close();">

-					<i class="' . $_style["actions_close"] . '"></i><span>' . $_lang['close'] . '</span>

+					<i class="' . $_style["actions_close"].'"></i><span>'.$_lang['close'].'</span>

 				</a>

 			</div>

 		</div>',

 		'save' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-					<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+					<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

 		'savedelete' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-					<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+					<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 				</a>

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

 		'cancel' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

 		'canceldelete' => '<div id="actions">

 			<div class="btn-group">

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

@@ -444,33 +444,33 @@ 
 			<div class="btn-group">' .

 				($addnew ? '

 					<a class="btn btn-secondary" href="javascript:;" onclick="actions.new();">

-						<i class="' . $_style["icons_new_document"] . '"></i><span>' . $_lang['create_resource_here'] . '</span>

+						<i class="' . $_style["icons_new_document"].'"></i><span>'.$_lang['create_resource_here'].'</span>

 					</a>

 					<a class="btn btn-secondary" href="javascript:;" onclick="actions.newlink();">

-						<i class="' . $_style["icons_new_weblink"] . '"></i><span>' . $_lang['create_weblink_here'] . '</span>

+						<i class="' . $_style["icons_new_weblink"].'"></i><span>'.$_lang['create_weblink_here'].'</span>

 					</a>

-				' : '') . '

+				' : '').'

 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.edit();">

-					<i class="' . $_style["actions_edit"] . '"></i><span>' . $_lang['edit'] . '</span>

+					<i class="' . $_style["actions_edit"].'"></i><span>'.$_lang['edit'].'</span>

 				</a>

 				<a id="Button2" class="btn btn-secondary" href="javascript:;" onclick="actions.move();">

-					<i class="' . $_style["actions_move"] . '"></i><span>' . $_lang['move'] . '</span>

+					<i class="' . $_style["actions_move"].'"></i><span>'.$_lang['move'].'</span>

 				</a>

 				<a id="Button6" class="btn btn-secondary" href="javascript:;" onclick="actions.duplicate();">

-					<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>

+					<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>

 				</a>

 				<a id="Button3" class="btn btn-secondary" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();">

-					<i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span>

+					<i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span>

 				</a>

 			</div>

 		</div>',

 		'cancel' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

Braces +19 added lines, -17 removed lines

@@ -11,14 +11,16 @@ 
 $style_path = 'media/style/' . ManagerTheme::getTheme() . '/images/';

 $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php';

 

-if(!empty($_GET['a']) && $_GET['a'] == 2) {

+if(!empty($_GET['a']) && $_GET['a'] == 2) {
     $modx->config['enable_filter'] = 1;

 

     $modx->addSnippet('hasPermission','return $modx->hasPermission($key);');

 

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

-        $hasAnyPermission = 1;

-    else $hasAnyPermission = 0;

+    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')) {
+            $hasAnyPermission = 1;
+    } else {
+        $hasAnyPermission = 0;
+    }
     $modx->addSnippet('hasAnyPermission','global $hasAnyPermission; return $hasAnyPermission;');

     $modx->addSnippet('getLoginUserName','return $modx->getLoginUserName();');

     $code = 'global $_lang;return $_SESSION["nrtotalmessages"] ? sprintf($_lang["welcome_messages"], $_SESSION["nrtotalmessages"], \'<span style="color:red;">\' . $_SESSION["nrnewmessages"] . "</span>") : $_lang["messages_no_messages"];';

@@ -226,68 +228,68 @@ 
 

 // actions buttons templates

 $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : '';

-if (!empty($modx->config['global_tabs']) && !isset($_SESSION['stay'])) {

+if (!empty($modx->config['global_tabs']) && !isset($_SESSION['stay'])) {
     $_REQUEST['stay'] = 2;

 }

-if (isset($_REQUEST['stay'])) {

+if (isset($_REQUEST['stay'])) {
     $_SESSION['stay'] = $_REQUEST['stay'];

-} else if (isset($_SESSION['stay'])) {

+} else if (isset($_SESSION['stay'])) {
     $_REQUEST['stay'] = $_SESSION['stay'];

 }

 $stay = isset($_REQUEST['stay']) ? $_REQUEST['stay'] : '';

 $addnew = 0;

 $run = 0;

-switch($action) {

+switch($action) {
 	case '3':

 	case '4':

 	case '27':

 	case '72':

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

+		if($modx->hasPermission('new_document')) {
 			$addnew = 1;

 		}

 		break;

 	case '16':

 	case '19':

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

+		if($modx->hasPermission('new_template')) {
 			$addnew = 1;

 		}

 		break;

 	case '300':

 	case '301':

-		if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {

+		if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
 			$addnew = 1;

 		}

 		break;

 	case '77':

 	case '78':

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

+		if($modx->hasPermission('new_chunk')) {
 			$addnew = 1;

 		}

 		break;

 	case '22':

 	case '23':

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

+		if($modx->hasPermission('new_snippet')) {
 			$addnew = 1;

 		}

 		break;

 	case '101':

 	case '102':

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

+		if($modx->hasPermission('new_plugin')) {
 			$addnew = 1;

 		}

 		break;

 	case '106':

 	case '107':

 	case '108':

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

+		if($modx->hasPermission('new_module')) {
 			$addnew = 1;

 		}

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

+		if($modx->hasPermission('exec_module')) {
 			$run = 1;

 		}

 		break;

 	case '88':

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

+		if($modx->hasPermission('new_web_user')) {
 			$addnew = 1;

 		}

 		break;