Templates moved from core to add directory

diff --git a/.gitattributes b/.gitattributes
index 46261eca57d240b640b68f70abe07e1f90aaae75..3f1425fe070284c85aa914032c067f38e6a9ac7b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -47,6 +47,8 @@ application/admin/templates/de/code/register_form.ctp -text
 application/admin/templates/de/emails/.htaccess -text
 application/admin/templates/de/emails/text_resend_link.tpl -text
 application/admin/templates/de/html/.htaccess -text
+application/admin/templates/de/html/emergency_exit.ctp -text
+application/admin/templates/de/html/footer_msg.ctp -text
 application/admin/templates/de/html/nav_advert.tpl -text
 application/admin/templates/de/html/selector_admin.tpl -text
 application/admin/templates/images/.htaccess -text

diff --git a/application/admin/main/login/class_AdminUserLogin.php b/application/admin/main/login/class_AdminUserLogin.php
index a4187a5e843b0ae9a0796f4dcc481b1f882775a7..423297eb9f8c318ed6f4fd227ddb4d9df813c44d 100644 (file)
--- a/application/admin/main/login/class_AdminUserLogin.php
+++ b/application/admin/main/login/class_AdminUserLogin.php
@@ -73,20 +73,14 @@ class AdminUserLogin extends BaseFrameworkSystem implements LoginableUser {
                $method = null;
                $data = "";
 
-               // Get a instance of the registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               // Get member class
+               $userClass = $this->getConfigInstance()->readConfig('user_class');
 
-               // Is there an instance?
-               if (is_null($userInstance)) {
-                       // Get member class
-                       $userClass = $this->getConfigInstance()->readConfig('user_class');
+               // Get a user instance
+               $userInstance = call_user_func_array(array($userClass, 'createMemberByRequest'), array($requestInstance));
 
-                       // Get a user instance
-                       $userInstance = call_user_func_array(array($userClass, 'createMemberByRequest'), array($requestInstance));
-
-                       // Remember this new instance in registry
-                       Registry::getRegistry()->addInstance($userInstance);
-               } // END - if
+               // Remember this new instance in registry
+               Registry::getRegistry()->addInstance('user', $userInstance);
 
                // Is the password correct?
                if ($userInstance->ifPasswordHashMatches($requestInstance) === false) {

diff --git a/application/admin/templates/de/html/emergency_exit.ctp b/application/admin/templates/de/html/emergency_exit.ctp
new file mode 100644 (file)
index 0000000..e974daf
--- /dev/null
+++ b/application/admin/templates/de/html/emergency_exit.ctp
@@ -0,0 +1,29 @@
+{?header:title="Problem in application framework detected!"?}
+
+<div id="emergency_message">
+       $content[message]
+</div>
+
+<div id="emergency_backtrace">
+       <div id="backtrace_header">
+               File inclusion backtrace:
+       </div>
+       <div id="backtrace_content">
+               $content[backtrace]
+       </div>
+</div>
+
+<div id="stats_box">
+       <div id="stats_header">
+               Statistics
+       </div>
+       <div id="stats_objects">
+               Total objects: $content[total_objects]
+       </div>
+       <div id="stats_includes">
+               Loaded class files: $content[total_includes]
+               <span class="hint">(Including exception and interfaces.)</span>
+       </div>
+</div>
+
+{?footer_msg:footer_msg="Please contact the support and supply the full above message, if you think you are not qualified to fix this problem."?}

diff --git a/application/admin/templates/de/html/footer_msg.ctp b/application/admin/templates/de/html/footer_msg.ctp
new file mode 100644 (file)
index 0000000..fb1de36
--- /dev/null
+++ b/application/admin/templates/de/html/footer_msg.ctp
@@ -0,0 +1,8 @@
+       <div id="footer_message">
+               $content[footer_msg]
+       </div>
+
+</div> <!-- masterbox //-->
+
+</body>
+</html>