Fix some errors detected from apache log file

Benjamin Renard
1 parent 59f99ad2
Showing 3 changed files with 13 additions and 14 deletions Show diff stats
php/classes/AmdaObjectMgr.php
php/classes/BaseManager.php
php/classes/FilesMgr.php
@@ -124,8 +124,8 @@ class AmdaObjectMgr
  
 	      foreach($obj as $key => $value) 
 	      {
-				if ($key != 'id' && $key != 'leaf' && $key != 'nodeType') 
-				{	
+				if ($key != 'id' && $key != 'leaf' && $key != 'nodeType' && !is_array($value)) 
+				{
 					$node =  $this->objectDom->createElement($key,htmlspecialchars($value)); 
 					$root -> appendChild($node);
 				}
@@ -15,7 +15,8 @@ class BaseManager
  
 	function __construct() 
 	{  
-		define("DELTA", 120);   // minumum file size in secs 
+		if (!defined("DELTA"))
+			define("DELTA", 120);   // minumum file size in secs 
  
 		if (getenv('USER_DATA_PATH') != "")
 				$this->baseDomName = getenv('USER_DATA_PATH')."base.xml";
@@ -154,8 +155,6 @@ class BaseManager
 */
 	public function delFile($fileObj) 
 	{                            
-		$start = $fileObj->getAttribute($start);
-		$stop = $fileObj->getAttribute($stop);
 		$vi =  $fileObj->parentNode;                                                                                   
 		$vi->removeChild($fileObj);
 		$mask = $vi->getElementsByTagName("mask")->item(0)->nodeValue;
@@ -272,7 +272,7 @@ class FilesMgr extends AmdaObjectMgr
 				}
 		}
  
-		if (feof($handle)) return -10;
+		if (feof($handler)) return -10;
  
 		$oneLine = trim(fgets($handler));      
 		$elems = explode(" ",$oneLine);
@@ -353,7 +353,7 @@ class FilesMgr extends AmdaObjectMgr
 		$handler = fopen($this->fileName, 'r');
 		if ($handler) 
 		{  
-			$offset = ftell($handle);
+			$offset = ftell($handler);
 			$i = 0;
 			while (!$StartTime && !feof($handler)) 
 			{
@@ -361,7 +361,7 @@ class FilesMgr extends AmdaObjectMgr
 				$elems = explode(" ", preg_replace('/\s+/', ' ', $oneLine));
 				if (!($time = strtotime($elems[0]))) 
 				{
-						$offset = ftell($handle);
+						$offset = ftell($handler);
 						$i++;
 						continue;
 				}            
@@ -668,7 +668,7 @@ class FilesMgr extends AmdaObjectMgr
 			$newFile->setAttribute('mask', $this->fileId);
  
 		$newFile->nodeValue = date('Y-m-d',$start)."T".date('H:i:s',$start)."-".date('Y-m-d',$stop)."T".date('H:i:s',$stop);
-		if ($desc != '')
+		if (!empty($desc))
 			$newFile->nodeValue .= (PHP_EOL.$desc);
  
 		return $newFile;   
@@ -915,7 +915,7 @@ class FilesMgr extends AmdaObjectMgr
 			// WS/Files.xml
 			if ($theFile) 
 			{
-				if ($desc) 
+				if (isset($desc)) 
 						$theFile->parentNode->setAttribute('info', $desc);
 				$theFile->parentNode->removeChild($theFile);               
 				$this->contentDom->save($this->xmlName); 
@@ -948,17 +948,17 @@ class FilesMgr extends AmdaObjectMgr
 			}
 		}
 		// No more files for myDataParams	
-		if ($paramsToDelete) 
+		if (isset($paramsToDelete)) 
 				return array('id' => $obj->id, 'params' => $paramsToDelete);
  
 		// update info for myDataParams Start Stop were changed
-		return  array('id' => $obj->id, 'mask' => $mask, 'maskDesc' => $desc);
+		return  array('id' => $obj->id, 'mask' => isset($mask) ? $mask : NULL, 'maskDesc' => isset($desc) ? $desc : NULL);
 	}
  
 /*
 *      recombine files in Files.xml according to new Mask
 */
-	public function addMask($fileMask, $type) 
+	public function addMask($fileMask) 
 	{ 
 		if ($this->contentDom ->getElementById($fileMask) != null) return false; 
 		$filesInRoot = $this->xp->query("/ws/fileList/file");                                   
@@ -1190,7 +1190,7 @@ class FilesMgr extends AmdaObjectMgr
  
 		//create new file tag with all attributes and add it to the content DOM   
 		$newFile = $this->createFile($format);
-		if ($newFile < 0) 
+		if (is_int($newFile) && ($newFile < 0)) 
 		{ 
 			unlink($this->fileName);
 			return array( 'success' => false, 'file' => $fileName);