airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [1/2] airavata-php-gateway git commit: removing use of missing app_config.
Date Tue, 12 May 2015 18:36:01 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master c1174e1e7 -> 40c0ff686


removing use of missing app_config.


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/2af16974
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2af16974
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2af16974

Branch: refs/heads/master
Commit: 2af169749e2413e996691cfe06bae50a7b35b4ac
Parents: c1174e1
Author: Supun Nakandala <supun.nakandala@gmail.com>
Authored: Wed May 13 00:04:40 2015 +0530
Committer: Supun Nakandala <supun.nakandala@gmail.com>
Committed: Wed May 13 00:04:40 2015 +0530

----------------------------------------------------------------------
 app/libraries/Utilities.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2af16974/app/libraries/Utilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/Utilities.php b/app/libraries/Utilities.php
index 923e1d2..e3b91be 100644
--- a/app/libraries/Utilities.php
+++ b/app/libraries/Utilities.php
@@ -128,10 +128,7 @@ public static function id_matches_db($username, $password)
     //var_dump( $idStore->authenticate($username, $password)); exit;
     if($idStore->authenticate($username, $password))
     {
-        //checking if user is an Admin and saving in Session.
-       $app_config = Utilities::read_config();
-
-        if( in_array( $app_config["admin-role"], (array)$idStore->getRoleListOfUser( $username)))
+        if( in_array(Config::get('pga_config.wsis')['admin-role-name'], (array)$idStore->getRoleListOfUser(
$username)))
         {
             Session::put("admin", true);
         }


Mime
View raw message