Made the markers more TYPO3-like to be able to use templates invoked by $TYPO3_CONF_V...
authorchristian.futterlieb <christian.futterlieb@735d13b6-9817-0410-8766-e36946ffe9aa>
Wed, 16 Feb 2011 09:17:22 +0000 (09:17 +0000)
committerchristian.futterlieb <christian.futterlieb@735d13b6-9817-0410-8766-e36946ffe9aa>
Wed, 16 Feb 2011 09:17:22 +0000 (09:17 +0000)
  Renamed new marker ###REASON_TEXT### to ###REASON###
  Added new markers ###CURRENT_URL### and ###CURRENT_URL_TITLE###

git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/pagenotfoundehandling/trunk@43685 735d13b6-9817-0410-8766-e36946ffe9aa

class.tx_pagenotfoundhandling.php
locallang_404.xml
res/defaultTemplate.tmpl

index 891af81..4a6fb7c 100644 (file)
@@ -218,7 +218,9 @@ class tx_pagenotfoundhandling
         $html = str_replace('###TITLE###', $language->getLL('page_title', 1), $html);
         $html = str_replace('###MESSAGE###', $language->getLL('page_message', 1), $html);
         $html = str_replace('###REASON_TITLE###', $language->getLL('reason_title', 1), $html);
-        $html = str_replace('###REASON_TEXT###', $this->_params['reasonText'], $html);
+        $html = str_replace('###REASON###', $this->_params['reasonText'], $html);
+        $html = str_replace('###CURRENT_URL_TITLE###', $language->getLL('current_url_title', 1), $html);
+        $html = str_replace('###CURRENT_URL###', $this->_params['currentUrl'], $html);
         return $html;
     }
 
index ce9d3f1..60736ae 100644 (file)
@@ -7,15 +7,18 @@
        <data type="array">
                <languageKey index="default" type="array">
                        <label index="page_title">Page not found!</label>
-                       <label index="reason_title">Reason</label>
+            <label index="reason_title">Reason</label>
+                       <label index="current_url_title">Current URL</label>
                </languageKey>
                <languageKey index="en" type="array">
                        <label index="page_title">Page not found!</label>
             <label index="reason_title">Reason</label>
+            <label index="current_url_title">Current URL</label>
                </languageKey>
         <languageKey index="de" type="array">
             <label index="page_title">Seite nicht gefunden!</label>
             <label index="reason_title">Grund</label>
+            <label index="current_url_title">Aktuelle URL</label>
         </languageKey>
        </data>
 </T3locallang>
\ No newline at end of file
index 4c27ef4..9a88782 100644 (file)
@@ -49,7 +49,8 @@
             <div class="errorcode">404</div>
             <div class="content-right">
                 <h1>###TITLE###</h1>
-                <p>###REASON_TITLE###: ###REASON_TEXT###</p>
+                <p>###REASON_TITLE###: ###REASON###</p>
+                <p>###CURRENT_URL_TITLE###: ###CURRENT_URL###</p>
             </div>
             <div class="clear"> </div>
         </div>