Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 21 additions & 19 deletions core/src/Core.php
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ public function sendRedirect($url, $count_attempts = 0, $type = 'REDIRECT_HEADER
}

if ($type === 'REDIRECT_JS') {
echo sprintf("<script>window.location.href='%s';</script>", $url);
echo sprintf('<script>window.location.href="%s";</script>', $url);
exit;
}

Expand Down Expand Up @@ -3151,7 +3151,7 @@ public function webAlertAndQuit($msg, $url = '')
} elseif (!$url) {
$fnc = 'history.back(-1);';
} else {
$fnc = "window.location.href='" . addslashes($url) . "';";
$fnc = 'window.location.href="' . addslashes($url) . '";';
}

$style = '';
Expand All @@ -3169,23 +3169,25 @@ public function webAlertAndQuit($msg, $url = '')
echo '<!DOCTYPE html>
<html lang="' . $lang_attribute . '" dir="' . $textdir . '">
<head>
<title>Evolution CMS :: Alert</title>
<meta http-equiv="Content-Type" content="text/html; charset=' . $manager_charset . ';">
' . $style . "
<script>
function __alertQuit() {
var el = document.querySelector('p');
alert(el.innerHTML);
el.remove();
" . $fnc . "
}
window.setTimeout(__alertQuit, 100);
</script>
</head>
<body>
<p>" . $msg . '</p>
</body>
</html>';
<title>Evolution CMS :: Alert</title>
<meta http-equiv="Content-Type" content="text/html; charset=' . $manager_charset . ';" />
' . $style . '
<script>
function __alertQuit() {
var el = document.querySelector(\'body > p\');
if(el) {
alert(el.innerHTML);
el.remove();
}
' . $fnc . '
}
window.setTimeout(__alertQuit, 50);
</script>
</head>
<body>
<p>' . $msg . '</p>
</body>
</html>';
exit;
}

Expand Down
45 changes: 34 additions & 11 deletions install/stubs/seeds/install/SystemEventnamesTableSeeder.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<?php

namespace EvolutionCMS\Installer\Install;

use Illuminate\Database\Seeder;

