You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/02/22 17:13:44 UTC
[1/3] airavata-php-gateway git commit: hack to work with IS 5.0.0 in
capatcha verification
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop c193c1679 -> d2f6dd598
hack to work with IS 5.0.0 in capatcha verification
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/d6fecb33
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d6fecb33
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d6fecb33
Branch: refs/heads/develop
Commit: d6fecb33dc30422b75b69f9ac0fe999e52fa8961
Parents: e460b22
Author: scnakandala <su...@gmail.com>
Authored: Wed Feb 17 21:19:11 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Feb 17 21:19:11 2016 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d6fecb33/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index f05e360..f19702f 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -158,7 +158,7 @@ class AccountController extends BaseController
if(Session::get("admin") || Session::get("admin-read-only")){
return Redirect::to("admin/dashboard");
}else{
- return Redirect::to("account/dashboard");
+ return Redirect::to("home");
}
}
@@ -230,7 +230,7 @@ class AccountController extends BaseController
return View::make('home');
}
- return Redirect::to("account/dashboard");
+ return Redirect::to("admin/dashboard");
}
public function forgotPassword()
@@ -324,9 +324,15 @@ class AccountController extends BaseController
}
}else{
$capatcha = WSIS::getCapatcha()->return;
- return View::make("account/verify-human", array("username"=>$username,"code"=>$confirmation,
- "imagePath"=>$capatcha->imagePath, "secretKey"=>$capatcha->secretKey,
- "imageUrl"=> Config::get("pga_config.wsis")["service-url"] . $capatcha->imagePath));
+ //hack to work with wso2 IS 5.0.0
+ if (file_exists($capatcha->imagePath)){
+ return View::make("account/verify-human", array("username"=>$username,"code"=>$confirmation,
+ "imagePath"=>$capatcha->imagePath, "secretKey"=>$capatcha->secretKey,
+ "imageUrl"=> Config::get("pga_config.wsis")["service-url"] . $capatcha->imagePath));
+ }else{
+ WSIS::confirmUserRegistration("123", $capatcha->imagePath,
+ $capatcha->secretKey, $username, $confirmation, Config::get('pga_config.wsis')['tenant-domain']);
+ }
}
}catch (Exception $e){
var_dump($e);exit;
@@ -425,7 +431,4 @@ class AccountController extends BaseController
return Redirect::to('home');
}
- public function dashboard(){
- return View::make("account/dashboard");
- }
}
[3/3] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by sc...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
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/d2f6dd59
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d2f6dd59
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d2f6dd59
Branch: refs/heads/develop
Commit: d2f6dd5984d0dc2c1371a250ac0ced6165604bab
Parents: c193c16 6b936af
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Feb 19 11:48:01 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Feb 19 11:48:01 2016 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[2/3] airavata-php-gateway git commit: amending the last commit
Posted by sc...@apache.org.
amending the last commit
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/6b936af6
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6b936af6
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6b936af6
Branch: refs/heads/develop
Commit: 6b936af659b238eaa8d0067fbe8271c3ffd4ee29
Parents: d6fecb3
Author: scnakandala <su...@gmail.com>
Authored: Wed Feb 17 21:21:52 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Feb 17 21:21:52 2016 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6b936af6/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index f19702f..2b16190 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -332,6 +332,7 @@ class AccountController extends BaseController
}else{
WSIS::confirmUserRegistration("123", $capatcha->imagePath,
$capatcha->secretKey, $username, $confirmation, Config::get('pga_config.wsis')['tenant-domain']);
+ return Redirect::to("login");
}
}
}catch (Exception $e){