CDPP / AMDA_IHM

Commit cd3083596cfcd49b4773e7f359f3d9b99d68b9ee

Authored by Elena Budnik
2 parents ea60a0bc e3a52676
Exists in master and in 111 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, livraison-akka, 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

Merge branch 'webservices' into 'master' 

Webservices

1ere merge request :

*Create user dir if necessary when using webservices*

See merge request !5
Showing 1 changed file with 56 additions and 53 deletions   Show diff stats
Inline Side-by-side
php/classes/WSUserMgr.php
  Diff comments   View file @cd30835
... ... @@ -2,59 +2,62 @@
2 2 /**
3 3 * @class WSUserMgr
4 4 * @version $Id: WSUserMgr.php 2806 2015-03-02 15:31:05Z natacha $
5   - *
  5 + *
6 6 */
7 7  
8 8  
9   - class WSUserMgr extends UserMgr {
10   -
11   - protected $isSoap;
12   -
13   -/*****************************************************************
14   -* PUBLIC FUNCTIONS
15   -*****************************************************************/
16   -
17   - public function init($username,$password,$sessionID,$isSoap) {
18   -
19   - $this->user = trim($username);
20   - $this->sessionID = trim($sessionID);
21   - $this->passwd = trim($password);
22   - $this->userWS = USERPATH."/".$this->user."/WS/";
23   - $this->userdir = USERPATH."/".$this->user."/";
24   - $this->userMissions = $this->getAvailableMissionsByUser();
25   -
26   - chmod($this->userWS,0775);
27   - if (isset($isSoap))
28   - $this->isSoap = $isSoap;
29   - else $this->isSoap = false;
30   -
31   - $this->setPath();
32   -
33   -
34   - if ($this->ddCheckUser() != 0) {
35   - if ($this->ddLogin() != 0) { // DD Login if user is not registered
36   - if ($this->isSoap) throw new SoapFault("server00","Server Error: AMDA Login procedure failed");
37   - else return array("error" => "Server Error: AMDA Login procedure failed");
38   - }
39   -
40   - if ($this->ddCheckUser() != 0) {
41   - if ($this->isSoap) throw new SoapFault("server01","Server Error: Check User procedure failed");
42   - else return array("error" => "Server Error: CheckUser procedure failed");
43   - }
44   -
45   - }
46   - return array('success' => true);
47   -
48   - }
49   -
50   - public function makeUserWS(){
51   - $this->makeLocalTree();
52   - $this->makeRemoteTree();
53   -
54   - return $sessionID = $this->user;
55   -
56   - }
57   -
58   - }
59   -
60   -?>
  9 +class WSUserMgr extends UserMgr {
  10 +
  11 + protected $isSoap;
  12 +
  13 + /*****************************************************************
  14 + * PUBLIC FUNCTIONS
  15 + *****************************************************************/
  16 +
  17 + public function init($username, $password, $sessionID, $isSoap) {
  18 +
  19 + $this->user = trim($username);
  20 + $this->sessionID = trim($sessionID);
  21 + $this->passwd = trim($password);
  22 + $this->userWS = USERPATH . "/" . $this->user . "/WS/";
  23 + $this->userdir = USERPATH . "/" . $this->user . "/";
  24 + $this->userMissions = $this->getAvailableMissionsByUser();
  25 +
  26 + chmod($this->userWS, 0775);
  27 + if (isset($isSoap)) {
  28 + $this->isSoap = $isSoap;
  29 + } else $this->isSoap = false;
  30 +
  31 + $this->setPath();
  32 +
  33 + if ($this->ddCheckUser() != 0) {
  34 + if ($this->ddLogin() != 0) { // DD Login if user is not registered
  35 + if ($this->isSoap) throw new SoapFault("server00", "Server Error: AMDA Login procedure failed");
  36 + else return array("error" => "Server Error: AMDA Login procedure failed");
  37 + }
  38 +
  39 + if ($this->ddCheckUser() != 0) {
  40 + if ($this->isSoap) throw new SoapFault("server01", "Server Error: Check User procedure failed");
  41 + else return array("error" => "Server Error: CheckUser procedure failed");
  42 + }
  43 + }
  44 +
  45 + if (!is_dir($this->userdir)) {
  46 + if (!$this->createDir()) {
  47 + die("Login for " . $this->user . " failed: Can't create WS dirs");
  48 + }
  49 + $this->isFirst = true;
  50 + }
  51 +
  52 + return array('success' => true);
  53 + }
  54 +
  55 + public function makeUserWS() {
  56 + $this->makeLocalTree();
  57 + $this->makeRemoteTree();
  58 +
  59 + return $sessionID = $this->user;
  60 + }
  61 +}
  62 +
  63 +?>
61 64 \ No newline at end of file
... ...