get init() working with class modules

2 files changed, 27 insertions, 9 deletions

diff --git a/Zotlabs/Web/Controller.php b/Zotlabs/Web/Controller.php
new file mode 100644
index 000000000..ac835e008
--- /dev/null
+++ b/Zotlabs/Web/Controller.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Zotlabs\Web;
+
+
+class Controller {
+
+	function init() {}
+	function post() {}
+	function get() {}
+
+}
\ No newline at end of file
diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php
index 699b27891..cbd9c107a 100644
--- a/Zotlabs/Web/Router.php
+++ b/Zotlabs/Web/Router.php
@@ -133,10 +133,14 @@ logger('3');
 		 */
 
 		$nmod = false;
+		$modname = '';
 
 		$newmod = ucfirst(\App::$module);
-		if(class_exists("Zotlabs\\Module\\{$newmod}"))
+
+		if(class_exists("Zotlabs\\Module\\{$newmod}")) {
 			$nmod = true;
+			$modname = "Zotlabs\\Module\\{$newmod}";
+		}
 
 		if(\App::$module_loaded) {
 			\App::$page['page_title'] = \App::$module;
@@ -149,14 +153,15 @@ logger('3');
 			 * to over-ride them.
 			 */
 
-			$modname = (($nmod) ? "Zotlabs\\Module\\{$newmod}" : '');
-			if($modname && method_exists($modname,'init'))
-				logger('function_exists: ' . $modname . '->init');
-
-			if(function_exists(\App::$module . '_init')) {
-				$arr = array('init' => true, 'replace' => false);		
-				call_hooks(\App::$module . '_mod_init', $arr);
-				if(! $arr['replace']) {
+			$arr = array('init' => true, 'replace' => false);		
+			call_hooks(\App::$module . '_mod_init', $arr);
+			if(! $arr['replace']) {
+				if($modname && method_exists($modname,'init')) {
+					logger('function_exists: ' . $modname . '->init');
+					$modclass = new $modname;
+					$modclass->init();
+				}
+				elseif(function_exists(\App::$module . '_init')) {
 					$func = \App::$module . '_init';
 					$func($a);
 				}
@@ -199,6 +204,7 @@ logger('3');
 				}
 			}
 
+
 			if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! \App::$error)
 				&& (function_exists(\App::$module . '_post'))
 				&& (! x($_POST, 'auth-params'))) {