adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 02:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making Router accessible as a singleton

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3397 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-08-12 13:02:51 +00:00
parent 1de5fee5bb
commit ceb5c9c6f1
3 changed files with 51 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/config/routes.php
View file

@ -33,14 +33,14 @@
* its action called 'display', and we pass a param to select the view file * its action called 'display', and we pass a param to select the view file
* to use (in this case, /app/views/pages/home.thtml)... * to use (in this case, /app/views/pages/home.thtml)...
*/ */
$Route->connect('/', array('controller' => 'pages', 'action' => 'display', 'home')); Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
/** /**
* ...and connect the rest of 'Pages' controller's urls. * ...and connect the rest of 'Pages' controller's urls.
*/ */
$Route->connect('/pages/*', array('controller' => 'pages', 'action' => 'display')); Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
/** /**
* Then we connect url '/test' to our test controller. This is helpfull in * Then we connect url '/test' to our test controller. This is helpfull in
* developement. * developement.
*/ */
$Route->connect('/tests', array('controller' => 'tests', 'action' => 'index')); Router::connect('/tests', array('controller' => 'tests', 'action' => 'index'));
?> ?>

2
cake/dispatcher.php
View file

@ -321,7 +321,7 @@ class Dispatcher extends Object {
* @return array Parameters found in POST and GET. * @return array Parameters found in POST and GET.
*/ */
function parseParams($from_url) { function parseParams($from_url) {
$Route = new Router(); $Route = Router::getInstance();
include CONFIGS.'routes.php'; include CONFIGS.'routes.php';
$params = $Route->parse ($from_url); $params = $Route->parse ($from_url);

73
cake/libs/router.php
View file

@ -39,7 +39,7 @@
* @package cake * @package cake
* @subpackage cake.cake.libs * @subpackage cake.cake.libs
*/ */
class Router extends Object{ class Router extends Object {
/** /**
* Array of routes * Array of routes
* *
@ -66,6 +66,20 @@ class Router extends Object{
} }
} }
} }
/**
* Gets a reference to the Router object instance
*
* @return object
*/
function &getInstance() {
static $instance = array();
if (!isset($instance[0]) || !$instance[0]) {
$instance[0] =& new Router();
}
return $instance[0];
}
/** /**
* TODO: Better description. Returns this object's routes array. Returns false if there are no routes available. * TODO: Better description. Returns this object's routes array. Returns false if there are no routes available.
* *
@ -75,24 +89,28 @@ class Router extends Object{
* @return array Array of routes * @return array Array of routes
*/ */
function connect($route, $default = null) { function connect($route, $default = null) {
$_this = Router::getInstance();
$parsed = $names = array(); $parsed = $names = array();
if (defined('CAKE_ADMIN') && $default == null) { if (defined('CAKE_ADMIN') && $default == null) {
if ($route == CAKE_ADMIN) { if ($route == CAKE_ADMIN) {
$this->routes[] = $this->__admin; $_this->routes[] = $_this->__admin;
$this->__admin = null; $_this->__admin = null;
} }
} }
$r = null; $r = null;
if (($route == '') || ($route == '/')) { if (($route == '') || ($route == '/')) {
$regexp='/^[\/]*$/'; $regexp = '/^[\/]*$/';
$this->routes[] = array($route, $regexp, array(), $default); $_this->routes[] = array($route, $regexp, array(), $default);
} else { } else {
$elements = array(); $elements = array();
foreach(explode('/', $route)as $element) { foreach(explode('/', $route) as $element) {
if (trim($element)) if (trim($element)) {
$elements[] = $element; $elements[] = $element;
}
} }
if (!count($elements)) { if (!count($elements)) {
@ -102,8 +120,8 @@ class Router extends Object{
foreach($elements as $element) { foreach($elements as $element) {
if (preg_match('/^:(.+)$/', $element, $r)) { if (preg_match('/^:(.+)$/', $element, $r)) {
$parsed[]='(?:\/([^\/]+))?'; $parsed[] = '(?:\/([^\/]+))?';
$names[] =$r[1]; $names[] = $r[1];
} elseif(preg_match('/^\*$/', $element, $r)) { } elseif(preg_match('/^\*$/', $element, $r)) {
$parsed[] = '(?:\/(.*))?'; $parsed[] = '(?:\/(.*))?';
} else { } else {
@ -111,10 +129,10 @@ class Router extends Object{
} }
} }
$regexp='#^' . join('', $parsed) . '[\/]*$#'; $regexp = '#^' . join('', $parsed) . '[\/]*$#';
$this->routes[] = array($route, $regexp, $names, $default); $_this->routes[] = array($route, $regexp, $names, $default);
} }
return $this->routes; return $_this->routes;
} }
/** /**
* Parses given URL and returns an array of controllers, action and parameters * Parses given URL and returns an array of controllers, action and parameters
@ -124,6 +142,8 @@ class Router extends Object{
* @return array * @return array
*/ */
function parse($url) { function parse($url) {
$_this = Router::getInstance();
if ($url && ('/' != $url[0])) { if ($url && ('/' != $url[0])) {
if (!defined('SERVER_IIS')) { if (!defined('SERVER_IIS')) {
$url = '/' . $url; $url = '/' . $url;
@ -135,27 +155,27 @@ class Router extends Object{
'/^(?:\/(?:([a-zA-Z0-9_\\-\\.]+)(?:\\/([a-zA-Z0-9_\\-\\.]+)(?:[\\/\\?](.*))?)?))[\\/]*$/', '/^(?:\/(?:([a-zA-Z0-9_\\-\\.]+)(?:\\/([a-zA-Z0-9_\\-\\.]+)(?:[\\/\\?](.*))?)?))[\\/]*$/',
array('controller', 'action'), array()); array('controller', 'action'), array());
if (defined('CAKE_ADMIN') && $this->__admin != null) { if (defined('CAKE_ADMIN') && $_this->__admin != null) {
$this->routes[]=$this->__admin; $_this->routes[] = $_this->__admin;
$this->__admin =null; $_this->__admin = null;
} }
$this->connect('/bare/:controller/:action/*', array('bare' => '1')); $_this->connect('/bare/:controller/:action/*', array('bare' => '1'));
$this->connect('/ajax/:controller/:action/*', array('bare' => '1')); $_this->connect('/ajax/:controller/:action/*', array('bare' => '1'));
if (defined('WEBSERVICES') && WEBSERVICES == 'on') { if (defined('WEBSERVICES') && WEBSERVICES == 'on') {
$this->connect('/rest/:controller/:action/*', array('webservices' => 'Rest')); $_this->connect('/rest/:controller/:action/*', array('webservices' => 'Rest'));
$this->connect('/rss/:controller/:action/*', array('webservices' => 'Rss')); $_this->connect('/rss/:controller/:action/*', array('webservices' => 'Rss'));
$this->connect('/soap/:controller/:action/*', array('webservices' => 'Soap')); $_this->connect('/soap/:controller/:action/*', array('webservices' => 'Soap'));
$this->connect('/xml/:controller/:action/*', array('webservices' => 'Xml')); $_this->connect('/xml/:controller/:action/*', array('webservices' => 'Xml'));
$this->connect('/xmlrpc/:controller/:action/*', array('webservices' => 'XmlRpc')); $_this->connect('/xmlrpc/:controller/:action/*', array('webservices' => 'XmlRpc'));
} }
$this->routes[] = $default_route; $_this->routes[] = $default_route;
if (strpos($url, '?') !== false) { if (strpos($url, '?') !== false) {
$url = substr($url, 0, strpos($url, '?')); $url = substr($url, 0, strpos($url, '?'));
} }
foreach($this->routes as $route) { foreach($_this->routes as $route) {
list($route, $regexp, $names, $defaults) = $route; list($route, $regexp, $names, $defaults) = $route;
if (preg_match($regexp, $url, $r)) { if (preg_match($regexp, $url, $r)) {
@ -165,7 +185,7 @@ class Router extends Object{
foreach($names as $name) { foreach($names as $name) {
$out[$name] = null; $out[$name] = null;
} }
$ii=0; $ii = 0;
if (is_array($defaults)) { if (is_array($defaults)) {
foreach($defaults as $name => $value) { foreach($defaults as $name => $value) {
@ -195,4 +215,5 @@ class Router extends Object{
return $out; return $out;
} }
} }
?> ?>