| @@ -20,7 +20,7 @@ | ||
| 20 | 20 | <form name="install" id="install_form" action="index.php?action=options" method="post"> | 
| 21 | 21 | <?php | 
| 22 | 22 |  if ($errors == 0) { | 
| 23 | - // check if install folder is removeable | |
| 23 | + // check if install folder is removeable | |
| 24 | 24 |      if (is_writable("../install")) { ?> | 
| 25 | 25 | <span id="removeinstall" style="float:left;cursor:pointer;color:#505050;line-height:18px;" onclick="var chk=document.install.rminstaller; if(chk) chk.checked=!chk.checked;"><input type="checkbox" name="rminstaller" onclick="event.cancelBubble=true;" <?php echo (empty ($errors) ? 'checked="checked"' : '') ?> style="cursor:default;" /><?php echo $_lang['remove_install_folder_auto'] ?></span> | 
| 26 | 26 | <?php | 
| @@ -8,10 +8,10 @@ | ||
| 8 | 8 | $self = 'install/connection.databasetest.php'; | 
| 9 | 9 |  $base_path = str_replace($self,'',str_replace('\\','/', __FILE__)); | 
| 10 | 10 |  if (is_file("{$base_path}assets/cache/siteManager.php")) { | 
| 11 | -	include_once("{$base_path}assets/cache/siteManager.php"); | |
| 11 | +    include_once("{$base_path}assets/cache/siteManager.php"); | |
| 12 | 12 | } | 
| 13 | 13 |  if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) { | 
| 14 | -	define('MGR_DIR','manager'); | |
| 14 | +    define('MGR_DIR','manager'); | |
| 15 | 15 | } | 
| 16 | 16 |  require_once("lang.php"); | 
| 17 | 17 | |
| @@ -16,10 +16,10 @@ | ||
| 16 | 16 | error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED); | 
| 17 | 17 | |
| 18 | 18 |  if (is_file("{$base_path}assets/cache/siteManager.php")) { | 
| 19 | -	include_once("{$base_path}assets/cache/siteManager.php"); | |
| 19 | +    include_once("{$base_path}assets/cache/siteManager.php"); | |
| 20 | 20 | } | 
| 21 | 21 |  if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) { | 
| 22 | -	define('MGR_DIR', 'manager'); | |
| 22 | +    define('MGR_DIR', 'manager'); | |
| 23 | 23 | } | 
| 24 | 24 | |
| 25 | 25 | |
| @@ -177,9 +177,9 @@ | ||
| 177 | 177 | <td colspan="2"><div class="split"></div></td> | 
| 178 | 178 | </tr> | 
| 179 | 179 | <?php | 
| 180 | - // Check for GD before allowing captcha to be enabled | |
| 181 | -      $gdAvailable = extension_loaded('gd');
 | |
| 182 | - ?> | |
| 180 | + // Check for GD before allowing captcha to be enabled | |
| 181 | +        $gdAvailable = extension_loaded('gd');
 | |
| 182 | + ?> | |
| 183 | 183 | <?php | 
| 184 | 184 |  $gdAvailable = extension_loaded('gd');
 | 
| 185 | 185 | if(!$gdAvailable) $use_captcha = 0; | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | - $site_unavailable_message_view = isset($site_unavailable_message) ? $site_unavailable_message : $_lang['siteunavailable_message_default']; | |
| 2 | + $site_unavailable_message_view = isset($site_unavailable_message) ? $site_unavailable_message : $_lang['siteunavailable_message_default']; | |
| 3 | 3 | ?> | 
| 4 | 4 | <style> | 
| 5 | 5 |  table.sysSettings > tbody td, table.sysSettings > tbody th {border-bottom:1px dotted #ccc;padding:10px;}
 | 
| @@ -135,8 +135,8 @@ discard block | ||
| 135 | 135 | <?php | 
| 136 | 136 | // Check if PHX is enabled | 
| 137 | 137 | $count = $modx->db->getRecordCount( | 
| 138 | -              $modx->db->select('id', '[+prefix+]site_plugins', 
 | |
| 139 | - "plugincode LIKE '%phx.parser.class.inc.php%OnParseDocument();%' AND disabled != 1") | |
| 138 | +                $modx->db->select('id', '[+prefix+]site_plugins', 
 | |
| 139 | + "plugincode LIKE '%phx.parser.class.inc.php%OnParseDocument();%' AND disabled != 1") | |
| 140 | 140 | ); | 
| 141 | 141 |              if($count) {
 | 
| 142 | 142 | $disabledFilters = 1; | 
| @@ -259,14 +259,14 @@ discard block | ||
| 259 | 259 | <th><?php echo $_lang['serveroffset_title'] ?><br><small>[(server_offset_time)]</small></th> | 
| 260 | 260 | <td> <select name="server_offset_time" size="1" class="inputBox"> | 
| 261 | 261 | <?php | 
| 262 | -      for($i=-24; $i<25; $i++) {
 | |
| 263 | - $seconds = $i*60*60; | |
| 264 | - $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ; | |
| 265 | - ?> | |
| 262 | +        for($i=-24; $i<25; $i++) {
 | |
| 263 | + $seconds = $i*60*60; | |
| 264 | + $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ; | |
| 265 | + ?> | |
| 266 | 266 | <option value="<?php echo $seconds; ?>" <?php echo $selectedtext; ?>><?php echo $i; ?></option> | 
| 267 | 267 | <?php | 
| 268 | - } | |
| 269 | - ?> | |
| 268 | + } | |
| 269 | + ?> | |
| 270 | 270 | </select> | 
| 271 | 271 |        	<div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time()+$server_offset_time)); ?></div>
 | 
