CDPP / AMDA_IHM

Commit d675a6e8216a36668f9acaeacee7ba94151f6b73

Authored by Hacene SI HADJ MOHAND
1 parent f85f44e4
Exists in master and in 106 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, 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-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, special-params, sum-components-indexes, test-merge, ws_get_catalog

Fix UserMgr

Showing 1 changed file with 14 additions and 14 deletions   Show diff stats
Inline Side-by-side
php/classes/UserMgr.php
  Diff comments   View file @d675a6e
... ... @@ -276,9 +276,9 @@ class UserMgr
276 276 else {
277 277 // totally rewrite
278 278 if ($base->hasAttribute('isSimulation')) {
279   - /*$centerNode = $this->makeSimulationBase($baseId);
  279 + $centerNode = $this->makeSimulationBase($baseId);
280 280 $center = new $baseId();
281   - $centerNode->setAttribute('available', $center->monitor());*/
  281 + $centerNode->setAttribute('available', $center->monitor());
282 282 }
283 283 else {
284 284 $center = new $baseId();
... ... @@ -334,18 +334,19 @@ class UserMgr
334 334  
335 335 $this->paramMgr->xmlDom->formatOutput = true;
336 336 $this->paramMgr->xmlDom->preserveWhiteSpace = false;
337   -
  337 +
338 338 $BASE = $this->paramMgr->xmlDom->createElement('dataRoot');
339 339 $BASE->setAttribute('xml:id','myRemoteData-treeRootNode');
340 340  
341 341 foreach ($this->paramMgr->Bases as $baseId)
342 342 {
343 343 $centerNode = $this->makeNewBase($baseId);
344   - $BASE->appendChild($centerNode);
  344 + if (isset($centerNode))
  345 + $BASE->appendChild($centerNode);
345 346 }
346   -
  347 +
347 348 $this->paramMgr->xmlDom->appendChild($BASE);
348   -
  349 +
349 350 return $this->paramMgr->xmlDom->save($this->paramMgr->xmlName);
350 351 }
351 352 }
... ... @@ -353,11 +354,11 @@ class UserMgr
353 354 protected function makeNewBase($baseId)
354 355 {
355 356 // no data base description ; skip this data base
356   - if (!@file_exists(RemoteData.$baseId.'/base.xml')) return;
  357 + if (!@file_exists(RemoteData.$baseId.'/base.xml')) return NULL;
357 358  
358 359 // can't read base.xml ; skip this data base
359   - if (!@$this->baseExtXml->load(RemoteData.$baseId.'/base.xml')) return;
360   -
  360 + if (!@$this->baseExtXml->load(RemoteData.$baseId.'/base.xml')) return NULL;
  361 +
361 362 $base = $this->paramMgr->basesDom->getElementById($baseId);
362 363  
363 364 if ($base->hasAttribute('default'))
... ... @@ -527,7 +528,7 @@ class UserMgr
527 528  
528 529  
529 530 public function init()
530   - {
  531 + {
531 532 if ($this->ddLogin() != 0)
532 533 die('<h2>You are trying to log in as '.$this->user.'<br/> Please check that you entered a valid password</h2>');
533 534  
... ... @@ -573,12 +574,11 @@ class UserMgr
573 574 $this->setPath();
574 575  
575 576 $this->userGrps = $this->getUserGrps();
576   -
  577 +
577 578 if (!$this->makeLocalTree())
578 579 die("Login for ".$this->user." failed: Can't make LocalParams.xml");;
579   - //$ok = $this->makeRemoteTree();
580   -
581   -//die("BRE");
  580 +
  581 + $ok = $this->makeRemoteTree();
582 582  
583 583 if (!file_exists(USERWSDIR.'Request.xml')) $reqMgr = new RequestMgr();
584 584 if (!file_exists(USERWSDIR.'Tt.xml')) $ttMgr = new TimeTableMgr();
... ...