class SystemEventnamesTableSeeder extends Seeder
{

/**
* Auto generated seed file
*
Expand All @@ -17,14 +15,23 @@ public function run()
\DB::table('system_eventnames')->delete();

\DB::table('system_eventnames')->insert([
// after
['name' => 'OnAfterLoadDocumentObject', 'service' => '5', 'groupname' => '',],
['name' => 'OnAfterMoveDocument', 'service' => '1', 'groupname' => 'Documents',],
// before
['name' => 'OnBeforeCacheUpdate', 'service' => '4', 'groupname' => '',],
['name' => 'OnBeforeChunkFormDelete', 'service' => '1', 'groupname' => 'Chunks',],
['name' => 'OnBeforeChunkFormSave', 'service' => '1', 'groupname' => 'Chunks',],
['name' => 'OnBeforeDocDuplicate', 'service' => '1', 'groupname' => 'Documents',],
['name' => 'OnBeforeDocFormDelete', 'service' => '1', 'groupname' => 'Documents',],
['name' => 'OnBeforeDocFormSave', 'service' => '1', 'groupname' => 'Documents',],
// doc
['name' => 'OnBeforeDocCreate', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocDuplicate', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocEdit', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocSetGroups', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocPublish', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocUnpublish', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocDelete', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocUndelete', 'service' => 1, 'groupname' => 'Documents',],
//
['name' => 'OnBeforeEmptyTrash', 'service' => '1', 'groupname' => 'Documents',],
['name' => 'OnBeforeFileBrowserCopy', 'service' => '1', 'groupname' => 'File Browser Events',],
['name' => 'OnBeforeFileBrowserDelete', 'service' => '1', 'groupname' => 'File Browser Events',],
Expand Down Expand Up @@ -52,22 +59,31 @@ public function run()
['name' => 'OnBeforeUserLogin', 'service' => '1', 'groupname' => 'Users',],
['name' => 'OnBeforeUserLogout', 'service' => '1', 'groupname' => 'Users',],
['name' => 'OnBeforeUserSave', 'service' => '1', 'groupname' => 'Users',],
//
['name' => 'OnCacheUpdate', 'service' => '4', 'groupname' => '',],
// chunk
['name' => 'OnChunkFormDelete', 'service' => '1', 'groupname' => 'Chunks',],
['name' => 'OnChunkFormPrerender', 'service' => '1', 'groupname' => 'Chunks',],
['name' => 'OnChunkFormRender', 'service' => '1', 'groupname' => 'Chunks',],
['name' => 'OnChunkFormSave', 'service' => '1', 'groupname' => 'Chunks',],
//
['name' => 'OnCreateDocGroup', 'service' => '1', 'groupname' => 'Documents',],
['name' => 'OnDocDuplicate', 'service' => '1', 'groupname' => 'Documents',],
['name' => 'OnDocFormDelete', 'service' => '1', 'groupname' => 'Documents',],
// doc form
['name' => 'OnDocFormPrerender', 'service' => '1', 'groupname' => 'Documents',],
['name' => 'OnDocFormRender', 'service' => '1', 'groupname' => 'Documents',],
['name' => 'OnDocFormSave', 'service' => '1', 'groupname' => 'Documents',],
['name' => 'OnDocFormTemplateRender', 'service' => '1', 'groupname' => 'Documents',],
['name' => 'OnDocFormUnDelete', 'service' => '1', 'groupname' => 'Documents',],
['name' => 'OnDocPublished', 'service' => '5', 'groupname' => '',],
['name' => 'OnDocUnPublished', 'service' => '5', 'groupname' => '',],
// doc
['name' => 'OnDocCreate', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnDocDuplicate', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnDocEdit', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnDocSetGroups', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnDocPublish', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnDocUnpublish', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnDocDelete', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnDocUndelete', 'service' => 1, 'groupname' => 'Documents',],
//
['name' => 'OnEmptyTrash', 'service' => '1', 'groupname' => 'Documents',],
// file
['name' => 'OnFileBrowserCopy', 'service' => '1', 'groupname' => 'File Browser Events',],
['name' => 'OnFileBrowserDelete', 'service' => '1', 'groupname' => 'File Browser Events',],
['name' => 'OnFileBrowserInit', 'service' => '1', 'groupname' => 'File Browser Events',],
Expand All @@ -76,6 +92,7 @@ public function run()
['name' => 'OnFileBrowserUpload', 'service' => '1', 'groupname' => 'File Browser Events',],
['name' => 'OnFileManagerSettingsRender', 'service' => '1', 'groupname' => 'System Settings',],
['name' => 'OnFileManagerUpload', 'service' => '1', 'groupname' => '',],
//
['name' => 'OnFriendlyURLSettingsRender', 'service' => '1', 'groupname' => 'System Settings',],
['name' => 'OnInterfaceSettingsRender', 'service' => '1', 'groupname' => 'System Settings',],
['name' => 'OnLoadDocumentObject', 'service' => '5', 'groupname' => '',],
Expand All @@ -85,6 +102,7 @@ public function run()
['name' => 'OnLogEvent', 'service' => '1', 'groupname' => 'Log Event',],
['name' => 'OnMakeDocUrl', 'service' => '5', 'groupname' => '',],
['name' => 'OnMakePageCacheKey', 'service' => '4', 'groupname' => '',],
// manager
['name' => 'OnManagerFrameLoader', 'service' => '2', 'groupname' => '',],
['name' => 'OnManagerLoginFormPrerender', 'service' => '2', 'groupname' => '',],
['name' => 'OnManagerLoginFormRender', 'service' => '2', 'groupname' => '',],
Expand All @@ -101,6 +119,7 @@ public function run()
['name' => 'OnManagerWelcomeHome', 'service' => '2', 'groupname' => '',],
['name' => 'OnManagerWelcomePrerender', 'service' => '2', 'groupname' => '',],
['name' => 'OnManagerWelcomeRender', 'service' => '2', 'groupname' => '',],
//
['name' => 'OnMiscSettingsRender', 'service' => '1', 'groupname' => 'System Settings',],
['name' => 'OnModFormDelete', 'service' => '1', 'groupname' => 'Modules',],
['name' => 'OnModFormPrerender', 'service' => '1', 'groupname' => 'Modules',],
Expand All @@ -110,10 +129,12 @@ public function run()
['name' => 'OnPageUnauthorized', 'service' => '1', 'groupname' => '',],
['name' => 'OnParseDocument', 'service' => '5', 'groupname' => '',],
['name' => 'OnParseProperties', 'service' => '5', 'groupname' => '',],
// plugin
['name' => 'OnPluginFormDelete', 'service' => '1', 'groupname' => 'Plugins',],
['name' => 'OnPluginFormPrerender', 'service' => '1', 'groupname' => 'Plugins',],
['name' => 'OnPluginFormRender', 'service' => '1', 'groupname' => 'Plugins',],
['name' => 'OnPluginFormSave', 'service' => '1', 'groupname' => 'Plugins',],
//
['name' => 'OnRichTextEditorInit', 'service' => '1', 'groupname' => 'RichText Editor',],
['name' => 'OnRichTextEditorRegister', 'service' => '1', 'groupname' => 'RichText Editor',],
['name' => 'OnSecuritySettingsRender', 'service' => '1', 'groupname' => 'System Settings',],
Expand All @@ -132,6 +153,7 @@ public function run()
['name' => 'OnTVFormPrerender', 'service' => '1', 'groupname' => 'Template Variables',],
['name' => 'OnTVFormRender', 'service' => '1', 'groupname' => 'Template Variables',],
['name' => 'OnTVFormSave', 'service' => '1', 'groupname' => 'Template Variables',],
// user
['name' => 'OnUserAuthentication', 'service' => '1', 'groupname' => 'Users',],
['name' => 'OnUserChangePassword', 'service' => '1', 'groupname' => 'Users',],
['name' => 'OnUserCreateGroup', 'service' => '1', 'groupname' => 'Users',],
Expand All @@ -142,6 +164,7 @@ public function run()
['name' => 'OnUserLogout', 'service' => '1', 'groupname' => 'Users',],
['name' => 'OnUserSave', 'service' => '1', 'groupname' => 'Users',],
['name' => 'OnUserSettingsRender', 'service' => '1', 'groupname' => 'System Settings',],
//
['name' => 'OnWebPageComplete', 'service' => '5', 'groupname' => '',],
['name' => 'OnWebPageInit', 'service' => '5', 'groupname' => '',],
['name' => 'OnWebPagePrerender', 'service' => '5', 'groupname' => '',],
Expand Down
42 changes: 40 additions & 2 deletions install/stubs/seeds/update/SystemEventnamesTableSeeder.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<?php

namespace EvolutionCMS\Installer\Update;

use Illuminate\Database\Seeder;

class SystemEventnamesTableSeeder extends Seeder
{

/**
* Auto generated seed file
*
Expand Down Expand Up @@ -59,5 +57,45 @@ public function run()
\DB::table('system_eventnames')->insertOrIgnore([
'name' => 'OnBeforeMailSend', 'service' => '1', 'groupname' => '',
]);

// --- document event changes
$insert2 = [
['name' => 'OnBeforeDocCreate', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnDocCreate', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocEdit', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnDocEdit', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocSetGroups', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnDocSetGroups', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocPublish', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocUnpublish', 'service' => 1, 'groupname' => 'Documents',],
['name' => 'OnBeforeDocUndelete', 'service' => 1, 'groupname' => 'Documents',],
];
foreach ($insert2 as $el) {
\DB::table('system_eventnames')
->insertOrIgnore($el);
}

$delete2 = [
'OnBeforeDocFormSave',
'OnDocFormSave',
];
\DB::table('system_eventnames')->whereIn('name', $delete2)->delete();

$rename2 = [
'OnBeforeDocFormDelete' => 'OnBeforeDocDelete',
'OnDocFormDelete' => 'OnDocDelete',
'OnDocFormUnDelete' => 'OnDocUndelete',
'OnDocPublished' => 'OnDocPublish',
'OnDocUnPublished' => 'OnDocUnpublish',
];
foreach ($rename2 as $old => $new) {
\DB::table('system_eventnames')
->where('name', $old)
->update([
'name' => $new,
'groupname' => 'Documents',
'service' => 1
]);
}
}
}
Loading