| 272 | 272 | </td> | 
| @@ -7,10 +7,10 @@ discard block | ||
| 7 | 7 | |
| 8 | 8 | // invoke OnBeforeManagerLogout event | 
| 9 | 9 |  $modx->invokeEvent("OnBeforeManagerLogout", | 
| 10 | - array( | |
| 11 | - "userid" => $internalKey, | |
| 12 | - "username" => $username | |
| 13 | - )); | |
| 10 | + array( | |
| 11 | + "userid" => $internalKey, | |
| 12 | + "username" => $username | |
| 13 | + )); | |
| 14 | 14 | |
| 15 | 15 | //// Unset all of the session variables. | 
| 16 | 16 | //$_SESSION = array(); | 
| @@ -33,10 +33,10 @@ discard block | ||
| 33 | 33 | |
| 34 | 34 | // invoke OnManagerLogout event | 
| 35 | 35 |  $modx->invokeEvent("OnManagerLogout", | 
| 36 | - array( | |
| 37 | - "userid" => $internalKey, | |
| 38 | - "username" => $username | |
| 39 | - )); | |
| 36 | + array( | |
| 37 | + "userid" => $internalKey, | |
| 38 | + "username" => $username | |
| 39 | + )); | |
| 40 | 40 | |
| 41 | 41 | // show login screen | 
| 42 | 42 |  header('Location: ' . MODX_MANAGER_URL); | 
| @@ -491,7 +491,7 @@ | ||
| 491 | 491 |              }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) { | 
| 492 | 492 | $publishedon = $pub_date; | 
| 493 | 493 | $publishedby = $modx->getLoginUserID(); | 
| 494 | -               }elseif ($was_published && !$published) { | |
| 494 | +                }elseif ($was_published && !$published) { | |
| 495 | 495 | $publishedon = 0; | 
| 496 | 496 | $publishedby = 0; | 
| 497 | 497 |          } else { | 
| @@ -236,9 +236,9 @@ | ||
| 236 | 236 | lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?> | 
| 237 | 237 | }; | 
| 238 | 238 | <?php | 
| 239 | -      $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
 | |
| 240 | -      echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";
 | |
| 241 | - ?> | |
| 239 | +        $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
 | |
| 240 | +        echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";
 | |
