routing fix, is never empty

sb0y · May 4, 2013 · cc2ae5c · cc2ae5c
1 parent c988b42
commit cc2ae5c
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 10 deletions.
diff --git a/adm/engine/controllers/ajax.php b/adm/engine/controllers/ajax.php
@@ -40,4 +40,9 @@ function requestModels (&$modelsNeeded)
 	{
 		$modelsNeeded = array();
 	}
+
+	function start()
+	{
+
+	}
 }
diff --git a/adm/engine/controllers/blog.php b/adm/engine/controllers/blog.php
@@ -25,6 +25,11 @@ function index()
 	{
 		$this->posts();
 	}
+
+	function start()
+	{
+
+	}
 
 	function writePost()
 	{

diff --git a/adm/engine/controllers/index.php b/adm/engine/controllers/index.php
@@ -31,5 +31,9 @@ function requestModels (&$modelsNeeded)
 	{
 		$modelsNeeded = array("blog");
 	}
-
+
+	function start()
+	{
+
+	}
 }
diff --git a/adm/engine/controllers/portfolio.php b/adm/engine/controllers/portfolio.php
@@ -26,6 +26,11 @@ function index()
 		$this->items();
 	}
 
+	function start()
+	{
+
+	}
+
 	function requestModels (&$modelsNeeded)
 	{
 		$modelsNeeded = array("blog");

diff --git a/adm/engine/controllers/users.php b/adm/engine/controllers/users.php
@@ -26,6 +26,11 @@ function index()
 		system::setParam ("page", "users");
 		blog::buildList ("users");
 	}
+
+	function start()
+	{
+
+	}
 
 	function edit()
 	{

diff --git a/engine/controllers/blog.php b/engine/controllers/blog.php
@@ -25,7 +25,7 @@ function index()
 	{
 		system::setParam ("page", "post");
 
-		if (!empty ($this->args[0]))
+		if ($this->args[0] != "blog")
 		{
 			$cacheID = $this->args[0]."|POST";
 			$this->smarty->setCacheID ($cacheID);
@@ -52,8 +52,6 @@ function index()
 				}
 			}
 		} else system::redirect ("/");
-
-		//$this->smarty->clearCache ("post.tpl");
 	}
 
 	function start()

diff --git a/engine/controllers/index.php b/engine/controllers/index.php
@@ -23,7 +23,7 @@ class controller_index extends controller_base
 {
 	function index()
 	{
-		if (!isset ($this->args[0]))
+		if ($this->args[0] == "index")
 		{
 			$this->smarty->setCacheID ("MAINPAGE|offset_0");
 			if (!$this->smarty->isCached ("main.tpl", "MAINPAGE|offset_0"))

diff --git a/engine/core/class.router.php b/engine/core/class.router.php
@@ -106,25 +106,28 @@ private function getController (&$file, &$controller, &$action, &$args)
 
 			$controller = array_shift ($parts);
 
-			if (empty($controller)) { $controller = "index"; }
+			if (empty($controller)) $controller = "index";
 
 			$action = array_shift ($parts);
 
-			if (empty($action)) { $action = "index"; }
+			if (empty($action)) $action = "index";
 
 			$file = $this->path."/$controller.php";
 
+			$this->args[] = $controller;
+
 			if (!is_readable ($file))
 			{
+
 				if (!is_readable (TPL_PATH."/static/$controller.tpl"))
 				{
 					throw new Exception ("404 Not Found (file $file is NOT readable)", 404);
 				} else {
-					$this->args[] = $controller;
 					$this->smarty->setCacheID ("STATIC|".$controller);
 					$controller = "index";
 					$file = $this->path."/index.php";
 				}
+
 			}
 
 			$args = $parts;
@@ -152,8 +155,6 @@ function delegate()
 				$controllerObject->start();
 				$modelsNeeded[] = "index";
 				$this->loadModels ($modelsNeeded, $controllerName);
-
-				$this->args[] = $controllerName;
 
 				$controllerObject->$controllerAction();