evolution-cms /
evolution
@@ -1,13 +1,13 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
| 3 | - die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
|
|
| 3 | + die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
|
|
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes |
| 7 | 7 | |
| 8 | 8 | if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
|
| 9 | - // seems to be a new install - send the user to the configuration page |
|
| 10 | - exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
|
|
| 9 | + // seems to be a new install - send the user to the configuration page |
|
| 10 | + exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
|
|
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | // set placeholders |
@@ -17,93 +17,93 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | // setup message info |
| 19 | 19 | if($modx->hasPermission('messages')) {
|
| 20 | - include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php'); |
|
| 21 | - $_SESSION['nrtotalmessages'] = $nrtotalmessages; |
|
| 22 | - $_SESSION['nrnewmessages'] = $nrnewmessages; |
|
| 23 | - |
|
| 24 | - $msg = array(); |
|
| 25 | - $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
|
|
| 26 | - $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : ''; |
|
| 27 | - $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold"> <a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
|
|
| 28 | - $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0'; |
|
| 29 | - $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages); |
|
| 30 | - $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
|
|
| 31 | - $ph['MessageInfo'] = implode("\n", $msg);
|
|
| 20 | + include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php'); |
|
| 21 | + $_SESSION['nrtotalmessages'] = $nrtotalmessages; |
|
| 22 | + $_SESSION['nrnewmessages'] = $nrnewmessages; |
|
| 23 | + |
|
| 24 | + $msg = array(); |
|
| 25 | + $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
|
|
| 26 | + $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : ''; |
|
| 27 | + $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold"> <a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
|
|
| 28 | + $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0'; |
|
| 29 | + $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages); |
|
| 30 | + $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
|
|
| 31 | + $ph['MessageInfo'] = implode("\n", $msg);
|
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | $iconTpl = $modx->getChunk('manager#welcome/WrapIcon');
|
| 35 | 35 | // setup icons |
| 36 | 36 | if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
|
| 37 | - $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]'; |
|
| 38 | - $ph['SecurityIcon'] = sprintf($iconTpl,$icon, 75); |
|
| 37 | + $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]'; |
|
| 38 | + $ph['SecurityIcon'] = sprintf($iconTpl,$icon, 75); |
|
| 39 | 39 | } |
| 40 | 40 | if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
|
| 41 | - $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]'; |
|
| 42 | - $ph['WebUserIcon'] = sprintf($iconTpl,$icon, 99); |
|
| 41 | + $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]'; |
|
| 42 | + $ph['WebUserIcon'] = sprintf($iconTpl,$icon, 99); |
|
| 43 | 43 | } |
| 44 | 44 | if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
|
| 45 | - $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]'; |
|
| 46 | - $ph['ModulesIcon'] = sprintf($iconTpl,$icon, 106); |
|
| 45 | + $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]'; |
|
| 46 | + $ph['ModulesIcon'] = sprintf($iconTpl,$icon, 106); |
|
| 47 | 47 | } |
| 48 | 48 | 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')) {
|
| 49 | - $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]'; |
|
| 50 | - $ph['ResourcesIcon'] = sprintf($iconTpl,$icon, 76); |
|
| 49 | + $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]'; |
|
| 50 | + $ph['ResourcesIcon'] = sprintf($iconTpl,$icon, 76); |
|
| 51 | 51 | } |
| 52 | 52 | if($modx->hasPermission('bk_manager')) {
|
| 53 | - $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]'; |
|
| 54 | - $ph['BackupIcon'] = sprintf($iconTpl,$icon, 93); |
|
| 53 | + $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]'; |
|
| 54 | + $ph['BackupIcon'] = sprintf($iconTpl,$icon, 93); |
|
| 55 | 55 | } |
| 56 | 56 | if($modx->hasPermission('help')) {
|
| 57 | - $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]'; |
|
| 58 | - $ph['HelpIcon'] = sprintf($iconTpl,$icon, 9); |
|
| 57 | + $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]'; |
|
| 58 | + $ph['HelpIcon'] = sprintf($iconTpl,$icon, 9); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | if($modx->hasPermission('new_document')) {
|
| 62 | - $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]'; |
|
| 63 | - $ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4); |
|
| 64 | - $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]'; |
|
| 65 | - $ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72); |
|
| 62 | + $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]'; |
|
| 63 | + $ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4); |
|
| 64 | + $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]'; |
|
| 65 | + $ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72); |
|
| 66 | 66 | } |
| 67 | 67 | if($modx->hasPermission('assets_images')) {
|
| 68 | - $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]'; |
|
| 69 | - $ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72); |
|
| 68 | + $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]'; |
|
| 69 | + $ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72); |
|
| 70 | 70 | } |
| 71 | 71 | if($modx->hasPermission('assets_files')) {
|
| 72 | - $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]'; |
|
| 73 | - $ph['FilesIcon'] = sprintf($iconTpl,$icon, 72); |
|
| 72 | + $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]'; |
|
| 73 | + $ph['FilesIcon'] = sprintf($iconTpl,$icon, 72); |
|
| 74 | 74 | } |
| 75 | 75 | if($modx->hasPermission('change_password')) {
|
| 76 | - $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]'; |
|
| 77 | - $ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28); |
|
| 76 | + $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]'; |
|
| 77 | + $ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28); |
|
| 78 | 78 | } |
| 79 | 79 | $icon = '<i class="[&icons_logout_large&]"></i>[%logout%]'; |
| 80 | 80 | $ph['LogoutIcon'] = sprintf($iconTpl,$icon, 8); |
| 81 | 81 | |
| 82 | 82 | // do some config checks |
| 83 | 83 | if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
|
| 84 | - include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php'); |
|
| 85 | - if($config_check_results != $_lang['configcheck_ok']) {
|
|
| 86 | - $ph['config_check_results'] = $config_check_results; |
|
| 87 | - $ph['config_display'] = 'block'; |
|
| 88 | - } else {
|
|
| 89 | - $ph['config_display'] = 'none'; |
|
| 90 | - } |
|
| 84 | + include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php'); |
|
| 85 | + if($config_check_results != $_lang['configcheck_ok']) {
|
|
| 86 | + $ph['config_check_results'] = $config_check_results; |
|
| 87 | + $ph['config_display'] = 'block'; |
|
| 88 | + } else {
|
|
| 89 | + $ph['config_display'] = 'none'; |
|
| 90 | + } |
|
| 91 | 91 | } else {
|
| 92 | - $ph['config_display'] = 'none'; |
|
| 92 | + $ph['config_display'] = 'none'; |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | // Check logout-reminder |
| 96 | 96 | if(isset($_SESSION['show_logout_reminder'])) {
|
| 97 | - switch($_SESSION['show_logout_reminder']['type']) {
|
|
| 98 | - case 'logout_reminder': |
|
| 99 | - $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly'); |
|
| 100 | - $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
|
|
| 101 | - break; |
|
| 102 | - } |
|
| 103 | - $ph['show_logout_reminder'] = 'block'; |
|
| 104 | - unset($_SESSION['show_logout_reminder']); |
|
| 97 | + switch($_SESSION['show_logout_reminder']['type']) {
|
|
| 98 | + case 'logout_reminder': |
|
| 99 | + $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly'); |
|
| 100 | + $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
|
|
| 101 | + break; |
|
| 102 | + } |
|
| 103 | + $ph['show_logout_reminder'] = 'block'; |
|
| 104 | + unset($_SESSION['show_logout_reminder']); |
|
| 105 | 105 | } else {
|
| 106 | - $ph['show_logout_reminder'] = 'none'; |
|
| 106 | + $ph['show_logout_reminder'] = 'none'; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | // Check multiple sessions |
@@ -151,11 +151,11 @@ discard block |
||
| 151 | 151 | $nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>'; |
| 152 | 152 | |
| 153 | 153 | $ph['UserInfo'] = $modx->parseText($tpl, array( |
| 154 | - 'username' => $modx->getLoginUserName(), |
|
| 155 | - 'role' => $_SESSION['mgrPermissions']['name'], |
|
| 156 | - 'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time), |
|
| 157 | - 'logincount' => $_SESSION['mgrLogincount'] + 1, |
|
| 158 | - 'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages) |
|
| 154 | + 'username' => $modx->getLoginUserName(), |
|
| 155 | + 'role' => $_SESSION['mgrPermissions']['name'], |
|
| 156 | + 'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time), |
|
| 157 | + 'logincount' => $_SESSION['mgrLogincount'] + 1, |
|
| 158 | + 'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages) |
|
| 159 | 159 | )); |
| 160 | 160 | |
| 161 | 161 | $from = array(); |
@@ -164,13 +164,13 @@ discard block |
||
| 164 | 164 | $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
|
| 165 | 165 | |
| 166 | 166 | if($modx->db->getRecordCount($rs) < 1) {
|
| 167 | - $html = '<p>[%no_active_users_found%]</p>'; |
|
| 167 | + $html = '<p>[%no_active_users_found%]</p>'; |
|
| 168 | 168 | } else {
|
| 169 | - include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php'); |
|
| 170 | - $now = $_SERVER['REQUEST_TIME'] + $server_offset_time; |
|
| 171 | - $ph['now'] = strftime('%H:%M:%S', $now);
|
|
| 172 | - $timetocheck = ($now - (60 * 20)); //+$server_offset_time; |
|
| 173 | - $html = ' |
|
| 169 | + include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php'); |
|
| 170 | + $now = $_SERVER['REQUEST_TIME'] + $server_offset_time; |
|
| 171 | + $ph['now'] = strftime('%H:%M:%S', $now);
|
|
| 172 | + $timetocheck = ($now - (60 * 20)); //+$server_offset_time; |
|
| 173 | + $html = ' |
|
| 174 | 174 | <div class="card-body"> |
| 175 | 175 | [%onlineusers_message%] |
| 176 | 176 | <b>[+now+]</b>): |
@@ -188,33 +188,33 @@ discard block |
||
| 188 | 188 | </thead> |
| 189 | 189 | <tbody>'; |
| 190 | 190 | |
| 191 | - $userList = array(); |
|
| 192 | - $userCount = array(); |
|
| 193 | - // Create userlist with session-count first before output |
|
| 194 | - while($activeusers = $modx->db->getRow($rs)) {
|
|
| 195 | - $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1; |
|
| 196 | - |
|
| 197 | - $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : ''; |
|
| 198 | - $webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" /> ' : ''; |
|
| 199 | - $ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip']; |
|
| 200 | - $currentaction = getAction($activeusers['action'], $activeusers['id']); |
|
| 201 | - $userList[] = array( |
|
| 202 | - $idle, |
|
| 203 | - '', |
|
| 204 | - $activeusers['username'], |
|
| 205 | - $webicon, |
|
| 206 | - abs($activeusers['internalKey']), |
|
| 207 | - $ip, |
|
| 208 | - strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),
|
|
| 209 | - $currentaction |
|
| 210 | - ); |
|
| 211 | - } |
|
| 212 | - foreach($userList as $params) {
|
|
| 213 | - $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : ''; |
|
| 214 | - $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);
|
|
| 215 | - } |
|
| 216 | - |
|
| 217 | - $html .= ' |
|
| 191 | + $userList = array(); |
|
| 192 | + $userCount = array(); |
|
| 193 | + // Create userlist with session-count first before output |
|
| 194 | + while($activeusers = $modx->db->getRow($rs)) {
|
|
| 195 | + $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1; |
|
| 196 | + |
|
| 197 | + $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : ''; |
|
| 198 | + $webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" /> ' : ''; |
|
| 199 | + $ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip']; |
|
| 200 | + $currentaction = getAction($activeusers['action'], $activeusers['id']); |
|
| 201 | + $userList[] = array( |
|
| 202 | + $idle, |
|
| 203 | + '', |
|
| 204 | + $activeusers['username'], |
|
| 205 | + $webicon, |
|
| 206 | + abs($activeusers['internalKey']), |
|
| 207 | + $ip, |
|
| 208 | + strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),
|
|
| 209 | + $currentaction |
|
| 210 | + ); |
|
| 211 | + } |
|
| 212 | + foreach($userList as $params) {
|
|
| 213 | + $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : ''; |
|
| 214 | + $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);
|
|
| 215 | + } |
|
| 216 | + |
|
| 217 | + $html .= ' |
|
| 218 | 218 | </tbody> |
| 219 | 219 | </table> |
| 220 | 220 | </div> |
@@ -255,17 +255,17 @@ discard block |
||
| 255 | 255 | // invoke event OnManagerWelcomePrerender |
| 256 | 256 | $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
|
| 257 | 257 | if(is_array($evtOut)) {
|
| 258 | - $output = implode('', $evtOut);
|
|
| 259 | - $ph['OnManagerWelcomePrerender'] = $output; |
|
| 258 | + $output = implode('', $evtOut);
|
|
| 259 | + $ph['OnManagerWelcomePrerender'] = $output; |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | $widgets['welcome'] = array( |
| 263 | - 'menuindex' => '10', |
|
| 264 | - 'id' => 'welcome', |
|
| 265 | - 'cols' => 'col-lg-6', |
|
| 266 | - 'icon' => 'fa-home', |
|
| 267 | - 'title' => '[%welcome_title%]', |
|
| 268 | - 'body' => ' |
|
| 263 | + 'menuindex' => '10', |
|
| 264 | + 'id' => 'welcome', |
|
| 265 | + 'cols' => 'col-lg-6', |
|
| 266 | + 'icon' => 'fa-home', |
|
| 267 | + 'title' => '[%welcome_title%]', |
|
| 268 | + 'body' => ' |
|
| 269 | 269 | <div class="wm_buttons card-body"> |
| 270 | 270 | <!--@IF:[[#hasPermission?key=new_document]]--> |
| 271 | 271 | <span class="wm_button"> |
@@ -339,25 +339,25 @@ discard block |
||
| 339 | 339 | </table> |
| 340 | 340 | </div> |
| 341 | 341 | ', |
| 342 | - 'hide'=>'0' |
|
| 342 | + 'hide'=>'0' |
|
| 343 | 343 | ); |
| 344 | 344 | $widgets['onlineinfo'] = array( |
| 345 | - 'menuindex' => '20', |
|
| 346 | - 'id' => 'onlineinfo', |
|
| 347 | - 'cols' => 'col-lg-6', |
|
| 348 | - 'icon' => 'fa-user', |
|
| 349 | - 'title' => '[%onlineusers_title%]', |
|
| 350 | - 'body' => '<div class="userstable">[+OnlineInfo+]</div>', |
|
| 351 | - 'hide'=>'0' |
|
| 345 | + 'menuindex' => '20', |
|
| 346 | + 'id' => 'onlineinfo', |
|
| 347 | + 'cols' => 'col-lg-6', |
|
| 348 | + 'icon' => 'fa-user', |
|
| 349 | + 'title' => '[%onlineusers_title%]', |
|
| 350 | + 'body' => '<div class="userstable">[+OnlineInfo+]</div>', |
|
| 351 | + 'hide'=>'0' |
|
| 352 | 352 | ); |
| 353 | 353 | $widgets['recentinfo'] = array( |
| 354 | - 'menuindex' => '30', |
|
| 355 | - 'id' => 'modxrecent_widget', |
|
| 356 | - 'cols' => 'col-sm-12', |
|
| 357 | - 'icon' => 'fa-pencil-square-o', |
|
| 358 | - 'title' => '[%activity_title%]', |
|
| 359 | - 'body' => '<div class="widget-stage">[+RecentInfo+]</div>', |
|
| 360 | - 'hide'=>'0' |
|
| 354 | + 'menuindex' => '30', |
|
| 355 | + 'id' => 'modxrecent_widget', |
|
| 356 | + 'cols' => 'col-sm-12', |
|
| 357 | + 'icon' => 'fa-pencil-square-o', |
|
| 358 | + 'title' => '[%activity_title%]', |
|
| 359 | + 'body' => '<div class="widget-stage">[+RecentInfo+]</div>', |
|
| 360 | + 'hide'=>'0' |
|
| 361 | 361 | ); |
| 362 | 362 | if ($modx->config['rss_url_news']) {
|
| 363 | 363 | $widgets['news'] = array( |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | // invoke OnManagerWelcomeHome event |
| 386 | 386 | $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
|
| 387 | 387 | if(is_array($sitewidgets)) {
|
| 388 | - $newwidgets = array(); |
|
| 388 | + $newwidgets = array(); |
|
| 389 | 389 | foreach($sitewidgets as $widget){
|
| 390 | 390 | $newwidgets = array_merge($newwidgets, unserialize($widget)); |
| 391 | 391 | } |
@@ -393,21 +393,21 @@ discard block |
||
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | usort($widgets, function ($a, $b) {
|
| 396 | - return $a['menuindex'] - $b['menuindex']; |
|
| 396 | + return $a['menuindex'] - $b['menuindex']; |
|
| 397 | 397 | }); |
| 398 | 398 | |
| 399 | 399 | $tpl = $modx->getChunk('manager#welcome/Widget');
|
| 400 | 400 | $output = ''; |
| 401 | 401 | foreach($widgets as $widget) {
|
| 402 | - if ($widget['hide'] != '1'){
|
|
| 403 | - $output .= $modx->parseText($tpl, $widget); |
|
| 404 | - } |
|
| 402 | + if ($widget['hide'] != '1'){
|
|
| 403 | + $output .= $modx->parseText($tpl, $widget); |
|
| 404 | + } |
|
| 405 | 405 | } |
| 406 | 406 | $ph['widgets'] = $output; |
| 407 | 407 | |
| 408 | 408 | // load template |
| 409 | 409 | if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
|
| 410 | - $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'; |
|
| 410 | + $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'; |
|
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | $target = $modx->config['manager_welcome_tpl']; |
@@ -415,27 +415,27 @@ discard block |
||
| 415 | 415 | $target = $modx->mergeSettingsContent($target); |
| 416 | 416 | |
| 417 | 417 | if(substr($target, 0, 1) === '@') {
|
| 418 | - if(substr($target, 0, 6) === '@CHUNK') {
|
|
| 419 | - $content = $modx->getChunk(trim(substr($target, 7))); |
|
| 420 | - } elseif(substr($target, 0, 5) === '@FILE') {
|
|
| 421 | - $content = file_get_contents(trim(substr($target, 6))); |
|
| 422 | - } else {
|
|
| 423 | - $content = ''; |
|
| 424 | - } |
|
| 418 | + if(substr($target, 0, 6) === '@CHUNK') {
|
|
| 419 | + $content = $modx->getChunk(trim(substr($target, 7))); |
|
| 420 | + } elseif(substr($target, 0, 5) === '@FILE') {
|
|
| 421 | + $content = file_get_contents(trim(substr($target, 6))); |
|
| 422 | + } else {
|
|
| 423 | + $content = ''; |
|
| 424 | + } |
|
| 425 | 425 | } else {
|
| 426 | - $chunk = $modx->getChunk($target); |
|
| 427 | - if($chunk !== false && !empty($chunk)) {
|
|
| 428 | - $content = $chunk; |
|
| 429 | - } elseif(is_file(MODX_BASE_PATH . $target)) {
|
|
| 430 | - $content = file_get_contents(MODX_BASE_PATH . $target); |
|
| 431 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
|
|
| 432 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl'); |
|
| 433 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible |
|
| 434 | - {
|
|
| 435 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html'); |
|
| 436 | - } else {
|
|
| 437 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'); |
|
| 438 | - } |
|
| 426 | + $chunk = $modx->getChunk($target); |
|
| 427 | + if($chunk !== false && !empty($chunk)) {
|
|
| 428 | + $content = $chunk; |
|
| 429 | + } elseif(is_file(MODX_BASE_PATH . $target)) {
|
|
| 430 | + $content = file_get_contents(MODX_BASE_PATH . $target); |
|
| 431 | + } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
|
|
| 432 | + $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl'); |
|
| 433 | + } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible |
|
| 434 | + {
|
|
| 435 | + $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html'); |
|
| 436 | + } else {
|
|
| 437 | + $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'); |
|
| 438 | + } |
|
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | // merge placeholders |
@@ -443,8 +443,8 @@ discard block |
||
| 443 | 443 | $content = $modx->mergeSettingsContent($content); |
| 444 | 444 | $content = $modx->parseText($content, $ph); |
| 445 | 445 | if(strpos($content, '[+') !== false) {
|
| 446 | - $modx->toPlaceholders($ph); |
|
| 447 | - $content = $modx->mergePlaceholderContent($content); |
|
| 446 | + $modx->toPlaceholders($ph); |
|
| 447 | + $content = $modx->mergePlaceholderContent($content); |
|
| 448 | 448 | } |
| 449 | 449 | $content = $modx->parseDocumentSource($content); |
| 450 | 450 | $content = $modx->parseText($content, $_lang, '[%', '%]'); |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | $content = $modx->cleanUpMODXTags($content); //cleanup |
| 453 | 453 | |
| 454 | 454 | if($js = $modx->getRegisteredClientScripts()) {
|
| 455 | - $content .= $js; |
|
| 455 | + $content .= $js; |
|
| 456 | 456 | } |
| 457 | 457 | |
| 458 | 458 | echo $content; |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 3 | 3 | die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
|
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes |
| 7 | 7 | |
| 8 | -if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
|
|
| 8 | +if ($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
|
|
| 9 | 9 | // seems to be a new install - send the user to the configuration page |
| 10 | 10 | exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
|
| 11 | 11 | } |
@@ -16,16 +16,16 @@ discard block |
||
| 16 | 16 | $_SESSION['nrnewmessages'] = 0; |
| 17 | 17 | |
| 18 | 18 | // setup message info |
| 19 | -if($modx->hasPermission('messages')) {
|
|
| 20 | - include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php'); |
|
| 19 | +if ($modx->hasPermission('messages')) {
|
|
| 20 | + include_once(MODX_MANAGER_PATH.'includes/messageCount.inc.php'); |
|
| 21 | 21 | $_SESSION['nrtotalmessages'] = $nrtotalmessages; |
| 22 | 22 | $_SESSION['nrnewmessages'] = $nrnewmessages; |
| 23 | 23 | |
| 24 | 24 | $msg = array(); |
| 25 | 25 | $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
|
| 26 | - $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : ''; |
|
| 26 | + $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">'.$_SESSION['nrnewmessages'].'</span>)' : ''; |
|
| 27 | 27 | $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold"> <a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
|
| 28 | - $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0'; |
|
| 28 | + $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">'.$_SESSION['nrnewmessages'].'</span>' : '0'; |
|
| 29 | 29 | $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages); |
| 30 | 30 | $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
|
| 31 | 31 | $ph['MessageInfo'] = implode("\n", $msg);
|
@@ -33,56 +33,56 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | $iconTpl = $modx->getChunk('manager#welcome/WrapIcon');
|
| 35 | 35 | // setup icons |
| 36 | -if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
|
|
| 36 | +if ($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
|
|
| 37 | 37 | $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]'; |
| 38 | - $ph['SecurityIcon'] = sprintf($iconTpl,$icon, 75); |
|
| 38 | + $ph['SecurityIcon'] = sprintf($iconTpl, $icon, 75); |
|
| 39 | 39 | } |
| 40 | -if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
|
|
| 40 | +if ($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
|
|
| 41 | 41 | $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]'; |
| 42 | - $ph['WebUserIcon'] = sprintf($iconTpl,$icon, 99); |
|
| 42 | + $ph['WebUserIcon'] = sprintf($iconTpl, $icon, 99); |
|
| 43 | 43 | } |
| 44 | -if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
|
|
| 44 | +if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
|
|
| 45 | 45 | $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]'; |
| 46 | - $ph['ModulesIcon'] = sprintf($iconTpl,$icon, 106); |
|
| 46 | + $ph['ModulesIcon'] = sprintf($iconTpl, $icon, 106); |
|
| 47 | 47 | } |
| 48 | -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')) {
|
|
| 48 | +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')) {
|
|
| 49 | 49 | $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]'; |
| 50 | - $ph['ResourcesIcon'] = sprintf($iconTpl,$icon, 76); |
|
| 50 | + $ph['ResourcesIcon'] = sprintf($iconTpl, $icon, 76); |
|
| 51 | 51 | } |
| 52 | -if($modx->hasPermission('bk_manager')) {
|
|
| 52 | +if ($modx->hasPermission('bk_manager')) {
|
|
| 53 | 53 | $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]'; |
| 54 | - $ph['BackupIcon'] = sprintf($iconTpl,$icon, 93); |
|
| 54 | + $ph['BackupIcon'] = sprintf($iconTpl, $icon, 93); |
|
| 55 | 55 | } |
| 56 | -if($modx->hasPermission('help')) {
|
|
| 56 | +if ($modx->hasPermission('help')) {
|
|
| 57 | 57 | $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]'; |
| 58 | - $ph['HelpIcon'] = sprintf($iconTpl,$icon, 9); |
|
| 58 | + $ph['HelpIcon'] = sprintf($iconTpl, $icon, 9); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | -if($modx->hasPermission('new_document')) {
|
|
| 61 | +if ($modx->hasPermission('new_document')) {
|
|
| 62 | 62 | $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]'; |
| 63 | - $ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4); |
|
| 63 | + $ph['ResourceIcon'] = sprintf($iconTpl, $icon, 4); |
|
| 64 | 64 | $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]'; |
| 65 | - $ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72); |
|
| 65 | + $ph['WeblinkIcon'] = sprintf($iconTpl, $icon, 72); |
|
| 66 | 66 | } |
| 67 | -if($modx->hasPermission('assets_images')) {
|
|
| 67 | +if ($modx->hasPermission('assets_images')) {
|
|
| 68 | 68 | $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]'; |
| 69 | - $ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72); |
|
| 69 | + $ph['ImagesIcon'] = sprintf($iconTpl, $icon, 72); |
|
| 70 | 70 | } |
| 71 | -if($modx->hasPermission('assets_files')) {
|
|
| 71 | +if ($modx->hasPermission('assets_files')) {
|
|
| 72 | 72 | $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]'; |
| 73 | - $ph['FilesIcon'] = sprintf($iconTpl,$icon, 72); |
|
| 73 | + $ph['FilesIcon'] = sprintf($iconTpl, $icon, 72); |
|
| 74 | 74 | } |
| 75 | -if($modx->hasPermission('change_password')) {
|
|
| 75 | +if ($modx->hasPermission('change_password')) {
|
|
| 76 | 76 | $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]'; |
| 77 | - $ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28); |
|
| 77 | + $ph['PasswordIcon'] = sprintf($iconTpl, $icon, 28); |
|
| 78 | 78 | } |
| 79 | 79 | $icon = '<i class="[&icons_logout_large&]"></i>[%logout%]'; |
| 80 | -$ph['LogoutIcon'] = sprintf($iconTpl,$icon, 8); |
|
| 80 | +$ph['LogoutIcon'] = sprintf($iconTpl, $icon, 8); |
|
| 81 | 81 | |
| 82 | 82 | // do some config checks |
| 83 | -if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
|
|
| 84 | - include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php'); |
|
| 85 | - if($config_check_results != $_lang['configcheck_ok']) {
|
|
| 83 | +if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
|
|
| 84 | + include_once(MODX_MANAGER_PATH.'includes/config_check.inc.php'); |
|
| 85 | + if ($config_check_results != $_lang['configcheck_ok']) {
|
|
| 86 | 86 | $ph['config_check_results'] = $config_check_results; |
| 87 | 87 | $ph['config_display'] = 'block'; |
| 88 | 88 | } else {
|
@@ -93,8 +93,8 @@ discard block |
||
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | // Check logout-reminder |
| 96 | -if(isset($_SESSION['show_logout_reminder'])) {
|
|
| 97 | - switch($_SESSION['show_logout_reminder']['type']) {
|
|
| 96 | +if (isset($_SESSION['show_logout_reminder'])) {
|
|
| 97 | + switch ($_SESSION['show_logout_reminder']['type']) {
|
|
| 98 | 98 | case 'logout_reminder': |
| 99 | 99 | $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly'); |
| 100 | 100 | $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
|
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | </tr> |
| 149 | 149 | </table>'; |
| 150 | 150 | |
| 151 | -$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>'; |
|
| 151 | +$nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>'; |
|
| 152 | 152 | |
| 153 | 153 | $ph['UserInfo'] = $modx->parseText($tpl, array( |
| 154 | 154 | 'username' => $modx->getLoginUserName(), |
@@ -163,10 +163,10 @@ discard block |
||
| 163 | 163 | $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'"; |
| 164 | 164 | $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
|
| 165 | 165 | |
| 166 | -if($modx->db->getRecordCount($rs) < 1) {
|
|
| 166 | +if ($modx->db->getRecordCount($rs) < 1) {
|
|
| 167 | 167 | $html = '<p>[%no_active_users_found%]</p>'; |
| 168 | 168 | } else {
|
| 169 | - include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php'); |
|
| 169 | + include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php'); |
|
| 170 | 170 | $now = $_SERVER['REQUEST_TIME'] + $server_offset_time; |
| 171 | 171 | $ph['now'] = strftime('%H:%M:%S', $now);
|
| 172 | 172 | $timetocheck = ($now - (60 * 20)); //+$server_offset_time; |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | $userList = array(); |
| 192 | 192 | $userCount = array(); |
| 193 | 193 | // Create userlist with session-count first before output |
| 194 | - while($activeusers = $modx->db->getRow($rs)) {
|
|
| 194 | + while ($activeusers = $modx->db->getRow($rs)) {
|
|
| 195 | 195 | $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1; |
| 196 | 196 | |
| 197 | 197 | $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : ''; |
@@ -209,9 +209,9 @@ discard block |
||
| 209 | 209 | $currentaction |
| 210 | 210 | ); |
| 211 | 211 | } |
| 212 | - foreach($userList as $params) {
|
|
| 212 | + foreach ($userList as $params) {
|
|
| 213 | 213 | $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : ''; |
| 214 | - $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);
|
|
| 214 | + $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);
|
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | $html .= ' |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | $ph['OnlineInfo'] = $html; |
| 224 | 224 | |
| 225 | 225 | // include rss feeds for important forum topics |
| 226 | -include_once(MODX_MANAGER_PATH . 'includes/rss.inc.php'); |
|
| 226 | +include_once(MODX_MANAGER_PATH.'includes/rss.inc.php'); |
|
| 227 | 227 | $ph['modx_security_notices_content'] = $feedData['modx_security_notices_content']; |
| 228 | 228 | $ph['modx_news_content'] = $feedData['modx_news_content']; |
| 229 | 229 | |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | // invoke event OnManagerWelcomePrerender |
| 256 | 256 | $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
|
| 257 | -if(is_array($evtOut)) {
|
|
| 257 | +if (is_array($evtOut)) {
|
|
| 258 | 258 | $output = implode('', $evtOut);
|
| 259 | 259 | $ph['OnManagerWelcomePrerender'] = $output; |
| 260 | 260 | } |
@@ -384,57 +384,57 @@ discard block |
||
| 384 | 384 | |
| 385 | 385 | // invoke OnManagerWelcomeHome event |
| 386 | 386 | $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
|
| 387 | -if(is_array($sitewidgets)) {
|
|
| 387 | +if (is_array($sitewidgets)) {
|
|
| 388 | 388 | $newwidgets = array(); |
| 389 | - foreach($sitewidgets as $widget){
|
|
| 389 | + foreach ($sitewidgets as $widget) {
|
|
| 390 | 390 | $newwidgets = array_merge($newwidgets, unserialize($widget)); |
| 391 | 391 | } |
| 392 | 392 | $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets; |
| 393 | 393 | } |
| 394 | 394 | |
| 395 | -usort($widgets, function ($a, $b) {
|
|
| 395 | +usort($widgets, function($a, $b){
|
|
| 396 | 396 | return $a['menuindex'] - $b['menuindex']; |
| 397 | 397 | }); |
| 398 | 398 | |
| 399 | 399 | $tpl = $modx->getChunk('manager#welcome/Widget');
|
| 400 | 400 | $output = ''; |
| 401 | -foreach($widgets as $widget) {
|
|
| 402 | - if ($widget['hide'] != '1'){
|
|
| 401 | +foreach ($widgets as $widget) {
|
|
| 402 | + if ($widget['hide'] != '1') {
|
|
| 403 | 403 | $output .= $modx->parseText($tpl, $widget); |
| 404 | 404 | } |
| 405 | 405 | } |
| 406 | 406 | $ph['widgets'] = $output; |
| 407 | 407 | |
| 408 | 408 | // load template |
| 409 | -if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
|
|
| 410 | - $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'; |
|
| 409 | +if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
|
|
| 410 | + $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH.'media/style/common/welcome.tpl'; |
|
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | $target = $modx->config['manager_welcome_tpl']; |
| 414 | 414 | $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
|
| 415 | 415 | $target = $modx->mergeSettingsContent($target); |
| 416 | 416 | |
| 417 | -if(substr($target, 0, 1) === '@') {
|
|
| 418 | - if(substr($target, 0, 6) === '@CHUNK') {
|
|
| 417 | +if (substr($target, 0, 1) === '@') {
|
|
| 418 | + if (substr($target, 0, 6) === '@CHUNK') {
|
|
| 419 | 419 | $content = $modx->getChunk(trim(substr($target, 7))); |
| 420 | - } elseif(substr($target, 0, 5) === '@FILE') {
|
|
| 420 | + } elseif (substr($target, 0, 5) === '@FILE') {
|
|
| 421 | 421 | $content = file_get_contents(trim(substr($target, 6))); |
| 422 | 422 | } else {
|
| 423 | 423 | $content = ''; |
| 424 | 424 | } |
| 425 | 425 | } else {
|
| 426 | 426 | $chunk = $modx->getChunk($target); |
| 427 | - if($chunk !== false && !empty($chunk)) {
|
|
| 427 | + if ($chunk !== false && !empty($chunk)) {
|
|
| 428 | 428 | $content = $chunk; |
| 429 | - } elseif(is_file(MODX_BASE_PATH . $target)) {
|
|
| 430 | - $content = file_get_contents(MODX_BASE_PATH . $target); |
|
| 431 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
|
|
| 432 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl'); |
|
| 433 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible |
|
| 429 | + } elseif (is_file(MODX_BASE_PATH.$target)) {
|
|
| 430 | + $content = file_get_contents(MODX_BASE_PATH.$target); |
|
| 431 | + } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl')) {
|
|
| 432 | + $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl'); |
|
| 433 | + } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html')) // ClipperCMS compatible |
|
| 434 | 434 | {
|
| 435 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html'); |
|
| 435 | + $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html'); |
|
| 436 | 436 | } else {
|
| 437 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'); |
|
| 437 | + $content = file_get_contents(MODX_MANAGER_PATH.'media/style/common/welcome.tpl'); |
|
| 438 | 438 | } |
| 439 | 439 | } |
| 440 | 440 | |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | $content = $modx->mergeConditionalTagsContent($content); |
| 443 | 443 | $content = $modx->mergeSettingsContent($content); |
| 444 | 444 | $content = $modx->parseText($content, $ph); |
| 445 | -if(strpos($content, '[+') !== false) {
|
|
| 445 | +if (strpos($content, '[+') !== false) {
|
|
| 446 | 446 | $modx->toPlaceholders($ph); |
| 447 | 447 | $content = $modx->mergePlaceholderContent($content); |
| 448 | 448 | } |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | $content = $modx->parseText($content, $_style, '[&', '&]'); |
| 452 | 452 | $content = $modx->cleanUpMODXTags($content); //cleanup |
| 453 | 453 | |
| 454 | -if($js = $modx->getRegisteredClientScripts()) {
|
|
| 454 | +if ($js = $modx->getRegisteredClientScripts()) {
|
|
| 455 | 455 | $content .= $js; |
| 456 | 456 | } |
| 457 | 457 | |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
|
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes |
| 7 | 7 | |
| 8 | -if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
|
|
| 8 | +if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) { |
|
| 9 | 9 | // seems to be a new install - send the user to the configuration page |
| 10 | 10 | exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
|
| 11 | 11 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | $_SESSION['nrnewmessages'] = 0; |
| 17 | 17 | |
| 18 | 18 | // setup message info |
| 19 | -if($modx->hasPermission('messages')) {
|
|
| 19 | +if($modx->hasPermission('messages')) { |
|
| 20 | 20 | include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php'); |
| 21 | 21 | $_SESSION['nrtotalmessages'] = $nrtotalmessages; |
| 22 | 22 | $_SESSION['nrnewmessages'] = $nrnewmessages; |
@@ -33,46 +33,46 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | $iconTpl = $modx->getChunk('manager#welcome/WrapIcon');
|
| 35 | 35 | // setup icons |
| 36 | -if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
|
|
| 36 | +if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) { |
|
| 37 | 37 | $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]'; |
| 38 | 38 | $ph['SecurityIcon'] = sprintf($iconTpl,$icon, 75); |
| 39 | 39 | } |
| 40 | -if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
|
|
| 40 | +if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) { |
|
| 41 | 41 | $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]'; |
| 42 | 42 | $ph['WebUserIcon'] = sprintf($iconTpl,$icon, 99); |
| 43 | 43 | } |
| 44 | -if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
|
|
| 44 | +if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) { |
|
| 45 | 45 | $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]'; |
| 46 | 46 | $ph['ModulesIcon'] = sprintf($iconTpl,$icon, 106); |
| 47 | 47 | } |
| 48 | -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')) {
|
|
| 48 | +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')) { |
|
| 49 | 49 | $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]'; |
| 50 | 50 | $ph['ResourcesIcon'] = sprintf($iconTpl,$icon, 76); |
| 51 | 51 | } |
| 52 | -if($modx->hasPermission('bk_manager')) {
|
|
| 52 | +if($modx->hasPermission('bk_manager')) { |
|
| 53 | 53 | $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]'; |
| 54 | 54 | $ph['BackupIcon'] = sprintf($iconTpl,$icon, 93); |
| 55 | 55 | } |
| 56 | -if($modx->hasPermission('help')) {
|
|
| 56 | +if($modx->hasPermission('help')) { |
|
| 57 | 57 | $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]'; |
| 58 | 58 | $ph['HelpIcon'] = sprintf($iconTpl,$icon, 9); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | -if($modx->hasPermission('new_document')) {
|
|
| 61 | +if($modx->hasPermission('new_document')) { |
|
| 62 | 62 | $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]'; |
| 63 | 63 | $ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4); |
| 64 | 64 | $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]'; |
| 65 | 65 | $ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72); |
| 66 | 66 | } |
| 67 | -if($modx->hasPermission('assets_images')) {
|
|
| 67 | +if($modx->hasPermission('assets_images')) { |
|
| 68 | 68 | $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]'; |
| 69 | 69 | $ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72); |
| 70 | 70 | } |
| 71 | -if($modx->hasPermission('assets_files')) {
|
|
| 71 | +if($modx->hasPermission('assets_files')) { |
|
| 72 | 72 | $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]'; |
| 73 | 73 | $ph['FilesIcon'] = sprintf($iconTpl,$icon, 72); |
| 74 | 74 | } |
| 75 | -if($modx->hasPermission('change_password')) {
|
|
| 75 | +if($modx->hasPermission('change_password')) { |
|
| 76 | 76 | $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]'; |
| 77 | 77 | $ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28); |
| 78 | 78 | } |
@@ -80,21 +80,21 @@ discard block |
||
| 80 | 80 | $ph['LogoutIcon'] = sprintf($iconTpl,$icon, 8); |
| 81 | 81 | |
| 82 | 82 | // do some config checks |
| 83 | -if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
|
|
| 83 | +if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) { |
|
| 84 | 84 | include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php'); |
| 85 | - if($config_check_results != $_lang['configcheck_ok']) {
|
|
| 85 | + if($config_check_results != $_lang['configcheck_ok']) { |
|
| 86 | 86 | $ph['config_check_results'] = $config_check_results; |
| 87 | 87 | $ph['config_display'] = 'block'; |
| 88 | - } else {
|
|
| 88 | + } else { |
|
| 89 | 89 | $ph['config_display'] = 'none'; |
| 90 | 90 | } |
| 91 | -} else {
|
|
| 91 | +} else { |
|
| 92 | 92 | $ph['config_display'] = 'none'; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | // Check logout-reminder |
| 96 | -if(isset($_SESSION['show_logout_reminder'])) {
|
|
| 97 | - switch($_SESSION['show_logout_reminder']['type']) {
|
|
| 96 | +if(isset($_SESSION['show_logout_reminder'])) { |
|
| 97 | + switch($_SESSION['show_logout_reminder']['type']) { |
|
| 98 | 98 | case 'logout_reminder': |
| 99 | 99 | $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly'); |
| 100 | 100 | $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
|
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | } |
| 103 | 103 | $ph['show_logout_reminder'] = 'block'; |
| 104 | 104 | unset($_SESSION['show_logout_reminder']); |
| 105 | -} else {
|
|
| 105 | +} else { |
|
| 106 | 106 | $ph['show_logout_reminder'] = 'none'; |
| 107 | 107 | } |
| 108 | 108 | |
@@ -163,9 +163,9 @@ discard block |
||
| 163 | 163 | $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'"; |
| 164 | 164 | $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
|
| 165 | 165 | |
| 166 | -if($modx->db->getRecordCount($rs) < 1) {
|
|
| 166 | +if($modx->db->getRecordCount($rs) < 1) { |
|
| 167 | 167 | $html = '<p>[%no_active_users_found%]</p>'; |
| 168 | -} else {
|
|
| 168 | +} else { |
|
| 169 | 169 | include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php'); |
| 170 | 170 | $now = $_SERVER['REQUEST_TIME'] + $server_offset_time; |
| 171 | 171 | $ph['now'] = strftime('%H:%M:%S', $now);
|
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | $userList = array(); |
| 192 | 192 | $userCount = array(); |
| 193 | 193 | // Create userlist with session-count first before output |
| 194 | - while($activeusers = $modx->db->getRow($rs)) {
|
|
| 194 | + while($activeusers = $modx->db->getRow($rs)) { |
|
| 195 | 195 | $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1; |
| 196 | 196 | |
| 197 | 197 | $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : ''; |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | $currentaction |
| 210 | 210 | ); |
| 211 | 211 | } |
| 212 | - foreach($userList as $params) {
|
|
| 212 | + foreach($userList as $params) { |
|
| 213 | 213 | $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : ''; |
| 214 | 214 | $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);
|
| 215 | 215 | } |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | // invoke event OnManagerWelcomePrerender |
| 256 | 256 | $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
|
| 257 | -if(is_array($evtOut)) {
|
|
| 257 | +if(is_array($evtOut)) { |
|
| 258 | 258 | $output = implode('', $evtOut);
|
| 259 | 259 | $ph['OnManagerWelcomePrerender'] = $output; |
| 260 | 260 | } |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | 'body' => '<div class="widget-stage">[+RecentInfo+]</div>', |
| 360 | 360 | 'hide'=>'0' |
| 361 | 361 | ); |
| 362 | -if ($modx->config['rss_url_news']) {
|
|
| 362 | +if ($modx->config['rss_url_news']) { |
|
| 363 | 363 | $widgets['news'] = array( |
| 364 | 364 | 'menuindex' => '40', |
| 365 | 365 | 'id' => 'news', |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | 'hide'=>'0' |
| 371 | 371 | ); |
| 372 | 372 | } |
| 373 | -if ($modx->config['rss_url_security']) {
|
|
| 373 | +if ($modx->config['rss_url_security']) { |
|
| 374 | 374 | $widgets['security'] = array( |
| 375 | 375 | 'menuindex' => '50', |
| 376 | 376 | 'id' => 'security', |
@@ -384,29 +384,29 @@ discard block |
||
| 384 | 384 | |
| 385 | 385 | // invoke OnManagerWelcomeHome event |
| 386 | 386 | $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
|
| 387 | -if(is_array($sitewidgets)) {
|
|
| 387 | +if(is_array($sitewidgets)) { |
|
| 388 | 388 | $newwidgets = array(); |
| 389 | - foreach($sitewidgets as $widget){
|
|
| 389 | + foreach($sitewidgets as $widget) { |
|
| 390 | 390 | $newwidgets = array_merge($newwidgets, unserialize($widget)); |
| 391 | 391 | } |
| 392 | 392 | $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets; |
| 393 | 393 | } |
| 394 | 394 | |
| 395 | -usort($widgets, function ($a, $b) {
|
|
| 395 | +usort($widgets, function ($a, $b){ |
|
| 396 | 396 | return $a['menuindex'] - $b['menuindex']; |
| 397 | 397 | }); |
| 398 | 398 | |
| 399 | 399 | $tpl = $modx->getChunk('manager#welcome/Widget');
|
| 400 | 400 | $output = ''; |
| 401 | -foreach($widgets as $widget) {
|
|
| 402 | - if ($widget['hide'] != '1'){
|
|
| 401 | +foreach($widgets as $widget) { |
|
| 402 | + if ($widget['hide'] != '1') { |
|
| 403 | 403 | $output .= $modx->parseText($tpl, $widget); |
| 404 | 404 | } |
| 405 | 405 | } |
| 406 | 406 | $ph['widgets'] = $output; |
| 407 | 407 | |
| 408 | 408 | // load template |
| 409 | -if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
|
|
| 409 | +if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) { |
|
| 410 | 410 | $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'; |
| 411 | 411 | } |
| 412 | 412 | |
@@ -414,26 +414,28 @@ discard block |
||
| 414 | 414 | $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
|
| 415 | 415 | $target = $modx->mergeSettingsContent($target); |
| 416 | 416 | |
| 417 | -if(substr($target, 0, 1) === '@') {
|
|
| 418 | - if(substr($target, 0, 6) === '@CHUNK') {
|
|
| 417 | +if(substr($target, 0, 1) === '@') { |
|
| 418 | + if(substr($target, 0, 6) === '@CHUNK') { |
|
| 419 | 419 | $content = $modx->getChunk(trim(substr($target, 7))); |
| 420 | - } elseif(substr($target, 0, 5) === '@FILE') {
|
|
| 420 | + } elseif(substr($target, 0, 5) === '@FILE') { |
|
| 421 | 421 | $content = file_get_contents(trim(substr($target, 6))); |
| 422 | - } else {
|
|
| 422 | + } else { |
|
| 423 | 423 | $content = ''; |
| 424 | 424 | } |
| 425 | -} else {
|
|
| 425 | +} else { |
|
| 426 | 426 | $chunk = $modx->getChunk($target); |
| 427 | - if($chunk !== false && !empty($chunk)) {
|
|
| 427 | + if($chunk !== false && !empty($chunk)) { |
|
| 428 | 428 | $content = $chunk; |
| 429 | - } elseif(is_file(MODX_BASE_PATH . $target)) {
|
|
| 429 | + } elseif(is_file(MODX_BASE_PATH . $target)) { |
|
| 430 | 430 | $content = file_get_contents(MODX_BASE_PATH . $target); |
| 431 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
|
|
| 431 | + } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) { |
|
| 432 | 432 | $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl'); |
| 433 | - } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible |
|
| 433 | + } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) { |
|
| 434 | + // ClipperCMS compatible |
|
| 434 | 435 | {
|
| 435 | - $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html'); |
|
| 436 | - } else {
|
|
| 436 | + $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html'); |
|
| 437 | + } |
|
| 438 | + } else { |
|
| 437 | 439 | $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl'); |
| 438 | 440 | } |
| 439 | 441 | } |
@@ -442,7 +444,7 @@ discard block |
||
| 442 | 444 | $content = $modx->mergeConditionalTagsContent($content); |
| 443 | 445 | $content = $modx->mergeSettingsContent($content); |
| 444 | 446 | $content = $modx->parseText($content, $ph); |
| 445 | -if(strpos($content, '[+') !== false) {
|
|
| 447 | +if(strpos($content, '[+') !== false) { |
|
| 446 | 448 | $modx->toPlaceholders($ph); |
| 447 | 449 | $content = $modx->mergePlaceholderContent($content); |
| 448 | 450 | } |
@@ -451,7 +453,7 @@ discard block |
||
| 451 | 453 | $content = $modx->parseText($content, $_style, '[&', '&]'); |
| 452 | 454 | $content = $modx->cleanUpMODXTags($content); //cleanup |
| 453 | 455 | |
| 454 | -if($js = $modx->getRegisteredClientScripts()) {
|
|
| 456 | +if($js = $modx->getRegisteredClientScripts()) { |
|
| 455 | 457 | $content .= $js; |
| 456 | 458 | } |
| 457 | 459 | |
@@ -11,12 +11,12 @@ discard block |
||
| 11 | 11 | $style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/'; |
| 12 | 12 | $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php'; |
| 13 | 13 | if(!$modx->config['lang_code']) {
|
| 14 | - global $modx_lang_attribute; |
|
| 15 | - $modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute; |
|
| 14 | + global $modx_lang_attribute; |
|
| 15 | + $modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute; |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | if(!empty($_GET['a']) && $_GET['a'] == 2) {
|
| 19 | - include_once('welcome.php');
|
|
| 19 | + include_once('welcome.php');
|
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | // Favicon |
@@ -274,66 +274,66 @@ discard block |
||
| 274 | 274 | $addnew = 0; |
| 275 | 275 | $run = 0; |
| 276 | 276 | switch($action) {
|
| 277 | - case '3': |
|
| 278 | - case '4': |
|
| 279 | - case '27': |
|
| 280 | - case '72': |
|
| 281 | - if($modx->hasPermission('new_document')) {
|
|
| 282 | - $addnew = 1; |
|
| 283 | - } |
|
| 284 | - break; |
|
| 285 | - case '16': |
|
| 286 | - case '19': |
|
| 287 | - if($modx->hasPermission('new_template')) {
|
|
| 288 | - $addnew = 1; |
|
| 289 | - } |
|
| 290 | - break; |
|
| 291 | - case '300': |
|
| 292 | - case '301': |
|
| 293 | - if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
|
|
| 294 | - $addnew = 1; |
|
| 295 | - } |
|
| 296 | - break; |
|
| 297 | - case '77': |
|
| 298 | - case '78': |
|
| 299 | - if($modx->hasPermission('new_chunk')) {
|
|
| 300 | - $addnew = 1; |
|
| 301 | - } |
|
| 302 | - break; |
|
| 303 | - case '22': |
|
| 304 | - case '23': |
|
| 305 | - if($modx->hasPermission('new_snippet')) {
|
|
| 306 | - $addnew = 1; |
|
| 307 | - } |
|
| 308 | - break; |
|
| 309 | - case '101': |
|
| 310 | - case '102': |
|
| 311 | - if($modx->hasPermission('new_plugin')) {
|
|
| 312 | - $addnew = 1; |
|
| 313 | - } |
|
| 314 | - break; |
|
| 315 | - case '106': |
|
| 316 | - case '107': |
|
| 317 | - case '108': |
|
| 318 | - if($modx->hasPermission('new_module')) {
|
|
| 319 | - $addnew = 1; |
|
| 320 | - } |
|
| 321 | - if($modx->hasPermission('exec_module')) {
|
|
| 322 | - $run = 1; |
|
| 323 | - } |
|
| 324 | - break; |
|
| 325 | - case '88': |
|
| 326 | - if($modx->hasPermission('new_web_user')) {
|
|
| 327 | - $addnew = 1; |
|
| 328 | - } |
|
| 329 | - break; |
|
| 277 | + case '3': |
|
| 278 | + case '4': |
|
| 279 | + case '27': |
|
| 280 | + case '72': |
|
| 281 | + if($modx->hasPermission('new_document')) {
|
|
| 282 | + $addnew = 1; |
|
| 283 | + } |
|
| 284 | + break; |
|
| 285 | + case '16': |
|
| 286 | + case '19': |
|
| 287 | + if($modx->hasPermission('new_template')) {
|
|
| 288 | + $addnew = 1; |
|
| 289 | + } |
|
| 290 | + break; |
|
| 291 | + case '300': |
|
| 292 | + case '301': |
|
| 293 | + if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
|
|
| 294 | + $addnew = 1; |
|
| 295 | + } |
|
| 296 | + break; |
|
| 297 | + case '77': |
|
| 298 | + case '78': |
|
| 299 | + if($modx->hasPermission('new_chunk')) {
|
|
| 300 | + $addnew = 1; |
|
| 301 | + } |
|
| 302 | + break; |
|
| 303 | + case '22': |
|
| 304 | + case '23': |
|
| 305 | + if($modx->hasPermission('new_snippet')) {
|
|
| 306 | + $addnew = 1; |
|
| 307 | + } |
|
| 308 | + break; |
|
| 309 | + case '101': |
|
| 310 | + case '102': |
|
| 311 | + if($modx->hasPermission('new_plugin')) {
|
|
| 312 | + $addnew = 1; |
|
| 313 | + } |
|
| 314 | + break; |
|
| 315 | + case '106': |
|
| 316 | + case '107': |
|
| 317 | + case '108': |
|
| 318 | + if($modx->hasPermission('new_module')) {
|
|
| 319 | + $addnew = 1; |
|
| 320 | + } |
|
| 321 | + if($modx->hasPermission('exec_module')) {
|
|
| 322 | + $run = 1; |
|
| 323 | + } |
|
| 324 | + break; |
|
| 325 | + case '88': |
|
| 326 | + if($modx->hasPermission('new_web_user')) {
|
|
| 327 | + $addnew = 1; |
|
| 328 | + } |
|
| 329 | + break; |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | $disabled = ($action == '19' || $action == '300' || $action == '77' || $action == '23' || $action == '101' || $action == '4' || $action == '72' || $action == '87' || $action == '11' || $action == '107' || $action == '38') ? ' disabled' : ''; |
| 333 | 333 | |
| 334 | 334 | $_style['actionbuttons'] = array( |
| 335 | - 'dynamic' => array( |
|
| 336 | - 'document' => '<div id="actions"> |
|
| 335 | + 'dynamic' => array( |
|
| 336 | + 'document' => '<div id="actions"> |
|
| 337 | 337 | <div class="btn-group"> |
| 338 | 338 | <div class="btn-group"> |
| 339 | 339 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option> |
| 349 | 349 | </select> |
| 350 | 350 | </div>' . |
| 351 | - ($addnew ? ' |
|
| 351 | + ($addnew ? ' |
|
| 352 | 352 | <a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();"> |
| 353 | 353 | <i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span> |
| 354 | 354 | </a> |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | </a> |
| 365 | 365 | </div> |
| 366 | 366 | </div>', |
| 367 | - 'user' => '<div id="actions"> |
|
| 367 | + 'user' => '<div id="actions"> |
|
| 368 | 368 | <div class="btn-group"> |
| 369 | 369 | <div class="btn-group"> |
| 370 | 370 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | </a> |
| 388 | 388 | </div> |
| 389 | 389 | </div>', |
| 390 | - 'element' => '<div id="actions"> |
|
| 390 | + 'element' => '<div id="actions"> |
|
| 391 | 391 | <div class="btn-group"> |
| 392 | 392 | <div class="btn-group"> |
| 393 | 393 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
@@ -420,21 +420,21 @@ discard block |
||
| 420 | 420 | ' : '') . ' |
| 421 | 421 | </div> |
| 422 | 422 | </div>', |
| 423 | - 'newmodule' => ($addnew ? '<div id="actions"> |
|
| 423 | + 'newmodule' => ($addnew ? '<div id="actions"> |
|
| 424 | 424 | <div class="btn-group"> |
| 425 | 425 | <a id="newModule" class="btn btn-secondary" href="javascript:;" onclick="actions.new();"> |
| 426 | 426 | <i class="' . $_style["actions_new"] . '"></i><span>' . $_lang['new_module'] . '</span> |
| 427 | 427 | </a> |
| 428 | 428 | </div> |
| 429 | 429 | </div>' : ''), |
| 430 | - 'close' => '<div id="actions"> |
|
| 430 | + 'close' => '<div id="actions"> |
|
| 431 | 431 | <div class="btn-group"> |
| 432 | 432 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.close();"> |
| 433 | 433 | <i class="' . $_style["actions_close"] . '"></i><span>' . $_lang['close'] . '</span> |
| 434 | 434 | </a> |
| 435 | 435 | </div> |
| 436 | 436 | </div>', |
| 437 | - 'save' => '<div id="actions"> |
|
| 437 | + 'save' => '<div id="actions"> |
|
| 438 | 438 | <div class="btn-group"> |
| 439 | 439 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
| 440 | 440 | <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span> |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | </a> |
| 445 | 445 | </div> |
| 446 | 446 | </div>', |
| 447 | - 'savedelete' => '<div id="actions"> |
|
| 447 | + 'savedelete' => '<div id="actions"> |
|
| 448 | 448 | <div class="btn-group"> |
| 449 | 449 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
| 450 | 450 | <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span> |
@@ -457,14 +457,14 @@ discard block |
||
| 457 | 457 | </a> |
| 458 | 458 | </div> |
| 459 | 459 | </div>', |
| 460 | - 'cancel' => '<div id="actions"> |
|
| 460 | + 'cancel' => '<div id="actions"> |
|
| 461 | 461 | <div class="btn-group"> |
| 462 | 462 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 463 | 463 | <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
| 464 | 464 | </a> |
| 465 | 465 | </div> |
| 466 | 466 | </div>', |
| 467 | - 'canceldelete' => '<div id="actions"> |
|
| 467 | + 'canceldelete' => '<div id="actions"> |
|
| 468 | 468 | <div class="btn-group"> |
| 469 | 469 | <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();"> |
| 470 | 470 | <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span> |
@@ -474,11 +474,11 @@ discard block |
||
| 474 | 474 | </a> |
| 475 | 475 | </div> |
| 476 | 476 | </div>', |
| 477 | - ), |
|
| 478 | - 'static' => array( |
|
| 479 | - 'document' => '<div id="actions"> |
|
| 477 | + ), |
|
| 478 | + 'static' => array( |
|
| 479 | + 'document' => '<div id="actions"> |
|
| 480 | 480 | <div class="btn-group">' . |
| 481 | - ($addnew ? ' |
|
| 481 | + ($addnew ? ' |
|
| 482 | 482 | <a class="btn btn-secondary" href="javascript:;" onclick="actions.new();"> |
| 483 | 483 | <i class="' . $_style["icons_new_document"] . '"></i><span>' . $_lang['create_resource_here'] . '</span> |
| 484 | 484 | </a> |
@@ -503,12 +503,12 @@ discard block |
||
| 503 | 503 | </a> |
| 504 | 504 | </div> |
| 505 | 505 | </div>', |
| 506 | - 'cancel' => '<div id="actions"> |
|
| 506 | + 'cancel' => '<div id="actions"> |
|
| 507 | 507 | <div class="btn-group"> |
| 508 | 508 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 509 | 509 | <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
| 510 | 510 | </a> |
| 511 | 511 | </div> |
| 512 | 512 | </div>', |
| 513 | - ) |
|
| 513 | + ) |
|
| 514 | 514 | ); |
@@ -8,19 +8,19 @@ discard block |
||
| 8 | 8 | * Version: 1.1 |
| 9 | 9 | * MODX version: 1.0.3 |
| 10 | 10 | */ |
| 11 | -$style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/'; |
|
| 11 | +$style_path = 'media/style/'.$modx->config['manager_theme'].'/images/'; |
|
| 12 | 12 | $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php'; |
| 13 | -if(!$modx->config['lang_code']) {
|
|
| 13 | +if (!$modx->config['lang_code']) {
|
|
| 14 | 14 | global $modx_lang_attribute; |
| 15 | 15 | $modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute; |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | -if(!empty($_GET['a']) && $_GET['a'] == 2) {
|
|
| 18 | +if (!empty($_GET['a']) && $_GET['a'] == 2) {
|
|
| 19 | 19 | include_once('welcome.php');
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | // Favicon |
| 23 | -$_style['favicon'] = (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico'); |
|
| 23 | +$_style['favicon'] = (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico'); |
|
| 24 | 24 | |
| 25 | 25 | //Main Menu |
| 26 | 26 | $_style['menu_search'] = '<i class="fa fa-search"></i>'; |
@@ -99,10 +99,10 @@ discard block |
||
| 99 | 99 | $_style['tree_page_word'] = "<i class='fa fa-file-word-o'></i>"; |
| 100 | 100 | $_style['tree_page_excel'] = "<i class='fa fa-file-excel-o'></i>"; |
| 101 | 101 | |
| 102 | -$_style['tree_minusnode'] = "<i class='fa fa-angle-down'></i>";//$style_path.'tree/angle-down.png'; |
|
| 103 | -$_style['tree_plusnode'] = "<i class='fa fa-angle-right'></i>";//$style_path.'tree/angle-right.png'; |
|
| 102 | +$_style['tree_minusnode'] = "<i class='fa fa-angle-down'></i>"; //$style_path.'tree/angle-down.png'; |
|
| 103 | +$_style['tree_plusnode'] = "<i class='fa fa-angle-right'></i>"; //$style_path.'tree/angle-right.png'; |
|
| 104 | 104 | $_style['tree_weblink'] = $style_path.'tree/link.png'; |
| 105 | -$_style['tree_preview_resource'] = "<i class='fa fa-eye'></i>";//$style_path.'icons/eye.png'; |
|
| 105 | +$_style['tree_preview_resource'] = "<i class='fa fa-eye'></i>"; //$style_path.'icons/eye.png'; |
|
| 106 | 106 | |
| 107 | 107 | $_style['tree_showtree'] = '<i class="fa fa-sitemap"></i>'; |
| 108 | 108 | $_style['tree_working'] = '<i class="fa fa-warning"></i>'; |
@@ -137,8 +137,8 @@ discard block |
||
| 137 | 137 | $_style['icons_edit_document'] = $style_path.'icons/save.png'; |
| 138 | 138 | $_style['icons_delete_document'] = $style_path.'icons/trash.png'; |
| 139 | 139 | //locks |
| 140 | -$_style['icons_preview_resource'] = $style_path.'icons/eye.png';//$style_path.'icons/eye.png'; |
|
| 141 | -$_style['icons_secured'] = "<i class='fa fa-lock'></i>";//$style_path.'icons/lock.png'; |
|
| 140 | +$_style['icons_preview_resource'] = $style_path.'icons/eye.png'; //$style_path.'icons/eye.png'; |
|
| 141 | +$_style['icons_secured'] = "<i class='fa fa-lock'></i>"; //$style_path.'icons/lock.png'; |
|
| 142 | 142 | |
| 143 | 143 | //file manager icons |
| 144 | 144 | $_style['files_save'] = 'fa fa-floppy-o'; |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | $_style['icons_set_parent'] = $style_path.'icons/folder-open.png'; |
| 214 | 214 | |
| 215 | 215 | //modules |
| 216 | -$_style['icons_module'] = 'fa fa-cube'; |
|
| 216 | +$_style['icons_module'] = 'fa fa-cube'; |
|
| 217 | 217 | $_style['icons_modules'] = 'fa fa-cubes'; //$style_path.'icons/modules.png'; |
| 218 | 218 | $_style['icons_run'] = $style_path.'icons/play.png'; |
| 219 | 219 | |
@@ -273,57 +273,57 @@ discard block |
||
| 273 | 273 | $stay = isset($_REQUEST['stay']) ? $_REQUEST['stay'] : ''; |
| 274 | 274 | $addnew = 0; |
| 275 | 275 | $run = 0; |
| 276 | -switch($action) {
|
|
| 276 | +switch ($action) {
|
|
| 277 | 277 | case '3': |
| 278 | 278 | case '4': |
| 279 | 279 | case '27': |
| 280 | 280 | case '72': |
| 281 | - if($modx->hasPermission('new_document')) {
|
|
| 281 | + if ($modx->hasPermission('new_document')) {
|
|
| 282 | 282 | $addnew = 1; |
| 283 | 283 | } |
| 284 | 284 | break; |
| 285 | 285 | case '16': |
| 286 | 286 | case '19': |
| 287 | - if($modx->hasPermission('new_template')) {
|
|
| 287 | + if ($modx->hasPermission('new_template')) {
|
|
| 288 | 288 | $addnew = 1; |
| 289 | 289 | } |
| 290 | 290 | break; |
| 291 | 291 | case '300': |
| 292 | 292 | case '301': |
| 293 | - if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
|
|
| 293 | + if ($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
|
|
| 294 | 294 | $addnew = 1; |
| 295 | 295 | } |
| 296 | 296 | break; |
| 297 | 297 | case '77': |
| 298 | 298 | case '78': |
| 299 | - if($modx->hasPermission('new_chunk')) {
|
|
| 299 | + if ($modx->hasPermission('new_chunk')) {
|
|
| 300 | 300 | $addnew = 1; |
| 301 | 301 | } |
| 302 | 302 | break; |
| 303 | 303 | case '22': |
| 304 | 304 | case '23': |
| 305 | - if($modx->hasPermission('new_snippet')) {
|
|
| 305 | + if ($modx->hasPermission('new_snippet')) {
|
|
| 306 | 306 | $addnew = 1; |
| 307 | 307 | } |
| 308 | 308 | break; |
| 309 | 309 | case '101': |
| 310 | 310 | case '102': |
| 311 | - if($modx->hasPermission('new_plugin')) {
|
|
| 311 | + if ($modx->hasPermission('new_plugin')) {
|
|
| 312 | 312 | $addnew = 1; |
| 313 | 313 | } |
| 314 | 314 | break; |
| 315 | 315 | case '106': |
| 316 | 316 | case '107': |
| 317 | 317 | case '108': |
| 318 | - if($modx->hasPermission('new_module')) {
|
|
| 318 | + if ($modx->hasPermission('new_module')) {
|
|
| 319 | 319 | $addnew = 1; |
| 320 | 320 | } |
| 321 | - if($modx->hasPermission('exec_module')) {
|
|
| 321 | + if ($modx->hasPermission('exec_module')) {
|
|
| 322 | 322 | $run = 1; |
| 323 | 323 | } |
| 324 | 324 | break; |
| 325 | 325 | case '88': |
| 326 | - if($modx->hasPermission('new_web_user')) {
|
|
| 326 | + if ($modx->hasPermission('new_web_user')) {
|
|
| 327 | 327 | $addnew = 1; |
| 328 | 328 | } |
| 329 | 329 | break; |
@@ -337,30 +337,30 @@ discard block |
||
| 337 | 337 | <div class="btn-group"> |
| 338 | 338 | <div class="btn-group"> |
| 339 | 339 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
| 340 | - <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span> |
|
| 340 | + <i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span> |
|
| 341 | 341 | </a> |
| 342 | 342 | <span class="btn btn-success plus dropdown-toggle"></span> |
| 343 | 343 | <select id="stay" name="stay"> |
| 344 | 344 | ' . ($addnew ? ' |
| 345 | - <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option> |
|
| 346 | - ' : '') . ' |
|
| 347 | - <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option> |
|
| 348 | - <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option> |
|
| 345 | + <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option> |
|
| 346 | + ' : '').' |
|
| 347 | + <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option> |
|
| 348 | + <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option> |
|
| 349 | 349 | </select> |
| 350 | 350 | </div>' . |
| 351 | 351 | ($addnew ? ' |
| 352 | - <a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();"> |
|
| 353 | - <i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span> |
|
| 352 | + <a id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();"> |
|
| 353 | + <i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span> |
|
| 354 | 354 | </a> |
| 355 | - ' : '') . ' |
|
| 356 | - <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();"> |
|
| 357 | - <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span> |
|
| 355 | + ' : '').' |
|
| 356 | + <a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();"> |
|
| 357 | + <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span> |
|
| 358 | 358 | </a> |
| 359 | 359 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 360 | - <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
|
| 360 | + <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span> |
|
| 361 | 361 | </a> |
| 362 | 362 | <a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();"> |
| 363 | - <i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span> |
|
| 363 | + <i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span> |
|
| 364 | 364 | </a> |
| 365 | 365 | </div> |
| 366 | 366 | </div>', |
@@ -368,22 +368,22 @@ discard block |
||
| 368 | 368 | <div class="btn-group"> |
| 369 | 369 | <div class="btn-group"> |
| 370 | 370 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
| 371 | - <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span> |
|
| 371 | + <i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span> |
|
| 372 | 372 | </a> |
| 373 | 373 | <span class="btn btn-success plus dropdown-toggle"></span> |
| 374 | 374 | <select id="stay" name="stay"> |
| 375 | 375 | ' . ($addnew ? ' |
| 376 | - <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option> |
|
| 377 | - ' : '') . ' |
|
| 378 | - <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option> |
|
| 379 | - <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option> |
|
| 376 | + <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option> |
|
| 377 | + ' : '').' |
|
| 378 | + <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option> |
|
| 379 | + <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option> |
|
| 380 | 380 | </select> |
| 381 | 381 | </div> |
| 382 | - <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();"> |
|
| 383 | - <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span> |
|
| 382 | + <a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();"> |
|
| 383 | + <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span> |
|
| 384 | 384 | </a> |
| 385 | 385 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 386 | - <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
|
| 386 | + <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span> |
|
| 387 | 387 | </a> |
| 388 | 388 | </div> |
| 389 | 389 | </div>', |
@@ -391,86 +391,86 @@ discard block |
||
| 391 | 391 | <div class="btn-group"> |
| 392 | 392 | <div class="btn-group"> |
| 393 | 393 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
| 394 | - <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span> |
|
| 394 | + <i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span> |
|
| 395 | 395 | </a> |
| 396 | 396 | <span class="btn btn-success plus dropdown-toggle"></span> |
| 397 | 397 | <select id="stay" name="stay"> |
| 398 | 398 | ' . ($addnew ? ' |
| 399 | - <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option> |
|
| 400 | - ' : '') . ' |
|
| 401 | - <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option> |
|
| 402 | - <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option> |
|
| 399 | + <option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option> |
|
| 400 | + ' : '').' |
|
| 401 | + <option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option> |
|
| 402 | + <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option> |
|
| 403 | 403 | </select> |
| 404 | 404 | </div> |
| 405 | 405 | ' . ($addnew ? ' |
| 406 | - <a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();"> |
|
| 407 | - <i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span> |
|
| 406 | + <a id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();"> |
|
| 407 | + <i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span> |
|
| 408 | 408 | </a> |
| 409 | - ' : '') . ' |
|
| 410 | - <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();"> |
|
| 411 | - <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span> |
|
| 409 | + ' : '').' |
|
| 410 | + <a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();"> |
|
| 411 | + <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span> |
|
| 412 | 412 | </a> |
| 413 | 413 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 414 | - <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
|
| 414 | + <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span> |
|
| 415 | 415 | </a> |
| 416 | 416 | ' . ($run ? ' |
| 417 | - <a id="Button4" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.run();"> |
|
| 418 | - <i class="' . $_style["actions_run"] . '"></i><span>' . $_lang['run_module'] . '</span> |
|
| 417 | + <a id="Button4" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.run();"> |
|
| 418 | + <i class="' . $_style["actions_run"].'"></i><span>'.$_lang['run_module'].'</span> |
|
| 419 | 419 | </a> |
| 420 | - ' : '') . ' |
|
| 420 | + ' : '').' |
|
| 421 | 421 | </div> |
| 422 | 422 | </div>', |
| 423 | 423 | 'newmodule' => ($addnew ? '<div id="actions"> |
| 424 | 424 | <div class="btn-group"> |
| 425 | 425 | <a id="newModule" class="btn btn-secondary" href="javascript:;" onclick="actions.new();"> |
| 426 | - <i class="' . $_style["actions_new"] . '"></i><span>' . $_lang['new_module'] . '</span> |
|
| 426 | + <i class="' . $_style["actions_new"].'"></i><span>'.$_lang['new_module'].'</span> |
|
| 427 | 427 | </a> |
| 428 | 428 | </div> |
| 429 | 429 | </div>' : ''), |
| 430 | 430 | 'close' => '<div id="actions"> |
| 431 | 431 | <div class="btn-group"> |
| 432 | 432 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.close();"> |
| 433 | - <i class="' . $_style["actions_close"] . '"></i><span>' . $_lang['close'] . '</span> |
|
| 433 | + <i class="' . $_style["actions_close"].'"></i><span>'.$_lang['close'].'</span> |
|
| 434 | 434 | </a> |
| 435 | 435 | </div> |
| 436 | 436 | </div>', |
| 437 | 437 | 'save' => '<div id="actions"> |
| 438 | 438 | <div class="btn-group"> |
| 439 | 439 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
| 440 | - <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span> |
|
| 440 | + <i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span> |
|
| 441 | 441 | </a> |
| 442 | 442 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 443 | - <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
|
| 443 | + <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span> |
|
| 444 | 444 | </a> |
| 445 | 445 | </div> |
| 446 | 446 | </div>', |
| 447 | 447 | 'savedelete' => '<div id="actions"> |
| 448 | 448 | <div class="btn-group"> |
| 449 | 449 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
| 450 | - <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span> |
|
| 450 | + <i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span> |
|
| 451 | 451 | </a> |
| 452 | - <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();"> |
|
| 453 | - <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span> |
|
| 452 | + <a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();"> |
|
| 453 | + <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span> |
|
| 454 | 454 | </a> |
| 455 | 455 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 456 | - <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
|
| 456 | + <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span> |
|
| 457 | 457 | </a> |
| 458 | 458 | </div> |
| 459 | 459 | </div>', |
| 460 | 460 | 'cancel' => '<div id="actions"> |
| 461 | 461 | <div class="btn-group"> |
| 462 | 462 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 463 | - <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
|
| 463 | + <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span> |
|
| 464 | 464 | </a> |
| 465 | 465 | </div> |
| 466 | 466 | </div>', |
| 467 | 467 | 'canceldelete' => '<div id="actions"> |
| 468 | 468 | <div class="btn-group"> |
| 469 | - <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();"> |
|
| 470 | - <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span> |
|
| 469 | + <a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();"> |
|
| 470 | + <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span> |
|
| 471 | 471 | </a> |
| 472 | 472 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 473 | - <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
|
| 473 | + <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span> |
|
| 474 | 474 | </a> |
| 475 | 475 | </div> |
| 476 | 476 | </div>', |
@@ -480,33 +480,33 @@ discard block |
||
| 480 | 480 | <div class="btn-group">' . |
| 481 | 481 | ($addnew ? ' |
| 482 | 482 | <a class="btn btn-secondary" href="javascript:;" onclick="actions.new();"> |
| 483 | - <i class="' . $_style["icons_new_document"] . '"></i><span>' . $_lang['create_resource_here'] . '</span> |
|
| 483 | + <i class="' . $_style["icons_new_document"].'"></i><span>'.$_lang['create_resource_here'].'</span> |
|
| 484 | 484 | </a> |
| 485 | 485 | <a class="btn btn-secondary" href="javascript:;" onclick="actions.newlink();"> |
| 486 | - <i class="' . $_style["icons_new_weblink"] . '"></i><span>' . $_lang['create_weblink_here'] . '</span> |
|
| 486 | + <i class="' . $_style["icons_new_weblink"].'"></i><span>'.$_lang['create_weblink_here'].'</span> |
|
| 487 | 487 | </a> |
| 488 | - ' : '') . ' |
|
| 488 | + ' : '').' |
|
| 489 | 489 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.edit();"> |
| 490 | - <i class="' . $_style["actions_edit"] . '"></i><span>' . $_lang['edit'] . '</span> |
|
| 490 | + <i class="' . $_style["actions_edit"].'"></i><span>'.$_lang['edit'].'</span> |
|
| 491 | 491 | </a> |
| 492 | 492 | <a id="Button2" class="btn btn-secondary" href="javascript:;" onclick="actions.move();"> |
| 493 | - <i class="' . $_style["actions_move"] . '"></i><span>' . $_lang['move'] . '</span> |
|
| 493 | + <i class="' . $_style["actions_move"].'"></i><span>'.$_lang['move'].'</span> |
|
| 494 | 494 | </a> |
| 495 | 495 | <a id="Button6" class="btn btn-secondary" href="javascript:;" onclick="actions.duplicate();"> |
| 496 | - <i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span> |
|
| 496 | + <i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span> |
|
| 497 | 497 | </a> |
| 498 | 498 | <a id="Button3" class="btn btn-secondary" href="javascript:;" onclick="actions.delete();"> |
| 499 | - <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span> |
|
| 499 | + <i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span> |
|
| 500 | 500 | </a> |
| 501 | 501 | <a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();"> |
| 502 | - <i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span> |
|
| 502 | + <i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span> |
|
| 503 | 503 | </a> |
| 504 | 504 | </div> |
| 505 | 505 | </div>', |
| 506 | 506 | 'cancel' => '<div id="actions"> |
| 507 | 507 | <div class="btn-group"> |
| 508 | 508 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 509 | - <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
|
| 509 | + <i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span> |
|
| 510 | 510 | </a> |
| 511 | 511 | </div> |
| 512 | 512 | </div>', |
@@ -10,12 +10,12 @@ discard block |
||
| 10 | 10 | */ |
| 11 | 11 | $style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/'; |
| 12 | 12 | $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php'; |
| 13 | -if(!$modx->config['lang_code']) {
|
|
| 13 | +if(!$modx->config['lang_code']) { |
|
| 14 | 14 | global $modx_lang_attribute; |
| 15 | 15 | $modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute; |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | -if(!empty($_GET['a']) && $_GET['a'] == 2) {
|
|
| 18 | +if(!empty($_GET['a']) && $_GET['a'] == 2) { |
|
| 19 | 19 | include_once('welcome.php');
|
| 20 | 20 | } |
| 21 | 21 | |
@@ -262,68 +262,68 @@ discard block |
||
| 262 | 262 | |
| 263 | 263 | // actions buttons templates |
| 264 | 264 | $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : ''; |
| 265 | -if (!empty($modx->config['global_tabs']) && !isset($_SESSION['stay'])) {
|
|
| 265 | +if (!empty($modx->config['global_tabs']) && !isset($_SESSION['stay'])) { |
|
| 266 | 266 | $_REQUEST['stay'] = 2; |
| 267 | 267 | } |
| 268 | -if (isset($_REQUEST['stay'])) {
|
|
| 268 | +if (isset($_REQUEST['stay'])) { |
|
| 269 | 269 | $_SESSION['stay'] = $_REQUEST['stay']; |
| 270 | -} else if (isset($_SESSION['stay'])) {
|
|
| 270 | +} else if (isset($_SESSION['stay'])) { |
|
| 271 | 271 | $_REQUEST['stay'] = $_SESSION['stay']; |
| 272 | 272 | } |
| 273 | 273 | $stay = isset($_REQUEST['stay']) ? $_REQUEST['stay'] : ''; |
| 274 | 274 | $addnew = 0; |
| 275 | 275 | $run = 0; |
| 276 | -switch($action) {
|
|
| 276 | +switch($action) { |
|
| 277 | 277 | case '3': |
| 278 | 278 | case '4': |
| 279 | 279 | case '27': |
| 280 | 280 | case '72': |
| 281 | - if($modx->hasPermission('new_document')) {
|
|
| 281 | + if($modx->hasPermission('new_document')) { |
|
| 282 | 282 | $addnew = 1; |
| 283 | 283 | } |
| 284 | 284 | break; |
| 285 | 285 | case '16': |
| 286 | 286 | case '19': |
| 287 | - if($modx->hasPermission('new_template')) {
|
|
| 287 | + if($modx->hasPermission('new_template')) { |
|
| 288 | 288 | $addnew = 1; |
| 289 | 289 | } |
| 290 | 290 | break; |
| 291 | 291 | case '300': |
| 292 | 292 | case '301': |
| 293 | - if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
|
|
| 293 | + if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) { |
|
| 294 | 294 | $addnew = 1; |
| 295 | 295 | } |
| 296 | 296 | break; |
| 297 | 297 | case '77': |
| 298 | 298 | case '78': |
| 299 | - if($modx->hasPermission('new_chunk')) {
|
|
| 299 | + if($modx->hasPermission('new_chunk')) { |
|
| 300 | 300 | $addnew = 1; |
| 301 | 301 | } |
| 302 | 302 | break; |
| 303 | 303 | case '22': |
| 304 | 304 | case '23': |
| 305 | - if($modx->hasPermission('new_snippet')) {
|
|
| 305 | + if($modx->hasPermission('new_snippet')) { |
|
| 306 | 306 | $addnew = 1; |
| 307 | 307 | } |
| 308 | 308 | break; |
| 309 | 309 | case '101': |
| 310 | 310 | case '102': |
| 311 | - if($modx->hasPermission('new_plugin')) {
|
|
| 311 | + if($modx->hasPermission('new_plugin')) { |
|
| 312 | 312 | $addnew = 1; |
| 313 | 313 | } |
| 314 | 314 | break; |
| 315 | 315 | case '106': |
| 316 | 316 | case '107': |
| 317 | 317 | case '108': |
| 318 | - if($modx->hasPermission('new_module')) {
|
|
| 318 | + if($modx->hasPermission('new_module')) { |
|
| 319 | 319 | $addnew = 1; |
| 320 | 320 | } |
| 321 | - if($modx->hasPermission('exec_module')) {
|
|
| 321 | + if($modx->hasPermission('exec_module')) { |
|
| 322 | 322 | $run = 1; |
| 323 | 323 | } |
| 324 | 324 | break; |
| 325 | 325 | case '88': |
| 326 | - if($modx->hasPermission('new_web_user')) {
|
|
| 326 | + if($modx->hasPermission('new_web_user')) { |
|
| 327 | 327 | $addnew = 1; |
| 328 | 328 | } |
| 329 | 329 | break; |