| 241 | + ?> | |
| 242 | 242 | </script> | 
| 243 | 243 | <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/modx.min.js?v=<?= $lastInstallTime ?>"></script> | 
| 244 | 244 |      <?php if ($modx->config['show_picker'] != "0") { ?>
 | 
| @@ -4,237 +4,237 @@ discard block | ||
| 4 | 4 | */ | 
| 5 | 5 | |
| 6 | 6 | $sitemenu['bars'] = array( | 
| 7 | - 'bars', | |
| 8 | - 'main', | |
| 9 | - '<i class="fa fa-bars"></i>', | |
| 10 | - 'javascript:;', | |
| 11 | - $_lang['home'], | |
| 12 | - 'modx.resizer.toggle(); return false;', | |
| 13 | - ' return false;', | |
| 14 | - '', | |
| 15 | - 0, | |
| 16 | - 10, | |
| 17 | - '' | |
| 7 | + 'bars', | |
| 8 | + 'main', | |
| 9 | + '<i class="fa fa-bars"></i>', | |
| 10 | + 'javascript:;', | |
| 11 | + $_lang['home'], | |
| 12 | + 'modx.resizer.toggle(); return false;', | |
| 13 | + ' return false;', | |
| 14 | + '', | |
| 15 | + 0, | |
| 16 | + 10, | |
| 17 | + '' | |
| 18 | 18 | ); | 
| 19 | 19 | |
| 20 | 20 | //mainMenu | 
| 21 | 21 | $sitemenu['site'] = array( | 
| 22 | - 'site', | |
| 23 | - 'main', | |
| 24 | - '<i class="fa fa-home"></i>' . $_lang['home'], | |
| 25 | - 'index.php?a=2', | |
| 26 | - $_lang['home'], | |
| 27 | - '', | |
| 28 | - '', | |
| 29 | - 'main', | |
| 30 | - 0, | |
| 31 | - 10, | |
| 32 | - 'active' | |
| 22 | + 'site', | |
| 23 | + 'main', | |
| 24 | + '<i class="fa fa-home"></i>' . $_lang['home'], | |
| 25 | + 'index.php?a=2', | |
| 26 | + $_lang['home'], | |
| 27 | + '', | |
| 28 | + '', | |
| 29 | + 'main', | |
| 30 | + 0, | |
| 31 | + 10, | |
| 32 | + 'active' | |
| 33 | 33 | ); | 
| 34 | 34 | |
| 35 | 35 |  if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
 | 
| 36 | - $sitemenu['elements'] = array( | |
| 37 | - 'elements', | |
| 38 | - 'main', | |
| 39 | - '<i class="fa fa-th"></i>' . $_lang['elements'], | |
| 40 | - 'javascript:;', | |
| 41 | - $_lang['elements'], | |
| 42 | - ' return false;', | |
| 43 | - '', | |
| 44 | - '', | |
| 45 | - 0, | |
| 46 | - 20, | |
| 47 | - '' | |
| 48 | - ); | |
| 36 | + $sitemenu['elements'] = array( | |
| 37 | + 'elements', | |
| 38 | + 'main', | |
| 39 | + '<i class="fa fa-th"></i>' . $_lang['elements'], | |
| 40 | + 'javascript:;', | |
| 41 | + $_lang['elements'], | |
| 42 | + ' return false;', | |
| 43 | + '', | |
| 44 | + '', | |
| 45 | + 0, | |
| 46 | + 20, | |
| 47 | + '' | |
| 48 | + ); | |
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | 51 |  if($modx->hasPermission('exec_module')) {
 | 
| 52 | - $sitemenu['modules'] = array( | |
| 53 | - 'modules', | |
| 54 | - 'main', | |
| 55 | - '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'], | |
| 56 | - 'javascript:;', | |
| 57 | - $_lang['modules'], | |
| 58 | - ' return false;', | |
| 59 | - '', | |
| 60 | - '', | |
| 61 | - 0, | |
| 62 | - 30, | |
| 63 | - '' | |
| 64 | - ); | |
| 52 | + $sitemenu['modules'] = array( | |
| 53 | + 'modules', | |
| 54 | + 'main', | |
| 55 | + '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'], | |
| 56 | + 'javascript:;', | |
| 57 | + $_lang['modules'], | |
| 58 | + ' return false;', | |
| 59 | + '', | |
| 60 | + '', | |
| 61 | + 0, | |
| 62 | + 30, | |
| 63 | + '' | |
| 64 | + ); | |
| 65 | 65 | } | 
| 66 | 66 | |
| 67 | 67 |  if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
 | 
| 68 | - $sitemenu['users'] = array( | |
| 69 | - 'users', | |
| 70 | - 'main', | |
| 71 | - '<i class="fa fa-users"></i>' . $_lang['users'], | |
| 72 | - 'javascript:;', | |
| 73 | - $_lang['users'], | |
| 74 | - ' return false;', | |
| 75 | - 'edit_user', | |
| 76 | - '', | |
| 77 | - 0, | |
| 78 | - 40, | |
| 79 | - '' | |
| 80 | - ); | |
| 68 | + $sitemenu['users'] = array( | |
| 69 | + 'users', | |
| 70 | + 'main', | |
| 71 | + '<i class="fa fa-users"></i>' . $_lang['users'], | |
| 72 | + 'javascript:;', | |
| 73 | + $_lang['users'], | |
| 74 | + ' return false;', | |
| 75 | + 'edit_user', | |
| 76 | + '', | |
| 77 | + 0, | |
| 78 | + 40, | |
| 79 | + '' | |
| 80 | + ); | |
| 81 | 81 | } | 
| 82 | 82 | |
| 83 | 83 |  if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
 | 
