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 9bd0641d0ac0893820b20a513e16565ad6b422f8 (commit)
from 61cd721d97a3c19d56cf15e5d58911624ca145ec (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=9bd0641d0ac0893820b20a513e16565ad6b422f8
commit 9bd0641d0ac0893820b20a513e16565ad6b422f8
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Feb 29 17:49:03 2016 +0100
Whitespace only
diff --git a/src/common/docman/actions/monitorfile.php
b/src/common/docman/actions/monitorfile.php
index 34f182b..cc5abe6 100644
--- a/src/common/docman/actions/monitorfile.php
+++ b/src/common/docman/actions/monitorfile.php
@@ -26,7 +26,7 @@
/* global variables used */
global $dirid; //id of doc_group
global $group_id; // id of group
-global $LUSER; //user object
+global $LUSER; // User object
global $childgroup_id; // id of child group if any
$redirecturl = '/docman/?group_id='.$group_id.'&dirid='.$dirid;
diff --git a/src/common/forum/ForumAdmin.class.php
b/src/common/forum/ForumAdmin.class.php
index b13f81f..53c1100 100644
--- a/src/common/forum/ForumAdmin.class.php
+++ b/src/common/forum/ForumAdmin.class.php
@@ -242,7 +242,7 @@ class ForumAdmin extends Error {
exit_error($f->getErrorMessage(),'forums');
}
- session_require_perm ('forum_admin',
$f->Group->getID()) ;
+ session_require_perm('forum_admin', $f->Group->getID())
;
if
(!$f->delete(getStringFromRequest('sure'),getStringFromRequest('really_sure')))
{
exit_error($f->getErrorMessage(),'forums');
@@ -258,7 +258,7 @@ class ForumAdmin extends Error {
if ($this->isGroupAdmin()) {
$this->PrintAdminOptions();
}
- $res = db_query_params ('SELECT fgl.forum_name,
fgl.group_forum_id FROM forum_group_list fgl, forum_pending_messages fpm WHERE
fgl.group_id=$1 AND fpm.group_forum_id = fgl.group_forum_id GROUP BY
fgl.forum_name, fgl.group_forum_id',
+ $res = db_query_params('SELECT fgl.forum_name,
fgl.group_forum_id FROM forum_group_list fgl, forum_pending_messages fpm WHERE
fgl.group_id=$1 AND fpm.group_forum_id = fgl.group_forum_id GROUP BY
fgl.forum_name, fgl.group_forum_id',
array ($group_id));
if (!$res) {
echo db_error();
diff --git a/src/common/include/FusionForge.class.php
b/src/common/include/FusionForge.class.php
index a91a66d..820c777 100644
--- a/src/common/include/FusionForge.class.php
+++ b/src/common/include/FusionForge.class.php
@@ -26,8 +26,8 @@ require_once $gfcommon.'include/Error.class.php';
class FusionForge extends Error {
- var $software_name = "FusionForge" ;
- var $software_version ;
+ var $software_name = "FusionForge";
+ var $software_version;
public static $instance;
diff --git a/src/common/include/Group.class.php
b/src/common/include/Group.class.php
index d16d94c..2d6a152 100644
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@ -1628,6 +1628,7 @@ class Group extends Error {
}
return $this->data_array['homepage'];
}
+
/**
* setHomepage - the hostname of the website url where this project is
located.
*
@@ -1791,6 +1792,7 @@ class Group extends Error {
return false;
}
}
+
//
// Delete Forums
//
@@ -1859,16 +1861,16 @@ class Group extends Error {
}
}
- // Delete news forums in group itself
- for ($i = 0; $i < db_numrows($res); $i++) {
- $Forum = new Forum($this, db_result($res, $i, 'forum_id'));
- if (!$Forum->delete(1, 1)) {
- $this->setError(_("Could Not Delete News Forum: %d"),
$Forum->getID());
- return false;
- }
- }
+ // Delete news forums in group itself
+ for ($i = 0; $i < db_numrows($res); $i++) {
+ $Forum = new Forum($this, db_result($res, $i,
'forum_id'));
+ if (!$Forum->delete(1, 1)) {
+ $this->setError(_("Could Not Delete News Forum:
%d"), $Forum->getID());
+ return false;
+ }
+ }
- $res = db_query_params('DELETE FROM news_bytes WHERE group_id=$1',
+ $res = db_query_params('DELETE FROM news_bytes WHERE
group_id=$1',
array($this->getID()));
if (!$res) {
$this->setError(_('Error Deleting News: ').db_error());
@@ -2293,7 +2295,7 @@ class Group extends Error {
plugin_hook ("group_removeuser", $hook_params);
//audit trail
- $this->addHistory(_('Removed User'),$user_id);
+ $this->addHistory(_('Removed User'), $user_id);
db_commit();
@@ -2626,9 +2628,7 @@ class Group extends Error {
}
} else {
/* use SCM choice from registration page */
-
- foreach ($template->getPlugins() as
- $plugin_id => $plugin_name) {
+ foreach ($template->getPlugins() as $plugin_id
=> $plugin_name) {
if (substr($plugin_name, 3) == 'scm' &&
$plugin_name != 'scmhook') {
/* skip copying scm plugins */
@@ -2727,7 +2727,7 @@ class Group extends Error {
foreach ($admins as $admin) {
setup_gettext_for_user ($admin);
- $message=sprintf(_('Your project registration for %4$s
has been approved.
+ $message = sprintf(_('Your project registration for
%4$s has been approved.
Project Full Name: %1$s
Project Unix Name: %2$s
diff --git a/src/common/include/PluginManager.class.php
b/src/common/include/PluginManager.class.php
index bd2cce1..5b4d8e2 100644
--- a/src/common/include/PluginManager.class.php
+++ b/src/common/include/PluginManager.class.php
@@ -136,7 +136,7 @@ class PluginManager extends Error {
$res = db_query_params('DELETE FROM plugins WHERE plugin_name =
$1', array($pluginname));
$p_id = NULL;
-
+
if (!isset($this->plugins_data)) {
$this->plugins_data = array();
}
diff --git a/src/common/include/system/UNIX.class.php
b/src/common/include/system/UNIX.class.php
index 8f1b78b..90f8f14 100644
--- a/src/common/include/system/UNIX.class.php
+++ b/src/common/include/system/UNIX.class.php
@@ -86,16 +86,16 @@ class UNIX extends System {
}
/*
- * Group management functions
- */
+ * Group management functions
+ */
/**
- * sysCheckGroup() - Check for the existence of a group
- *
- * @param int $group_id The ID of the group to check
- * @return bool true on success/false on error
- *
- */
+ * sysCheckGroup() - Check for the existence of a group
+ *
+ * @param int $group_id The ID of the group to check
+ * @return bool true on success/false on error
+ *
+ */
function sysCheckGroup($group_id) {
$group = group_get_object($group_id);
if (!$group){
@@ -105,10 +105,10 @@ class UNIX extends System {
}
/**
- * sysCreateGroup() - Create a group
- *
- * @param int $group_id The ID of the group to create
- * @return bool true on success/false on error
+ * sysCreateGroup() - Create a group
+ *
+ * @param int $group_id The ID of the group to create
+ * @return bool true on success/false on error
*
*/
function sysCreateGroup($group_id) {
diff --git a/src/common/include/system/pgsql.class.php
b/src/common/include/system/pgsql.class.php
index 5e52938..fb5f2b7 100644
--- a/src/common/include/system/pgsql.class.php
+++ b/src/common/include/system/pgsql.class.php
@@ -25,52 +25,52 @@ require_once $gfcommon.'include/System.class.php';
class pgsql extends System {
/*
- * Constants
- */
+ * Constants
+ */
/**
- * Value to add to unix_uid to get unix uid
- *
- * @var constant $UID_ADD
- */
+ * Value to add to unix_uid to get unix uid
+ *
+ * @var constant $UID_ADD
+ */
var $UID_ADD = 20000;
/**
- * Value to add to group_id to get unix gid
- *
- * @var constant $GID_ADD
- */
+ * Value to add to group_id to get unix gid
+ *
+ * @var constant $GID_ADD
+ */
var $GID_ADD = 10000;
/**
- * Value to add to unix gid to get unix gid of 'xxx_scmro' group
- *
- * @var constant $GID_ADD_SCMRO
- */
+ * Value to add to unix gid to get unix gid of 'xxx_scmro' group
+ *
+ * @var constant $GID_ADD_SCMRO
+ */
var $GID_ADD_SCMRO = 100000;
/**
- * Value to add to unix gid to get unix gid of 'xxx_scmrw' group
- *
- * @var constant $GID_ADD_SCMRW
- */
+ * Value to add to unix gid to get unix gid of 'xxx_scmrw' group
+ *
+ * @var constant $GID_ADD_SCMRW
+ */
var $GID_ADD_SCMRW = 50000;
/**
- * pgsql() - CONSTRUCTOR
- *
- */
+ * pgsql() - CONSTRUCTOR
+ *
+ */
function pgsql() {
$this->System();
return true;
}
/**
- * sysUseUnixName() - Check if user/group used the unix_name
- *
- * @param string $unix_name The unix_name to check
- * @return boolean true if used/false is free
- */
+ * sysUseUnixName() - Check if user/group used the unix_name
+ *
+ * @param string $unix_name The unix_name to check
+ * @return boolean true if used/false is free
+ */
function sysUseUnixName($unix_name) {
$res1 = db_query_params('SELECT user_id FROM users
WHERE
user_name=$1',array($unix_name));
@@ -83,16 +83,16 @@ class pgsql extends System {
}
/*
- * User management functions
- */
+ * User management functions
+ */
/**
- * sysCheckUser() - Check for the existence of a user
- *
- * @param int $user_id The user ID of the user to check
- * @return bool true on success/false on error
- *
- */
+ * sysCheckUser() - Check for the existence of a user
+ *
+ * @param int $user_id The user ID of the user to check
+ * @return bool true on success/false on error
+ *
+ */
function sysCheckUser($user_id) {
$user = user_get_object($user_id);
if (!$user) {
@@ -102,12 +102,12 @@ class pgsql extends System {
}
/**
- * sysCreateUser() - Create a user
- *
- * @param int $user_id The user ID of the user to
create
- * @return bool success or not
- *
- */
+ * sysCreateUser() - Create a user
+ *
+ * @param int $user_id The user ID of the user to
create
+ * @return bool success or not
+ *
+ */
function sysCreateUser($user_id) {
$user = user_get_object($user_id);
if (!$user) {
@@ -150,34 +150,34 @@ class pgsql extends System {
}
/**
- * sysCheckCreateUser() - Check that a user has been created
- *
- * @param int $user_id The ID of the user to
check
- * @return bool true on success/false on error
- *
- */
+ * sysCheckCreateUser() - Check that a user has been created
+ *
+ * @param int $user_id The ID of the user to
check
+ * @return bool true on success/false on error
+ *
+ */
function sysCheckCreateUser($user_id) {
return $this->sysCreateUser($user_id);
}
/**
- * sysCheckCreateGroup() - Check that a group has been created
- *
- * @param int $group_id The ID of the group to check
- * @return bool true on success/false on error
- *
- */
+ * sysCheckCreateGroup() - Check that a group has been created
+ *
+ * @param int $group_id The ID of the group to check
+ * @return bool true on success/false on error
+ *
+ */
function sysCheckCreateGroup($group_id) {
return $this->sysCreateGroup($group_id);
}
/**
- * sysRemoveUser() - Remove a user
- *
- * @param int $user_id The user ID of the user to
remove
- * @return bool true on success/false on failure
- *
- */
+ * sysRemoveUser() - Remove a user
+ *
+ * @param int $user_id The user ID of the user to
remove
+ * @return bool true on success/false on failure
+ *
+ */
function sysRemoveUser($user_id) {
$res = db_query_params('UPDATE users SET unix_status=$1 WHERE
user_id=$2',
array ('D',
@@ -197,14 +197,14 @@ class pgsql extends System {
}
/**
- * sysUserSetAttribute() - Set an attribute for a user
- *
- * @param int $user_id The user ID
- * @param string $attr The attribute to set
- * @param string $value The new value of the attribute
- * @return bool true on success/false
on error
- *
- */
+ * sysUserSetAttribute() - Set an attribute for a user
+ *
+ * @param int $user_id The user ID
+ * @param string $attr The attribute to set
+ * @param string $value The new value of the attribute
+ * @return bool true on success/false
on error
+ *
+ */
function sysUserSetAttribute($user_id,$attr,$value) {
// trigger nscd cache invalidation and scm-passwd regen through
systasksd
$res = db_query_params('UPDATE nss_usergroups'
@@ -219,16 +219,16 @@ class pgsql extends System {
}
/*
- * Group management functions
- */
+ * Group management functions
+ */
/**
- * sysCheckGroup() - Check for the existence of a group
- *
- * @param int $group_id The ID of the group to
check
- * @return bool true on success/false
on error
- *
- */
+ * sysCheckGroup() - Check for the existence of a group
+ *
+ * @param int $group_id The ID of the group to
check
+ * @return bool true on success/false
on error
+ *
+ */
function sysCheckGroup($group_id) {
$group = group_get_object($group_id);
if (!$group){
@@ -245,12 +245,12 @@ class pgsql extends System {
}
/**
- * sysCreateGroup() - Create a group
- *
- * @param int $group_id The ID of the
group to create
- * @return bool true on success/false on error
- *
- */
+ * sysCreateGroup() - Create a group
+ *
+ * @param int $group_id The ID of the
group to create
+ * @return bool true on success/false on error
+ *
+ */
function sysCreateGroup($group_id) {
$group = group_get_object($group_id);
if (!$group) {
@@ -263,6 +263,7 @@ class pgsql extends System {
$this->setError('Error: Cannot Delete Group Member(s):
'.db_error());
return false;
}
+
$res3 = db_query_params ('DELETE FROM nss_groups WHERE
group_id=$1',
array ($group_id)) ;
if (!$res3) {
@@ -316,12 +317,12 @@ class pgsql extends System {
}
/**
- * sysRemoveGroup() - Remove a group
- *
- * @param int $group_id The ID of the
group to remove
- * @return bool true on success/false on error
- *
- */
+ * sysRemoveGroup() - Remove a group
+ *
+ * @param int $group_id The ID of the
group to remove
+ * @return bool true on success/false on error
+ *
+ */
function sysRemoveGroup($group_id) {
$res1 = db_query_params ('DELETE FROM nss_usergroups WHERE
group_id=$1',
array ($group_id)) ;
@@ -338,7 +339,7 @@ class pgsql extends System {
return true;
}
- /**
+ /**
* sysGroupAddUser() - Add a user to a group
*
* @param int $group_id The ID of the group two
which the user will be added
@@ -351,12 +352,12 @@ class pgsql extends System {
}
/**
- * sysGroupCheckUser() - Sync user's Unix permissions with their FF
permissions within a group
- *
- * @param int $group_id The ID of the group
- * @param int $user_id The ID of the user
- * @return bool true on success/false on error
- */
+ * sysGroupCheckUser() - Sync user's Unix permissions with their FF
permissions within a group
+ *
+ * @param int $group_id The ID of the group
+ * @param int $user_id The ID of the user
+ * @return bool true on success/false on error
+ */
function sysGroupCheckUser($group_id,$user_id) {
db_begin () ;
if (! $this->sysGroupRemoveUser($group_id,$user_id)) {
@@ -449,13 +450,13 @@ WHERE users.user_id=$2
}
/**
- * sysGroupRemoveUser() - Remove a user from a group
- *
- * @param int $group_id The ID of the group
from which to remove the user
- * @param int $user_id The ID of the user to
remove
- * @param bool $unused Compatibility issue but not
used : pgsql extends System...
- * @return bool true on success/false on error
- */
+ * sysGroupRemoveUser() - Remove a user from a group
+ *
+ * @param int $group_id The ID of the group
from which to remove the user
+ * @param int $user_id The ID of the user to
remove
+ * @param bool $unused Compatibility issue but not
used : pgsql extends System...
+ * @return bool true on success/false on error
+ */
function sysGroupRemoveUser($group_id, $user_id, $unused = false) {
$res = db_query_params ('DELETE FROM nss_usergroups WHERE
user_id=$1 AND group_id=$2',
array ($user_id,
diff --git a/src/www/env.inc.php b/src/www/env.inc.php
index fe2ca38..99c9ea8 100644
--- a/src/www/env.inc.php
+++ b/src/www/env.inc.php
@@ -1,5 +1,5 @@
<?php
-
-/* Compatibility file installed after move of real env.inc.php to
common/include */
+/* Compatibility file installed after move of real env.inc.php to
common/include
+ */
require_once (dirname(dirname( __FILE__ )).'/common/include/env.inc.php') ;
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/actions/monitorfile.php | 2 +-
src/common/forum/ForumAdmin.class.php | 4 +-
src/common/include/FusionForge.class.php | 4 +-
src/common/include/Group.class.php | 28 ++--
src/common/include/PluginManager.class.php | 2 +-
src/common/include/system/UNIX.class.php | 24 ++--
src/common/include/system/pgsql.class.php | 201 +++++++++++++++--------------
src/www/env.inc.php | 4 +-
8 files changed, 135 insertions(+), 134 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
