diff --git a/php/classes/AmdaAction.php b/php/classes/AmdaAction.php index cc0d8c5..747db51 100644 --- a/php/classes/AmdaAction.php +++ b/php/classes/AmdaAction.php @@ -471,7 +471,7 @@ class AmdaAction $childrenToReturn[] = array('text' => $name,'alias' => $alias, 'id' => $id,'nodeType' => $nodeType, 'info' => $info, 'help' => $help, 'globalStart' => $globalStart, 'globalStop' => $globalStop, 'leaf' => $isLeaf, 'disable' => $disable, 'isParameter' => $isParameter, - 'isScatter' => $isScatter, 'isSpectra' => $isSpectra, 'needsArgs' => $needsArgs, "component_info" => $component_info); + 'isScatter' => $isScatter, 'isSpectra' => $isSpectra, 'needsArgs' => $needsArgs, "component_info" => isset($component_info) ? $component_info : NULL); else $childrenToReturn[] = array('text' => $name,'alias' => $alias, 'id' => $id,'nodeType' => $nodeType, 'info' => $info, 'help' => $help, diff --git a/php/classes/AmdaObjectMgr.php b/php/classes/AmdaObjectMgr.php index 304dc94..2475e84 100644 --- a/php/classes/AmdaObjectMgr.php +++ b/php/classes/AmdaObjectMgr.php @@ -112,7 +112,7 @@ class AmdaObjectMgr } protected function createObjectResource(){} - protected function renameInResource(){} + protected function renameInResource($name, $id){} /* * Write Object into desc file diff --git a/php/classes/UserMgr.php b/php/classes/UserMgr.php index 041adbb..586fb09 100644 --- a/php/classes/UserMgr.php +++ b/php/classes/UserMgr.php @@ -137,7 +137,7 @@ class UserMgr { $info = $this->amdaClient->getUserInfo($this->user); - if ($info['group'] == '') + if (empty($info['group'])) return null; else return explode(',',$info['group']); @@ -452,7 +452,7 @@ unlink(USERWSDIR.'RemoteParams.xml'); $centerNode->setAttribute('name', $base->getAttribute('name')); $centerNode->setAttribute('desc', $base->getAttribute('desc')); - $centerNode->setAttribute('available',!$notAvailable); + $centerNode->setAttribute('available',isset($notAvailable) ? !$notAvailable : TRUE); $BASE->appendChild($centerNode); } $paramMgr->xmlDom->appendChild($BASE); -- libgit2 0.21.2