| 84 | - $sitemenu['tools'] = array( | |
| 85 | - 'tools', | |
| 86 | - 'main', | |
| 87 | - '<i class="fa fa-wrench"></i>' . $_lang['tools'], | |
| 88 | - 'javascript:;', | |
| 89 | - $_lang['tools'], | |
| 90 | - ' return false;', | |
| 91 | - '', | |
| 92 | - '', | |
| 93 | - 0, | |
| 94 | - 50, | |
| 95 | - '' | |
| 96 | - ); | |
| 84 | + $sitemenu['tools'] = array( | |
| 85 | + 'tools', | |
| 86 | + 'main', | |
| 87 | + '<i class="fa fa-wrench"></i>' . $_lang['tools'], | |
| 88 | + 'javascript:;', | |
| 89 | + $_lang['tools'], | |
| 90 | + ' return false;', | |
| 91 | + '', | |
| 92 | + '', | |
| 93 | + 0, | |
| 94 | + 50, | |
| 95 | + '' | |
| 96 | + ); | |
| 97 | 97 | } | 
| 98 | 98 | |
| 99 | 99 | $tab = 0; | 
| 100 | 100 |  if($modx->hasPermission('edit_template')) {
 | 
| 101 | - $sitemenu['element_templates'] = array( | |
| 102 | - 'element_templates', | |
| 103 | - 'elements', | |
| 104 | - '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 105 | - 'index.php?a=76&tab=' . $tab++, | |
| 106 | - $_lang['manage_templates'], | |
| 107 | - '', | |
| 108 | - 'new_template,edit_template', | |
| 109 | - 'main', | |
| 110 | - 0, | |
| 111 | - 10, | |
| 112 | - 'dropdown-toggle' | |
| 113 | - ); | |
| 101 | + $sitemenu['element_templates'] = array( | |
| 102 | + 'element_templates', | |
| 103 | + 'elements', | |
| 104 | + '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 105 | + 'index.php?a=76&tab=' . $tab++, | |
| 106 | + $_lang['manage_templates'], | |
| 107 | + '', | |
| 108 | + 'new_template,edit_template', | |
| 109 | + 'main', | |
| 110 | + 0, | |
| 111 | + 10, | |
| 112 | + 'dropdown-toggle' | |
| 113 | + ); | |
| 114 | 114 | } | 
| 115 | 115 |  if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
 | 
| 116 | - $sitemenu['element_tplvars'] = array( | |
| 117 | - 'element_tplvars', | |
| 118 | - 'elements', | |
| 119 | - '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 120 | - 'index.php?a=76&tab=' . $tab++, | |
| 121 | - $_lang['tmplvars'], | |
| 122 | - '', | |
| 123 | - 'new_template,edit_template', | |
| 124 | - 'main', | |
| 125 | - 0, | |
| 126 | - 20, | |
| 127 | - 'dropdown-toggle' | |
| 128 | - ); | |
| 116 | + $sitemenu['element_tplvars'] = array( | |
| 117 | + 'element_tplvars', | |
| 118 | + 'elements', | |
| 119 | + '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 120 | + 'index.php?a=76&tab=' . $tab++, | |
| 121 | + $_lang['tmplvars'], | |
| 122 | + '', | |
| 123 | + 'new_template,edit_template', | |
| 124 | + 'main', | |
| 125 | + 0, | |
| 126 | + 20, | |
| 127 | + 'dropdown-toggle' | |
| 128 | + ); | |
| 129 | 129 | } | 
| 130 | 130 |  if($modx->hasPermission('edit_chunk')) {
 | 
| 131 | - $sitemenu['element_htmlsnippets'] = array( | |
| 132 | - 'element_htmlsnippets', | |
| 133 | - 'elements', | |
| 134 | - '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 135 | - 'index.php?a=76&tab=' . $tab++, | |
| 136 | - $_lang['manage_htmlsnippets'], | |
| 137 | - '', | |
| 138 | - 'new_chunk,edit_chunk', | |
| 139 | - 'main', | |
| 140 | - 0, | |
| 141 | - 30, | |
| 142 | - 'dropdown-toggle' | |
| 143 | - ); | |
| 131 | + $sitemenu['element_htmlsnippets'] = array( | |
| 132 | + 'element_htmlsnippets', | |
| 133 | + 'elements', | |
| 134 | + '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 135 | + 'index.php?a=76&tab=' . $tab++, | |
| 136 | + $_lang['manage_htmlsnippets'], | |
| 137 | + '', | |
| 138 | + 'new_chunk,edit_chunk', | |
| 139 | + 'main', | |
| 140 | + 0, | |
| 141 | + 30, | |
| 142 | + 'dropdown-toggle' | |
| 143 | + ); | |
| 144 | 144 | } | 
| 145 | 145 |  if($modx->hasPermission('edit_snippet')) {
 | 
| 146 | - $sitemenu['element_snippets'] = array( | |
| 147 | - 'element_snippets', | |
| 148 | - 'elements', | |
| 149 | - '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 150 | - 'index.php?a=76&tab=' . $tab++, | |
| 151 | - $_lang['manage_snippets'], | |
| 152 | - '', | |
| 153 | - 'new_snippet,edit_snippet', | |
| 154 | - 'main', | |
| 155 | - 0, | |
| 156 | - 40, | |
| 157 | - 'dropdown-toggle' | |
| 158 | - ); | |
| 146 | + $sitemenu['element_snippets'] = array( | |
| 147 | + 'element_snippets', | |
| 148 | + 'elements', | |
| 149 | + '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 150 | + 'index.php?a=76&tab=' . $tab++, | |
| 151 | + $_lang['manage_snippets'], | |
| 152 | + '', | |
| 153 | + 'new_snippet,edit_snippet', | |
| 154 | + 'main', | |
| 155 | + 0, | |
| 156 | + 40, | |
| 157 | + 'dropdown-toggle' | |
| 158 | + ); | |
| 159 | 159 | } | 
| 160 | 160 |  if($modx->hasPermission('edit_plugin')) {
 | 
| 161 | - $sitemenu['element_plugins'] = array( | |
| 162 | - 'element_plugins', | |
| 163 | - 'elements', | |
| 164 | - '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 165 | - 'index.php?a=76&tab=' . $tab++, | |
| 166 | - $_lang['manage_plugins'], | |
| 167 | - '', | |
| 168 | - 'new_plugin,edit_plugin', | |
| 169 | - 'main', | |
| 170 | - 0, | |
| 171 | - 50, | |
| 172 | - 'dropdown-toggle' | |
| 173 | - ); | |
| 161 | + $sitemenu['element_plugins'] = array( | |
| 162 | + 'element_plugins', | |
| 163 | + 'elements', | |
| 164 | + '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 165 | + 'index.php?a=76&tab=' . $tab++, | |
| 166 | + $_lang['manage_plugins'], | |
| 167 | + '', | |
| 168 | + 'new_plugin,edit_plugin', | |
| 169 | + 'main', | |
| 170 | + 0, | |
| 171 | + 50, | |
| 172 | + 'dropdown-toggle' | |
| 173 | + ); | |
| 174 | 174 | } | 
| 175 | 175 |  //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
 | 
