pluf2

pluf2 Commit Details


Date:2009-05-15 04:57:04 (15 years 7 months ago)
Author:Loic d'Anterroches
Branch:master
Commit:5088d0508839e9ca08574fe90f8371117339fe6e
Parents: 7aa17fcfc9204c4d139f3b72c464f1a58261ac23
Message:Fixed issues with recursive URLs inclusion.

Changes:

File differences

src/Pluf/HTTP/Response/RedirectToLogin.php
4141
4242
4343
44
44
4545
4646
4747
function __construct($request, $loginurl=null)
{
if ($loginurl !== null) {
$murl = new Pluf_HTTP_URL(Pluf::f('url_format'));
$murl = new Pluf_HTTP_URL();
$url = $murl->generate($loginurl, array('_redirect_after' => $request->uri), false);
$encoded = $murl->generate($loginurl, array('_redirect_after' => $request->uri));
} else {
src/Pluf/HTTP/URL.php
135135
136136
137137
138
139
140
141
142
143
144
145
146
147
148
138149
139150
140151
......
146157
147158
148159
149
150
151
152
153
154
155
156
157160
158161
159162
function Pluf_HTTP_URL_find($views, $vdef, $regbase)
{
foreach ($views as $dview) {
if (isset($dview['sub'])) {
$regbase2 = $regbase;
if (empty($regbase2[0])) {
$regbase2[0] = $dview['base'];
}
$regbase2[1][] = $dview['regex'];
$res = Pluf_HTTP_URL_find($dview['sub'], $vdef, $regbase2);
if ($res) {
return $res;
}
}
if (
(isset($dview['name']) && $dview['name'] == $vdef[2])
or
}
return $regbase;
}
if (isset($dview['sub'])) {
$regbase2 = $regbase;
$regbase2[1][] = $dview['regex'];
$res = Pluf_HTTP_URL_find($dview['sub'], $vdef, $regbase2);
if ($res) {
return $res;
}
}
}
return false;
}

Archive Download the corresponding diff file

Branches

Number of commits:
Page rendered in 0.05445s using 13 queries.