Page MenuHomeIn-Portal Phabricator

D3.id307.diff
No OneTemporary

File Metadata

Created
Mon, Jan 6, 2:55 AM

D3.id307.diff

Index: core/admin_templates/error_fatal.tpl
===================================================================
--- /dev/null
+++ core/admin_templates/error_fatal.tpl
@@ -0,0 +1,61 @@
+<inp2:m_Set skip_last_template="1"/>
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:root" title_preset="error_fatal" parent="0"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+ <tbody>
+ <tr>
+ <td id="toolbar_cell">
+ <script type="text/javascript">
+ function prepareToolbar() {
+ a_toolbar = new ToolBar();
+
+ a_toolbar.AddButton(
+ new ToolBarButton(
+ 'prev',
+ '<inp2:m_phrase label="la_ToolTip_Back" escape="1"/>',
+ function() {
+ history.back();
+ }
+ )
+ );
+
+ a_toolbar.Render( $('#toolbar_cell').get(0) );
+ }
+
+ $(document).ready(
+ function() {
+ prepareToolbar();
+ Application.removeDebuggerStatistics();
+ maximizeElement('#fatal_error');
+
+ $('#fatal_error_container').css('background-color', '#F6F6F6');
+ }
+ );
+ </script>
+
+ </td>
+ </tr>
+ </tbody>
+</table>
+
+<div id="fatal_error" class="table-color1" style="bottom: 50%; text-align: center; vertical-align: middle;">
+ <br />
+ <strong><inp2:m_Phrase name="la_text_FatalError"/></strong>
+ <inp2:m_if check="m_Recall" name="FatalErrorMessage">
+ <inp2:m_if check="m_IsDebugMode">
+ <br /><br />
+ <div style="text-align: left;">
+ <inp2:m_Recall name="FatalErrorMessage"/><br />
+ </div>
+
+ <inp2:system-log_PrintBacktrace/>
+ </inp2:m_if>
+
+ <inp2:m_RemoveVar name="FatalErrorMessage"/>
+ </inp2:m_if>
+</div>
+
+<inp2:m_include t="incs/footer"/>
Index: core/install/english.lang
===================================================================
--- core/install/english.lang
+++ core/install/english.lang
@@ -1363,6 +1363,7 @@
<PHRASE Label="la_text_disclaimer_part2" Module="Core" Type="1">UGxlYXNlIG1ha2Ugc3VyZSB0byBCQUNLVVAgeW91ciBkYXRhYmFzZShzKSBiZWZvcmUgcnVubmluZyB0aGlzIHV0aWxpdHkh</PHRASE>
<PHRASE Label="la_Text_Edit" Module="Core" Type="1">RWRpdA==</PHRASE>
<PHRASE Label="la_Text_Email" Module="Core" Type="1">RW1haWw=</PHRASE>
+ <PHRASE Label="la_text_FatalError" Module="Core" Type="1">T3Bwcywgc29tZXRoaW5nIHdlbnQgd3JvbmcgLi4u</PHRASE>
<PHRASE Label="la_text_FollowingLinesWereNotImported" Module="Core" Type="1">Rm9sbG93aW5nIGxpbmVzIHdlcmUgTk9UIGltcG9ydGVk</PHRASE>
<PHRASE Label="la_Text_FrontOnly" Module="Core" Type="1">RnJvbnQtRW5kIE9ubHk=</PHRASE>
<PHRASE Label="la_Text_General" Module="Core" Type="1">R2VuZXJhbA==</PHRASE>
@@ -1394,6 +1395,7 @@
<PHRASE Label="la_Text_RootCategory" Module="Core" Type="1">TW9kdWxlIFJvb3QgU2VjdGlvbg==</PHRASE>
<PHRASE Label="la_text_Save" Module="Core" Type="1">U2F2ZQ==</PHRASE>
<PHRASE Label="la_Text_Select" Module="Core" Type="1">U2VsZWN0</PHRASE>
+ <PHRASE Label="la_text_ServerError" Module="Core" Type="1">T3Bwcywgc29tZXRoaW5nIHdlbnQgd3JvbmcgLi4u</PHRASE>
<PHRASE Label="la_text_sess_expired" Module="Core" Type="1">U2Vzc2lvbiBFeHBpcmVk</PHRASE>
<PHRASE Label="la_Text_Simple" Module="Core" Type="1">U2ltcGxl</PHRASE>
<PHRASE Label="la_Text_Sort" Module="Core" Type="1">U29ydA==</PHRASE>
@@ -1558,6 +1560,7 @@
<PHRASE Label="LA_TITLE_SENDEMAIL" Module="Core" Type="1">U2VuZCBFLW1haWw=</PHRASE>
<PHRASE Label="LA_TITLE_SENDINGPREPAREDEMAILS" Module="Core" Type="1">U2VuZGluZyBQcmVwYXJlZCBFLW1haWxz</PHRASE>
<PHRASE Label="la_Title_SendMailComplete" Module="Core" Type="1">TWFpbCBoYXMgYmVlbiBzZW50IFN1Y2Nlc3NmdWxseQ==</PHRASE>
+ <PHRASE Label="la_title_ServerError" Module="Core" Type="1">U2VydmVyIEVycm9y</PHRASE>
<PHRASE Label="la_title_SiteDomains" Module="Core" Type="1">U2l0ZSBEb21haW5z</PHRASE>
<PHRASE Label="la_title_SpamReports" Module="Core" Type="1">U1BBTSBSZXBvcnRz</PHRASE>
<PHRASE Label="la_title_SpellingDictionary" Module="Core" Type="1">U3BlbGxpbmcgRGljdGlvbmFyeQ==</PHRASE>
Index: core/install/install_data.sql
===================================================================
--- core/install/install_data.sql
+++ core/install/install_data.sql
@@ -37,14 +37,15 @@
INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceModRewriteUrlEnding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceModRewriteUrlEnding', 'checkbox', '', NULL, 10.012, 0, 0, 'hint:la_config_ForceModRewriteUrlEnding');
INSERT INTO SystemSettings VALUES(DEFAULT, 'UseContentLanguageNegotiation', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseContentLanguageNegotiation', 'checkbox', '', '', 10.013, 0, 0, NULL);
INSERT INTO SystemSettings VALUES(DEFAULT, 'cms_DefaultDesign', '#default_design#', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultDesignTemplate', 'text', NULL, NULL, 10.02, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_error_template', 'text', '', '', 10.03, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'NotFoundErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_error_template', 'text', '', '', 10.03, 0, 0, NULL);
INSERT INTO SystemSettings VALUES(DEFAULT, 'NoPermissionTemplate', 'no_permission', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_nopermission_template', 'text', '', '', 10.04, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'UsePageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UsePageHitCounter', 'checkbox', '', '', 10.05, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceImageMagickResize', 'checkbox', '', '', 10.06, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_CheckStopWords', 'checkbox', '', '', 10.07, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'UseVisitorTracking', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseVisitorTracking', 'checkbox', '', '', 10.08, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'cms_DefaultTrackingCode', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultTrackingCode', 'textarea', NULL, 'COLS=40 ROWS=5', 10.09, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'PerformExactSearch', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_PerformExactSearch', 'checkbox', '', '', '10.10', 0, 0, 'hint:la_config_PerformExactSearch');
+INSERT INTO SystemSettings VALUES(DEFAULT, 'FatalErrorTemplate', 'error_fatal', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_FatalErrorTemplate', 'text', '', '', 10.05, 0, 0, null);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'UsePageHitCounter', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UsePageHitCounter', 'checkbox', '', '', 10.06, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_ForceImageMagickResize', 'checkbox', '', '', 10.07, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_CheckStopWords', 'checkbox', '', '', 10.08, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'UseVisitorTracking', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_UseVisitorTracking', 'checkbox', '', '', 10.09, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'cms_DefaultTrackingCode', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_DefaultTrackingCode', 'textarea', NULL, 'COLS=40 ROWS=5', '10.10', 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'PerformExactSearch', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_PerformExactSearch', 'checkbox', '', '', 10.11, 0, 0, 'hint:la_config_PerformExactSearch');
INSERT INTO SystemSettings VALUES(DEFAULT, 'MaintenanceMessageFront', 'Website is currently undergoing the upgrades. Please come back shortly!', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMaintenance', 'la_config_MaintenanceMessageFront', 'textarea', '', 'style="width: 100%; height: 100px;"', '15.01', 0, 0, 'hint:la_config_MaintenanceMessageFront');
INSERT INTO SystemSettings VALUES(DEFAULT, 'MaintenanceMessageAdmin', 'Website is currently undergoing the upgrades. Please come back shortly!', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMaintenance', 'la_config_MaintenanceMessageAdmin', 'textarea', '', 'style="width: 100%; height: 100px;"', '15.02', 0, 0, 'hint:la_config_MaintenanceMessageAdmin');
INSERT INTO SystemSettings VALUES(DEFAULT, 'SoftMaintenanceTemplate', 'maintenance', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMaintenance', 'la_config_SoftMaintenanceTemplate', 'text', '', 'style="width: 200px;"', '15.03', 0, 0, 'hint:la_config_SoftMaintenanceTemplate');
Index: core/install/upgrades.sql
===================================================================
--- core/install/upgrades.sql
+++ core/install/upgrades.sql
@@ -3026,3 +3026,13 @@
UPDATE Modules
SET ClassNamespace = 'InPortal\\Core'
WHERE `Name` IN ('Core', 'In-Portal');
+
+UPDATE SystemSettings
+SET VariableName = 'NotFoundErrorTemplate'
+WHERE VariableName = 'ErrorTemplate';
+
+UPDATE SystemSettings
+SET DisplayOrder = ROUND(DisplayOrder + 0.01, 2)
+WHERE Section = 'in-portal:configure_advanced' and Heading = 'la_section_SettingsWebsite' AND DisplayOrder > 10.04;
+
+INSERT INTO SystemSettings VALUES (DEFAULT, 'FatalErrorTemplate', 'error_fatal', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsWebsite', 'la_config_FatalErrorTemplate', 'text', '', '', 10.05, 0, 0, null);
Index: core/kernel/managers/url_manager.php
===================================================================
--- core/kernel/managers/url_manager.php
+++ core/kernel/managers/url_manager.php
@@ -492,7 +492,7 @@
$theme_id = $this->Application->GetVar('m_theme');
}
- $not_found = $this->Application->ConfigValue('ErrorTemplate');
+ $not_found = $this->Application->ConfigValue('NotFoundErrorTemplate');
$vars['t'] = $not_found ? $not_found : 'error_notfound';
$themes_helper = $this->Application->recallObject('ThemesHelper');
@@ -524,4 +524,4 @@
$this->Application->Done();
exit;
}
-}
\ No newline at end of file
+}
Index: core/kernel/utility/logger.php
===================================================================
--- core/kernel/utility/logger.php
+++ core/kernel/utility/logger.php
@@ -206,6 +206,20 @@
protected $_ignoreInTrace = Array ('logger.php', 'db_connection.php', 'db_load_balancer.php');
/**
+ * True when application is going to shutdown.
+ *
+ * @var boolean
+ */
+ public $applicationShutdown = false;
+
+ /**
+ * Id of last log record.
+ *
+ * @var integer
+ */
+ public $lastLogId = null;
+
+ /**
* Create event log
*
* @param Array $methods_to_call List of invokable kLogger class method with their parameters (if any)
@@ -737,6 +751,7 @@
if ( $storage_medium == self::LS_DATABASE ) {
$result = $this->Conn->doInsert($this->_logRecord, TABLE_PREFIX . 'SystemLog');
+ $this->lastLogId = $this->Conn->getInsertID();
}
elseif ( $storage_medium == self::LS_DISK ) {
$result = $this->_saveToFile(RESTRICTED . '/system.log');
@@ -764,6 +779,7 @@
*/
public function catchLastError()
{
+ $this->applicationShutdown = true;
$this->write();
$last_error = error_get_last();
@@ -1147,10 +1163,34 @@
protected function _displayFatalError($errno)
{
$errno = $this->_getFatalErrorTitle($errno);
+ $message = $this->_logger->toString($errno);
- $margin = $this->Application->isAdmin ? '8px' : 'auto';
- echo '<div style="background-color: #FEFFBF; margin: ' . $margin . '; padding: 10px; border: 2px solid red; text-align: center">' . $this->_logger->toString($errno) . '</div>';
- exit;
+ 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 '<div style="' . implode('; ', $css_properties) . ';">' . $message . '</div>';
+ exit;
+ }
+ else {
+ $this->Application->StoreVar('FatalErrorMessage', $message);
+ $redirect_params = array();
+
+ if ( $this->Application->isDebugMode() && $this->_logger->lastLogId ) {
+ $redirect_params['system-log_id'] = $this->_logger->lastLogId;
+ }
+
+ if ( $this->Application->isAdmin ) {
+ $this->Application->Redirect('error_fatal', $redirect_params);
+ }
+ else {
+ $this->Application->Redirect($this->Application->ConfigValue('FatalErrorTemplate'), $redirect_params);
+ }
+ }
}
/**
Index: core/units/admin/admin_config.php
===================================================================
--- core/units/admin/admin_config.php
+++ core/units/admin/admin_config.php
@@ -45,6 +45,7 @@
'sql_query' => Array ('format' => '!la_tab_QueryDB!'),
'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!'),
@@ -98,4 +99,4 @@
'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 @@
<PHRASE Label="lu_text_Redirect" Module="Core" Type="0">Q2xpY2sgaGVyZSBpZiB5b3VyIGJyb3dzZXIgZG9lcyBub3QgYXV0b21hdGljYWxseSByZWRpcmVjdCB5b3Uu</PHRASE>
<PHRASE Label="lu_text_RegistrationActivationPending" Module="Core" Type="0">VGhhbmsgeW91IGZvciByZWdpc3RlcmluZyBvbiBvdXIgd2Vic2l0ZS4gWW91IGNhbiBhY3RpdmF0ZSB5b3VyIHJlZ2lzdHJhdGlvbiB1c2luZyBsaW5rIHNlbnQgdG8geW91IGJ5IGVtYWlsLg==</PHRASE>
<PHRASE Label="lu_text_RegistrationPending" Module="Core" Type="0">VGhhbmsgeW91IGZvciByZWdpc3RlcmluZyBvbiBvdXIgd2Vic2l0ZS4gWW91ciByZWdpc3RyYXRpb24gaXMgcGVuZGluZyBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbC4gWW91IHdpbGwgZ2V0IGEgc2VwYXJhdGUgZW1haWwgb25jZSBpdCdzIGFjdGl2YXRlZC4=</PHRASE>
+ <PHRASE Label="lu_text_ServerError" Module="Core" Type="0">T3Bwcywgc29tZXRoaW5nIHdlbnQgd3JvbmcgLi4u</PHRASE>
<PHRASE Label="lu_text_SuggestCategoryConfirm" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWdnZXN0aW5nIHlvdXIgY2F0ZWdvcnku</PHRASE>
<PHRASE Label="lu_text_SuggestCategoryPendingConfirm" Module="Core" Type="0">U3VnZ2VzdGVkIGNhdGVnb3J5IGlzIHBlbmRpbmcgZm9yIEFkbWluaXN0cmF0aXZlIGFwcHJvdmFsIA==</PHRASE>
<PHRASE Label="lu_text_ThankYou" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgcmVxdWVzdC4=</PHRASE>
@@ -354,6 +355,7 @@
<PHRASE Label="lu_title_Reviews" Module="Core" Type="0">Q29tbWVudHM=</PHRASE>
<PHRASE Label="lu_title_SearchBox" Module="Core" Type="0">U2VhcmNoIEJveA==</PHRASE>
<PHRASE Label="lu_title_SearchResults" Module="Core" Type="0">U2VhcmNoIFJlc3VsdHM=</PHRASE>
+ <PHRASE Label="lu_title_ServerError" Module="Core" Type="0">U2VydmVyIEVycm9y</PHRASE>
<PHRASE Label="lu_title_Sitemap" Module="Core" Type="0">U2l0ZSBtYXA=</PHRASE>
<PHRASE Label="lu_title_SubscribeConfirm" Module="Core" Type="0">U3Vic2NyaXB0aW9uIENvbmZpcm1hdGlvbg==</PHRASE>
<PHRASE Label="lu_title_SubscribeOk" Module="Core" Type="0">U3Vic2NyaXB0aW9uIENvbmZpcm1lZA==</PHRASE>
@@ -390,4 +392,4 @@
<PHRASE Label="lu_ZipCode" Module="Core" Type="0">WklQIENvZGU=</PHRASE>
</PHRASES>
</LANGUAGE>
-</LANGUAGES>
\ No newline at end of file
+</LANGUAGES>
Index: themes/advanced/error_fatal.tpl
===================================================================
--- /dev/null
+++ themes/advanced/error_fatal.tpl
@@ -0,0 +1,64 @@
+<!--##
+<NAME>Server Error</NAME>
+<DESC></DESC>
+<SECTION>Platform</SECTION>
+##-->
+
+<!--## SET 500 HEADER FOR RESPONSE ##-->
+<inp2:m_Header data="HTTP/1.0 500 Internal Server Error"/>
+<!--## //SET 500 HEADER FOR RESPONSE ##-->
+
+<!--## PAGE TITLE ELEMENT ##-->
+<inp2:m_DefineElement name="page_title">
+ <inp2:m_Phrase name="lu_title_ServerError" no_editing="1"/>
+</inp2:m_DefineElement>
+<!--## //PAGE TITLE ELEMENT ##-->
+
+<!--## SIDE-BAR ELEMENT ##-->
+<inp2:m_DefineElement name="sidebar">
+ <div class="movable-area">
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
+ </div>
+ </div>
+</inp2:m_DefineElement>
+<!--## //SIDE-BAR ELEMENT ##-->
+
+<!--## MAIN CONTENT ##-->
+<inp2:m_DefineElement name="content">
+ <div class="movable-area">
+ <div class="movable-element">
+ <inp2:m_Include template="platform/elements/navigation_bar.elm" titles="lu_title_ServerError" templates="error_fatal"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement design="content_box">
+ <inp2:m_Capture to_var="header">
+ <inp2:m_Phrase name="lu_title_ServerError"/>
+ </inp2:m_Capture>
+ <br /><br />
+ <inp2:m_Phrase name="lu_text_ServerError"/>
+ <br /><br />
+
+ <inp2:m_if check="m_IsDebugMode">
+ <inp2:system-log_PrintBacktrace/>
+ <br /><br />
+ </inp2:m_if>
+
+ </inp2:m_RenderElement>
+ </div>
+ </div>
+</inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
+
+<!--## DESIGN TEMPLATE ##-->
+<inp2:m_Include template="platform/designs/default_design.des" pass_params="1"/>
+<!--## /DESIGN TEMPLATE ##-->
Index: themes/default/_install/english.lang
===================================================================
--- themes/default/_install/english.lang
+++ themes/default/_install/english.lang
@@ -15,10 +15,12 @@
<PHRASE Label="lu_rootcategory_name" Module="Core" Type="0">SG9tZQ==</PHRASE>
<PHRASE Label="lu_text_PromoHeader1" Module="Core" Type="0">TGFuZ3VhZ2Ugc2VsZWN0aW9uOg==</PHRASE>
<PHRASE Label="lu_text_PromoHeader2" Module="Core" Type="0">JnF1b3Q7SW4tUG9ydGFsIC0gU2V0dGluZyBFeGNlbGxlbmNlPGJyLz4NCmluIENvbnRlbnQgTWFuYWdlbWVudCZxdW90Ow==</PHRASE>
+ <PHRASE Label="lu_text_ServerError" Module="Core" Type="0">T3Bwcywgc29tZXRoaW5nIHdlbnQgd3JvbmcgLi4u</PHRASE>
<PHRASE Label="lu_text_Thankyou" Module="Core" Type="0">VGhhbmsgeW91IGZvciBjb250YWN0aW5nIHdpdGggdXMh</PHRASE>
<PHRASE Label="lu_title_Address" Module="Core" Type="0">QWRkcmVzcw==</PHRASE>
<PHRASE Label="lu_title_MaintenanceMode" Module="Core" Type="0">TWFpbnRlbmFuY2UgTW9kZQ==</PHRASE>
<PHRASE Label="lu_title_RequestInformation" Module="Core" Type="0">SW5mb3JtYXRpb24gUmVxdWVzdCBGb3Jt</PHRASE>
+ <PHRASE Label="lu_title_ServerError" Module="Core" Type="0">U2VydmVyIEVycm9y</PHRASE>
</PHRASES>
</LANGUAGE>
-</LANGUAGES>
\ No newline at end of file
+</LANGUAGES>
Index: themes/default/error_fatal.tpl
===================================================================
--- /dev/null
+++ themes/default/error_fatal.tpl
@@ -0,0 +1,32 @@
+<!--##
+<NAME>Server Error</NAME>
+<DESC></DESC>
+<SECTION>Pages</SECTION>
+##-->
+
+<!--## SET 500 HEADER FOR RESPONSE ##-->
+<inp2:m_Header data="HTTP/1.0 500 Internal Server Error"/>
+<!--## //SET 500 HEADER FOR RESPONSE ##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+ <inp2:m_RenderElement design="content_box">
+ <inp2:m_Capture to_var="header">
+ <inp2:st_PageInfo type="title"/>
+ </inp2:m_Capture>
+
+ <inp2:st_ContentBlock num="1"/>
+
+ <inp2:m_if check="m_IsDebugMode">
+ <inp2:system-log_PrintBacktrace/>
+ </inp2:m_if>
+
+ </inp2:m_RenderElement>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des" page_class="inner"/>
+<!--## /DESIGN TEMPLATE ##-->
Index: themes/simple/_install/english.lang
===================================================================
--- themes/simple/_install/english.lang
+++ themes/simple/_install/english.lang
@@ -304,8 +304,9 @@
<PHRASE Label="lu_text_pagenotfound" Module="Core" Type="0">NDA0LiBQYWdlIG5vdCBmb3VuZCBvbiB0aGUgc2VydmVyLg==</PHRASE>
<PHRASE Label="lu_text_PasswordRequestConfirm" Module="Core" Type="0">UGxlYXNlIGNvbmZpcm0gdGhhdCB5b3Ugd2FudCB0byByZXNldCB5b3VyIHBhc3N3b3JkLg==</PHRASE>
<PHRASE Label="lu_text_RegistrationActivationPending" Module="Core" Type="0">VGhhbmsgeW91IGZvciByZWdpc3RlcmluZyBvbiBvdXIgd2Vic2l0ZS4gWW91IGNhbiBhY3RpdmF0ZSB5b3VyIHJlZ2lzdHJhdGlvbiB1c2luZyBsaW5rIHNlbnQgdG8geW91IGJ5IGVtYWlsLg==</PHRASE>
- <PHRASE Label="lu_text_registrationpending" Module="Core" Type="0">VGhhbmsgeW91IGZvciByZWdpc3RlcmluZyBvbiBvdXIgd2Vic2l0ZS4gWW91ciByZWdpc3RyYXRpb24gaXMgcGVuZGluZyBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbC4gWW91IHdpbGwgZ2V0IGEgc2VwYXJhdGUgZW1haWwgb25jZSBpdCdzIGFjdGl2YXRlZC4=</PHRASE>
- <PHRASE Label="lu_text_suggestcategoryconfirm" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWdnZXN0aW5nIHlvdXIgY2F0ZWdvcnku</PHRASE>
+ <PHRASE Label="lu_text_registrationpending" Module="Core" Type="0">VGhhbmsgeW91IGZvciByZWdpc3RlcmluZyBvbiBvdXIgd2Vic2l0ZS4gWW91ciByZWdpc3RyYXRpb24gaXMgcGVuZGluZyBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbC4gWW91IHdpbGwgZ2V0IGEgc2VwYXJhdGUgZW1haWwgb25jZSBpdCdzIGFjdGl2YXRlZC4=</PHRASE>
+ <PHRASE Label="lu_text_ServerError" Module="Core" Type="0">T3Bwcywgc29tZXRoaW5nIHdlbnQgd3JvbmcgLi4u</PHRASE>
+ <PHRASE Label="lu_text_suggestcategoryconfirm" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWdnZXN0aW5nIHlvdXIgY2F0ZWdvcnku</PHRASE>
<PHRASE Label="lu_text_SuggestCategoryPendingConfirm" Module="Core" Type="0">U3VnZ2VzdGVkIGNhdGVnb3J5IGlzIHBlbmRpbmcgZm9yIEFkbWluaXN0cmF0aXZlIGFwcHJvdmFsIA==</PHRASE>
<PHRASE Label="lu_text_ThankYou" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgcmVxdWVzdC4=</PHRASE>
<PHRASE Label="lu_ThankForSubscribing" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWJzY3JpYmluZyB0byBvdXIgbWFpbGluZyBsaXN0</PHRASE>
@@ -348,6 +349,7 @@
<PHRASE Label="lu_title_RelatedSearches" Module="Core" Type="0">UmVsYXRlZCBTZWFyY2hlcw==</PHRASE>
<PHRASE Label="lu_title_SearchBox" Module="Core" Type="0">U2VhcmNoIEJveA==</PHRASE>
<PHRASE Label="lu_title_SearchResults" Module="Core" Type="0">U2VhcmNoIFJlc3VsdHM=</PHRASE>
+ <PHRASE Label="lu_title_ServerError" Module="Core" Type="0">U2VydmVyIEVycm9y</PHRASE>
<PHRASE Label="lu_title_Sitemap" Module="Core" Type="0">U2l0ZSBtYXA=</PHRASE>
<PHRASE Label="lu_title_SubscribeConfirm" Module="Core" Type="0">U3Vic2NyaXB0aW9uIENvbmZpcm1hdGlvbg==</PHRASE>
<PHRASE Label="lu_title_SubscribeOk" Module="Core" Type="0">U3Vic2NyaXB0aW9uIENvbmZpcm1lZA==</PHRASE>
@@ -387,4 +389,4 @@
<PHRASE Label="lu_zip_code" Module="Core" Type="0">WklQIENvZGU=</PHRASE>
</PHRASES>
</LANGUAGE>
-</LANGUAGES>
\ No newline at end of file
+</LANGUAGES>
Index: themes/simple/error_fatal.tpl
===================================================================
--- /dev/null
+++ themes/simple/error_fatal.tpl
@@ -0,0 +1,34 @@
+<!--##
+<NAME>Server Error</NAME>
+<DESC></DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## SET 500 HEADER FOR RESPONSE ##-->
+<inp2:m_Header data="HTTP/1.0 500 Internal Server Error"/>
+<!--## //SET 500 HEADER FOR RESPONSE ##-->
+
+<!--## MAIN CONTENT ##-->
+<inp2:m_DefineElement name="content">
+ <div class="movable-element">
+
+ <div id="block-latest" class="block">
+ <div class="round-top"></div>
+ <div class="content">
+ <h1 class="movable-header"><inp2:m_Phrase name="lu_title_ServerError"/></h1>
+ <inp2:m_phrase name="lu_text_ServerError"/>
+
+ <inp2:m_if check="m_IsDebugMode">
+ <inp2:system-log_PrintBacktrace/>
+ </inp2:m_if>
+ </div>
+ <div class="round-bottom"></div>
+ </div>
+
+ </div>
+</inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
+
+<!--## DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des" pass_params="1"/>
+<!--## /DESIGN TEMPLATE ##-->

Event Timeline