| 176 | 176 | |
| 177 | 177 |  if($modx->hasPermission('file_manager')) {
 | 
| 178 | - $sitemenu['manage_files'] = array( | |
| 179 | - 'manage_files', | |
| 180 | - 'elements', | |
| 181 | - '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'], | |
| 182 | - 'index.php?a=31', | |
| 183 | - $_lang['manage_files'], | |
| 184 | - '', | |
| 185 | - 'file_manager', | |
| 186 | - 'main', | |
| 187 | - 0, | |
| 188 | - 70, | |
| 189 | - '' | |
| 190 | - ); | |
| 178 | + $sitemenu['manage_files'] = array( | |
| 179 | + 'manage_files', | |
| 180 | + 'elements', | |
| 181 | + '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'], | |
| 182 | + 'index.php?a=31', | |
| 183 | + $_lang['manage_files'], | |
| 184 | + '', | |
| 185 | + 'file_manager', | |
| 186 | + 'main', | |
| 187 | + 0, | |
| 188 | + 70, | |
| 189 | + '' | |
| 190 | + ); | |
| 191 | 191 | } | 
| 192 | 192 |  if($modx->hasPermission('category_manager')) {
 | 
| 193 | - $sitemenu['manage_categories'] = array( | |
| 194 | - 'manage_categories', | |
| 195 | - 'elements', | |
| 196 | - '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'], | |
| 197 | - 'index.php?a=120', | |
| 198 | - $_lang['manage_categories'], | |
| 199 | - '', | |
| 200 | - 'category_manager', | |
| 201 | - 'main', | |
| 202 | - 0, | |
| 203 | - 80, | |
| 204 | - '' | |
| 205 | - ); | |
| 193 | + $sitemenu['manage_categories'] = array( | |
| 194 | + 'manage_categories', | |
| 195 | + 'elements', | |
| 196 | + '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'], | |
| 197 | + 'index.php?a=120', | |
| 198 | + $_lang['manage_categories'], | |
| 199 | + '', | |
| 200 | + 'category_manager', | |
| 201 | + 'main', | |
| 202 | + 0, | |
| 203 | + 80, | |
| 204 | + '' | |
| 205 | + ); | |
| 206 | 206 | } | 
| 207 | 207 | |
| 208 | 208 | // Modules Menu Items | 
| 209 | 209 |  if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
 | 
