.gitignore controllers/admin/projects_controller.php views/admin/projects/edit.php views/admin/projects/index.php views/friends/friend.php views/home/index.php views/projects/index.php views/projects/item.php views/projects/project.php @@ -11,7 +11,7 @@ $GLOBALS['routes'] = array( '/hello-world/[action]' => 'hello_world', //Requests to /projects will go to the projects controller inside the admin folder in controllers - '/admin/projects' => 'admin/projects', + '/admin/projects/[action]' => 'admin/projects', //Requests to /non-existent-controller will include /views/non_existent_controller.php, as the controller itself doesn't exist '/non-existent-controller' => 'non_existent_controller', config/routes.php @@ -7,9 +7,5 @@ class controller { function __construct() { //Why not add authorisation checks in here, then all controllers can inherit } - - function index() { - echo "No index method defined for this controller"; - } } \ No newline at end of file controllers/controller.php @@ -17,7 +17,7 @@ class friends_controller extends controller { $user = new user($this->parameters['user']); $other_user = new user($this->parameters['friend']); $friend = new friend($user->username,$other_user->username); - require_once("views/friend.php"); + require_once("views/friends/friend.php"); exit; } controllers/friends_controller.php @@ -3,10 +3,4 @@ class home_controller extends controller { - - // GET / - function index() { - echo "This is the home page"; - } - } \ No newline at end of file controllers/home_controller.php @@ -8,13 +8,13 @@ class projects_controller extends controller { // GET /projects function index() { - require_once("views/projects.php"); + require_once("views/projects/index.php"); exit; } // GET /projects/1234 function view($project) { - require_once("views/project.php"); + require_once("views/projects/project.php"); exit; } @@ -28,7 +28,7 @@ class projects_controller extends controller { // GET //projects/1234/items/567 function view_item($project,$item) { - require_once("views/item.php"); + require_once("views/projects/item.php"); exit; } controllers/projects_controller.php @@ -14,65 +14,62 @@ class router { while (substr($path, -1) == '/') { $path = mb_substr($path,0,(mb_strlen($path)-1)); } - $pathComponents = explode('/', $path); + $path_components = explode('/', $path); //default actions are called 'index' $action = "index"; //Handle home page requests - if (count($pathComponents) == 1) { - router::performControllerAction("home",$action,array(),array()); + if (count($path_components) == 1) { + router::perform_controller_action("home",$action,array(),array()); } - + //Loop through all the routes we defined in route.php, and try to find one that matches our request foreach ($GLOBALS['routes'] as $route => $controller) { - $routeComponents = explode("/",$route); + $route_components = explode("/",$route); $action = "index"; $i=0; $objects = array(); $goodRoute = true; - $pathComponents = array_pad($pathComponents, count($routeComponents), ''); + $path_components = array_pad($path_components, count($route_components), ''); $parameters = array(); //Handle routes that call a specific action - $controllerActionArray = explode(":",$controller); - $controller = $controllerActionArray[0]; - if (count($controllerActionArray) == 2) { - $action = $controllerActionArray[1]; + $controller_action_array = explode(":",$controller); + $controller = $controller_action_array[0]; + if (count($controller_action_array) == 2) { + $action = $controller_action_array[1]; } //Loop through each component of this route until we find a part that doesn't match, or we run out of url - foreach ($routeComponents as $routeComponent) { + foreach ($route_components as $route_component) { //This part of the route is a named parameter - if (substr($routeComponent,0,1) == ":") { - $parameters[substr($routeComponent,1)] = $pathComponents[$i]; + if (substr($route_component,0,1) == ":") { + $parameters[substr($route_component,1)] = $path_components[$i]; //This part of the route is an action for a controller - } elseif ($routeComponent == "[action]") { - if ($pathComponents[$i] != "") { - $action = $pathComponents[$i]; + } elseif ($route_component == "[action]") { + if ($path_components[$i] != "") { + $action = str_replace("-","_",$path_components[$i]); } //This part of the route will require that we create an object - } elseif (substr($routeComponent,0,1) == "(" && substr($routeComponent,-1,1) == ")") { - $reflectionObj = new ReflectionClass(substr($routeComponent,1,strlen($routeComponent)-2)); - $object = $reflectionObj->newInstanceArgs(array($pathComponents[$i])); + } elseif (substr($route_component,0,1) == "(" && substr($route_component,-1,1) == ")") { + $reflection_obj = new ReflectionClass(substr($route_component,1,strlen($route_component)-2)); + $object = $reflection_obj->newInstanceArgs(array($path_components[$i])); - //If we couldn't make an object and this part of the url isn't empty, we probably wanted a different route - if (!$object->is_valid && $pathComponents[$i] != "") { - $goodRoute = false; - } + $objects[] = $object; //Part of the url that isn't an action or an object didn't match, this definitely isn't the right route - } elseif ($routeComponent != $pathComponents[$i]) { - #echo "Bad match $routeComponent != ".$pathComponents[$i]."<br />"; + } elseif ($route_component != $path_components[$i] && str_replace("-","_",$route_component) != $path_components[$i]) { + //echo "Bad match: ".str_replace("-","_",$route_component)." != ".$path_components[$i]."<br />"; $goodRoute = false; break; } @@ -80,8 +77,9 @@ class router { } //This route is a match for our request, let's get the controller working on it - if ($goodRoute && ($i >= count($pathComponents) || $pathComponents[$i] == "")) { - router::performControllerAction($controller,$action,$objects,$parameters); + if ($goodRoute && ($i >= count($path_components) || $path_components[$i] == "")) { + + router::perform_controller_action($controller,$action,$objects,$parameters); } } @@ -90,39 +88,51 @@ class router { } //Look for a controller file matching the request, and failing that, a view - static function performControllerAction($path,$action,$objects,$parameters) { + static function perform_controller_action($class_path,$action,$objects,$parameters) { - //Nice urls: treat /hello-world the same as /hello_world - $action = str_replace("-","_",$action); + //We treat 'new' the same as 'edit', since they generally contain a lot of the same code + if ($action == "new") { + $action = "edit"; + } - - //First, let's look for a controller - $controllerPath = SITE_PATH."/controllers/".$path."_controller.php"; + //Let's look for a controller + $controller_path = SITE_PATH."/controllers/".$class_path."_controller.php"; - if (file_exists($controllerPath)) { - require_once($controllerPath); - if ($action == "new") { - $action = "edit"; - } - $class = explode("/",$path); - $class = $class[count($class)-1]."_controller"; - if (!method_exists($class,$action)) { - fatal_error("$class does not respond to $action"); + if (file_exists($controller_path)) { + require_once($controller_path); + + $class_path_components = explode("/",$class_path); + $class = $class_path_components[count($class_path_components)-1]; + $controller_class = $class."_controller"; + if (!method_exists($controller_class,$action)) { + if (router::render_view($class_path,$action)) { + exit; + } else { + fatal_error("$controller_class does not respond to $action"); + } } - $controller = new $class(); + $controller = new $controller_class(); $controller->parameters = $parameters; call_user_func_array(array($controller,$action),$objects); exit; } //If no controller was found, we'll look for a view - $viewPath = SITE_PATH."/views/".$path.".php"; - if (file_exists($viewPath)) { - require_once($viewPath); + if (router::render_view($class_path,$action)) { exit; } } - + + static function render_view($class_path,$action) { + $view_path = SITE_PATH."/views/$class_path/".$action.".php"; + if (file_exists($view_path)) { + $controller = new controller(); + require_once($view_path); + return true; + } + return false; + } } + helpers/router.php @@ -13,5 +13,8 @@ class project extends model { $this->is_valid = true; } } + + function delete() { + } } \ No newline at end of file models/project.php views/friend.php views/item.php views/project.php views/projects.php 89c858cbb53aad196b9764f28fb034b0ec276dd9 Ben Copsey ben@allseeing-i.com http://github.com/pokeb/php-mvc-router/commit/7da53852665d79afb90b4441d6b3763a46e40bb5 7da53852665d79afb90b4441d6b3763a46e40bb5 2008-08-25T04:31:06-07:00 2008-08-25T04:31:06-07:00 Reorganise system for parsing views: * Views are now stored in folders named after their controller, to better deal with larger sites * When using the [action] syntax, a matching view will be rendered when no action in the controller exists Also: * More reliable hyphen to underscore conversion * Index page now shows a list of links that match those in the example routes.php * Variable naming convention changed to use underscores rather than lowerCamelCase (yep, I've spent too much time with rails..) * Misc bug fixes - all the examples should work now * Added per-site config files to .gitignore 55926240db65ac4591dbb31b64327d8bb8c416f0 Ben Copsey ben@allseeing-i.com