Index: core/admin_templates/error_fatal.tpl
===================================================================
--- core/admin_templates/error_fatal.tpl
+++ core/admin_templates/error_fatal.tpl
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
' . $this->_logger->toString($errno) . '
';
+ if ( PHP_SAPI == 'cli' || $this->_logger->applicationShutdown || $this->Application->isDebugMode(false) ) {
+ $css_properties = array(
+ 'background-color: #FEFFBF',
+ 'margin: ' . ($this->Application->isAdmin ? '8px' : 'auto'),
+ 'padding: 10px',
+ 'border: 2px solid red',
+ 'text-align: center',
+ );
+ echo '' . $message . '
';
- exit;
+ exit;
+ }
+ else {
+ $this->Application->StoreVar('FatalErrorMessage', $message);
+
+ if ( $this->Application->isAdmin ) {
+ $this->Application->Redirect('error_fatal');
+ }
+ else {
+ $this->Application->Redirect($this->Application->ConfigValue('FatalErrorTemplate'));
+ }
+ }
}
/**
@@ -1364,4 +1391,4 @@
return $res;
}
-}
\ No newline at end of file
+}
Index: core/units/admin/admin_config.php
===================================================================
--- core/units/admin/admin_config.php
+++ core/units/admin/admin_config.php
@@ -14,79 +14,80 @@
defined('FULL_PATH') or die('restricted access!');
-$config = Array (
+$config = array(
'Prefix' => 'adm',
- 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
- 'EventHandlerClass' => Array ('class' => 'AdminEventsHandler', 'file' => 'admin_events_handler.php', 'build_event' => 'OnBuild'),
- 'TagProcessorClass' => Array ('class' => 'AdminTagProcessor', 'file' => 'admin_tag_processor.php', 'build_event' => 'OnBuild'),
+ 'ItemClass' => array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+ 'EventHandlerClass' => array('class' => 'AdminEventsHandler', 'file' => 'admin_events_handler.php', 'build_event' => 'OnBuild'),
+ 'TagProcessorClass' => array('class' => 'AdminTagProcessor', 'file' => 'admin_tag_processor.php', 'build_event' => 'OnBuild'),
'AutoLoad' => false, // because defaults to `true`
- 'QueryString' => Array (
+ 'QueryString' => array(
1 => 'event',
),
- 'ScheduledTasks' => Array (
- 'optimize_performance' => Array ('EventName' => 'OnOptimizePerformance', 'RunSchedule' => '0 0 * * *'),
- 'pre_resize_images' => Array ('EventName' => 'OnPreResizeImages', 'RunSchedule' => '0 * * * *'),
+ 'ScheduledTasks' => array(
+ 'optimize_performance' => array('EventName' => 'OnOptimizePerformance', 'RunSchedule' => '0 0 * * *'),
+ 'pre_resize_images' => array('EventName' => 'OnPreResizeImages', 'RunSchedule' => '0 * * * *'),
),
- 'TitlePresets' => Array (
- 'tree_root' => Array ('format' => '!la_section_overview!'),
- 'tree_reports' => Array ('format' => '!la_section_overview!'),
- 'tree_system' => Array ('format' => '!la_section_overview!'),
- 'tree_tools' => Array ('format' => '!la_section_overview!'),
- 'system_tools' => Array ('format' => '!la_title_SystemTools!'),
+ 'TitlePresets' => array(
+ 'tree_root' => array('format' => '!la_section_overview!'),
+ 'tree_reports' => array('format' => '!la_section_overview!'),
+ 'tree_system' => array('format' => '!la_section_overview!'),
+ 'tree_tools' => array('format' => '!la_section_overview!'),
+ 'system_tools' => array('format' => '!la_title_SystemTools!'),
- 'backup' => Array ('format' => '!la_performing_backup! - !la_Step! '),
- 'import' => Array ('format' => '!la_performing_import! - !la_Step! '),
- 'restore' => Array ('format' => '!la_performing_restore! - !la_Step! '),
- 'server_info' => Array ('format' => '!la_tab_ServerInfo!'),
- 'sql_query' => Array ('format' => '!la_tab_QueryDB!'),
+ 'backup' => array('format' => '!la_performing_backup! - !la_Step! '),
+ 'import' => array('format' => '!la_performing_import! - !la_Step! '),
+ 'restore' => array('format' => '!la_performing_restore! - !la_Step! '),
+ 'server_info' => array('format' => '!la_tab_ServerInfo!'),
+ 'sql_query' => array('format' => '!la_tab_QueryDB!'),
- 'no_permissions' => Array ('format' => '!la_title_NoPermissions!'),
+ 'no_permissions' => array('format' => '!la_title_NoPermissions!'),
+ 'error_fatal' => array('format' => '!la_title_ServerError!'),
- 'column_picker' => Array ('format' => '!la_title_ColumnPicker!'),
- 'csv_export' => Array ('format' => '!la_title_CSVExport!'),
- 'csv_import' => Array ('format' => '!la_title_CSVImport!'),
+ 'column_picker' => array('format' => '!la_title_ColumnPicker!'),
+ 'csv_export' => array('format' => '!la_title_CSVExport!'),
+ 'csv_import' => array('format' => '!la_title_CSVImport!'),
),
- 'PermSection' => Array ('main' => 'in-portal:service'),
+ 'PermSection' => array('main' => 'in-portal:service'),
- 'Sections' => Array (
- 'in-portal:root' => Array (
+ 'Sections' => array(
+ 'in-portal:root' => array(
'parent' => null,
'icon' => 'site',
'label' => 'SITE_NAME',
- 'url' => Array ('t' => 'index', 'pass' => 'm'),
- 'permissions' => Array ('view'),
+ 'url' => array('t' => 'index', 'pass' => 'm'),
+ 'permissions' => array('view'),
'priority' => 0,
'container' => true,
'type' => stTREE,
'icon_module' => 'core',
),
- 'in-portal:service' => Array (
+ 'in-portal:service' => array(
'parent' => 'in-portal:tools',
'icon' => 'service',
'label' => 'la_tab_Service',
- 'url' => Array ('t' => 'tools/system_tools', 'pass' => 'm'),
- 'permissions' => Array ('view', 'edit'),
+ 'url' => array('t' => 'tools/system_tools', 'pass' => 'm'),
+ 'permissions' => array('view', 'edit'),
'priority' => 6,
'type' => stTREE,
),
),
- 'ListSQLs' => Array (
- '' => '', // to prevent warning
+ 'ListSQLs' => array(
+ '' => '', // To prevent warning.
),
- 'Fields' => Array (), // we need empty array because kernel doesn't use virtual fields else
- 'VirtualFields' => Array (
- 'ImportFile' => Array (
+ 'Fields' => array(), // We need empty array because kernel doesn't use virtual fields else.
+ 'VirtualFields' => array(
+ 'ImportFile' => array(
'type' => 'string',
'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, // in Bytes !
- 'error_msgs' => Array (
+ 'error_msgs' => array(
'cant_open_file' => '!la_error_CantOpenFile!',
'no_matching_columns' => '!la_error_NoMatchingColumns!',
),
@@ -96,6 +97,6 @@
'default' => null,
),
- 'Content' => Array ('type' => 'string', 'default' => ''),
+ 'Content' => array('type' => 'string', 'default' => ''),
),
-);
\ No newline at end of file
+);
Index: core/units/categories/categories_event_handler.php
===================================================================
--- core/units/categories/categories_event_handler.php
+++ core/units/categories/categories_event_handler.php
@@ -1781,7 +1781,7 @@
}
}
else {
- $not_found = $this->Application->ConfigValue('ErrorTemplate');
+ $not_found = $this->Application->ConfigValue('NotFoundErrorTemplate');
$real_t = $not_found ? $not_found : 'error_notfound';
$themes_helper = $this->Application->recallObject('ThemesHelper');
Index: themes/advanced/_install/english.lang
===================================================================
--- themes/advanced/_install/english.lang
+++ themes/advanced/_install/english.lang
@@ -307,6 +307,7 @@
Q2xpY2sgaGVyZSBpZiB5b3VyIGJyb3dzZXIgZG9lcyBub3QgYXV0b21hdGljYWxseSByZWRpcmVjdCB5b3Uu
VGhhbmsgeW91IGZvciByZWdpc3RlcmluZyBvbiBvdXIgd2Vic2l0ZS4gWW91IGNhbiBhY3RpdmF0ZSB5b3VyIHJlZ2lzdHJhdGlvbiB1c2luZyBsaW5rIHNlbnQgdG8geW91IGJ5IGVtYWlsLg==
VGhhbmsgeW91IGZvciByZWdpc3RlcmluZyBvbiBvdXIgd2Vic2l0ZS4gWW91ciByZWdpc3RyYXRpb24gaXMgcGVuZGluZyBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbC4gWW91IHdpbGwgZ2V0IGEgc2VwYXJhdGUgZW1haWwgb25jZSBpdCdzIGFjdGl2YXRlZC4=
+ T3Bwcywgc29tZXRoaW5nIHdlbnQgd3JvbmcgLi4u
VGhhbmsgeW91IGZvciBzdWdnZXN0aW5nIHlvdXIgY2F0ZWdvcnku
U3VnZ2VzdGVkIGNhdGVnb3J5IGlzIHBlbmRpbmcgZm9yIEFkbWluaXN0cmF0aXZlIGFwcHJvdmFsIA==
VGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgcmVxdWVzdC4=
@@ -354,6 +355,7 @@
Q29tbWVudHM=
U2VhcmNoIEJveA==
U2VhcmNoIFJlc3VsdHM=
+ U2VydmVyIEVycm9y
U2l0ZSBtYXA=
U3Vic2NyaXB0aW9uIENvbmZpcm1hdGlvbg==
U3Vic2NyaXB0aW9uIENvbmZpcm1lZA==
@@ -390,4 +392,4 @@
WklQIENvZGU=
-
\ No newline at end of file
+
Index: themes/advanced/error_fatal.tpl
===================================================================
--- themes/advanced/error_fatal.tpl
+++ themes/advanced/error_fatal.tpl
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+