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, 6.1 has been updated
via 63a0e797634548de3cfdefa20ba8afa104151130 (commit)
from 5de342cfb503da07b93d0d21396b47fbb9c68742 (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=63a0e797634548de3cfdefa20ba8afa104151130
commit 63a0e797634548de3cfdefa20ba8afa104151130
Author: Franck Villaume <[email protected]>
Date: Mon Apr 2 10:39:36 2018 +0200
User: string & remove dead code
diff --git a/src/common/include/User.class.php
b/src/common/include/User.class.php
index 0d8cbd6..4e36c43 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -719,11 +719,11 @@ class FFUser extends FFError {
if ($status != 'P' && $status != 'A'
&& $status != 'S' && $status != 'D') {
- $this->setError(_('Error: Invalid status value'));
+ $this->setError(_('Error')._(': ')._('Invalid status
value'));
return false;
}
if ($this->getStatus() != 'P' && $status == 'P') {
- $this->setError(_('Error: You cannot set pending status
if user is suspend or active'));
+ $this->setError(_('Error')._(': ')._('You cannot set
pending status if user is suspend or active'));
return false;
}
@@ -732,7 +732,7 @@ class FFUser extends FFError {
array($status, $this->getID()));
if (!$res) {
- $this->setError(_('Error: Cannot Update User
Status:').' '.db_error());
+ $this->setError(_('Error')._(': ')._('Cannot Update
User Unix Status')._(': ').db_error());
db_rollback();
return false;
} else {
@@ -798,7 +798,7 @@ class FFUser extends FFError {
array($status, $this->getID()));
if (!$res) {
- $this->setError('Error: Cannot Update User Unix Status:
'.db_error());
+ $this->setError(_('Error')._(': ')._('Cannot Update
User Unix Status')._(': ').db_error());
db_rollback();
return false;
} else {
@@ -851,15 +851,6 @@ class FFUser extends FFError {
return $this->data_array['unix_box'];
}
- /**
- * getMD5Passwd - the password.
- *
- * @return string This user's MD5-crypted passwd.
- */
- function getMD5Passwd() {
- exit(_('MD5 obsoleted'));
- }
-
//Added to be compatible with codendi getUserPw function
function getUserPw() {
exit(_('MD5 obsoleted'));
-----------------------------------------------------------------------
Summary of changes:
src/common/include/User.class.php | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
