From 075f9ed229e3fa54e6a6f45b52368206670a3bdf Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Fri, 22 May 2026 10:15:56 +0700 Subject: [PATCH 01/18] add_manager_route --- core/config/manager_routes.php | 15 ++++++++++++++ core/functions/helper.php | 26 +++++++++++++++++++++++ core/src/Controllers/Frame.php | 38 +++++++++++++++++----------------- 3 files changed, 60 insertions(+), 19 deletions(-) create mode 100644 core/config/manager_routes.php diff --git a/core/config/manager_routes.php b/core/config/manager_routes.php new file mode 100644 index 0000000000..280b75388a --- /dev/null +++ b/core/config/manager_routes.php @@ -0,0 +1,15 @@ + 2, + 'elements' => 76, + 'files' => 31, + 'categories' => 120, + 'modules' => 112, + 'user_list' => 99, + 'role_list' => 86, + 'web_permissions' => 91, + 'refresh_site' => 26, + 'search' => 71, + 'backup' => 93, + 'update_tree' => 95, +]; \ No newline at end of file diff --git a/core/functions/helper.php b/core/functions/helper.php index 956334a3f0..2b2b0cea2a 100644 --- a/core/functions/helper.php +++ b/core/functions/helper.php @@ -247,3 +247,29 @@ function replace_array( return $out; } } + +if (!function_exists('manager_route')) { + /** + * Генерирует URL для страницы админ-панели по читаемому имени маршрута + * + * @param string $name имя маршрута из config/manager_routes.php + * @param array $params дополнительные GET-параметры (id, tab, …) + * @return string полный URL вида MODX_MANAGER_URL . 'index.php?a=...&...' + * @throws InvalidArgumentException если маршрут не найден + */ + function manager_route(string $name, array $params = []): string + { + static $routes = null; + if ($routes === null) { + $routes = include __DIR__ . '/../config/manager_routes.php'; + } + + $action = $routes[$name] ?? null; + if ($action === null) { + throw new \InvalidArgumentException("Неизвестный маршрут админки: $name"); + } + + $query = array_merge(['a' => $action], $params); + return MODX_MANAGER_URL . 'index.php?' . http_build_query($query); + } +} diff --git a/core/src/Controllers/Frame.php b/core/src/Controllers/Frame.php index b7448c5bc9..eb52a423f0 100644 --- a/core/src/Controllers/Frame.php +++ b/core/src/Controllers/Frame.php @@ -265,7 +265,7 @@ protected function menuSite() 'site', 'main', '' . $this->managerTheme->getLexicon('home') . '', - 'index.php?a=2', + manager_route('home'), $this->managerTheme->getLexicon('home'), '', '', @@ -404,7 +404,7 @@ protected function menuElementTemplates() 'element_templates', 'elements', '' . $this->managerTheme->getLexicon('templates') . '', - 'index.php?a=76&tab=0', + manager_route('elements', ['tab' => 0]), $this->managerTheme->getLexicon('templates'), '', 'new_template,edit_template', @@ -425,7 +425,7 @@ protected function menuElementTv() 'element_tplvars', 'elements', '' . $this->managerTheme->getLexicon('tmplvars') . '', - 'index.php?a=76&tab=1', + manager_route('elements', ['tab' => 1]), $this->managerTheme->getLexicon('tmplvars'), '', 'new_template,edit_template', @@ -446,7 +446,7 @@ protected function menuElementChunks() 'element_htmlsnippets', 'elements', '' . $this->managerTheme->getLexicon('htmlsnippets') . '', - 'index.php?a=76&tab=2', + manager_route('elements', ['tab' => 2]), $this->managerTheme->getLexicon('htmlsnippets'), '', 'new_chunk,edit_chunk', @@ -467,7 +467,7 @@ protected function menuElementSnippets() 'element_snippets', 'elements', '' . $this->managerTheme->getLexicon('snippets') . '', - 'index.php?a=76&tab=3', + manager_route('elements', ['tab' => 3]), $this->managerTheme->getLexicon('snippets'), '', 'new_snippet,edit_snippet', @@ -488,7 +488,7 @@ protected function menuElementPlugins() 'element_plugins', 'elements', '' . $this->managerTheme->getLexicon('plugins') . '', - 'index.php?a=76&tab=4', + manager_route('elements', ['tab' => 4]), $this->managerTheme->getLexicon('plugins'), '', 'new_plugin,edit_plugin', @@ -509,7 +509,7 @@ protected function menuElementModules() 'element_modules', 'elements', '' . $this->managerTheme->getLexicon('modules') . '', - 'index.php?a=76&tab=5', + manager_route('elements', ['tab' => 5]), $this->managerTheme->getLexicon('modules'), '', 'new_module,edit_module', @@ -530,7 +530,7 @@ protected function menuFiles() 'manage_files', 'elements', '' . $this->managerTheme->getLexicon('files'), - 'index.php?a=31', + manager_route('files'), $this->managerTheme->getLexicon('files'), '', 'file_manager', @@ -553,7 +553,7 @@ protected function menuCategories() 'manage_categories', 'elements', '' . $this->managerTheme->getLexicon('categories'), - 'index.php?a=120', + manager_route('categories'), $this->managerTheme->getLexicon('categories'), '', 'category_manager', @@ -605,7 +605,7 @@ protected function menuRunModules() 'module' . $row['id'], 'modules', ($row['icon'] != '' ? '' : '') . e($row['name']), - 'index.php?a=112&id=' . $row['id'], + manager_route('modules', ['id' => $row['id']]), e($row['name']), '', '', @@ -627,7 +627,7 @@ protected function menuRunModules() 'module' . $module['id'], 'modules', ($module['icon'] != '' ? '' : '') . $module['name'], - !empty($module['properties']['routes']) ? 'modules/' . $module['id'] : 'index.php?a=112&id=' . $module['id'], + !empty($module['properties']['routes']) ? 'modules/' . $module['id'] : manager_route('modules', ['id' => $module['id']]), $module['name'], '', '', @@ -662,7 +662,7 @@ protected function menuUserManagement() 'web_user_management_title', 'users', '' . $this->managerTheme->getLexicon('web_user_management_title') . '', - 'index.php?a=99', + manager_route('user_list'), $this->managerTheme->getLexicon('web_user_management_title'), '', 'edit_user', @@ -682,7 +682,7 @@ protected function menuRoleManagement() 'role_management_title', 'users', '' . $this->managerTheme->getLexicon('role_management_title') . '', - 'index.php?a=86', + manager_route('role_list'), $this->managerTheme->getLexicon('role_management_title'), '', 'new_role,edit_role,delete_role', @@ -706,7 +706,7 @@ protected function menuWebPermissions() 'web_permissions', 'users', '' . $this->managerTheme->getLexicon('web_permissions'), - 'index.php?a=91', + manager_route('web_permissions'), $this->managerTheme->getLexicon('web_permissions'), '', 'web_access_permissions', @@ -725,7 +725,7 @@ protected function menuRefreshSite() 'refresh_site', 'tools', '' . $this->managerTheme->getLexicon('refresh_site'), - 'index.php?a=26', + manager_route('refresh_site'), $this->managerTheme->getLexicon('refresh_site'), '', '', @@ -741,7 +741,7 @@ protected function menuRefreshSite() // href 'btn btn-secondary', // class or btn-success - "modx.popup({url:'index.php?a=26', title:'" . $this->managerTheme->getLexicon('refresh_site') . "', icon: 'fa-recycle', iframe: 'ajax', selector: '.tab-page>.container', position: 'right top', width: 'auto', maxheight: '50%%', wrap: 'body' })", + "modx.popup({url:'" . manager_route('refresh_site') . "', title:'" . $this->managerTheme->getLexicon('refresh_site') . "', icon: 'fa-recycle', iframe: 'ajax', selector: '.tab-page>.container', position: 'right top', width: 'auto', maxheight: '50%%', wrap: 'body' })", // onclick $this->managerTheme->getLexicon('refresh_site'), // title @@ -760,7 +760,7 @@ protected function menuSearch() 'search', 'tools', '' . $this->managerTheme->getLexicon('search'), - 'index.php?a=71', + manager_route('search'), $this->managerTheme->getLexicon('search'), '', '', @@ -783,7 +783,7 @@ protected function menuBkManager() 'bk_manager', 'tools', '' . $this->managerTheme->getLexicon('bk_manager'), - 'index.php?a=93', + manager_route('backup'), $this->managerTheme->getLexicon('bk_manager'), '', 'bk_manager', @@ -825,7 +825,7 @@ protected function menuUpdateTree() 'update_tree', 'tools', '' . $this->managerTheme->getLexicon('update_tree'), - 'index.php?a=95', + manager_route('update_tree'), $this->managerTheme->getLexicon('update_tree'), '', 'update_tree', From 45fe87c2400b37e60997d7a04be1f03a0f61057d Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Fri, 29 May 2026 17:07:08 +0700 Subject: [PATCH 02/18] add_more_route --- core/config/manager_routes.php | 80 ++++++++++++++++--- core/functions/actions/files.php | 12 ++- core/functions/helper.php | 25 ++++++ core/src/Controllers/ManagerLog.php | 6 +- core/src/Controllers/MoveDocument.php | 2 +- core/src/Controllers/Search.php | 14 ++-- core/src/Controllers/UserRoles/Permission.php | 5 +- .../UserRoles/PermissionsGroups.php | 4 +- core/src/Controllers/UserRoles/UserRole.php | 26 ++++-- core/src/Controllers/Users/ChangePassword.php | 8 +- core/src/Controllers/Users/DeleteUser.php | 2 +- core/src/Controllers/Users/EditOrNewUser.php | 12 ++- core/src/Controllers/Users/LogInOut.php | 4 +- core/src/Controllers/WebAccessPermissions.php | 5 +- core/src/ManagerTheme.php | 4 +- manager/actions/bkmanager.static.php | 13 +-- manager/actions/files.dynamic.php | 16 +++- manager/actions/mutate_categories.dynamic.php | 2 +- manager/actions/mutate_content.dynamic.php | 2 +- .../actions/web_user_management.static.php | 4 +- manager/includes/config_check.inc.php | 2 +- manager/media/style/default/ajax.php | 36 ++++----- .../default/snippets/welcome/RecentInfo.php | 16 ++-- .../processors/delete_category.processor.php | 2 +- .../processors/delete_content.processor.php | 2 +- .../processors/delete_eventlog.processor.php | 2 +- .../delete_htmlsnippet.processor.php | 2 +- .../processors/delete_module.processor.php | 2 +- .../processors/delete_plugin.processor.php | 2 +- .../processors/delete_snippet.processor.php | 2 +- .../processors/delete_template.processor.php | 2 +- .../processors/delete_tmplvars.processor.php | 4 +- .../processors/execute_module.processor.php | 6 +- .../processors/publish_content.processor.php | 2 +- manager/processors/purge_plugin.processor.php | 2 +- .../processors/remove_content.processor.php | 2 +- manager/processors/remove_locks.processor.php | 2 +- manager/processors/save_content.processor.php | 49 +++++------- .../processors/save_htmlsnippet.processor.php | 30 ++++--- manager/processors/save_module.processor.php | 30 ++++--- manager/processors/save_plugin.processor.php | 26 +++--- .../processors/save_settings.processor.php | 2 +- manager/processors/save_snippet.processor.php | 26 +++--- .../processors/save_template.processor.php | 30 ++++--- .../processors/save_tmplvars.processor.php | 26 +++--- .../processors/undelete_content.processor.php | 2 +- .../unpublish_content.processor.php | 2 +- .../web_access_groups.processor.php | 2 +- manager/views/frame/1.blade.php | 28 +++---- manager/views/frame/tree.blade.php | 6 +- manager/views/page/2.blade.php | 14 ++-- manager/views/page/3.blade.php | 34 ++++---- manager/views/page/chunk.blade.php | 6 +- manager/views/page/eventlog.blade.php | 8 +- manager/views/page/eventlog_details.blade.php | 4 +- manager/views/page/managerlog.blade.php | 2 +- manager/views/page/modules.blade.php | 12 +-- manager/views/page/move_document.blade.php | 2 +- manager/views/page/password.blade.php | 2 +- manager/views/page/plugin.blade.php | 6 +- manager/views/page/plugin_priority.blade.php | 2 +- manager/views/page/refresh_site.blade.php | 2 +- manager/views/page/resources/chunks.blade.php | 2 +- .../views/page/resources/modules.blade.php | 2 +- .../views/page/resources/plugins.blade.php | 2 +- .../views/page/resources/snippets.blade.php | 2 +- .../views/page/resources/templates.blade.php | 2 +- manager/views/page/resources/tv.blade.php | 2 +- manager/views/page/search.blade.php | 8 +- manager/views/page/snippet.blade.php | 6 +- .../views/page/sysinfo/phpversion.blade.php | 2 +- manager/views/page/system_settings.blade.php | 2 +- manager/views/page/template.blade.php | 6 +- manager/views/page/tmplvar.blade.php | 4 +- manager/views/page/tmplvar_rank.blade.php | 2 +- manager/views/page/update_tree.blade.php | 2 +- .../page/user_roles/permission.blade.php | 4 +- .../permission_group_list.blade.php | 2 +- .../page/user_roles/permission_list.blade.php | 2 +- .../user_roles/permissions_groups.blade.php | 4 +- .../page/user_roles/role_management.blade.php | 2 +- .../views/page/user_roles/user_role.blade.php | 2 +- .../page/web_access_permissions.blade.php | 10 +-- ...eb_access_permissions_groupslist.blade.php | 2 +- 84 files changed, 454 insertions(+), 305 deletions(-) diff --git a/core/config/manager_routes.php b/core/config/manager_routes.php index 280b75388a..85d86ac213 100644 --- a/core/config/manager_routes.php +++ b/core/config/manager_routes.php @@ -1,15 +1,71 @@ 2, - 'elements' => 76, - 'files' => 31, - 'categories' => 120, - 'modules' => 112, - 'user_list' => 99, - 'role_list' => 86, - 'web_permissions' => 91, - 'refresh_site' => 26, - 'search' => 71, - 'backup' => 93, - 'update_tree' => 95, + 'repair' => 0, + 'home' => 2, + 'about_document' => 3, + 'create_resource' => 4, + 'delete_resource' => 6, + 'wait_clean_up' => 7, + 'logout' => 8, + 'manager_log' => 13, + 'edit_template' => 16, + 'edit_settings' => 17, + 'create_template' => 19, + 'delete_template' => 21, + 'edit_snippet' => 22, + 'create_snippet' => 23, + 'delete_snippet' => 25, + 'refresh_site' => 26, + 'edit_document' => 27, + 'change_password' => 28, + 'files' => 31, + 'role_edit' => 35, + 'role_create' => 35, + 'delete_role' => 37, + 'move_recource' => 51, + 'system_info' => 53, + 'optimization_table' => 54, + 'refresh_tree' => 56, + 'publication_resource' => 61, + 'unpublication_resource'=> 62, + 'undelete_resource' => 63, + 'schedule_site' => 70, + 'search' => 71, + 'create_weblink' => 72, + 'elements' => 76, + 'create_chunk' => 77, + 'edit_chunk' => 78, + 'delete_chunk' => 80, + 'role_list' => 86, + 'create_user' => 87, + 'edit_user' => 88, + 'web_permissions' => 91, + 'edit_permissions' => 92, + 'backup' => 93, + 'duplicate_resource' => 94, + 'update_tree' => 95, + 'duplicate_template' => 96, + 'duplicate_chunk' => 97, + 'duplicate_snippet' => 98, + 'user_list' => 99, + 'create_plugin' => 101, + 'edit_plugin' => 102, + 'delete_plugin' => 104, + 'duplicate_plugin' => 105, + 'create_module' => 107, + 'edit_module' => 108, + 'delete_module' => 110, + 'duplicate_module' => 111, + 'modules' => 112, + 'event_log' => 114, + 'event_log_detail' => 115, + 'delete_log_event' => 116, + 'categories' => 120, + 'permission_edit' => 135, + 'permission_grop_edit' => 136, + 'php_info' => 200, + 'create_tv' => 300, + 'edit_tv' => 301, + 'delete_tv' => 303, + 'duplicate_tv' => 304, ]; \ No newline at end of file diff --git a/core/functions/actions/files.php b/core/functions/actions/files.php index b0daf39160..311e3a020f 100644 --- a/core/functions/actions/files.php +++ b/core/functions/actions/files.php @@ -101,7 +101,13 @@ function ls($curpath, array $options = []) if ($file === '..' || $file === '.') { continue; } elseif (!in_array($file, $excludes) && !in_array($newpath, $protected_path)) { - $dirs_array[$dircounter]['text'] = ' ' . $file . ''; + $dirs_array[$dircounter]['text'] = + ' ' . + '' . + '' . $file . ''; $dfiles = scandir($newpath); foreach ($dfiles as $i => $infile) { @@ -137,10 +143,10 @@ function ls($curpath, array $options = []) explode('/', substr($newpath, $len, strlen($newpath))))) . '" style="cursor:pointer;" download>' : ''); $files_array[$filecounter]['view'] = (in_array($type, - $inlineviewablefiles)) ? '' : $files_array[$filecounter]['view']; + $inlineviewablefiles)) ? '' : $files_array[$filecounter]['view']; $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '' : ''; $files_array[$filecounter]['edit'] = (in_array($type, - $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; + $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; $files_array[$filecounter]['rename'] = (in_array($type, diff --git a/core/functions/helper.php b/core/functions/helper.php index 2b2b0cea2a..cc47c0935f 100644 --- a/core/functions/helper.php +++ b/core/functions/helper.php @@ -273,3 +273,28 @@ function manager_route(string $name, array $params = []): string return MODX_MANAGER_URL . 'index.php?' . http_build_query($query); } } + +if (!function_exists('manager_route_by_action')) { + /** + * Генерирует URL для страницы админ-панели по числовому ID действия (a=...) + * + * @param int $action ID действия из manager_routes.php + * @param array $params дополнительные GET-параметры + * @return string полный URL + * @throws InvalidArgumentException если действие не найдено в маршрутах + */ + function manager_route_by_action(int $action, array $params = []): string + { + static $routes = null; + if ($routes === null) { + $routes = include __DIR__ . '/../config/manager_routes.php'; + } + + $name = array_search($action, $routes, true); + if ($name === false) { + throw new \InvalidArgumentException("Неизвестный ID действия админки: $action"); + } + + return manager_route($name, $params); + } +} diff --git a/core/src/Controllers/ManagerLog.php b/core/src/Controllers/ManagerLog.php index 2692c356e4..f21d062a68 100644 --- a/core/src/Controllers/ManagerLog.php +++ b/core/src/Controllers/ManagerLog.php @@ -40,7 +40,7 @@ public function process(): bool // truncate case 55: \EvolutionCMS\Models\ManagerLog::query()->truncate(); - header('Location: index.php?a=13'); + header('Location:'. manager_route('manager_log')); exit(); } return true; @@ -151,12 +151,12 @@ protected function getItems() [ // username 'width' => '1%', 'align' => 'center', - 'type' => 'template:[+e.value+]', + 'type' => 'template:[+e.value+]', ], [ // action 'width' => '', 'align' => 'center', - 'type' => 'template:[+message+]', + 'type' => 'template:[+message+]', ], [ // itemid 'width' => '1%', diff --git a/core/src/Controllers/MoveDocument.php b/core/src/Controllers/MoveDocument.php index 4d75435416..7ed6348785 100644 --- a/core/src/Controllers/MoveDocument.php +++ b/core/src/Controllers/MoveDocument.php @@ -104,7 +104,7 @@ protected function handle() // empty cache & sync site $this->managerTheme->getCore()->clearCache('full'); - header('Location: index.php?a=3&id=' . $document->getKey() . '&r=9'); + header('Location:'. manager_route('about_document', [ 'id' => $document->getKey(), 'r' => 9 ])); } protected function processDisplay() : bool diff --git a/core/src/Controllers/Search.php b/core/src/Controllers/Search.php index d747f49428..b53133c2ab 100644 --- a/core/src/Controllers/Search.php +++ b/core/src/Controllers/Search.php @@ -254,7 +254,7 @@ protected function getAjaxResults() foreach ($results as $row) { $output['content']['results'][] = [ 'id' => $row['id'], - 'url' => 'index.php?a=27&id=' . $row['id'], + 'url' => manager_route('edit_document', [ 'id' => $row['id'] ]), 'title' => $this->highlightingCoincidence($row['pagetitle'], $_REQUEST['searchfields']) . ' (' . $this->highlightingCoincidence($row['id'], $_REQUEST['searchfields']) . ')', 'class' => $this->addClassForItemList('', !$row['published'], $row['deleted']) ]; @@ -284,7 +284,7 @@ protected function getAjaxResults() ->toArray() as $row) { $output['templates']['results'][] = [ 'id' => $row['id'], - 'url' => 'index.php?a=16&id=' . $row['id'], + 'url' => manager_route('edit_document', [ 'id' => $row['id'] ]), 'title' => $this->highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']), 'class' => $this->addClassForItemList($row['locked']) ]; @@ -321,7 +321,7 @@ protected function getAjaxResults() ->toArray() as $row) { $output['tmplvars']['results'][] = [ 'id' => $row['id'], - 'url' => 'index.php?a=301&id=' . $row['id'], + 'url' => manager_route('edit_tv', [ 'id' => $row['id'] ]), 'title' => $this->highlightingCoincidence($row['name'], $_REQUEST['searchfields']), 'class' => $this->addClassForItemList($row['locked']) ]; @@ -351,7 +351,7 @@ protected function getAjaxResults() ->toArray() as $row) { $output['htmlsnippets']['results'][] = [ 'id' => $row['id'], - 'url' => 'index.php?a=78&id=' . $row['id'], + 'url' => manager_route('edit_chunk', [ 'id' => $row['id'] ]), 'title' => $this->highlightingCoincidence($row['name'], $_REQUEST['searchfields']), 'class' => $this->addClassForItemList($row['locked'], $row['disabled']) ]; @@ -383,7 +383,7 @@ protected function getAjaxResults() ->toArray() as $row) { $output['snippets']['results'][] = [ 'id' => $row['id'], - 'url' => 'index.php?a=22&id=' . $row['id'], + 'url' => manager_route('edit_snippet', [ 'id' => $row['id'] ]), 'title' => $this->highlightingCoincidence($row['name'], $_REQUEST['searchfields']), 'class' => $this->addClassForItemList($row['locked'], $row['disabled']) ]; @@ -415,7 +415,7 @@ protected function getAjaxResults() ->toArray() as $row) { $output['plugins']['results'][] = [ 'id' => $row['id'], - 'url' => 'index.php?a=102&id=' . $row['id'], + 'url' => manager_route('edit_plugin', [ 'id'=> $row['id'] ]), 'title' => $this->highlightingCoincidence($row['name'], $_REQUEST['searchfields']), 'class' => $this->addClassForItemList($row['locked'], $row['disabled']) ]; @@ -448,7 +448,7 @@ protected function getAjaxResults() ->toArray() as $row) { $output['modules']['results'][] = [ 'id' => $row['id'], - 'url' => 'index.php?a=108&id=' . $row['id'], + 'url' => manager_route('edit_module', [ 'id'=> $row['id'] ]), 'title' => $this->highlightingCoincidence($row['name'], $_REQUEST['searchfields']), 'class' => $this->addClassForItemList($row['locked'], $row['disabled']) ]; diff --git a/core/src/Controllers/UserRoles/Permission.php b/core/src/Controllers/UserRoles/Permission.php index ea3d13a46d..79dfb777a3 100644 --- a/core/src/Controllers/UserRoles/Permission.php +++ b/core/src/Controllers/UserRoles/Permission.php @@ -20,7 +20,7 @@ public function process() : bool { if(isset($_GET['action']) && $_GET['action'] == 'delete' ){ Models\Permissions::query()->where('id', $this->getElementId())->delete(); - header('Location: index.php?a=86&tab=2'); + header('Location:'. manager_route('role_list', [ 'tab' => 2 ])); } if (isset($_POST['a'])) { $this->updateOrCreate(); @@ -47,8 +47,7 @@ public function updateOrCreate() $group->group_id = $group_id; $group->disabled = $_POST['disabled']; $group->save(); - header('Location: index.php?a=135&id=' . $group->getKey() . '&r=9'); - + header('Location:'. manager_route('permission_edit', [ 'id' => $group->getKey(), 'r' => 9 ])); } /** diff --git a/core/src/Controllers/UserRoles/PermissionsGroups.php b/core/src/Controllers/UserRoles/PermissionsGroups.php index a39ad0c82b..fbe4cc3c56 100644 --- a/core/src/Controllers/UserRoles/PermissionsGroups.php +++ b/core/src/Controllers/UserRoles/PermissionsGroups.php @@ -22,7 +22,7 @@ public function process(): bool if (isset($_GET['action']) && $_GET['action'] == 'delete') { Models\Permissions::query()->where('group_id', $this->getElementId())->delete(); Models\PermissionsGroups::query()->where('id', $this->getElementId())->delete(); - header('Location: index.php?a=86&tab=1'); + header('Location:'. manager_route('role_list', [ 'tab' => 1 ])); } if (isset($_POST['a'])) { $this->updateOrCreate(); @@ -39,7 +39,7 @@ public function updateOrCreate() $group->name = $_POST['name']; $group->lang_key = $_POST['lang_key']; $group->save(); - header('Location: index.php?a=136&id=' . $group->getKey() . '&r=9'); + header('Location:'. manager_route('permission_grop_edit', [ 'id' => $group->getKey(), 'r' => '9' ])); } public static function findCategoryOrNew($name) diff --git a/core/src/Controllers/UserRoles/UserRole.php b/core/src/Controllers/UserRoles/UserRole.php index e2034b417e..f7ffa7e350 100644 --- a/core/src/Controllers/UserRoles/UserRole.php +++ b/core/src/Controllers/UserRoles/UserRole.php @@ -43,14 +43,14 @@ public function process(): bool $id = $this->getElementId(); $count = UserAttribute::where('role',$id)->count(); if($id==1){ - $this->managerTheme->getCore()->webAlertAndQuit->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!", "index.php?a=35&id={$id}"); + $this->managerTheme->getCore()->webAlertAndQuit->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!", manager_route('role_edit', [ 'id' => $id ])); } if($count>0){ - $this->managerTheme->getCore()->webAlertAndQuit("There are users with this role. It can't be deleted.", "index.php?a=35&id={$id}"); + $this->managerTheme->getCore()->webAlertAndQuit("There are users with this role. It can't be deleted.", manager_route('role_edit', [ 'id' => $id ])); } Models\RolePermissions::query()->where('role_id', $id)->delete(); Models\UserRole::destroy($id); - header('Location: index.php?a=86&tab=0'); + header('Location:'. manager_route('role_list', [ 'tab' => 0 ])); } if (isset($_POST['a'])) { @@ -79,7 +79,9 @@ public function updateOrCreate() $this->managerTheme->getCore()->getManagerApi()->saveFormValues(); $this->managerTheme->getCore()->webAlertAndQuit( 'Please enter a name for this role!', - "index.php?a=$mode" . ($mode == 35 ? "&id=$id" : '') + $mode == 35 + ? manager_route('role_edit', [ 'id' => $id ]) + : manager_route('role_create') ); } @@ -139,10 +141,20 @@ public function updateOrCreate() $this->managerTheme->getCore()->getManagerApi()->clearSavedFormValues(); if (!empty($_POST['stay'])) { - $a = $_POST['stay'] == '2' ? '35&id=' . $role->getKey() : '38'; - header('Location: index.php?a=' . $a . '&r=2&stay=' . $_POST['stay']); + if ($_POST['stay'] == '2') { + header('Location: ' . manager_route('role_edit', [ + 'id' => $role->getKey(), + 'r' => 2, + 'stay' => $_POST['stay'] + ])); + } else { + header('Location: ' . manager_route('role_create', [ + 'r' => 2, + 'stay' => $_POST['stay'] + ])); + } } else { - header('Location: index.php?a=86'); + header('Location: ' . manager_route('role_list')); } } diff --git a/core/src/Controllers/Users/ChangePassword.php b/core/src/Controllers/Users/ChangePassword.php index b7aff0b95b..7cadc86601 100644 --- a/core/src/Controllers/Users/ChangePassword.php +++ b/core/src/Controllers/Users/ChangePassword.php @@ -26,17 +26,13 @@ public function process() : bool foreach ($exception->getValidationErrors() as $errors){ if(is_array($errors)){ foreach ($errors as $error){ - EvolutionCMS()->webAlertAndQuit($error, 'index.php?a=28'); + EvolutionCMS()->webAlertAndQuit($error, manager_route('change_password')); } } } } - header("Location: index.php?a=99"); + header("Location:". manager_route('user_list')); exit(); } - - - - } diff --git a/core/src/Controllers/Users/DeleteUser.php b/core/src/Controllers/Users/DeleteUser.php index e4ac08aece..cdd6ffbcd7 100644 --- a/core/src/Controllers/Users/DeleteUser.php +++ b/core/src/Controllers/Users/DeleteUser.php @@ -42,7 +42,7 @@ public function process() : bool } } } - header("Location: index.php?a=99"); + header("Location:". manager_route('user_list')); exit(); } diff --git a/core/src/Controllers/Users/EditOrNewUser.php b/core/src/Controllers/Users/EditOrNewUser.php index d22ed3eddf..c327687eba 100644 --- a/core/src/Controllers/Users/EditOrNewUser.php +++ b/core/src/Controllers/Users/EditOrNewUser.php @@ -152,12 +152,16 @@ public function process(): bool } if ($userData['stay'] != '') { - $a = ($userData['stay'] == '2') ? "88&id={$user->getKey()}" : "87"; - $this->parameters['url'] = "index.php?a={$a}&r=2&stay=" . $userData['stay']; + $route = ($userData['stay'] == '2') ? 'edit_user' : 'create_user'; + $params = ['r' => 2, 'stay' => $userData['stay']]; + if ($userData['stay'] == '2') { + $params['id'] = $user->getKey(); + } + $this->parameters['url'] = manager_route($route, $params); } else { - $this->parameters['url'] = "index.php?a=99"; + $this->parameters['url'] = manager_route('user_list'); } - $this->parameters['cancel_url'] = "index.php?a=99"; + $this->parameters['cancel_url'] = manager_route('user_list'); if ($userData['passwordnotifymethod'] == 'e') { $websignupemail_message = EvolutionCMS()->getConfig('websignupemail_message'); $site_url = EvolutionCMS()->getConfig('site_url'); diff --git a/core/src/Controllers/Users/LogInOut.php b/core/src/Controllers/Users/LogInOut.php index c4b80c1579..322811dc09 100644 --- a/core/src/Controllers/Users/LogInOut.php +++ b/core/src/Controllers/Users/LogInOut.php @@ -110,9 +110,7 @@ public function loginFromHash() exit(); } - header('Location: ' . MODX_MANAGER_URL.'#?a=28'); + header('Location: ' . manager_route('change_password')); exit(); } - - } diff --git a/core/src/Controllers/WebAccessPermissions.php b/core/src/Controllers/WebAccessPermissions.php index e1324b43df..cf1e9af191 100644 --- a/core/src/Controllers/WebAccessPermissions.php +++ b/core/src/Controllers/WebAccessPermissions.php @@ -75,7 +75,10 @@ public function process() : bool break; } - $list->setPath('index.php?a='.$_GET['a'].'&list='.$_GET['list'].'&id='.$groupId); + $list->setPath(manager_route('web_access_permissions', [ + 'list' => $_GET['list'], + 'id' => $groupId + ])); $this->parameters['list'] = $list; return true; diff --git a/core/src/ManagerTheme.php b/core/src/ManagerTheme.php index d074405475..3670e517b1 100644 --- a/core/src/ManagerTheme.php +++ b/core/src/ManagerTheme.php @@ -617,7 +617,7 @@ public function getTemplatePlaceholders(): array 'modx_charset' => $this->getCharset(), 'favicon' => (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL : $this->getThemeUrl() . 'images/') . 'favicon.ico', 'homeurl' => $this->getCore()->makeUrl($this->getManagerStartupPageId()), - 'logouturl' => MODX_MANAGER_URL . 'index.php?a=8', + 'logouturl' => manager_route('logout'), 'year' => date('Y'), 'theme' => $this->getTheme(), 'manager_theme_url' => $this->getThemeUrl(), @@ -888,7 +888,7 @@ public function repairPassword($plh) public function sendRepairMail($email, $hash, $mode) { $body = ' -

