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 ebf771d42c992a05c69b5d4a37213341c8c3be05 (commit)
from 258a6a5f7c316fbd40581e3ddf61e35c0ad449a6 (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=ebf771d42c992a05c69b5d4a37213341c8c3be05
commit ebf771d42c992a05c69b5d4a37213341c8c3be05
Author: Roland Mas <[email protected]>
Date: Thu Oct 6 11:32:20 2016 +0200
Fixed status check
diff --git a/src/www/account/change_email-complete.php
b/src/www/account/change_email-complete.php
index 898413e..cf8e957 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 == 'S') || ($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 428603e..4ae7d8c 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 == 'S') || ($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 2cea9f2..d813ce9 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 == 'S') || ($u->getStatus
== 'D')){
+ 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');
}
diff --git a/src/www/account/unsubscribe.php b/src/www/account/unsubscribe.php
index 60b5f5e..eec27b4 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 == 'S') || ($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 e70a99d..de662e6 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 == 'S') || ($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 | 2 +-
src/www/account/unsubscribe.php | 2 +-
src/www/account/verify.php | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