| 210 | - $sitemenu['new_module'] = array( | |
| 211 | - 'new_module', | |
| 212 | - 'modules', | |
| 213 | - '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'], | |
| 214 | - 'index.php?a=106', | |
| 215 | - $_lang['module_management'], | |
| 216 | - '', | |
| 217 | - 'new_module,edit_module', | |
| 218 | - 'main', | |
| 219 | - 1, | |
| 220 | - 0, | |
| 221 | - '' | |
| 222 | - ); | |
| 210 | + $sitemenu['new_module'] = array( | |
| 211 | + 'new_module', | |
| 212 | + 'modules', | |
| 213 | + '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'], | |
| 214 | + 'index.php?a=106', | |
| 215 | + $_lang['module_management'], | |
| 216 | + '', | |
| 217 | + 'new_module,edit_module', | |
| 218 | + 'main', | |
| 219 | + 1, | |
| 220 | + 0, | |
| 221 | + '' | |
| 222 | + ); | |
| 223 | 223 | } | 
| 224 | 224 | |
| 225 | 225 |  if($modx->hasPermission('exec_module')) {
 | 
| 226 | -	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
 | |
| 227 | -		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
 | |
| 226 | +    if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
 | |
| 227 | +        $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
 | |
| 228 | 228 |  				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
 | 
| 229 | 229 |  				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
 | 
| 230 | 230 |  				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
 | 
| 231 | 231 | WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1 | 
| 232 | 232 | ORDER BY sm.name'); | 
| 233 | -	} else {
 | |
| 234 | -		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
 | |
| 235 | - } | |
| 236 | -	if($modx->db->getRecordCount($rs)) {
 | |
| 237 | -	    while ($row = $modx->db->getRow($rs)) {
 | |
| 233 | +    } else {
 | |
| 234 | +        $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
 | |
| 235 | + } | |
| 236 | +    if($modx->db->getRecordCount($rs)) {
 | |
| 237 | +        while ($row = $modx->db->getRow($rs)) {
 | |
| 238 | 238 | $sitemenu['module' . $row['id']] = array( | 
| 239 | 239 | 'module' . $row['id'], | 
| 240 | 240 | 'modules', | 
| @@ -255,83 +255,83 @@ discard block | ||
| 255 | 255 | // security menu items (users) | 
| 256 | 256 | |
| 257 | 257 |  if($modx->hasPermission('edit_user')) {
 | 
| 258 | - $sitemenu['user_management_title'] = array( | |
| 259 | - 'user_management_title', | |
| 260 | - 'users', | |
| 261 | - '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 262 | - 'index.php?a=75', | |
| 263 | - $_lang['user_management_title'], | |
| 264 | - '', | |
| 265 | - 'edit_user', | |
| 266 | - 'main', | |
| 267 | - 0, | |
| 268 | - 10, | |
| 269 | - 'dropdown-toggle' | |
| 270 | - ); | |
| 258 | + $sitemenu['user_management_title'] = array( | |
| 259 | + 'user_management_title', | |
| 260 | + 'users', | |
| 261 | + '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 262 | + 'index.php?a=75', | |
| 263 | + $_lang['user_management_title'], | |
| 264 | + '', | |
| 265 | + 'edit_user', | |
| 266 | + 'main', | |
| 267 | + 0, | |
| 268 | + 10, | |
| 269 | + 'dropdown-toggle' | |
| 270 | + ); | |
| 271 | 271 | } | 
| 272 | 272 | |
| 273 | 273 |  if($modx->hasPermission('edit_web_user')) {
 | 
| 274 | - $sitemenu['web_user_management_title'] = array( | |
| 275 | - 'web_user_management_title', | |
| 276 | - 'users', | |
| 277 | - '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 278 | - 'index.php?a=99', | |
| 279 | - $_lang['web_user_management_title'], | |
| 280 | - '', | |
| 281 | - 'edit_web_user', | |
| 282 | - 'main', | |
| 283 | - 0, | |
| 284 | - 20, | |
| 285 | - 'dropdown-toggle' | |
| 286 | - ); | |
| 274 | + $sitemenu['web_user_management_title'] = array( | |
| 275 | + 'web_user_management_title', | |
| 276 | + 'users', | |
| 277 | + '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', | |
| 278 | + 'index.php?a=99', | |
| 279 | + $_lang['web_user_management_title'], | |
| 280 | + '', | |
| 281 | + 'edit_web_user', | |
| 282 | + 'main', | |
| 283 | + 0, | |
| 284 | + 20, | |
| 285 | + 'dropdown-toggle' | |
| 286 | + ); | |
| 287 | 287 | } | 
| 288 | 288 | |
| 289 | 289 |  if($modx->hasPermission('edit_role')) {
 | 
| 290 | - $sitemenu['role_management_title'] = array( | |
| 291 | - 'role_management_title', | |
| 292 | - 'users', | |
| 293 | - '<i class="fa fa-legal"></i>' . $_lang['role_management_title'], | |
| 294 | - 'index.php?a=86', | |
| 295 | - $_lang['role_management_title'], | |
| 296 | - '', | |
| 297 | - 'new_role,edit_role,delete_role', | |
| 298 | - 'main', | |
| 299 | - 0, | |
| 300 | - 30, | |
| 301 | - '' | |
| 302 | - ); | |
| 290 | + $sitemenu['role_management_title'] = array( | |
| 291 | + 'role_management_title', | |
| 292 | + 'users', | |
| 293 | + '<i class="fa fa-legal"></i>' . $_lang['role_management_title'], | |
| 294 | + 'index.php?a=86', | |
| 295 | + $_lang['role_management_title'], | |
| 296 | + '', | |
| 297 | + 'new_role,edit_role,delete_role', | |
| 298 | + 'main', | |
| 299 | + 0, | |
| 300 | + 30, | |
| 301 | + '' | |
| 302 | + ); | |
| 303 | 303 | } | 
| 304 | 304 | |
| 305 | 305 |  if($modx->hasPermission('access_permissions')) {
 | 
| 306 | - $sitemenu['manager_permissions'] = array( | |
| 307 | - 'manager_permissions', | |
| 308 | - 'users', | |
| 309 | - '<i class="fa fa-male"></i>' . $_lang['manager_permissions'], | |
| 310 | - 'index.php?a=40', | |
| 311 | - $_lang['manager_permissions'], | |
| 312 | - '', | |
| 313 | - 'access_permissions', | |
| 314 | - 'main', | |
| 315 | - 0, | |
| 316 | - 40, | |
| 317 | - '' | |
| 318 | - ); | |
| 306 | + $sitemenu['manager_permissions'] = array( | |
| 307 | + 'manager_permissions', | |
| 308 | + 'users', | |
| 309 | + '<i class="fa fa-male"></i>' . $_lang['manager_permissions'], | |
| 310 | + 'index.php?a=40', | |
| 311 | + $_lang['manager_permissions'], | |
| 312 | + '', | |
| 313 | + 'access_permissions', | |
| 314 | + 'main', | |
| 315 | + 0, | |
| 316 | + 40, | |
| 317 | + '' | |
| 318 | + ); | |
| 319 | 319 | } | 
| 320 | 320 | |
| 321 | 321 |  if($modx->hasPermission('web_access_permissions')) {
 | 
| 322 | - $sitemenu['web_permissions'] = array( | |
| 323 | - 'web_permissions', | |
| 324 | - 'users', | |
| 325 | - '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'], | |
| 326 | - 'index.php?a=91', | |
| 327 | - $_lang['web_permissions'], | |
| 328 | - '', | |
| 329 | - 'web_access_permissions', | |
| 330 | - 'main', | |
| 331 | - 0, | |
| 332 | - 50, | |
| 333 | - '' | |
| 334 | - ); | |
| 322 | + $sitemenu['web_permissions'] = array( | |
| 323 | + 'web_permissions', | |
| 324 | + 'users', | |
| 325 | + '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'], | |
| 326 | + 'index.php?a=91', | |
| 327 | + $_lang['web_permissions'], | |
| 328 | + '', | |
| 329 | + 'web_access_permissions', | |
| 330 | + 'main', | |
| 331 | + 0, | |
| 332 | + 50, | |
| 333 | + '' | |
| 334 | + ); | |
| 335 | 335 | } | 
| 336 | 336 | |
| 337 | 337 | // Tools Menu | 
| @@ -361,104 +361,104 @@ discard block | ||
| 361 | 361 | ); | 
| 362 | 362 | |
| 363 | 363 | $sitemenu['search'] = array( | 
| 364 | - 'search', | |
| 365 | - 'tools', | |
| 366 | - '<i class="fa fa-search"></i>' . $_lang['search'], | |
| 367 | - 'index.php?a=71', | |
| 368 | - $_lang['search'], | |
| 369 | - '', | |
| 370 | - '', | |
| 371 | - 'main', | |
| 372 | - 1, | |
| 373 | - 9, | |
| 374 | - '' | |
| 364 | + 'search', | |
| 365 | + 'tools', | |
| 366 | + '<i class="fa fa-search"></i>' . $_lang['search'], | |
| 367 | + 'index.php?a=71', | |
| 368 | + $_lang['search'], | |
| 369 | + '', | |
| 370 | + '', | |
| 371 | + 'main', | |
| 372 | + 1, | |
| 373 | + 9, | |
| 374 | + '' | |
| 375 | 375 | ); | 
| 376 | 376 | |
| 377 | 377 |  if($modx->hasPermission('bk_manager')) {
 | 
| 378 | - $sitemenu['bk_manager'] = array( | |
| 379 | - 'bk_manager', | |
| 380 | - 'tools', | |
| 381 | - '<i class="fa fa-database"></i>' . $_lang['bk_manager'], | |
| 382 | - 'index.php?a=93', | |
| 383 | - $_lang['bk_manager'], | |
| 384 | - '', | |
| 385 | - 'bk_manager', | |
| 386 | - 'main', | |
| 387 | - 0, | |
| 388 | - 10, | |
| 389 | - '' | |
| 390 | - ); | |
| 378 | + $sitemenu['bk_manager'] = array( | |
| 379 | + 'bk_manager', | |
| 380 | + 'tools', | |
| 381 | + '<i class="fa fa-database"></i>' . $_lang['bk_manager'], | |
| 382 | + 'index.php?a=93', | |
| 383 | + $_lang['bk_manager'], | |
| 384 | + '', | |
| 385 | + 'bk_manager', | |
| 386 | + 'main', | |
| 387 | + 0, | |
| 388 | + 10, | |
| 389 | + '' | |
| 390 | + ); | |
| 391 | 391 | } | 
| 392 | 392 | |
| 393 | 393 |  if($modx->hasPermission('remove_locks')) {
 | 
| 394 | - $sitemenu['remove_locks'] = array( | |
| 395 | - 'remove_locks', | |
| 396 | - 'tools', | |
| 397 | - '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'], | |
| 398 | - 'javascript:modx.removeLocks();', | |
| 399 | - $_lang['remove_locks'], | |
| 400 | - '', | |
| 401 | - 'remove_locks', | |
| 402 | - '', | |
| 403 | - 0, | |
| 404 | - 20, | |
| 405 | - '' | |
| 406 | - ); | |
| 394 | + $sitemenu['remove_locks'] = array( | |
| 395 | + 'remove_locks', | |
| 396 | + 'tools', | |
| 397 | + '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'], | |
| 398 | + 'javascript:modx.removeLocks();', | |
| 399 | + $_lang['remove_locks'], | |
| 400 | + '', | |
| 401 | + 'remove_locks', | |
| 402 | + '', | |
| 403 | + 0, | |
| 404 | + 20, | |
| 405 | + '' | |
| 406 | + ); | |
| 407 | 407 | } | 
| 408 | 408 | |
| 409 | 409 |  if($modx->hasPermission('import_static')) {
 | 
| 410 | - $sitemenu['import_site'] = array( | |
| 411 | - 'import_site', | |
| 412 | - 'tools', | |
| 413 | - '<i class="fa fa-upload"></i>' . $_lang['import_site'], | |
| 414 | - 'index.php?a=95', | |
| 415 | - $_lang['import_site'], | |
| 416 | - '', | |
| 417 | - 'import_static', | |
| 418 | - 'main', | |
| 419 | - 0, | |
| 420 | - 30, | |
| 421 | - '' | |
| 422 | - ); | |
| 410 | + $sitemenu['import_site'] = array( | |
| 411 | + 'import_site', | |
| 412 | + 'tools', | |
| 413 | + '<i class="fa fa-upload"></i>' . $_lang['import_site'], | |
| 414 | + 'index.php?a=95', | |
| 415 | + $_lang['import_site'], | |
| 416 | + '', | |
| 417 | + 'import_static', | |
| 418 | + 'main', | |
| 419 | + 0, | |
| 420 | + 30, | |
| 421 | + '' | |
| 422 | + ); | |
| 423 | 423 | } | 
| 424 | 424 | |
| 425 | 425 |  if($modx->hasPermission('export_static')) {
 | 
| 426 | - $sitemenu['export_site'] = array( | |
| 427 | - 'export_site', | |
| 428 | - 'tools', | |
| 429 | - '<i class="fa fa-download"></i>' . $_lang['export_site'], | |
| 430 | - 'index.php?a=83', | |
| 431 | - $_lang['export_site'], | |
| 432 | - '', | |
| 433 | - 'export_static', | |
| 434 | - 'main', | |
| 435 | - 1, | |
| 436 | - 40, | |
| 437 | - '' | |
| 438 | - ); | |
| 426 | + $sitemenu['export_site'] = array( | |
| 427 | + 'export_site', | |
| 428 | + 'tools', | |
| 429 | + '<i class="fa fa-download"></i>' . $_lang['export_site'], | |
| 430 | + 'index.php?a=83', | |
| 431 | + $_lang['export_site'], | |
| 432 | + '', | |
| 433 | + 'export_static', | |
| 434 | + 'main', | |
| 435 | + 1, | |
| 436 | + 40, | |
| 437 | + '' | |
| 438 | + ); | |
| 439 | 439 | } | 
| 440 | 440 | |
| 441 | 441 |  $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
 | 
