@@ -1,5 +1,5 @@ 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 | header("X-XSS-Protection: 0"); |
@@ -11,22 +11,22 @@ discard block |
||
11 | 11 | |
12 | 12 | $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en'; |
13 | 13 | |
14 | -if (!isset($modx->config['manager_menu_height'])) { |
|
14 | +if (!isset($modx->config['manager_menu_height'])) { |
|
15 | 15 | $modx->config['manager_menu_height'] = 2.2; // rem |
16 | 16 | } |
17 | 17 | |
18 | -if (!isset($modx->config['manager_tree_width'])) { |
|
18 | +if (!isset($modx->config['manager_tree_width'])) { |
|
19 | 19 | $modx->config['manager_tree_width'] = 20; // rem |
20 | 20 | } |
21 | 21 | |
22 | -if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) { |
|
22 | +if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) { |
|
23 | 23 | $initMainframeAction = $_SESSION['onLoginForwardToAction']; |
24 | 24 | unset($_SESSION['onLoginForwardToAction']); |
25 | -} else { |
|
25 | +} else { |
|
26 | 26 | $initMainframeAction = 2; // welcome.static |
27 | 27 | } |
28 | 28 | |
29 | -if (!isset($_SESSION['tree_show_only_folders'])) { |
|
29 | +if (!isset($_SESSION['tree_show_only_folders'])) { |
|
30 | 30 | $_SESSION['tree_show_only_folders'] = 0; |
31 | 31 | } |
32 | 32 | |
@@ -35,29 +35,29 @@ discard block |
||
35 | 35 | $tree_width = $modx->config['manager_tree_width']; |
36 | 36 | $tree_min_width = 0; |
37 | 37 | |
38 | -if (isset($_COOKIE['MODX_widthSideBar'])) { |
|
38 | +if (isset($_COOKIE['MODX_widthSideBar'])) { |
|
39 | 39 | $MODX_widthSideBar = $_COOKIE['MODX_widthSideBar']; |
40 | -} else { |
|
40 | +} else { |
|
41 | 41 | $MODX_widthSideBar = $tree_width; |
42 | 42 | } |
43 | 43 | |
44 | -if (!$MODX_widthSideBar) { |
|
44 | +if (!$MODX_widthSideBar) { |
|
45 | 45 | $body_class .= 'sidebar-closed'; |
46 | 46 | } |
47 | 47 | |
48 | 48 | $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness'); |
49 | -if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) { |
|
49 | +if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) { |
|
50 | 50 | $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']]; |
51 | -} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) { |
|
51 | +} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) { |
|
52 | 52 | $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']]; |
53 | 53 | } |
54 | 54 | |
55 | 55 | $navbar_position = $modx->config['manager_menu_position']; |
56 | -if ($navbar_position == 'left') { |
|
56 | +if ($navbar_position == 'left') { |
|
57 | 57 | $body_class .= ' navbar-left navbar-left-icon-and-text'; |
58 | 58 | } |
59 | 59 | |
60 | -if (isset($modx->pluginCache['ElementsInTree'])) { |
|
60 | +if (isset($modx->pluginCache['ElementsInTree'])) { |
|
61 | 61 | $body_class .= ' ElementsInTree'; |
62 | 62 | } |
63 | 63 | |
@@ -73,19 +73,19 @@ discard block |
||
73 | 73 | 'type8' => $_lang["lock_element_type_8"] |
74 | 74 | ); |
75 | 75 | |
76 | -foreach ($unlockTranslations as $key => $value) { |
|
76 | +foreach ($unlockTranslations as $key => $value) { |
|
77 | 77 | $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value); |
78 | 78 | } |
79 | 79 | |
80 | 80 | $user = $modx->getUserInfo($modx->getLoginUserID()); |
81 | -if ($user['which_browser'] == 'default') { |
|
81 | +if ($user['which_browser'] == 'default') { |
|
82 | 82 | $user['which_browser'] = $modx->config['which_browser']; |
83 | 83 | } |
84 | 84 | |
85 | 85 | $css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime; |
86 | 86 | |
87 | -if ($modx->config['manager_theme'] == 'default') { |
|
88 | - if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) { |
|
87 | +if ($modx->config['manager_theme'] == 'default') { |
|
88 | + if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) { |
|
89 | 89 | require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php'; |
90 | 90 | $minifier = new Formatter\CSSMinify(); |
91 | 91 | $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css'); |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | $css = $minifier->minify(); |
103 | 103 | file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css); |
104 | 104 | } |
105 | - if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) { |
|
105 | + if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) { |
|
106 | 106 | $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime; |
107 | 107 | } |
108 | 108 | } |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | <?php |
258 | 258 | // invoke OnManagerTopPrerender event |
259 | 259 | $evtOut = $modx->invokeEvent('OnManagerTopPrerender', $_REQUEST); |
260 | - if (is_array($evtOut)) { |
|
260 | + if (is_array($evtOut)) { |
|
261 | 261 | echo implode("\n", $evtOut); |
262 | 262 | } |
263 | 263 | ?> |
@@ -428,11 +428,14 @@ discard block |
||
428 | 428 | <div id="evo-tab-page-home" class="evo-tab-page show iframe-scroller"> |
429 | 429 | <iframe id="mainframe" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe> |
430 | 430 | </div> |
431 | - <?php else: ?> |
|
431 | + <?php else { |
|
432 | + : ?> |
|
432 | 433 | <div class="iframe-scroller"> |
433 | 434 | <iframe id="mainframe" name="main" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe> |
434 | 435 | </div> |
435 | - <?php endif; ?> |
|
436 | + <?php endif; |
|
437 | +} |
|
438 | +?> |
|
436 | 439 | <script> |
437 | 440 | if (/iPhone|iPad|iPod/i.test(navigator.userAgent)) { |
438 | 441 | document.getElementById('mainframe').setAttribute('scrolling', 'no'); |
@@ -451,11 +454,11 @@ discard block |
||
451 | 454 | 'tree_sortdir', |
452 | 455 | 'tree_nodename' |
453 | 456 | ); |
454 | - foreach ($sortParams as $param) { |
|
455 | - if (isset($_REQUEST[$param])) { |
|
457 | + foreach ($sortParams as $param) { |
|
458 | + if (isset($_REQUEST[$param])) { |
|
456 | 459 | $modx->manager->saveLastUserSetting($param, $_REQUEST[$param]); |
457 | 460 | $_SESSION[$param] = $_REQUEST[$param]; |
458 | - } else if (!isset($_SESSION[$param])) { |
|
461 | + } else if (!isset($_SESSION[$param])) { |
|
459 | 462 | $_SESSION[$param] = $modx->manager->getLastUserSetting($param); |
460 | 463 | } |
461 | 464 | } |
@@ -535,16 +538,16 @@ discard block |
||
535 | 538 | </div> |
536 | 539 | |
537 | 540 | <?php |
538 | - if(!function_exists('constructLink')) { |
|
541 | + if(!function_exists('constructLink')) { |
|
539 | 542 | /** |
540 | 543 | * @param string $action |
541 | 544 | * @param string $img |
542 | 545 | * @param string $text |
543 | 546 | * @param bool $allowed |
544 | 547 | */ |
545 | - function constructLink($action, $img, $text, $allowed) |
|
546 | - { |
|
547 | - if ((bool)$allowed) { |
|
548 | + function constructLink($action, $img, $text, $allowed) |
|
549 | + { |
|
550 | + if ((bool)$allowed) { |
|
548 | 551 | echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action, |
549 | 552 | $action); |
550 | 553 | echo sprintf('<i class="%s"></i> %s</div>', $img, $text); |
@@ -651,7 +654,7 @@ discard block |
||
651 | 654 | ?> |
652 | 655 | |
653 | 656 | </div> |
654 | -<?php if ($modx->config['show_picker'] != "0") { |
|
657 | +<?php if ($modx->config['show_picker'] != "0") { |
|
655 | 658 | include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php'); |
656 | 659 | } ?> |
657 | 660 | </body> |
@@ -476,7 +476,8 @@ discard block |
||
476 | 476 | return s; |
477 | 477 | } |
478 | 478 | |
479 | - <?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?> |
|
479 | + <?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { |
|
480 | +// Web Link specific ?> |
|
480 | 481 | var lastImageCtrl; |
481 | 482 | var lastFileCtrl; |
482 | 483 | |
@@ -692,7 +693,8 @@ discard block |
||
692 | 693 | </td> |
693 | 694 | </tr> |
694 | 695 | |
695 | - <?php if($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?> |
|
696 | + <?php if($content['type'] == 'reference' || $modx->manager->action == '72') { |
|
697 | +// Web Link specific ?> |
|
696 | 698 | |
697 | 699 | <tr> |
698 | 700 | <td><span class="warning"><?= $_lang['weblink'] ?></span> |
@@ -1370,7 +1372,9 @@ discard block |
||
1370 | 1372 | if($documentId > 0) { |
1371 | 1373 | // Load up, the permissions from the parent (if new document) or existing document |
1372 | 1374 | $rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'"); |
1373 | - while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id']; |
|
1375 | + while($currentgroup = $modx->db->getRow($rs)) { |
|
1376 | + $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id']; |
|
1377 | + } |
|
1374 | 1378 | |
1375 | 1379 | // Load up the current permissions and names |
1376 | 1380 | $vs = array( |
@@ -1432,7 +1436,9 @@ discard block |
||
1432 | 1436 | |
1433 | 1437 | // Create attribute string list |
1434 | 1438 | $inputString = array(); |
1435 | - foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"'; |
|
1439 | + foreach($inputAttributes as $k => $v) { |
|
1440 | + $inputString[] = $k . '="' . $v . '"'; |
|
1441 | + } |
|
1436 | 1442 | |
1437 | 1443 | // Make the <input> HTML |
1438 | 1444 | $inputHTML = '<input ' . implode(' ', $inputString) . ' />'; |
@@ -27,16 +27,14 @@ |
||
27 | 27 | $cm = new EvolutionCMS\Legacy\ModuleCategoriesManager(); |
28 | 28 | |
29 | 29 | // assign module_params to internal params |
30 | -foreach( $_module_params as $param => $value ) |
|
31 | -{ |
|
30 | +foreach( $_module_params as $param => $value ) { |
|
32 | 31 | $cm->set( $param, $value ); |
33 | 32 | } |
34 | 33 | |
35 | 34 | // catch the request actions |
36 | 35 | include_once $cm->get('inc_dir') . 'request_trigger.inc.php'; |
37 | 36 | |
38 | -if( !$categories = $cm->getCategories() ) |
|
39 | -{ |
|
37 | +if( !$categories = $cm->getCategories() ) { |
|
40 | 38 | setcookie('webfxtab_manage-categories-pane', 0 ); |
41 | 39 | $cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' ); |
42 | 40 | } |
@@ -4,4 +4,6 @@ |
||
4 | 4 | * Class to handle the modx-categories |
5 | 5 | * @deprecated use EvolutionCMS\Legacy\Categories |
6 | 6 | */ |
7 | -class Categories extends EvolutionCMS\Legacy\Categories{} |
|
7 | +class Categories extends EvolutionCMS\Legacy\Categories |
|
8 | +{ |
|
9 | +} |
@@ -12,7 +12,7 @@ |
||
12 | 12 | } |
13 | 13 | |
14 | 14 | // check if user has access permission, except admins |
15 | -if($_SESSION['mgrRole']!=1){ |
|
15 | +if($_SESSION['mgrRole']!=1) { |
|
16 | 16 | $rs = $modx->db->select( |
17 | 17 | 'sma.usergroup,mg.member', |
18 | 18 | $modx->getFullTableName("site_module_access")." sma |
@@ -31,8 +31,11 @@ |
||
31 | 31 | // count duplicates |
32 | 32 | $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'")); |
33 | 33 | $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'")); |
34 | -if($count>=1) $count = ' '.($count+1); |
|
35 | -else $count = ''; |
|
34 | +if($count>=1) { |
|
35 | + $count = ' '.($count+1); |
|
36 | +} else { |
|
37 | + $count = ''; |
|
38 | +} |
|
36 | 39 | |
37 | 40 | // duplicate module |
38 | 41 | $newid = $modx->db->insert( |
@@ -12,12 +12,20 @@ discard block |
||
12 | 12 | // ok, two things to check. |
13 | 13 | // first, document cannot be moved to itself |
14 | 14 | // second, new parent must be a folder. If not, set it to folder. |
15 | -if($documentID==$newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]); |
|
16 | -if($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
17 | -if($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
15 | +if($documentID==$newParentID) { |
|
16 | + $modx->webAlertAndQuit($_lang["error_movedocument1"]); |
|
17 | +} |
|
18 | +if($documentID <= 0) { |
|
19 | + $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
20 | +} |
|
21 | +if($newParentID < 0) { |
|
22 | + $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
23 | +} |
|
18 | 24 | |
19 | 25 | $parents = $modx->getParentIds($newParentID); |
20 | -if (in_array($documentID, $parents)) $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
26 | +if (in_array($documentID, $parents)) { |
|
27 | + $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
|
28 | +} |
|
21 | 29 | |
22 | 30 | $rs = $modx->db->select('parent', $modx->getFullTableName('site_content'), "id='{$documentID}'"); |
23 | 31 | $oldparent = $modx->db->getValue($rs); |
@@ -62,11 +70,11 @@ discard block |
||
62 | 70 | "old_parent" => $oldparent, |
63 | 71 | "new_parent" => $newParentID |
64 | 72 | )); |
65 | -if (is_array($evtOut) && count($evtOut) > 0){ |
|
73 | +if (is_array($evtOut) && count($evtOut) > 0) { |
|
66 | 74 | $newParent = array_pop($evtOut); |
67 | 75 | if($newParent == $oldparent) { |
68 | 76 | $modx->webAlertAndQuit($_lang["error_movedocument2"]); |
69 | - }else{ |
|
77 | + } else { |
|
70 | 78 | $newParentID = $newParent; |
71 | 79 | } |
72 | 80 | } |
@@ -1,15 +1,15 @@ 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 | -switch($modx->manager->action) { |
|
5 | +switch($modx->manager->action) { |
|
6 | 6 | case 107: |
7 | - if(!$modx->hasPermission('new_module')) { |
|
7 | + if(!$modx->hasPermission('new_module')) { |
|
8 | 8 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
9 | 9 | } |
10 | 10 | break; |
11 | 11 | case 108: |
12 | - if(!$modx->hasPermission('edit_module')) { |
|
12 | + if(!$modx->hasPermission('edit_module')) { |
|
13 | 13 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
14 | 14 | } |
15 | 15 | break; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | |
32 | 32 | |
33 | 33 | // check to see the module editor isn't locked |
34 | -if($lockedEl = $modx->elementIsLocked(6, $id)) { |
|
34 | +if($lockedEl = $modx->elementIsLocked(6, $id)) { |
|
35 | 35 | $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module'])); |
36 | 36 | } |
37 | 37 | // end check for lock |
@@ -39,22 +39,22 @@ discard block |
||
39 | 39 | // Lock snippet for other users to edit |
40 | 40 | $modx->lockElement(6, $id); |
41 | 41 | |
42 | -if(isset($_GET['id'])) { |
|
42 | +if(isset($_GET['id'])) { |
|
43 | 43 | $rs = $modx->db->select('*', $tbl_site_modules, "id='{$id}'"); |
44 | 44 | $content = $modx->db->getRow($rs); |
45 | - if(!$content) { |
|
45 | + if(!$content) { |
|
46 | 46 | $modx->webAlertAndQuit("Module not found for id '{$id}'."); |
47 | 47 | } |
48 | 48 | $content['properties'] = str_replace("&", "&", $content['properties']); |
49 | 49 | $_SESSION['itemname'] = $content['name']; |
50 | - if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) { |
|
50 | + if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) { |
|
51 | 51 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
52 | 52 | } |
53 | -} else { |
|
53 | +} else { |
|
54 | 54 | $_SESSION['itemname'] = $_lang["new_module"]; |
55 | 55 | $content['wrap'] = '1'; |
56 | 56 | } |
57 | -if($modx->manager->hasFormValues()) { |
|
57 | +if($modx->manager->hasFormValues()) { |
|
58 | 58 | $modx->manager->loadFormValues(); |
59 | 59 | } |
60 | 60 | |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | <?php |
429 | 429 | // invoke OnModFormPrerender event |
430 | 430 | $evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id)); |
431 | - if(is_array($evtOut)) { |
|
431 | + if(is_array($evtOut)) { |
|
432 | 432 | echo implode('', $evtOut); |
433 | 433 | } |
434 | 434 | |
@@ -491,7 +491,7 @@ discard block |
||
491 | 491 | <option> </option> |
492 | 492 | <?php |
493 | 493 | include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php'); |
494 | - foreach(getCategories() as $n => $v) { |
|
494 | + foreach(getCategories() as $n => $v) { |
|
495 | 495 | echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n"; |
496 | 496 | } |
497 | 497 | ?> |
@@ -643,7 +643,7 @@ discard block |
||
643 | 643 | $rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'"); |
644 | 644 | $groupsarray = $modx->db->getColumn('usergroup', $rs); |
645 | 645 | |
646 | - if($modx->hasPermission('access_permissions')) { |
|
646 | + if($modx->hasPermission('access_permissions')) { |
|
647 | 647 | ?> |
648 | 648 | <!-- User Group Access Permissions --> |
649 | 649 | <script type="text/javascript"> |
@@ -671,21 +671,21 @@ discard block |
||
671 | 671 | } |
672 | 672 | $chk = ''; |
673 | 673 | $rs = $modx->db->select('name, id', $tbl_membergroup_names, '', 'name'); |
674 | - while($row = $modx->db->getRow($rs)) { |
|
674 | + while($row = $modx->db->getRow($rs)) { |
|
675 | 675 | $groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array(); |
676 | 676 | $checked = in_array($row['id'], $groupsarray); |
677 | - if($modx->hasPermission('access_permissions')) { |
|
678 | - if($checked) { |
|
677 | + if($modx->hasPermission('access_permissions')) { |
|
678 | + if($checked) { |
|
679 | 679 | $notPublic = true; |
680 | 680 | } |
681 | 681 | $chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n"; |
682 | - } else { |
|
683 | - if($checked) { |
|
682 | + } else { |
|
683 | + if($checked) { |
|
684 | 684 | $chks = '<input type="hidden" name="usrgroups[]" value="' . $row['id'] . '" />' . "\n" . $chks; |
685 | 685 | } |
686 | 686 | } |
687 | 687 | } |
688 | - if($modx->hasPermission('access_permissions')) { |
|
688 | + if($modx->hasPermission('access_permissions')) { |
|
689 | 689 | $chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks; |
690 | 690 | } |
691 | 691 | echo $chks; |
@@ -707,7 +707,7 @@ discard block |
||
707 | 707 | <?php |
708 | 708 | // invoke OnModFormRender event |
709 | 709 | $evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id)); |
710 | - if(is_array($evtOut)) { |
|
710 | + if(is_array($evtOut)) { |
|
711 | 711 | echo implode('', $evtOut); |
712 | 712 | } |
713 | 713 | ?> |
@@ -1,8 +1,8 @@ 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 | -if (!$modx->hasPermission('logs')) { |
|
5 | +if (!$modx->hasPermission('logs')) { |
|
6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
7 | 7 | } |
8 | 8 | |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | <?php |
27 | 27 | // get all users currently in the log |
28 | 28 | $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username'); |
29 | - foreach ($logs_user as $row) { |
|
29 | + foreach ($logs_user as $row) { |
|
30 | 30 | $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : ''; |
31 | 31 | echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n"; |
32 | 32 | } |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | // get all available actions in the log |
44 | 44 | include_once "actionlist.inc.php"; |
45 | 45 | $logs_actions = record_sort(array_unique_multi($logs, 'action'), 'action'); |
46 | - foreach ($logs_actions as $row) { |
|
46 | + foreach ($logs_actions as $row) { |
|
47 | 47 | $action = getAction($row['action']); |
48 | - if ($action == 'Idle') { |
|
48 | + if ($action == 'Idle') { |
|
49 | 49 | continue; |
50 | 50 | } |
51 | 51 | $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : ''; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | <?php |
64 | 64 | // get all itemid currently in logging |
65 | 65 | $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid'); |
66 | - foreach ($logs_items as $row) { |
|
66 | + foreach ($logs_items as $row) { |
|
67 | 67 | $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : ''; |
68 | 68 | echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n"; |
69 | 69 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | <?php |
80 | 80 | // get all itemname currently in logging |
81 | 81 | $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname'); |
82 | - foreach ($logs_names as $row) { |
|
82 | + foreach ($logs_names as $row) { |
|
83 | 83 | $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : ''; |
84 | 84 | echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n"; |
85 | 85 | } |
@@ -135,36 +135,36 @@ discard block |
||
135 | 135 | <div class="container container-body"> |
136 | 136 | |
137 | 137 | <?php |
138 | -if (isset($_REQUEST['log_submit'])) { |
|
138 | +if (isset($_REQUEST['log_submit'])) { |
|
139 | 139 | // get the selections the user made. |
140 | 140 | $sqladd = array(); |
141 | - if ($_REQUEST['searchuser'] != 0) { |
|
141 | + if ($_REQUEST['searchuser'] != 0) { |
|
142 | 142 | $sqladd[] = "internalKey='" . (int)$_REQUEST['searchuser'] . "'"; |
143 | 143 | } |
144 | - if ($_REQUEST['action'] != 0) { |
|
144 | + if ($_REQUEST['action'] != 0) { |
|
145 | 145 | $sqladd[] = "action=" . (int)$_REQUEST['action']; |
146 | 146 | } |
147 | - if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") { |
|
147 | + if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") { |
|
148 | 148 | $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'"; |
149 | 149 | } |
150 | - if ($_REQUEST['itemname'] != '0') { |
|
150 | + if ($_REQUEST['itemname'] != '0') { |
|
151 | 151 | $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'"; |
152 | 152 | } |
153 | - if ($_REQUEST['message'] != "") { |
|
153 | + if ($_REQUEST['message'] != "") { |
|
154 | 154 | $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'"; |
155 | 155 | } |
156 | 156 | // date stuff |
157 | - if ($_REQUEST['datefrom'] != "") { |
|
157 | + if ($_REQUEST['datefrom'] != "") { |
|
158 | 158 | $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']); |
159 | 159 | } |
160 | - if ($_REQUEST['dateto'] != "") { |
|
160 | + if ($_REQUEST['dateto'] != "") { |
|
161 | 161 | $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']); |
162 | 162 | } |
163 | 163 | |
164 | 164 | // If current position is not set, set it to zero |
165 | - if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) { |
|
165 | + if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) { |
|
166 | 166 | $int_cur_position = 0; |
167 | - } else { |
|
167 | + } else { |
|
168 | 168 | $int_cur_position = $_REQUEST['int_cur_position']; |
169 | 169 | } |
170 | 170 | |
@@ -178,9 +178,9 @@ discard block |
||
178 | 178 | |
179 | 179 | $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}"); |
180 | 180 | |
181 | -if ($limit < 1) { |
|
181 | +if ($limit < 1) { |
|
182 | 182 | echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>'; |
183 | -} else { |
|
183 | +} else { |
|
184 | 184 | echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>'; |
185 | 185 | |
186 | 186 | // New instance of the Paging class, you can modify the color and the width of the html table |
@@ -198,14 +198,14 @@ discard block |
||
198 | 198 | $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " "); |
199 | 199 | $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " "); |
200 | 200 | $pagesfound = sizeof($array_row_paging); |
201 | - if ($pagesfound > 6) { |
|
201 | + if ($pagesfound > 6) { |
|
202 | 202 | $paging .= $array_row_paging[$current_row - 2]; // ." "; |
203 | 203 | $paging .= $array_row_paging[$current_row - 1]; // ." "; |
204 | 204 | $paging .= $array_row_paging[$current_row]; // ." "; |
205 | 205 | $paging .= $array_row_paging[$current_row + 1]; // ." "; |
206 | 206 | $paging .= $array_row_paging[$current_row + 2]; // ." "; |
207 | - } else { |
|
208 | - for ($i = 0; $i < $pagesfound; $i++) { |
|
207 | + } else { |
|
208 | + for ($i = 0; $i < $pagesfound; $i++) { |
|
209 | 209 | $paging .= $array_row_paging[$i] . " "; |
210 | 210 | } |
211 | 211 | } |
@@ -242,12 +242,12 @@ discard block |
||
242 | 242 | // grab the entire log file... |
243 | 243 | $logentries = array(); |
244 | 244 | $i = 0; |
245 | - while ($logentry = $modx->db->getRow($rs)) { |
|
246 | - if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) { |
|
245 | + while ($logentry = $modx->db->getRow($rs)) { |
|
246 | + if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) { |
|
247 | 247 | $item = '<div style="text-align:center;">-</div>'; |
248 | - } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) { |
|
248 | + } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) { |
|
249 | 249 | $item = '<a href="index.php?a=3&id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>'; |
250 | - } else { |
|
250 | + } else { |
|
251 | 251 | $item = $logentry['itemname']; |
252 | 252 | } |
253 | 253 | //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true' |
@@ -284,6 +284,6 @@ discard block |
||
284 | 284 | // @see index.php @ 915 |
285 | 285 | global $action; |
286 | 286 | $action = 1; |
287 | -} else { |
|
287 | +} else { |
|
288 | 288 | echo $_lang["mgrlog_noquery"]; |
289 | 289 | } |