Skip to content

fix(manager): Modx to Evo in Codemirror and fatal error if no user found. #2443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Seiger merged 1 commit into from
Sep 1, 2026
Merged

fix(manager): Modx to Evo in Codemirror and fatal error if no user found. #2443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions assets/plugins/codemirror/codemirror.plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@
<script type="text/javascript">
window.evoElementNameHelperConfig = window.evoElementNameHelperConfig || {};
window.evoElementNameHelperConfig.endpoint = "{$elementNameHelperEndpoint}";
// Add mode MODX for syntax highlighting. Dfsed on $mode
CodeMirror.defineMode("MODx-{$mode}", function(config, parserConfig) {
// Add the Evolution CMS overlay mode for syntax highlighting, on top of $mode
CodeMirror.defineMode("Evo-{$mode}", function(config, parserConfig) {
var mustacheOverlay = {
token: function(stream, state) {
var ch;
Expand Down Expand Up @@ -264,6 +264,12 @@
};
return CodeMirror.overlayMode(CodeMirror.getMode(config, parserConfig.backdrop || "{$mode}"), mustacheOverlay);
});
// The mode was called MODx-* for as long as this plugin has existed,
// and third-party code refers to it by that name. Kept as an alias so
// the rename cannot break it.
CodeMirror.defineMode("MODx-{$mode}", function(config) {
return CodeMirror.getMode(config, "Evo-{$mode}");
});
function makeMarker(symbol) {
var marker = document.createElement("div");
marker.style.color = "#822";
Expand All @@ -273,7 +279,7 @@ function makeMarker(symbol) {
}
//Basic settings
var config = {
mode: 'MODx-{$mode}',
mode: 'Evo-{$mode}',
theme: '{$theme}',
defaulttheme: '{$defaulttheme}',
darktheme: '{$darktheme}',
Expand Down
5 changes: 3 additions & 2 deletions manager/actions/mutate_web_user.dynamic.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,21 +76,22 @@
if($modx->getManagerApi()->action == '88') {
// get user attributes
$userdatatmp = \EvolutionCMS\Models\UserAttribute::query()->where('internalKey', $user)->first();
$userdatatmp = $userdatatmp->makeVisible('role')->toArray();
if(!$userdatatmp) {
$modx->webAlertAndQuit("No user returned!");
}
$userdatatmp = $userdatatmp->makeVisible('role')->toArray();
$userdata = array_merge($userdata, $userdatatmp);
unset($userdatatmp);

// get user settings
$usersettings = \EvolutionCMS\Models\UserSetting::where('user', $user)->pluck('setting_value', 'setting_name')->toArray();
extract($usersettings, EXTR_OVERWRITE);
// get user name
$usernamedata = \EvolutionCMS\Models\User::find($user)->toArray();
$usernamedata = \EvolutionCMS\Models\User::find($user);
if(!$usernamedata) {
$modx->webAlertAndQuit("No user returned while getting username!");
}
$usernamedata = $usernamedata->toArray();
$_SESSION['itemname'] = $usernamedata['username'];
} else {
$_SESSION['itemname'] = $_lang["new_web_user"];
Expand Down
13 changes: 12 additions & 1 deletion manager/views/page/template.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,17 @@
'css': 'text/css'
};

// The CodeMirror plugin registers its EVO tag overlay as
// Evo-<mode>. Setting the bare name here would throw that
// overlay away and leave the template editor with no tag
// highlighting at all, so the overlay is preferred wherever
// the plugin defined one for the mode being asked for.
var overlaid = function(mode) {
return window.CodeMirror && CodeMirror.modes['Evo-' + mode]
? 'Evo-' + mode
: mode;
};

var applyHighlighting = function() {
if (!window.myCodeMirrors || !window.myCodeMirrors['post']) {
return;
Expand All @@ -197,7 +208,7 @@
: 'htmlmixed';

try {
window.myCodeMirrors['post'].setOption('mode', mode);
window.myCodeMirrors['post'].setOption('mode', overlaid(mode));
} catch (e) {
// An editor that will not take a mode is not worth
// breaking the form over.
Expand Down