Pluf Framework Commit Details - 5088d0508839e9ca08574fe90f8371117339fe6e - High Performance, Lightweight, PHP 5 Framework

Date:	2009-05-15 11:57:04 (1 year 3 months ago)
Author:	Loïc d'Anterroches
Commit:	5088d0508839e9ca08574fe90f8371117339fe6e
Message:	Fixed issues with recursive URLs inclusion.
Files:	src/Pluf/HTTP/Response/RedirectToLogin.php (1 diff) src/Pluf/HTTP/URL.php (2 diffs)

Change Details

src/Pluf/HTTP/Response/RedirectToLogin.php
41	41	function __construct($request, $loginurl=null)
42	42	{
43	43	if ($loginurl !== null) {
44		$murl = new Pluf_HTTP_URL(Pluf::f('url_format'));
	44	$murl = new Pluf_HTTP_URL();
45	45	$url = $murl->generate($loginurl, array('_redirect_after' => $request->uri), false);
46	46	$encoded = $murl->generate($loginurl, array('_redirect_after' => $request->uri));
47	47	} else {

src/Pluf/HTTP/URL.php
135	135	function Pluf_HTTP_URL_find($views, $vdef, $regbase)
136	136	{
137	137	foreach ($views as $dview) {
	138	if (isset($dview['sub'])) {
	139	$regbase2 = $regbase;
	140	if (empty($regbase2[0])) {
	141	$regbase2[0] = $dview['base'];
	142	}
	143	$regbase2[1][] = $dview['regex'];
	144	$res = Pluf_HTTP_URL_find($dview['sub'], $vdef, $regbase2);
	145	if ($res) {
	146	return $res;
	147	}
	148	}
138	149	if (
139	150	(isset($dview['name']) && $dview['name'] == $vdef[2])
140	151	or
...	...
146	157	}
147	158	return $regbase;
148	159	}
149		if (isset($dview['sub'])) {
150		$regbase2 = $regbase;
151		$regbase2[1][] = $dview['regex'];
152		$res = Pluf_HTTP_URL_find($dview['sub'], $vdef, $regbase2);
153		if ($res) {
154		return $res;
155		}
156		}
157	160	}
158	161	return false;
159	162	}