' . \Lang::get('global.forgot_password_email_intro') . ' ' . \Lang::get('global.forgot_password_email_link') . '

+

' . \Lang::get('global.forgot_password_email_intro') . ' ' . \Lang::get('global.forgot_password_email_link') . '

' . \Lang::get('global.forgot_password_email_instructions') . '

' . \Lang::get('global.forgot_password_email_fine_print') . '

'; diff --git a/manager/actions/bkmanager.static.php b/manager/actions/bkmanager.static.php index 45286fd303..18aa22ff7b 100644 --- a/manager/actions/bkmanager.static.php +++ b/manager/actions/bkmanager.static.php @@ -54,7 +54,7 @@ } } - header('Location: index.php?r=9&a=93'); + header('Location: ' . manager_route('backup', ['r' => 9])); exit; } elseif ($mode == 'restore2') { $path = $modx->getConfig('snapshot_path') . $_POST['filename']; @@ -72,10 +72,11 @@ import_sql_from_file($path); break; } + $redirectUrl = manager_route('backup', ['r' => 9]); if (headers_sent()) { - echo "\n"; + echo "\n"; } else { - header("Location: index.php?r=9&a=93"); + header("Location: " . $redirectUrl); } } @@ -190,7 +191,7 @@ if ($dumpfinished) { $_SESSION['result_msg'] = 'snapshot_ok'; - header("Location: index.php?a=93"); + header("Location:". manager_route('backup')); exit; } else { $modx->webAlertAndQuit('Unable to Backup Database'); @@ -374,13 +375,13 @@ class="form-check-input" $modx->getDatabase()->getConfig('prefix') . 'manager_log', ); if ($modx->hasPermission('settings') && in_array($db_status['Name'], $truncateable) && $db_status['Rows'] > 0) { - echo '' . nicesize($db_status['Data_length'] + $db_status['Data_free']) . '' . '' . "\n"; + echo '' . nicesize($db_status['Data_length'] + $db_status['Data_free']) . '' . '' . "\n"; } else { echo '' . nicesize($db_status['Data_length'] + $db_status['Data_free']) . '' . "\n"; } if ($modx->hasPermission('settings')) { - echo '' . ($db_status['Data_free'] > 0 ? '' . nicesize($db_status['Data_free']) . '' : '-') . '' . "\n"; + echo '' . ($db_status['Data_free'] > 0 ? '' . nicesize($db_status['Data_free']) . '' : '-') . '' . "\n"; } else { echo '' . ($db_status['Data_free'] > 0 ? nicesize($db_status['Data_free']) : '-') . '' . "\n"; } diff --git a/manager/actions/files.dynamic.php b/manager/actions/files.dynamic.php index aebd7dc150..bed94d51dd 100644 --- a/manager/actions/files.dynamic.php +++ b/manager/actions/files.dynamic.php @@ -225,12 +225,20 @@ function renameFile (file) $tpl = '[+subject+]'; $ph['image'] = $_style['icon_folder_open']; $ph['subject'] = $_lang['add_folder']; - $ph['href'] = 'index.php?a=31&mode=newfolder&path=' . urlencode($startpath) . '&name='; + $ph['href'] = manager_route('files', [ + 'mode' => 'newfolder', + 'path' => urlencode($startpath), + 'name' => '' + ]); $_ = parsePlaceholder($tpl, $ph); $tpl = '' . $_lang['files.dynamic.php1'] . ''; $ph['image'] = $_style['icon_document']; - $ph['href'] = 'index.php?a=31&mode=newfile&path=' . urlencode($startpath) . '&name='; + $ph['href'] = manager_route('files', [ + 'mode' => 'newfile', + 'path' => urlencode($startpath), + 'name' => '' + ]); $_ .= parsePlaceholder($tpl, $ph); echo $_; } @@ -265,7 +273,7 @@ function renameFile (file) $ph['subject'] = 'Top'; } else { $ph['image'] = '' . $_style['icon_folder_open'] . ''; - $ph['subject'] = 'Top/'; + $ph['subject'] = 'Top/'; } echo parsePlaceholder($tpl, $ph); @@ -284,7 +292,7 @@ function renameFile (file) } $path .= rtrim($v, '/') . '/'; if (1 < $count) { - $href = 'index.php?a=31&mode=drill&path=' . urlencode($filemanager_path . $path); + $href = manager_route('files', [ 'mode' => 'drill', 'path' => urlencode($filemanager_path . $path) ]); $pieces[$i] = '' . trim($v, '/') . ''; } else { $pieces[$i] = '' . trim($v, '/') . ''; diff --git a/manager/actions/mutate_categories.dynamic.php b/manager/actions/mutate_categories.dynamic.php index e3f62934fe..afdcd13dad 100644 --- a/manager/actions/mutate_categories.dynamic.php +++ b/manager/actions/mutate_categories.dynamic.php @@ -15,7 +15,7 @@ 'native_language' => 'de', 'name' => $_lang['manage_categories'], 'dirname' => MODX_MANAGER_URL, - 'url' => 'index.php?a=120&id=' . get_by_key($_GET, 'id', 0), + 'url' => manager_route('categories', ['id' => get_by_key($_GET, 'id', 0)]), 'path' => realpath( __DIR__ ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR, 'inc_dir' => realpath( __DIR__ ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR, 'languages_dir' => realpath( __DIR__ ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR, diff --git a/manager/actions/mutate_content.dynamic.php b/manager/actions/mutate_content.dynamic.php index 71fa200653..85f777f7e9 100644 --- a/manager/actions/mutate_content.dynamic.php +++ b/manager/actions/mutate_content.dynamic.php @@ -571,7 +571,7 @@ function evoRenderTvImageCheck(a) { $parentsResult = SiteContent::withTrashed()->select('id','pagetitle')->whereIn('id', $temp)->get(); foreach ($parentsResult->toArray() as $row) { $out .= ''; } diff --git a/manager/actions/web_user_management.static.php b/manager/actions/web_user_management.static.php index 95c3ea906a..7e5df85ca9 100644 --- a/manager/actions/web_user_management.static.php +++ b/manager/actions/web_user_management.static.php @@ -122,7 +122,7 @@ $listDocs[] = [ 'icon' => '', - 'name' => '' . e($el['username']) . '', + 'name' => '' . e($el['username']) . '', 'user_full_name' => e($el['fullname']), 'email' => e($el['email']), 'role' => e($el['name'] ?: ManagerTheme::getLexicon('no_user_role')), @@ -133,7 +133,7 @@ } $table->createPagingNavigation($numRecords, 'a=99&'.http_build_query($query)); - $output = $table->create($listDocs, $listTableHeader, 'index.php?a=99'); + $output = $table->create($listDocs, $listTableHeader, manager_route('user_list')); } else { // no documents $output = '

