This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via bb485a334190ba3ea7265e21506e4f63c1f96c82 (commit)
via 385fd4a30c17caa5398a77411dd764915650e5cf (commit)
from bd8a92a44b2ba0ae4c7f0cd26fab23c3f5fe2d11 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bb485a334190ba3ea7265e21506e4f63c1f96c82
commit bb485a334190ba3ea7265e21506e4f63c1f96c82
Author: Franck Villaume <[email protected]>
Date: Fri Aug 26 18:49:11 2016 +0200
remove url_prefix in return_to. related to [#643]
diff --git a/src/common/include/Navigation.class.php
b/src/common/include/Navigation.class.php
index be87e52..9872c9c 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -194,7 +194,14 @@ class Navigation extends FFError {
$url = '/account/login.php';
if(getStringFromServer('REQUEST_METHOD') != 'POST') {
$url .= '?return_to=';
- $url .=
urlencode(getStringFromServer('REQUEST_URI'));
+ // remove the url_prefix
+ $url_prefix = forge_get_config('url_prefix');
+ $request_uri =
getStringFromServer('REQUEST_URI');
+ if (substr($request_uri, 0,
strlen($url_prefix)) == $url_prefix) {
+ $request_uri = '/'.substr($request_uri,
strlen($url_prefix));
+ }
+
+ $url .= urlencode($request_uri);
}
$res['titles'][] = _('Log In');
$res['urls'][] = util_make_url($url);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=385fd4a30c17caa5398a77411dd764915650e5cf
commit 385fd4a30c17caa5398a77411dd764915650e5cf
Author: Franck Villaume <[email protected]>
Date: Fri Aug 26 18:48:10 2016 +0200
coding style
diff --git a/src/plugins/authbuiltin/www/post-login.php
b/src/plugins/authbuiltin/www/post-login.php
index 34d0988..fde37c5 100644
--- a/src/plugins/authbuiltin/www/post-login.php
+++ b/src/plugins/authbuiltin/www/post-login.php
@@ -48,15 +48,16 @@ $triggered = getIntFromRequest('triggered');
$attempts = getIntFromRequest('attempts');
$previous_login = getStringFromRequest('previous_login');
-if (session_loggedin())
+if (session_loggedin()) {
session_redirect('/my');
+}
//
// Validate return_to
//
if ($return_to) {
$tmpreturn = explode('?',$return_to);
- $rtpath = $tmpreturn[0] ;
+ $rtpath = $tmpreturn[0];
if (@is_file(forge_get_config('url_root').$rtpath)
|| @is_dir(forge_get_config('url_root').$rtpath)
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Navigation.class.php | 9 ++++++++-
src/plugins/authbuiltin/www/post-login.php | 5 +++--
2 files changed, 11 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
