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/03/01 20:18:28 UTC
[1/2] airavata-php-gateway git commit: fixing capatcha verification
issue
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 24df8b83c -> bcf167a5c
fixing capatcha verification issue
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/7aca00c8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7aca00c8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7aca00c8
Branch: refs/heads/develop
Commit: 7aca00c88ef1585c795971f0290eeef1c72325bd
Parents: d2f6dd5
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 1 14:18:16 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 1 14:18:16 2016 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7aca00c8/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 2b16190..7812f7a 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -325,7 +325,7 @@ class AccountController extends BaseController
}else{
$capatcha = WSIS::getCapatcha()->return;
//hack to work with wso2 IS 5.0.0
- if (file_exists($capatcha->imagePath)){
+ if (is_array(getimagesize(Config::get('pga_config.wsis')['service-url'] . $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));
@@ -343,6 +343,24 @@ class AccountController extends BaseController
}
}
+ private function checkRemoteFile($url)
+ {
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL,$url);
+ // don't download content
+ curl_setopt($ch, CURLOPT_NOBODY, 1);
+ curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ if(curl_exec($ch)!==FALSE)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
private function sendAccountCreationNotification2Admin($username){
$mail = new PHPMailer;
[2/2] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
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/bcf167a5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/bcf167a5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/bcf167a5
Branch: refs/heads/develop
Commit: bcf167a5cf3de3edfe40909ee2b8d7556f0a9d6a
Parents: 7aca00c 24df8b8
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 1 14:18:26 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 1 14:18:26 2016 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 8 +
app/controllers/AdminController.php | 4 +
app/controllers/ApplicationController.php | 12 +-
app/controllers/ComputeResourceController.php | 18 ++
.../Model/AppCatalog/AppDeployment/Types.php | 33 ---
.../Model/AppCatalog/ComputeResource/Types.php | 290 +++++++++++++------
.../Model/AppCatalog/GatewayProfile/Types.php | 23 ++
.../Model/AppCatalog/Parallelism/Types.php | 53 ++++
.../Airavata/Model/Experiment/Types.php | 67 +++--
app/libraries/AppUtilities.php | 6 +
app/libraries/CRUtilities.php | 14 +-
app/routes.php | 7 +
app/views/account/dashboard.blade.php | 10 +
app/views/account/request-allocation.blade.php | 70 +++++
app/views/admin/manage-gateway.blade.php | 2 +-
app/views/application/interface.blade.php | 55 +++-
.../compute-resource-preferences.blade.php | 13 +
.../partials/resource-job-manager.blade.php | 41 +++
app/views/resource/browse.blade.php | 2 +-
app/views/resource/edit.blade.php | 152 ++++------
app/views/storage-resource/browse.blade.php | 2 +-
public/css/bootstrap.min.css | 6 +-
public/js/interface.js | 10 +
public/js/script.js | 18 +-
24 files changed, 676 insertions(+), 240 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bcf167a5/app/controllers/AccountController.php
----------------------------------------------------------------------