fix php warnings

Nathanael Jourdane
1 parent a394ee09
Showing 2 changed files with 21 additions and 26 deletions Show diff stats
php/classes/UserMgr.php
php/classes/WebServer.php
@@ -77,7 +77,7 @@ class UserMgr
 			$this->user = $_GET['sessionID'];
 		else if (isset($sessionID))
 			$this->user = $sessionID;
-			$this->amdaClient = new AmdaClient();
+			$this->amdaClient = new AmdaClient(true);
 	}
  
 	//TODO if needed?? set session ID
@@ -197,9 +197,10 @@ class WebServer
  
     protected function initUserMgr()
     {
-        if (isset($this->wsUserMgr))
+        if (isset($this->wsUserMgr)) {
             return array('success' => true);
-        $this->wsUserMgr = new WSUserMgr();
+        }
+        $this->wsUserMgr = new WSUserMgr($this->userID, $this->userPWD, $this->sessionID);
         $this->wsUserMgr->init($this->userID, $this->userPWD, $this->sessionID, $this->isSoap);
  
         return array('success' => true);
@@ -351,7 +352,7 @@ class WebServer
             $dom->save($locParamResult);
         }
 //     if (!copy($remoteParamSrc,$remoteParamResult))
-// 	$remoteParamResult = '';  
+// 	$remoteParamResult = '';
         if (!copy($wsParamSrc, $wsParamResult))
             $wsParamResult = '';
  
@@ -533,7 +534,7 @@ class WebServer
             $dom->save($locParamResult);
         }
 //     if (!copy($remoteParamSrc,$remoteParamResult))
-// 	$remoteParamResult = '';  
+// 	$remoteParamResult = '';
         if (!copy($wsParamSrc, $wsParamResult))
             $wsParamResult = '';
  
@@ -596,33 +597,27 @@ class WebServer
         array_push($paramId, $vars["parameterID"]);
 //     $paramId[] = $vars["parameterID"];
  
-        if (!$vars["timeFormat"])
-            $timeFormat = "ISO8601";
-        else
-            $timeFormat = $vars["timeFormat"];
-
-        if (!$vars["gzip"])
-            $gzip = 0;
-        else
-            $gzip = $vars["gzip"];
-        /*
-            if (!$vars["stream"])
-              $stream = 0;
-            else
-              $stream = $vars["stream"];*/
+        $sampling = key_exists("sampling", $vars) ? $vars["sampling"] : false;
+        $gzip = key_exists("gzip", $vars) ? $vars["gzip"] : 0;
+        $outputFormat = key_exists("outputFormat", $vars) ? $vars["outputFormat"] : false;
+        $timeFormat = key_exists("timeFormat", $vars) ? $vars["timeFormat"] : "ISO8601";
+        $stream = key_exists("stream", $vars) ? $vars["stream"] : 0;
  
         $res = $this->doDownloadRequest(
-                array("startTime" => $vars["startTime"], "stopTime" => $vars["stopTime"], "sampling" => $vars["sampling"]),
+                array("startTime" => $vars["startTime"], "stopTime" => $vars["stopTime"], "sampling" => $sampling),
                 array("params" => $paramId),
                 array("userName" => $this->userID, "userPwd" => $this->userPWD, "sessionID" => $this->sessionID),
-                array("format" => $vars["outputFormat"], "timeFormat" => $timeFormat, "gzip" => $gzip, "stream" => $stream),
+                array("format" => $outputFormat, "timeFormat" => $timeFormat, "gzip" => $gzip, "stream" => $stream),
                 $dataFileName);
  
-
-        if ($res['success']) return $res;
-        else {
-            if ($this->isSoap) throw new SoapFault("request03", $res['message']);
-            else return array('success' => false, 'message' => $res['message']);
+        if ($res['success']) {
+            return $res;
+        } else {
+            if ($this->isSoap) {
+                throw new SoapFault("request03", $res['message']);
+            } else {
+                return array('success' => false, 'message' => $res['message']);
+            }
         }
     }