CDPP / AMDA_IHM

Commit 05961422a7b47e79626830b986ffef6f3f8316c8

Authored by Elena.Budnik
1 parent 1798cae0
Exists in master and in 109 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, 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

permissions on dirs

Showing 3 changed files with 11 additions and 13 deletions   Show diff stats
Inline Side-by-side
php/RemoteDataCenter/RemoteDataCenterClass.php
  Diff comments   View file @0596142
... ... @@ -53,9 +53,7 @@ abstract class RemoteDataCenterClass
53 53 public function initProxy()
54 54 {
55 55 if (!is_dir(RemoteData.$this->baseID))
56   - mkdir(RemoteData.$this->baseID);
57   -
58   - chmod(RemoteData.$this->baseID,0775);
  56 + mkdir(RemoteData.$this->baseID, 0775, true);
59 57  
60 58 $this->getRemoteTree();
61 59 }
... ...
php/RemoteDataCenter/RemoteParamManager.php
  Diff comments   View file @0596142
... ... @@ -31,10 +31,10 @@ class RemoteParamManager
31 31 return array("err" => "No RemoteParams.xml");
32 32  
33 33 if (!is_dir(RemoteData."/PARAMS"))
34   - mkdir(RemoteData."/PARAMS", 0755, true);
  34 + mkdir(RemoteData."/PARAMS", 0775, true);
35 35  
36 36 if (!is_dir(RemoteData."/PARAMS_INFO"))
37   - mkdir(RemoteData."/PARAMS_INFO", 0755, true);
  37 + mkdir(RemoteData."/PARAMS_INFO", 0775, true);
38 38  
39 39 $this->xmlName = USERWSDIR."RemoteParams.xml";
40 40 $this->xmlDom = new DomDocument("1.0");
... ... @@ -148,6 +148,7 @@ class RemoteParamManager
148 148 $paramNode->appendChild($xml->createElement("output"));
149 149  
150 150 $res = $xml->save($xmlNameRemote);
  151 +
151 152 if ($res)
152 153 return copy($xmlNameRemote, $xmlNameTemp);
153 154  
... ... @@ -177,7 +178,6 @@ class RemoteParamManager
177 178  
178 179 // Node to be added
179 180 $nodeRemote = $this->center->baseDom->getElementById($id);
180   -
181 181 // No such node in base.xml
182 182 if (!$nodeRemote) return false;
183 183  
... ... @@ -185,12 +185,12 @@ class RemoteParamManager
185 185 {
186 186 $this->center->setViId($nodeRemote->getAttribute('name'));
187 187 $status = $this->center->addViToDD();
188   -
  188 +
189 189 if (!$status) return false;
190 190  
191 191 $remoteDatasetInfo = DDSERVICE."/BASE/INFO/bases/".$this->center->baseID."/".$this->center->infoFile;
192 192 $localDatasetInfo = RemoteData.$this->center->baseID."/".$this->center->infoFile;
193   -
  193 +
194 194 if (!copy($remoteDatasetInfo,$localDatasetInfo)) return false;
195 195 }
196 196  
... ... @@ -201,9 +201,9 @@ class RemoteParamManager
201 201 $this->center->setParamId($nodeRemote->getAttribute('name'));
202 202 $this->center->setViId($nodeRemote->parentNode->getAttribute('name'));
203 203 $this->center->setInfoFile();
204   -
  204 +
205 205 if (!$this->makeInternalParamXml()) return false;
206   -
  206 +
207 207 if (($size = $this->center->getParamSize()) > 1)
208 208 {
209 209 // make components and args
... ...
php/RemoteDataCenter/getRemoteDDBaseProxies.php
  Diff comments   View file @0596142
... ... @@ -16,7 +16,7 @@
16 16  
17 17 // only "DDBASE" Bases.xml
18 18 if (!file_exists(DATAPATH."/RemoteData/Bases.xml")) {
19   - if (!is_dir(DATAPATH."/RemoteData")) mkdir(DATAPATH."/RemoteData");
  19 + if (!is_dir(DATAPATH."/RemoteData")) mkdir(DATAPATH."/RemoteData", 0775, true);
20 20 echo 'No Bases.xml file : Will use Bases.xml from DDBase'.PHP_EOL;
21 21 $basesDom = new DomDocument("1.0");
22 22  
... ... @@ -29,7 +29,7 @@
29 29  
30 30 $baseDir = DATAPATH."/RemoteData/$baseId";
31 31 $baseDirRemote = DDSERVICE."/BASE/INFO/bases/$baseId";
32   - if (!is_dir($baseDir)) mkdir($baseDir);
  32 + if (!is_dir($baseDir)) mkdir($baseDir, 0775, true);
33 33 if (!copy("$baseDirRemote/base.xml", "$baseDir/base.xml"))
34 34 echo "Cannot copy base.xml for $baseId".PHP_EOL;
35 35 }
... ... @@ -51,7 +51,7 @@
51 51 if (!$basesDom->getElementById($baseId)) {
52 52 $baseDir = DATAPATH."/RemoteData/$baseId";
53 53 $baseDirRemote = DDSERVICE."/BASE/INFO/bases/$baseId";
54   - if (!is_dir($baseDir)) mkdir($baseDir);
  54 + if (!is_dir($baseDir)) mkdir($baseDir, 0775, true);
55 55 if (!copy("$baseDirRemote/base.xml", "$baseDir/base.xml")) {
56 56 echo "Cannot copy base.xml for $baseId".PHP_EOL;
57 57 }
... ...