[Fusionforge-commits] FusionForge branch master updated. v6.1-133-gf16f610

Franck Villaume nerville at libremir.placard.fr.eu.org
Sat Dec 8 16:47:41 CET 2018


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  f16f610958bff568ecec01c4d88fe77d6ffb10f7 (commit)
       via  fb09e3022de206f6d3966bf94df144b23f34592d (commit)
       via  5a78a9855151713ea38714573ed5a2825e03467d (commit)
      from  019b0ca69f94a62b50466cd0abc0a512034aac44 (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=f16f610958bff568ecec01c4d88fe77d6ffb10f7

commit f16f610958bff568ecec01c4d88fe77d6ffb10f7
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 8 16:47:22 2018 +0100

    Drop undocumented and old sys_noforcetype

diff --git a/src/common/include/Navigation.class.php b/src/common/include/Navigation.class.php
index 84407cf..ccf3fce 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -330,11 +330,7 @@ class Navigation extends FFError {
 				if (!$project->isError()) {
 					$menu['titles'][] = $project->getPublicName();
 					$menu['tooltips'][] = _('Project home page, widgets selected to follow specific items.');
-					if (isset ($GLOBALS['sys_noforcetype']) && $GLOBALS['sys_noforcetype']) {
-						$menu['urls'][] = util_make_uri('/project/?group_id') .$project->getID();
-					} else {
-						$menu['urls'][] = util_make_uri('/projects/') .$project->getUnixName().'/';
-					}
+					$menu['urls'][] = util_make_uri('/projects/') .$project->getUnixName().'/';
 					$selected = count($menu['urls'])-1;
 				}
 			}
@@ -386,11 +382,7 @@ class Navigation extends FFError {
 			// Summary
 			$menu['titles'][] = _('Summary');
 			$menu['tooltips'][] = _('Project Homepage. Widgets oriented');
-			if (isset($GLOBALS['sys_noforcetype']) && $GLOBALS['sys_noforcetype']) {
-				$url = util_make_uri('/project/?group_id=' . $group_id);
-			} else {
-				$url = util_make_uri('/projects/' . $group->getUnixName() .'/');
-			}
+			$url = util_make_uri('/projects/' . $group->getUnixName() .'/');
 			$menu['urls'][] = $url;
 			$menu['adminurls'][] = false;
 			if ($toptab == "home") {
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 7d9225d..add91de 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1026,11 +1026,7 @@ function util_display_user($username, $user_id = 0, $text = '', $size = 'xs') {
  * @return	string URL
  */
 function util_make_url_u($username, $user_id) {
-	if (isset ($GLOBALS['sys_noforcetype']) && $GLOBALS['sys_noforcetype']) {
-		return util_make_uri('/developer/?user_id='.$user_id);
-	} else {
-		return util_make_uri('/users/'.$username.'/');
-	}
+	return util_make_uri('/users/'.$username.'/');
 }
 
 /**
@@ -1064,11 +1060,7 @@ function util_make_link_g($group_name, $group_id, $text) {
  * @return	string
  */
 function util_make_url_g($group_name, $group_id) {
-	if (isset ($GLOBALS['sys_noforcetype']) && $GLOBALS['sys_noforcetype']) {
-		return util_make_uri('/project/?group_id='.$group_id);
-	} else {
-		return util_make_uri('/projects/'.$group_name.'/');
-	}
+	return util_make_uri('/projects/'.$group_name.'/');
 }
 
 function util_ensure_value_in_set($value, $set) {
diff --git a/src/www/admin/userlist.php b/src/www/admin/userlist.php
index 0a29df0..f6bb858 100644
--- a/src/www/admin/userlist.php
+++ b/src/www/admin/userlist.php
@@ -134,7 +134,7 @@ function show_users_list($users, $filter = '', $sortorder = 'realname', $start,
 		}
 		$cells[] = array(($u->getAddDate() ? date(_('Y-m-d H:i'), $u->getAddDate()) : '-'), 'style' => 'width:15%', 'class' => 'align-center');
 		if ($u->getStatus() != 'D') {
-			$nextcell = util_make_link('/developer/?form_dev='.$u->getID(),_('User Profile'));
+			$nextcell = util_make_link_u($u->getUnixName(), $u->getID(), _('User Profile'));
 		} else {
 			$nextcell = '<span class="strike">'._('User Profile').'</span>';
 		}
diff --git a/src/www/developer/index.php b/src/www/developer/index.php
deleted file mode 100644
index cf91563..0000000
--- a/src/www/developer/index.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Developer's Page
- *
- * Copyright 1999-2001 (c) VA Linux Systems, dtype
- * Copyright 2010 (c) Franck Villaume
- * http://fusionforge.org
- *
- * This file is part of FusionForge. FusionForge is free software;
- * you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the Licence, or (at your option)
- * any later version.
- *
- * FusionForge is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with FusionForge; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-
-require_once '../env.inc.php';
-require_once $gfcommon.'include/pre.php';
-
-$user_id = getIntFromRequest('user_id');
-
-if (!$user_id) {
-	$user_id = getIntFromRequest('form_dev');
-}
-
-if (isset ($sys_noforcetype) && $sys_noforcetype) {
-	if (!$user_id) {
-		exit_missing_param('',array(_('A user must be specified for this page.')),'home');
-	} else {
-		$user = user_get_object($user_id);
-		if (!$user || !is_object($user)) {
-			exit_error(_('Invalid User'),'home');
-		} elseif ( $user->isError()) {
-			exit_error($user->isError(),'home');
-		} elseif ( !$user->isActive()) {
-			exit_error(_('User not active'),'home');
-		}
-
-		include $gfwww.'include/user_home.php';
-	}
-} else {
-	session_redirect('/users/'.user_getname($user_id).'/');
-}
diff --git a/src/www/project/index.php b/src/www/project/index.php
deleted file mode 100644
index 65f4081..0000000
--- a/src/www/project/index.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * FusionForge Documentation Manager
- *
- * Copyright 1999-2001 (c), VA Linux Systems, dtype
- * Copyright 2010, FusionForge Team
- * http://fusionforge.org
- *
- * This file is part of FusionForge. FusionForge is free software;
- * you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the Licence, or (at your option)
- * any later version.
- *
- * FusionForge is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with FusionForge; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-require_once '../env.inc.php';
-require_once $gfcommon.'include/pre.php';
-
-$group_id = getIntFromRequest("group_id");
-
-if ((!$group_id) && $form_grp) {
-	$group_id=$form_grp;
-}
-
-if (!$group_id) {
-	exit_missing_param('',array(_('A project must be specified for this page.')),'');
-}
-
-if (isset ($sys_noforcetype) && $sys_noforcetype) {
-	$project = group_get_object($group_id);
-	include $gfwww.'include/project_home.php';
-} else {
-	session_redirect('/projects/'. group_getunixname($group_id) .'/');
-}

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

commit fb09e3022de206f6d3966bf94df144b23f34592d
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 8 16:25:54 2018 +0100

    fix logic

diff --git a/src/www/users b/src/www/users
index 28708fd..8457bca 100644
--- a/src/www/users
+++ b/src/www/users
@@ -88,9 +88,7 @@ if (!$user || !is_object($user) || $user->isError() || !$user->isActive()) {
 		$title = _('User Profile');
 		$HTML->header(array('title'=>$title));
 
-		if (!forge_get_config('user_home_widget')) {
-			include $gfwww.'include/user_home.php';
-		} else {
+		if (forge_get_config('user_home_widget')) {
 			if (session_loggedin() && ($user->getID() == user_getid())) {
 				$sql = "SELECT l.*
 						FROM layouts AS l INNER JOIN owner_layouts AS o ON(l.id = o.layout_id)
@@ -115,6 +113,8 @@ if (!$user || !is_object($user) || $user->isError() || !$user->isActive()) {
 			}
 			$lm = new WidgetLayoutManager();
 			$lm->displayLayout($user->getID(), WidgetLayoutManager::OWNER_TYPE_USERHOME);
+		} else {
+			include $gfwww.'include/user_home.php';
 		}
 		$HTML->footer();
 	}

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

commit 5a78a9855151713ea38714573ed5a2825e03467d
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 8 16:25:29 2018 +0100

    fix comment

diff --git a/src/bin/inject-users.php b/src/bin/inject-users.php
index 55cfea4..68010bd 100755
--- a/src/bin/inject-users.php
+++ b/src/bin/inject-users.php
@@ -23,7 +23,7 @@
  * Line format:
  * login:email:fname:lname:password
  * password is cleartext
- * login might be optional if sys_require_unique_email is true
+ * login might be optional if require_unique_email is true
 */
 
 

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

Summary of changes:
 src/bin/inject-users.php                |  2 +-
 src/common/include/Navigation.class.php | 12 ++------
 src/common/include/utils.php            | 12 ++------
 src/www/admin/userlist.php              |  2 +-
 src/www/developer/index.php             | 52 ---------------------------------
 src/www/project/index.php               | 43 ---------------------------
 src/www/users                           |  6 ++--
 7 files changed, 9 insertions(+), 120 deletions(-)
 delete mode 100644 src/www/developer/index.php
 delete mode 100644 src/www/project/index.php


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list