[Fusionforge-commits] FusionForge branch master updated. 657df8d998cdad5edb01fc8973106fec4f5938e6
Franck VILLAUME
nerville at fusionforge.org
Sun Apr 28 16:13:01 CEST 2013
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 657df8d998cdad5edb01fc8973106fec4f5938e6 (commit)
from 13e513dacc5995cee4c71eb7cb532121edf9ed1f (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 -----------------------------------------------------------------
commit 657df8d998cdad5edb01fc8973106fec4f5938e6
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Sun Apr 28 16:12:57 2013 +0200
patch #539: cleanup is_public and remove USE_PFO_RBAC since it is default
diff --git a/src/common/include/Group.class.php b/src/common/include/Group.class.php
index 251f7af..c8b98da 100644
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@ -7,6 +7,7 @@
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright 2010-2012, Alain Peyrat - Alcatel-Lucent
* Copyright 2012-2013, Franck Villaume - TrivialDev
+ * Copyright 2013, French Ministry of National Education
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -404,14 +405,13 @@ class Group extends Error {
* This function require site admin privilege.
*
* @param object User requesting operation (for access control).
- * @param boolean Whether group is publicly accessible (0/1).
* @param int Group type (1-project, 2-foundry).
* @param string Machine on which group's home directory located.
* @param string Domain which serves group's WWW.
* @return status.
* @access public
*/
- function updateAdmin(&$user, $is_public, $type_id, $unix_box, $http_domain) {
+ function updateAdmin(&$user, $type_id, $unix_box, $http_domain) {
$perm =& $this->getPermission();
if (!$perm || !is_object($perm)) {
diff --git a/src/www/admin/groupedit.php b/src/www/admin/groupedit.php
index 4172616..6d2597c 100644
--- a/src/www/admin/groupedit.php
+++ b/src/www/admin/groupedit.php
@@ -5,6 +5,8 @@
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2010 (c) Franck Villaume - Capgemini
* Copyright (C) 2011-2012 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2013, French Ministry of National Education
+ * Copyright 2013, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -38,7 +40,7 @@ if (!$group || !is_object($group)) {
}
// This function performs very update
-function do_update(&$group, $is_public, $is_template, $status, $group_type, $unix_box, $http_domain, $scm_box='') {
+function do_update(&$group, $is_template, $status, $group_type, $unix_box, $http_domain, $scm_box='') {
global $feedback;
global $error_msg;
@@ -50,7 +52,7 @@ function do_update(&$group, $is_public, $is_template, $status, $group_type, $uni
return false;
}
- if (!$group->updateAdmin(session_get_user(), $is_public, $group_type, $unix_box, $http_domain)) {
+ if (!$group->updateAdmin(session_get_user(), $group_type, $unix_box, $http_domain)) {
$error_msg .= $group->getErrorMessage();
db_rollback();
return false;
@@ -76,14 +78,13 @@ function do_update(&$group, $is_public, $is_template, $status, $group_type, $uni
if (getStringFromRequest('submit')) {
- $form_public = getStringFromRequest('form_public');
$form_template = getStringFromRequest('form_template');
$form_status = getStringFromRequest('form_status');
$form_box = getStringFromRequest('form_box');
$form_domain = getStringFromRequest('form_domain');
$form_scm_box = getStringFromRequest('form_scm_box');
- do_update($group, $form_public, $form_template, $form_status, 1, $form_box, $form_domain, $form_scm_box);
+ do_update($group, $form_template, $form_status, 1, $form_box, $form_domain, $form_scm_box);
} elseif (getStringFromRequest('resend')) {
@@ -133,7 +134,6 @@ if($status == 'P') {
</td>
</tr>
<tr>
-<?php if (USE_PFO_RBAC) { ?>
<td colspan="2"><?php
printf(_('With PFO-RBAC, the “is_public” property is gone. Instead, to make a project public, <%1$s>link<%2$s> the global role “Anonymous/not logged in” then <%3$s>give<%4$s> it “Project visibility” permissions.'),
'a href="' . util_make_url('/project/admin/users.php?group_id=' .
@@ -144,25 +144,6 @@ printf(_('With PFO-RBAC, the “is_public” property is gone. Instead, to make
'/a'
);
?></td>
-<?php } else { ?>
-<td>
-<?php echo _('Public?') ?>:
-</td>
-<td>
-<?php // PLEASE DONT TRANSLATE THIS, THIS IS DATABASE INFO THAT CANT BE DIFFERENT AMONG LANGUAGES
- echo html_build_select_box_from_arrays(
- array(
- '0',
- '1'
- ),
- array(
- _('No'),
- _('Yes')
-),
- 'form_public', $group->isPublic(), false
-); ?>
-</td>
-<?php } ?>
</tr>
<tr>
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Group.class.php | 4 ++--
src/www/admin/groupedit.php | 29 +++++------------------------
2 files changed, 7 insertions(+), 26 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list