From 2f6cb764a4670f848123153e44d6aa58d6ab01b7 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 17 Sep 2018 10:30:47 +0200
Subject: prepare submodule to interact with route

---
 Zotlabs/Module/Articles.php |  2 +-
 Zotlabs/Web/SubModule.php   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Module/Articles.php b/Zotlabs/Module/Articles.php
index d622b221a..7af1ab6b8 100644
--- a/Zotlabs/Module/Articles.php
+++ b/Zotlabs/Module/Articles.php
@@ -45,7 +45,7 @@ class Articles extends Controller {
 			return $o;
 		}
 
-		nav_set_selected(t('Articles'));
+		nav_set_selected('Articles');
 
 		head_add_link([ 
 			'rel'   => 'alternate',
diff --git a/Zotlabs/Web/SubModule.php b/Zotlabs/Web/SubModule.php
index 7c8404201..763a55d86 100644
--- a/Zotlabs/Web/SubModule.php
+++ b/Zotlabs/Web/SubModule.php
@@ -2,6 +2,8 @@
 
 namespace Zotlabs\Web;
 
+use Zotlabs\Extend\Route;
+
 /*
  * @brief
  *
@@ -31,9 +33,23 @@ class SubModule {
 
 		$filename = 'Zotlabs/Module/' . ucfirst(argv(0)) . '/'. ucfirst(argv($whicharg)) . '.php';
 		$modname = '\\Zotlabs\\Module\\' . ucfirst(argv(0)) . '\\' . ucfirst(argv($whicharg));
+
 		if(file_exists($filename)) {
 			$this->controller = new $modname();
 		}
+
+		$routes = Route::get();
+
+		if($routes) {
+			foreach($routes as $route) {
+				if(is_array($route) && strtolower($route[1]) === strtolower(argv(0)) . '/' . strtolower(argv($whicharg))) {
+					include_once($route[0]);
+					if(class_exists($modname)) {
+						$this->controller = new $modname;
+					}
+				}
+			}
+		}
 	}
 
 	/**
@@ -43,6 +59,7 @@ class SubModule {
 	 * @return boolean|mixed
 	 */
 	function call($method) {
+
 		if(! $this->controller)
 			return false;
 
-- 
cgit v1.2.3