evolution-cms /
evolution
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | -if(!function_exists('duplicateDocument')) { |
|
| 39 | +if (!function_exists('duplicateDocument')) { |
|
| 40 | 40 | /** |
| 41 | 41 | * @param int $docid |
| 42 | 42 | * @param null|int $parent |
@@ -90,12 +90,12 @@ discard block |
||
| 90 | 90 | $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('pagetitle', $modx->getFullTableName('site_content'), |
| 91 | 91 | "pagetitle LIKE '{$pagetitle} Duplicate%'")); |
| 92 | 92 | if ($count >= 1) { |
| 93 | - $count = ' ' . ($count + 1); |
|
| 93 | + $count = ' '.($count + 1); |
|
| 94 | 94 | } else { |
| 95 | 95 | $count = ''; |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - $content['pagetitle'] = $_lang['duplicated_el_suffix'] . $count . ' ' . $content['pagetitle']; |
|
| 98 | + $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle']; |
|
| 99 | 99 | $content['alias'] = null; |
| 100 | 100 | } elseif ($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) { |
| 101 | 101 | $content['alias'] = null; |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | -if(!function_exists('duplicateTVs')) { |
|
| 156 | +if (!function_exists('duplicateTVs')) { |
|
| 157 | 157 | /** |
| 158 | 158 | * Duplicate Document TVs |
| 159 | 159 | * |
@@ -166,8 +166,8 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | $tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues'); |
| 168 | 168 | |
| 169 | - $newid = (int)$newid; |
|
| 170 | - $oldid = (int)$oldid; |
|
| 169 | + $newid = (int) $newid; |
|
| 170 | + $oldid = (int) $oldid; |
|
| 171 | 171 | |
| 172 | 172 | $modx->getDatabase()->insert( |
| 173 | 173 | array('contentid' => '', 'tmplvarid' => '', 'value' => ''), $tbltvc, // Insert into |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | -if(!function_exists('duplicateAccess')) { |
|
| 179 | +if (!function_exists('duplicateAccess')) { |
|
| 180 | 180 | /** |
| 181 | 181 | * Duplicate Document Access Permissions |
| 182 | 182 | * |
@@ -189,8 +189,8 @@ discard block |
||
| 189 | 189 | |
| 190 | 190 | $tbldg = $modx->getFullTableName('document_groups'); |
| 191 | 191 | |
| 192 | - $newid = (int)$newid; |
|
| 193 | - $oldid = (int)$oldid; |
|
| 192 | + $newid = (int) $newid; |
|
| 193 | + $oldid = (int) $oldid; |
|
| 194 | 194 | |
| 195 | 195 | $modx->getDatabase()->insert( |
| 196 | 196 | array('document' => '', 'document_group' => ''), $tbldg, // Insert into |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | -if(!function_exists('evalModule')) { |
|
| 202 | +if (!function_exists('evalModule')) { |
|
| 203 | 203 | /** |
| 204 | 204 | * evalModule |
| 205 | 205 | * |
@@ -235,17 +235,17 @@ discard block |
||
| 235 | 235 | } |
| 236 | 236 | if ($modx->config['error_reporting'] === '99' || 2 < $error_level) { |
| 237 | 237 | $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], |
| 238 | - $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg); |
|
| 238 | + $_SESSION['itemname'].' - Module', $error_info['message'], $error_info['line'], $msg); |
|
| 239 | 239 | $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>"); |
| 240 | 240 | } |
| 241 | 241 | } |
| 242 | 242 | unset($modx->event->params); |
| 243 | 243 | |
| 244 | - return $mod . $msg; |
|
| 244 | + return $mod.$msg; |
|
| 245 | 245 | } |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | -if(!function_exists('allChildren')) { |
|
| 248 | +if (!function_exists('allChildren')) { |
|
| 249 | 249 | /** |
| 250 | 250 | * @param int $currDocID |
| 251 | 251 | * @return array |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | } |
| 266 | 266 | } |
| 267 | 267 | |
| 268 | -if(!function_exists('jsAlert')) { |
|
| 268 | +if (!function_exists('jsAlert')) { |
|
| 269 | 269 | /** |
| 270 | 270 | * show javascript alert |
| 271 | 271 | * |
@@ -275,14 +275,14 @@ discard block |
||
| 275 | 275 | { |
| 276 | 276 | $modx = evolutionCMS(); |
| 277 | 277 | if ($_POST['ajax'] != 1) { |
| 278 | - echo "<script>window.setTimeout(\"alert('" . addslashes($modx->getDatabase()->escape($msg)) . "')\",10);history.go(-1)</script>"; |
|
| 278 | + echo "<script>window.setTimeout(\"alert('".addslashes($modx->getDatabase()->escape($msg))."')\",10);history.go(-1)</script>"; |
|
| 279 | 279 | } else { |
| 280 | - echo $msg . "\n"; |
|
| 280 | + echo $msg."\n"; |
|
| 281 | 281 | } |
| 282 | 282 | } |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | -if(!function_exists('login')) { |
|
| 285 | +if (!function_exists('login')) { |
|
| 286 | 286 | /** |
| 287 | 287 | * @param string $username |
| 288 | 288 | * @param string $givenPassword |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | } |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | -if(!function_exists('loginV1')) { |
|
| 300 | +if (!function_exists('loginV1')) { |
|
| 301 | 301 | /** |
| 302 | 302 | * @param int $internalKey |
| 303 | 303 | * @param string $givenPassword |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | } |
| 331 | 331 | } |
| 332 | 332 | |
| 333 | -if(!function_exists('loginMD5')) { |
|
| 333 | +if (!function_exists('loginMD5')) { |
|
| 334 | 334 | /** |
| 335 | 335 | * @param int $internalKey |
| 336 | 336 | * @param string $givenPassword |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | } |
| 352 | 352 | } |
| 353 | 353 | |
| 354 | -if(!function_exists('updateNewHash')) { |
|
| 354 | +if (!function_exists('updateNewHash')) { |
|
| 355 | 355 | /** |
| 356 | 356 | * @param string $username |
| 357 | 357 | * @param string $password |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | } |
| 367 | 367 | } |
| 368 | 368 | |
| 369 | -if(!function_exists('incrementFailedLoginCount')) { |
|
| 369 | +if (!function_exists('incrementFailedLoginCount')) { |
|
| 370 | 370 | /** |
| 371 | 371 | * @param int $internalKey |
| 372 | 372 | * @param int $failedlogins |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | |
| 390 | 390 | if ($failedlogins < $failed_allowed) { |
| 391 | 391 | //sleep to help prevent brute force attacks |
| 392 | - $sleep = (int)$failedlogins / 2; |
|
| 392 | + $sleep = (int) $failedlogins / 2; |
|
| 393 | 393 | if ($sleep > 5) { |
| 394 | 394 | $sleep = 5; |
| 395 | 395 | } |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | } |
| 403 | 403 | } |
| 404 | 404 | |
| 405 | -if(!function_exists('saveUserGroupAccessPermissons')) { |
|
| 405 | +if (!function_exists('saveUserGroupAccessPermissons')) { |
|
| 406 | 406 | /** |
| 407 | 407 | * saves module user group access |
| 408 | 408 | */ |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | } |
| 434 | 434 | } |
| 435 | 435 | |
| 436 | -if(!function_exists('saveEventListeners')) { |
|
| 436 | +if (!function_exists('saveEventListeners')) { |
|
| 437 | 437 | # Save Plugin Event Listeners |
| 438 | 438 | function saveEventListeners($id, $sysevents, $mode) |
| 439 | 439 | { |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | } |
| 487 | 487 | } |
| 488 | 488 | |
| 489 | -if(!function_exists('getEventIdByName')) { |
|
| 489 | +if (!function_exists('getEventIdByName')) { |
|
| 490 | 490 | /** |
| 491 | 491 | * @param string $name |
| 492 | 492 | * @return string|int |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | } |
| 510 | 510 | } |
| 511 | 511 | |
| 512 | -if(!function_exists('saveTemplateAccess')) { |
|
| 512 | +if (!function_exists('saveTemplateAccess')) { |
|
| 513 | 513 | /** |
| 514 | 514 | * @param int $id |
| 515 | 515 | */ |
@@ -548,7 +548,7 @@ discard block |
||
| 548 | 548 | } |
| 549 | 549 | } |
| 550 | 550 | |
| 551 | -if(!function_exists('saveTemplateVarAccess')) { |
|
| 551 | +if (!function_exists('saveTemplateVarAccess')) { |
|
| 552 | 552 | /** |
| 553 | 553 | * @return void |
| 554 | 554 | */ |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | } |
| 588 | 588 | } |
| 589 | 589 | |
| 590 | -if(!function_exists('saveDocumentAccessPermissons')) { |
|
| 590 | +if (!function_exists('saveDocumentAccessPermissons')) { |
|
| 591 | 591 | function saveDocumentAccessPermissons() |
| 592 | 592 | { |
| 593 | 593 | global $id, $newid; |
@@ -756,10 +756,10 @@ discard block |
||
| 756 | 756 | } |
| 757 | 757 | |
| 758 | 758 | foreach ($defaults as $k) { |
| 759 | - if (isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') { |
|
| 759 | + if (isset($settings['default_'.$k]) && $settings['default_'.$k] == '1') { |
|
| 760 | 760 | unset($settings[$k]); |
| 761 | 761 | } |
| 762 | - unset($settings['default_' . $k]); |
|
| 762 | + unset($settings['default_'.$k]); |
|
| 763 | 763 | } |
| 764 | 764 | |
| 765 | 765 | $modx->getDatabase()->delete($tbl_user_settings, "user='{$id}'"); |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | global $id, $modx; |
| 792 | 792 | $mode = $_POST['mode']; |
| 793 | 793 | $modx->getManagerApi()->saveFormValues($mode); |
| 794 | - $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode === $action ? "&id={$id}" : '')); |
|
| 794 | + $modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode === $action ? "&id={$id}" : '')); |
|
| 795 | 795 | } |
| 796 | 796 | } |
| 797 | 797 | |
@@ -807,7 +807,7 @@ discard block |
||
| 807 | 807 | global $deltime; |
| 808 | 808 | |
| 809 | 809 | $rs = $modx->getDatabase()->select('id', $modx->getFullTableName('site_content'), |
| 810 | - "parent='" . (int)$parent . "' AND deleted=1 AND deletedon='" . (int)$deltime . "'"); |
|
| 810 | + "parent='".(int) $parent."' AND deleted=1 AND deletedon='".(int) $deltime."'"); |
|
| 811 | 811 | // the document has children documents, we'll need to delete those too |
| 812 | 812 | while ($row = $modx->getDatabase()->getRow($rs)) { |
| 813 | 813 | $children[] = $row['id']; |
@@ -380,10 +380,12 @@ |
||
| 380 | 380 | $failedlogins += 1; |
| 381 | 381 | |
| 382 | 382 | $fields = array('failedlogincount' => $failedlogins); |
| 383 | - if ($failedlogins >= $failed_allowed) //block user for too many fail attempts |
|
| 383 | + if ($failedlogins >= $failed_allowed) { |
|
| 384 | + //block user for too many fail attempts |
|
| 384 | 385 | { |
| 385 | 386 | $fields['blockeduntil'] = time() + ($blocked_minutes * 60); |
| 386 | 387 | } |
| 388 | + } |
|
| 387 | 389 | |
| 388 | 390 | $modx->getDatabase()->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'"); |
| 389 | 391 | |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if(!function_exists('makeHTML')) { |
|
| 3 | +if (!function_exists('makeHTML')) { |
|
| 4 | 4 | /** |
| 5 | 5 | * @param int $indent |
| 6 | 6 | * @param int $parent |
@@ -37,14 +37,14 @@ discard block |
||
| 37 | 37 | case 'publishedon': |
| 38 | 38 | case 'pub_date': |
| 39 | 39 | case 'unpub_date': |
| 40 | - $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'], |
|
| 41 | - 'sc.' . $_SESSION['tree_sortby']); |
|
| 40 | + $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.'.$_SESSION['tree_sortby'], |
|
| 41 | + 'sc.'.$_SESSION['tree_sortby']); |
|
| 42 | 42 | break; |
| 43 | 43 | default: |
| 44 | - $sortby = 'sc.' . $_SESSION['tree_sortby']; |
|
| 44 | + $sortby = 'sc.'.$_SESSION['tree_sortby']; |
|
| 45 | 45 | }; |
| 46 | 46 | |
| 47 | - $orderby = $modx->getDatabase()->escape($sortby . ' ' . $_SESSION['tree_sortdir']); |
|
| 47 | + $orderby = $modx->getDatabase()->escape($sortby.' '.$_SESSION['tree_sortdir']); |
|
| 48 | 48 | |
| 49 | 49 | // Folder sorting gets special setup ;) Add menuindex and pagetitle |
| 50 | 50 | if ($_SESSION['tree_sortby'] == 'isfolder') { |
@@ -59,11 +59,11 @@ discard block |
||
| 59 | 59 | $_SESSION['mgrDocgroups']) : ''; |
| 60 | 60 | $showProtected = false; |
| 61 | 61 | if (isset ($modx->config['tree_show_protected'])) { |
| 62 | - $showProtected = (boolean)$modx->config['tree_show_protected']; |
|
| 62 | + $showProtected = (boolean) $modx->config['tree_show_protected']; |
|
| 63 | 63 | } |
| 64 | - $mgrRole = (isset ($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0'; |
|
| 64 | + $mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0'; |
|
| 65 | 65 | if ($showProtected == false) { |
| 66 | - $access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))"); |
|
| 66 | + $access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))"); |
|
| 67 | 67 | } else { |
| 68 | 68 | $access = ''; |
| 69 | 69 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | $weblinkDisplay = $row['type'] == 'reference' ? sprintf(' %s', $_style['tree_linkgo']) : ''; |
| 103 | - $pageIdDisplay = '<small>(' . ($modx_textdir ? '‏' : '') . $row['id'] . ')</small>'; |
|
| 103 | + $pageIdDisplay = '<small>('.($modx_textdir ? '‏' : '').$row['id'].')</small>'; |
|
| 104 | 104 | |
| 105 | 105 | // Prepare displaying user-locks |
| 106 | 106 | $lockedByUser = ''; |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | 'element_type' => $_lang["lock_element_type_7"], |
| 112 | 112 | 'lasthit_df' => $rowLock['lasthit_df'] |
| 113 | 113 | )); |
| 114 | - $lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>'; |
|
| 114 | + $lockedByUser = '<span title="'.$title.'" class="editResource">'.$_style['tree_preview_resource'].'</span>'; |
|
| 115 | 115 | } else { |
| 116 | 116 | $title = $modx->parseText($_lang["lock_element_locked_by"], array( |
| 117 | 117 | 'element_type' => $_lang["lock_element_type_7"], |
@@ -119,9 +119,9 @@ discard block |
||
| 119 | 119 | 'lasthit_df' => $rowLock['lasthit_df'] |
| 120 | 120 | )); |
| 121 | 121 | if ($modx->hasPermission('remove_locks')) { |
| 122 | - $lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>'; |
|
| 122 | + $lockedByUser = '<span onclick="modx.tree.unlockElement(7, '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>'; |
|
| 123 | 123 | } else { |
| 124 | - $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>'; |
|
| 124 | + $lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>'; |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | } |
@@ -130,22 +130,22 @@ discard block |
||
| 130 | 130 | |
| 131 | 131 | $title = ''; |
| 132 | 132 | if (isDateNode($nodeNameSource)) { |
| 133 | - $title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]'; |
|
| 133 | + $title = $_lang['pagetitle'].': '.$row['pagetitle'].'[+lf+]'; |
|
| 134 | 134 | } |
| 135 | - $title .= $_lang['id'] . ': ' . $row['id']; |
|
| 136 | - $title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle']; |
|
| 137 | - $title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex']; |
|
| 138 | - $title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-'); |
|
| 139 | - $title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename']; |
|
| 140 | - $title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']); |
|
| 141 | - $title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']); |
|
| 142 | - $title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']); |
|
| 143 | - $title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']); |
|
| 144 | - $title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 145 | - $title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 146 | - $title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 135 | + $title .= $_lang['id'].': '.$row['id']; |
|
| 136 | + $title .= '[+lf+]'.$_lang['resource_opt_menu_title'].': '.$row['menutitle']; |
|
| 137 | + $title .= '[+lf+]'.$_lang['resource_opt_menu_index'].': '.$row['menuindex']; |
|
| 138 | + $title .= '[+lf+]'.$_lang['alias'].': '.(!empty($row['alias']) ? $row['alias'] : '-'); |
|
| 139 | + $title .= '[+lf+]'.$_lang['template'].': '.$row['templatename']; |
|
| 140 | + $title .= '[+lf+]'.$_lang['publish_date'].': '.$modx->toDateFormat($row['pub_date']); |
|
| 141 | + $title .= '[+lf+]'.$_lang['unpublish_date'].': '.$modx->toDateFormat($row['unpub_date']); |
|
| 142 | + $title .= '[+lf+]'.$_lang['page_data_web_access'].': '.($row['privateweb'] ? $_lang['private'] : $_lang['public']); |
|
| 143 | + $title .= '[+lf+]'.$_lang['page_data_mgr_access'].': '.($row['privatemgr'] ? $_lang['private'] : $_lang['public']); |
|
| 144 | + $title .= '[+lf+]'.$_lang['resource_opt_richtext'].': '.($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 145 | + $title .= '[+lf+]'.$_lang['page_data_searchable'].': '.($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 146 | + $title .= '[+lf+]'.$_lang['page_data_cacheable'].': '.($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 147 | 147 | $title = $modx->getPhpCompat()->htmlspecialchars($title); |
| 148 | - $title = str_replace('[+lf+]', ' ', $title); // replace line-breaks with empty space as fall-back |
|
| 148 | + $title = str_replace('[+lf+]', ' ', $title); // replace line-breaks with empty space as fall-back |
|
| 149 | 149 | |
| 150 | 150 | $data = array( |
| 151 | 151 | 'id' => $row['id'], |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | if ($ph['contextmenu']) { |
| 232 | - $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"'; |
|
| 232 | + $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"'; |
|
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | if ($_SESSION['tree_show_only_folders']) { |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | if ($ph['contextmenu']) { |
| 290 | - $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"'; |
|
| 290 | + $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"'; |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | $node .= $modx->parseText($tpl, $ph); |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | if ($ph['contextmenu']) { |
| 328 | - $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"'; |
|
| 328 | + $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"'; |
|
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | $node .= $modx->parseText($tpl, $ph); |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | if ($ph['contextmenu']) { |
| 379 | - $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"'; |
|
| 379 | + $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"'; |
|
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | $node .= $modx->parseText($tpl, $ph); |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | if ($ph['contextmenu']) { |
| 421 | - $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"'; |
|
| 421 | + $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"'; |
|
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | $node .= $modx->parseText($tpl, $ph); |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | } |
| 445 | 445 | } |
| 446 | 446 | |
| 447 | -if(!function_exists('getIconInfo')) { |
|
| 447 | +if (!function_exists('getIconInfo')) { |
|
| 448 | 448 | /** |
| 449 | 449 | * @param array $_style |
| 450 | 450 | * @return array |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | } |
| 479 | 479 | } |
| 480 | 480 | |
| 481 | -if(!function_exists('getNodeTitle')) { |
|
| 481 | +if (!function_exists('getNodeTitle')) { |
|
| 482 | 482 | /** |
| 483 | 483 | * @param string $nodeNameSource |
| 484 | 484 | * @param array $row |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | $nodetitle .= $modx->config['friendly_url_suffix']; |
| 500 | 500 | } |
| 501 | 501 | } |
| 502 | - $nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle; |
|
| 502 | + $nodetitle = $modx->config['friendly_url_prefix'].$nodetitle; |
|
| 503 | 503 | break; |
| 504 | 504 | case 'pagetitle': |
| 505 | 505 | $nodetitle = $row['pagetitle']; |
@@ -533,7 +533,7 @@ discard block |
||
| 533 | 533 | } |
| 534 | 534 | } |
| 535 | 535 | |
| 536 | -if(!function_exists('isDateNode')) { |
|
| 536 | +if (!function_exists('isDateNode')) { |
|
| 537 | 537 | /** |
| 538 | 538 | * @param string $nodeNameSource |
| 539 | 539 | * @return bool |
@@ -553,7 +553,7 @@ discard block |
||
| 553 | 553 | } |
| 554 | 554 | } |
| 555 | 555 | |
| 556 | -if(!function_exists('checkIsFolder')) { |
|
| 556 | +if (!function_exists('checkIsFolder')) { |
|
| 557 | 557 | /** |
| 558 | 558 | * @param int $parent |
| 559 | 559 | * @param int $isfolder |
@@ -563,11 +563,11 @@ discard block |
||
| 563 | 563 | { |
| 564 | 564 | $modx = evolutionCMS(); |
| 565 | 565 | |
| 566 | - return (int)$modx->getDatabase()->getValue($modx->getDatabase()->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' ')); |
|
| 566 | + return (int) $modx->getDatabase()->getValue($modx->getDatabase()->query('SELECT count(*) FROM '.$modx->getFullTableName('site_content').' WHERE parent='.$parent.' AND isfolder='.$isfolder.' ')); |
|
| 567 | 567 | } |
| 568 | 568 | } |
| 569 | 569 | |
| 570 | -if(!function_exists('_htmlentities')) { |
|
| 570 | +if (!function_exists('_htmlentities')) { |
|
| 571 | 571 | /** |
| 572 | 572 | * @param mixed $array |
| 573 | 573 | * @return string |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | } |
| 584 | 584 | } |
| 585 | 585 | |
| 586 | -if(!function_exists('getTplSingleNode')) { |
|
| 586 | +if (!function_exists('getTplSingleNode')) { |
|
| 587 | 587 | /** |
| 588 | 588 | * @return string |
| 589 | 589 | */ |
@@ -613,7 +613,7 @@ discard block |
||
| 613 | 613 | } |
| 614 | 614 | } |
| 615 | 615 | |
| 616 | -if(!function_exists('getTplFolderNode')) { |
|
| 616 | +if (!function_exists('getTplFolderNode')) { |
|
| 617 | 617 | /** |
| 618 | 618 | * @return string |
| 619 | 619 | */ |
@@ -654,7 +654,7 @@ discard block |
||
| 654 | 654 | title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>'; |
| 655 | 655 | } |
| 656 | 656 | } |
| 657 | -if(!function_exists('getTplFolderNodeNotChildren')) { |
|
| 657 | +if (!function_exists('getTplFolderNodeNotChildren')) { |
|
| 658 | 658 | /** |
| 659 | 659 | * @return string |
| 660 | 660 | */ |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * @see https://github.com/theseer/Autoload |
| 4 | 4 | */ |
| 5 | 5 | spl_autoload_register( |
| 6 | - function($class) { |
|
| 6 | + function($class){ |
|
| 7 | 7 | static $classes = null; |
| 8 | 8 | if ($classes === null) { |
| 9 | 9 | $classes = array( |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | } |
| 67 | 67 | $cn = strtolower($class); |
| 68 | 68 | if (isset($classes[$cn])) { |
| 69 | - require __DIR__ . $classes[$cn]; |
|
| 69 | + require __DIR__.$classes[$cn]; |
|
| 70 | 70 | } |
| 71 | 71 | }, |
| 72 | 72 | true, |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | * @see https://github.com/theseer/Autoload |
| 4 | 4 | */ |
| 5 | 5 | spl_autoload_register( |
| 6 | - function($class) { |
|
| 6 | + function($class){ |
|
| 7 | 7 | static $classes = null; |
| 8 | 8 | if ($classes === null) { |
| 9 | 9 | $classes = array( |
@@ -4,15 +4,15 @@ |
||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getFullTableName('user_messages'), |
| 7 | - "recipient=" . $modx->getLoginUserID() . " AND messageread=0"); |
|
| 7 | + "recipient=".$modx->getLoginUserID()." AND messageread=0"); |
|
| 8 | 8 | $nrnewmessages = $modx->getDatabase()->getValue($rs); |
| 9 | -$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID()); |
|
| 9 | +$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()); |
|
| 10 | 10 | $nrtotalmessages = $modx->getDatabase()->getValue($rs); |
| 11 | 11 | $messagesallowed = $modx->hasPermission('messages'); |
| 12 | 12 | |
| 13 | 13 | // ajax response |
| 14 | 14 | if (isset($_POST['updateMsgCount'])) { |
| 15 | 15 | header("Content-Type: application/json; charset=utf-8"); |
| 16 | - print $nrnewmessages . ',' . $nrtotalmessages; |
|
| 16 | + print $nrnewmessages.','.$nrtotalmessages; |
|
| 17 | 17 | exit; |
| 18 | 18 | } |
@@ -7,11 +7,11 @@ discard block |
||
| 7 | 7 | |
| 8 | 8 | $modx->getDatabase()->connect(); |
| 9 | 9 | |
| 10 | -if (empty ($modx->config)) {
|
|
| 10 | +if (empty ($modx->config)) { |
|
| 11 | 11 | $modx->getSettings(); |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | -if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {
|
|
| 14 | +if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) { |
|
| 15 | 15 | $modx->sendErrorPage(); |
| 16 | 16 | } |
| 17 | 17 | |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | $_lang = array(); |
| 22 | 22 | include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php'; |
| 23 | -if ($modx->config['manager_language'] != 'english') {
|
|
| 23 | +if ($modx->config['manager_language'] != 'english') { |
|
| 24 | 24 | include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php'; |
| 25 | 25 | } |
| 26 | 26 | include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php'; |
@@ -33,12 +33,12 @@ discard block |
||
| 33 | 33 | // set limit sql query |
| 34 | 34 | $limit = !empty($modx->config['number_of_results']) ? (int) $modx->config['number_of_results'] : 100; |
| 35 | 35 | |
| 36 | -if (isset($action)) {
|
|
| 37 | - switch ($action) {
|
|
| 36 | +if (isset($action)) { |
|
| 37 | + switch ($action) { |
|
| 38 | 38 | |
| 39 | 39 | case '1': {
|
| 40 | 40 | |
| 41 | - switch ($frame) {
|
|
| 41 | + switch ($frame) { |
|
| 42 | 42 | case 'nodes': |
| 43 | 43 | include_once MODX_MANAGER_PATH . '/frames/nodes.php'; |
| 44 | 44 | |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | $elements = isset($_REQUEST['elements']) && is_scalar($_REQUEST['elements']) ? htmlentities($_REQUEST['elements']) : ''; |
| 54 | 54 | |
| 55 | - if ($elements) {
|
|
| 55 | + if ($elements) { |
|
| 56 | 56 | $output = ''; |
| 57 | 57 | $items = ''; |
| 58 | 58 | $sql = ''; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
| 62 | 62 | $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
| 63 | 63 | |
| 64 | - switch ($elements) {
|
|
| 64 | + switch ($elements) { |
|
| 65 | 65 | case 'element_templates': |
| 66 | 66 | $a = 16; |
| 67 | 67 | $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | ORDER BY t1.templatename ASC |
| 72 | 72 | ' . $sqlLimit); |
| 73 | 73 | |
| 74 | - if ($modx->hasPermission('new_template')) {
|
|
| 74 | + if ($modx->hasPermission('new_template')) { |
|
| 75 | 75 | $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>'; |
| 76 | 76 | } |
| 77 | 77 | |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | ORDER BY t1.name ASC |
| 88 | 88 | ' . $sqlLimit); |
| 89 | 89 | |
| 90 | - if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
|
|
| 90 | + if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) { |
|
| 91 | 91 | $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>'; |
| 92 | 92 | } |
| 93 | 93 | |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | ORDER BY t1.name ASC |
| 102 | 102 | ' . $sqlLimit); |
| 103 | 103 | |
| 104 | - if ($modx->hasPermission('new_chunk')) {
|
|
| 104 | + if ($modx->hasPermission('new_chunk')) { |
|
| 105 | 105 | $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>'; |
| 106 | 106 | } |
| 107 | 107 | |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | ORDER BY t1.name ASC |
| 116 | 116 | ' . $sqlLimit); |
| 117 | 117 | |
| 118 | - if ($modx->hasPermission('new_snippet')) {
|
|
| 118 | + if ($modx->hasPermission('new_snippet')) { |
|
| 119 | 119 | $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>'; |
| 120 | 120 | } |
| 121 | 121 | |
@@ -129,19 +129,19 @@ discard block |
||
| 129 | 129 | ORDER BY t1.name ASC |
| 130 | 130 | ' . $sqlLimit); |
| 131 | 131 | |
| 132 | - if ($modx->hasPermission('new_plugin')) {
|
|
| 132 | + if ($modx->hasPermission('new_plugin')) { |
|
| 133 | 133 | $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>'; |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | break; |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - if ($count = $modx->getDatabase()->getRecordCount($sql)) {
|
|
| 140 | - if ($count == $limit) {
|
|
| 139 | + if ($count = $modx->getDatabase()->getRecordCount($sql)) { |
|
| 140 | + if ($count == $limit) { |
|
| 141 | 141 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
| 142 | 142 | } |
| 143 | - while ($row = $modx->getDatabase()->getRow($sql)) {
|
|
| 144 | - if (($row['disabled'] || $row['locked']) && $role != 1) {
|
|
| 143 | + while ($row = $modx->getDatabase()->getRow($sql)) { |
|
| 144 | + if (($row['disabled'] || $row['locked']) && $role != 1) { |
|
| 145 | 145 | continue; |
| 146 | 146 | } |
| 147 | 147 | |
@@ -149,9 +149,9 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - if (isset($_REQUEST['filter'])) {
|
|
| 152 | + if (isset($_REQUEST['filter'])) { |
|
| 153 | 153 | $output = $items; |
| 154 | - } else {
|
|
| 154 | + } else { |
|
| 155 | 155 | $output .= $items; |
| 156 | 156 | } |
| 157 | 157 | |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
| 170 | 170 | $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
| 171 | 171 | |
| 172 | - if(!$modx->hasPermission('save_role')) {
|
|
| 172 | + if(!$modx->hasPermission('save_role')) { |
|
| 173 | 173 | $sqlLike .= $sqlLike ? ' AND ' : 'WHERE '; |
| 174 | 174 | $sqlLike .= 't2.role != 1'; |
| 175 | 175 | } |
@@ -181,22 +181,22 @@ discard block |
||
| 181 | 181 | ORDER BY t1.username ASC |
| 182 | 182 | ' . $sqlLimit); |
| 183 | 183 | |
| 184 | - if ($modx->hasPermission('new_user')) {
|
|
| 184 | + if ($modx->hasPermission('new_user')) { |
|
| 185 | 185 | $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>'; |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - if ($count = $modx->getDatabase()->getRecordCount($sql)) {
|
|
| 189 | - if ($count == $limit) {
|
|
| 188 | + if ($count = $modx->getDatabase()->getRecordCount($sql)) { |
|
| 189 | + if ($count == $limit) { |
|
| 190 | 190 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
| 191 | 191 | } |
| 192 | - while ($row = $modx->getDatabase()->getRow($sql)) {
|
|
| 192 | + while ($row = $modx->getDatabase()->getRow($sql)) { |
|
| 193 | 193 | $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
|
| 194 | 194 | } |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | - if (isset($_REQUEST['filter'])) {
|
|
| 197 | + if (isset($_REQUEST['filter'])) { |
|
| 198 | 198 | $output = $items; |
| 199 | - } else {
|
|
| 199 | + } else { |
|
| 200 | 200 | $output .= $items; |
| 201 | 201 | } |
| 202 | 202 | |
@@ -220,22 +220,22 @@ discard block |
||
| 220 | 220 | ORDER BY t1.username ASC |
| 221 | 221 | ' . $sqlLimit); |
| 222 | 222 | |
| 223 | - if ($modx->hasPermission('new_web_user')) {
|
|
| 223 | + if ($modx->hasPermission('new_web_user')) { |
|
| 224 | 224 | $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>'; |
| 225 | 225 | } |
| 226 | 226 | |
| 227 | - if ($count = $modx->getDatabase()->getRecordCount($sql)) {
|
|
| 228 | - if ($count == $limit) {
|
|
| 227 | + if ($count = $modx->getDatabase()->getRecordCount($sql)) { |
|
| 228 | + if ($count == $limit) { |
|
| 229 | 229 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
| 230 | 230 | } |
| 231 | - while ($row = $modx->getDatabase()->getRow($sql)) {
|
|
| 231 | + while ($row = $modx->getDatabase()->getRow($sql)) { |
|
| 232 | 232 | $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
|
| 233 | 233 | } |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | - if (isset($_REQUEST['filter'])) {
|
|
| 236 | + if (isset($_REQUEST['filter'])) { |
|
| 237 | 237 | $output = $items; |
| 238 | - } else {
|
|
| 238 | + } else { |
|
| 239 | 239 | $output .= $items; |
| 240 | 240 | } |
| 241 | 241 | |
@@ -249,8 +249,8 @@ discard block |
||
| 249 | 249 | $type = isset($_REQUEST['type']) && is_scalar($_REQUEST['type']) ? $modx->getDatabase()->escape($_REQUEST['type']) : false; |
| 250 | 250 | $contextmenu = ''; |
| 251 | 251 | |
| 252 | - if ($role && $name && $type) {
|
|
| 253 | - switch ($type) {
|
|
| 252 | + if ($role && $name && $type) { |
|
| 253 | + switch ($type) { |
|
| 254 | 254 | case 'Snippet': |
| 255 | 255 | case 'SnippetNoCache': {
|
| 256 | 256 | |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | WHERE name="' . $name . '" |
| 260 | 260 | LIMIT 1'); |
| 261 | 261 | |
| 262 | - if ($modx->getDatabase()->getRecordCount($sql)) {
|
|
| 262 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
| 263 | 263 | $row = $modx->getDatabase()->getRow($sql); |
| 264 | 264 | $contextmenu = array( |
| 265 | 265 | 'header' => array( |
@@ -270,13 +270,13 @@ discard block |
||
| 270 | 270 | 'url' => "index.php?a=22&id=" . $row['id'] |
| 271 | 271 | ) |
| 272 | 272 | ); |
| 273 | - if (!empty($row['description'])) {
|
|
| 273 | + if (!empty($row['description'])) { |
|
| 274 | 274 | $contextmenu['seperator'] = ''; |
| 275 | 275 | $contextmenu['description'] = array( |
| 276 | 276 | 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
| 277 | 277 | ); |
| 278 | 278 | } |
| 279 | - } else {
|
|
| 279 | + } else { |
|
| 280 | 280 | $contextmenu = array( |
| 281 | 281 | 'header' => array( |
| 282 | 282 | 'innerHTML' => '<i class="fa fa-code"></i> ' . $name |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | WHERE name="' . $name . '" |
| 298 | 298 | LIMIT 1'); |
| 299 | 299 | |
| 300 | - if ($modx->getDatabase()->getRecordCount($sql)) {
|
|
| 300 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
| 301 | 301 | $row = $modx->getDatabase()->getRow($sql); |
| 302 | 302 | $contextmenu = array( |
| 303 | 303 | 'header' => array( |
@@ -308,13 +308,13 @@ discard block |
||
| 308 | 308 | 'url' => "index.php?a=78&id=" . $row['id'] |
| 309 | 309 | ) |
| 310 | 310 | ); |
| 311 | - if (!empty($row['description'])) {
|
|
| 311 | + if (!empty($row['description'])) { |
|
| 312 | 312 | $contextmenu['seperator'] = ''; |
| 313 | 313 | $contextmenu['description'] = array( |
| 314 | 314 | 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
| 315 | 315 | ); |
| 316 | 316 | } |
| 317 | - } else {
|
|
| 317 | + } else { |
|
| 318 | 318 | $contextmenu = array( |
| 319 | 319 | 'header' => array( |
| 320 | 320 | 'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | WHERE name="' . $name . '" |
| 335 | 335 | LIMIT 1'); |
| 336 | 336 | |
| 337 | - if ($modx->getDatabase()->getRecordCount($sql)) {
|
|
| 337 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
| 338 | 338 | $row = $modx->getDatabase()->getRow($sql); |
| 339 | 339 | $contextmenu = array( |
| 340 | 340 | 'header' => array( |
@@ -345,20 +345,20 @@ discard block |
||
| 345 | 345 | 'url' => "index.php?a=78&id=" . $row['id'] |
| 346 | 346 | ) |
| 347 | 347 | ); |
| 348 | - if (!empty($row['description'])) {
|
|
| 348 | + if (!empty($row['description'])) { |
|
| 349 | 349 | $contextmenu['seperator'] = ''; |
| 350 | 350 | $contextmenu['description'] = array( |
| 351 | 351 | 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
| 352 | 352 | ); |
| 353 | 353 | } |
| 354 | - } else {
|
|
| 354 | + } else { |
|
| 355 | 355 | |
| 356 | 356 | $sql = $modx->getDatabase()->query('SELECT *
|
| 357 | 357 | FROM ' . $modx->getFullTableName('site_snippets') . '
|
| 358 | 358 | WHERE name="' . $name . '" |
| 359 | 359 | LIMIT 1'); |
| 360 | 360 | |
| 361 | - if ($modx->getDatabase()->getRecordCount($sql)) {
|
|
| 361 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
| 362 | 362 | $row = $modx->getDatabase()->getRow($sql); |
| 363 | 363 | $contextmenu = array( |
| 364 | 364 | 'header' => array( |
@@ -369,13 +369,13 @@ discard block |
||
| 369 | 369 | 'url' => "index.php?a=22&id=" . $row['id'] |
| 370 | 370 | ) |
| 371 | 371 | ); |
| 372 | - if (!empty($row['description'])) {
|
|
| 372 | + if (!empty($row['description'])) { |
|
| 373 | 373 | $contextmenu['seperator'] = ''; |
| 374 | 374 | $contextmenu['description'] = array( |
| 375 | 375 | 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
| 376 | 376 | ); |
| 377 | 377 | } |
| 378 | - } else {
|
|
| 378 | + } else { |
|
| 379 | 379 | $contextmenu = array( |
| 380 | 380 | 'header' => array( |
| 381 | 381 | 'innerHTML' => '<i class="fa fa-code"></i> ' . $name |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | 'alias_visible' |
| 438 | 438 | ); |
| 439 | 439 | |
| 440 | - if (in_array($name, $default_field)) {
|
|
| 440 | + if (in_array($name, $default_field)) { |
|
| 441 | 441 | return; |
| 442 | 442 | } |
| 443 | 443 | |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | WHERE name="' . $name . '" |
| 447 | 447 | LIMIT 1'); |
| 448 | 448 | |
| 449 | - if ($modx->getDatabase()->getRecordCount($sql)) {
|
|
| 449 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
| 450 | 450 | $row = $modx->getDatabase()->getRow($sql); |
| 451 | 451 | $contextmenu = array( |
| 452 | 452 | 'header' => array( |
@@ -457,13 +457,13 @@ discard block |
||
| 457 | 457 | 'url' => "index.php?a=301&id=" . $row['id'] |
| 458 | 458 | ) |
| 459 | 459 | ); |
| 460 | - if (!empty($row['description'])) {
|
|
| 460 | + if (!empty($row['description'])) { |
|
| 461 | 461 | $contextmenu['seperator'] = ''; |
| 462 | 462 | $contextmenu['description'] = array( |
| 463 | 463 | 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
| 464 | 464 | ); |
| 465 | 465 | } |
| 466 | - } else {
|
|
| 466 | + } else { |
|
| 467 | 467 | $contextmenu = array( |
| 468 | 468 | 'header' => array( |
| 469 | 469 | 'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name |
@@ -488,13 +488,13 @@ discard block |
||
| 488 | 488 | case 'movedocument' : {
|
| 489 | 489 | $json = array(); |
| 490 | 490 | |
| 491 | - if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
|
|
| 491 | + if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) { |
|
| 492 | 492 | $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : ''; |
| 493 | 493 | $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0; |
| 494 | 494 | $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0; |
| 495 | 495 | |
| 496 | 496 | // set parent |
| 497 | - if ($id && $parent >= 0) {
|
|
| 497 | + if ($id && $parent >= 0) { |
|
| 498 | 498 | |
| 499 | 499 | // find older parent |
| 500 | 500 | $parentOld = $modx->getDatabase()->getValue($modx->getDatabase()->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));
|
@@ -505,31 +505,31 @@ discard block |
||
| 505 | 505 | 'new_parent' => $parent, |
| 506 | 506 | ]); |
| 507 | 507 | |
| 508 | - if (is_array($eventOut) && count($eventOut) > 0) {
|
|
| 508 | + if (is_array($eventOut) && count($eventOut) > 0) { |
|
| 509 | 509 | $eventParent = array_pop($eventOut); |
| 510 | 510 | |
| 511 | - if ($eventParent == $parentOld) {
|
|
| 511 | + if ($eventParent == $parentOld) { |
|
| 512 | 512 | $json['errors'] = $_lang['error_movedocument2']; |
| 513 | - } else {
|
|
| 513 | + } else { |
|
| 514 | 514 | $parent = $eventParent; |
| 515 | 515 | } |
| 516 | 516 | } |
| 517 | 517 | |
| 518 | - if (empty($json['errors'])) {
|
|
| 518 | + if (empty($json['errors'])) { |
|
| 519 | 519 | // check privileges user for move docs |
| 520 | - if (!empty($modx->config['tree_show_protected']) && $role != 1) {
|
|
| 520 | + if (!empty($modx->config['tree_show_protected']) && $role != 1) { |
|
| 521 | 521 | $sql = $modx->getDatabase()->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');
|
| 522 | - if ($modx->getDatabase()->getRecordCount($sql)) {
|
|
| 522 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
| 523 | 523 | $document_groups = array(); |
| 524 | - while ($row = $modx->getDatabase()->getRow($sql)) {
|
|
| 524 | + while ($row = $modx->getDatabase()->getRow($sql)) { |
|
| 525 | 525 | $document_groups[$row['document']]['groups'][] = $row['document_group']; |
| 526 | 526 | } |
| 527 | - foreach ($document_groups as $key => $value) {
|
|
| 528 | - if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {
|
|
| 527 | + foreach ($document_groups as $key => $value) { |
|
| 528 | + if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) { |
|
| 529 | 529 | $json['errors'] = $_lang["error_no_privileges"]; |
| 530 | 530 | } |
| 531 | 531 | } |
| 532 | - if ($json['errors']) {
|
|
| 532 | + if ($json['errors']) { |
|
| 533 | 533 | header('content-type: application/json');
|
| 534 | 534 | echo json_encode($json, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE); |
| 535 | 535 | break; |
@@ -537,9 +537,9 @@ discard block |
||
| 537 | 537 | } |
| 538 | 538 | } |
| 539 | 539 | |
| 540 | - if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {
|
|
| 540 | + if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) { |
|
| 541 | 541 | $json['errors'] = $_lang["error_no_privileges"]; |
| 542 | - } else {
|
|
| 542 | + } else { |
|
| 543 | 543 | // set new parent |
| 544 | 544 | $modx->getDatabase()->update(array( |
| 545 | 545 | 'parent' => $parent |
@@ -549,13 +549,13 @@ discard block |
||
| 549 | 549 | 'isfolder' => 1 |
| 550 | 550 | ), $modx->getFullTableName('site_content'), 'id=' . $parent);
|
| 551 | 551 | |
| 552 | - if ($parent != $parentOld) {
|
|
| 552 | + if ($parent != $parentOld) { |
|
| 553 | 553 | // check children docs and set parent isfolder |
| 554 | - if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
|
|
| 554 | + if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) { |
|
| 555 | 555 | $modx->getDatabase()->update(array( |
| 556 | 556 | 'isfolder' => 1 |
| 557 | 557 | ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
|
| 558 | - } else {
|
|
| 558 | + } else { |
|
| 559 | 559 | $modx->getDatabase()->update(array( |
| 560 | 560 | 'isfolder' => 0 |
| 561 | 561 | ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
|
@@ -563,16 +563,16 @@ discard block |
||
| 563 | 563 | } |
| 564 | 564 | |
| 565 | 565 | // set menuindex |
| 566 | - if (!empty($menuindex)) {
|
|
| 566 | + if (!empty($menuindex)) { |
|
| 567 | 567 | $menuindex = explode(',', $menuindex);
|
| 568 | - foreach ($menuindex as $key => $value) {
|
|
| 568 | + foreach ($menuindex as $key => $value) { |
|
| 569 | 569 | $modx->getDatabase()->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);
|
| 570 | 570 | } |
| 571 | - } else {
|
|
| 571 | + } else { |
|
| 572 | 572 | // TODO: max(*) menuindex |
| 573 | 573 | } |
| 574 | 574 | |
| 575 | - if (!$json['errors']) {
|
|
| 575 | + if (!$json['errors']) { |
|
| 576 | 576 | $json['success'] = $_lang["actioncomplete"]; |
| 577 | 577 | |
| 578 | 578 | $modx->invokeEvent('onAfterMoveDocument', [
|
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | } |
| 585 | 585 | } |
| 586 | 586 | } |
| 587 | - } else {
|
|
| 587 | + } else { |
|
| 588 | 588 | $json['errors'] = $_lang["error_no_privileges"]; |
| 589 | 589 | } |
| 590 | 590 | |
@@ -600,7 +600,7 @@ discard block |
||
| 600 | 600 | |
| 601 | 601 | $output = !!$modx->elementIsLocked($type, $id, true); |
| 602 | 602 | |
| 603 | - if (!$output) {
|
|
| 603 | + if (!$output) { |
|
| 604 | 604 | $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
|
| 605 | 605 | $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';
|
| 606 | 606 | $sql = ' |
@@ -609,7 +609,7 @@ discard block |
||
| 609 | 609 | LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id
|
| 610 | 610 | WHERE sc.id=' . $id . ' GROUP BY sc.id'; |
| 611 | 611 | $sql = $modx->getDatabase()->query($sql); |
| 612 | - if ($modx->getDatabase()->getRecordCount($sql)) {
|
|
| 612 | + if ($modx->getDatabase()->getRecordCount($sql)) { |
|
| 613 | 613 | $row = $modx->getDatabase()->getRow($sql); |
| 614 | 614 | $output = !!$row['locked']; |
| 615 | 615 | } |
@@ -18,11 +18,11 @@ discard block |
||
| 18 | 18 | $modx->sid = session_id(); |
| 19 | 19 | |
| 20 | 20 | $_lang = array(); |
| 21 | -include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php'; |
|
| 21 | +include_once MODX_MANAGER_PATH.'/includes/lang/english.inc.php'; |
|
| 22 | 22 | if ($modx->config['manager_language'] != 'english') {
|
| 23 | - include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php'; |
|
| 23 | + include_once MODX_MANAGER_PATH.'/includes/lang/'.$modx->config['manager_language'].'.inc.php'; |
|
| 24 | 24 | } |
| 25 | -include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php'; |
|
| 25 | +include_once MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/style.php'; |
|
| 26 | 26 | |
| 27 | 27 | $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : ''; |
| 28 | 28 | $frame = isset($_REQUEST['f']) ? $_REQUEST['f'] : ''; |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | switch ($frame) {
|
| 41 | 41 | case 'nodes': |
| 42 | - include_once MODX_MANAGER_PATH . '/frames/nodes.php'; |
|
| 42 | + include_once MODX_MANAGER_PATH.'/frames/nodes.php'; |
|
| 43 | 43 | |
| 44 | 44 | break; |
| 45 | 45 | } |
@@ -57,21 +57,21 @@ discard block |
||
| 57 | 57 | $sql = ''; |
| 58 | 58 | $a = ''; |
| 59 | 59 | $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '%*_') : ''; |
| 60 | - $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
|
| 61 | - $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
|
| 60 | + $sqlLike = $filter ? 'WHERE t1.name LIKE "'.$modx->getDatabase()->escape($filter).'%"' : ''; |
|
| 61 | + $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit; |
|
| 62 | 62 | |
| 63 | 63 | switch ($elements) {
|
| 64 | 64 | case 'element_templates': |
| 65 | 65 | $a = 16; |
| 66 | - $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
|
| 66 | + $sqlLike = $filter ? 'WHERE t1.templatename LIKE "'.$modx->getDatabase()->escape($filter).'%"' : ''; |
|
| 67 | 67 | $sql = $modx->getDatabase()->query('SELECT t1.id, t1.templatename AS name, t1.locked, 0 AS disabled
|
| 68 | - FROM ' . $modx->getFullTableName('site_templates') . ' AS t1
|
|
| 69 | - ' . $sqlLike . ' |
|
| 68 | + FROM ' . $modx->getFullTableName('site_templates').' AS t1
|
|
| 69 | + ' . $sqlLike.' |
|
| 70 | 70 | ORDER BY t1.templatename ASC |
| 71 | 71 | ' . $sqlLimit); |
| 72 | 72 | |
| 73 | 73 | if ($modx->hasPermission('new_template')) {
|
| 74 | - $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>'; |
|
| 74 | + $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>'.$_lang['new_template'].'</a></li>'; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | break; |
@@ -79,15 +79,15 @@ discard block |
||
| 79 | 79 | case 'element_tplvars': |
| 80 | 80 | $a = 301; |
| 81 | 81 | $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, IF(MIN(t2.tmplvarid),0,1) AS disabled
|
| 82 | - FROM ' . $modx->getFullTableName('site_tmplvars') . ' AS t1
|
|
| 83 | - LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates') . ' AS t2 ON t1.id=t2.tmplvarid
|
|
| 84 | - ' . $sqlLike . ' |
|
| 82 | + FROM ' . $modx->getFullTableName('site_tmplvars').' AS t1
|
|
| 83 | + LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates').' AS t2 ON t1.id=t2.tmplvarid
|
|
| 84 | + ' . $sqlLike.' |
|
| 85 | 85 | GROUP BY t1.id |
| 86 | 86 | ORDER BY t1.name ASC |
| 87 | 87 | ' . $sqlLimit); |
| 88 | 88 | |
| 89 | 89 | if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
|
| 90 | - $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>'; |
|
| 90 | + $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>'.$_lang['new_tmplvars'].'</a></li>'; |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | break; |
@@ -95,13 +95,13 @@ discard block |
||
| 95 | 95 | case 'element_htmlsnippets': |
| 96 | 96 | $a = 78; |
| 97 | 97 | $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, t1.disabled
|
| 98 | - FROM ' . $modx->getFullTableName('site_htmlsnippets') . ' AS t1
|
|
| 99 | - ' . $sqlLike . ' |
|
| 98 | + FROM ' . $modx->getFullTableName('site_htmlsnippets').' AS t1
|
|
| 99 | + ' . $sqlLike.' |
|
| 100 | 100 | ORDER BY t1.name ASC |
| 101 | 101 | ' . $sqlLimit); |
| 102 | 102 | |
| 103 | 103 | if ($modx->hasPermission('new_chunk')) {
|
| 104 | - $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>'; |
|
| 104 | + $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>'.$_lang['new_htmlsnippet'].'</a></li>'; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | break; |
@@ -109,13 +109,13 @@ discard block |
||
| 109 | 109 | case 'element_snippets': |
| 110 | 110 | $a = 22; |
| 111 | 111 | $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, t1.disabled
|
| 112 | - FROM ' . $modx->getFullTableName('site_snippets') . ' AS t1
|
|
| 113 | - ' . $sqlLike . ' |
|
| 112 | + FROM ' . $modx->getFullTableName('site_snippets').' AS t1
|
|
| 113 | + ' . $sqlLike.' |
|
| 114 | 114 | ORDER BY t1.name ASC |
| 115 | 115 | ' . $sqlLimit); |
| 116 | 116 | |
| 117 | 117 | if ($modx->hasPermission('new_snippet')) {
|
| 118 | - $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>'; |
|
| 118 | + $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>'.$_lang['new_snippet'].'</a></li>'; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | break; |
@@ -123,13 +123,13 @@ discard block |
||
| 123 | 123 | case 'element_plugins': |
| 124 | 124 | $a = 102; |
| 125 | 125 | $sql = $modx->getDatabase()->query('SELECT t1.id, t1.name, t1.locked, t1.disabled
|
| 126 | - FROM ' . $modx->getFullTableName('site_plugins') . ' AS t1
|
|
| 127 | - ' . $sqlLike . ' |
|
| 126 | + FROM ' . $modx->getFullTableName('site_plugins').' AS t1
|
|
| 127 | + ' . $sqlLike.' |
|
| 128 | 128 | ORDER BY t1.name ASC |
| 129 | 129 | ' . $sqlLimit); |
| 130 | 130 | |
| 131 | 131 | if ($modx->hasPermission('new_plugin')) {
|
| 132 | - $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>'; |
|
| 132 | + $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>'.$_lang['new_plugin'].'</a></li>'; |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | break; |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | continue; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - $items .= '<li class="item ' . ($row['disabled'] ? 'disabled' : '') . ($row['locked'] ? ' locked' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main" data-parent-id="a_76__elements_' . $elements . '">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>' . "\n";
|
|
| 147 | + $items .= '<li class="item '.($row['disabled'] ? 'disabled' : '').($row['locked'] ? ' locked' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main" data-parent-id="a_76__elements_'.$elements.'">'.$row['name'].' <small>('.$row['id'].')</small></a></li>'."\n";
|
|
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | |
@@ -165,23 +165,23 @@ discard block |
||
| 165 | 165 | $output = ''; |
| 166 | 166 | $items = ''; |
| 167 | 167 | $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : ''; |
| 168 | - $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
|
| 169 | - $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
|
| 168 | + $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->getDatabase()->escape($filter).'%"' : ''; |
|
| 169 | + $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit; |
|
| 170 | 170 | |
| 171 | - if(!$modx->hasPermission('save_role')) {
|
|
| 171 | + if (!$modx->hasPermission('save_role')) {
|
|
| 172 | 172 | $sqlLike .= $sqlLike ? ' AND ' : 'WHERE '; |
| 173 | 173 | $sqlLike .= 't2.role != 1'; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | $sql = $modx->getDatabase()->query('SELECT t1.*, t1.username AS name, t2.blocked
|
| 177 | - FROM ' . $modx->getFullTableName('manager_users') . ' AS t1
|
|
| 178 | - LEFT JOIN ' . $modx->getFullTableName('user_attributes') . ' AS t2 ON t1.id=t2.internalKey
|
|
| 179 | - ' . $sqlLike . ' |
|
| 177 | + FROM ' . $modx->getFullTableName('manager_users').' AS t1
|
|
| 178 | + LEFT JOIN ' . $modx->getFullTableName('user_attributes').' AS t2 ON t1.id=t2.internalKey
|
|
| 179 | + ' . $sqlLike.' |
|
| 180 | 180 | ORDER BY t1.username ASC |
| 181 | 181 | ' . $sqlLimit); |
| 182 | 182 | |
| 183 | 183 | if ($modx->hasPermission('new_user')) {
|
| 184 | - $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>'; |
|
| 184 | + $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>'.$_lang['new_user'].'</a></li>'; |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | if ($count = $modx->getDatabase()->getRecordCount($sql)) {
|
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
| 190 | 190 | } |
| 191 | 191 | while ($row = $modx->getDatabase()->getRow($sql)) {
|
| 192 | - $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
|
|
| 192 | + $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>';
|
|
| 193 | 193 | } |
| 194 | 194 | } |
| 195 | 195 | |
@@ -209,18 +209,18 @@ discard block |
||
| 209 | 209 | $output = ''; |
| 210 | 210 | $items = ''; |
| 211 | 211 | $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : ''; |
| 212 | - $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : ''; |
|
| 213 | - $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
|
| 212 | + $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->getDatabase()->escape($filter).'%"' : ''; |
|
| 213 | + $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit; |
|
| 214 | 214 | |
| 215 | 215 | $sql = $modx->getDatabase()->query('SELECT t1.*, t1.username AS name, t2.blocked
|
| 216 | - FROM ' . $modx->getFullTableName('web_users') . ' AS t1
|
|
| 217 | - LEFT JOIN ' . $modx->getFullTableName('web_user_attributes') . ' AS t2 ON t1.id=t2.internalKey
|
|
| 218 | - ' . $sqlLike . ' |
|
| 216 | + FROM ' . $modx->getFullTableName('web_users').' AS t1
|
|
| 217 | + LEFT JOIN ' . $modx->getFullTableName('web_user_attributes').' AS t2 ON t1.id=t2.internalKey
|
|
| 218 | + ' . $sqlLike.' |
|
| 219 | 219 | ORDER BY t1.username ASC |
| 220 | 220 | ' . $sqlLimit); |
| 221 | 221 | |
| 222 | 222 | if ($modx->hasPermission('new_web_user')) {
|
| 223 | - $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>'; |
|
| 223 | + $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>'.$_lang['new_web_user'].'</a></li>'; |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | if ($count = $modx->getDatabase()->getRecordCount($sql)) {
|
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
| 229 | 229 | } |
| 230 | 230 | while ($row = $modx->getDatabase()->getRow($sql)) {
|
| 231 | - $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
|
|
| 231 | + $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>';
|
|
| 232 | 232 | } |
| 233 | 233 | } |
| 234 | 234 | |
@@ -254,35 +254,35 @@ discard block |
||
| 254 | 254 | case 'SnippetNoCache': {
|
| 255 | 255 | |
| 256 | 256 | $sql = $modx->getDatabase()->query('SELECT *
|
| 257 | - FROM ' . $modx->getFullTableName('site_snippets') . '
|
|
| 258 | - WHERE name="' . $name . '" |
|
| 257 | + FROM ' . $modx->getFullTableName('site_snippets').'
|
|
| 258 | + WHERE name="' . $name.'" |
|
| 259 | 259 | LIMIT 1'); |
| 260 | 260 | |
| 261 | 261 | if ($modx->getDatabase()->getRecordCount($sql)) {
|
| 262 | 262 | $row = $modx->getDatabase()->getRow($sql); |
| 263 | 263 | $contextmenu = array( |
| 264 | 264 | 'header' => array( |
| 265 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name'] |
|
| 265 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$row['name'] |
|
| 266 | 266 | ), |
| 267 | 267 | 'item' => array( |
| 268 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
| 269 | - 'url' => "index.php?a=22&id=" . $row['id'] |
|
| 268 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
| 269 | + 'url' => "index.php?a=22&id=".$row['id'] |
|
| 270 | 270 | ) |
| 271 | 271 | ); |
| 272 | 272 | if (!empty($row['description'])) {
|
| 273 | 273 | $contextmenu['seperator'] = ''; |
| 274 | 274 | $contextmenu['description'] = array( |
| 275 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
| 275 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
| 276 | 276 | ); |
| 277 | 277 | } |
| 278 | 278 | } else {
|
| 279 | 279 | $contextmenu = array( |
| 280 | 280 | 'header' => array( |
| 281 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $name |
|
| 281 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$name |
|
| 282 | 282 | ), |
| 283 | 283 | 'item' => array( |
| 284 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'], |
|
| 285 | - 'url' => "index.php?a=23&itemname=" . $name |
|
| 284 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'], |
|
| 285 | + 'url' => "index.php?a=23&itemname=".$name |
|
| 286 | 286 | ) |
| 287 | 287 | ); |
| 288 | 288 | } |
@@ -292,35 +292,35 @@ discard block |
||
| 292 | 292 | case 'Chunk' : {
|
| 293 | 293 | |
| 294 | 294 | $sql = $modx->getDatabase()->query('SELECT *
|
| 295 | - FROM ' . $modx->getFullTableName('site_htmlsnippets') . '
|
|
| 296 | - WHERE name="' . $name . '" |
|
| 295 | + FROM ' . $modx->getFullTableName('site_htmlsnippets').'
|
|
| 296 | + WHERE name="' . $name.'" |
|
| 297 | 297 | LIMIT 1'); |
| 298 | 298 | |
| 299 | 299 | if ($modx->getDatabase()->getRecordCount($sql)) {
|
| 300 | 300 | $row = $modx->getDatabase()->getRow($sql); |
| 301 | 301 | $contextmenu = array( |
| 302 | 302 | 'header' => array( |
| 303 | - 'innerHTML' => '<i class="fa fa-th-large"></i> ' . $row['name'] |
|
| 303 | + 'innerHTML' => '<i class="fa fa-th-large"></i> '.$row['name'] |
|
| 304 | 304 | ), |
| 305 | 305 | 'item' => array( |
| 306 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
| 307 | - 'url' => "index.php?a=78&id=" . $row['id'] |
|
| 306 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
| 307 | + 'url' => "index.php?a=78&id=".$row['id'] |
|
| 308 | 308 | ) |
| 309 | 309 | ); |
| 310 | 310 | if (!empty($row['description'])) {
|
| 311 | 311 | $contextmenu['seperator'] = ''; |
| 312 | 312 | $contextmenu['description'] = array( |
| 313 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
| 313 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
| 314 | 314 | ); |
| 315 | 315 | } |
| 316 | 316 | } else {
|
| 317 | 317 | $contextmenu = array( |
| 318 | 318 | 'header' => array( |
| 319 | - 'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name |
|
| 319 | + 'innerHTML' => '<i class="fa fa-th-large"></i> '.$name |
|
| 320 | 320 | ), |
| 321 | 321 | 'item' => array( |
| 322 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'], |
|
| 323 | - 'url' => "index.php?a=77&itemname=" . $name |
|
| 322 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'], |
|
| 323 | + 'url' => "index.php?a=77&itemname=".$name |
|
| 324 | 324 | ) |
| 325 | 325 | ); |
| 326 | 326 | } |
@@ -329,8 +329,8 @@ discard block |
||
| 329 | 329 | } |
| 330 | 330 | case 'AttributeValue': {
|
| 331 | 331 | $sql = $modx->getDatabase()->query('SELECT *
|
| 332 | - FROM ' . $modx->getFullTableName('site_htmlsnippets') . '
|
|
| 333 | - WHERE name="' . $name . '" |
|
| 332 | + FROM ' . $modx->getFullTableName('site_htmlsnippets').'
|
|
| 333 | + WHERE name="' . $name.'" |
|
| 334 | 334 | LIMIT 1'); |
| 335 | 335 | |
| 336 | 336 | if ($modx->getDatabase()->getRecordCount($sql)) {
|
@@ -340,52 +340,52 @@ discard block |
||
| 340 | 340 | 'innerText' => $row['name'] |
| 341 | 341 | ), |
| 342 | 342 | 'item' => array( |
| 343 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
| 344 | - 'url' => "index.php?a=78&id=" . $row['id'] |
|
| 343 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
| 344 | + 'url' => "index.php?a=78&id=".$row['id'] |
|
| 345 | 345 | ) |
| 346 | 346 | ); |
| 347 | 347 | if (!empty($row['description'])) {
|
| 348 | 348 | $contextmenu['seperator'] = ''; |
| 349 | 349 | $contextmenu['description'] = array( |
| 350 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
| 350 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
| 351 | 351 | ); |
| 352 | 352 | } |
| 353 | 353 | } else {
|
| 354 | 354 | |
| 355 | 355 | $sql = $modx->getDatabase()->query('SELECT *
|
| 356 | - FROM ' . $modx->getFullTableName('site_snippets') . '
|
|
| 357 | - WHERE name="' . $name . '" |
|
| 356 | + FROM ' . $modx->getFullTableName('site_snippets').'
|
|
| 357 | + WHERE name="' . $name.'" |
|
| 358 | 358 | LIMIT 1'); |
| 359 | 359 | |
| 360 | 360 | if ($modx->getDatabase()->getRecordCount($sql)) {
|
| 361 | 361 | $row = $modx->getDatabase()->getRow($sql); |
| 362 | 362 | $contextmenu = array( |
| 363 | 363 | 'header' => array( |
| 364 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name'] |
|
| 364 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$row['name'] |
|
| 365 | 365 | ), |
| 366 | 366 | 'item' => array( |
| 367 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
| 368 | - 'url' => "index.php?a=22&id=" . $row['id'] |
|
| 367 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
| 368 | + 'url' => "index.php?a=22&id=".$row['id'] |
|
| 369 | 369 | ) |
| 370 | 370 | ); |
| 371 | 371 | if (!empty($row['description'])) {
|
| 372 | 372 | $contextmenu['seperator'] = ''; |
| 373 | 373 | $contextmenu['description'] = array( |
| 374 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
| 374 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
| 375 | 375 | ); |
| 376 | 376 | } |
| 377 | 377 | } else {
|
| 378 | 378 | $contextmenu = array( |
| 379 | 379 | 'header' => array( |
| 380 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $name |
|
| 380 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$name |
|
| 381 | 381 | ), |
| 382 | 382 | 'item' => array( |
| 383 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'], |
|
| 384 | - 'url' => "index.php?a=77&itemname=" . $name |
|
| 383 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'], |
|
| 384 | + 'url' => "index.php?a=77&itemname=".$name |
|
| 385 | 385 | ), |
| 386 | 386 | 'item2' => array( |
| 387 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'], |
|
| 388 | - 'url' => "index.php?a=23&itemname=" . $name |
|
| 387 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'], |
|
| 388 | + 'url' => "index.php?a=23&itemname=".$name |
|
| 389 | 389 | ) |
| 390 | 390 | ); |
| 391 | 391 | } |
@@ -441,35 +441,35 @@ discard block |
||
| 441 | 441 | } |
| 442 | 442 | |
| 443 | 443 | $sql = $modx->getDatabase()->query('SELECT *
|
| 444 | - FROM ' . $modx->getFullTableName('site_tmplvars') . '
|
|
| 445 | - WHERE name="' . $name . '" |
|
| 444 | + FROM ' . $modx->getFullTableName('site_tmplvars').'
|
|
| 445 | + WHERE name="' . $name.'" |
|
| 446 | 446 | LIMIT 1'); |
| 447 | 447 | |
| 448 | 448 | if ($modx->getDatabase()->getRecordCount($sql)) {
|
| 449 | 449 | $row = $modx->getDatabase()->getRow($sql); |
| 450 | 450 | $contextmenu = array( |
| 451 | 451 | 'header' => array( |
| 452 | - 'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $row['name'] |
|
| 452 | + 'innerHTML' => '<i class="fa fa-list-alt"></i> '.$row['name'] |
|
| 453 | 453 | ), |
| 454 | 454 | 'item' => array( |
| 455 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
| 456 | - 'url' => "index.php?a=301&id=" . $row['id'] |
|
| 455 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
| 456 | + 'url' => "index.php?a=301&id=".$row['id'] |
|
| 457 | 457 | ) |
| 458 | 458 | ); |
| 459 | 459 | if (!empty($row['description'])) {
|
| 460 | 460 | $contextmenu['seperator'] = ''; |
| 461 | 461 | $contextmenu['description'] = array( |
| 462 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
| 462 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
| 463 | 463 | ); |
| 464 | 464 | } |
| 465 | 465 | } else {
|
| 466 | 466 | $contextmenu = array( |
| 467 | 467 | 'header' => array( |
| 468 | - 'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name |
|
| 468 | + 'innerHTML' => '<i class="fa fa-list-alt"></i> '.$name |
|
| 469 | 469 | ), |
| 470 | 470 | 'item' => array( |
| 471 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_tmplvars'], |
|
| 472 | - 'url' => "index.php?a=300&itemname=" . $name |
|
| 471 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_tmplvars'], |
|
| 472 | + 'url' => "index.php?a=300&itemname=".$name |
|
| 473 | 473 | ) |
| 474 | 474 | ); |
| 475 | 475 | } |
@@ -488,15 +488,15 @@ discard block |
||
| 488 | 488 | $json = array(); |
| 489 | 489 | |
| 490 | 490 | if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
|
| 491 | - $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : ''; |
|
| 492 | - $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0; |
|
| 491 | + $id = !empty($_REQUEST['id']) ? (int) $_REQUEST['id'] : ''; |
|
| 492 | + $parent = isset($_REQUEST['parent']) ? (int) $_REQUEST['parent'] : 0; |
|
| 493 | 493 | $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0; |
| 494 | 494 | |
| 495 | 495 | // set parent |
| 496 | 496 | if ($id && $parent >= 0) {
|
| 497 | 497 | |
| 498 | 498 | // find older parent |
| 499 | - $parentOld = $modx->getDatabase()->getValue($modx->getDatabase()->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));
|
|
| 499 | + $parentOld = $modx->getDatabase()->getValue($modx->getDatabase()->select('parent', $modx->getFullTableName('site_content'), 'id='.$id));
|
|
| 500 | 500 | |
| 501 | 501 | $eventOut = $modx->invokeEvent('onBeforeMoveDocument', [
|
| 502 | 502 | 'id_document' => $id, |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | if (empty($json['errors'])) {
|
| 518 | 518 | // check privileges user for move docs |
| 519 | 519 | if (!empty($modx->config['tree_show_protected']) && $role != 1) {
|
| 520 | - $sql = $modx->getDatabase()->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');
|
|
| 520 | + $sql = $modx->getDatabase()->select('*', $modx->getFullTableName('document_groups'), 'document IN('.$id.','.$parent.','.$parentOld.')');
|
|
| 521 | 521 | if ($modx->getDatabase()->getRecordCount($sql)) {
|
| 522 | 522 | $document_groups = array(); |
| 523 | 523 | while ($row = $modx->getDatabase()->getRow($sql)) {
|
@@ -542,22 +542,22 @@ discard block |
||
| 542 | 542 | // set new parent |
| 543 | 543 | $modx->getDatabase()->update(array( |
| 544 | 544 | 'parent' => $parent |
| 545 | - ), $modx->getFullTableName('site_content'), 'id=' . $id);
|
|
| 545 | + ), $modx->getFullTableName('site_content'), 'id='.$id);
|
|
| 546 | 546 | // set parent isfolder = 1 |
| 547 | 547 | $modx->getDatabase()->update(array( |
| 548 | 548 | 'isfolder' => 1 |
| 549 | - ), $modx->getFullTableName('site_content'), 'id=' . $parent);
|
|
| 549 | + ), $modx->getFullTableName('site_content'), 'id='.$parent);
|
|
| 550 | 550 | |
| 551 | 551 | if ($parent != $parentOld) {
|
| 552 | 552 | // check children docs and set parent isfolder |
| 553 | - if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
|
|
| 553 | + if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getFullTableName('site_content'), 'parent='.$parentOld))) {
|
|
| 554 | 554 | $modx->getDatabase()->update(array( |
| 555 | 555 | 'isfolder' => 1 |
| 556 | - ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
|
|
| 556 | + ), $modx->getFullTableName('site_content'), 'id='.$parentOld);
|
|
| 557 | 557 | } else {
|
| 558 | 558 | $modx->getDatabase()->update(array( |
| 559 | 559 | 'isfolder' => 0 |
| 560 | - ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
|
|
| 560 | + ), $modx->getFullTableName('site_content'), 'id='.$parentOld);
|
|
| 561 | 561 | } |
| 562 | 562 | } |
| 563 | 563 | |
@@ -565,7 +565,7 @@ discard block |
||
| 565 | 565 | if (!empty($menuindex)) {
|
| 566 | 566 | $menuindex = explode(',', $menuindex);
|
| 567 | 567 | foreach ($menuindex as $key => $value) {
|
| 568 | - $modx->getDatabase()->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);
|
|
| 568 | + $modx->getDatabase()->query('UPDATE '.$modx->getFullTableName('site_content').' SET menuindex='.$key.' WHERE id='.$value);
|
|
| 569 | 569 | } |
| 570 | 570 | } else {
|
| 571 | 571 | // TODO: max(*) menuindex |
@@ -594,19 +594,19 @@ discard block |
||
| 594 | 594 | } |
| 595 | 595 | |
| 596 | 596 | case 'getLockedElements': {
|
| 597 | - $type = isset($_REQUEST['type']) ? (int)$_REQUEST['type'] : 0; |
|
| 598 | - $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; |
|
| 597 | + $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : 0; |
|
| 598 | + $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; |
|
| 599 | 599 | |
| 600 | 600 | $output = !!$modx->elementIsLocked($type, $id, true); |
| 601 | 601 | |
| 602 | 602 | if (!$output) {
|
| 603 | 603 | $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
|
| 604 | - $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';
|
|
| 604 | + $docgrp_cond = $docgrp ? ' OR dg.document_group IN ('.$docgrp.')' : '';
|
|
| 605 | 605 | $sql = ' |
| 606 | - SELECT MAX(IF(1=' . $role . ' OR sc.privatemgr=0' . $docgrp_cond . ', 0, 1)) AS locked |
|
| 607 | - FROM ' . $modx->getFullTableName('site_content') . ' AS sc
|
|
| 608 | - LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id
|
|
| 609 | - WHERE sc.id=' . $id . ' GROUP BY sc.id'; |
|
| 606 | + SELECT MAX(IF(1=' . $role.' OR sc.privatemgr=0'.$docgrp_cond.', 0, 1)) AS locked |
|
| 607 | + FROM ' . $modx->getFullTableName('site_content').' AS sc
|
|
| 608 | + LEFT JOIN ' . $modx->getFullTableName('document_groups').' dg ON dg.document=sc.id
|
|
| 609 | + WHERE sc.id=' . $id.' GROUP BY sc.id'; |
|
| 610 | 610 | $sql = $modx->getDatabase()->query($sql); |
| 611 | 611 | if ($modx->getDatabase()->getRecordCount($sql)) {
|
| 612 | 612 | $row = $modx->getDatabase()->getRow($sql); |
@@ -1,12 +1,12 @@ 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 | // invoke OnManagerTreeInit event |
| 7 | 7 | $evtOut = $modx->invokeEvent('OnManagerTreeInit', $_REQUEST);
|
| 8 | 8 | if(is_array($evtOut)) {
|
| 9 | - echo implode("\n", $evtOut);
|
|
| 9 | + echo implode("\n", $evtOut);
|
|
| 10 | 10 | } |
| 11 | 11 | ?> |
| 12 | 12 | |
@@ -52,23 +52,23 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | <div id="treeHolder"> |
| 54 | 54 | <?php |
| 55 | - // invoke OnManagerTreePrerender event |
|
| 56 | - $evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->getDatabase()->escape($_REQUEST));
|
|
| 57 | - if(is_array($evtOut)) {
|
|
| 58 | - echo implode("\n", $evtOut);
|
|
| 59 | - } |
|
| 60 | - ?> |
|
| 55 | + // invoke OnManagerTreePrerender event |
|
| 56 | + $evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->getDatabase()->escape($_REQUEST));
|
|
| 57 | + if(is_array($evtOut)) {
|
|
| 58 | + echo implode("\n", $evtOut);
|
|
| 59 | + } |
|
| 60 | + ?> |
|
| 61 | 61 | <div id="node0" class="rootNode"><a class="node" onclick="modx.tree.treeAction(event, 0)" data-id="0" data-title-esc="<?php $site_name = htmlspecialchars($site_name, ENT_QUOTES, $modx->config['modx_charset']); |
| 62 | - echo $site_name; ?>"><span class="icon"><?php echo $_style['tree_showtree']; ?></span><span class="title"><?php echo $site_name; ?></span></a> |
|
| 62 | + echo $site_name; ?>"><span class="icon"><?php echo $_style['tree_showtree']; ?></span><span class="title"><?php echo $site_name; ?></span></a> |
|
| 63 | 63 | <div id="treeloader"><i class="fa fa-cog fa-spin fa-3x fa-fw"></i></div> |
| 64 | 64 | </div> |
| 65 | 65 | <div id="treeRoot"></div> |
| 66 | 66 | <?php |
| 67 | - // invoke OnManagerTreeRender event |
|
| 68 | - $evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->getDatabase()->escape($_REQUEST));
|
|
| 69 | - if(is_array($evtOut)) {
|
|
| 70 | - echo implode("\n", $evtOut);
|
|
| 71 | - } |
|
| 72 | - ?> |
|
| 67 | + // invoke OnManagerTreeRender event |
|
| 68 | + $evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->getDatabase()->escape($_REQUEST));
|
|
| 69 | + if(is_array($evtOut)) {
|
|
| 70 | + echo implode("\n", $evtOut);
|
|
| 71 | + } |
|
| 72 | + ?> |
|
| 73 | 73 | </div> |
| 74 | 74 | </div> |
@@ -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 | // invoke OnManagerTreeInit event |
| 7 | 7 | $evtOut = $modx->invokeEvent('OnManagerTreeInit', $_REQUEST);
|
| 8 | -if(is_array($evtOut)) {
|
|
| 8 | +if (is_array($evtOut)) {
|
|
| 9 | 9 | echo implode("\n", $evtOut);
|
| 10 | 10 | } |
| 11 | 11 | ?> |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | <a class="treeButton" id="treeMenu_collapsetree" onclick="modx.tree.collapseTree();" title="<?php echo $_lang['collapse_tree']; ?>"><?php echo $_style['collapse_tree']; ?></a> |
| 19 | 19 | |
| 20 | - <?php if($modx->hasPermission('new_document')) { ?>
|
|
| 20 | + <?php if ($modx->hasPermission('new_document')) { ?>
|
|
| 21 | 21 | <a class="treeButton" id="treeMenu_addresource" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=4', title: '<?php echo $_lang['add_resource']; ?>'});" title="<?php echo $_lang['add_resource']; ?>"><?php echo $_style['add_doc_tree']; ?></a>
|
| 22 | 22 | <a class="treeButton" id="treeMenu_addweblink" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=72', title: '<?php echo $_lang['add_weblink']; ?>'});" title="<?php echo $_lang['add_weblink']; ?>"><?php echo $_style['add_weblink_tree']; ?></a>
|
| 23 | 23 | <?php } ?> |
@@ -26,23 +26,23 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | <a class="treeButton" id="treeMenu_sortingtree" onclick="modx.tree.showSorter(event);" title="<?php echo $_lang['sort_tree']; ?>"><?php echo $_style['sort_tree']; ?></a> |
| 28 | 28 | |
| 29 | - <?php if($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) { ?>
|
|
| 29 | + <?php if ($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) { ?>
|
|
| 30 | 30 | <a class="treeButton" id="treeMenu_sortingindex" onclick="modx.tabs({url: '<?= MODX_MANAGER_URL ?>?a=56&id=0', title: '<?php echo $_lang['sort_menuindex']; ?>'});" title="<?php echo $_lang['sort_menuindex']; ?>"><?php echo $_style['sort_menuindex']; ?></a>
|
| 31 | 31 | <?php } ?> |
| 32 | 32 | |
| 33 | - <?php if($use_browser && $modx->hasPermission('assets_images')) { ?>
|
|
| 34 | - <a class="treeButton" id="treeMenu_openimages" title="<?php echo $_lang["images_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['images_management']; ?></a> |
|
| 33 | + <?php if ($use_browser && $modx->hasPermission('assets_images')) { ?>
|
|
| 34 | + <a class="treeButton" id="treeMenu_openimages" title="<?php echo $_lang["images_management"]."\n".$_lang['em_button_shift'] ?>"><?php echo $_style['images_management']; ?></a> |
|
| 35 | 35 | <?php } ?> |
| 36 | 36 | |
| 37 | - <?php if($use_browser && $modx->hasPermission('assets_files')) { ?>
|
|
| 38 | - <a class="treeButton" id="treeMenu_openfiles" title="<?php echo $_lang["files_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['files_management']; ?></a> |
|
| 37 | + <?php if ($use_browser && $modx->hasPermission('assets_files')) { ?>
|
|
| 38 | + <a class="treeButton" id="treeMenu_openfiles" title="<?php echo $_lang["files_management"]."\n".$_lang['em_button_shift'] ?>"><?php echo $_style['files_management']; ?></a> |
|
| 39 | 39 | <?php } ?> |
| 40 | 40 | |
| 41 | - <?php if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>
|
|
| 42 | - <a class="treeButton" id="treeMenu_openelements" title="<?php echo $_lang["element_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['element_management']; ?></a> |
|
| 41 | + <?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>
|
|
| 42 | + <a class="treeButton" id="treeMenu_openelements" title="<?php echo $_lang["element_management"]."\n".$_lang['em_button_shift'] ?>"><?php echo $_style['element_management']; ?></a> |
|
| 43 | 43 | <?php } ?> |
| 44 | 44 | |
| 45 | - <?php if($modx->hasPermission('empty_trash')) { ?>
|
|
| 45 | + <?php if ($modx->hasPermission('empty_trash')) { ?>
|
|
| 46 | 46 | <a class="treeButton treeButtonDisabled" id="treeMenu_emptytrash" title="<?php echo $_lang['empty_recycle_bin_empty']; ?>"><?php echo $_style['empty_recycle_bin_empty']; ?></a> |
| 47 | 47 | <?php } ?> |
| 48 | 48 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | <?php |
| 55 | 55 | // invoke OnManagerTreePrerender event |
| 56 | 56 | $evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->getDatabase()->escape($_REQUEST));
|
| 57 | - if(is_array($evtOut)) {
|
|
| 57 | + if (is_array($evtOut)) {
|
|
| 58 | 58 | echo implode("\n", $evtOut);
|
| 59 | 59 | } |
| 60 | 60 | ?> |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | <?php |
| 67 | 67 | // invoke OnManagerTreeRender event |
| 68 | 68 | $evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->getDatabase()->escape($_REQUEST));
|
| 69 | - if(is_array($evtOut)) {
|
|
| 69 | + if (is_array($evtOut)) {
|
|
| 70 | 70 | echo implode("\n", $evtOut);
|
| 71 | 71 | } |
| 72 | 72 | ?> |
@@ -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 | // invoke OnManagerTreeInit event |
| 7 | 7 | $evtOut = $modx->invokeEvent('OnManagerTreeInit', $_REQUEST);
|
| 8 | -if(is_array($evtOut)) {
|
|
| 8 | +if(is_array($evtOut)) { |
|
| 9 | 9 | echo implode("\n", $evtOut);
|
| 10 | 10 | } |
| 11 | 11 | ?> |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | <?php |
| 55 | 55 | // invoke OnManagerTreePrerender event |
| 56 | 56 | $evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->getDatabase()->escape($_REQUEST));
|
| 57 | - if(is_array($evtOut)) {
|
|
| 57 | + if(is_array($evtOut)) { |
|
| 58 | 58 | echo implode("\n", $evtOut);
|
| 59 | 59 | } |
| 60 | 60 | ?> |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | <?php |
| 67 | 67 | // invoke OnManagerTreeRender event |
| 68 | 68 | $evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->getDatabase()->escape($_REQUEST));
|
| 69 | - if(is_array($evtOut)) {
|
|
| 69 | + if(is_array($evtOut)) { |
|
| 70 | 70 | echo implode("\n", $evtOut);
|
| 71 | 71 | } |
| 72 | 72 | ?> |
@@ -4,237 +4,237 @@ discard block |
||
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | 6 | $sitemenu['bars'] = array( |
| 7 | - 'bars', |
|
| 8 | - 'main', |
|
| 9 | - '<i class="fa fa-bars"></i>', |
|
| 10 | - 'javascript:;', |
|
| 11 | - $_lang['home'], |
|
| 12 | - 'modx.resizer.toggle(); return false;', |
|
| 13 | - ' return false;', |
|
| 14 | - '', |
|
| 15 | - 0, |
|
| 16 | - 10, |
|
| 17 | - '' |
|
| 7 | + 'bars', |
|
| 8 | + 'main', |
|
| 9 | + '<i class="fa fa-bars"></i>', |
|
| 10 | + 'javascript:;', |
|
| 11 | + $_lang['home'], |
|
| 12 | + 'modx.resizer.toggle(); return false;', |
|
| 13 | + ' return false;', |
|
| 14 | + '', |
|
| 15 | + 0, |
|
| 16 | + 10, |
|
| 17 | + '' |
|
| 18 | 18 | ); |
| 19 | 19 | |
| 20 | 20 | //mainMenu |
| 21 | 21 | $sitemenu['site'] = array( |
| 22 | - 'site', |
|
| 23 | - 'main', |
|
| 24 | - '<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>', |
|
| 25 | - 'index.php?a=2', |
|
| 26 | - $_lang['home'], |
|
| 27 | - '', |
|
| 28 | - '', |
|
| 29 | - 'main', |
|
| 30 | - 0, |
|
| 31 | - 10, |
|
| 32 | - 'active' |
|
| 22 | + 'site', |
|
| 23 | + 'main', |
|
| 24 | + '<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>', |
|
| 25 | + 'index.php?a=2', |
|
| 26 | + $_lang['home'], |
|
| 27 | + '', |
|
| 28 | + '', |
|
| 29 | + 'main', |
|
| 30 | + 0, |
|
| 31 | + 10, |
|
| 32 | + 'active' |
|
| 33 | 33 | ); |
| 34 | 34 | |
| 35 | 35 | if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
|
| 36 | - $sitemenu['elements'] = array( |
|
| 37 | - 'elements', |
|
| 38 | - 'main', |
|
| 39 | - '<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>', |
|
| 40 | - 'javascript:;', |
|
| 41 | - $_lang['elements'], |
|
| 42 | - ' return false;', |
|
| 43 | - '', |
|
| 44 | - '', |
|
| 45 | - 0, |
|
| 46 | - 20, |
|
| 47 | - '' |
|
| 48 | - ); |
|
| 36 | + $sitemenu['elements'] = array( |
|
| 37 | + 'elements', |
|
| 38 | + 'main', |
|
| 39 | + '<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>', |
|
| 40 | + 'javascript:;', |
|
| 41 | + $_lang['elements'], |
|
| 42 | + ' return false;', |
|
| 43 | + '', |
|
| 44 | + '', |
|
| 45 | + 0, |
|
| 46 | + 20, |
|
| 47 | + '' |
|
| 48 | + ); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if($modx->hasPermission('exec_module')) {
|
| 52 | - $sitemenu['modules'] = array( |
|
| 53 | - 'modules', |
|
| 54 | - 'main', |
|
| 55 | - '<i class="'.$_style['icons_modules'] .'"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>', |
|
| 56 | - 'javascript:;', |
|
| 57 | - $_lang['modules'], |
|
| 58 | - ' return false;', |
|
| 59 | - '', |
|
| 60 | - '', |
|
| 61 | - 0, |
|
| 62 | - 30, |
|
| 63 | - '' |
|
| 64 | - ); |
|
| 52 | + $sitemenu['modules'] = array( |
|
| 53 | + 'modules', |
|
| 54 | + 'main', |
|
| 55 | + '<i class="'.$_style['icons_modules'] .'"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>', |
|
| 56 | + 'javascript:;', |
|
| 57 | + $_lang['modules'], |
|
| 58 | + ' return false;', |
|
| 59 | + '', |
|
| 60 | + '', |
|
| 61 | + 0, |
|
| 62 | + 30, |
|
| 63 | + '' |
|
| 64 | + ); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
|
| 68 | - $sitemenu['users'] = array( |
|
| 69 | - 'users', |
|
| 70 | - 'main', |
|
| 71 | - '<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>', |
|
| 72 | - 'javascript:;', |
|
| 73 | - $_lang['users'], |
|
| 74 | - ' return false;', |
|
| 75 | - 'edit_user', |
|
| 76 | - '', |
|
| 77 | - 0, |
|
| 78 | - 40, |
|
| 79 | - '' |
|
| 80 | - ); |
|
| 68 | + $sitemenu['users'] = array( |
|
| 69 | + 'users', |
|
| 70 | + 'main', |
|
| 71 | + '<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>', |
|
| 72 | + 'javascript:;', |
|
| 73 | + $_lang['users'], |
|
| 74 | + ' return false;', |
|
| 75 | + 'edit_user', |
|
| 76 | + '', |
|
| 77 | + 0, |
|
| 78 | + 40, |
|
| 79 | + '' |
|
| 80 | + ); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
|
| 84 | - $sitemenu['tools'] = array( |
|
| 85 | - 'tools', |
|
| 86 | - 'main', |
|
| 87 | - '<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>', |
|
| 88 | - 'javascript:;', |
|
| 89 | - $_lang['tools'], |
|
| 90 | - ' return false;', |
|
| 91 | - '', |
|
| 92 | - '', |
|
| 93 | - 0, |
|
| 94 | - 50, |
|
| 95 | - '' |
|
| 96 | - ); |
|
| 84 | + $sitemenu['tools'] = array( |
|
| 85 | + 'tools', |
|
| 86 | + 'main', |
|
| 87 | + '<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>', |
|
| 88 | + 'javascript:;', |
|
| 89 | + $_lang['tools'], |
|
| 90 | + ' return false;', |
|
| 91 | + '', |
|
| 92 | + '', |
|
| 93 | + 0, |
|
| 94 | + 50, |
|
| 95 | + '' |
|
| 96 | + ); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $tab = 0; |
| 100 | 100 | if($modx->hasPermission('edit_template')) {
|
| 101 | - $sitemenu['element_templates'] = array( |
|
| 102 | - 'element_templates', |
|
| 103 | - 'elements', |
|
| 104 | - '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 105 | - 'index.php?a=76&tab=' . $tab++, |
|
| 106 | - $_lang['manage_templates'], |
|
| 107 | - '', |
|
| 108 | - 'new_template,edit_template', |
|
| 109 | - 'main', |
|
| 110 | - 0, |
|
| 111 | - 10, |
|
| 112 | - 'dropdown-toggle' |
|
| 113 | - ); |
|
| 101 | + $sitemenu['element_templates'] = array( |
|
| 102 | + 'element_templates', |
|
| 103 | + 'elements', |
|
| 104 | + '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 105 | + 'index.php?a=76&tab=' . $tab++, |
|
| 106 | + $_lang['manage_templates'], |
|
| 107 | + '', |
|
| 108 | + 'new_template,edit_template', |
|
| 109 | + 'main', |
|
| 110 | + 0, |
|
| 111 | + 10, |
|
| 112 | + 'dropdown-toggle' |
|
| 113 | + ); |
|
| 114 | 114 | } |
| 115 | 115 | if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
|
| 116 | - $sitemenu['element_tplvars'] = array( |
|
| 117 | - 'element_tplvars', |
|
| 118 | - 'elements', |
|
| 119 | - '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 120 | - 'index.php?a=76&tab=' . $tab++, |
|
| 121 | - $_lang['tmplvars'], |
|
| 122 | - '', |
|
| 123 | - 'new_template,edit_template', |
|
| 124 | - 'main', |
|
| 125 | - 0, |
|
| 126 | - 20, |
|
| 127 | - 'dropdown-toggle' |
|
| 128 | - ); |
|
| 116 | + $sitemenu['element_tplvars'] = array( |
|
| 117 | + 'element_tplvars', |
|
| 118 | + 'elements', |
|
| 119 | + '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 120 | + 'index.php?a=76&tab=' . $tab++, |
|
| 121 | + $_lang['tmplvars'], |
|
| 122 | + '', |
|
| 123 | + 'new_template,edit_template', |
|
| 124 | + 'main', |
|
| 125 | + 0, |
|
| 126 | + 20, |
|
| 127 | + 'dropdown-toggle' |
|
| 128 | + ); |
|
| 129 | 129 | } |
| 130 | 130 | if($modx->hasPermission('edit_chunk')) {
|
| 131 | - $sitemenu['element_htmlsnippets'] = array( |
|
| 132 | - 'element_htmlsnippets', |
|
| 133 | - 'elements', |
|
| 134 | - '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 135 | - 'index.php?a=76&tab=' . $tab++, |
|
| 136 | - $_lang['manage_htmlsnippets'], |
|
| 137 | - '', |
|
| 138 | - 'new_chunk,edit_chunk', |
|
| 139 | - 'main', |
|
| 140 | - 0, |
|
| 141 | - 30, |
|
| 142 | - 'dropdown-toggle' |
|
| 143 | - ); |
|
| 131 | + $sitemenu['element_htmlsnippets'] = array( |
|
| 132 | + 'element_htmlsnippets', |
|
| 133 | + 'elements', |
|
| 134 | + '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 135 | + 'index.php?a=76&tab=' . $tab++, |
|
| 136 | + $_lang['manage_htmlsnippets'], |
|
| 137 | + '', |
|
| 138 | + 'new_chunk,edit_chunk', |
|
| 139 | + 'main', |
|
| 140 | + 0, |
|
| 141 | + 30, |
|
| 142 | + 'dropdown-toggle' |
|
| 143 | + ); |
|
| 144 | 144 | } |
| 145 | 145 | if($modx->hasPermission('edit_snippet')) {
|
| 146 | - $sitemenu['element_snippets'] = array( |
|
| 147 | - 'element_snippets', |
|
| 148 | - 'elements', |
|
| 149 | - '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 150 | - 'index.php?a=76&tab=' . $tab++, |
|
| 151 | - $_lang['manage_snippets'], |
|
| 152 | - '', |
|
| 153 | - 'new_snippet,edit_snippet', |
|
| 154 | - 'main', |
|
| 155 | - 0, |
|
| 156 | - 40, |
|
| 157 | - 'dropdown-toggle' |
|
| 158 | - ); |
|
| 146 | + $sitemenu['element_snippets'] = array( |
|
| 147 | + 'element_snippets', |
|
| 148 | + 'elements', |
|
| 149 | + '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 150 | + 'index.php?a=76&tab=' . $tab++, |
|
| 151 | + $_lang['manage_snippets'], |
|
| 152 | + '', |
|
| 153 | + 'new_snippet,edit_snippet', |
|
| 154 | + 'main', |
|
| 155 | + 0, |
|
| 156 | + 40, |
|
| 157 | + 'dropdown-toggle' |
|
| 158 | + ); |
|
| 159 | 159 | } |
| 160 | 160 | if($modx->hasPermission('edit_plugin')) {
|
| 161 | - $sitemenu['element_plugins'] = array( |
|
| 162 | - 'element_plugins', |
|
| 163 | - 'elements', |
|
| 164 | - '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 165 | - 'index.php?a=76&tab=' . $tab++, |
|
| 166 | - $_lang['manage_plugins'], |
|
| 167 | - '', |
|
| 168 | - 'new_plugin,edit_plugin', |
|
| 169 | - 'main', |
|
| 170 | - 0, |
|
| 171 | - 50, |
|
| 172 | - 'dropdown-toggle' |
|
| 173 | - ); |
|
| 161 | + $sitemenu['element_plugins'] = array( |
|
| 162 | + 'element_plugins', |
|
| 163 | + 'elements', |
|
| 164 | + '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 165 | + 'index.php?a=76&tab=' . $tab++, |
|
| 166 | + $_lang['manage_plugins'], |
|
| 167 | + '', |
|
| 168 | + 'new_plugin,edit_plugin', |
|
| 169 | + 'main', |
|
| 170 | + 0, |
|
| 171 | + 50, |
|
| 172 | + 'dropdown-toggle' |
|
| 173 | + ); |
|
| 174 | 174 | } |
| 175 | 175 | //$sitemenu['element_categories'] = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
|
| 176 | 176 | |
| 177 | 177 | if($modx->hasPermission('file_manager')) {
|
| 178 | - $sitemenu['manage_files'] = array( |
|
| 179 | - 'manage_files', |
|
| 180 | - 'elements', |
|
| 181 | - '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'], |
|
| 182 | - 'index.php?a=31', |
|
| 183 | - $_lang['manage_files'], |
|
| 184 | - '', |
|
| 185 | - 'file_manager', |
|
| 186 | - 'main', |
|
| 187 | - 0, |
|
| 188 | - 80, |
|
| 189 | - '' |
|
| 190 | - ); |
|
| 178 | + $sitemenu['manage_files'] = array( |
|
| 179 | + 'manage_files', |
|
| 180 | + 'elements', |
|
| 181 | + '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'], |
|
| 182 | + 'index.php?a=31', |
|
| 183 | + $_lang['manage_files'], |
|
| 184 | + '', |
|
| 185 | + 'file_manager', |
|
| 186 | + 'main', |
|
| 187 | + 0, |
|
| 188 | + 80, |
|
| 189 | + '' |
|
| 190 | + ); |
|
| 191 | 191 | } |
| 192 | 192 | if($modx->hasPermission('category_manager')) {
|
| 193 | - $sitemenu['manage_categories'] = array( |
|
| 194 | - 'manage_categories', |
|
| 195 | - 'elements', |
|
| 196 | - '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'], |
|
| 197 | - 'index.php?a=120', |
|
| 198 | - $_lang['manage_categories'], |
|
| 199 | - '', |
|
| 200 | - 'category_manager', |
|
| 201 | - 'main', |
|
| 202 | - 0, |
|
| 203 | - 70, |
|
| 204 | - '' |
|
| 205 | - ); |
|
| 193 | + $sitemenu['manage_categories'] = array( |
|
| 194 | + 'manage_categories', |
|
| 195 | + 'elements', |
|
| 196 | + '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'], |
|
| 197 | + 'index.php?a=120', |
|
| 198 | + $_lang['manage_categories'], |
|
| 199 | + '', |
|
| 200 | + 'category_manager', |
|
| 201 | + 'main', |
|
| 202 | + 0, |
|
| 203 | + 70, |
|
| 204 | + '' |
|
| 205 | + ); |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | // Modules Menu Items |
| 209 | 209 | if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
|
| 210 | - $sitemenu['new_module'] = array( |
|
| 211 | - 'new_module', |
|
| 212 | - 'modules', |
|
| 213 | - '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'], |
|
| 214 | - 'index.php?a=106', |
|
| 215 | - $_lang['module_management'], |
|
| 216 | - '', |
|
| 217 | - 'new_module,edit_module', |
|
| 218 | - 'main', |
|
| 219 | - 1, |
|
| 220 | - 0, |
|
| 221 | - '' |
|
| 222 | - ); |
|
| 210 | + $sitemenu['new_module'] = array( |
|
| 211 | + 'new_module', |
|
| 212 | + 'modules', |
|
| 213 | + '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'], |
|
| 214 | + 'index.php?a=106', |
|
| 215 | + $_lang['module_management'], |
|
| 216 | + '', |
|
| 217 | + 'new_module,edit_module', |
|
| 218 | + 'main', |
|
| 219 | + 1, |
|
| 220 | + 0, |
|
| 221 | + '' |
|
| 222 | + ); |
|
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | if($modx->hasPermission('exec_module')) {
|
| 226 | - if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
|
|
| 227 | - $rs = $modx->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
|
|
| 226 | + if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
|
|
| 227 | + $rs = $modx->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
|
|
| 228 | 228 | FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
|
| 229 | 229 | LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
|
| 230 | 230 | LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
|
| 231 | 231 | WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1 |
| 232 | 232 | ORDER BY sm.name'); |
| 233 | - } else {
|
|
| 234 | - $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
|
|
| 235 | - } |
|
| 236 | - if($modx->getDatabase()->getRecordCount($rs)) {
|
|
| 237 | - while ($row = $modx->getDatabase()->getRow($rs)) {
|
|
| 233 | + } else {
|
|
| 234 | + $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
|
|
| 235 | + } |
|
| 236 | + if($modx->getDatabase()->getRecordCount($rs)) {
|
|
| 237 | + while ($row = $modx->getDatabase()->getRow($rs)) {
|
|
| 238 | 238 | $sitemenu['module' . $row['id']] = array( |
| 239 | 239 | 'module' . $row['id'], |
| 240 | 240 | 'modules', |
@@ -255,83 +255,83 @@ discard block |
||
| 255 | 255 | // security menu items (users) |
| 256 | 256 | |
| 257 | 257 | if($modx->hasPermission('edit_user')) {
|
| 258 | - $sitemenu['user_management_title'] = array( |
|
| 259 | - 'user_management_title', |
|
| 260 | - 'users', |
|
| 261 | - '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 262 | - 'index.php?a=75', |
|
| 263 | - $_lang['user_management_title'], |
|
| 264 | - '', |
|
| 265 | - 'edit_user', |
|
| 266 | - 'main', |
|
| 267 | - 0, |
|
| 268 | - 10, |
|
| 269 | - 'dropdown-toggle' |
|
| 270 | - ); |
|
| 258 | + $sitemenu['user_management_title'] = array( |
|
| 259 | + 'user_management_title', |
|
| 260 | + 'users', |
|
| 261 | + '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 262 | + 'index.php?a=75', |
|
| 263 | + $_lang['user_management_title'], |
|
| 264 | + '', |
|
| 265 | + 'edit_user', |
|
| 266 | + 'main', |
|
| 267 | + 0, |
|
| 268 | + 10, |
|
| 269 | + 'dropdown-toggle' |
|
| 270 | + ); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | if($modx->hasPermission('edit_web_user')) {
|
| 274 | - $sitemenu['web_user_management_title'] = array( |
|
| 275 | - 'web_user_management_title', |
|
| 276 | - 'users', |
|
| 277 | - '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 278 | - 'index.php?a=99', |
|
| 279 | - $_lang['web_user_management_title'], |
|
| 280 | - '', |
|
| 281 | - 'edit_web_user', |
|
| 282 | - 'main', |
|
| 283 | - 0, |
|
| 284 | - 20, |
|
| 285 | - 'dropdown-toggle' |
|
| 286 | - ); |
|
| 274 | + $sitemenu['web_user_management_title'] = array( |
|
| 275 | + 'web_user_management_title', |
|
| 276 | + 'users', |
|
| 277 | + '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 278 | + 'index.php?a=99', |
|
| 279 | + $_lang['web_user_management_title'], |
|
| 280 | + '', |
|
| 281 | + 'edit_web_user', |
|
| 282 | + 'main', |
|
| 283 | + 0, |
|
| 284 | + 20, |
|
| 285 | + 'dropdown-toggle' |
|
| 286 | + ); |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | if($modx->hasPermission('edit_role')) {
|
| 290 | - $sitemenu['role_management_title'] = array( |
|
| 291 | - 'role_management_title', |
|
| 292 | - 'users', |
|
| 293 | - '<i class="fa fa-legal"></i>' . $_lang['role_management_title'], |
|
| 294 | - 'index.php?a=86', |
|
| 295 | - $_lang['role_management_title'], |
|
| 296 | - '', |
|
| 297 | - 'new_role,edit_role,delete_role', |
|
| 298 | - 'main', |
|
| 299 | - 0, |
|
| 300 | - 30, |
|
| 301 | - '' |
|
| 302 | - ); |
|
| 290 | + $sitemenu['role_management_title'] = array( |
|
| 291 | + 'role_management_title', |
|
| 292 | + 'users', |
|
| 293 | + '<i class="fa fa-legal"></i>' . $_lang['role_management_title'], |
|
| 294 | + 'index.php?a=86', |
|
| 295 | + $_lang['role_management_title'], |
|
| 296 | + '', |
|
| 297 | + 'new_role,edit_role,delete_role', |
|
| 298 | + 'main', |
|
| 299 | + 0, |
|
| 300 | + 30, |
|
| 301 | + '' |
|
| 302 | + ); |
|
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | if($modx->hasPermission('access_permissions')) {
|
| 306 | - $sitemenu['manager_permissions'] = array( |
|
| 307 | - 'manager_permissions', |
|
| 308 | - 'users', |
|
| 309 | - '<i class="fa fa-male"></i>' . $_lang['manager_permissions'], |
|
| 310 | - 'index.php?a=40', |
|
| 311 | - $_lang['manager_permissions'], |
|
| 312 | - '', |
|
| 313 | - 'access_permissions', |
|
| 314 | - 'main', |
|
| 315 | - 0, |
|
| 316 | - 40, |
|
| 317 | - '' |
|
| 318 | - ); |
|
| 306 | + $sitemenu['manager_permissions'] = array( |
|
| 307 | + 'manager_permissions', |
|
| 308 | + 'users', |
|
| 309 | + '<i class="fa fa-male"></i>' . $_lang['manager_permissions'], |
|
| 310 | + 'index.php?a=40', |
|
| 311 | + $_lang['manager_permissions'], |
|
| 312 | + '', |
|
| 313 | + 'access_permissions', |
|
| 314 | + 'main', |
|
| 315 | + 0, |
|
| 316 | + 40, |
|
| 317 | + '' |
|
| 318 | + ); |
|
| 319 | 319 | } |
| 320 | 320 | |
| 321 | 321 | if($modx->hasPermission('web_access_permissions')) {
|
| 322 | - $sitemenu['web_permissions'] = array( |
|
| 323 | - 'web_permissions', |
|
| 324 | - 'users', |
|
| 325 | - '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'], |
|
| 326 | - 'index.php?a=91', |
|
| 327 | - $_lang['web_permissions'], |
|
| 328 | - '', |
|
| 329 | - 'web_access_permissions', |
|
| 330 | - 'main', |
|
| 331 | - 0, |
|
| 332 | - 50, |
|
| 333 | - '' |
|
| 334 | - ); |
|
| 322 | + $sitemenu['web_permissions'] = array( |
|
| 323 | + 'web_permissions', |
|
| 324 | + 'users', |
|
| 325 | + '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'], |
|
| 326 | + 'index.php?a=91', |
|
| 327 | + $_lang['web_permissions'], |
|
| 328 | + '', |
|
| 329 | + 'web_access_permissions', |
|
| 330 | + 'main', |
|
| 331 | + 0, |
|
| 332 | + 50, |
|
| 333 | + '' |
|
| 334 | + ); |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | // Tools Menu |
@@ -361,104 +361,104 @@ discard block |
||
| 361 | 361 | ); |
| 362 | 362 | |
| 363 | 363 | $sitemenu['search'] = array( |
| 364 | - 'search', |
|
| 365 | - 'tools', |
|
| 366 | - '<i class="fa fa-search"></i>' . $_lang['search'], |
|
| 367 | - 'index.php?a=71', |
|
| 368 | - $_lang['search'], |
|
| 369 | - '', |
|
| 370 | - '', |
|
| 371 | - 'main', |
|
| 372 | - 1, |
|
| 373 | - 9, |
|
| 374 | - '' |
|
| 364 | + 'search', |
|
| 365 | + 'tools', |
|
| 366 | + '<i class="fa fa-search"></i>' . $_lang['search'], |
|
| 367 | + 'index.php?a=71', |
|
| 368 | + $_lang['search'], |
|
| 369 | + '', |
|
| 370 | + '', |
|
| 371 | + 'main', |
|
| 372 | + 1, |
|
| 373 | + 9, |
|
| 374 | + '' |
|
| 375 | 375 | ); |
| 376 | 376 | |
| 377 | 377 | if($modx->hasPermission('bk_manager')) {
|
| 378 | - $sitemenu['bk_manager'] = array( |
|
| 379 | - 'bk_manager', |
|
| 380 | - 'tools', |
|
| 381 | - '<i class="fa fa-database"></i>' . $_lang['bk_manager'], |
|
| 382 | - 'index.php?a=93', |
|
| 383 | - $_lang['bk_manager'], |
|
| 384 | - '', |
|
| 385 | - 'bk_manager', |
|
| 386 | - 'main', |
|
| 387 | - 0, |
|
| 388 | - 10, |
|
| 389 | - '' |
|
| 390 | - ); |
|
| 378 | + $sitemenu['bk_manager'] = array( |
|
| 379 | + 'bk_manager', |
|
| 380 | + 'tools', |
|
| 381 | + '<i class="fa fa-database"></i>' . $_lang['bk_manager'], |
|
| 382 | + 'index.php?a=93', |
|
| 383 | + $_lang['bk_manager'], |
|
| 384 | + '', |
|
| 385 | + 'bk_manager', |
|
| 386 | + 'main', |
|
| 387 | + 0, |
|
| 388 | + 10, |
|
| 389 | + '' |
|
| 390 | + ); |
|
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | if($modx->hasPermission('remove_locks')) {
|
| 394 | - $sitemenu['remove_locks'] = array( |
|
| 395 | - 'remove_locks', |
|
| 396 | - 'tools', |
|
| 397 | - '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'], |
|
| 398 | - 'javascript:modx.removeLocks();', |
|
| 399 | - $_lang['remove_locks'], |
|
| 400 | - '', |
|
| 401 | - 'remove_locks', |
|
| 402 | - '', |
|
| 403 | - 0, |
|
| 404 | - 20, |
|
| 405 | - '' |
|
| 406 | - ); |
|
| 394 | + $sitemenu['remove_locks'] = array( |
|
| 395 | + 'remove_locks', |
|
| 396 | + 'tools', |
|
| 397 | + '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'], |
|
| 398 | + 'javascript:modx.removeLocks();', |
|
| 399 | + $_lang['remove_locks'], |
|
| 400 | + '', |
|
| 401 | + 'remove_locks', |
|
| 402 | + '', |
|
| 403 | + 0, |
|
| 404 | + 20, |
|
| 405 | + '' |
|
| 406 | + ); |
|
| 407 | 407 | } |
| 408 | 408 | |
| 409 | 409 | if($modx->hasPermission('import_static')) {
|
| 410 | - $sitemenu['import_site'] = array( |
|
| 411 | - 'import_site', |
|
| 412 | - 'tools', |
|
| 413 | - '<i class="fa fa-upload"></i>' . $_lang['import_site'], |
|
| 414 | - 'index.php?a=95', |
|
| 415 | - $_lang['import_site'], |
|
| 416 | - '', |
|
| 417 | - 'import_static', |
|
| 418 | - 'main', |
|
| 419 | - 0, |
|
| 420 | - 30, |
|
| 421 | - '' |
|
| 422 | - ); |
|
| 410 | + $sitemenu['import_site'] = array( |
|
| 411 | + 'import_site', |
|
| 412 | + 'tools', |
|
| 413 | + '<i class="fa fa-upload"></i>' . $_lang['import_site'], |
|
| 414 | + 'index.php?a=95', |
|
| 415 | + $_lang['import_site'], |
|
| 416 | + '', |
|
| 417 | + 'import_static', |
|
| 418 | + 'main', |
|
| 419 | + 0, |
|
| 420 | + 30, |
|
| 421 | + '' |
|
| 422 | + ); |
|
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | if($modx->hasPermission('export_static')) {
|
| 426 | - $sitemenu['export_site'] = array( |
|
| 427 | - 'export_site', |
|
| 428 | - 'tools', |
|
| 429 | - '<i class="fa fa-download"></i>' . $_lang['export_site'], |
|
| 430 | - 'index.php?a=83', |
|
| 431 | - $_lang['export_site'], |
|
| 432 | - '', |
|
| 433 | - 'export_static', |
|
| 434 | - 'main', |
|
| 435 | - 1, |
|
| 436 | - 40, |
|
| 437 | - '' |
|
| 438 | - ); |
|
| 426 | + $sitemenu['export_site'] = array( |
|
| 427 | + 'export_site', |
|
| 428 | + 'tools', |
|
| 429 | + '<i class="fa fa-download"></i>' . $_lang['export_site'], |
|
| 430 | + 'index.php?a=83', |
|
| 431 | + $_lang['export_site'], |
|
| 432 | + '', |
|
| 433 | + 'export_static', |
|
| 434 | + 'main', |
|
| 435 | + 1, |
|
| 436 | + 40, |
|
| 437 | + '' |
|
| 438 | + ); |
|
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
|
| 442 | 442 | if(is_array($menu)) {
|
| 443 | - $newmenu = array(); |
|
| 444 | - foreach($menu as $item){
|
|
| 445 | - if(is_array(unserialize($item))){
|
|
| 446 | - $newmenu = array_merge($newmenu, unserialize($item)); |
|
| 447 | - } |
|
| 448 | - } |
|
| 449 | - if(count($newmenu)> 0) $sitemenu = $newmenu; |
|
| 443 | + $newmenu = array(); |
|
| 444 | + foreach($menu as $item){
|
|
| 445 | + if(is_array(unserialize($item))){
|
|
| 446 | + $newmenu = array_merge($newmenu, unserialize($item)); |
|
| 447 | + } |
|
| 448 | + } |
|
| 449 | + if(count($newmenu)> 0) $sitemenu = $newmenu; |
|
| 450 | 450 | } |
| 451 | 451 | |
| 452 | 452 | if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
|
| 453 | - include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php'); |
|
| 453 | + include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php'); |
|
| 454 | 454 | } else {
|
| 455 | - include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php'); |
|
| 455 | + include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php'); |
|
| 456 | 456 | } |
| 457 | 457 | $menu = new EVOmenu(); |
| 458 | 458 | $menu->Build($sitemenu, array( |
| 459 | - 'outerClass' => 'nav', |
|
| 460 | - 'innerClass' => 'dropdown-menu', |
|
| 461 | - 'parentClass' => 'dropdown', |
|
| 459 | + 'outerClass' => 'nav', |
|
| 460 | + 'innerClass' => 'dropdown-menu', |
|
| 461 | + 'parentClass' => 'dropdown', |
|
| 462 | 462 | 'parentLinkClass' => 'dropdown-toggle', |
| 463 | 463 | 'parentLinkAttr' => '', |
| 464 | 464 | 'parentLinkIn' => '' |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | $sitemenu['site'] = array( |
| 22 | 22 | 'site', |
| 23 | 23 | 'main', |
| 24 | - '<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>', |
|
| 24 | + '<i class="fa fa-tachometer"></i><span class="menu-item-text">'.$_lang['home'].'</span>', |
|
| 25 | 25 | 'index.php?a=2', |
| 26 | 26 | $_lang['home'], |
| 27 | 27 | '', |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | 'active' |
| 33 | 33 | ); |
| 34 | 34 | |
| 35 | -if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
|
|
| 35 | +if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
|
|
| 36 | 36 | $sitemenu['elements'] = array( |
| 37 | 37 | 'elements', |
| 38 | 38 | 'main', |
| 39 | - '<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>', |
|
| 39 | + '<i class="fa fa-th"></i><span class="menu-item-text">'.$_lang['elements'].'</span>', |
|
| 40 | 40 | 'javascript:;', |
| 41 | 41 | $_lang['elements'], |
| 42 | 42 | ' return false;', |
@@ -48,11 +48,11 @@ discard block |
||
| 48 | 48 | ); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | -if($modx->hasPermission('exec_module')) {
|
|
| 51 | +if ($modx->hasPermission('exec_module')) {
|
|
| 52 | 52 | $sitemenu['modules'] = array( |
| 53 | 53 | 'modules', |
| 54 | 54 | 'main', |
| 55 | - '<i class="'.$_style['icons_modules'] .'"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>', |
|
| 55 | + '<i class="'.$_style['icons_modules'].'"></i><span class="menu-item-text">'.$_lang['modules'].'</span>', |
|
| 56 | 56 | 'javascript:;', |
| 57 | 57 | $_lang['modules'], |
| 58 | 58 | ' return false;', |
@@ -64,11 +64,11 @@ discard block |
||
| 64 | 64 | ); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | -if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
|
|
| 67 | +if ($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
|
|
| 68 | 68 | $sitemenu['users'] = array( |
| 69 | 69 | 'users', |
| 70 | 70 | 'main', |
| 71 | - '<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>', |
|
| 71 | + '<i class="fa fa-users"></i><span class="menu-item-text">'.$_lang['users'].'</span>', |
|
| 72 | 72 | 'javascript:;', |
| 73 | 73 | $_lang['users'], |
| 74 | 74 | ' return false;', |
@@ -80,11 +80,11 @@ discard block |
||
| 80 | 80 | ); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | -if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
|
|
| 83 | +if ($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
|
|
| 84 | 84 | $sitemenu['tools'] = array( |
| 85 | 85 | 'tools', |
| 86 | 86 | 'main', |
| 87 | - '<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>', |
|
| 87 | + '<i class="fa fa-wrench"></i><span class="menu-item-text">'.$_lang['tools'].'</span>', |
|
| 88 | 88 | 'javascript:;', |
| 89 | 89 | $_lang['tools'], |
| 90 | 90 | ' return false;', |
@@ -97,12 +97,12 @@ discard block |
||
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $tab = 0; |
| 100 | -if($modx->hasPermission('edit_template')) {
|
|
| 100 | +if ($modx->hasPermission('edit_template')) {
|
|
| 101 | 101 | $sitemenu['element_templates'] = array( |
| 102 | 102 | 'element_templates', |
| 103 | 103 | 'elements', |
| 104 | - '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 105 | - 'index.php?a=76&tab=' . $tab++, |
|
| 104 | + '<i class="fa fa-newspaper-o"></i>'.$_lang['manage_templates'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 105 | + 'index.php?a=76&tab='.$tab++, |
|
| 106 | 106 | $_lang['manage_templates'], |
| 107 | 107 | '', |
| 108 | 108 | 'new_template,edit_template', |
@@ -112,12 +112,12 @@ discard block |
||
| 112 | 112 | 'dropdown-toggle' |
| 113 | 113 | ); |
| 114 | 114 | } |
| 115 | -if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
|
|
| 115 | +if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
|
|
| 116 | 116 | $sitemenu['element_tplvars'] = array( |
| 117 | 117 | 'element_tplvars', |
| 118 | 118 | 'elements', |
| 119 | - '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 120 | - 'index.php?a=76&tab=' . $tab++, |
|
| 119 | + '<i class="fa fa-list-alt"></i>'.$_lang['tmplvars'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 120 | + 'index.php?a=76&tab='.$tab++, |
|
| 121 | 121 | $_lang['tmplvars'], |
| 122 | 122 | '', |
| 123 | 123 | 'new_template,edit_template', |
@@ -127,12 +127,12 @@ discard block |
||
| 127 | 127 | 'dropdown-toggle' |
| 128 | 128 | ); |
| 129 | 129 | } |
| 130 | -if($modx->hasPermission('edit_chunk')) {
|
|
| 130 | +if ($modx->hasPermission('edit_chunk')) {
|
|
| 131 | 131 | $sitemenu['element_htmlsnippets'] = array( |
| 132 | 132 | 'element_htmlsnippets', |
| 133 | 133 | 'elements', |
| 134 | - '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 135 | - 'index.php?a=76&tab=' . $tab++, |
|
| 134 | + '<i class="fa fa-th-large"></i>'.$_lang['manage_htmlsnippets'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 135 | + 'index.php?a=76&tab='.$tab++, |
|
| 136 | 136 | $_lang['manage_htmlsnippets'], |
| 137 | 137 | '', |
| 138 | 138 | 'new_chunk,edit_chunk', |
@@ -142,12 +142,12 @@ discard block |
||
| 142 | 142 | 'dropdown-toggle' |
| 143 | 143 | ); |
| 144 | 144 | } |
| 145 | -if($modx->hasPermission('edit_snippet')) {
|
|
| 145 | +if ($modx->hasPermission('edit_snippet')) {
|
|
| 146 | 146 | $sitemenu['element_snippets'] = array( |
| 147 | 147 | 'element_snippets', |
| 148 | 148 | 'elements', |
| 149 | - '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 150 | - 'index.php?a=76&tab=' . $tab++, |
|
| 149 | + '<i class="fa fa-code"></i>'.$_lang['manage_snippets'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 150 | + 'index.php?a=76&tab='.$tab++, |
|
| 151 | 151 | $_lang['manage_snippets'], |
| 152 | 152 | '', |
| 153 | 153 | 'new_snippet,edit_snippet', |
@@ -157,12 +157,12 @@ discard block |
||
| 157 | 157 | 'dropdown-toggle' |
| 158 | 158 | ); |
| 159 | 159 | } |
| 160 | -if($modx->hasPermission('edit_plugin')) {
|
|
| 160 | +if ($modx->hasPermission('edit_plugin')) {
|
|
| 161 | 161 | $sitemenu['element_plugins'] = array( |
| 162 | 162 | 'element_plugins', |
| 163 | 163 | 'elements', |
| 164 | - '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 165 | - 'index.php?a=76&tab=' . $tab++, |
|
| 164 | + '<i class="fa fa-plug"></i>'.$_lang['manage_plugins'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 165 | + 'index.php?a=76&tab='.$tab++, |
|
| 166 | 166 | $_lang['manage_plugins'], |
| 167 | 167 | '', |
| 168 | 168 | 'new_plugin,edit_plugin', |
@@ -174,11 +174,11 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | //$sitemenu['element_categories'] = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
|
| 176 | 176 | |
| 177 | -if($modx->hasPermission('file_manager')) {
|
|
| 177 | +if ($modx->hasPermission('file_manager')) {
|
|
| 178 | 178 | $sitemenu['manage_files'] = array( |
| 179 | 179 | 'manage_files', |
| 180 | 180 | 'elements', |
| 181 | - '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'], |
|
| 181 | + '<i class="fa fa-folder-open-o"></i>'.$_lang['manage_files'], |
|
| 182 | 182 | 'index.php?a=31', |
| 183 | 183 | $_lang['manage_files'], |
| 184 | 184 | '', |
@@ -189,11 +189,11 @@ discard block |
||
| 189 | 189 | '' |
| 190 | 190 | ); |
| 191 | 191 | } |
| 192 | -if($modx->hasPermission('category_manager')) {
|
|
| 192 | +if ($modx->hasPermission('category_manager')) {
|
|
| 193 | 193 | $sitemenu['manage_categories'] = array( |
| 194 | 194 | 'manage_categories', |
| 195 | 195 | 'elements', |
| 196 | - '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'], |
|
| 196 | + '<i class="fa fa-object-group"></i>'.$_lang['manage_categories'], |
|
| 197 | 197 | 'index.php?a=120', |
| 198 | 198 | $_lang['manage_categories'], |
| 199 | 199 | '', |
@@ -206,11 +206,11 @@ discard block |
||
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | // Modules Menu Items |
| 209 | -if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
|
|
| 209 | +if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
|
|
| 210 | 210 | $sitemenu['new_module'] = array( |
| 211 | 211 | 'new_module', |
| 212 | 212 | 'modules', |
| 213 | - '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'], |
|
| 213 | + '<i class="'.$_style['icons_modules'].'"></i>'.$_lang['module_management'], |
|
| 214 | 214 | 'index.php?a=106', |
| 215 | 215 | $_lang['module_management'], |
| 216 | 216 | '', |
@@ -222,24 +222,24 @@ discard block |
||
| 222 | 222 | ); |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | -if($modx->hasPermission('exec_module')) {
|
|
| 226 | - if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
|
|
| 225 | +if ($modx->hasPermission('exec_module')) {
|
|
| 226 | + if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
|
|
| 227 | 227 | $rs = $modx->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
|
| 228 | - FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
|
|
| 229 | - LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
|
|
| 230 | - LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
|
|
| 231 | - WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1 |
|
| 228 | + FROM ' . $modx->getFullTableName('site_modules').' AS sm
|
|
| 229 | + LEFT JOIN ' . $modx->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id
|
|
| 230 | + LEFT JOIN ' . $modx->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group
|
|
| 231 | + WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1 |
|
| 232 | 232 | ORDER BY sm.name'); |
| 233 | 233 | } else {
|
| 234 | 234 | $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
|
| 235 | 235 | } |
| 236 | - if($modx->getDatabase()->getRecordCount($rs)) {
|
|
| 236 | + if ($modx->getDatabase()->getRecordCount($rs)) {
|
|
| 237 | 237 | while ($row = $modx->getDatabase()->getRow($rs)) {
|
| 238 | - $sitemenu['module' . $row['id']] = array( |
|
| 239 | - 'module' . $row['id'], |
|
| 238 | + $sitemenu['module'.$row['id']] = array( |
|
| 239 | + 'module'.$row['id'], |
|
| 240 | 240 | 'modules', |
| 241 | - ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>') . $row['name'], |
|
| 242 | - 'index.php?a=112&id=' . $row['id'], |
|
| 241 | + ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>').$row['name'], |
|
| 242 | + 'index.php?a=112&id='.$row['id'], |
|
| 243 | 243 | $row['name'], |
| 244 | 244 | '', |
| 245 | 245 | '', |
@@ -254,11 +254,11 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | // security menu items (users) |
| 256 | 256 | |
| 257 | -if($modx->hasPermission('edit_user')) {
|
|
| 257 | +if ($modx->hasPermission('edit_user')) {
|
|
| 258 | 258 | $sitemenu['user_management_title'] = array( |
| 259 | 259 | 'user_management_title', |
| 260 | 260 | 'users', |
| 261 | - '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 261 | + '<i class="fa fa fa-user"></i>'.$_lang['user_management_title'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 262 | 262 | 'index.php?a=75', |
| 263 | 263 | $_lang['user_management_title'], |
| 264 | 264 | '', |
@@ -270,11 +270,11 @@ discard block |
||
| 270 | 270 | ); |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | -if($modx->hasPermission('edit_web_user')) {
|
|
| 273 | +if ($modx->hasPermission('edit_web_user')) {
|
|
| 274 | 274 | $sitemenu['web_user_management_title'] = array( |
| 275 | 275 | 'web_user_management_title', |
| 276 | 276 | 'users', |
| 277 | - '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 277 | + '<i class="fa fa-users"></i>'.$_lang['web_user_management_title'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 278 | 278 | 'index.php?a=99', |
| 279 | 279 | $_lang['web_user_management_title'], |
| 280 | 280 | '', |
@@ -286,11 +286,11 @@ discard block |
||
| 286 | 286 | ); |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | -if($modx->hasPermission('edit_role')) {
|
|
| 289 | +if ($modx->hasPermission('edit_role')) {
|
|
| 290 | 290 | $sitemenu['role_management_title'] = array( |
| 291 | 291 | 'role_management_title', |
| 292 | 292 | 'users', |
| 293 | - '<i class="fa fa-legal"></i>' . $_lang['role_management_title'], |
|
| 293 | + '<i class="fa fa-legal"></i>'.$_lang['role_management_title'], |
|
| 294 | 294 | 'index.php?a=86', |
| 295 | 295 | $_lang['role_management_title'], |
| 296 | 296 | '', |
@@ -302,11 +302,11 @@ discard block |
||
| 302 | 302 | ); |
| 303 | 303 | } |
| 304 | 304 | |
| 305 | -if($modx->hasPermission('access_permissions')) {
|
|
| 305 | +if ($modx->hasPermission('access_permissions')) {
|
|
| 306 | 306 | $sitemenu['manager_permissions'] = array( |
| 307 | 307 | 'manager_permissions', |
| 308 | 308 | 'users', |
| 309 | - '<i class="fa fa-male"></i>' . $_lang['manager_permissions'], |
|
| 309 | + '<i class="fa fa-male"></i>'.$_lang['manager_permissions'], |
|
| 310 | 310 | 'index.php?a=40', |
| 311 | 311 | $_lang['manager_permissions'], |
| 312 | 312 | '', |
@@ -318,11 +318,11 @@ discard block |
||
| 318 | 318 | ); |
| 319 | 319 | } |
| 320 | 320 | |
| 321 | -if($modx->hasPermission('web_access_permissions')) {
|
|
| 321 | +if ($modx->hasPermission('web_access_permissions')) {
|
|
| 322 | 322 | $sitemenu['web_permissions'] = array( |
| 323 | 323 | 'web_permissions', |
| 324 | 324 | 'users', |
| 325 | - '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'], |
|
| 325 | + '<i class="fa fa-universal-access"></i>'.$_lang['web_permissions'], |
|
| 326 | 326 | 'index.php?a=91', |
| 327 | 327 | $_lang['web_permissions'], |
| 328 | 328 | '', |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | $sitemenu['refresh_site'] = array( |
| 340 | 340 | 'refresh_site', |
| 341 | 341 | 'tools', |
| 342 | - '<i class="fa fa-recycle"></i>' . $_lang['refresh_site'], |
|
| 342 | + '<i class="fa fa-recycle"></i>'.$_lang['refresh_site'], |
|
| 343 | 343 | 'index.php?a=26', |
| 344 | 344 | $_lang['refresh_site'], |
| 345 | 345 | '', |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | 'a', // tag |
| 354 | 354 | 'javascript:;', // href |
| 355 | 355 | 'btn btn-secondary', // class or btn-success |
| 356 | - 'modx.popup({url:\'index.php?a=26\', title:\'' . $_lang['refresh_site'] . '\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
|
|
| 356 | + 'modx.popup({url:\'index.php?a=26\', title:\''.$_lang['refresh_site'].'\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
|
|
| 357 | 357 | $_lang['refresh_site'], // title |
| 358 | 358 | '<i class="fa fa-recycle"></i>' // innerHTML |
| 359 | 359 | ) |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | $sitemenu['search'] = array( |
| 364 | 364 | 'search', |
| 365 | 365 | 'tools', |
| 366 | - '<i class="fa fa-search"></i>' . $_lang['search'], |
|
| 366 | + '<i class="fa fa-search"></i>'.$_lang['search'], |
|
| 367 | 367 | 'index.php?a=71', |
| 368 | 368 | $_lang['search'], |
| 369 | 369 | '', |
@@ -374,11 +374,11 @@ discard block |
||
| 374 | 374 | '' |
| 375 | 375 | ); |
| 376 | 376 | |
| 377 | -if($modx->hasPermission('bk_manager')) {
|
|
| 377 | +if ($modx->hasPermission('bk_manager')) {
|
|
| 378 | 378 | $sitemenu['bk_manager'] = array( |
| 379 | 379 | 'bk_manager', |
| 380 | 380 | 'tools', |
| 381 | - '<i class="fa fa-database"></i>' . $_lang['bk_manager'], |
|
| 381 | + '<i class="fa fa-database"></i>'.$_lang['bk_manager'], |
|
| 382 | 382 | 'index.php?a=93', |
| 383 | 383 | $_lang['bk_manager'], |
| 384 | 384 | '', |
@@ -390,11 +390,11 @@ discard block |
||
| 390 | 390 | ); |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | -if($modx->hasPermission('remove_locks')) {
|
|
| 393 | +if ($modx->hasPermission('remove_locks')) {
|
|
| 394 | 394 | $sitemenu['remove_locks'] = array( |
| 395 | 395 | 'remove_locks', |
| 396 | 396 | 'tools', |
| 397 | - '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'], |
|
| 397 | + '<i class="fa fa-hourglass"></i>'.$_lang['remove_locks'], |
|
| 398 | 398 | 'javascript:modx.removeLocks();', |
| 399 | 399 | $_lang['remove_locks'], |
| 400 | 400 | '', |
@@ -406,11 +406,11 @@ discard block |
||
| 406 | 406 | ); |
| 407 | 407 | } |
| 408 | 408 | |
| 409 | -if($modx->hasPermission('import_static')) {
|
|
| 409 | +if ($modx->hasPermission('import_static')) {
|
|
| 410 | 410 | $sitemenu['import_site'] = array( |
| 411 | 411 | 'import_site', |
| 412 | 412 | 'tools', |
| 413 | - '<i class="fa fa-upload"></i>' . $_lang['import_site'], |
|
| 413 | + '<i class="fa fa-upload"></i>'.$_lang['import_site'], |
|
| 414 | 414 | 'index.php?a=95', |
| 415 | 415 | $_lang['import_site'], |
| 416 | 416 | '', |
@@ -422,11 +422,11 @@ discard block |
||
| 422 | 422 | ); |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | -if($modx->hasPermission('export_static')) {
|
|
| 425 | +if ($modx->hasPermission('export_static')) {
|
|
| 426 | 426 | $sitemenu['export_site'] = array( |
| 427 | 427 | 'export_site', |
| 428 | 428 | 'tools', |
| 429 | - '<i class="fa fa-download"></i>' . $_lang['export_site'], |
|
| 429 | + '<i class="fa fa-download"></i>'.$_lang['export_site'], |
|
| 430 | 430 | 'index.php?a=83', |
| 431 | 431 | $_lang['export_site'], |
| 432 | 432 | '', |
@@ -439,20 +439,20 @@ discard block |
||
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
|
| 442 | -if(is_array($menu)) {
|
|
| 442 | +if (is_array($menu)) {
|
|
| 443 | 443 | $newmenu = array(); |
| 444 | - foreach($menu as $item){
|
|
| 445 | - if(is_array(unserialize($item))){
|
|
| 444 | + foreach ($menu as $item) {
|
|
| 445 | + if (is_array(unserialize($item))) {
|
|
| 446 | 446 | $newmenu = array_merge($newmenu, unserialize($item)); |
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | - if(count($newmenu)> 0) $sitemenu = $newmenu; |
|
| 449 | + if (count($newmenu) > 0) $sitemenu = $newmenu; |
|
| 450 | 450 | } |
| 451 | 451 | |
| 452 | -if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
|
|
| 453 | - include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php'); |
|
| 452 | +if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php')) {
|
|
| 453 | + include_once(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php'); |
|
| 454 | 454 | } else {
|
| 455 | - include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php'); |
|
| 455 | + include_once(MODX_MANAGER_PATH.'includes/menu.class.inc.php'); |
|
| 456 | 456 | } |
| 457 | 457 | $menu = new EVOmenu(); |
| 458 | 458 | $menu->Build($sitemenu, array( |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | 'active' |
| 33 | 33 | ); |
| 34 | 34 | |
| 35 | -if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
|
|
| 35 | +if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) { |
|
| 36 | 36 | $sitemenu['elements'] = array( |
| 37 | 37 | 'elements', |
| 38 | 38 | 'main', |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | ); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | -if($modx->hasPermission('exec_module')) {
|
|
| 51 | +if($modx->hasPermission('exec_module')) { |
|
| 52 | 52 | $sitemenu['modules'] = array( |
| 53 | 53 | 'modules', |
| 54 | 54 | 'main', |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | ); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | -if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
|
|
| 67 | +if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) { |
|
| 68 | 68 | $sitemenu['users'] = array( |
| 69 | 69 | 'users', |
| 70 | 70 | 'main', |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | ); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | -if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
|
|
| 83 | +if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) { |
|
| 84 | 84 | $sitemenu['tools'] = array( |
| 85 | 85 | 'tools', |
| 86 | 86 | 'main', |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $tab = 0; |
| 100 | -if($modx->hasPermission('edit_template')) {
|
|
| 100 | +if($modx->hasPermission('edit_template')) { |
|
| 101 | 101 | $sitemenu['element_templates'] = array( |
| 102 | 102 | 'element_templates', |
| 103 | 103 | 'elements', |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | 'dropdown-toggle' |
| 113 | 113 | ); |
| 114 | 114 | } |
| 115 | -if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
|
|
| 115 | +if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) { |
|
| 116 | 116 | $sitemenu['element_tplvars'] = array( |
| 117 | 117 | 'element_tplvars', |
| 118 | 118 | 'elements', |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | 'dropdown-toggle' |
| 128 | 128 | ); |
| 129 | 129 | } |
| 130 | -if($modx->hasPermission('edit_chunk')) {
|
|
| 130 | +if($modx->hasPermission('edit_chunk')) { |
|
| 131 | 131 | $sitemenu['element_htmlsnippets'] = array( |
| 132 | 132 | 'element_htmlsnippets', |
| 133 | 133 | 'elements', |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | 'dropdown-toggle' |
| 143 | 143 | ); |
| 144 | 144 | } |
| 145 | -if($modx->hasPermission('edit_snippet')) {
|
|
| 145 | +if($modx->hasPermission('edit_snippet')) { |
|
| 146 | 146 | $sitemenu['element_snippets'] = array( |
| 147 | 147 | 'element_snippets', |
| 148 | 148 | 'elements', |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | 'dropdown-toggle' |
| 158 | 158 | ); |
| 159 | 159 | } |
| 160 | -if($modx->hasPermission('edit_plugin')) {
|
|
| 160 | +if($modx->hasPermission('edit_plugin')) { |
|
| 161 | 161 | $sitemenu['element_plugins'] = array( |
| 162 | 162 | 'element_plugins', |
| 163 | 163 | 'elements', |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | //$sitemenu['element_categories'] = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
|
| 176 | 176 | |
| 177 | -if($modx->hasPermission('file_manager')) {
|
|
| 177 | +if($modx->hasPermission('file_manager')) { |
|
| 178 | 178 | $sitemenu['manage_files'] = array( |
| 179 | 179 | 'manage_files', |
| 180 | 180 | 'elements', |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | '' |
| 190 | 190 | ); |
| 191 | 191 | } |
| 192 | -if($modx->hasPermission('category_manager')) {
|
|
| 192 | +if($modx->hasPermission('category_manager')) { |
|
| 193 | 193 | $sitemenu['manage_categories'] = array( |
| 194 | 194 | 'manage_categories', |
| 195 | 195 | 'elements', |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | // Modules Menu Items |
| 209 | -if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
|
|
| 209 | +if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) { |
|
| 210 | 210 | $sitemenu['new_module'] = array( |
| 211 | 211 | 'new_module', |
| 212 | 212 | 'modules', |
@@ -222,19 +222,19 @@ discard block |
||
| 222 | 222 | ); |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | -if($modx->hasPermission('exec_module')) {
|
|
| 226 | - if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
|
|
| 225 | +if($modx->hasPermission('exec_module')) { |
|
| 226 | + if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) { |
|
| 227 | 227 | $rs = $modx->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
|
| 228 | 228 | FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
|
| 229 | 229 | LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
|
| 230 | 230 | LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
|
| 231 | 231 | WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1 |
| 232 | 232 | ORDER BY sm.name'); |
| 233 | - } else {
|
|
| 233 | + } else { |
|
| 234 | 234 | $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
|
| 235 | 235 | } |
| 236 | - if($modx->getDatabase()->getRecordCount($rs)) {
|
|
| 237 | - while ($row = $modx->getDatabase()->getRow($rs)) {
|
|
| 236 | + if($modx->getDatabase()->getRecordCount($rs)) { |
|
| 237 | + while ($row = $modx->getDatabase()->getRow($rs)) { |
|
| 238 | 238 | $sitemenu['module' . $row['id']] = array( |
| 239 | 239 | 'module' . $row['id'], |
| 240 | 240 | 'modules', |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | // security menu items (users) |
| 256 | 256 | |
| 257 | -if($modx->hasPermission('edit_user')) {
|
|
| 257 | +if($modx->hasPermission('edit_user')) { |
|
| 258 | 258 | $sitemenu['user_management_title'] = array( |
| 259 | 259 | 'user_management_title', |
| 260 | 260 | 'users', |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | ); |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | -if($modx->hasPermission('edit_web_user')) {
|
|
| 273 | +if($modx->hasPermission('edit_web_user')) { |
|
| 274 | 274 | $sitemenu['web_user_management_title'] = array( |
| 275 | 275 | 'web_user_management_title', |
| 276 | 276 | 'users', |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | ); |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | -if($modx->hasPermission('edit_role')) {
|
|
| 289 | +if($modx->hasPermission('edit_role')) { |
|
| 290 | 290 | $sitemenu['role_management_title'] = array( |
| 291 | 291 | 'role_management_title', |
| 292 | 292 | 'users', |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | ); |
| 303 | 303 | } |
| 304 | 304 | |
| 305 | -if($modx->hasPermission('access_permissions')) {
|
|
| 305 | +if($modx->hasPermission('access_permissions')) { |
|
| 306 | 306 | $sitemenu['manager_permissions'] = array( |
| 307 | 307 | 'manager_permissions', |
| 308 | 308 | 'users', |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | ); |
| 319 | 319 | } |
| 320 | 320 | |
| 321 | -if($modx->hasPermission('web_access_permissions')) {
|
|
| 321 | +if($modx->hasPermission('web_access_permissions')) { |
|
| 322 | 322 | $sitemenu['web_permissions'] = array( |
| 323 | 323 | 'web_permissions', |
| 324 | 324 | 'users', |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | '' |
| 375 | 375 | ); |
| 376 | 376 | |
| 377 | -if($modx->hasPermission('bk_manager')) {
|
|
| 377 | +if($modx->hasPermission('bk_manager')) { |
|
| 378 | 378 | $sitemenu['bk_manager'] = array( |
| 379 | 379 | 'bk_manager', |
| 380 | 380 | 'tools', |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | ); |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | -if($modx->hasPermission('remove_locks')) {
|
|
| 393 | +if($modx->hasPermission('remove_locks')) { |
|
| 394 | 394 | $sitemenu['remove_locks'] = array( |
| 395 | 395 | 'remove_locks', |
| 396 | 396 | 'tools', |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | ); |
| 407 | 407 | } |
| 408 | 408 | |
| 409 | -if($modx->hasPermission('import_static')) {
|
|
| 409 | +if($modx->hasPermission('import_static')) { |
|
| 410 | 410 | $sitemenu['import_site'] = array( |
| 411 | 411 | 'import_site', |
| 412 | 412 | 'tools', |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | ); |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | -if($modx->hasPermission('export_static')) {
|
|
| 425 | +if($modx->hasPermission('export_static')) { |
|
| 426 | 426 | $sitemenu['export_site'] = array( |
| 427 | 427 | 'export_site', |
| 428 | 428 | 'tools', |
@@ -439,19 +439,21 @@ discard block |
||
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
|
| 442 | -if(is_array($menu)) {
|
|
| 442 | +if(is_array($menu)) { |
|
| 443 | 443 | $newmenu = array(); |
| 444 | - foreach($menu as $item){
|
|
| 445 | - if(is_array(unserialize($item))){
|
|
| 444 | + foreach($menu as $item) { |
|
| 445 | + if(is_array(unserialize($item))) { |
|
| 446 | 446 | $newmenu = array_merge($newmenu, unserialize($item)); |
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | - if(count($newmenu)> 0) $sitemenu = $newmenu; |
|
| 450 | -} |
|
| 449 | + if(count($newmenu)> 0) { |
|
| 450 | + $sitemenu = $newmenu; |
|
| 451 | + } |
|
| 452 | + } |
|
| 451 | 453 | |
| 452 | -if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
|
|
| 454 | +if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) { |
|
| 453 | 455 | include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php'); |
| 454 | -} else {
|
|
| 456 | +} else { |
|
| 455 | 457 | include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php'); |
| 456 | 458 | } |
| 457 | 459 | $menu = new EVOmenu(); |
@@ -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 | if (!$modx->hasPermission('file_manager')) { |
@@ -9,15 +9,15 @@ discard block |
||
| 9 | 9 | $newToken = makeToken(); |
| 10 | 10 | |
| 11 | 11 | // settings |
| 12 | -$theme_image_path = $modx->config['site_manager_url'] . 'media/style/' . $modx->config['manager_theme'] . '/images/'; |
|
| 12 | +$theme_image_path = $modx->config['site_manager_url'].'media/style/'.$modx->config['manager_theme'].'/images/'; |
|
| 13 | 13 | $excludes = array( |
| 14 | 14 | '.', |
| 15 | 15 | '..', |
| 16 | 16 | '.svn' |
| 17 | 17 | ); |
| 18 | -$alias_suffix = (!empty($friendly_url_suffix)) ? ',' . ltrim($friendly_url_suffix, '.') : ''; |
|
| 19 | -$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json,ini' . $alias_suffix); |
|
| 20 | -$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json,ini' . $alias_suffix); |
|
| 18 | +$alias_suffix = (!empty($friendly_url_suffix)) ? ','.ltrim($friendly_url_suffix, '.') : ''; |
|
| 19 | +$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json,ini'.$alias_suffix); |
|
| 20 | +$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json,ini'.$alias_suffix); |
|
| 21 | 21 | $viewablefiles = explode(',', 'jpg,gif,png,ico'); |
| 22 | 22 | |
| 23 | 23 | $editablefiles = add_dot($editablefiles); |
@@ -30,31 +30,31 @@ discard block |
||
| 30 | 30 | { |
| 31 | 31 | */ |
| 32 | 32 | $protected_path[] = $modx->config['site_manager_path']; |
| 33 | -$protected_path[] = $modx->config['base_path'] . 'temp/backup'; |
|
| 34 | -$protected_path[] = $modx->config['base_path'] . 'assets/backup'; |
|
| 33 | +$protected_path[] = $modx->config['base_path'].'temp/backup'; |
|
| 34 | +$protected_path[] = $modx->config['base_path'].'assets/backup'; |
|
| 35 | 35 | |
| 36 | 36 | if (!$modx->hasPermission('save_plugin')) { |
| 37 | - $protected_path[] = $modx->config['base_path'] . 'assets/plugins'; |
|
| 37 | + $protected_path[] = $modx->config['base_path'].'assets/plugins'; |
|
| 38 | 38 | } |
| 39 | 39 | if (!$modx->hasPermission('save_snippet')) { |
| 40 | - $protected_path[] = $modx->config['base_path'] . 'assets/snippets'; |
|
| 40 | + $protected_path[] = $modx->config['base_path'].'assets/snippets'; |
|
| 41 | 41 | } |
| 42 | 42 | if (!$modx->hasPermission('save_template')) { |
| 43 | - $protected_path[] = $modx->config['base_path'] . 'assets/templates'; |
|
| 43 | + $protected_path[] = $modx->config['base_path'].'assets/templates'; |
|
| 44 | 44 | } |
| 45 | 45 | if (!$modx->hasPermission('save_module')) { |
| 46 | - $protected_path[] = $modx->config['base_path'] . 'assets/modules'; |
|
| 46 | + $protected_path[] = $modx->config['base_path'].'assets/modules'; |
|
| 47 | 47 | } |
| 48 | 48 | if (!$modx->hasPermission('empty_cache')) { |
| 49 | - $protected_path[] = $modx->config['base_path'] . 'assets/cache'; |
|
| 49 | + $protected_path[] = $modx->config['base_path'].'assets/cache'; |
|
| 50 | 50 | } |
| 51 | 51 | if (!$modx->hasPermission('import_static')) { |
| 52 | - $protected_path[] = $modx->config['base_path'] . 'temp/import'; |
|
| 53 | - $protected_path[] = $modx->config['base_path'] . 'assets/import'; |
|
| 52 | + $protected_path[] = $modx->config['base_path'].'temp/import'; |
|
| 53 | + $protected_path[] = $modx->config['base_path'].'assets/import'; |
|
| 54 | 54 | } |
| 55 | 55 | if (!$modx->hasPermission('export_static')) { |
| 56 | - $protected_path[] = $modx->config['base_path'] . 'temp/export'; |
|
| 57 | - $protected_path[] = $modx->config['base_path'] . 'assets/export'; |
|
| 56 | + $protected_path[] = $modx->config['base_path'].'temp/export'; |
|
| 57 | + $protected_path[] = $modx->config['base_path'].'assets/export'; |
|
| 58 | 58 | } |
| 59 | 59 | /* |
| 60 | 60 | } |
@@ -96,15 +96,15 @@ discard block |
||
| 96 | 96 | $rw = realpath('../'); |
| 97 | 97 | $webstart_path = str_replace('\\', '/', str_replace($rw, '', $rf)); |
| 98 | 98 | if (substr($webstart_path, 0, 1) == '/') { |
| 99 | - $webstart_path = '..' . $webstart_path; |
|
| 99 | + $webstart_path = '..'.$webstart_path; |
|
| 100 | 100 | } else { |
| 101 | - $webstart_path = '../' . $webstart_path; |
|
| 101 | + $webstart_path = '../'.$webstart_path; |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | ?> |
| 105 | 105 | <script type="text/javascript"> |
| 106 | 106 | |
| 107 | - var current_path = '<?= $startpath;?>'; |
|
| 107 | + var current_path = '<?= $startpath; ?>'; |
|
| 108 | 108 | |
| 109 | 109 | function viewfile (url) |
| 110 | 110 | { |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | function unzipFile (file) |
| 141 | 141 | { |
| 142 | 142 | if (confirmUnzip()) { |
| 143 | - window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken;?>"; |
|
| 143 | + window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken; ?>"; |
|
| 144 | 144 | return false; |
| 145 | 145 | } |
| 146 | 146 | } |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | function deleteFolder (folder, status) |
| 163 | 163 | { |
| 164 | 164 | if (confirmDeleteFolder(status)) { |
| 165 | - window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken;?>"; |
|
| 165 | + window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken; ?>"; |
|
| 166 | 166 | return false; |
| 167 | 167 | } |
| 168 | 168 | } |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | function deleteFile (file) |
| 171 | 171 | { |
| 172 | 172 | if (confirmDelete()) { |
| 173 | - window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken;?>"; |
|
| 173 | + window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken; ?>"; |
|
| 174 | 174 | return false; |
| 175 | 175 | } |
| 176 | 176 | } |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | { |
| 180 | 180 | var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file); |
| 181 | 181 | if (newFilename !== null && newFilename !== file) { |
| 182 | - window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>"; |
|
| 182 | + window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>"; |
|
| 183 | 183 | } |
| 184 | 184 | } |
| 185 | 185 | |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | { |
| 188 | 188 | var newDirname = prompt("<?= $_lang["files_dynamic_new_folder_name"] ?>", dir); |
| 189 | 189 | if (newDirname !== null && newDirname !== dir) { |
| 190 | - window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken;?>"; |
|
| 190 | + window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken; ?>"; |
|
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | { |
| 196 | 196 | var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file); |
| 197 | 197 | if (newFilename !== null && newFilename !== file) { |
| 198 | - window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>"; |
|
| 198 | + window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>"; |
|
| 199 | 199 | } |
| 200 | 200 | } |
| 201 | 201 | |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | <?php endif ?> |
| 215 | 215 | <?php |
| 216 | 216 | if (isset($_GET['mode']) && $_GET['mode'] !== 'drill') { |
| 217 | - $href = 'a=31&path=' . urlencode($_REQUEST['path']); |
|
| 217 | + $href = 'a=31&path='.urlencode($_REQUEST['path']); |
|
| 218 | 218 | } else { |
| 219 | 219 | $href = 'a=2'; |
| 220 | 220 | } |
@@ -224,12 +224,12 @@ discard block |
||
| 224 | 224 | $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFolderName(this);"><i class="[+image+]"></i><span>[+subject+]</span></a>'; |
| 225 | 225 | $ph['image'] = $_style['files_folder-open']; |
| 226 | 226 | $ph['subject'] = $_lang['add_folder']; |
| 227 | - $ph['href'] = 'index.php?a=31&mode=newfolder&path=' . urlencode($startpath) . '&name='; |
|
| 227 | + $ph['href'] = 'index.php?a=31&mode=newfolder&path='.urlencode($startpath).'&name='; |
|
| 228 | 228 | $_ = parsePlaceholder($tpl, $ph); |
| 229 | 229 | |
| 230 | - $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>' . $_lang['files.dynamic.php1'] . '</span></a>'; |
|
| 230 | + $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>'.$_lang['files.dynamic.php1'].'</span></a>'; |
|
| 231 | 231 | $ph['image'] = $_style['files_page_html']; |
| 232 | - $ph['href'] = 'index.php?a=31&mode=newfile&path=' . urlencode($startpath) . '&name='; |
|
| 232 | + $ph['href'] = 'index.php?a=31&mode=newfile&path='.urlencode($startpath).'&name='; |
|
| 233 | 233 | $_ .= parsePlaceholder($tpl, $ph); |
| 234 | 234 | echo $_; |
| 235 | 235 | } |
@@ -259,12 +259,12 @@ discard block |
||
| 259 | 259 | $ph = array(); |
| 260 | 260 | $ph['style_path'] = $theme_image_path; |
| 261 | 261 | // To Top Level with folder icon to the left |
| 262 | - if ($startpath == $filemanager_path || $startpath . '/' == $filemanager_path) { |
|
| 263 | - $ph['image'] = '' . $_style['files_top'] . ''; |
|
| 262 | + if ($startpath == $filemanager_path || $startpath.'/' == $filemanager_path) { |
|
| 263 | + $ph['image'] = ''.$_style['files_top'].''; |
|
| 264 | 264 | $ph['subject'] = '<span>Top</span>'; |
| 265 | 265 | } else { |
| 266 | - $ph['image'] = '' . $_style['files_top'] . ''; |
|
| 267 | - $ph['subject'] = '<a href="index.php?a=31&mode=drill&path=' . $filemanager_path . '">Top</a>/'; |
|
| 266 | + $ph['image'] = ''.$_style['files_top'].''; |
|
| 267 | + $ph['subject'] = '<a href="index.php?a=31&mode=drill&path='.$filemanager_path.'">Top</a>/'; |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | echo parsePlaceholder($tpl, $ph); |
@@ -281,12 +281,12 @@ discard block |
||
| 281 | 281 | if (empty($v)) { |
| 282 | 282 | continue; |
| 283 | 283 | } |
| 284 | - $path .= rtrim($v, '/') . '/'; |
|
| 284 | + $path .= rtrim($v, '/').'/'; |
|
| 285 | 285 | if (1 < $count) { |
| 286 | - $href = 'index.php?a=31&mode=drill&path=' . urlencode($filemanager_path . $path); |
|
| 287 | - $pieces[$i] = '<a href="' . $href . '">' . trim($v, '/') . '</a>'; |
|
| 286 | + $href = 'index.php?a=31&mode=drill&path='.urlencode($filemanager_path.$path); |
|
| 287 | + $pieces[$i] = '<a href="'.$href.'">'.trim($v, '/').'</a>'; |
|
| 288 | 288 | } else { |
| 289 | - $pieces[$i] = '<span>' . trim($v, '/') . '</span>'; |
|
| 289 | + $pieces[$i] = '<span>'.trim($v, '/').'</span>'; |
|
| 290 | 290 | } |
| 291 | 291 | $count--; |
| 292 | 292 | } |
@@ -299,16 +299,16 @@ discard block |
||
| 299 | 299 | </div> |
| 300 | 300 | <?php |
| 301 | 301 | // check to see user isn't trying to move below the document_root |
| 302 | - if (substr(strtolower(str_replace('//', '/', $startpath . "/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path . '/'))) { |
|
| 302 | + if (substr(strtolower(str_replace('//', '/', $startpath."/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path.'/'))) { |
|
| 303 | 303 | $modx->webAlertAndQuit($_lang["files_access_denied"]); |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | // Unzip .zip files - by Raymond |
| 307 | 307 | if ($enablefileunzip && $_REQUEST['mode'] == 'unzip' && is_writable($startpath)) { |
| 308 | - if (!$err = unzip(realpath("{$startpath}/" . $_REQUEST['file']), realpath($startpath))) { |
|
| 309 | - echo '<span class="warning"><b>' . $_lang['file_unzip_fail'] . ($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '') . '</b></span><br /><br />'; |
|
| 308 | + if (!$err = unzip(realpath("{$startpath}/".$_REQUEST['file']), realpath($startpath))) { |
|
| 309 | + echo '<span class="warning"><b>'.$_lang['file_unzip_fail'].($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '').'</b></span><br /><br />'; |
|
| 310 | 310 | } else { |
| 311 | - echo '<span class="success"><b>' . $_lang['file_unzip'] . '</b></span><br /><br />'; |
|
| 311 | + echo '<span class="success"><b>'.$_lang['file_unzip'].'</b></span><br /><br />'; |
|
| 312 | 312 | } |
| 313 | 313 | } |
| 314 | 314 | // End Unzip - Raymond |
@@ -320,9 +320,9 @@ discard block |
||
| 320 | 320 | if ($_REQUEST['mode'] == 'deletefolder') { |
| 321 | 321 | $folder = $_REQUEST['folderpath']; |
| 322 | 322 | if (!$token_check || !@rrmdir($folder)) { |
| 323 | - echo '<span class="warning"><b>' . $_lang['file_folder_not_deleted'] . '</b></span><br /><br />'; |
|
| 323 | + echo '<span class="warning"><b>'.$_lang['file_folder_not_deleted'].'</b></span><br /><br />'; |
|
| 324 | 324 | } else { |
| 325 | - echo '<span class="success"><b>' . $_lang['file_folder_deleted'] . '</b></span><br /><br />'; |
|
| 325 | + echo '<span class="success"><b>'.$_lang['file_folder_deleted'].'</b></span><br /><br />'; |
|
| 326 | 326 | } |
| 327 | 327 | } |
| 328 | 328 | |
@@ -333,10 +333,10 @@ discard block |
||
| 333 | 333 | if (!mkdirs("{$startpath}/{$foldername}", 0777)) { |
| 334 | 334 | echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />'; |
| 335 | 335 | } else { |
| 336 | - if (!@chmod($startpath . '/' . $foldername, $newfolderaccessmode)) { |
|
| 337 | - echo '<span class="warning"><b>' . $_lang['file_folder_chmod_error'] . '</b></span><br /><br />'; |
|
| 336 | + if (!@chmod($startpath.'/'.$foldername, $newfolderaccessmode)) { |
|
| 337 | + echo '<span class="warning"><b>'.$_lang['file_folder_chmod_error'].'</b></span><br /><br />'; |
|
| 338 | 338 | } else { |
| 339 | - echo '<span class="success"><b>' . $_lang['file_folder_created'] . '</b></span><br /><br />'; |
|
| 339 | + echo '<span class="success"><b>'.$_lang['file_folder_created'].'</b></span><br /><br />'; |
|
| 340 | 340 | } |
| 341 | 341 | } |
| 342 | 342 | umask($old_umask); |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | $filename = $modx->getDatabase()->escape($filename); |
| 349 | 349 | |
| 350 | 350 | if (!checkExtension($filename)) { |
| 351 | - echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />'; |
|
| 351 | + echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />'; |
|
| 352 | 352 | } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $filename) !== 0) { |
| 353 | 353 | echo $_lang['files.dynamic.php3']; |
| 354 | 354 | } else { |
@@ -370,11 +370,11 @@ discard block |
||
| 370 | 370 | $newFilename = $modx->getDatabase()->escape($newFilename); |
| 371 | 371 | |
| 372 | 372 | if (!checkExtension($newFilename)) { |
| 373 | - echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />'; |
|
| 373 | + echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />'; |
|
| 374 | 374 | } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) { |
| 375 | 375 | echo $_lang['files.dynamic.php3']; |
| 376 | 376 | } else { |
| 377 | - if (!copy($filename, MODX_BASE_PATH . $newFilename)) { |
|
| 377 | + if (!copy($filename, MODX_BASE_PATH.$newFilename)) { |
|
| 378 | 378 | echo $_lang['files.dynamic.php5']; |
| 379 | 379 | } |
| 380 | 380 | umask($old_umask); |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | // Rename folder here |
| 384 | 384 | if ($_REQUEST['mode'] == 'renameFolder') { |
| 385 | 385 | $old_umask = umask(0); |
| 386 | - $dirname = $_REQUEST['path'] . '/' . $_REQUEST['dirname']; |
|
| 386 | + $dirname = $_REQUEST['path'].'/'.$_REQUEST['dirname']; |
|
| 387 | 387 | $dirname = $modx->getDatabase()->escape($dirname); |
| 388 | 388 | $newDirname = str_replace(array( |
| 389 | 389 | '..\\', |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | |
| 396 | 396 | if (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newDirname) !== 0) { |
| 397 | 397 | echo $_lang['files.dynamic.php3']; |
| 398 | - } else if (!rename($dirname, $_REQUEST['path'] . '/' . $newDirname)) { |
|
| 398 | + } else if (!rename($dirname, $_REQUEST['path'].'/'.$newDirname)) { |
|
| 399 | 399 | echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />'; |
| 400 | 400 | } |
| 401 | 401 | umask($old_umask); |
@@ -415,11 +415,11 @@ discard block |
||
| 415 | 415 | $newFilename = $modx->getDatabase()->escape($newFilename); |
| 416 | 416 | |
| 417 | 417 | if (!checkExtension($newFilename)) { |
| 418 | - echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />'; |
|
| 418 | + echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />'; |
|
| 419 | 419 | } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) { |
| 420 | 420 | echo $_lang['files.dynamic.php3']; |
| 421 | 421 | } else { |
| 422 | - if (!rename($filename, $path . '/' . $newFilename)) { |
|
| 422 | + if (!rename($filename, $path.'/'.$newFilename)) { |
|
| 423 | 423 | echo $_lang['files.dynamic.php5']; |
| 424 | 424 | } |
| 425 | 425 | umask($old_umask); |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | ls($startpath); |
| 453 | 453 | echo "\n\n\n"; |
| 454 | 454 | if ($folders == 0 && $files == 0) { |
| 455 | - echo '<tr><td colspan="4"><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> ' . $_lang['files_directory_is_empty'] . ' </span></td></tr>'; |
|
| 455 | + echo '<tr><td colspan="4"><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> '.$_lang['files_directory_is_empty'].' </span></td></tr>'; |
|
| 456 | 456 | } |
| 457 | 457 | ?> |
| 458 | 458 | </table> |
@@ -461,10 +461,10 @@ discard block |
||
| 461 | 461 | <div class="container"> |
| 462 | 462 | <p> |
| 463 | 463 | <?php |
| 464 | - echo $_lang['files_directories'] . ': <b>' . $folders . '</b> '; |
|
| 465 | - echo $_lang['files_files'] . ': <b>' . $files . '</b> '; |
|
| 466 | - echo $_lang['files_data'] . ': <b><span dir="ltr">' . $modx->nicesize($filesizes) . '</span></b> '; |
|
| 467 | - echo $_lang['files_dirwritable'] . ' <b>' . (is_writable($startpath) == 1 ? $_lang['yes'] . '.' : $_lang['no']) . '.</b>' |
|
| 464 | + echo $_lang['files_directories'].': <b>'.$folders.'</b> '; |
|
| 465 | + echo $_lang['files_files'].': <b>'.$files.'</b> '; |
|
| 466 | + echo $_lang['files_data'].': <b><span dir="ltr">'.$modx->nicesize($filesizes).'</span></b> '; |
|
| 467 | + echo $_lang['files_dirwritable'].' <b>'.(is_writable($startpath) == 1 ? $_lang['yes'].'.' : $_lang['no']).'.</b>' |
|
| 468 | 468 | ?> |
| 469 | 469 | </p> |
| 470 | 470 | |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | </form> |
| 490 | 490 | <?php |
| 491 | 491 | } else { |
| 492 | - echo "<p>" . $_lang['files_upload_inhibited_msg'] . "</p>"; |
|
| 492 | + echo "<p>".$_lang['files_upload_inhibited_msg']."</p>"; |
|
| 493 | 493 | } |
| 494 | 494 | ?> |
| 495 | 495 | <div id="imageviewer"></div> |
@@ -1,12 +1,12 @@ 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 | if (!$modx->hasPermission('edit_document') || !$modx->hasPermission('save_document')) { |
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | -$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : null; |
|
| 9 | +$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : null; |
|
| 10 | 10 | $reset = isset($_POST['reset']) && $_POST['reset'] == 'true' ? 1 : 0; |
| 11 | 11 | $items = isset($_POST['list']) ? $_POST['list'] : ''; |
| 12 | 12 | $ressourcelist = ''; |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | if (isset($_POST['listSubmitted'])) { |
| 26 | - $updateMsg .= '<div class="text-success" id="updated">' . $_lang['sort_updated'] . '</div>'; |
|
| 26 | + $updateMsg .= '<div class="text-success" id="updated">'.$_lang['sort_updated'].'</div>'; |
|
| 27 | 27 | if (strlen($items) > 0) { |
| 28 | 28 | $items = explode(';', $items); |
| 29 | 29 | foreach ($items as $key => $value) { |
@@ -43,15 +43,15 @@ discard block |
||
| 43 | 43 | $tblsc = $modx->getFullTableName('site_content'); |
| 44 | 44 | $tbldg = $modx->getFullTableName('document_groups'); |
| 45 | 45 | |
| 46 | - $rs = $modx->getDatabase()->select('pagetitle', $tblsc, 'id=' . $id . ''); |
|
| 46 | + $rs = $modx->getDatabase()->select('pagetitle', $tblsc, 'id='.$id.''); |
|
| 47 | 47 | $pagetitle = $modx->getDatabase()->getValue($rs); |
| 48 | 48 | |
| 49 | 49 | $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : ''; |
| 50 | 50 | $docgrp_cond = $docgrp ? "OR dg.document_group IN ({$docgrp})" : ''; |
| 51 | - $mgrRole = (isset ($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0'; |
|
| 52 | - $access = " AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))"); |
|
| 51 | + $mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0'; |
|
| 52 | + $access = " AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))"); |
|
| 53 | 53 | |
| 54 | - $rs = $modx->getDatabase()->select('sc.id, sc.pagetitle, sc.parent, sc.menuindex, sc.published, sc.hidemenu, sc.deleted, sc.isfolder', $tblsc . 'AS sc LEFT JOIN ' . $tbldg . ' dg ON dg.document=sc.id', 'sc.parent=' . $id . $access . ' GROUP BY sc.id', 'menuindex ASC'); |
|
| 54 | + $rs = $modx->getDatabase()->select('sc.id, sc.pagetitle, sc.parent, sc.menuindex, sc.published, sc.hidemenu, sc.deleted, sc.isfolder', $tblsc.'AS sc LEFT JOIN '.$tbldg.' dg ON dg.document=sc.id', 'sc.parent='.$id.$access.' GROUP BY sc.id', 'menuindex ASC'); |
|
| 55 | 55 | |
| 56 | 56 | if ($modx->getDatabase()->getRecordCount($rs)) { |
| 57 | 57 | $ressourcelist .= '<div class="clearfix"><ul id="sortlist" class="sortableList">'; |
@@ -60,12 +60,12 @@ discard block |
||
| 60 | 60 | $classes .= ($row['hidemenu']) ? ' notInMenuNode ' : ' inMenuNode'; |
| 61 | 61 | $classes .= ($row['published']) ? ' publishedNode ' : ' unpublishedNode '; |
| 62 | 62 | $classes = ($row['deleted']) ? ' deletedNode ' : $classes; |
| 63 | - $icon = $row['isfolder'] ? '<i class="' . $_style['files_folder'] . '"></i> ' : ' <i class="' . $_style['files_page_html'] . '"></i> '; |
|
| 64 | - $ressourcelist .= '<li id="item_' . $row['id'] . '" class="' . $classes . '">' . $icon . $row['pagetitle'] . ' <small>(' . $row['id'] . ')</small></li>'; |
|
| 63 | + $icon = $row['isfolder'] ? '<i class="'.$_style['files_folder'].'"></i> ' : ' <i class="'.$_style['files_page_html'].'"></i> '; |
|
| 64 | + $ressourcelist .= '<li id="item_'.$row['id'].'" class="'.$classes.'">'.$icon.$row['pagetitle'].' <small>('.$row['id'].')</small></li>'; |
|
| 65 | 65 | } |
| 66 | 66 | $ressourcelist .= '</ul></div>'; |
| 67 | 67 | } else { |
| 68 | - $updateMsg = '<p class="text-danger">' . $_lang['sort_nochildren'] . '</p>'; |
|
| 68 | + $updateMsg = '<p class="text-danger">'.$_lang['sort_nochildren'].'</p>'; |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | </script> |
| 149 | 149 | |
| 150 | 150 | <h1> |
| 151 | - <i class="fa fa-sort-numeric-asc"></i><?= ($pagetitle ? $pagetitle . '<small>(' . $id . ')</small>' : $_lang['sort_menuindex']) ?> |
|
| 151 | + <i class="fa fa-sort-numeric-asc"></i><?= ($pagetitle ? $pagetitle.'<small>('.$id.')</small>' : $_lang['sort_menuindex']) ?> |
|
| 152 | 152 | </h1> |
| 153 | 153 | |
| 154 | 154 | <?= $_style['actionbuttons']['dynamic']['save'] ?> |
