[Fusionforge-commits] FusionForge branch master updated. 6.0.4-987-g258a6a5

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Oct 6 11:24:47 CEST 2016


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  258a6a5f7c316fbd40581e3ddf61e35c0ad449a6 (commit)
      from  e92ae4579fd80d21873e9dd82aa4cb0f305ac68d (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=258a6a5f7c316fbd40581e3ddf61e35c0ad449a6

commit 258a6a5f7c316fbd40581e3ddf61e35c0ad449a6
Author: Roland Mas <lolando at debian.org>
Date:   Thu Oct 6 11:22:29 2016 +0200

    Fixed status check

diff --git a/src/www/account/change_email-complete.php b/src/www/account/change_email-complete.php
index 17906c5..898413e 100644
--- a/src/www/account/change_email-complete.php
+++ b/src/www/account/change_email-complete.php
@@ -52,7 +52,7 @@ if (!$u || !is_object($u)) {
 	exit_error(_('Could Not Get User'),'home');
 } elseif ($u->isError()) {
 	exit_error($u->getErrorMessage(),'my');
-} elseif (($u->getStatus == 'D') || ($u->getStatus == 'D')) {
+} elseif (($u->getStatus == 'S') || ($u->getStatus == 'D')) {
 	exit_error(_('Account is suspended or deleted','my'));
 }
 
diff --git a/src/www/account/lostlogin.php b/src/www/account/lostlogin.php
index e4129bc..428603e 100644
--- a/src/www/account/lostlogin.php
+++ b/src/www/account/lostlogin.php
@@ -55,7 +55,7 @@ if (!$u || !is_object($u)) {
 	exit_error(_('Could Not Get User'),'home');
 } elseif ($u->isError()) {
 	exit_error($u->getErrorMessage(),'my');
-} elseif (($u->getStatus == 'D') || ($u->getStatus == 'D')) {
+} elseif (($u->getStatus == 'S') || ($u->getStatus == 'D')) {
 	exit_error(_('Account is suspended or deleted','my'));
 }
 
diff --git a/src/www/account/lostpw.php b/src/www/account/lostpw.php
index 67bcd01..2cea9f2 100644
--- a/src/www/account/lostpw.php
+++ b/src/www/account/lostpw.php
@@ -40,7 +40,7 @@ if (getStringFromRequest('submit')) {
 
 	$u = user_get_object_by_name($loginname);
 
-	if (!$u || !is_object($u) || ($u->getStatus == 'D') || ($u->getStatus == 'S')){
+	if (!$u || !is_object($u) || ($u->getStatus == 'S') || ($u->getStatus == 'D')){
 		form_release_key(getStringFromRequest('form_key'));
 		exit_error(_('That user does not exist.'),'my');
 	}
@@ -53,8 +53,6 @@ if (getStringFromRequest('submit')) {
 	if ($u->isError()) {
 		form_release_key(getStringFromRequest('form_key'));
 		exit_error($u->getErrorMessage(),'my');
-	} elseif (($u->getStatus == 'D') || ($u->getStatus == 'D')) {
-		exit_error(_('Account is suspended or deleted','my'));
 	} else {
 
 		$message = sprintf(_('Someone (presumably you) on the %s site requested a password change through email verification.'),
diff --git a/src/www/account/unsubscribe.php b/src/www/account/unsubscribe.php
index 55c39b1..60b5f5e 100644
--- a/src/www/account/unsubscribe.php
+++ b/src/www/account/unsubscribe.php
@@ -54,7 +54,7 @@ if (!$user || !is_object($user)) {
     exit_error(_('Could Not Get User'),'home');
 } elseif ($user->isError()) {
     exit_error($user->getErrorMessage(),'my');
-} elseif (($u->getStatus == 'D') || ($u->getStatus == 'D')) {
+} elseif (($u->getStatus == 'S') || ($u->getStatus == 'D')) {
 	exit_error(_('Account is suspended or deleted','my'));
 }
 
diff --git a/src/www/account/verify.php b/src/www/account/verify.php
index 8287bef..e70a99d 100644
--- a/src/www/account/verify.php
+++ b/src/www/account/verify.php
@@ -52,7 +52,7 @@ if (getStringFromRequest('submit')) {
 		$error_msg = $u->getErrorMessage();
 	} elseif ($u->getStatus()=='A'){
 		$error_msg = _('Account already active.');
-	} elseif (($u->getStatus == 'D') || ($u->getStatus == 'D')) {
+	} elseif (($u->getStatus == 'S') || ($u->getStatus == 'D')) {
 		$error_msg = _('Account is suspended or deleted','my');
 	} elseif ($confirm_hash != $u->getConfirmHash()) {
 		$error_msg = _('Cannot confirm account identity - invalid confirmation hash (or login name)');

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

Summary of changes:
 src/www/account/change_email-complete.php | 2 +-
 src/www/account/lostlogin.php             | 2 +-
 src/www/account/lostpw.php                | 4 +---
 src/www/account/unsubscribe.php           | 2 +-
 src/www/account/verify.php                | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list