[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1314-g269fa24

[Franck Villaume]

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  269fa2494d42fe2e653dbd391abd28224d95b711 (commit)
       via  f930a2f1c61122d3faaed7aa550764a548a1dd48 (commit)
      from  7d934e0d552ba576c6a604f89454ff2b32afab1c (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=269fa2494d42fe2e653dbd391abd28224d95b711

commit 269fa2494d42fe2e653dbd391abd28224d95b711
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Dec 29 19:49:03 2016 +0100

    fix header when called from user page

diff --git a/src/www/forum/myforums.php b/src/www/forum/myforums.php
index dd594a3..18d6fd1 100644
--- a/src/www/forum/myforums.php
+++ b/src/www/forum/myforums.php
@@ -46,7 +46,7 @@ $group_id = getIntFromRequest("group_id");
 if ($group_id) {
 	forum_header(array('title'=>_('My Monitored Forums')));
 } else {
-	site_header(array('title'=>_('My Monitored Forums'), 'user_id' => $user_id));
+	site_user_header(array('title'=>_('My Monitored Forums')));
 }
 
 //get the user monitored forums

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f930a2f1c61122d3faaed7aa550764a548a1dd48

commit f930a2f1c61122d3faaed7aa550764a548a1dd48
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Dec 29 19:43:12 2016 +0100

    fix selected tab with url_prefix

diff --git a/src/common/include/Navigation.class.php b/src/common/include/Navigation.class.php
index 1b7f53b..d65e5c9 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -216,6 +216,7 @@ class Navigation extends FFError {
 	 *	$result['selected']: number of the selected menu entry.
 	 */
 	function getSiteMenu() {
+		//WARNING: REQUEST_URI does not include prefix. DO NOT use util_make_uri in test to find the selected tab.
 		$request_uri = getStringFromServer('REQUEST_URI');
 
 		$menu = array();
@@ -236,10 +237,11 @@ class Navigation extends FFError {
 			$menu['titles'][] = _('My Page');
 			$menu['urls'][] = util_make_uri('/my/');
 			$menu['tooltips'][] = _('Your Page, widgets selected by you to follow your items.');
-			if (strstr($request_uri, util_make_uri('/my/'))
-				|| strstr($request_uri, util_make_uri('/account/'))
-				|| strstr($request_uri, util_make_uri('/register/'))
-				|| strstr($request_uri, util_make_uri('/themes/'))
+			if (strstr($request_uri, '/my/')
+				|| strstr($request_uri, '/account/')
+				|| strstr($request_uri, '/register/')
+				|| strstr($request_uri, '/themes/')
+				|| strstr($request_uri, '/forum/myforums.php')
 				)
 			{
 				$selected = count($menu['urls'])-1;
@@ -250,7 +252,7 @@ class Navigation extends FFError {
 			$menu['titles'][] = _('Projects');
 			$menu['urls'][] = util_make_uri('/softwaremap/');
 			$menu['tooltips'][] = _('Map of projects, by categories or types.');
-			if (strstr($request_uri, util_make_uri('/softwaremap/'))) {
+			if (strstr($request_uri, '/softwaremap/')) {
 				$selected = count($menu['urls'])-1;
 			}
 		}
@@ -259,7 +261,7 @@ class Navigation extends FFError {
 			$menu['titles'][] = _('Code Snippets');
 			$menu['urls'][] = util_make_uri('/snippet/');
 			$menu['tooltips'][] = _('Tooling library. Small coding tips.');
-			if (strstr($request_uri, util_make_uri('/snippet/'))) {
+			if (strstr($request_uri, '/snippet/')) {
 				$selected = count($menu['urls'])-1;
 			}
 		}
@@ -268,7 +270,7 @@ class Navigation extends FFError {
 			$menu['titles'][] = _('Project Openings');
 			$menu['urls'][] = util_make_uri('/people/');
 			$menu['tooltips'][] = _('Hiring Market Place.');
-			if (strstr($request_uri, util_make_uri('/people/'))) {
+			if (strstr($request_uri, '/people/')) {
 				$selected=count($menu['urls'])-1;
 			}
 		}
@@ -294,7 +296,7 @@ class Navigation extends FFError {
 			$menu['titles'][] = _('Site Admin');
 			$menu['urls'][] = util_make_uri('/admin/');
 			$menu['tooltips'][] = _('Administration Submenu to handle global configuration, users & projects.');
-			if (strstr($request_uri, util_make_uri('/admin/')) || strstr($request_uri, 'type=globaladmin')) {
+			if (strstr($request_uri, '/admin/') || strstr($request_uri, 'type=globaladmin')) {
 				$selected = count($menu['urls'])-1;
 			}
 		}
@@ -302,7 +304,7 @@ class Navigation extends FFError {
 			$menu['titles'][] = _('Reporting');
 			$menu['urls'][] = util_make_uri('/reporting/');
 			$menu['tooltips'][] = _('Statistics about visits, users & projects in time frame.');
-			if (strstr($request_uri, util_make_uri('/reporting/'))) {
+			if (strstr($request_uri, '/reporting/')) {
 				$selected = count($menu['urls'])-1;
 			}
 		}
@@ -336,7 +338,6 @@ class Navigation extends FFError {
 		}
 
 		$menu['selected'] = $selected;
-
 		return $menu;
 	}
 

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/Navigation.class.php | 21 +++++++++++----------
 src/www/forum/myforums.php              |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
FusionForge