Follow-up to #11651: Allow Extbase as framework for backend modules

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5837 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index af16923..097932f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-08-27  Steffen Kamper  <info@sk-typo3.de>
 
+       * Follow-up to #11651: Allow Extbase as framework for backend modules
        * Fixed bug #11803: sysext opendocs is shy (thanks to Steffen Gebert)
        * Follow-up to #11652: Modern integration of module into backend using Extbase - general approach without naming of Extbase
        * Fixed bug #11511: Resources -> Files missing in doktype Sysfolder (thanks to Steffen Gebert)

diff --git a/typo3/mod.php b/typo3/mod.php
index e44cf3c..3fad29c 100644 (file)
--- a/typo3/mod.php
+++ b/typo3/mod.php
@@ -40,20 +40,30 @@ unset($MCONF);
 require('init.php');
 require('template.php');
 
-       // Find module path:
+// Find module path:
 $temp_M = (string)t3lib_div::_GET('M');
-if (substr($temp_M, 0, 3) === 'Tx_') {
-       $dispatcher = t3lib_div::makeInstance('Tx_Extbase_BackendDispatcher');
-       $dispatcher->callModule(substr($temp_M, 3));
-} else {
-       if ($temp_path = $TBE_MODULES['_PATHS'][$temp_M]) {
-               $MCONF['_'] = 'mod.php?M=' . rawurlencode($temp_M);
-               require($temp_path . 'conf.php');
-               $BACK_PATH = '';
-               require($temp_path . 'index.php');
-       } else {
-               die('Value "' . htmlspecialchars($temp_M) . '" for "M" was not found as a module');
+$isDispatched = FALSE;
+
+if ($temp_path = $TBE_MODULES['_PATHS'][$temp_M]) {
+       $MCONF['_'] = 'mod.php?M=' . rawurlencode($temp_M);
+       require($temp_path . 'conf.php');
+       $BACK_PATH = '';
+       require($temp_path . 'index.php');
+       $isDispatched = TRUE;
+} else {       
+       if (is_array($TBE_MODULES['_dispatcher'])) {
+               foreach ($TBE_MODULES['_dispatcher'] as $dispatcher) {
+                       if (is_object($dispatcher)) {
+                               if ($dispatcher->callModule($temp_M) === TRUE) {
+                                       $isDispatched = TRUE;
+                                       break;
+                               }
+                       }
+               }
        }
 }
 
+if ($isDispatched === FALSE) {
+       die('Value "' . htmlspecialchars($temp_M) . '" for "M" was not found as a module'); 
+}
 ?>
\ No newline at end of file