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 175e1ac1b62f550036c44cdbc01c14e4c3569aa8 (commit)
via 96949f100f2c4e74afed3dca7099959e240a61a1 (commit)
via 16cd41173c3a32da57340c1a58aabba06f17597c (commit)
via 9804ffe6834d143a5c075382c289203266156b5c (commit)
from e7af9eca1667d9bad31038ae9f9a6b1d10a77fd0 (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=175e1ac1b62f550036c44cdbc01c14e4c3569aa8
commit 175e1ac1b62f550036c44cdbc01c14e4c3569aa8
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Wed May 19 20:31:08 2021 +0200
remove unneeded UserManager class
diff --git a/src/common/include/UserManager.class.php
b/src/common/include/UserManager.class.php
deleted file mode 100644
index 5fbcec9..0000000
--- a/src/common/include/UserManager.class.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
- *
- * This file is a 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 License, 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, see <http://www.gnu.org/licenses/>.
- */
-
-require_once $gfcommon.'include/User.class.php';
-
-class UserManager {
-
- protected function __construct() {
- }
-
- protected static $_instance;
- public static function instance() {
- if (!isset(self::$_instance)) {
- $c = __CLASS__;
- self::$_instance = new $c();
- }
- return self::$_instance;
- }
-
- /**
- * @param string $session_hash Optional parameter. If given,
this will force
- * the load of the user with the
given session_hash.
- * else it will check from the
user cookies & ip
- * @return object User the user currently logged in (who made the
request)
- */
- function getCurrentUser($session_hash = '') {
- if (!session_get_user()) {
- return new FFUser();
- }
- return session_get_user();
- }
-
- function getUserById($user_id) {
- return user_get_object($user_id);
- }
-
- function getUserByEmail($user_id) {
- return user_get_object_by_email($user_id);
- }
-
- function existEmail ($email) {
- if (!validate_email($email)) {
- return false;
- }
- $res = db_query_params('SELECT * FROM users WHERE email=$1',
array($email));
- if (!$res || db_numrows($res)<1) {
- return false;
- }
- else {
- return $email;
- }
- }
-}
diff --git a/src/common/include/preplugins.php
b/src/common/include/preplugins.php
index 7178860..7948c3d 100644
--- a/src/common/include/preplugins.php
+++ b/src/common/include/preplugins.php
@@ -24,6 +24,3 @@ require_once $gfcommon.'include/HTTPRequest.class.php';
require_once $gfcommon.'include/Codendi_HTMLPurifier.class.php';
//Codendi class for Validator
require_once $gfcommon.'valid/ValidFactory.class.php';
-
-//Manager from Codendi
-require_once $gfcommon.'include/UserManager.class.php';
diff --git a/src/plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php
b/src/plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php
index e67775f..7f6ee13 100644
--- a/src/plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php
+++ b/src/plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php
@@ -20,7 +20,6 @@
*/
require_once 'HudsonOverviewWidget.class.php';
-//require_once('common/user/UserManager.class.php');
require_once 'common/include/HTTPRequest.class.php';
require_once 'PluginHudsonJobDao.class.php';
require_once 'HudsonJob.class.php';
diff --git a/src/www/admin/grouplist.php b/src/www/admin/grouplist.php
index 1946ee3..5891bb1 100644
--- a/src/www/admin/grouplist.php
+++ b/src/www/admin/grouplist.php
@@ -23,7 +23,6 @@
require_once '../env.inc.php';
require_once $gfcommon.'include/pre.php';
-require_once $gfcommon.'include/UserManager.class.php';
require_once $gfwww.'admin/admin_utils.php';
global $LUSER;
diff --git a/src/www/admin/userlist.php b/src/www/admin/userlist.php
index ce14dce..26debf9 100644
--- a/src/www/admin/userlist.php
+++ b/src/www/admin/userlist.php
@@ -24,7 +24,6 @@
require_once '../env.inc.php';
require_once $gfcommon.'include/pre.php';
-require_once $gfcommon.'include/UserManager.class.php';
require_once $gfwww.'admin/admin_utils.php';
global $HTML;
diff --git a/src/www/pm/browse_task.php b/src/www/pm/browse_task.php
index 05ecda7..fd52bbb 100644
--- a/src/www/pm/browse_task.php
+++ b/src/www/pm/browse_task.php
@@ -27,7 +27,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once $gfcommon.'include/UserManager.class.php';
require_once $gfcommon.'pm/ProjectTaskFactory.class.php';
//build page title to make bookmarking easier
//if a user was selected, add the user_name to the title
@@ -376,8 +375,3 @@ if ($rows < 1) {
}
pm_footer();
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=96949f100f2c4e74afed3dca7099959e240a61a1
commit 96949f100f2c4e74afed3dca7099959e240a61a1
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Wed May 19 20:19:00 2021 +0200
use user_get_object_by_email when needed
diff --git a/src/plugins/forumml/www/forumml_utils.php
b/src/plugins/forumml/www/forumml_utils.php
index 604473b..d836985 100644
--- a/src/plugins/forumml/www/forumml_utils.php
+++ b/src/plugins/forumml/www/forumml_utils.php
@@ -664,10 +664,9 @@ function plugin_forumml_process_mail($plug,$reply=false) {
}
// Checks sanity of CC List
$err = '';
- $valid=true;
- foreach ($cc_array as $key => $cc) {
- $umanager = UserManager::instance();
- $user = $umanager->existEmail($cc);
+ $valid = true;
+ foreach ($cc_array as $cc) {
+ $user = user_get_object_by_email($cc);
if (!$user) {
$valid = false;
$err .= $cc.'<br>';
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=16cd41173c3a32da57340c1a58aabba06f17597c
commit 16cd41173c3a32da57340c1a58aabba06f17597c
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Wed May 19 20:13:39 2021 +0200
use user_get_object_by_email when needed
diff --git a/src/common/mail/Mail.class.php b/src/common/mail/Mail.class.php
index 40400b9..45210eb 100644
--- a/src/common/mail/Mail.class.php
+++ b/src/common/mail/Mail.class.php
@@ -57,7 +57,6 @@ class Mail {
return $this->_headerCharset;
}
-
function setBodyCharset($charset) {
$this->_bodyCharset = $charset;
}
@@ -138,7 +137,7 @@ class Mail {
foreach($recipArray as $email) {
$email = trim($email);
if(!empty($email)) {
- $user =
UserManager::instance()->getUserByEmail($email);
+ $user = user_get_object_by_email($email);
if ($user) {
$allowed_status = array('A', 'R', 'P',
'V', 'W');
$one_with_status_allowed_found = false;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9804ffe6834d143a5c075382c289203266156b5c
commit 9804ffe6834d143a5c075382c289203266156b5c
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Wed May 19 20:08:49 2021 +0200
use user_get_object when needed
diff --git a/src/common/tracker/ArtifactType.class.php
b/src/common/tracker/ArtifactType.class.php
index 9a306c4..f1cb730 100644
--- a/src/common/tracker/ArtifactType.class.php
+++ b/src/common/tracker/ArtifactType.class.php
@@ -976,11 +976,11 @@ class ArtifactType extends FFError {
$type = $oef->getType();
if (in_array($type,
unserialize(ARTIFACT_EXTRAFIELDTYPEGROUP_VALUE)) || $type ==
ARTIFACT_EXTRAFIELDTYPE_USER) {
$default = $oef->getDefaultValues();
- if ($type==ARTIFACT_EXTRAFIELDTYPE_INTEGER &&
$default != 0) {
+ if ($type == ARTIFACT_EXTRAFIELDTYPE_INTEGER &&
$default != 0) {
$nef->setDefaultValues($default);
- } elseif ($type==ARTIFACT_EXTRAFIELDTYPE_USER
&& $default != 100) {
+ } elseif ($type == ARTIFACT_EXTRAFIELDTYPE_USER
&& $default != 100) {
$roleEls =
$this->getExtraFieldElements($newEFId);
- $defaultUser =
UserManager::instance()->getUserById($default);
+ $defaultUser =
user_get_object($default);
foreach ($roleEls as $roleEl) {
$role =
RBACEngine::getInstance()->getRoleById($roleEl['element_name']);
if (
$role->hasUser($defaultUser)) {
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index 690f4d7..dd45a0a 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -32,7 +32,6 @@ require_once
$gfcommon.'tracker/ArtifactExtraFieldElement.class.php';
require_once $gfcommon.'tracker/ArtifactWorkflow.class.php';
require_once $gfcommon.'tracker/EffortUnitFactory.class.php';
require_once $gfcommon.'include/utils_crossref.php';
-require_once $gfcommon.'include/UserManager.class.php';
require_once $gfcommon.'widget/WidgetLayoutManager.class.php';
class ArtifactTypeHtml extends ArtifactType {
@@ -727,7 +726,7 @@ class ArtifactTypeHtml extends ArtifactType {
}
}
if ($aef->isAutoAssign()) {
- $autoAssignTo =
UserManager::instance()->getUserById($aefe->getAutoAssignto());
+ $autoAssignTo =
user_get_object($aefe->getAutoAssignto());
$opt_attrs[$i]=array_merge(isset($opt_attrs[$i]) ? $opt_attrs[$i] : array(),
array('data-autoassignto'=>'{"id":'.$aefe->getAutoAssignto().',
"name":"'.$autoAssignTo->getRealName().'
('.$autoAssignTo->getUnixName().')"}'));
}
}
@@ -966,8 +965,7 @@ class ArtifactTypeHtml extends ArtifactType {
$dependency = '';
if (!empty($aefChildren)) {
$cElmntArr = $aefe->getChildrenElements();
- if (!empty($cElmntArr))
- {
+ if (!empty($cElmntArr)) {
foreach ($cElmntArr as $key=>$cElmnt) {
$childField = new
ArtifactExtraField($this, $key);
$dependency .=
(empty($dependency) ? '':', ').'{"field":'.$key.', "elmnt": ['.implode(', ',
$cElmnt).']}';
@@ -977,7 +975,7 @@ class ArtifactTypeHtml extends ArtifactType {
}
}
if ($aef->isAutoAssign()) {
- $autoAssignTo =
UserManager::instance()->getUserById($aefe->getAutoAssignto());
+ $autoAssignTo =
user_get_object($aefe->getAutoAssignto());
$radios_attrs[$i]=array_merge(isset($radios_attrs[$i]) ? $radios_attrs[$i] :
array(), array('data-autoassignto'=>'{"id":'.$aefe->getAutoAssignto().',
"name":"'.$autoAssignTo->getRealName().'
('.$autoAssignTo->getUnixName().')"}'));
}
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/UserManager.class.php | 70 ----------------------
src/common/include/preplugins.php | 3 -
src/common/mail/Mail.class.php | 3 +-
src/common/tracker/ArtifactType.class.php | 6 +-
.../tracker/include/ArtifactTypeHtml.class.php | 8 +--
src/plugins/forumml/www/forumml_utils.php | 7 +--
.../hudson_Widget_MyMonitoredJobs.class.php | 1 -
src/www/admin/grouplist.php | 1 -
src/www/admin/userlist.php | 1 -
src/www/pm/browse_task.php | 6 --
10 files changed, 10 insertions(+), 96 deletions(-)
delete mode 100644 src/common/include/UserManager.class.php
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