' . ManagerTheme::getLexicon('resources_in_container_no') . '

'; diff --git a/manager/includes/config_check.inc.php b/manager/includes/config_check.inc.php index dd61ef3509..246037f5f8 100755 --- a/manager/includes/config_check.inc.php +++ b/manager/includes/config_check.inc.php @@ -166,7 +166,7 @@ function checkSiteCache() { $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"]; $warnings[$i][2] = ''; if($modx->hasPermission('settings')) { - $warnings[$i][2] .= ''; + $warnings[$i][2] .= ''; } if(empty($_SESSION["mgrConfigCheck"])) $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']); break; diff --git a/manager/media/style/default/ajax.php b/manager/media/style/default/ajax.php index c58f32cc1e..605644f6f4 100755 --- a/manager/media/style/default/ajax.php +++ b/manager/media/style/default/ajax.php @@ -129,7 +129,7 @@ } if ($modx->hasPermission('new_template')) { - $output .= '
  • ' . $_lang['new_template'] . '
  • '; + $output .= '
  • ' . $_lang['new_template'] . '
  • '; } break; @@ -154,7 +154,7 @@ } if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) { - $output .= '
  • ' . $_lang['new_tmplvars'] . '
  • '; + $output .= '
  • ' . $_lang['new_tmplvars'] . '
  • '; } break; @@ -168,7 +168,7 @@ } if ($modx->hasPermission('new_chunk')) { - $output .= '
  • ' . $_lang['new_htmlsnippet'] . '
  • '; + $output .= '
  • ' . $_lang['new_htmlsnippet'] . '
  • '; } break; @@ -182,7 +182,7 @@ } if ($modx->hasPermission('new_snippet')) { - $output .= '
  • ' . $_lang['new_snippet'] . '
  • '; + $output .= '
  • ' . $_lang['new_snippet'] . '
  • '; } break; @@ -196,7 +196,7 @@ } if ($modx->hasPermission('new_plugin')) { - $output .= '
  • ' . $_lang['new_plugin'] . '
  • '; + $output .= '
  • ' . $_lang['new_plugin'] . '
  • '; } break; @@ -212,7 +212,7 @@ } if ($modx->hasPermission('new_module')) { - $output .= '
  • ' . $_lang['new_module'] . '
  • '; + $output .= '
  • ' . $_lang['new_module'] . '
  • '; } break; @@ -264,7 +264,7 @@ } if ($modx->hasPermission('new_role')) { - $output .= '
  • ' . $_lang['new_role'] . '
  • '; + $output .= '
  • ' . $_lang['new_role'] . '
  • '; } if ($count = $sql->count()) { @@ -301,7 +301,7 @@ } if ($modx->hasPermission('new_user')) { - $output .= '
  • ' . $_lang['new_web_user'] . '
  • '; + $output .= '
  • ' . $_lang['new_web_user'] . '
  • '; } if ($count = $sql->count()) { @@ -342,7 +342,7 @@ ), 'item' => array( 'innerHTML' => ' ' . $_lang['edit'], - 'url' => "index.php?a=22&id=" . $row['id'], + 'url' => manager_route('edit_snippet', [ 'id' => $row['id'] ]), ), ); if (!empty($row['description'])) { @@ -358,7 +358,7 @@ ), 'item' => array( 'innerHTML' => ' ' . $_lang['new_snippet'], - 'url' => "index.php?a=23&itemname=" . entities($name, $modx->getConfig('modx_charset')), + 'url' => manager_route('create_snippet', [ 'itemname' => entities($name, $modx->getConfig('modx_charset')) ]), ), ); } @@ -375,7 +375,7 @@ ), 'item' => array( 'innerHTML' => ' ' . $_lang['edit'], - 'url' => "index.php?a=78&id=" . $row['id'], + 'url' => manager_route('edit_chunk', [ 'id' => $row['id'] ]), ), ); if (!empty($row['description'])) { @@ -391,7 +391,7 @@ ), 'item' => array( 'innerHTML' => ' ' . $_lang['new_htmlsnippet'], - 'url' => "index.php?a=77&itemname=" . entities($name, $modx->getConfig('modx_charset')), + 'url' => manager_route('create_chunk', [ 'itemname' => entities($name, $modx->getConfig('modx_charset')) ]), ), ); } @@ -408,7 +408,7 @@ ), 'item' => array( 'innerHTML' => ' ' . $_lang['edit'], - 'url' => "index.php?a=78&id=" . $row['id'], + 'url' => manager_route('edit_chunk', [ 'id' => $row['id'] ]), ), ); if (!empty($row['description'])) { @@ -429,7 +429,7 @@ ), 'item' => array( 'innerHTML' => ' ' . $_lang['edit'], - 'url' => "index.php?a=22&id=" . $row['id'], + 'url' => manager_route('edit_snippet', [ 'id'=> $row['id'] ]), ), ); if (!empty($row['description'])) { @@ -445,11 +445,11 @@ ), 'item' => array( 'innerHTML' => ' ' . $_lang['new_htmlsnippet'], - 'url' => "index.php?a=77&itemname=" . entities($name, $modx->getConfig('modx_charset')), + 'url' => manager_route('create_chunk', [ 'itemname' => entities($name, $modx->getConfig('modx_charset')) ]), ), 'item2' => array( 'innerHTML' => ' ' . $_lang['new_snippet'], - 'url' => "index.php?a=23&itemname=" . entities($name, $modx->getConfig('modx_charset')), + 'url' => manager_route('create_snippet', [ 'itemname' => entities($name, $modx->getConfig('modx_charset')) ]), ), ); } @@ -513,7 +513,7 @@ ), 'item' => array( 'innerHTML' => ' ' . $_lang['edit'], - 'url' => "index.php?a=301&id=" . $row['id'], + 'url' => manager_route('edit_tv', [ 'id' => $row['id'] ]), ), ); if (!empty($row['description'])) { @@ -529,7 +529,7 @@ ), 'item' => array( 'innerHTML' => ' ' . $_lang['new_tmplvars'], - 'url' => "index.php?a=300&itemname=" . entities($name, $modx->getConfig('modx_charset')), + 'url' => manager_route('create_tv', [ 'itemname' => entities($name, $modx->getConfig('modx_charset')) ]), ), ); } diff --git a/manager/media/style/default/snippets/welcome/RecentInfo.php b/manager/media/style/default/snippets/welcome/RecentInfo.php index cfc732b347..912a2e7ee6 100644 --- a/manager/media/style/default/snippets/welcome/RecentInfo.php +++ b/manager/media/style/default/snippets/welcome/RecentInfo.php @@ -10,7 +10,7 @@ } $tpl = ' [+id+] - [+pagetitle:htmlentities+] + [+pagetitle:htmlentities+] [+edit_date+] [+username:htmlentities+] [+edit_btn+][+publish_btn+][+delete_btn+][+info_btn+][+preview_btn+] @@ -32,7 +32,7 @@ '; -$btntpl['edit'] = ' '; +$btntpl['edit'] = ' '; $btntpl['preview_btn'] = ' '; $output = array(); @@ -67,9 +67,9 @@ if ($modx->hasPermission('delete_document')) { if ($ph['deleted'] == 0) { - $delete_btn = ' '; + $delete_btn = ' '; } else { - $delete_btn = ' '; + $delete_btn = ' '; } $ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn); } else { @@ -77,13 +77,13 @@ } if ($ph['deleted'] == 1 && $ph['published'] == 0) { - $publish_btn = ' '; + $publish_btn = ' '; } elseif ($ph['deleted'] == 1 && $ph['published'] == 1) { - $publish_btn = ' '; + $publish_btn = ' '; } elseif ($ph['deleted'] == 0 && $ph['published'] == 0) { - $publish_btn = ' '; + $publish_btn = ' '; } else { - $publish_btn = ' '; + $publish_btn = ' '; } $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn); diff --git a/manager/processors/delete_category.processor.php b/manager/processors/delete_category.processor.php index 8215b50929..0bb901a52d 100755 --- a/manager/processors/delete_category.processor.php +++ b/manager/processors/delete_category.processor.php @@ -19,5 +19,5 @@ deleteCategory($id); // finished emptying cache - redirect -$header = "Location: index.php?a=76"; +$header = "Location:". manager_route('elements'); header($header); diff --git a/manager/processors/delete_content.processor.php b/manager/processors/delete_content.processor.php index 1c79003608..3d3e8a3c8a 100755 --- a/manager/processors/delete_content.processor.php +++ b/manager/processors/delete_content.processor.php @@ -84,5 +84,5 @@ $modx->clearCache('full'); // finished emptying cache - redirect -$header = "Location: index.php?a=3&id=$pid&r=1" . $add_path; +$header = "Location:". manager_route('about_document', [ 'id' => $pid, 'r' => 1 ])." . $add_path; header($header); \ No newline at end of file diff --git a/manager/processors/delete_eventlog.processor.php b/manager/processors/delete_eventlog.processor.php index 2dd60d382b..0229eba28c 100755 --- a/manager/processors/delete_eventlog.processor.php +++ b/manager/processors/delete_eventlog.processor.php @@ -21,5 +21,5 @@ $query->delete(); -$header = "Location: index.php?a=114"; +$header = "Location:". manager_route('event_log'); header($header); diff --git a/manager/processors/delete_htmlsnippet.processor.php b/manager/processors/delete_htmlsnippet.processor.php index 3a6b727236..bc9a293a80 100755 --- a/manager/processors/delete_htmlsnippet.processor.php +++ b/manager/processors/delete_htmlsnippet.processor.php @@ -38,5 +38,5 @@ $modx->clearCache('full'); // finished emptying cache - redirect -$header = "Location: index.php?a=76&r=2&tab=2"; +$header = "Location:". manager_route('elements', [ 'r' => 2, 'tab' => '2' ]); header($header); diff --git a/manager/processors/delete_module.processor.php b/manager/processors/delete_module.processor.php index a0ad47e6b2..17ca44ff0e 100755 --- a/manager/processors/delete_module.processor.php +++ b/manager/processors/delete_module.processor.php @@ -42,5 +42,5 @@ $modx->clearCache('full'); // finished emptying cache - redirect -$header = "Location: index.php?a=76&r=2&tab=5"; +$header = "Location:". manager_route('elements', [ 'r' => 2, 'tab' => 5 ]); header($header); diff --git a/manager/processors/delete_plugin.processor.php b/manager/processors/delete_plugin.processor.php index 2bdbf8e60e..284f6bf3e1 100755 --- a/manager/processors/delete_plugin.processor.php +++ b/manager/processors/delete_plugin.processor.php @@ -39,5 +39,5 @@ $modx->clearCache('full'); // finished emptying cache - redirect -$header = "Location: index.php?a=76&r=2&tab=4"; +$header = "Location:". manager_route('elements', [ 'r' => 2, 'tab' => 4 ]); header($header); diff --git a/manager/processors/delete_snippet.processor.php b/manager/processors/delete_snippet.processor.php index ce9fdc8755..e179ac358a 100755 --- a/manager/processors/delete_snippet.processor.php +++ b/manager/processors/delete_snippet.processor.php @@ -38,5 +38,5 @@ $modx->clearCache('full'); // finished emptying cache - redirect -$header = "Location: index.php?a=76&r=2&tab=3"; +$header = "Location:". manager_route('elements', [ 'r' => 2, 'tab' => 3 ]); header($header); diff --git a/manager/processors/delete_template.processor.php b/manager/processors/delete_template.processor.php index c1953d33e9..db659a747c 100755 --- a/manager/processors/delete_template.processor.php +++ b/manager/processors/delete_template.processor.php @@ -63,5 +63,5 @@ $modx->clearCache('full'); // finished emptying cache - redirect -$header = "Location: index.php?a=76&r=2"; +$header = "Location:". manager_route('elements', [ 'r' => 2 ]); header($header); diff --git a/manager/processors/delete_tmplvars.processor.php b/manager/processors/delete_tmplvars.processor.php index e60ce17c9d..bd45073cfa 100755 --- a/manager/processors/delete_tmplvars.processor.php +++ b/manager/processors/delete_tmplvars.processor.php @@ -41,7 +41,7 @@ @@ -74,5 +74,5 @@ $modx->clearCache('full'); // finished emptying cache - redirect -$header = "Location: index.php?a=76&r=2&tab=1"; +$header = "Location:". manager_route('elements', [ 'r' => 2, 'tab' => 1 ]); header($header); diff --git a/manager/processors/execute_module.processor.php b/manager/processors/execute_module.processor.php index 059e158710..855723e343 100644 --- a/manager/processors/execute_module.processor.php +++ b/manager/processors/execute_module.processor.php @@ -25,18 +25,18 @@ ->first(); if (empty($moduleAccess)) { - $modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=76&tab=5"); + $modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", manager_route('elements', [ 'tab' => 5 ])); } } if (is_numeric($id)) { // get module data $content = \EvolutionCMS\Models\SiteModule::find($id); if (is_null($content)) { - $modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=76&tab=5"); + $modx->webAlertAndQuit("No record found for id {$id}.", manager_route('elements', [ 'tab' => 5 ])); } $content = $content->toArray(); if ($content['disabled']) { - $modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=76&tab=5"); + $modx->webAlertAndQuit("This module is disabled and cannot be executed.", manager_route('elements', [ 'tab' => 5 ])); } } else { $content = $modx->modulesFromFile[$id]; diff --git a/manager/processors/publish_content.processor.php b/manager/processors/publish_content.processor.php index b2f92c9507..f1f7bfe5ea 100755 --- a/manager/processors/publish_content.processor.php +++ b/manager/processors/publish_content.processor.php @@ -53,6 +53,6 @@ // empty cache $modx->clearCache('full'); -$header = "Location: index.php?a=3&id=$pid&r=1" . $add_path; +$header = "Location:". manager_route('about_document', [ 'id' => $pid, 'r' => 1 ]) . $add_path; header($header); diff --git a/manager/processors/purge_plugin.processor.php b/manager/processors/purge_plugin.processor.php index 0a26ef0257..70cda76f21 100755 --- a/manager/processors/purge_plugin.processor.php +++ b/manager/processors/purge_plugin.processor.php @@ -57,4 +57,4 @@ $sync->setReport(false); $sync->emptyCache(); // first empty the cache -header('Location: index.php?a=76&tab=4'); +header('Location:'.manager_route('elements', [ 'tab' => 4 ])); diff --git a/manager/processors/remove_content.processor.php b/manager/processors/remove_content.processor.php index e9d0cdb130..f99d1d24dc 100755 --- a/manager/processors/remove_content.processor.php +++ b/manager/processors/remove_content.processor.php @@ -37,5 +37,5 @@ $modx->clearCache('full'); // finished emptying cache - redirect -$header = "Location: index.php?a=2&r=1"; +$header = "Location:". manager_route('home', [ 'r' => 1 ]); header($header); diff --git a/manager/processors/remove_locks.processor.php b/manager/processors/remove_locks.processor.php index 7ae7cc000e..bfddfa2c4b 100755 --- a/manager/processors/remove_locks.processor.php +++ b/manager/processors/remove_locks.processor.php @@ -12,7 +12,7 @@ \EvolutionCMS\Models\ActiveUserLock::query()->truncate(); \EvolutionCMS\Models\ActiveUser::query()->truncate(); - $header = "Location: index.php?a=2"; + $header = "Location:". manager_route('home'); header($header); } else { // Remove single locks via AJAX / window.onbeforeunload diff --git a/manager/processors/save_content.processor.php b/manager/processors/save_content.processor.php index e9238a1e24..ad08ff45e5 100644 --- a/manager/processors/save_content.processor.php +++ b/manager/processors/save_content.processor.php @@ -110,10 +110,10 @@ if (!is_null($docid)) { if ($actionToTake == 'edit') { $modx->getManagerApi()->saveFormValues(27); - $modx->webAlertAndQuit(sprintf($_lang["duplicate_alias_found"], $docid->id, $alias), "index.php?a=27&id={$id}"); + $modx->webAlertAndQuit(sprintf($_lang["duplicate_alias_found"], $docid->id, $alias), manager_route('edit_document', [ 'id' => $id ])); } else { $modx->getManagerApi()->saveFormValues(4); - $modx->webAlertAndQuit(sprintf($_lang["duplicate_alias_found"], $docid->id, $alias), "index.php?a=4"); + $modx->webAlertAndQuit(sprintf($_lang["duplicate_alias_found"], $docid->id, $alias), manager_route('create_resource')); } } } elseif ($alias) { @@ -127,10 +127,10 @@ if (!is_null($docid)) { if ($actionToTake == 'edit') { $modx->getManagerApi()->saveFormValues(27); - $modx->webAlertAndQuit(sprintf($_lang["duplicate_alias_found"], $docid->id, $alias), "index.php?a=27&id={$id}"); + $modx->webAlertAndQuit(sprintf($_lang["duplicate_alias_found"], $docid->id, $alias), manager_route('edit_document', [ 'id' => $id ])); } else { $modx->getManagerApi()->saveFormValues(4); - $modx->webAlertAndQuit(sprintf($_lang["duplicate_alias_found"], $docid->id, $alias), "index.php?a=4"); + $modx->webAlertAndQuit(sprintf($_lang["duplicate_alias_found"], $docid->id, $alias), manager_route('create_resource')); } } } @@ -181,10 +181,10 @@ if ($count == 0) { if ($actionToTake == 'edit') { $modx->getManagerApi()->saveFormValues(27); - $modx->webAlertAndQuit($_lang["resource_permissions_error"], "index.php?a=27&id={$id}"); + $modx->webAlertAndQuit($_lang["resource_permissions_error"], manager_route('edit_document', [ 'id' => $id ])); } else { $modx->getManagerApi()->saveFormValues(4); - $modx->webAlertAndQuit($_lang["resource_permissions_error"], "index.php?a=4"); + $modx->webAlertAndQuit($_lang["resource_permissions_error"], manager_route('create_resource')); } } } @@ -273,10 +273,10 @@ if (!$udperms->checkPermissions()) { if ($actionToTake == 'edit') { $modx->getManagerApi()->saveFormValues(27); - $modx->webAlertAndQuit($_lang['access_permission_parent_denied'], "index.php?a=27&id={$id}"); + $modx->webAlertAndQuit($_lang['access_permission_parent_denied'], manager_route('edit_document', [ 'id' => $id ])); } else { $modx->getManagerApi()->saveFormValues(4); - $modx->webAlertAndQuit($_lang['access_permission_parent_denied'], "index.php?a=4"); + $modx->webAlertAndQuit($_lang['access_permission_parent_denied'], manager_route('create_resource')); } } } @@ -456,19 +456,15 @@ // redirect/stay options if ($_POST['stay'] != '') { - // weblink - if ($_POST['mode'] == "72") { - $a = ($_POST['stay'] == '2') ? "27&id=$key" : "72&pid=$parentId"; - } - - // document - if ($_POST['mode'] == "4") { - $a = ($_POST['stay'] == '2') ? "27&id=$key" : "4&pid=$parentId"; + if ($_POST['stay'] == '2') { + $url = manager_route('edit_document', ['id' => $key, 'r' => 1, 'stay' => $_POST['stay']]); + } else { + $route = ($_POST['mode'] == '72') ? 'create_weblink' : 'create_document'; + $url = manager_route($route, ['pid' => $parentId, 'r' => 1, 'stay' => $_POST['stay']]); } - - $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay']; + $header = "Location: " . $url; } else { - $header = "Location: index.php?a=3&id=$key&r=1"; + $header = "Location: " . manager_route('about_document', ['id' => $key, 'r' => 1]); } if (headers_sent()) { @@ -627,7 +623,7 @@ ->pluck('document_group') ->toArray(); if (!empty($docgrp) && !array_intersect($docgrp, $remainingGroups)) { - $modx->webAlertAndQuit($_lang["resource_permissions_error"], "index.php?a=27&id={$id}"); + $modx->webAlertAndQuit($_lang["resource_permissions_error"], manager_route('edit_document', [ 'id' => $id ])); } } if (!empty($old_groups)) { @@ -683,16 +679,15 @@ } if ($_POST['stay'] != '') { $id = $_REQUEST['id']; - if ($type == "reference") { - // weblink - $a = ($_POST['stay'] == '2') ? "27&id=$id" : "72&pid=$parentId"; + if ($_POST['stay'] == '2') { + $url = manager_route('edit_document', ['id' => $id, 'r' => 1, 'stay' => $_POST['stay']]); } else { - // document - $a = ($_POST['stay'] == '2') ? "27&id=$id" : "4&pid=$parentId"; + $route = ($type == "reference") ? 'create_weblink' : 'create_document'; + $url = manager_route($route, ['pid' => $parentId, 'r' => 1, 'stay' => $_POST['stay']]); } - $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'] . $add_path; + $header = "Location: " . $url . $add_path; } else { - $header = "Location: index.php?a=3&id=$id&r=1" . $add_path; + $header = "Location: " . manager_route('about_document', ['id' => $id, 'r' => 1]) . $add_path; } } if (headers_sent()) { diff --git a/manager/processors/save_htmlsnippet.processor.php b/manager/processors/save_htmlsnippet.processor.php index e2becea3b9..87e9ac8b40 100755 --- a/manager/processors/save_htmlsnippet.processor.php +++ b/manager/processors/save_htmlsnippet.processor.php @@ -31,7 +31,7 @@ $modx->clearCache('full'); // finished emptying cache - redirect - $header = "Location: index.php?a=76&tab=2&r=2"; + $header = "Location:" . manager_route('elements', [ 'tab' => 2, 'r' => 2 ]); header($header); exit; } @@ -75,7 +75,7 @@ // disallow duplicate names for new chunks if (EvolutionCMS\Models\SiteHtmlsnippet::where('name', '=', $name)->first()) { $modx->getManagerApi()->saveFormValues(77); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['chunk'], $name), "index.php?a=77"); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['chunk'], $name), manager_route('create_chunk')); } //do stuff to save the new doc @@ -95,14 +95,16 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "78&id=$id" : "77"; - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; - header($header); + $route = ($_POST['stay'] == '2') ? 'edit_chunk' : 'create_chunk'; + $params = ['r' => 2, 'stay' => $_POST['stay']]; + if ($_POST['stay'] == '2') { + $params['id'] = $id; + } + $url = manager_route($route, $params); + header("Location: " . $url); } else { - $header = "Location: index.php?a=76&r=2"; - header($header); + header("Location: ". manager_route('elements', ['r' => 2])); } - break; case '78': // invoke OnBeforeChunkFormSave event $modx->invokeEvent("OnBeforeChunkFormSave", array( @@ -113,7 +115,7 @@ // disallow duplicate names for chunks if (EvolutionCMS\Models\SiteHtmlsnippet::where('id', '!=', $id)->where('name', '=', $name)->first()) { $modx->getManagerApi()->saveFormValues(78); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['chunk'], $name), "index.php?a=78&id={$id}"); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['chunk'], $name), manager_route('edit_chunk', [ 'id' => $id ])); } //do stuff to save the edited doc @@ -135,12 +137,16 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "78&id=$id" : "77"; - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; + $route = ($_POST['stay'] == '2') ? "edit_chunk" : "create_chunk"; + $params = [ 'r' => 2, 'stay' => $_POST['stay'] ]; + if ($_POST['stay'] == '2') { + $params ['id'] = $id; + } + $header = "Location:". manager_route($route, $params); header($header); } else { $modx->unlockElement(3, $id); - $header = "Location: index.php?a=76&r=2"; + $header = "Location:". manager_route('elements', [ 'r' => 2 ]); header($header); } break; diff --git a/manager/processors/save_module.processor.php b/manager/processors/save_module.processor.php index cdcb7d4343..20207d6c57 100755 --- a/manager/processors/save_module.processor.php +++ b/manager/processors/save_module.processor.php @@ -35,7 +35,7 @@ $modx->clearCache('full'); // finished emptying cache - redirect - $header = "Location: index.php?a=76&tab=5&r=2"; + $header = "Location:". manager_route('elements', [ 'tab' => 5, 'r' => 2 ]); header($header); exit; } @@ -104,7 +104,7 @@ $count = \EvolutionCMS\Models\SiteModule::query()->where('name', $name)->count(); if ($count > 0) { $modx->getManagerApi()->saveFormValues(107); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), "index.php?a=107"); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), manager_route('create_module')); } // save the new module @@ -143,11 +143,15 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "108&id=$newid" : "107"; - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; - header($header); + $route = ($_POST['stay'] == '2') ? 'edit_module' : 'create_module'; + $params = ['r' => 2, 'stay' => $_POST['stay']]; + if ($_POST['stay'] == '2') { + $params['id'] = $newid; + } + $url = manager_route($route, $params); + header("Location: " . $url); } else { - $header = "Location: index.php?a=76&tab=5&r=2"; + $header = "Location:". manager_route('elements', [ 'tab' => 5, 'r' => 2 ]); header($header); } break; @@ -163,7 +167,7 @@ if ($count > 0) { $modx->getManagerApi()->saveFormValues(108); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), "index.php?a=108&id={$id}"); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), manager_route('edit_module', [ 'id' => $id ])); } // save the edited module @@ -201,12 +205,16 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "108&id=$id" : "107"; - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; - header($header); + $route = ($_POST['stay'] == '2') ? 'edit_module' : 'create_module'; + $params = ['r' => 2, 'stay' => $_POST['stay']]; + if ($_POST['stay'] == '2') { + $params['id'] = $newid; + } + $url = manager_route($route, $params); + header("Location: " . $url); } else { $modx->unlockElement(6, $id); - $header = "Location: index.php?a=76&tab=5&r=2"; + $header = "Location:". manager_route('elements', [ 'tab' => 5, 'r' => 2 ]); header($header); } break; diff --git a/manager/processors/save_plugin.processor.php b/manager/processors/save_plugin.processor.php index 68687ebc61..ef442d5593 100755 --- a/manager/processors/save_plugin.processor.php +++ b/manager/processors/save_plugin.processor.php @@ -31,7 +31,7 @@ $modx->clearCache('full'); // finished emptying cache - redirect - $header = "Location: index.php?a=76&tab=4&r=2"; + $header = "Location:". manager_route('elements', [ 'tab' => 4, 'r' => 2 ]); header($header); exit; } @@ -94,7 +94,7 @@ $count = \EvolutionCMS\Models\SitePlugin::query()->where('name', $name)->where('disabled', 0)->count(); if ($count > 0) { $modx->getManagerApi()->saveFormValues(101); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['plugin'], $name), 'index.php?a=101'); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['plugin'], $name), manager_route('create_plugin')); } } @@ -129,11 +129,15 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "102&id=$newid" : '101'; - $header = 'Location: index.php?a=' . $a . '&r=2&stay=' . $_POST['stay']; + $route = ($_POST['stay'] == '2') ? "edit_plugin" : "create_plugin"; + $params = [ 'r' => 2, 'stay' => $_POST['stay'] ]; + if ($_POST['stay'] == '2') { + $params ['id'] = $newid; + } + $header = 'Location:'. manager_route($route, $params); header($header); } else { - $header = 'Location: index.php?a=76&tab=4&r=2'; + $header = 'Location:'. manager_route('elements', [ 'tab' => 4, 'r' => 2 ]); header($header); } break; @@ -149,7 +153,7 @@ $count = \EvolutionCMS\Models\SitePlugin::query()->where('name', $name)->where('disabled', 0)->where('id', '!=', $id)->count(); if ($count > 0) { $modx->getManagerApi()->saveFormValues(102); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['plugin'], $name), "index.php?a=102&id={$id}"); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['plugin'], $name), manager_route('edit_plugin')); } } @@ -183,12 +187,16 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "102&id=$id" : '101'; - $header = 'Location: index.php?a=' . $a . '&r=2&stay=' . $_POST['stay']; + $route = ($_POST['stay'] == '2') ? "edit_plugin" : "create_plugin"; + $params = [ 'r' => 2, 'stay' => $_POST['stay'] ]; + if ($_POST['stay'] == '2') { + $params ['id'] = $id; + } + $header = 'Location:'. manager_route($route, $params); header($header); } else { $modx->unlockElement(5, $id); - $header = 'Location: index.php?a=76&tab=4&r=2'; + $header = 'Location:'. manager_route('elements', [ 'tab' => 4, 'r' => 2 ]); header($header); } break; diff --git a/manager/processors/save_settings.processor.php b/manager/processors/save_settings.processor.php index de252b6099..5fb946d0db 100755 --- a/manager/processors/save_settings.processor.php +++ b/manager/processors/save_settings.processor.php @@ -134,5 +134,5 @@ // empty cache $modx->clearCache('full'); } -$header = "Location: index.php?a=7&r=10"; +$header = "Location:". manager_route('wait_clean_up', [ 'r' => 10 ]); header($header); diff --git a/manager/processors/save_snippet.processor.php b/manager/processors/save_snippet.processor.php index 40384a94b9..0fc8583df7 100755 --- a/manager/processors/save_snippet.processor.php +++ b/manager/processors/save_snippet.processor.php @@ -31,7 +31,7 @@ $modx->clearCache('full'); // finished emptying cache - redirect - $header = "Location: index.php?a=76&tab=3&r=2"; + $header = "Location:". manager_route('elements', [ 'tab' => 3, 'r' => 2 ]); header($header); exit; } @@ -105,7 +105,7 @@ // disallow duplicate names for new snippets if (EvolutionCMS\Models\SiteSnippet::where('name', '=', $name)->first()) { $modx->getManagerApi()->saveFormValues(23); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23"); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), manager_route('create_snippet')); } //do stuff to save the new doc @@ -125,11 +125,15 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23"; - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; + $route = ($_POST['stay'] == '2') ? "edit_snippet" : "create_snippet"; + $params = [ 'r' => 2, 'stay' => $_POST['stay'] ]; + if ($_POST['stay'] == '2') { + $params ['id'] = $newid; + } + $header = "Location:". manager_route($route, $params); header($header); } else { - $header = "Location: index.php?a=76&tab=3&r=2"; + $header = "Location:". manager_route('elements', [ 'tab' => 3, 'r' => 2 ]); header($header); } break; @@ -143,7 +147,7 @@ // disallow duplicate names for snippets if (EvolutionCMS\Models\SiteSnippet::where('id', '!=', $id)->where('name', '=', $name)->first()) { $modx->getManagerApi()->saveFormValues(22); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}"); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), manager_route('edit_snippet', [ 'id' => $id ])); } //do stuff to save the edited doc @@ -165,12 +169,16 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23"; - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; + $route = ($_POST['stay'] == '2') ? "edit_snippet" : "create_snippet"; + $params = [ 'r' => 2, 'stay' => $_POST['stay']]; + if ($_POST['stay'] == '2') { + $params ['id'] = $id; + } + $header = "Location:". manager_route($route, $params); header($header); } else { $modx->unlockElement(4, $id); - $header = "Location: index.php?a=76&tab=3&r=2"; + $header = "Location:". manager_route('elements', [ 'tab' => 3, 'r' => 2 ]); header($header); } break; diff --git a/manager/processors/save_template.processor.php b/manager/processors/save_template.processor.php index feeb43a6cb..673343f6c7 100755 --- a/manager/processors/save_template.processor.php +++ b/manager/processors/save_template.processor.php @@ -34,7 +34,7 @@ $modx->webAlertAndQuit(__('global.error_no_id')); } - $header = 'Location: index.php?a=76&tab=0&r=2'; + $header = 'Location:'. manager_route('elements', [ 'tab' => 0, 'r' => 2 ]); header($header); exit; } @@ -101,7 +101,7 @@ function createBladeFile($templatealias) $count = \EvolutionCMS\Models\SiteTemplate::where('templatename', $templatename)->count(); if ($count > 0) { $modx->getManagerApi()->saveFormValues(19); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), "index.php?a=19"); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), manager_route('create_template')); } if ($templatealias == '') { @@ -114,7 +114,7 @@ function createBladeFile($templatealias) if ($count > 0) { $modx->getManagerApi()->saveFormValues(19); - $modx->webAlertAndQuit(sprintf($_lang["duplicate_template_alias_found"], $docid, $templatealias), "index.php?a=19"); + $modx->webAlertAndQuit(sprintf($_lang["duplicate_template_alias_found"], $docid, $templatealias), manager_route('create_template')); } //do stuff to save the new doc $newid = \EvolutionCMS\Models\SiteTemplate::query()->insertGetId(array( @@ -150,11 +150,15 @@ function createBladeFile($templatealias) // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "16&id=$newid" : "19"; - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; + $route = ($_POST['stay'] == '2') ? "edit_template" : "create_template"; + $params = [ 'r' => 2, 'stay' => $_POST['stay'] ]; + if ($_POST['stay'] == '2') { + $params ['id'] = $newid; + } + $header = "Location:". manager_route($route, $params); header($header); } else { - $header = "Location: index.php?a=76&r=2"; + $header = "Location:". manager_route('elements', [ 'r' => 2 ]); header($header); } @@ -170,7 +174,7 @@ function createBladeFile($templatealias) $count = \EvolutionCMS\Models\SiteTemplate::where('templatename', $templatename)->where('id', '!=', $id)->count(); if ($count > 0) { $modx->getManagerApi()->saveFormValues(16); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), "index.php?a=16&id={$id}"); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), manager_route('edit_template', [ 'id' => $id ])); } if ($templatealias == '') { @@ -183,7 +187,7 @@ function createBladeFile($templatealias) if ($count > 0) { $modx->getManagerApi()->saveFormValues(16); - $modx->webAlertAndQuit(sprintf($_lang["duplicate_template_alias_found"], $docid, $templatealias), "index.php?a=16&id={$id}"); + $modx->webAlertAndQuit(sprintf($_lang["duplicate_template_alias_found"], $docid, $templatealias), manager_route('edit_template', [ 'id' => $id ])); } //do stuff to save the edited doc \EvolutionCMS\Models\SiteTemplate::find($id)->update(array( @@ -218,12 +222,16 @@ function createBladeFile($templatealias) // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "16&id=$id" : "19"; - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; + $route = ($_POST['stay'] == '2') ? "edit_template" : "create_template"; + $params = [ 'r' => 2, 'stay' => $_POST['stay'] ]; + if ($_POST['stay'] == '2') { + $params['id'] = $id; + } + $header = "Location:". manager_route($route, $params); header($header); } else { $modx->unlockElement(1, $id); - $header = "Location: index.php?a=76&r=2"; + $header = "Location:". manager_route('elements', [ 'r' => 2 ]); header($header); } break; diff --git a/manager/processors/save_tmplvars.processor.php b/manager/processors/save_tmplvars.processor.php index 651ae0e12d..d5fa30e7b6 100755 --- a/manager/processors/save_tmplvars.processor.php +++ b/manager/processors/save_tmplvars.processor.php @@ -49,13 +49,13 @@ // disallow duplicate names for new tvs if (EvolutionCMS\Models\SiteTmplvar::where('name', '=', $name)->first()) { $modx->getManagerApi()->saveFormValues(300); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['tv'], $name), "index.php?a=300"); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['tv'], $name), manager_route('create_tv')); } // disallow reserved names if (in_array($name, array('id', 'type', 'contentType', 'pagetitle', 'longtitle', 'description', 'alias', 'link_attributes', 'published', 'pub_date', 'unpub_date', 'parent', 'isfolder', 'introtext', 'content', 'richtext', 'template', 'menuindex', 'searchable', 'cacheable', 'createdby', 'createdon', 'editedby', 'editedon', 'deleted', 'deletedon', 'deletedby', 'publishedon', 'publishedby', 'menutitle', 'hide_from_tree', 'privateweb', 'privatemgr', 'content_dispo', 'hidemenu', 'alias_visible', 'id', 'oldusername', 'oldemail', 'newusername', 'fullname', 'first_name', 'middle_name', 'last_name', 'verified', 'newpassword', 'newpasswordcheck', 'passwordgenmethod', 'passwordnotifymethod', 'specifiedpassword', 'confirmpassword', 'email', 'phone', 'mobilephone', 'fax', 'dob', 'country', 'street', 'city', 'state', 'zip', 'gender', 'photo', 'comment', 'role', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter', 'user_groups', 'mode', 'blockedmode', 'stay', 'save', 'theme_refresher', 'username'))) { $_POST['name'] = ''; $modx->getManagerApi()->saveFormValues(300); - $modx->webAlertAndQuit(sprintf($_lang['reserved_name_warning'], $_lang['tv'], $name), "index.php?a=300"); + $modx->webAlertAndQuit(sprintf($_lang['reserved_name_warning'], $_lang['tv'], $name), manager_route('create_tv')); } // Add new TV @@ -97,11 +97,15 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "301&id=$newid" : "300"; - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; + $route = ($_POST['stay'] == '2') ? "edit_tv" : "create_tv"; + $params = [ 'r' => 2, 'stay' => $_POST ]; + if ($_POST['stay'] == '2') { + $params ['id'] = $newid; + } + $header = "Location:". manager_route($route, $params); header($header); } else { - $header = "Location: index.php?a=76&tab=1&r=2"; + $header = "Location:". manager_route('elements', [ 'tab' => 1, 'r' => 2 ]); header($header); } break; @@ -115,12 +119,12 @@ // disallow duplicate names for tvs if (EvolutionCMS\Models\SiteTmplvar::where('name', '=', $name)->where('id', '!=', $id)->first()) { $modx->getManagerApi()->saveFormValues(300); - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['tv'], $name), "index.php?a=301&id={$id}"); + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['tv'], $name), manager_route('edit_tv', [ 'id' => $id ])); } // disallow reserved names if (in_array($name, array('id', 'type', 'contentType', 'pagetitle', 'longtitle', 'description', 'alias', 'link_attributes', 'published', 'pub_date', 'unpub_date', 'parent', 'isfolder', 'introtext', 'content', 'richtext', 'template', 'menuindex', 'searchable', 'cacheable', 'createdby', 'createdon', 'editedby', 'editedon', 'deleted', 'deletedon', 'deletedby', 'publishedon', 'publishedby', 'menutitle', 'hide_from_tree', 'privateweb', 'privatemgr', 'content_dispo', 'hidemenu', 'alias_visible', 'id', 'oldusername', 'oldemail', 'newusername', 'fullname', 'first_name', 'middle_name', 'last_name', 'verified', 'newpassword', 'newpasswordcheck', 'passwordgenmethod', 'passwordnotifymethod', 'specifiedpassword', 'confirmpassword', 'email', 'phone', 'mobilephone', 'fax', 'dob', 'country', 'street', 'city', 'state', 'zip', 'gender', 'photo', 'comment', 'role', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter', 'user_groups', 'mode', 'blockedmode', 'stay', 'save', 'theme_refresher', 'username'))) { $modx->getManagerApi()->saveFormValues(300); - $modx->webAlertAndQuit(sprintf($_lang['reserved_name_warning'], $_lang['tv'], $name), "index.php?a=301&id={$id}"); + $modx->webAlertAndQuit(sprintf($_lang['reserved_name_warning'], $_lang['tv'], $name), manager_route('edit_tv', [ 'id' => $id ])); } // update TV @@ -161,8 +165,12 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { - $a = ($_POST['stay'] == '2') ? "301&id=$id" : "300"; - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'] . "&or=" . $origin . "&oid=" . $originId; + $route = ($_POST['stay'] == '2') ? "301&id=$id" : "300"; + $params = [ 'r' =>2, 'stay' => $_POST['stay'], 'or' => $origin, 'oid' => $originId ]; + if ($_POST['stay'] == '2') { + $params ['id'] = $id; + } + $header = "Location:". manager_route($route, $params); header($header); } else { $modx->unlockElement(2, $id); diff --git a/manager/processors/undelete_content.processor.php b/manager/processors/undelete_content.processor.php index 8093396e53..704e3762fb 100755 --- a/manager/processors/undelete_content.processor.php +++ b/manager/processors/undelete_content.processor.php @@ -67,5 +67,5 @@ $modx->clearCache('full'); // finished emptying cache - redirect -$header = "Location: index.php?a=3&id=$pid&r=1" . $add_path; +$header = "Location:". manager_route('about_document', [ 'id' => $pid, 'r' => 1 ]) . $add_path; header($header); diff --git a/manager/processors/unpublish_content.processor.php b/manager/processors/unpublish_content.processor.php index b14029d7b8..b32b2b382a 100755 --- a/manager/processors/unpublish_content.processor.php +++ b/manager/processors/unpublish_content.processor.php @@ -53,6 +53,6 @@ // empty cache $modx->clearCache('full'); -$header = "Location: index.php?a=3&id=$pid&r=1" . $add_path; +$header = "Location:". manager_route('about_document', [ 'id' => $pid, 'r' => 1 ]) . $add_path; header($header); diff --git a/manager/processors/web_access_groups.processor.php b/manager/processors/web_access_groups.processor.php index 0dda000fc3..f909340fa7 100755 --- a/manager/processors/web_access_groups.processor.php +++ b/manager/processors/web_access_groups.processor.php @@ -142,5 +142,5 @@ } } -$header = "Location: index.php?a=91"; +$header = "Location:". manager_route('web_permissions'); header($header); diff --git a/manager/views/frame/1.blade.php b/manager/views/frame/1.blade.php index 5bdabdb8bd..ed2f643104 100644 --- a/manager/views/frame/1.blade.php +++ b/manager/views/frame/1.blade.php @@ -187,7 +187,7 @@
    -
    @else
    -
    @endif @@ -537,7 +537,7 @@ function constructLink($action, $img, $text, $allowed) e.preventDefault(); if (modx.config.global_tabs && !e.shiftKey) { modx.tabs({ - url: '{{ MODX_MANAGER_URL }}index.php?a=76', + url: '{{ manager_route('elements') }}', title: '{{ ManagerTheme::getLexicon('elements') }}' }); } else { @@ -546,7 +546,7 @@ function constructLink($action, $img, $text, $allowed) randomNum += ' #' + Math.floor((Math.random() * 999999) + 1); } modx.openWindow({ - url: '{{ MODX_MANAGER_URL }}index.php?a=76', + url: '{{ manager_route('elements') }}', title: randomNum }); } diff --git a/manager/views/frame/tree.blade.php b/manager/views/frame/tree.blade.php index 956cce1aef..cea5265bdf 100644 --- a/manager/views/frame/tree.blade.php +++ b/manager/views/frame/tree.blade.php @@ -14,8 +14,8 @@ @if($modx->hasPermission('new_document')) - - + + @endif @@ -23,7 +23,7 @@ @if($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) - + @endif @if($modx->getConfig('use_browser') && $modx->hasPermission('assets_images')) diff --git a/manager/views/page/2.blade.php b/manager/views/page/2.blade.php index 974b1bf038..d6b9c3956a 100644 --- a/manager/views/page/2.blade.php +++ b/manager/views/page/2.blade.php @@ -6,7 +6,7 @@ if ($modx->hasPermission('settings') && $modx->getConfig('settings_version') !== $modx->getVersionData('version')) { // seems to be a new install - send the user to the configuration page - exit(''); + exit(''); } // set placeholders @@ -82,7 +82,7 @@ if (!$modx->getConfig('site_status') && $modx->hasPermission('settings')) { $ph['show_site_status'] = 'block'; - $ph['site_status_msg'] = strip_tags($modx->getConfig('site_unavailable_message')) . ' ' . __('global.update_settings_from_language') . ' ' . __('global.online') . ''; + $ph['site_status_msg'] = strip_tags($modx->getConfig('site_unavailable_message')) . ' ' . __('global.update_settings_from_language') . ' ' . __('global.online') . ''; } else { $ph['show_site_status'] = 'none'; } @@ -243,7 +243,7 @@ ($modx->hasPermission('new_document') ? ' - + - + - + - + - + ' . $icon . '' . '' . entities($children['pagetitle'], + $title = '' . $icon . '' . '' . entities($children['pagetitle'], $modx->getConfig('modx_charset')) . ''; } else { $title = '' . $icon . '' . entities($children['pagetitle'], @@ -235,12 +235,12 @@ } $icon_pub_unpub = (!$children['published']) - ? '' - : ''; + ? '' + : ''; $icon_del_undel = (!$children['deleted']) - ? '' - : ''; + ? '' + : ''; $listDocs[] = array( 'docid' => '
    ' . $children['id'] . '
    ', @@ -250,14 +250,14 @@ 'pub_date' => '
    ' . ($children['pub_date'] ? ($modx->toDateFormat($children['pub_date'] + $modx->timestamp(0), 'dateOnly')) : '') . '
    ', 'status' => '
    ' . ($children['published'] == 0 ? '' . ManagerTheme::getLexicon('page_data_unpublished') . '' : '' . ManagerTheme::getLexicon('page_data_published') . '') . '
    ', - 'edit' => '
    ' . ($modx->hasPermission('edit_document') ? ' - '
    ' . ($modx->hasPermission('edit_document') ? ' + ' . $icon_pub_unpub : '') . ($modx->hasPermission('delete_document') ? $icon_del_undel : '') . '
    ' ); } $table->createPagingNavigation($numRecords, 'a=3&id=' . $content['id'] . '&dir=' . $dir . '&sort=' . $sort); - $children_output = $table->create($listDocs, $listTableHeader, 'index.php?a=3&id=' . $content['id']); + $children_output = $table->create($listDocs, $listTableHeader, manager_route('about_document', [ 'id' => $content['id'] ])); } else { // No Child documents $children_output = '

    ' . ManagerTheme::getLexicon('resources_in_container_no') . '

    '; @@ -462,14 +462,14 @@ class="' . $_style['icon_move'] . '">
    ' . $icon_pub_unpub : '') . ($modx-
    @if($numRecords > 0) @@ -120,7 +120,7 @@ function deletegroup(groupid, type) {
    @@ -182,7 +182,7 @@ function deletegroup(groupid, type) { @foreach($userGroup->documentGroups as $documentGroup)
  • {{ $documentGroup->name }} ({{ $documentGroup->pivot->context ? 'web' : 'mgr' }}) - ({{ ManagerTheme::getLexicon('remove') }}) + ({{ ManagerTheme::getLexicon('remove') }})
  • @endforeach diff --git a/manager/views/page/web_access_permissions_groupslist.blade.php b/manager/views/page/web_access_permissions_groupslist.blade.php index 675c8d7426..da10158175 100644 --- a/manager/views/page/web_access_permissions_groupslist.blade.php +++ b/manager/views/page/web_access_permissions_groupslist.blade.php @@ -41,7 +41,7 @@ @foreach($list as $item) {{ $item->id }} - {{ $_GET['list'] == 'users' ? $item->username : $item->pagetitle }} + {{ $_GET['list'] == 'users' ? $item->username : $item->pagetitle }} @endforeach From f45d8439b6d7b6747482107a4ccde7f2fbe5038a Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Fri, 29 May 2026 17:23:07 +0700 Subject: [PATCH 03/18] litle_fix_name_and_bug --- core/src/Controllers/Search.php | 2 +- manager/processors/save_tmplvars.processor.php | 2 +- manager/views/page/search.blade.php | 2 +- manager/views/page/web_access_permissions_groupslist.blade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/Controllers/Search.php b/core/src/Controllers/Search.php index b53133c2ab..be0441b1d7 100644 --- a/core/src/Controllers/Search.php +++ b/core/src/Controllers/Search.php @@ -284,7 +284,7 @@ protected function getAjaxResults() ->toArray() as $row) { $output['templates']['results'][] = [ 'id' => $row['id'], - 'url' => manager_route('edit_document', [ 'id' => $row['id'] ]), + 'url' => manager_route('edit_template', [ 'id' => $row['id'] ]), 'title' => $this->highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']), 'class' => $this->addClassForItemList($row['locked']) ]; diff --git a/manager/processors/save_tmplvars.processor.php b/manager/processors/save_tmplvars.processor.php index d5fa30e7b6..cc5dde0cda 100755 --- a/manager/processors/save_tmplvars.processor.php +++ b/manager/processors/save_tmplvars.processor.php @@ -165,7 +165,7 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { - $route = ($_POST['stay'] == '2') ? "301&id=$id" : "300"; + $route = ($_POST['stay'] == '2') ? 'edit_tv' : 'create_tv';; $params = [ 'r' =>2, 'stay' => $_POST['stay'], 'or' => $origin, 'oid' => $originId ]; if ($_POST['stay'] == '2') { $params ['id'] = $id; diff --git a/manager/views/page/search.blade.php b/manager/views/page/search.blade.php index 94f9e4fa0e..6e5acc8792 100644 --- a/manager/views/page/search.blade.php +++ b/manager/views/page/search.blade.php @@ -116,7 +116,7 @@ @foreach($results as $row) - + diff --git a/manager/views/page/web_access_permissions_groupslist.blade.php b/manager/views/page/web_access_permissions_groupslist.blade.php index da10158175..c89e50dcfc 100644 --- a/manager/views/page/web_access_permissions_groupslist.blade.php +++ b/manager/views/page/web_access_permissions_groupslist.blade.php @@ -41,7 +41,7 @@ @foreach($list as $item) {{ $item->id }} - {{ $_GET['list'] == 'users' ? $item->username : $item->pagetitle }} + {{ $_GET['list'] == 'users' ? $item->username : $item->pagetitle }} @endforeach From b8e3066a73121854870028312d78c285559ff092 Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Fri, 29 May 2026 17:33:36 +0700 Subject: [PATCH 04/18] more_fix_human_factor --- core/config/manager_routes.php | 8 ++++---- core/src/Controllers/UserRoles/PermissionsGroups.php | 2 +- core/src/Controllers/WebAccessPermissions.php | 2 +- .../media/style/default/snippets/welcome/RecentInfo.php | 8 ++++---- manager/views/page/3.blade.php | 8 ++++---- manager/views/page/user_roles/permission.blade.php | 2 +- .../views/page/user_roles/permissions_groups.blade.php | 2 +- manager/views/page/user_roles/user_role.blade.php | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/core/config/manager_routes.php b/core/config/manager_routes.php index 85d86ac213..24e6ffdedf 100644 --- a/core/config/manager_routes.php +++ b/core/config/manager_routes.php @@ -22,12 +22,12 @@ 'role_edit' => 35, 'role_create' => 35, 'delete_role' => 37, - 'move_recource' => 51, + 'move_resource' => 51, 'system_info' => 53, 'optimization_table' => 54, 'refresh_tree' => 56, - 'publication_resource' => 61, - 'unpublication_resource'=> 62, + 'publish_resource' => 61, + 'unpublish_resource'=> 62, 'undelete_resource' => 63, 'schedule_site' => 70, 'search' => 71, @@ -62,7 +62,7 @@ 'delete_log_event' => 116, 'categories' => 120, 'permission_edit' => 135, - 'permission_grop_edit' => 136, + 'permission_group_edit' => 136, 'php_info' => 200, 'create_tv' => 300, 'edit_tv' => 301, diff --git a/core/src/Controllers/UserRoles/PermissionsGroups.php b/core/src/Controllers/UserRoles/PermissionsGroups.php index fbe4cc3c56..3c3f5cf327 100644 --- a/core/src/Controllers/UserRoles/PermissionsGroups.php +++ b/core/src/Controllers/UserRoles/PermissionsGroups.php @@ -39,7 +39,7 @@ public function updateOrCreate() $group->name = $_POST['name']; $group->lang_key = $_POST['lang_key']; $group->save(); - header('Location:'. manager_route('permission_grop_edit', [ 'id' => $group->getKey(), 'r' => '9' ])); + header('Location:'. manager_route('permission_group_edit', [ 'id' => $group->getKey(), 'r' => '9' ])); } public static function findCategoryOrNew($name) diff --git a/core/src/Controllers/WebAccessPermissions.php b/core/src/Controllers/WebAccessPermissions.php index cf1e9af191..ea5d8b3ead 100644 --- a/core/src/Controllers/WebAccessPermissions.php +++ b/core/src/Controllers/WebAccessPermissions.php @@ -75,7 +75,7 @@ public function process() : bool break; } - $list->setPath(manager_route('web_access_permissions', [ + $list->setPath(manager_route('web_permissions', [ 'list' => $_GET['list'], 'id' => $groupId ])); diff --git a/manager/media/style/default/snippets/welcome/RecentInfo.php b/manager/media/style/default/snippets/welcome/RecentInfo.php index 912a2e7ee6..6b7333235f 100644 --- a/manager/media/style/default/snippets/welcome/RecentInfo.php +++ b/manager/media/style/default/snippets/welcome/RecentInfo.php @@ -77,13 +77,13 @@ } if ($ph['deleted'] == 1 && $ph['published'] == 0) { - $publish_btn = '
    '; + $publish_btn = '
    '; } elseif ($ph['deleted'] == 1 && $ph['published'] == 1) { - $publish_btn = ' '; + $publish_btn = ' '; } elseif ($ph['deleted'] == 0 && $ph['published'] == 0) { - $publish_btn = ' '; + $publish_btn = ' '; } else { - $publish_btn = ' '; + $publish_btn = ' '; } $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn); diff --git a/manager/views/page/3.blade.php b/manager/views/page/3.blade.php index 38a5c61636..b90126ae4f 100644 --- a/manager/views/page/3.blade.php +++ b/manager/views/page/3.blade.php @@ -55,7 +55,7 @@ 'save' => '', 'delete' => manager_route('delete_resource', [ 'id' => $_REQUEST['id'] ]), 'cancel' => $id == 0 ? manager_route('home') : manager_route('about_document', ['r' => 1, 'id' => $id]) . $add_path, - 'move' => manager_route('move_recource', [ 'id' => $_REQUEST['id'] ]), + 'move' => manager_route('move_resource', [ 'id' => $_REQUEST['id'] ]), 'duplicate' => manager_route('duplicate_resource', [ 'id' => $_REQUEST['id'] ]), 'view' => $modx->getConfig('friendly_urls') ? UrlProcessor::makeUrl($id) : MODX_SITE_URL . 'index.php?id=' . $id, ]; @@ -235,8 +235,8 @@ } $icon_pub_unpub = (!$children['published']) - ? '' - : ''; + ? '' + : ''; $icon_del_undel = (!$children['deleted']) ? '' @@ -251,7 +251,7 @@ 'dateOnly')) : '') . '
    ', 'status' => '
    ' . ($children['published'] == 0 ? '' . ManagerTheme::getLexicon('page_data_unpublished') . '' : '' . ManagerTheme::getLexicon('page_data_published') . '') . '
    ', 'edit' => '
    ' . ($modx->hasPermission('edit_document') ? ' - ' . $icon_pub_unpub : '') . ($modx->hasPermission('delete_document') ? $icon_del_undel : '') . '
    ' ); } diff --git a/manager/views/page/user_roles/permission.blade.php b/manager/views/page/user_roles/permission.blade.php index 5102387dac..f16c429064 100644 --- a/manager/views/page/user_roles/permission.blade.php +++ b/manager/views/page/user_roles/permission.blade.php @@ -113,7 +113,7 @@ function changestate (element) { }, delete: function () { if (confirm("{{ __('global.confirm_delete_permission') }}") === true) { - document.location.href = "{{ manager_route('permission_edit', ['tab' => 2, 'action' => 'delete']) }}" + "&id=" + document.userform.id.value + document.location.href = "{{ manager_route('permission_edit', ['action' => 'delete']) }}" + "&id=" + document.userform.id.value } }, cancel: function () { diff --git a/manager/views/page/user_roles/permissions_groups.blade.php b/manager/views/page/user_roles/permissions_groups.blade.php index e8c3ca6317..4ce7089e11 100644 --- a/manager/views/page/user_roles/permissions_groups.blade.php +++ b/manager/views/page/user_roles/permissions_groups.blade.php @@ -69,7 +69,7 @@ function changestate (element) { }, delete: function () { if (confirm("{{ __('global.confirm_delete_category') }}") === true) { - document.location.href = "{{ manager_route('permission_grop_edit', [ 'action' => 'delete']) }}" + "&id=" + document.userform.id.value + document.location.href = "{{ manager_route('permission_group_edit', [ 'action' => 'delete']) }}" + "&id=" + document.userform.id.value } }, cancel: function () { diff --git a/manager/views/page/user_roles/user_role.blade.php b/manager/views/page/user_roles/user_role.blade.php index 72b42294e6..c035a0833a 100644 --- a/manager/views/page/user_roles/user_role.blade.php +++ b/manager/views/page/user_roles/user_role.blade.php @@ -180,7 +180,7 @@ function changestate (element) { }, cancel: function () { documentDirty = false - document.location.href = "{{ manager_route('role_list')}}"'index.php?a=86' + document.location.href = "{{ manager_route('role_list')}}" } } From b6d769d041e02640d73d6bf524d28353fc9a6284 Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Mon, 1 Jun 2026 10:44:07 +0700 Subject: [PATCH 05/18] fix_and_and_new_route --- core/config/manager_routes.php | 16 +++++++++------- core/src/Controllers/Frame.php | 4 ++-- core/src/Controllers/UserRoles/Permission.php | 2 +- .../Controllers/UserRoles/PermissionsGroups.php | 2 +- core/src/Controllers/UserRoles/UserRole.php | 12 ++++++------ manager/media/style/default/ajax.php | 2 +- .../processors/duplicate_content.processor.php | 2 +- .../duplicate_htmlsnippet.processor.php | 2 +- .../processors/duplicate_module.processor.php | 2 +- .../processors/duplicate_plugin.processor.php | 2 +- .../processors/duplicate_snippet.processor.php | 2 +- .../processors/duplicate_template.processor.php | 2 +- .../processors/duplicate_tmplvars.processor.php | 2 +- manager/processors/optimize_table.processor.php | 2 +- manager/processors/save_tmplvars.processor.php | 2 +- manager/views/page/modules.blade.php | 2 +- manager/views/page/template.blade.php | 2 +- .../views/page/user_roles/permission.blade.php | 2 +- .../page/user_roles/permissions_groups.blade.php | 2 +- .../views/page/user_roles/user_role.blade.php | 2 +- manager/views/partials/header.blade.php | 2 +- 21 files changed, 35 insertions(+), 33 deletions(-) diff --git a/core/config/manager_routes.php b/core/config/manager_routes.php index 24e6ffdedf..f0e53b340b 100644 --- a/core/config/manager_routes.php +++ b/core/config/manager_routes.php @@ -19,16 +19,17 @@ 'edit_document' => 27, 'change_password' => 28, 'files' => 31, - 'role_edit' => 35, - 'role_create' => 35, + 'edit_role' => 35, + 'create_role' => 35, 'delete_role' => 37, 'move_resource' => 51, 'system_info' => 53, 'optimization_table' => 54, 'refresh_tree' => 56, - 'publish_resource' => 61, - 'unpublish_resource'=> 62, + 'publish_resource' => 61, + 'unpublish_resource' => 62, 'undelete_resource' => 63, + 'remove_lock' => 67, 'schedule_site' => 70, 'search' => 71, 'create_weblink' => 72, @@ -56,13 +57,14 @@ 'edit_module' => 108, 'delete_module' => 110, 'duplicate_module' => 111, - 'modules' => 112, + 'execute_modules' => 112, 'event_log' => 114, 'event_log_detail' => 115, 'delete_log_event' => 116, + 'edit_tv_rank' => 117, 'categories' => 120, - 'permission_edit' => 135, - 'permission_group_edit' => 136, + 'edit_permission' => 135, + 'edit_permission_group' => 136, 'php_info' => 200, 'create_tv' => 300, 'edit_tv' => 301, diff --git a/core/src/Controllers/Frame.php b/core/src/Controllers/Frame.php index eb52a423f0..412c9d091f 100644 --- a/core/src/Controllers/Frame.php +++ b/core/src/Controllers/Frame.php @@ -605,7 +605,7 @@ protected function menuRunModules() 'module' . $row['id'], 'modules', ($row['icon'] != '' ? '' : '') . e($row['name']), - manager_route('modules', ['id' => $row['id']]), + manager_route('execute_modules', ['id' => $row['id']]), e($row['name']), '', '', @@ -627,7 +627,7 @@ protected function menuRunModules() 'module' . $module['id'], 'modules', ($module['icon'] != '' ? '' : '') . $module['name'], - !empty($module['properties']['routes']) ? 'modules/' . $module['id'] : manager_route('modules', ['id' => $module['id']]), + !empty($module['properties']['routes']) ? 'modules/' . $module['id'] : manager_route('execute_modules', ['id' => $module['id']]), $module['name'], '', '', diff --git a/core/src/Controllers/UserRoles/Permission.php b/core/src/Controllers/UserRoles/Permission.php index 79dfb777a3..5d51bd4796 100644 --- a/core/src/Controllers/UserRoles/Permission.php +++ b/core/src/Controllers/UserRoles/Permission.php @@ -47,7 +47,7 @@ public function updateOrCreate() $group->group_id = $group_id; $group->disabled = $_POST['disabled']; $group->save(); - header('Location:'. manager_route('permission_edit', [ 'id' => $group->getKey(), 'r' => 9 ])); + header('Location:'. manager_route('edit_permission', [ 'id' => $group->getKey(), 'r' => 9 ])); } /** diff --git a/core/src/Controllers/UserRoles/PermissionsGroups.php b/core/src/Controllers/UserRoles/PermissionsGroups.php index 3c3f5cf327..824d5f9311 100644 --- a/core/src/Controllers/UserRoles/PermissionsGroups.php +++ b/core/src/Controllers/UserRoles/PermissionsGroups.php @@ -39,7 +39,7 @@ public function updateOrCreate() $group->name = $_POST['name']; $group->lang_key = $_POST['lang_key']; $group->save(); - header('Location:'. manager_route('permission_group_edit', [ 'id' => $group->getKey(), 'r' => '9' ])); + header('Location:'. manager_route('edit_permission_group', [ 'id' => $group->getKey(), 'r' => '9' ])); } public static function findCategoryOrNew($name) diff --git a/core/src/Controllers/UserRoles/UserRole.php b/core/src/Controllers/UserRoles/UserRole.php index f7ffa7e350..aa5bcfbe01 100644 --- a/core/src/Controllers/UserRoles/UserRole.php +++ b/core/src/Controllers/UserRoles/UserRole.php @@ -43,10 +43,10 @@ public function process(): bool $id = $this->getElementId(); $count = UserAttribute::where('role',$id)->count(); if($id==1){ - $this->managerTheme->getCore()->webAlertAndQuit->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!", manager_route('role_edit', [ 'id' => $id ])); + $this->managerTheme->getCore()->webAlertAndQuit->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!", manager_route('edit_role', [ 'id' => $id ])); } if($count>0){ - $this->managerTheme->getCore()->webAlertAndQuit("There are users with this role. It can't be deleted.", manager_route('role_edit', [ 'id' => $id ])); + $this->managerTheme->getCore()->webAlertAndQuit("There are users with this role. It can't be deleted.", manager_route('edit_role', [ 'id' => $id ])); } Models\RolePermissions::query()->where('role_id', $id)->delete(); Models\UserRole::destroy($id); @@ -80,8 +80,8 @@ public function updateOrCreate() $this->managerTheme->getCore()->webAlertAndQuit( 'Please enter a name for this role!', $mode == 35 - ? manager_route('role_edit', [ 'id' => $id ]) - : manager_route('role_create') + ? manager_route('edit_role', [ 'id' => $id ]) + : manager_route('create_role') ); } @@ -142,13 +142,13 @@ public function updateOrCreate() if (!empty($_POST['stay'])) { if ($_POST['stay'] == '2') { - header('Location: ' . manager_route('role_edit', [ + header('Location: ' . manager_route('edit_role', [ 'id' => $role->getKey(), 'r' => 2, 'stay' => $_POST['stay'] ])); } else { - header('Location: ' . manager_route('role_create', [ + header('Location: ' . manager_route('create_role', [ 'r' => 2, 'stay' => $_POST['stay'] ])); diff --git a/manager/media/style/default/ajax.php b/manager/media/style/default/ajax.php index 605644f6f4..7918b12313 100755 --- a/manager/media/style/default/ajax.php +++ b/manager/media/style/default/ajax.php @@ -264,7 +264,7 @@ } if ($modx->hasPermission('new_role')) { - $output .= '
  • ' . $_lang['new_role'] . '
  • '; + $output .= '
  • ' . $_lang['new_role'] . '
  • '; } if ($count = $sql->count()) { diff --git a/manager/processors/duplicate_content.processor.php b/manager/processors/duplicate_content.processor.php index 3d283a1d24..b6355d4e69 100755 --- a/manager/processors/duplicate_content.processor.php +++ b/manager/processors/duplicate_content.processor.php @@ -32,5 +32,5 @@ $_SESSION['itemname'] = $name; // finish cloning - redirect -$header = "Location: index.php?r=1&a=3&id=" . $document->getKey(); +$header = "Location:". manager_route('about_document', [ 'r' => 1, 'id' => $document->getKey() ]); header($header); diff --git a/manager/processors/duplicate_htmlsnippet.processor.php b/manager/processors/duplicate_htmlsnippet.processor.php index 3ef37a71b1..b808c0de80 100755 --- a/manager/processors/duplicate_htmlsnippet.processor.php +++ b/manager/processors/duplicate_htmlsnippet.processor.php @@ -29,5 +29,5 @@ $_SESSION['itemname'] = $newHtmlsnippet->name; // finish duplicating - redirect to new chunk -$header = "Location: index.php?r=2&a=78&id=" . $newHtmlsnippet->getKey(); +$header = "Location:". manager_route('edit_chunk', [ 'r' => 2, 'id' => $newHtmlsnippet->getKey() ]); header($header); diff --git a/manager/processors/duplicate_module.processor.php b/manager/processors/duplicate_module.processor.php index 6b6f93b13e..1438f3e97c 100755 --- a/manager/processors/duplicate_module.processor.php +++ b/manager/processors/duplicate_module.processor.php @@ -64,5 +64,5 @@ $_SESSION['itemname'] = $name; // finish duplicating - redirect to new module -$header = "Location: index.php?r=2&a=108&id=$newid"; +$header = "Location:". manager_route('edit_module', [ 'r' => 2, 'id' => $newid ]); header($header); diff --git a/manager/processors/duplicate_plugin.processor.php b/manager/processors/duplicate_plugin.processor.php index 86e3488e38..03bcf27d23 100755 --- a/manager/processors/duplicate_plugin.processor.php +++ b/manager/processors/duplicate_plugin.processor.php @@ -43,5 +43,5 @@ $_SESSION['itemname'] = $name; // finish duplicating - redirect to new plugin -$header = "Location: index.php?r=2&a=102&id=$newid"; +$header = "Location:". manager_route('edit_plugin', ['r' => 2, 'id' => $newid ]); header($header); diff --git a/manager/processors/duplicate_snippet.processor.php b/manager/processors/duplicate_snippet.processor.php index f30c2fa28e..41374f4124 100755 --- a/manager/processors/duplicate_snippet.processor.php +++ b/manager/processors/duplicate_snippet.processor.php @@ -30,5 +30,5 @@ $_SESSION['itemname'] = $newSnippet->name; // finish duplicating - redirect to new snippet -$header = "Location: index.php?r=2&a=22&id=" . $newSnippet->getKey(); +$header = "Location:". manager_route('edit_snippet', [ 'r' => 2, 'id' => $newSnippet->getKey() ]); header($header); diff --git a/manager/processors/duplicate_template.processor.php b/manager/processors/duplicate_template.processor.php index 7ceff2f87f..a457578a5e 100755 --- a/manager/processors/duplicate_template.processor.php +++ b/manager/processors/duplicate_template.processor.php @@ -41,5 +41,5 @@ $_SESSION['itemname'] = $name; // finish duplicating - redirect to new template -$header = "Location: index.php?r=2&a=16&id=$newid"; +$header = "Location:". manager_route('edit_template', [ 'r'=>2, 'id' => $newid ]); header($header); diff --git a/manager/processors/duplicate_tmplvars.processor.php b/manager/processors/duplicate_tmplvars.processor.php index d9f9205724..634ffe32ec 100755 --- a/manager/processors/duplicate_tmplvars.processor.php +++ b/manager/processors/duplicate_tmplvars.processor.php @@ -45,5 +45,5 @@ $_SESSION['itemname'] = $newTmplvar->name; // finish duplicating - redirect to new variable -$header = "Location: index.php?r=2&a=301&id=" . $newTmplvar->getKey(); +$header = "Location:". manager_route('edit_tv', [ 'r' => 2, 'id' => $newTmplvar->getKey() ]); header($header); diff --git a/manager/processors/optimize_table.processor.php b/manager/processors/optimize_table.processor.php index 3f08044373..32c0fb9a59 100755 --- a/manager/processors/optimize_table.processor.php +++ b/manager/processors/optimize_table.processor.php @@ -30,5 +30,5 @@ } $mode = (int) get_by_key($_REQUEST, 'mode', 93, 'is_scalar'); -$header = "Location: index.php?a={$mode}&s=4"; +$header = "Location:". manager_route_by_action($mode, [ 's' => 4 ]); header($header); diff --git a/manager/processors/save_tmplvars.processor.php b/manager/processors/save_tmplvars.processor.php index cc5dde0cda..d1e567f71a 100755 --- a/manager/processors/save_tmplvars.processor.php +++ b/manager/processors/save_tmplvars.processor.php @@ -174,7 +174,7 @@ header($header); } else { $modx->unlockElement(2, $id); - $header = "Location: index.php?a=" . $origin . "&r=2" . (empty($originId) ? '' : '&id=' . $originId); + $header = "Location:". manager_route_by_action($origin, ['r' => 2, 'id' => $originId]); header($header); } diff --git a/manager/views/page/modules.blade.php b/manager/views/page/modules.blade.php index febcaf2cc5..fb582a9a1b 100644 --- a/manager/views/page/modules.blade.php +++ b/manager/views/page/modules.blade.php @@ -87,7 +87,7 @@ function menuAction(a) { switch (a) { case 1: // run module dontShowWorker = true; // prevent worker from being displayed - window.location.href = {!! manager_route('modules') !!} + '&id=' + id; + window.location.href = {!! manager_route('execute_modules') !!} + '&id=' + id; break; case 2: // edit window.location.href = {!! manager_route('edit_module') !!} + '&id=' + id; diff --git a/manager/views/page/template.blade.php b/manager/views/page/template.blade.php index 0c8cd16fa2..6a68f06901 100644 --- a/manager/views/page/template.blade.php +++ b/manager/views/page/template.blade.php @@ -241,7 +241,7 @@ @if($modx->hasPermission('save_template') && $data->tvs->count() > 1 && $data->getKey())
    {{ ManagerTheme::getLexicon('template_tv_edit') }} + href="{{ manager_route('edit_tv_rank', ['id' => $data->getKey()]) }}">{{ ManagerTheme::getLexicon('template_tv_edit') }}
    @endif diff --git a/manager/views/page/user_roles/permission.blade.php b/manager/views/page/user_roles/permission.blade.php index f16c429064..4fba60c72d 100644 --- a/manager/views/page/user_roles/permission.blade.php +++ b/manager/views/page/user_roles/permission.blade.php @@ -113,7 +113,7 @@ function changestate (element) { }, delete: function () { if (confirm("{{ __('global.confirm_delete_permission') }}") === true) { - document.location.href = "{{ manager_route('permission_edit', ['action' => 'delete']) }}" + "&id=" + document.userform.id.value + document.location.href = "{{ manager_route('edit_permission', ['action' => 'delete']) }}" + "&id=" + document.userform.id.value } }, cancel: function () { diff --git a/manager/views/page/user_roles/permissions_groups.blade.php b/manager/views/page/user_roles/permissions_groups.blade.php index 4ce7089e11..704dbaeec4 100644 --- a/manager/views/page/user_roles/permissions_groups.blade.php +++ b/manager/views/page/user_roles/permissions_groups.blade.php @@ -69,7 +69,7 @@ function changestate (element) { }, delete: function () { if (confirm("{{ __('global.confirm_delete_category') }}") === true) { - document.location.href = "{{ manager_route('permission_group_edit', [ 'action' => 'delete']) }}" + "&id=" + document.userform.id.value + document.location.href = "{{ manager_route('edit_permission_group', [ 'action' => 'delete']) }}" + "&id=" + document.userform.id.value } }, cancel: function () { diff --git a/manager/views/page/user_roles/user_role.blade.php b/manager/views/page/user_roles/user_role.blade.php index c035a0833a..fc1a2a29a9 100644 --- a/manager/views/page/user_roles/user_role.blade.php +++ b/manager/views/page/user_roles/user_role.blade.php @@ -175,7 +175,7 @@ function changestate (element) { }, delete: function () { if (confirm("{{ __('global.confirm_delete_role') }}") === true) { - document.location.href = 'index.php?id=' + document.userform.id.value + '&a=35&action=delete' + document.location.href = " {{ manager_route('create_role', ['action' => 'delete']) }}"+"&id=" + document.userform.id.value } }, cancel: function () { diff --git a/manager/views/partials/header.blade.php b/manager/views/partials/header.blade.php index 8a9e359ce0..91e5451d60 100644 --- a/manager/views/partials/header.blade.php +++ b/manager/views/partials/header.blade.php @@ -59,7 +59,7 @@ function unlockThisElement() var stay = document.getElementById('stay'); // Trigger unlock if ((stay && stay.value !== '2') || !form_save) { - var url = '?a=67&type={{ $elementType }}&id={{ $data->getKey() }}&_token={{ csrf_token() }}&o=' + Math.random(); + var url = "{{manager_route('remove_lock', [ 'type' => $elementType, 'id' => $data->getKey(), '_token' => ])}}+&_token={{ csrf_token() }}&o=" + Math.random(); if (navigator.sendBeacon) { navigator.sendBeacon(url) } else { From 971c681d89b758aea4fe2ecabd8798f3c82198e3 Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Mon, 1 Jun 2026 10:55:26 +0700 Subject: [PATCH 06/18] little_fix --- manager/processors/delete_content.processor.php | 2 +- manager/processors/save_content.processor.php | 4 ++-- manager/processors/save_tmplvars.processor.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manager/processors/delete_content.processor.php b/manager/processors/delete_content.processor.php index 3d3e8a3c8a..983d5e2b21 100755 --- a/manager/processors/delete_content.processor.php +++ b/manager/processors/delete_content.processor.php @@ -84,5 +84,5 @@ $modx->clearCache('full'); // finished emptying cache - redirect -$header = "Location:". manager_route('about_document', [ 'id' => $pid, 'r' => 1 ])." . $add_path; +$header = "Location:". manager_route('about_document', [ 'id' => $pid, 'r' => 1 ]) . $add_path; header($header); \ No newline at end of file diff --git a/manager/processors/save_content.processor.php b/manager/processors/save_content.processor.php index ad08ff45e5..501aec3694 100644 --- a/manager/processors/save_content.processor.php +++ b/manager/processors/save_content.processor.php @@ -459,7 +459,7 @@ if ($_POST['stay'] == '2') { $url = manager_route('edit_document', ['id' => $key, 'r' => 1, 'stay' => $_POST['stay']]); } else { - $route = ($_POST['mode'] == '72') ? 'create_weblink' : 'create_document'; + $route = ($_POST['mode'] == '72') ? 'create_weblink' : 'create_resource'; $url = manager_route($route, ['pid' => $parentId, 'r' => 1, 'stay' => $_POST['stay']]); } $header = "Location: " . $url; @@ -682,7 +682,7 @@ if ($_POST['stay'] == '2') { $url = manager_route('edit_document', ['id' => $id, 'r' => 1, 'stay' => $_POST['stay']]); } else { - $route = ($type == "reference") ? 'create_weblink' : 'create_document'; + $route = ($type == "reference") ? 'create_weblink' : 'create_resource'; $url = manager_route($route, ['pid' => $parentId, 'r' => 1, 'stay' => $_POST['stay']]); } $header = "Location: " . $url . $add_path; diff --git a/manager/processors/save_tmplvars.processor.php b/manager/processors/save_tmplvars.processor.php index d1e567f71a..98bd59797d 100755 --- a/manager/processors/save_tmplvars.processor.php +++ b/manager/processors/save_tmplvars.processor.php @@ -98,7 +98,7 @@ // finished emptying cache - redirect if ($_POST['stay'] != '') { $route = ($_POST['stay'] == '2') ? "edit_tv" : "create_tv"; - $params = [ 'r' => 2, 'stay' => $_POST ]; + $params = [ 'r' => 2, 'stay' => $_POST['stay'] ]; if ($_POST['stay'] == '2') { $params ['id'] = $newid; } From 82bc2b2558ddcfb186dca8d3d429626f1e0f3058 Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Mon, 1 Jun 2026 11:00:50 +0700 Subject: [PATCH 07/18] little_fix --- manager/views/page/eventlog.blade.php | 2 +- manager/views/partials/header.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/views/page/eventlog.blade.php b/manager/views/page/eventlog.blade.php index d1ab45b1d7..daaabd096f 100644 --- a/manager/views/page/eventlog.blade.php +++ b/manager/views/page/eventlog.blade.php @@ -172,7 +172,7 @@ class="{{ $_style['icon_table'] }}">
    $grd->columns = ManagerTheme::getLexicon('type') . ' ,' . ManagerTheme::getLexicon('source') . ' ,' . ManagerTheme::getLexicon('date') . ' ,' . ManagerTheme::getLexicon('event_id') . ' ,' . ManagerTheme::getLexicon('sysinfo_userid'); $grd->colWidths = '1%,,1%,1%,1%'; $grd->colAligns = 'center,,,center,center'; - $grd->colTypes = "template:||template:[+source+]||date: " . $modx->toDateFormat(null, 'formatOnly') . ' H:i:s'; + $grd->colTypes = "template:||template:[+source+]||date: " . $modx->toDateFormat(null, 'formatOnly') . ' H:i:s'; if ($listmode == '1') { $grd->pageSize = 0; } diff --git a/manager/views/partials/header.blade.php b/manager/views/partials/header.blade.php index 91e5451d60..fe8fb1bb32 100644 --- a/manager/views/partials/header.blade.php +++ b/manager/views/partials/header.blade.php @@ -59,7 +59,7 @@ function unlockThisElement() var stay = document.getElementById('stay'); // Trigger unlock if ((stay && stay.value !== '2') || !form_save) { - var url = "{{manager_route('remove_lock', [ 'type' => $elementType, 'id' => $data->getKey(), '_token' => ])}}+&_token={{ csrf_token() }}&o=" + Math.random(); + var url = "{{manager_route('remove_lock', [ 'type' => $elementType, 'id' => $data->getKey() ])}}+&_token={{ csrf_token() }}&o=" + Math.random(); if (navigator.sendBeacon) { navigator.sendBeacon(url) } else { From 762cba692fdb8d086e1e0d94c16d73f18fbc0ecb Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Mon, 1 Jun 2026 13:55:55 +0700 Subject: [PATCH 08/18] fix_shielding problems --- core/functions/actions/files.php | 6 +++--- manager/actions/files.dynamic.php | 8 ++++---- manager/views/frame/1.blade.php | 4 ++-- manager/views/page/3.blade.php | 4 ++-- manager/views/page/user_roles/permission.blade.php | 4 ++-- .../views/page/user_roles/permissions_groups.blade.php | 4 ++-- manager/views/page/user_roles/user_role.blade.php | 4 ++-- manager/views/partials/header.blade.php | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core/functions/actions/files.php b/core/functions/actions/files.php index 311e3a020f..1cadadcacd 100644 --- a/core/functions/actions/files.php +++ b/core/functions/actions/files.php @@ -105,7 +105,7 @@ function ls($curpath, array $options = []) ' ' . '' . '' . $file . ''; @@ -143,10 +143,10 @@ function ls($curpath, array $options = []) explode('/', substr($newpath, $len, strlen($newpath))))) . '" style="cursor:pointer;" download>' : ''); $files_array[$filecounter]['view'] = (in_array($type, - $inlineviewablefiles)) ? '' : $files_array[$filecounter]['view']; + $inlineviewablefiles)) ? '' : $files_array[$filecounter]['view']; $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '' : ''; $files_array[$filecounter]['edit'] = (in_array($type, - $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; + $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; $files_array[$filecounter]['rename'] = (in_array($type, diff --git a/manager/actions/files.dynamic.php b/manager/actions/files.dynamic.php index bed94d51dd..9698fc4701 100644 --- a/manager/actions/files.dynamic.php +++ b/manager/actions/files.dynamic.php @@ -215,7 +215,7 @@ function renameFile (file) 'newfolder', - 'path' => urlencode($startpath), + 'path' => $startpath, 'name' => '' ]); $_ = parsePlaceholder($tpl, $ph); @@ -236,7 +236,7 @@ function renameFile (file) $ph['image'] = $_style['icon_document']; $ph['href'] = manager_route('files', [ 'mode' => 'newfile', - 'path' => urlencode($startpath), + 'path' => $startpath, 'name' => '' ]); $_ .= parsePlaceholder($tpl, $ph); @@ -292,7 +292,7 @@ function renameFile (file) } $path .= rtrim($v, '/') . '/'; if (1 < $count) { - $href = manager_route('files', [ 'mode' => 'drill', 'path' => urlencode($filemanager_path . $path) ]); + $href = manager_route('files', [ 'mode' => 'drill', 'path' => $filemanager_path . $path ]); $pieces[$i] = '' . trim($v, '/') . ''; } else { $pieces[$i] = '' . trim($v, '/') . ''; diff --git a/manager/views/frame/1.blade.php b/manager/views/frame/1.blade.php index ed2f643104..57149bd99e 100644 --- a/manager/views/frame/1.blade.php +++ b/manager/views/frame/1.blade.php @@ -537,7 +537,7 @@ function constructLink($action, $img, $text, $allowed) e.preventDefault(); if (modx.config.global_tabs && !e.shiftKey) { modx.tabs({ - url: '{{ manager_route('elements') }}', + url: '{!! manager_route('elements') !!}', title: '{{ ManagerTheme::getLexicon('elements') }}' }); } else { @@ -546,7 +546,7 @@ function constructLink($action, $img, $text, $allowed) randomNum += ' #' + Math.floor((Math.random() * 999999) + 1); } modx.openWindow({ - url: '{{ manager_route('elements') }}', + url: '{!! manager_route('elements') !!}', title: randomNum }); } diff --git a/manager/views/page/3.blade.php b/manager/views/page/3.blade.php index b90126ae4f..4ebd1faae2 100644 --- a/manager/views/page/3.blade.php +++ b/manager/views/page/3.blade.php @@ -462,14 +462,14 @@ class="' . $_style['icon_move'] . '">
    ' . $icon_pub_unpub : '') . ($modx-
    @if($numRecords > 0) + "> toHtml(); ?> - +
    @@ -536,7 +536,7 @@ class=""> toHtml(); ?> - + $_REQUEST['path'] ]); } else { - $href = 'a=2'; + $href = manager_route('home'); } if (is_writable($startpath)) { $ph = array(); @@ -476,7 +476,7 @@ function renameFile (file) echo csrf_field()->toHtml(); ?> - + toHtml(); ?> - + diff --git a/manager/actions/mutate_content.dynamic.php b/manager/actions/mutate_content.dynamic.php index a2345deae3..27d4fab9ad 100644 --- a/manager/actions/mutate_content.dynamic.php +++ b/manager/actions/mutate_content.dynamic.php @@ -520,7 +520,7 @@ function evoRenderTvImageCheck(a) { /*************************/ ?> - + diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php index f00d751732..5c0569dbb1 100644 --- a/manager/actions/mutate_module.dynamic.php +++ b/manager/actions/mutate_module.dynamic.php @@ -75,7 +75,7 @@ function loadDependencies() { } documentDirty = false; - window.location.href = " $_REQUEST['id'] ?? '']) ?>"; + window.location.href = " $_REQUEST['id'] ?? '']) ?>"; } var actions = { @@ -137,7 +137,7 @@ function setTextWrap(ctrl, b) { $docBlockList = $modx->convertDocBlockIntoList($docBlock); $internal = array(); ?> - + "> diff --git a/manager/actions/mutate_module_resources.dynamic.php b/manager/actions/mutate_module_resources.dynamic.php index 0258edd241..d5ccacb906 100644 --- a/manager/actions/mutate_module_resources.dynamic.php +++ b/manager/actions/mutate_module_resources.dynamic.php @@ -178,7 +178,7 @@ function openSelector(resource, mode, callback, w, h) { toHtml(); ?> - + diff --git a/manager/actions/mutate_web_user.dynamic.php b/manager/actions/mutate_web_user.dynamic.php index 9d233f3624..3225280f65 100644 --- a/manager/actions/mutate_web_user.dynamic.php +++ b/manager/actions/mutate_web_user.dynamic.php @@ -313,7 +313,7 @@ function evoRenderTvImageCheck(a) { echo implode("", $evtOut); } ?> - + diff --git a/manager/actions/web_user_management.static.php b/manager/actions/web_user_management.static.php index c3ec027903..ce7ff10fd6 100644 --- a/manager/actions/web_user_management.static.php +++ b/manager/actions/web_user_management.static.php @@ -132,7 +132,7 @@ ]; } - $table->createPagingNavigation($numRecords, 'a=99&'.http_build_query($query)); + $table->createPagingNavigation($numRecords, 'a=' . manager_action_id('user_list') . '&' . http_build_query($query)); $output = $table->create($listDocs, $listTableHeader, manager_route('user_list')); } else { // no documents @@ -191,7 +191,7 @@ function menuAction(a) { }); - +toHtml(); ?> diff --git a/manager/media/script/mutate_settings.js b/manager/media/script/mutate_settings.js index 6d470818f5..919183d09c 100644 --- a/manager/media/script/mutate_settings.js +++ b/manager/media/script/mutate_settings.js @@ -58,7 +58,7 @@ function confirmLangChange(el, lkey, elupd){ proceed = confirm(lang_chg); } if(proceed) { - $.post('index.php?a=118', { + $.post(modx.routes.updatePlugin, { action: 'get', lang: lang !== '' ? lang : lang_default, key: lkey diff --git a/manager/media/script/resources-functions.js b/manager/media/script/resources-functions.js index 6fc3b869c4..c872dea89f 100644 --- a/manager/media/script/resources-functions.js +++ b/manager/media/script/resources-functions.js @@ -1,7 +1,7 @@ function unlockElement(type, id, domEl) { var msg = trans.msg.replace('[+id+]', id).replace('[+element_type+]', trans['type' + type]); if (confirm(msg) == true) { - jQuery.get('index.php?a=67&type=' + type + '&id=' + id, function (data) { + jQuery.get(modx.routes.removeLock + '&type=' + type + '&id=' + id, function (data) { if (data == 1) { jQuery(domEl).fadeOut(); } else alert(data); diff --git a/manager/media/script/session.js b/manager/media/script/session.js index e7655d9845..189082e84f 100755 --- a/manager/media/script/session.js +++ b/manager/media/script/session.js @@ -7,7 +7,7 @@ function keepMeAlive() { onComplete: function(sessionResponse) { resp = Json.evaluate(sessionResponse); if(resp.status != 'ok') { - window.location.href = 'index.php?a=8'; + window.location.href = modx.routes.logout; } } }).request(); diff --git a/manager/media/style/common/login.tpl b/manager/media/style/common/login.tpl index 69edc773bb..d9d5292197 100644 --- a/manager/media/style/common/login.tpl +++ b/manager/media/style/common/login.tpl @@ -111,7 +111,7 @@ el.remove(); } var xhr = new XMLHttpRequest(); - xhr.open('POST', '?a=0', true); + xhr.open('POST', '', true); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded;'); xhr.onload = function() { if (this.readyState === 4) { diff --git a/manager/media/style/default/chunks/welcome/StartUpScript.tpl b/manager/media/style/default/chunks/welcome/StartUpScript.tpl index f85cbd3526..10ca700a1f 100644 --- a/manager/media/style/default/chunks/welcome/StartUpScript.tpl +++ b/manager/media/style/default/chunks/welcome/StartUpScript.tpl @@ -1,7 +1,7 @@ "; } -echo ""; +header('Location: ' . manager_route('home') . '#'); +exit; diff --git a/manager/views/frame/1.blade.php b/manager/views/frame/1.blade.php index 57149bd99e..54f83520c0 100644 --- a/manager/views/frame/1.blade.php +++ b/manager/views/frame/1.blade.php @@ -134,6 +134,26 @@ ElementsInTree: pluginCache['ElementsInTree']) ? 1 : 0 ?>, EVOmodal: pluginCache['EVO.modal']) ? 1 : 0 ?> }, + routes: { + home: '{!! manager_route('home') !!}', + editDocument: '{!! manager_route('edit_document') !!}', + createResource: '{!! manager_route('create_resource') !!}', + deleteResource: '{!! manager_route('delete_resource') !!}', + moveResource: '{!! manager_route('move_resource') !!}', + createWeblink: '{!! manager_route('create_weblink') !!}', + duplicateResource: '{!! manager_route('duplicate_resource') !!}', + undeleteResource: '{!! manager_route('undelete_resource') !!}', + publishResource: '{!! manager_route('publish_resource') !!}', + unpublishResource: '{!! manager_route('unpublish_resource') !!}', + refreshTree: '{!! manager_route('refresh_tree') !!}', + removeLock: '{!! manager_route('remove_lock') !!}', + emptyTrash: '{!! manager_route('empty_trash') !!}', + logout: '{!! manager_route('logout') !!}', + waitCleanUp: '{!! manager_route('wait_clean_up') !!}', + search: '{!! manager_route('search') !!}', + updatePlugin: '{!! manager_route('update_plugin') !!}', + categoriesAjax: '{!! manager_route('categories_ajax') !!}', + }, extend: function() { for (var i = 1; i < arguments.length; i++) { for (var key in arguments[i]) { diff --git a/manager/views/page/3.blade.php b/manager/views/page/3.blade.php index 4ebd1faae2..9271fede9c 100644 --- a/manager/views/page/3.blade.php +++ b/manager/views/page/3.blade.php @@ -256,7 +256,8 @@ class="' . $_style['icon_move'] . '">' . $icon_pub_unpub : '') . ($modx- ); } - $table->createPagingNavigation($numRecords, 'a=3&id=' . $content['id'] . '&dir=' . $dir . '&sort=' . $sort); + $qs = 'a=' . manager_action_id('about_document') . '&id=' . $content['id'] . '&dir=' . $dir . '&sort=' . $sort; + $table->createPagingNavigation($numRecords, $qs); $children_output = $table->create($listDocs, $listTableHeader, manager_route('about_document', [ 'id' => $content['id'] ])); } else { // No Child documents diff --git a/manager/views/page/chunk.blade.php b/manager/views/page/chunk.blade.php index bd3bf53969..10ed0f3731 100644 --- a/manager/views/page/chunk.blade.php +++ b/manager/views/page/chunk.blade.php @@ -59,7 +59,7 @@ function changeRTE() @csrf {!! get_by_key($events, 'OnChunkFormPrerender') !!} - + diff --git a/manager/views/page/move_document.blade.php b/manager/views/page/move_document.blade.php index ae31f5b45e..b7b88bd5d1 100644 --- a/manager/views/page/move_document.blade.php +++ b/manager/views/page/move_document.blade.php @@ -64,7 +64,7 @@ function checkParentChildRelation(pId, pName)

    {{ ManagerTheme::getLexicon('move_resource_message') }}

    @csrf - + diff --git a/manager/views/page/password.blade.php b/manager/views/page/password.blade.php index d6693d628e..19fccefab1 100644 --- a/manager/views/page/password.blade.php +++ b/manager/views/page/password.blade.php @@ -25,7 +25,7 @@
    @csrf - +

    {{ ManagerTheme::getLexicon('change_password_message') }}

    @include('manager::form.input', [ 'name' => 'password', diff --git a/manager/views/page/plugin.blade.php b/manager/views/page/plugin.blade.php index a7108c079b..d942685d40 100644 --- a/manager/views/page/plugin.blade.php +++ b/manager/views/page/plugin.blade.php @@ -101,7 +101,7 @@ function assignEvents() @csrf {!! get_by_key($events, 'OnPluginFormPrerender') !!} - + diff --git a/manager/views/page/search.blade.php b/manager/views/page/search.blade.php index 6e5acc8792..097ff65a4d 100644 --- a/manager/views/page/search.blade.php +++ b/manager/views/page/search.blade.php @@ -33,7 +33,7 @@
    @csrf - +
    {{ ManagerTheme::getLexicon('search_criteria_top') }}
    diff --git a/manager/views/page/snippet.blade.php b/manager/views/page/snippet.blade.php index b12cce585d..91546b1cb9 100644 --- a/manager/views/page/snippet.blade.php +++ b/manager/views/page/snippet.blade.php @@ -59,7 +59,7 @@ function setTextWrap(ctrl, b) @csrf {!! get_by_key($events, 'OnSnipFormPrerender') !!} - + diff --git a/manager/views/page/system_settings.blade.php b/manager/views/page/system_settings.blade.php index 5380fddea8..9518ea7688 100644 --- a/manager/views/page/system_settings.blade.php +++ b/manager/views/page/system_settings.blade.php @@ -19,7 +19,7 @@ @endpush @csrf - + diff --git a/manager/views/page/template.blade.php b/manager/views/page/template.blade.php index 6a68f06901..a1fb29d1e9 100644 --- a/manager/views/page/template.blade.php +++ b/manager/views/page/template.blade.php @@ -73,7 +73,7 @@ @csrf {!! get_by_key($events, 'OnTempFormPrerender') !!} - + diff --git a/manager/views/page/tmplvar.blade.php b/manager/views/page/tmplvar.blade.php index af4f2cc2d1..c86ad4590c 100644 --- a/manager/views/page/tmplvar.blade.php +++ b/manager/views/page/tmplvar.blade.php @@ -276,7 +276,7 @@ function decode(s) {!! get_by_key($events, 'OnTVFormPrerender') !!} - + diff --git a/manager/views/page/user_roles/permission.blade.php b/manager/views/page/user_roles/permission.blade.php index 051f81e17c..ea340d16c7 100644 --- a/manager/views/page/user_roles/permission.blade.php +++ b/manager/views/page/user_roles/permission.blade.php @@ -2,7 +2,7 @@ @section('content') @csrf - + diff --git a/manager/views/page/user_roles/permissions_groups.blade.php b/manager/views/page/user_roles/permissions_groups.blade.php index 66abdc0dd1..7ffa3f0f21 100644 --- a/manager/views/page/user_roles/permissions_groups.blade.php +++ b/manager/views/page/user_roles/permissions_groups.blade.php @@ -2,7 +2,7 @@ @section('content') @csrf - + diff --git a/manager/views/page/user_roles/user_role.blade.php b/manager/views/page/user_roles/user_role.blade.php index 2231bc25d6..0078ae04f7 100644 --- a/manager/views/page/user_roles/user_role.blade.php +++ b/manager/views/page/user_roles/user_role.blade.php @@ -2,7 +2,7 @@ @section('content') @csrf - + diff --git a/manager/views/page/web_access_permissions.blade.php b/manager/views/page/web_access_permissions.blade.php index 4d9561150c..be489b5a3a 100644 --- a/manager/views/page/web_access_permissions.blade.php +++ b/manager/views/page/web_access_permissions.blade.php @@ -49,7 +49,7 @@ function deletegroup(groupid, type) { {{ ManagerTheme::getLexicon('access_permissions_add_user_group') }} @csrf - +
    @@ -68,7 +68,7 @@ function deletegroup(groupid, type) {
    @csrf - +
    @@ -96,7 +96,7 @@ function deletegroup(groupid, type) { {{ ManagerTheme::getLexicon('access_permissions_add_resource_group') }} @csrf - +
    @@ -114,7 +114,7 @@ function deletegroup(groupid, type) {
    @csrf - +
    @@ -144,7 +144,7 @@ function deletegroup(groupid, type) { {{ ManagerTheme::getLexicon('access_permissions_group_link') }} @csrf - + {{ ManagerTheme::getLexicon('access_permissions_link_user_group') }} From e2dbd8cdbcf57ded894490ae4071385fb3938bfa Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Mon, 6 Jul 2026 10:35:16 +0700 Subject: [PATCH 11/18] fix_name_function --- manager/views/page/chunk.blade.php | 2 +- manager/views/page/move_document.blade.php | 2 +- manager/views/page/password.blade.php | 2 +- manager/views/page/plugin.blade.php | 2 +- manager/views/page/search.blade.php | 2 +- manager/views/page/snippet.blade.php | 2 +- manager/views/page/system_settings.blade.php | 2 +- manager/views/page/template.blade.php | 2 +- manager/views/page/tmplvar.blade.php | 2 +- manager/views/page/web_access_permissions.blade.php | 10 +++++----- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/manager/views/page/chunk.blade.php b/manager/views/page/chunk.blade.php index 10ed0f3731..3973665934 100644 --- a/manager/views/page/chunk.blade.php +++ b/manager/views/page/chunk.blade.php @@ -59,7 +59,7 @@ function changeRTE() @csrf {!! get_by_key($events, 'OnChunkFormPrerender') !!} - + diff --git a/manager/views/page/move_document.blade.php b/manager/views/page/move_document.blade.php index b7b88bd5d1..55d6b2f2d0 100644 --- a/manager/views/page/move_document.blade.php +++ b/manager/views/page/move_document.blade.php @@ -64,7 +64,7 @@ function checkParentChildRelation(pId, pName)

    {{ ManagerTheme::getLexicon('move_resource_message') }}

    @csrf - + diff --git a/manager/views/page/password.blade.php b/manager/views/page/password.blade.php index 19fccefab1..b361a18191 100644 --- a/manager/views/page/password.blade.php +++ b/manager/views/page/password.blade.php @@ -25,7 +25,7 @@
    @csrf - +

    {{ ManagerTheme::getLexicon('change_password_message') }}

    @include('manager::form.input', [ 'name' => 'password', diff --git a/manager/views/page/plugin.blade.php b/manager/views/page/plugin.blade.php index d942685d40..e48a254eaf 100644 --- a/manager/views/page/plugin.blade.php +++ b/manager/views/page/plugin.blade.php @@ -101,7 +101,7 @@ function assignEvents() @csrf {!! get_by_key($events, 'OnPluginFormPrerender') !!} - + diff --git a/manager/views/page/search.blade.php b/manager/views/page/search.blade.php index 097ff65a4d..a602900514 100644 --- a/manager/views/page/search.blade.php +++ b/manager/views/page/search.blade.php @@ -33,7 +33,7 @@
    @csrf - +
    {{ ManagerTheme::getLexicon('search_criteria_top') }}
    diff --git a/manager/views/page/snippet.blade.php b/manager/views/page/snippet.blade.php index 91546b1cb9..b7922c958c 100644 --- a/manager/views/page/snippet.blade.php +++ b/manager/views/page/snippet.blade.php @@ -59,7 +59,7 @@ function setTextWrap(ctrl, b) @csrf {!! get_by_key($events, 'OnSnipFormPrerender') !!} - + diff --git a/manager/views/page/system_settings.blade.php b/manager/views/page/system_settings.blade.php index 9518ea7688..36c17e0568 100644 --- a/manager/views/page/system_settings.blade.php +++ b/manager/views/page/system_settings.blade.php @@ -19,7 +19,7 @@ @endpush @csrf - + diff --git a/manager/views/page/template.blade.php b/manager/views/page/template.blade.php index a1fb29d1e9..1d42542d77 100644 --- a/manager/views/page/template.blade.php +++ b/manager/views/page/template.blade.php @@ -73,7 +73,7 @@ @csrf {!! get_by_key($events, 'OnTempFormPrerender') !!} - + diff --git a/manager/views/page/tmplvar.blade.php b/manager/views/page/tmplvar.blade.php index c86ad4590c..c2cd1aa612 100644 --- a/manager/views/page/tmplvar.blade.php +++ b/manager/views/page/tmplvar.blade.php @@ -276,7 +276,7 @@ function decode(s) {!! get_by_key($events, 'OnTVFormPrerender') !!} - + diff --git a/manager/views/page/web_access_permissions.blade.php b/manager/views/page/web_access_permissions.blade.php index be489b5a3a..8104a2b3b2 100644 --- a/manager/views/page/web_access_permissions.blade.php +++ b/manager/views/page/web_access_permissions.blade.php @@ -49,7 +49,7 @@ function deletegroup(groupid, type) { {{ ManagerTheme::getLexicon('access_permissions_add_user_group') }} @csrf - +
    @@ -68,7 +68,7 @@ function deletegroup(groupid, type) {
    @csrf - +
    @@ -96,7 +96,7 @@ function deletegroup(groupid, type) { {{ ManagerTheme::getLexicon('access_permissions_add_resource_group') }} @csrf - +
    @@ -114,7 +114,7 @@ function deletegroup(groupid, type) {
    @csrf - +
    @@ -144,7 +144,7 @@ function deletegroup(groupid, type) { {{ ManagerTheme::getLexicon('access_permissions_group_link') }} @csrf - + {{ ManagerTheme::getLexicon('access_permissions_link_user_group') }} From 4e253e8801a09b21acdd4a620a49d8ad297e3770 Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Mon, 6 Jul 2026 10:57:47 +0700 Subject: [PATCH 12/18] litle_fix_name_end_url --- core/config/manager_routes.php | 2 +- manager/actions/mutate_module_resources.dynamic.php | 2 +- manager/includes/config_check.inc.php | 2 +- manager/media/style/default/ajax.php | 2 +- manager/views/page/user_roles/user_role.blade.php | 2 +- manager/views/partials/header.blade.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/config/manager_routes.php b/core/config/manager_routes.php index 9e5bc3ba82..4a49f4c150 100644 --- a/core/config/manager_routes.php +++ b/core/config/manager_routes.php @@ -25,9 +25,9 @@ 'files' => 31, 'save_password' => 34, 'edit_role' => 35, - 'create_role' => 35, 'save_role' => 36, 'delete_role' => 37, + 'create_role' => 38, 'move_resource' => 51, 'process_move' => 52, 'system_info' => 53, diff --git a/manager/actions/mutate_module_resources.dynamic.php b/manager/actions/mutate_module_resources.dynamic.php index d5ccacb906..29fbae0848 100644 --- a/manager/actions/mutate_module_resources.dynamic.php +++ b/manager/actions/mutate_module_resources.dynamic.php @@ -153,7 +153,7 @@ function openSelector(resource, mode, callback, w, h) { var win w = w ? w : 600; h = h ? h : 400; - url = " &sm=" + mode + "&rt=" + resource + "&cb=" + callback + url = "&sm=" + mode + "&rt=" + resource + "&cb=" + callback // center on parent if (window.screenX) { var x = window.screenX + (window.outerWidth - w) / 2; diff --git a/manager/includes/config_check.inc.php b/manager/includes/config_check.inc.php index e0226b36f5..590d9e3cd9 100755 --- a/manager/includes/config_check.inc.php +++ b/manager/includes/config_check.inc.php @@ -49,7 +49,7 @@ if(!is_null($row) && $row->disabled == 0) { $warnings[] = array($_lang['configcheck_templateswitcher_present']); $tplName = $row->name; - $pluginUpdateUrl = manager_route('plugin_update'); + $pluginUpdateUrl = manager_route('update_plugin'); $script = << function deleteTemplateSwitcher(){ diff --git a/manager/media/style/default/ajax.php b/manager/media/style/default/ajax.php index 7918b12313..62591f11c6 100755 --- a/manager/media/style/default/ajax.php +++ b/manager/media/style/default/ajax.php @@ -264,7 +264,7 @@ } if ($modx->hasPermission('new_role')) { - $output .= '
  • ' . $_lang['new_role'] . '
  • '; + $output .= '
  • ' . $_lang['new_role'] . '
  • '; } if ($count = $sql->count()) { diff --git a/manager/views/page/user_roles/user_role.blade.php b/manager/views/page/user_roles/user_role.blade.php index 0078ae04f7..408d4300d4 100644 --- a/manager/views/page/user_roles/user_role.blade.php +++ b/manager/views/page/user_roles/user_role.blade.php @@ -175,7 +175,7 @@ function changestate (element) { }, delete: function () { if (confirm("{{ __('global.confirm_delete_role') }}") === true) { - document.location.href = " {!! manager_route('create_role', ['action' => 'delete']) !!}"+"&id=" + document.userform.id.value + document.location.href = "{!! manager_route('create_role', ['action' => 'delete']) !!}&id=" + document.userform.id.value } }, cancel: function () { diff --git a/manager/views/partials/header.blade.php b/manager/views/partials/header.blade.php index 0f25111810..851f83796e 100644 --- a/manager/views/partials/header.blade.php +++ b/manager/views/partials/header.blade.php @@ -59,7 +59,7 @@ function unlockThisElement() var stay = document.getElementById('stay'); // Trigger unlock if ((stay && stay.value !== '2') || !form_save) { - var url = "{!!manager_route('remove_lock', [ 'type' => $elementType, 'id' => $data->getKey() ])!!}+&_token={{ csrf_token() }}&o=" + Math.random(); + var url = "{!!manager_route('remove_lock', [ 'type' => $elementType, 'id' => $data->getKey() ])!!}&_token={{ csrf_token() }}&o=" + Math.random(); if (navigator.sendBeacon) { navigator.sendBeacon(url) } else { From 4e541107ae1222521df0e24f6eb65641600b1647 Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Mon, 6 Jul 2026 14:25:01 +0700 Subject: [PATCH 13/18] replace?& --- manager/actions/mutate_module.dynamic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php index 5c0569dbb1..6482f5f1cf 100644 --- a/manager/actions/mutate_module.dynamic.php +++ b/manager/actions/mutate_module.dynamic.php @@ -94,7 +94,7 @@ function loadDependencies() { delete: function () { if (confirm("") === true) { documentDirty = false; - document.location.href = "?id=" + document.mutate.id.value; + document.location.href = "&id=" + document.mutate.id.value; } }, cancel: function () { From 2a5814983fdb4007d2c28a6441d8df2dc917ffd2 Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Tue, 7 Jul 2026 09:49:28 +0700 Subject: [PATCH 14/18] fix_login_and_install --- manager/media/style/common/login.tpl | 2 +- manager/media/style/default/login.tpl | 4 ++-- manager/processors/remove_installer.processor.php | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/manager/media/style/common/login.tpl b/manager/media/style/common/login.tpl index d9d5292197..43512a2d54 100644 --- a/manager/media/style/common/login.tpl +++ b/manager/media/style/common/login.tpl @@ -111,7 +111,7 @@ el.remove(); } var xhr = new XMLHttpRequest(); - xhr.open('POST', '', true); + xhr.open('POST', '[+repair_url+]', true); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded;'); xhr.onload = function() { if (this.readyState === 4) { diff --git a/manager/media/style/default/login.tpl b/manager/media/style/default/login.tpl index 565584bbd2..7b0abd4d4d 100644 --- a/manager/media/style/default/login.tpl +++ b/manager/media/style/default/login.tpl @@ -547,7 +547,7 @@
    - + [+csrf+] [+OnManagerLoginFormPrerender+] @@ -621,7 +621,7 @@ el.remove(); } var xhr = new XMLHttpRequest(); - xhr.open('POST', '', true); + xhr.open('POST', '[+repair_url+]', true); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded;'); xhr.onload = function() { if (this.readyState === 4) { diff --git a/manager/processors/remove_installer.processor.php b/manager/processors/remove_installer.processor.php index d11f83966b..dd37fe89c4 100755 --- a/manager/processors/remove_installer.processor.php +++ b/manager/processors/remove_installer.processor.php @@ -46,9 +46,8 @@ function rmdirRecursive($path, $followLinks = false) } } } + if ($msg) { echo ""; } - -header('Location: ' . manager_route('home') . '#'); -exit; +echo ""; From 84ad1c996d66e9db515b407e2aaab98a4e0c388a Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Tue, 7 Jul 2026 10:31:44 +0700 Subject: [PATCH 15/18] fix_add_echo_and_new_route_js --- manager/actions/bkmanager.static.php | 6 ++--- manager/actions/files.dynamic.php | 4 ++-- manager/actions/mutate_content.dynamic.php | 2 +- manager/actions/mutate_module.dynamic.php | 2 +- .../mutate_module_resources.dynamic.php | 2 +- manager/actions/mutate_web_user.dynamic.php | 2 +- .../actions/web_user_management.static.php | 2 +- .../default/chunks/welcome/StartUpScript.tpl | 2 +- manager/views/page/2.blade.php | 1 + manager/views/partials/header.blade.php | 24 ++++++++++++++++++- 10 files changed, 35 insertions(+), 12 deletions(-) diff --git a/manager/actions/bkmanager.static.php b/manager/actions/bkmanager.static.php index 8587209941..28db364ba2 100644 --- a/manager/actions/bkmanager.static.php +++ b/manager/actions/bkmanager.static.php @@ -427,7 +427,7 @@ class="form-check-input" toHtml(); ?> - + "> toHtml(); ?> - +
    @@ -536,7 +536,7 @@ class=""> toHtml(); ?> - + toHtml(); ?> - + toHtml(); ?> - +
    diff --git a/manager/actions/mutate_content.dynamic.php b/manager/actions/mutate_content.dynamic.php index 27d4fab9ad..365ce83546 100644 --- a/manager/actions/mutate_content.dynamic.php +++ b/manager/actions/mutate_content.dynamic.php @@ -520,7 +520,7 @@ function evoRenderTvImageCheck(a) { /*************************/ ?> - + diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php index 6482f5f1cf..9e17666cfe 100644 --- a/manager/actions/mutate_module.dynamic.php +++ b/manager/actions/mutate_module.dynamic.php @@ -137,7 +137,7 @@ function setTextWrap(ctrl, b) { $docBlockList = $modx->convertDocBlockIntoList($docBlock); $internal = array(); ?> - + "> diff --git a/manager/actions/mutate_module_resources.dynamic.php b/manager/actions/mutate_module_resources.dynamic.php index 29fbae0848..79761c5738 100644 --- a/manager/actions/mutate_module_resources.dynamic.php +++ b/manager/actions/mutate_module_resources.dynamic.php @@ -178,7 +178,7 @@ function openSelector(resource, mode, callback, w, h) { toHtml(); ?> - + diff --git a/manager/actions/mutate_web_user.dynamic.php b/manager/actions/mutate_web_user.dynamic.php index 3225280f65..5e20338580 100644 --- a/manager/actions/mutate_web_user.dynamic.php +++ b/manager/actions/mutate_web_user.dynamic.php @@ -313,7 +313,7 @@ function evoRenderTvImageCheck(a) { echo implode("", $evtOut); } ?> - + diff --git a/manager/actions/web_user_management.static.php b/manager/actions/web_user_management.static.php index ce7ff10fd6..3f25d26e18 100644 --- a/manager/actions/web_user_management.static.php +++ b/manager/actions/web_user_management.static.php @@ -191,7 +191,7 @@ function menuAction(a) { }); - +toHtml(); ?> diff --git a/manager/media/style/default/chunks/welcome/StartUpScript.tpl b/manager/media/style/default/chunks/welcome/StartUpScript.tpl index 10ca700a1f..ec66950e50 100644 --- a/manager/media/style/default/chunks/welcome/StartUpScript.tpl +++ b/manager/media/style/default/chunks/welcome/StartUpScript.tpl @@ -1,7 +1,7 @@ - + @if(!empty($elementType)) From 306cc47f20f66f719538514bc6590bd42d20e1ae Mon Sep 17 00:00:00 2001 From: Kolya1222 Date: Tue, 11 Aug 2026 12:26:02 +0700 Subject: [PATCH 18/18] fix_litle --- manager/media/style/default/login.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/media/style/default/login.tpl b/manager/media/style/default/login.tpl index 7b0abd4d4d..93dab83b11 100644 --- a/manager/media/style/default/login.tpl +++ b/manager/media/style/default/login.tpl @@ -547,7 +547,7 @@
    - + [+csrf+] [+OnManagerLoginFormPrerender+]