diff --git a/php/classes/AmdaAction.php b/php/classes/AmdaAction.php index 6f9ee0a..094f10f 100644 --- a/php/classes/AmdaAction.php +++ b/php/classes/AmdaAction.php @@ -870,12 +870,14 @@ class AmdaAction if (isset($obj->username) && isset($obj->password) && isset($obj->sessionID)) { - //$dd = new WSUserMgr(); + //$dd = new WSUserMgr(); //$dd->init($obj->username,$obj->password,$obj->sessionID); return array('success' => false, "message" => "AKKA-KERNEL-INT - WS support not implemented"); } - else + else { $dd = new UserMgr(); + $dd->setSpecialSettings(); + } //TODO error handling if (($res = $dd -> ddCheckUser()) != 0) @@ -887,14 +889,12 @@ class AmdaAction } if ($dd->user == 'impex') - { - //if ($dd->getWsSize() > DISK_QUOTA * 100) - // error_log('Natacha! It is time to CLEAN UP IMPEX WS!',1,'nbourrel@irap.omp.eu'); + { return array('success' => false, "message" => "AKKA-KERNEL-INT - WS support for IMPEx not implemented"); } else { - // check disk space + // check disk space if ($dd->getWsSize() > DISK_QUOTA) return array('success' => false, 'message' => 'Please clean up your workspace.
No more space is available'); } diff --git a/php/classes/UserMgr.php b/php/classes/UserMgr.php index 27a636f..deb70f5 100644 --- a/php/classes/UserMgr.php +++ b/php/classes/UserMgr.php @@ -195,7 +195,7 @@ class UserMgr // Attention !!! CONSTANT cannot be redefined define("$key",$value); } - } + } } /* * Totally replace IMPEX staff in user remote tree @@ -600,7 +600,12 @@ unlink(USERWSDIR.'RemoteParams.xml'); //TODO sessionID = user + WSname $sessionID = $this->user; - + + /* + * Special settings are defined in the generic_data/SpecialSettings/Settings.xml + */ + $this->setSpecialSettings(); + /* * Special groups are defined in the generic_data/SpecialSettings/Groups.xml */ -- libgit2 0.21.2