CDPP / AMDA_IHM

Commit a21497ccca9a9ccd0067f9c9b91b3c585ac9a169

Authored by Elena.Budnik
1 parent 7baca0ef
Exists in master and in 110 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

redmine #5645

Showing 2 changed files with 13 additions and 8 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @a21497c
... ... @@ -870,12 +870,14 @@ class AmdaAction
870 870  
871 871 if (isset($obj->username) && isset($obj->password) && isset($obj->sessionID))
872 872 {
873   - //$dd = new WSUserMgr();
  873 + //$dd = new WSUserMgr();
874 874 //$dd->init($obj->username,$obj->password,$obj->sessionID);
875 875 return array('success' => false, "message" => "AKKA-KERNEL-INT - WS support not implemented");
876 876 }
877   - else
  877 + else {
878 878 $dd = new UserMgr();
  879 + $dd->setSpecialSettings();
  880 + }
879 881  
880 882 //TODO error handling
881 883 if (($res = $dd -> ddCheckUser()) != 0)
... ... @@ -887,14 +889,12 @@ class AmdaAction
887 889 }
888 890  
889 891 if ($dd->user == 'impex')
890   - {
891   - //if ($dd->getWsSize() > DISK_QUOTA * 100)
892   - // error_log('Natacha! It is time to CLEAN UP IMPEX WS!',1,'nbourrel@irap.omp.eu');
  892 + {
893 893 return array('success' => false, "message" => "AKKA-KERNEL-INT - WS support for IMPEx not implemented");
894 894 }
895 895 else
896 896 {
897   - // check disk space
  897 + // check disk space
898 898 if ($dd->getWsSize() > DISK_QUOTA)
899 899 return array('success' => false, 'message' => 'Please clean up your workspace.<br/>No more space is available');
900 900 }
... ...
php/classes/UserMgr.php
  Diff comments   View file @a21497c
... ... @@ -195,7 +195,7 @@ class UserMgr
195 195 // Attention !!! CONSTANT cannot be redefined
196 196 define("$key",$value);
197 197 }
198   - }
  198 + }
199 199 }
200 200 /*
201 201 * Totally replace IMPEX staff in user remote tree
... ... @@ -600,7 +600,12 @@ unlink(USERWSDIR.&#39;RemoteParams.xml&#39;);
600 600  
601 601 //TODO sessionID = user + WSname
602 602 $sessionID = $this->user;
603   -
  603 +
  604 + /*
  605 + * Special settings are defined in the generic_data/SpecialSettings/Settings.xml
  606 + */
  607 + $this->setSpecialSettings();
  608 +
604 609 /*
605 610 * Special groups are defined in the generic_data/SpecialSettings/Groups.xml
606 611 */
... ...