| 442 | 442 |  if(is_array($menu)) {
 | 
| 443 | - $newmenu = array(); | |
| 444 | -	foreach($menu as $item){
 | |
| 445 | -		if(is_array(unserialize($item))){
 | |
| 446 | - $newmenu = array_merge($newmenu, unserialize($item)); | |
| 447 | - } | |
| 448 | - } | |
| 449 | - if(count($newmenu)> 0) $sitemenu = $newmenu; | |
| 443 | + $newmenu = array(); | |
| 444 | +    foreach($menu as $item){
 | |
| 445 | +        if(is_array(unserialize($item))){
 | |
| 446 | + $newmenu = array_merge($newmenu, unserialize($item)); | |
| 447 | + } | |
| 448 | + } | |
| 449 | + if(count($newmenu)> 0) $sitemenu = $newmenu; | |
| 450 | 450 | } | 
| 451 | 451 | |
| 452 | 452 |  if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
 | 
| 453 | - include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php'); | |
| 453 | + include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php'); | |
| 454 | 454 |  } else {
 | 
| 455 | - include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php'); | |
| 455 | + include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php'); | |
| 456 | 456 | } | 
| 457 | 457 | $menu = new EVOmenu(); | 
| 458 | 458 | $menu->Build($sitemenu, array( | 
| 459 | - 'outerClass' => 'nav', | |
| 460 | - 'innerClass' => 'dropdown-menu', | |
| 461 | - 'parentClass' => 'dropdown', | |
| 459 | + 'outerClass' => 'nav', | |
| 460 | + 'innerClass' => 'dropdown-menu', | |
| 461 | + 'parentClass' => 'dropdown', | |
| 462 | 462 | 'parentLinkClass' => 'dropdown-toggle', | 
| 463 | 463 | 'parentLinkAttr' => '', | 
| 464 | 464 | 'parentLinkIn' => '' |