Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DB557200BCE for ; Fri, 2 Dec 2016 16:54:58 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DA3AB160B24; Fri, 2 Dec 2016 15:54:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2D082160B08 for ; Fri, 2 Dec 2016 16:54:58 +0100 (CET) Received: (qmail 85642 invoked by uid 500); 2 Dec 2016 15:54:57 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 85629 invoked by uid 99); 2 Dec 2016 15:54:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2016 15:54:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 16C26E055E; Fri, 2 Dec 2016 15:54:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: airavata-php-gateway git commit: fixing AIRAVATA-2187 : WSO2 IS account confirmation link is only valid once! Cannot use the link afterwards. Date: Fri, 2 Dec 2016 15:54:57 +0000 (UTC) archived-at: Fri, 02 Dec 2016 15:54:59 -0000 Repository: airavata-php-gateway Updated Branches: refs/heads/develop a0391c9a4 -> b3ee6171c fixing AIRAVATA-2187 : WSO2 IS account confirmation link is only valid once! Cannot use the link afterwards. Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/b3ee6171 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b3ee6171 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b3ee6171 Branch: refs/heads/develop Commit: b3ee6171c625d1333ef64ce9e2b2ecf099859b8f Parents: a0391c9 Author: scnakandala Authored: Fri Dec 2 10:54:52 2016 -0500 Committer: scnakandala Committed: Fri Dec 2 10:54:52 2016 -0500 ---------------------------------------------------------------------- app/controllers/AccountController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b3ee6171/app/controllers/AccountController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 6cd9c38..b14745a 100644 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -349,7 +349,7 @@ class AccountController extends BaseController // "imagePath"=>$capatcha->imagePath, "secretKey"=>$capatcha->secretKey, // "imageUrl"=> Config::get("pga_config.wsis")["service-url"] . $capatcha->imagePath)); }else{ - CommonUtilities::print_error_message("Account confirmation failed!"); + CommonUtilities::print_error_message("Account confirmation failed! Please contact the Gateway Admin"); return View::make("home"); } // }else{ @@ -359,7 +359,7 @@ class AccountController extends BaseController // "imageUrl"=> Config::get("pga_config.wsis")["service-url"] . $capatcha->imagePath)); // } }catch (Exception $e){ - CommonUtilities::print_error_message("Account confirmation failed!"); + CommonUtilities::print_error_message("Account confirmation failed! Please contact the Gateway Admin"); return View::make("home"); } }