Merge branch 'fix-import' into 'master'

Fix import See merge request !19

Merge branch 'fix-import' into 'master'
Fix import See merge request !19
Elena Budnik
2 parents e1e55d6e 42356ea1
Showing 4 changed files with 772 additions and 633 deletions Show diff stats
js/.eslintrc.yml
php/classes/AmdaAction.php
php/classes/FilesMgr.php
php/classes/TimeTableMgr.php
@@ -7,18 +7,17 @@ plugins:
   - extjs
 rules:
   indent: [error, 2, SwitchCase: 1]
-  semi: [warn, never]
+  semi: [error, always]
   max-len: [error, code: 120]
-  max-lines: [error, 600]
+  max-lines: [warn, 600]
   linebreak-style: [error, unix]
   quotes: [error, single]
   strict: [error, global]
   quote-props: [error, as-needed]
   max-statements: [warn, 20]
-  array-bracket-newline: [warn, consistent]
   consistent-this: [error, me]
   padded-blocks: off
-  no-tabs: off
+  newline-per-chained-call: [error, ignoreChainWithDepth: 3]
   no-warning-comments: off
   func-names: off
   function-paren-newline: off
@@ -594,6 +594,9 @@ class AmdaAction
 	*/
 	public  function getUploadedObject($name, $format, $nodeType)
 	{
+		$fileContent = preg_replace(['~\R~u', "/\t/"], ["\n", ' '], trim(file_get_contents(USERTEMPDIR . $name)));
+		file_put_contents(USERTEMPDIR . $name, $fileContent);
+
 		switch ($nodeType)
 		{
 			case 'timeTable' :
@@ -277,9 +277,9 @@ class FilesMgr extends AmdaObjectMgr
 		$handler = fopen($this->fileName, 'r');
 		if ($handler) {
 				while (!feof($handler) && !$StartTime) {
-						$oneLine = trim(fgets($handler)); 
-						$elems = explode(" ", preg_replace('/\s+/', ' ', $oneLine));
-						if ((strlen($elems[0]) < 16) || !($time = strtotime($elems[0]))) { 
+						$oneLine = trim(preg_replace('/\s+/', ' ', fgets($handler)));
+						$elems = explode(' ', $oneLine);
+						if ((strlen($elems[0]) < 16) || !($time = strtotime($elems[0]))) {
 								$i++;
 								continue;
 					}                   
@@ -291,8 +291,9 @@ class FilesMgr extends AmdaObjectMgr
 		if (feof($handler)) return -10;
-		$oneLine = trim(fgets($handler));      
-		$elems = explode(" ",$oneLine);
+		$oneLine = trim(preg_replace('/\s+/', ' ', fgets($handler)));
+		$elems = explode(' ',$oneLine);
+
 		if (count($elems) < 2) return -10;
 		// dT else Array
@@ -313,8 +314,8 @@ class FilesMgr extends AmdaObjectMgr
 		if ($handler) {
 			$i = 0;
 			while (!feof($handler) && !$StartTime) {
-						$oneLine = trim(fgets($handler)); 
-						$elems = explode(" ", preg_replace('/\s+/', ' ', $oneLine));
+						$oneLine = trim(preg_replace('/\s+/', ' ', fgets($handler)));
+						$elems = explode(' ',$oneLine);
 						if (strlen($elems[0]) < 16 || !($time = strtotime($elems[0]))) { 
 									$i++;
 									continue;
@@ -327,8 +328,8 @@ class FilesMgr extends AmdaObjectMgr
 		} 
 		if (feof($handle)) return array(-10);
-		$oneLine = trim(fgets($handler));
-		$elems = explode(" ",$oneLine);
+		$oneLine = trim(preg_replace('/\s+/', ' ', fgets($handler)));
+		$elems = explode(' ',$oneLine);
 		if (count($elems) < 2) return array (-1);
         // dT else Array
 		if (!($time = strtotime($elems[0]))) 
@@ -340,8 +341,9 @@ class FilesMgr extends AmdaObjectMgr
 			while (!feof($handler)) 
 			{
-				$oneLine = trim(fgets($handler));
-				$elems = explode(" ",$oneLine); 
+				$oneLine = trim(preg_replace('/\s+/', ' ', fgets($handler)));
+				$elems = explode(' ',$oneLine);
+
 				if (count($elems) < 2) continue;
 				$StartTime = $time;
 				if (!($time = strtotime($elems[0]))) return array(-1);                       
@@ -374,8 +376,9 @@ class FilesMgr extends AmdaObjectMgr
 			$i = 0;
 			while (!$StartTime && !feof($handler)) 
 			{
-				$oneLine = trim(fgets($handler));
-				$elems = explode(" ", preg_replace('/\s+/', ' ', $oneLine));
+				$oneLine = trim(preg_replace('/\s+/', ' ', fgets($handler)));
+				$elems = explode(' ',$oneLine);
+
 				if (!($time = strtotime($elems[0]))) 
 				{
 						$offset = ftell($handler);
@@ -388,9 +391,10 @@ class FilesMgr extends AmdaObjectMgr
 		}
 		$newfile = fopen(USERDATADIR."temp", "w");
-		
-		$oneLine = trim(fgets($handler));   
-		$elems = explode(" " , $oneLine);
+
+		$oneLine = trim(preg_replace('/\s+/', ' ', fgets($handler)));
+		$elems = explode(' ',$oneLine);
+
 		// dT
 		if (!($time = strtotime($elems[0])))
 		{ 
@@ -400,8 +404,8 @@ class FilesMgr extends AmdaObjectMgr
 			$newtime += $dt; 
 			while (!feof($handler)) 
-			{ 
-				$oneLine = trim(fgets($handler));                      
+			{
+				$oneLine = trim(preg_replace('/\s+/', ' ', fgets($handler)));
 				if ($oneLine != PHP_EOL && count($elems) > 0) fwrite($newfile,  $newtime." ".$oneLine.PHP_EOL);
 				$newtime += $dt;  
 			}
@@ -411,9 +415,9 @@ class FilesMgr extends AmdaObjectMgr
 		{ 
 			fseek($handler, $offset);
 			while (!feof($handler)) 
-			{ 
-				$oneLine = trim(fgets($handler));
-				$elems = explode(" " ,$oneLine);
+			{
+				$oneLine = trim(preg_replace('/\s+/', ' ', fgets($handler)));
+				$elems = explode(' ',$oneLine);
 				// empty lines
 				if (count($elems) < 2) continue;
 				$newtime = strtotime($elems[0]); 
@@ -461,18 +465,18 @@ class FilesMgr extends AmdaObjectMgr
 			$newfile = fopen(USERDATADIR."temp", "w");
 			while (!feof($handle)) 
 			{
-				if (($oneLine = fgets($handle)) !== false) 
+				$oneLine = trim(preg_replace('/\s+/', ' ', fgets($handle)));
+
+				if ($oneLine !== false)
 				{
-					$line = $timeLength == 'auto' ? $line = trim(preg_replace('/\s+/', ' ', $oneLine)) : trim($oneLine);    
-		
-					if (strlen($line) > $formatLength) 
+					if (strlen($oneLine) > $formatLength)
 					{   
 						try 
 						{
-							$date = DateTime::createFromFormat($timeFormat, trim(substr($line,0,$formatLength)));
+							$date = DateTime::createFromFormat($timeFormat, trim(substr($oneLine,0,$formatLength)));
 							if (!$date) 
 							{
-								if (strpos($line,'#') === 0)  fwrite($newfile, $line.PHP_EOL);
+								if (strpos($oneLine,'#') === 0)  fwrite($newfile, $oneLine.PHP_EOL);
 							}
 							else 
 							{
@@ -480,7 +484,7 @@ class FilesMgr extends AmdaObjectMgr
 								if ($doy) {
 									$date->modify('-1 day');
 								}
-								$suffix =  preg_replace('/\s+/', ' ',substr($line, $formatLength));
+								$suffix =  preg_replace('/\s+/', ' ',substr($oneLine, $formatLength));
 								fwrite($newfile,$date->format('Y-m-d')."T".$date->format('H:i:s').$suffix.PHP_EOL);
 							}
 						}
@@ -490,7 +494,7 @@ class FilesMgr extends AmdaObjectMgr
 						}               	       
 					} 
 					else 
-						if (strpos($line,'#') === 0) fwrite($newfile,$line.PHP_EOL); 
+						if (strpos($oneLine,'#') === 0) fwrite($newfile,$oneLine.PHP_EOL);
 				}
 			}
 		}
@@ -501,7 +505,7 @@ class FilesMgr extends AmdaObjectMgr
 				fclose($handle); 
 				unlink($this->fileName);
 			}
-			return $false;
+			return false;
 		}
 		fclose($newfile); 
@@ -7,46 +7,38 @@
  *
  */
-function timeFormat($myString) 
-{
-	if (format == "Y z H i s")  {
-		$tt = getdate(strtotime($myString));
-		return sprintf("%04d",$tt["year"])." "
-			.sprintf("%03d",$tt["yday"]+1)." "
-			.sprintf("%02d",$tt["hours"])." "
-			.sprintf("%02d",$tt["minutes"])." "
-			.sprintf("%02d",$tt["seconds"]);
-	}
-	return date(format,strtotime($myString));     
-}
-
 class TimeTableMgr extends AmdaObjectMgr
-{     
-	function __construct($user = NULL, $sharedObject = FALSE) 
+{
+	/**
+	 * TimeTableMgr constructor.
+	 * @param null $user The user
+	 * @param bool $sharedObject Shared object
+	 */
+	public function __construct($user = null, $sharedObject = false)
 	{
 		parent::__construct('Tt.xml');
 		$this->contentRootId = 'timeTable-treeRootNode';
 		$this->contentRootTag = 'timetabList';
-		$this->attributes = array('name' => '', 'intervals' => '');
-		$this->optionalAttributes = array();
+		$this->attributes = ['name' => '', 'intervals' => ''];
+		$this->optionalAttributes = [];
 		$this->objTagName = 'timetab';
 		$this->id_prefix = 'tt_';
 		if (!$sharedObject && !file_exists($this->xmlName)) {
-			  $this->createDom();
-			  $this->xp = new domxpath($this->contentDom); 
+			$this->createDom();
+			$this->xp = new domxpath($this->contentDom);
 		}
 	}
-	
-	protected function createDom() 
+
+	protected function createDom()
 	{
-		$types = array('timetab' => 'timeTable', 'catalog' => 'catalog');
+		$types = ['timetab' => 'timeTable', 'catalog' => 'catalog'];
 		$rootElement = $this->contentDom->createElement('ws');
-		
+
 		foreach ($types as $key => $value) {
-			$contentId = $value.'-treeRootNode';
-			$contentTag = $key.'List';
+			$contentId = $value . '-treeRootNode';
+			$contentTag = $key . 'List';
 			$typeElement = $this->contentDom->createElement($contentTag);
 			$typeElement->setAttribute('xml:id', $contentId);
 			$rootElement->appendChild($typeElement);
@@ -55,363 +47,600 @@ class TimeTableMgr extends AmdaObjectMgr
 		$this->contentDom->save($this->xmlName);
 	}
-	/*
-	*       rename  Time Table in  id.xml
-	*/
-	protected function renameInResource($name, $id) 
+	/**
+	 * Get object
+	 * @param $id
+	 * @param $nodeType
+	 * @return array
+	 */
+	public function getObject($id, $nodeType = null)
 	{
-		if (!file_exists(USERTTDIR.$id.'.xml')) return false;
+		if (substr($nodeType, 0, 6) == 'shared') {
+			//Shared object
+			$sharedObjMgr = new SharedObjectsMgr();
+			$path = $sharedObjMgr->getDataFilePath(str_replace('shared', '', $nodeType), $id);
+		} else {
+			$path = USERTTDIR . $id . '.xml';
+		}
-		$this->objectDom -> load(USERTTDIR.$id.'.xml');
-		if (!($objToRename = $this->objectDom->getElementById($id))) return false;
-		$objToRename -> getElementsByTagName('name')->item(0)->nodeValue = $name;
-		$this->objectDom ->save(USERTTDIR.$id.'.xml');
-		 
-		return true;
+		if (!file_exists($path)) {
+			return ['error' => NO_OBJECT_FILE];
+		}
+		$this->objectDom->load($path);
+		if (!($objToGet = $this->objectDom->getElementById($id))) {
+			return ['error' => NO_SUCH_ID];
+		}
+		$attributesToReturn['id'] = $objToGet->getAttribute('xml:id');
+		$attributes = $objToGet->childNodes;
+
+		$nbInt = 0;
+		foreach ($attributes as $attribute) {
+			if ($attribute->nodeType == XML_ELEMENT_NODE) {
+				/*if ($attribute->tagName == 'intervals') {
+					$start = $attribute -> getElementsByTagName('start')->item(0) -> nodeValue;
+					$stop = $attribute -> getElementsByTagName('stop')->item(0) -> nodeValue;
+					$attributesToReturn['intervals'][] = array('start' => $start, 'stop' => $stop);
+				}
+				else
+				$attributesToReturn[$attribute->tagName] =  $attribute->nodeValue;*/
+				//BRE - load all except intervals - Intervals will be loaded later with 'loadIntervalsFromTT' function
+				if ($attribute->tagName != 'intervals') {
+					$attributesToReturn[$attribute->tagName] = $attribute->nodeValue;
+				} else {
+					$nbInt++;
+				}
+			}
+		}
+		$attributesToReturn['nbIntervals'] = $nbInt;
+
+		return $attributesToReturn;
 	}
-	protected function deleteParameter($id)
+	/**
+	 * Modify an object
+	 * @param $p
+	 * @return array
+	 */
+	public function modifyObject($p)
 	{
-		if (file_exists(USERTTDIR.$id.'.xml')) unlink(USERTTDIR.$id.'.xml');
+		$folder = $this->getObjectFolder($p->id);
+
+		//Copy TT in a tempory file
+		$ttFilePath = USERTTDIR . $p->id . '.xml';
+		$tmpFileExist = false;
+		if (file_exists($ttFilePath)) {
+			$tmpFileExist = copy($ttFilePath, $ttFilePath . ".tmp");
+		}
+
+		//Delete TT
+		$this->deleteObject($p);
+
+		//Save modifications
+		try {
+			$result = $this->createObject($p, $folder);
+			if ($result['error']) {
+				throw new Exception($result['error']);
+			}
+			if ($tmpFileExist) {
+				unlink($ttFilePath . ".tmp");
+			}
+			return ['id' => $p->id, 'info' => $result['info']];
+		} catch (Exception $exception) {
+			//Restore TT file
+			if ($tmpFileExist) {
+				copy($ttFilePath . ".tmp", $ttFilePath);
+				unlink($ttFilePath . ".tmp");
+			}
+			return ['error' => $exception->getMessage()];
+		}
 	}
-	/*
-	*        Check if difference is name and info only
-	*/
-	protected function renameOnly($p) {
-		//if (!($p->intervals)) return true;
-		return false;
+	/**
+	 * Create an object
+	 * @param $p
+	 * @param $folder
+	 * @return array
+	 */
+	public function createObject($p, $folder)
+	{
+		if ($p->leaf) {
+			$result = $this->createParameter($p, $folder);
+			if ($result['error']) {
+				return $result;
+			}
+			$cacheMgr = new TimeTableCacheMgr();
+			if (isset($p->cacheToken) && ($p->cacheToken != '')) {
+				$resultSaveInt = $cacheMgr->saveInTT($result['id'], "update", $p->cacheToken);
+				if (!$resultSaveInt['success']) {
+					if ($resultSaveInt['message']) {
+						return ['error' => $resultSaveInt['message']];
+					} else {
+						return ['error' => 'Unknown error during intervals save'];
+					}
+				}
+			}
+			return $result;
+		} else {
+			return ['error' => 'createFolder should be called from RENAME'];
+			// return $this->createFolder($p);
+			// TODO check if this is possible?
+		}
 	}
-         
-        /*
-        *  In case of catalogs
-        */
-        protected function setParamDescription($param) { }
-        
-	/*
-	 *         Create Time Table
+	/**
+	 * Create parameter (in case of catalogs)
+	 * @param $p
+	 * @param $folder
+	 * @return array
 	 */
 	protected function createParameter($p, $folder)
 	{
-		if ($this -> objectExistsByName($p->name)) {
-			$p -> id  = $this -> getObjectIdByName($p->name);
-			$this -> deleteObject($p);
+		if ($this->objectExistsByName($p->name)) {
+			$p->id = $this->getObjectIdByName($p->name);
+			$this->deleteObject($p);
 		}
-		
+
 		$this->id = $this->setId();
 		$this->created = date('Y-m-d\TH:i:s');
-		if (!$this->id) return array('error' => ID_CREATION_ERROR);
-		
-		$this->resFileName = USERTTDIR.$this->id.'.xml';
-		//TODO catalog root element = 'timetable'
+		if (!$this->id) {
+			return ['error' => ID_CREATION_ERROR];
+		}
+
+		$this->resFileName = USERTTDIR . $this->id . '.xml';
+		// TODO catalog root element = 'timetable'
 		$rootElement = $this->objectDom->createElement('timetable');
-		$rootElement->setAttribute('xml:id',$this->id);
-	 
-		foreach ($p as $key => $value)		
+		$rootElement->setAttribute('xml:id', $this->id);
+
+		foreach ($p as $key => $value) {
 			if ($key != 'id' && $key != 'leaf' && $key != 'nodeType' &&
 				$key != 'objName' && $key != 'objFormat' && $key != 'folderId' && $key != 'cacheToken') {
-					if ($key == 'created') {
-						$rootElement->appendChild($this->objectDom->createElement($key, $this->created));
-					}
-					// it is catalog 
-					else if ($key == 'parameters') {
-					$paramsElement = $this->setParamDescription($value);
-					if ($paramsElement) $rootElement->appendChild($paramsElement);
-					
+				if ($key == 'created') {
+					$rootElement->appendChild($this->objectDom->createElement($key, $this->created));
+				} // it is catalog
+				else {
+					if ($key == 'parameters') {
+						$paramsElement = $this->setParamDescription($value);
+						if ($paramsElement) {
+							$rootElement->appendChild($paramsElement);
+						}
+					} else {
+						if ($key != 'intervals') {
+							$rootElement->appendChild($this->objectDom->createElement($key, htmlspecialchars($value)));
+						}
 					}
-					else if ($key != 'intervals')
-						$rootElement->appendChild($this->objectDom->createElement($key, htmlspecialchars($value)));
+				}
 			}
+		}
 		$this->objectDom->appendChild($rootElement);
 		$this->objectDom->save($this->resFileName);
 		$obj = new stdClass();
 		$obj->name = $p->name;
 		$obj->intervals = $p->nbIntervals;
-		$this -> addToContent($obj, $folder);
-		return array('id' => $this->id,'created' => $this->created,'info' =>$obj->intervals.' intervals' );
+		$this->addToContent($obj, $folder);
+		// FIXME field created is undefined
+		return ['id' => $this->id, 'created' => $this->created, 'info' => $obj->intervals . ' intervals'];
 	}
-	protected function call_intersection($fst, $snd) 
+	/**
+	 * Set parameter description
+	 * TODO
+	 * @param $param string The parameter
+	 * @return DOMNode
+	 */
+	protected function setParamDescription($param)
 	{
-		$inf = ( $fst[0] > $snd[0] ) ? $fst[0] : $snd[0];
-		$sup = ( $fst[1] < $snd[1] ) ? $fst[1] : $snd[1];
-		if ( $inf >= $sup ) { $inter[] = array(0,0); }
-		else {$inter[] = array($inf,$sup); }
-		return $inter;
+		return new DOMNode();
 	}
-    
+
+	/**
+	 * Get uploaded object
+	 * @param $name
+	 * @param $format
+	 * @param bool $onlyDescription
+	 * @return mixed
+	 */
+	public function getUploadedObject($name, $format, $onlyDescription = false)
+	{
+		if (strpos($name, '.txt') !== false || strpos($name, '.asc') !== false || strpos($name, '.') == false) {
+			$attributesToReturn = $this->textToAmda(USERTEMPDIR . $name, $onlyDescription);
+			$attributesToReturn['objName'] = $name;
+			$attributesToReturn['objFormat'] = $format;
+
+			return $attributesToReturn;
+		}
+
+		if ($format == 'VOT') {
+			$attributesToReturn = $this->vot2amda(USERTEMPDIR . $name, $onlyDescription);
+			$attributesToReturn['objName'] = $name;
+			$attributesToReturn['objFormat'] = $format;
+
+			return $attributesToReturn;
+		}
+
+		if (strpos($name, '.xml') !== false) {
+			$temp = explode('.xml', $name);
+			$name = $temp[0];
+		}
+
+		if (!file_exists(USERTEMPDIR . $name . '.xml')) {
+			return ['error' => 'no such name'];
+		}
+
+		$this->objectDom->load(USERTEMPDIR . $name . '.xml');
+		if (!($objToGet = $this->objectDom->getElementsByTagName('timetable')->item(0)) &&
+			!($objToGet = $this->objectDom->getElementsByTagName('TimeTable')->item(0))) {
+			return ['error' => 'no time table'];
+		}
+
+		$attributes = $objToGet->childNodes;
+		$attributesToReturn['name'] = $name;
+		$attributesToReturn['objName'] = $name;
+		$attributesToReturn['objFormat'] = $format;
+
+		/** @var DOMElement $attribute */
+		foreach ($attributes as $attribute) {
+			if ($attribute->nodeType == XML_ELEMENT_NODE) {
+				if ($attribute->tagName == 'intervals') {
+					$start = $attribute->getElementsByTagName('start')->item(0)->nodeValue;
+					$stop = $attribute->getElementsByTagName('stop')->item(0)->nodeValue;
+					if (!$onlyDescription) {
+						$attributesToReturn['intervals'][] = ['start' => $start, 'stop' => $stop];
+					}
+				} else {
+					if ($attribute->tagName == 'Interval') {
+						$start = $attribute->getElementsByTagName('Start')->item(0)->nodeValue;
+						$stop = $attribute->getElementsByTagName('Stop')->item(0)->nodeValue;
+						if (!$onlyDescription) {
+							$attributesToReturn['intervals'][] = ['start' => $start, 'stop' => $stop];
+						}
+					} else {
+						switch (strtolower($attribute->tagName)) {
+							case 'created':
+								$attributesToReturn['created'] = $attribute->nodeValue;
+								break;
+							case 'chain':
+							case 'source':
+								$attributesToReturn['description'] = $attribute->nodeValue;
+								break;
+							default:
+								break;
+						}
+					}
+				}
+			}
+		}
+		return $attributesToReturn;
+	}
+
 	/*
 	* Uploaded text file => convert to array
 	*/
-	protected function text2amda($tmp_file, $onlyDescription = false) 
-	{  
+
+	/**
+	 * Convert text to AMDA attributes
+	 * @param $tmp_file
+	 * @param bool $onlyDescription
+	 * @return mixed
+	 */
+	protected function textToAmda($tmp_file, $onlyDescription = false)
+	{
 		$suffix = explode('.', basename($tmp_file));
-		$lines = file($tmp_file,FILE_SKIP_EMPTY_LINES);
-		$description="Uploaded Time Table".PHP_EOL; 
+		$lines = file($tmp_file, FILE_SKIP_EMPTY_LINES);
+		$description = "Uploaded Time Table" . PHP_EOL;
 		$recordsNumber = count($lines);
 		$descNumber = 0;
-		
-		foreach ($lines as $line)
-		{  
-			if ($line[0] == '#') {
-				$description=$description.PHP_EOL.substr($line,1,-1);
-			}
-			else {
-				$date = explode(' ', trim(preg_replace('!\s+!', ' ',$line)));
-				
-				if (!strtotime(trim($date[0]))) {
-					$description=$description.PHP_EOL.$line;
-					$descNumber++;
-					continue;
-				}
-				// check if it is ISO format
-				if (!isset($isIso)) 
-					$isIso = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})$/', trim($date[0]));
-					
-				if (!$isIso) {
-					// y-m-d h:m:s for example
-					$dateLength = count($date) / 2;
-
-					$tempStart = $date[0];
-					$tempStop = $date[$dateLength];
-					
-					if ($dateLength > 1) {
-						for ($i = 1; $i < $dateLength; $i++)
-							$tempStart.= $date[$i];	
-						
-						for ($i = $dateLength + 1; $i < $dateLength * 2; $i++)
-							$tempStop .= $date[$i];
+
+		foreach ($lines as $line) {
+			$line = preg_replace('/[-:\/\s]+/', ' ', trim($line));
+			if ($line[0] == '#') { // Comment
+				$description = $description . PHP_EOL . substr($line, 1, -1);
+			} else {
+				$isoFormat = 'Y-m-dTH:i:s';
+				$doyFormat = 'Y z H i s';
+				$doyRegex = '(\d{4}) (\d{3}) (\d{2}) (\d{2}) (\d{2})( \d{2})?';
+
+				if (preg_match('/^' . $doyRegex . ' ' . $doyRegex . '$/', $line)) {
+					$start = DateTime::createFromFormat($doyFormat, substr($line, 0, 17));
+					$stop = DateTime::createFromFormat($doyFormat, substr($line, 18));
+					$startDate = $start->sub(new DateInterval('P1D'))->format($isoFormat);
+					$stopDate = $stop->sub(new DateInterval('P1D'))->format($isoFormat);
+				} else {
+					$dateLength = round((strlen($line)-1) / 2);
+
+					$start = explode(' ', substr($line, 0, $dateLength) . ' 00');
+					$startTime = strtotime("$start[0]/$start[1]/$start[2] $start[3]:$start[4]:$start[5]");
+
+					$stop = explode(' ', substr($line, $dateLength + 1) . ' 00');
+					$stopTime = strtotime("$stop[0]/$stop[1]/$stop[2] $stop[3]:$stop[4]:$stop[5]");
+					if (is_numeric($startTime) && is_numeric($stopTime)) {
+						$startDate = date($isoFormat, $startTime);
+						$stopDate = date($isoFormat, $stopTime);
+					} else {
+						$description = $description . PHP_EOL . $line;
+						$descNumber++;
+						continue;
 					}
+				}
-					$startDate = date('Y-m-d\TH:i:s',strtotime($tempStart));
-					$stopDate = date('Y-m-d\TH:i:s',strtotime($tempStop));
-					
-					if (!$onlyDescription)
-							$attributesToReturn['intervals'][] = array('start' => $startDate, 'stop' => $stopDate); 
+				if (!$onlyDescription) {
+					$attributesToReturn['intervals'][] = ['start' => $startDate, 'stop' => $stopDate];
 				}
-				else {
-					if (!$onlyDescription)
-						$attributesToReturn['intervals'][] = array('start' => trim($date[0]), 'stop' => trim($date[1]));
-				} 
 			}
 		}
-      if ( $recordsNumber == $descNumber )
-			$description = "Looks like we can not read your time format...".PHP_EOL.$description;
-			
+		if ($recordsNumber == $descNumber) {
+			$description = 'Looks like we can not read your time format...' . PHP_EOL . $description;
+		}
+
 		$attributesToReturn['description'] = $description;
-		$attributesToReturn['name'] = basename($tmp_file, '.'.$suffix[1]);
+		$attributesToReturn['name'] = basename($tmp_file, '.' . $suffix[1]);
 		$attributesToReturn['created'] = date('Y-m-d\TH:i:s');
-
 		return $attributesToReturn;
 	}
-      /*
-      * Uploaded vot TT => convert to array
-      */
-	protected function vot2amda($tmp_file, $onlyDescription = false) {		  
-	// Load Time table		
-		$this->objectDom -> load($tmp_file);
+	/**
+	 * Convert VOTable time table to AMDA attributes
+	 * @param $tmp_file
+	 * @param bool $onlyDescription
+	 * @return mixed
+	 */
+	protected function vot2amda($tmp_file, $onlyDescription = false)
+	{
+		// Load Time table
+		$this->objectDom->load($tmp_file);
 		$objToGet = $this->objectDom->getElementsByTagName('TABLEDATA')->item(0);
 		$attributesToReturn['name'] = $tmp_file;
-		$attributes = $objToGet -> childNodes;
-		foreach($attributes as $attribute)
+		$attributes = $objToGet->childNodes;
+
+		/** @var DOMElement $attribute */
+		foreach ($attributes as $attribute) {
 			if ($attribute->tagName == 'TR') {
-				$start = $attribute -> getElementsByTagName('TD')->item(0) -> nodeValue;
-				$stop = $attribute -> getElementsByTagName('TD')->item(1) -> nodeValue;
-				if (!$onlyDescription)
-						$attributesToReturn['intervals'][] = array('start' => $start, 'stop' => $stop);
+				$start = $attribute->getElementsByTagName('TD')->item(0)->nodeValue;
+				$stop = $attribute->getElementsByTagName('TD')->item(1)->nodeValue;
+				if (!$onlyDescription) {
+					$attributesToReturn['intervals'][] = ['start' => $start, 'stop' => $stop];
+				}
 			}
-		$suffix = explode('.', basename($tmp_file));   
-		$attributesToReturn['name'] = basename($tmp_file, '.'.$suffix[1]); 
-		$attributesToReturn['created'] = date('Y-m-d')."T".date('H:i:s');
-		$attributesToReturn['description'] = htmlspecialchars($this->objectDom->getElementsByTagName('DESCRIPTION')->item(0) -> nodeValue);
-		return($attributesToReturn);
+		}
+		$suffix = explode('.', basename($tmp_file));
+		$attributesToReturn['name'] = basename($tmp_file, '.' . $suffix[1]);
+		$attributesToReturn['created'] = date('Y-m-d') . "T" . date('H:i:s');
+		$description = $this->objectDom->getElementsByTagName('DESCRIPTION')->item(0)->nodeValue;
+		$attributesToReturn['description'] = htmlspecialchars($description);
+		return ($attributesToReturn);
 	}
-	
+
 	/*****************************************************************
 	 *                           PUBLIC FUNCTIONS
 	 *****************************************************************/
-	 
+
 	/*
 	 *   Get Object into Edit
 	 */
-	function getObject($id, $nodeType) {
-		if (substr($nodeType,0,6) == 'shared') {
-			//Shared object
-			$sharedObjMgr = new SharedObjectsMgr();
-			$path = $sharedObjMgr->getDataFilePath(str_replace('shared', '', $nodeType), $id);
+	public function getTmpObject($folderId, $name, $onlyDescription = false)
+	{
+		$filePath = USERWORKINGDIR . $folderId . '/' . $name . '.xml';
+		if (!file_exists($filePath)) {
+			return ['error' => 'Cannot find result file'];
 		}
-		else {
-			$path = USERTTDIR.$id.'.xml';
+
+		$dom = new DomDocument('1.0');
+		$dom->formatOutput = true;
+
+		if (!$dom->load($filePath)) {
+			return ['error' => 'Cannot load result file'];
 		}
-		if (!file_exists($path)) return array('error' => NO_OBJECT_FILE);
-		$this->objectDom -> load($path);
-		if (!($objToGet = $this->objectDom->getElementById($id))) return array('error' => NO_SUCH_ID);
-		$attributesToReturn['id'] = $objToGet->getAttribute('xml:id');
-		$attributes = $objToGet -> childNodes;
+		$descNodes = $dom->getElementsByTagName('description');
+		if ($descNodes->length > 0) {
+			$attributesToReturn['description'] = $descNodes->item(0)->nodeValue;
+		}
-		$nbInt = 0;
-		foreach($attributes as $attribute)
-			if($attribute->nodeType == XML_ELEMENT_NODE){
-			/*if ($attribute->tagName == 'intervals') {
-				$start = $attribute -> getElementsByTagName('start')->item(0) -> nodeValue;
-				$stop = $attribute -> getElementsByTagName('stop')->item(0) -> nodeValue;
-				$attributesToReturn['intervals'][] = array('start' => $start, 'stop' => $stop);
-			}
-			else
-			$attributesToReturn[$attribute->tagName] =  $attribute->nodeValue;*/
-				//BRE - load all except intervals - Intervals will be loaded later with 'loadIntervalsFromTT' function
-				if ($attribute->tagName != 'intervals')
-					$attributesToReturn[$attribute->tagName] =  $attribute->nodeValue;
-				else
-					$nbInt++;
-			}
-		
-		$attributesToReturn['nbIntervals'] = $nbInt;
-		
-		return  $attributesToReturn;
-	}
-	
-	public function createObject($p, $folder)
-	{	
-		if ($p -> leaf){
-			$result = $this->createParameter($p, $folder);
-			if ($result['error'])
-				return $result;
-			$cacheMgr = new TimeTableCacheMgr();
-			if (isset($p->cacheToken) && ($p->cacheToken != ''))
-			{
-				$resultSaveInt = $cacheMgr->saveInTT($result['id'], "update", $p->cacheToken);
-				if (!$resultSaveInt['success'])
-				{
-					if ($resultSaveInt['message'])
-						return array('error' => $resultSaveInt['message']);
-					else
-						return array('error' => 'Unknown error during intervals save');
+		$creatNodes = $dom->getElementsByTagName('created');
+		if ($creatNodes->length > 0) {
+			$attributesToReturn['created'] = $creatNodes->item(0)->nodeValue;
+		}
+
+		$histNodes = $dom->getElementsByTagName('history');
+		if ($histNodes->length > 0) {
+			$attributesToReturn['history'] = $histNodes->item(0)->nodeValue;
+		}
+
+		$attributesToReturn['objName'] = $name;
+		$attributesToReturn['folderId'] = $folderId;
+
+		if (!$onlyDescription) {
+			$intNodes = $dom->getElementsByTagName('intervals');
+
+			/** @var DOMElement $intNode */
+			foreach ($intNodes as $intNode) {
+				$startNodes = $intNode->getElementsByTagName('start');
+				if ($startNodes->length <= 0) {
+					return ['error' => 'Error detected in result file'];
+				}
+				$stopNodes = $intNode->getElementsByTagName('stop');
+				if ($stopNodes->length <= 0) {
+					return ['error' => 'Error detected in result file'];
 				}
+				$attributesToReturn['intervals'][] = [
+					'start' => $startNodes->item(0)->nodeValue,
+					'stop' => $stopNodes->item(0)->nodeValue
+				];
 			}
-			return $result;
 		}
-		//      else return $this->createFolder($p);
-		//TODO check if this is possible?
-		else return array('error' => 'createFolder should be called from RENAME');	
+
+		return $attributesToReturn;
 	}
-	
-	
-	public function modifyObject($p) {
-		$folder = $this->getObjectFolder($p->id);
-		
-		//Copy TT in a tempory file
-		$ttFilePath = USERTTDIR.$p->id.'.xml';
-		$tmpFileExist = FALSE;
-		if (file_exists($ttFilePath))
-			$tmpFileExist = copy($ttFilePath,$ttFilePath.".tmp");
-		
-		//Delete TT
-		$this->deleteObject($p);
-		
-		//Save modifications
-		try {
-			$result = $this->createObject($p, $folder);			
-			if ($result['error'])
-				throw new Exception($result['error']);
-			if ($tmpFileExist)
-				unlink($ttFilePath.".tmp");
-			return array('id' => $p->id, 'info' => $result['info']);
+
+	/**
+	 * Merge time tables
+	 * @param $obj
+	 * @return array
+	 */
+	public function merge($obj)
+	{
+		/**
+		 * Array of intervals, used like :
+		 * [{start:'2010-01-01T23:00:00',stop:'2011-01-01T20:00:00'},{start:'2009-01-01T23:00:00',stop:'2010-01-01T20:00:00'}]
+		 * $attributesToReturn['intervals'][] = array('start' => $start, 'stop' => $stop);
+		 */
+
+		$intervals = 0;
+		for ($iId = 0; $iId < count($obj->ids); $iId++) {
+			$table[$iId] = $this->loadIntervalsFromTT($obj->ids[$iId]);
+			for ($jId = 0; $jId < count($table[$iId]['intervals']); $jId++) {
+				$interval[$iId][$jId][0] = $table[$iId]['intervals'][$jId]['start'];
+				$interval[$iId][$jId][1] = $table[$iId]['intervals'][$jId]['stop'];
+			}
+			$intervals += count($interval[$iId]);
 		}
-		catch (Exception $e) {
-			//Restore TT file
-			if ($tmpFileExist)
-			{
-				copy($ttFilePath.".tmp", $ttFilePath);
-				unlink($ttFilePath.".tmp");
+		if ($intervals > 10000) {
+			set_time_limit(1800);
+		}
+
+		$final = [];
+		for ($iId = 0; $iId < count($obj->ids); $iId++) {
+			$final = array_merge($final, $interval[$iId]);
+		}
+		sort($final);
+
+		// Algorithm of union
+		$line = 0;
+		$iId = 0;
+		$val = $final[$iId][0];
+		while ($iId < count($final) - 1) {
+			if ($final[$iId + 1][1] <= $final[$iId][1]) {
+				array_splice($final, $iId + 1, 1);
+			} else {
+				if (($final[$iId + 1][0] <= $final[$iId][1]) && ($final[$iId + 1][1] >= $final[$iId][1])) {
+					$iId++;
+				} else {
+					$start[$line] = $val;
+					$stop[$line] = $final[$iId][1];
+					$iId++;
+					$line++;
+					$val = $final[$iId][0];
+				}
 			}
-			return array ('error' => $e->getMessage());
 		}
+		$start[$line] = $val;
+		$stop[$line] = $final[$iId][1];
+
+		$objTT = new stdClass();
+		$objTT->name = $obj->name;
+		$objTT->nodeType = 'timeTable';
+		$objTT->leaf = true;
+		$objTT->created = null;
+		$objTT->history = $obj->history;
+		for ($iId = 0; $iId < count($start); $iId++) {
+			$inter = new stdClass();
+			$inter->start = $start[$iId];
+			$inter->stop = $stop[$iId];
+			$objTT->intervals[] = $inter;
+		}
+		$objTT->nbIntervals = count($start);
+		$this->objectDom = new DomDocument('1.0');
+		$this->objectDom->formatOutput = true;
+
+		$res = $this->createParameter($objTT, $folder); // FIXME $folder is undefined
+		if ($res['error']) {
+			return $res;
+		}
+
+		$this->saveIntervals($res['id'], $objTT->intervals, 'merge');
+		return $res;
 	}
-	
-	public function loadIntervalsFromTT($id,$typeTT,$start = NULL, $limit = NULL)
+
+	/**
+	 * Load intervals from time table
+	 * @param $id
+	 * @param $typeTT
+	 * @param null $start
+	 * @param null $limit
+	 * @return array
+	 */
+	public function loadIntervalsFromTT($id, $typeTT = '', $start = null, $limit = null)
 	{
 		if ($typeTT == 'sharedtimeTable') {
 			//Shared object
 			$sharedObjMgr = new SharedObjectsMgr();
 			$path = $sharedObjMgr->getDataFilePath('timeTable', $id);
+		} else {
+			$path = USERTTDIR . $id . '.xml';
+		}
+
+		//load intervals from TT id
+		if (!file_exists($path)) {
+			return ['success' => false, 'message' => "Cannot find TT file " . $id];
 		}
-		else {
-			$path = USERTTDIR.$id.'.xml';
-		}
-		
-  	 //load intervals from TT id
-		if (!file_exists($path))
-			return array('success' => false, 'message' => "Cannot find TT file ".$id);
-			
-		$this->objectDom -> load($path);
-		if (!($objToGet = $this->objectDom->getElementById($id)))
-			return array('success' => false, 'message' => NO_SUCH_ID." ".$id);
-    
+
+		$this->objectDom->load($path);
+		if (!($objToGet = $this->objectDom->getElementById($id))) {
+			return ['success' => false, 'message' => NO_SUCH_ID . " " . $id];
+		}
+
 		$xpath = new DOMXPath($this->objectDom);
-		$intervals =  $xpath->query('//intervals');
-		
-		$result = array();
-    
+		$intervals = $xpath->query('//intervals');
+
+		$result = [];
+
 		if (!isset($start) || !isset($limit)) {
+
+			/** @var DOMElement $interval */
 			foreach ($intervals as $interval) {
 				$startTime = $interval->getElementsByTagName('start')->item(0)->nodeValue;
-				$stopTime  = $interval->getElementsByTagName('stop')->item(0)->nodeValue;
-				array_push($result, array('start' => $startTime, 'stop' => $stopTime));
+				$stopTime = $interval->getElementsByTagName('stop')->item(0)->nodeValue;
+				array_push($result, ['start' => $startTime, 'stop' => $stopTime]);
 			}
-		}
-		else {
-			for ($i = 0; $i < $limit; ++$i) {
-				if ($start+$i >= $intervals->length)
+		} else {
+			for ($iInt = 0; $iInt < $limit; ++$iInt) {
+				if ($start + $iInt >= $intervals->length) {
 					break;
-				$startTime = $intervals->item($start+$i)->getElementsByTagName('start')->item(0)->nodeValue;
-				$stopTime  = $intervals->item($start+$i)->getElementsByTagName('stop')->item(0)->nodeValue;
-				array_push($result, array('start' => $startTime, 'stop' => $stopTime));
+				}
+				$startTime = $intervals->item($start + $iInt)->getElementsByTagName('start')->item(0)->nodeValue;
+				$stopTime = $intervals->item($start + $iInt)->getElementsByTagName('stop')->item(0)->nodeValue;
+				array_push($result, ['start' => $startTime, 'stop' => $stopTime]);
 			}
 		}
-    
-		return array(
-		'totalCount' => $intervals->length,
-		'intervals'  => $result,
-		'start' => isset($start) ? $start : 0,
-		'limit' => isset($limit) ? $limit : 0,
-		'success'    => true
-		);   
-	}
-  
-	protected function createIntervalElement($interval) 
-	{  
-		$newInterval = $this->objectDom->createElement('intervals');
-		$newInterval->appendChild($this->objectDom->createElement('start',$interval->start));
-		$newInterval->appendChild($this->objectDom->createElement('stop',$interval->stop));
-		return $newInterval;
+
+		return [
+			'totalCount' => $intervals->length,
+			'intervals' => $result,
+			'start' => isset($start) ? $start : 0,
+			'limit' => isset($limit) ? $limit : 0,
+			'success' => true
+		];
 	}
-	
-	public function saveIntervals($id,$intervals,$action)
+
+	/**
+	 * Save intervals
+	 * @param $id
+	 * @param $intervals
+	 * @param $action
+	 * @return array
+	 */
+	public function saveIntervals($id, $intervals, $action)
 	{
-		if (substr($id,0,6) == 'shared') {
-			return array('success' => false, 'message' => "Cannot save shared TimeTable");
-		}
-		else {
-			$path = USERTTDIR.$id.'.xml';		
-		} 
-		if (!file_exists($path))
-			return array('success' => false, 'message' => "Cannot find TT file ".$id);
-		$this->objectDom -> load($path);
-    
-		if (!($objToGet = $this->objectDom->getElementById($id))) 
-			return array('success' => false, 'message' => NO_SUCH_ID." ".$id);
+		if (substr($id, 0, 6) == 'shared') {
+			return ['success' => false, 'message' => "Cannot save shared TimeTable"];
+		} else {
+			$path = USERTTDIR . $id . '.xml';
+		}
+		if (!file_exists($path)) {
+			return ['success' => false, 'message' => "Cannot find TT file " . $id];
+		}
+		$this->objectDom->load($path);
+
+		if (!($objToGet = $this->objectDom->getElementById($id))) {
+			return ['success' => false, 'message' => NO_SUCH_ID . " " . $id];
+		}
 		//remove old intervals
 		$crtNode = $objToGet->firstChild;
-    
+
 		while ($crtNode) {
-			if (($crtNode->nodeType != XML_ELEMENT_NODE) || ($crtNode->tagName != 'intervals')) {	
+			if (($crtNode->nodeType != XML_ELEMENT_NODE) || ($crtNode->tagName != 'intervals')) {
 				$crtNode = $crtNode->nextSibling;
 				continue;
 			}
@@ -420,357 +649,261 @@ class TimeTableMgr extends AmdaObjectMgr
 			$objToGet->removeChild($toRemove);
 			unset($toRemove);
 		}
-      
+
 		//add new intervals
-		foreach ($intervals as $interval) {	 
-			$newInterval = $this-> createIntervalElement($interval);
+		foreach ($intervals as $interval) {
+			$newInterval = $this->createIntervalElement($interval);
 			$this->objectDom->documentElement->appendChild($newInterval);
 		}
 		//save modifications
 		$this->id = $id;
-		$this->resFileName = USERTTDIR.$this->id.'.xml';
+		$this->resFileName = USERTTDIR . $this->id . '.xml';
 		$this->objectDom->save($this->resFileName);
-    
+
 		unset($this->objectDom);
-    
-		return array('success' => true,'action' => $action, 'nbIntervals' => count($intervals));
+
+		return ['success' => true, 'action' => $action, 'nbIntervals' => count($intervals)];
 	}
-	
-      
-	public function getUploadedObject($name, $format, $onlyDescription = false) 
+
+	/**
+	 * Create interval element
+	 * @param $interval
+	 * @return DOMElement
+	 */
+	protected function createIntervalElement($interval)
 	{
-		if (strpos($name,'.txt') !== false || strpos($name,'.asc') !== false || strpos($name,'.') == false) {
-			$attributesToReturn = $this->text2amda(USERTEMPDIR.$name, $onlyDescription);
-			$attributesToReturn['objName'] = $name;
-			$attributesToReturn['objFormat'] = $format;
-			
-			return $attributesToReturn;
+		$newInterval = $this->objectDom->createElement('intervals');
+		$newInterval->appendChild($this->objectDom->createElement('start', $interval->start));
+		$newInterval->appendChild($this->objectDom->createElement('stop', $interval->stop));
+		return $newInterval;
+	}
+
+	/**
+	 * Intersect time tables
+	 * @param $obj
+	 * @return array|string
+	 */
+	public function intersect($obj)
+	{
+		$intervals = 0;
+		for ($iId = 0; $iId < count($obj->ids); $iId++) {
+			$table[$iId] = $this->loadIntervalsFromTT($obj->ids[$iId]);
+			for ($jId = 0; $jId < count($table[$iId]['intervals']); $jId++) {
+				$interval[$iId][$jId][0] = $table[$iId]['intervals'][$jId]['start'];
+				$interval[$iId][$jId][1] = $table[$iId]['intervals'][$jId]['stop'];
+			}
+			$intervals += count($interval[$iId]);
 		}
-		
-		if ($format == 'VOT') {
-			 $attributesToReturn = $this->vot2amda(USERTEMPDIR.$name, $onlyDescription);
-			 $attributesToReturn['objName'] = $name;
-			 $attributesToReturn['objFormat'] = $format;
-			 
-			 return $attributesToReturn;
-		}
-	 
-		if (strpos($name,'.xml') !== false) {
-			$temp = explode('.xml', $name);
-			$name = $temp[0];
+		if ($intervals > 10000) {
+			set_time_limit(1800);
 		}
-	
-		if (!file_exists(USERTEMPDIR.$name.'.xml')) 
-				return array('error' => 'no such name');
-			  
-		$this->objectDom->load(USERTEMPDIR.$name.'.xml');
-		if (!($objToGet = $this->objectDom->getElementsByTagName('timetable')->item(0)) && 
-			!($objToGet = $this->objectDom->getElementsByTagName('TimeTable')->item(0))) 
-					return array('error' => 'no time table');
-		$attributes = $objToGet -> childNodes;
-		$attributesToReturn['name'] = $name;
-		$attributesToReturn['objName'] = $name;
-		$attributesToReturn['objFormat'] = $format;
+		// Sort intervals in time tables
+		sort($interval[0]);
+		sort($interval[1]);
-		foreach($attributes as $attribute) {
-			if($attribute->nodeType == XML_ELEMENT_NODE){
-				if ($attribute->tagName == 'intervals') {
-					$start = $attribute -> getElementsByTagName('start')->item(0) -> nodeValue;
-					$stop = $attribute -> getElementsByTagName('stop')->item(0) -> nodeValue;
-					if (!$onlyDescription)
-						$attributesToReturn['intervals'][] = array('start' => $start, 'stop' => $stop);
-				} 
-				else if ($attribute->tagName == 'Interval') {
-					$start = $attribute -> getElementsByTagName('Start')->item(0) -> nodeValue;
-					$stop = $attribute -> getElementsByTagName('Stop')->item(0) -> nodeValue;
-					if (!$onlyDescription)
-						$attributesToReturn['intervals'][] = array('start' => $start, 'stop' => $stop);
-				}
-				else {
-					switch (strtolower($attribute->tagName)) {
-						case 'created' : 
-							$attributesToReturn['created'] =  $attribute->nodeValue;
-							break;
-						case 'chain'  :
-						case 'source' :  
-							$attributesToReturn['description'] = $attribute->nodeValue;
-							break;
-						default:  break;
-					}
+		$iId = 0;
+		$jId = 0;
+		$line = 0;
+
+		while (($iId < count($interval[0])) && ($jId < count($interval[1]))) {
+			$inter = $this->callIntersection($interval[0][$iId], $interval[1][$jId]);
+
+			if ($inter[0][0] != 0 && $inter[0][1] != 0) {
+				$start[$line] = $inter[0][0];
+				$stop[$line] = $inter[0][1];
+				$line++;
+			}
+
+			if ($interval[0][$iId][1] < $interval[1][$jId][1]) {
+				$iId++;
+			} else {
+				$jId++;
+			}
+		}
+
+		// Intersection is empty
+		if ($line == 0) {
+			$result = "empty";
+		} else {
+			$objTT->name = $obj->name;  // FIXME $objTT is undefined
+			$objTT->nodeType = 'timeTable';
+			$objTT->leaf = true;
+			$objTT->created = null;
+			$objTT->history = $obj->history;
+			for ($iId = 0; $iId < count($start); $iId++) {
+				$inter = new stdClass();
+				$inter->start = $start[$iId];
+				$inter->stop = $stop[$iId];
+				$objTT->intervals[] = $inter;
+			}
+			$objTT->nbIntervals = count($start);
+
+			if (count($objTT->intervals) == 0) {
+				$result = "empty";
+			} else {
+				$this->objectDom = new DomDocument('1.0');
+				$this->objectDom->formatOutput = true;
+				$result = $this->createObject($objTT, $folder); // FIXME $folder is undefined
+
+				if (!isset($result['error'])) {
+					$this->saveIntervals($result['id'], $objTT->intervals, 'intersect');
 				}
 			}
 		}
-		return  $attributesToReturn;
+		return $result;
 	}
-	//TODO getObject only!!!! => change DD_Search output
-	public function getTmpObject($folderId, $name, $onlyDescription = false) {
-		$filePath = USERWORKINGDIR.$folderId.'/'.$name.'.xml';
-		if (!file_exists($filePath)) 
-			return array('error' => 'Cannot find result file');
-		
-		$dom = new DomDocument('1.0'); 
-		$dom->formatOutput = true;
-		
-		if (!$dom -> load($filePath))
-			return array('error' => 'Cannot load result file');
-		
-		$descNodes = $dom->getElementsByTagName('description');
-		if ($descNodes->length > 0)
-			$attributesToReturn['description'] = $descNodes->item(0)->nodeValue;
-		
-		$creatNodes = $dom->getElementsByTagName('created');
-		if ($creatNodes->length > 0)
-			$attributesToReturn['created'] = $creatNodes->item(0)->nodeValue;
-		
-		$histNodes = $dom->getElementsByTagName('history');
-		if ($histNodes->length > 0)
-			$attributesToReturn['history'] = $histNodes->item(0)->nodeValue;
-	
-		$attributesToReturn['objName'] = $name;
-		$attributesToReturn['folderId'] = $folderId;
-	
-		if (!$onlyDescription)
-		{
-			$intNodes = $dom->getElementsByTagName('intervals');
-			foreach ($intNodes as $intNode)
-			{
-				$startNodes = $intNode->getElementsByTagName('start');
-				if ($startNodes->length <= 0)
-					return array('error' => 'Error detected in result file');
-				$stopNodes = $intNode->getElementsByTagName('stop');
-				if ($stopNodes->length <= 0)
-					return array('error' => 'Error detected in result file');
-				$attributesToReturn['intervals'][] = array('start' => $startNodes->item(0)->nodeValue,
-														'stop' => $stopNodes->item(0)->nodeValue);
-			}
+	/**
+	 * Call intersection
+	 * @param $fst
+	 * @param $snd
+	 * @return array
+	 */
+	protected function callIntersection($fst, $snd)
+	{
+		$inf = ($fst[0] > $snd[0]) ? $fst[0] : $snd[0];
+		$sup = ($fst[1] < $snd[1]) ? $fst[1] : $snd[1];
+		$inter[] = ($inf >= $sup) ? [0, 0] : [$inf, $sup];
+		return $inter;
+	}
+
+	/**
+	 * Valid name object
+	 * TODO getObject only!!!! => change DD_Search output
+	 * @param $p
+	 * @return array
+	 */
+	public function validNameObject($p)
+	{
+		// overwritten
+		$res = parent::validNameObject($p);
+
+		if (!$res['valid']) {
+			return $res;
+		}
+
+		//no space
+		if (strpos($p->name, ' ') === false) {
+			return ['valid' => true];
 		}
-		
-		return  $attributesToReturn;
+
+		return ['valid' => false, 'error' => 'Space character is not allowed'];
 	}
-	/*
-	* merge time tables
-	*/
-	public  function merge($obj)   {
 	/**
-	* Array of intervals, used like : 
-	* [{start:'2010-01-01T23:00:00',stop:'2011-01-01T20:00:00'},{start:'2009-01-01T23:00:00',stop:'2010-01-01T20:00:00'}]
-	* $attributesToReturn['intervals'][] = array('start' => $start, 'stop' => $stop);
-	*/
-		
-		$intervals = 0;	
-    		
-		for ( $i = 0; $i < count($obj->ids); $i++ ) {
-			$table[$i] = $this->loadIntervalsFromTT($obj->ids[$i]);
-			for ($j=0; $j < count($table[$i]['intervals']); $j++) {
-				$interval[$i][$j][0] = $table[$i]['intervals'][$j]['start'];
-				$interval[$i][$j][1] = $table[$i]['intervals'][$j]['stop'];
-			}
-			$intervals += count($interval[$i]);
-		}  
-    		if ( $intervals > 10000) set_time_limit(1800);
-    		
-    		$final = array();
-    		for ( $i = 0; $i < count($obj->ids); $i++ ) {
-    			$final = array_merge($final, $interval[$i]);        		
-      		}
-    		sort($final);
-    		
-    		// Algorithm of union
-    		$line = 0;
-        	$i = 0;
-        	$a = $final[$i][0];
-	        while ($i < count($final)-1) {
-	           if ($final[$i+1][1] <= $final[$i][1])
-	           {
-	                  array_splice($final,$i+1,1);
-	           }
-	           else if (($final[$i+1][0] <= $final[$i][1]) && ($final[$i+1][1] >= $final[$i][1]))
-	           {
-	                  $i++;
-	           }
-	           else {
-	                $start[$line] = $a;
-	                $stop[$line] = $final[$i][1];
-	                $i++;
-	                $line++;
-	                $a = $final[$i][0];
-	           }
-	        }
-	        $start[$line] = $a;
-	        $stop[$line] = $final[$i][1];
-	        $line++;
-        
-		$objTT = new stdClass();	            	        
-		$objTT->name = $obj->name;
-    	$objTT->nodeType = 'timeTable';
-    	$objTT->leaf = true;
-    	$objTT->created = null;
-    	$objTT->history = $obj->history;
-    	for ($i=0; $i < count($start); $i++) {	
-							$inter = new stdClass();
-							$inter->start = $start[$i];
-							$inter->stop = $stop[$i];
-							$objTT->intervals[] = $inter;
-    	}
-    	$objTT->nbIntervals = count($start);
-		$this->objectDom = new DomDocument('1.0'); 
-		$this->objectDom->formatOutput = true;
- 		
-		$res = $this->createParameter($objTT, $folder);
-		if ($res['error'])
-		  return $res;
- 		  
-		$this->saveIntervals($res['id'],$objTT->intervals,'merge');
- 		
-		return $res;
-		
-    } 
-    
-/*
- * intersect time tables
- */
-    public  function intersect($obj)   {
-    	
-    	for ( $i = 0; $i < count($obj->ids); $i++ ) {
-    		$table[$i] = $this->loadIntervalsFromTT($obj->ids[$i]);
-    		for ($j=0; $j < count($table[$i]['intervals']); $j++) {
-  				$interval[$i][$j][0] = $table[$i]['intervals'][$j]['start'];
-  				$interval[$i][$j][1] = $table[$i]['intervals'][$j]['stop'];
-  			}
-    		$intervals += count($interval[$i]);
-    	}  
-    	if ( $intervals > 10000) set_time_limit(1800);
-
-    	// Sort intervals in time tables
-        sort($interval[0]);
-        sort($interval[1]);
-            	
-    	$i = 0;
-	    $j = 0;
-	    $line = 0;
-	
-	    while ( ($i < count($interval[0])) && ($j < count($interval[1])) ) {
-	    	$inter = $this->call_intersection($interval[0][$i], $interval[1][$j]);
-	
-	        if ($inter[0][0] != 0 && $inter[0][1] != 0)
-	        {
-	        	$start[$line] = $inter[0][0];
-	            $stop[$line] = $inter[0][1];
-	            $line++;
-	        }
-	
-	        if ( $interval[0][$i][1] < $interval[1][$j][1] ) { $i++; }
-	        else {  $j++; }
-	    }
-	
-	    // Intersection is empty
-	    if ( $line == 0 ) {
-	    	$result ="empty";
-	    } 
-	    else {
-	    	$objTT->name = $obj->name;
-    		$objTT->nodeType = 'timeTable';
-    		$objTT->leaf = true;
-    		$objTT->created = null;
-    		$objTT->history = $obj->history;
-    		for ($i=0; $i < count($start); $i++) {	
-				$inter = new stdClass();
-				$inter->start = $start[$i];
-				$inter->stop = $stop[$i];
-				$objTT->intervals[] = $inter;
-    		}
-    		$objTT->nbIntervals = count($start);
-    		
-    		if (count($objTT->intervals) == 0)
-    		  $result ="empty";
-    		else
-    		{
-    		  $this->objectDom = new DomDocument('1.0'); 
-			     $this->objectDom->formatOutput = true;
-	    	  $result = $this->createObject($objTT, $folder);
-	    	
-	       if (!isset($result['error']))
-		        $this->saveIntervals($result['id'],$objTT->intervals,'intersect');
-		
-		     }  	
-	    }
-	    return  $result;		
-    }
-    
-         
-         function validNameObject($p){
-         	// overwritten
-         	$res = parent::validNameObject($p);
-         	 
-         	if (!$res['valid'])
-         		return $res;
-         	 
-         	//no space
-         	if (strpos($p->name, ' ') === FALSE)
-         		return array('valid' => true);
-         	
-         	return array('valid' => false, 'error' => 'Space character is not allowed');
-         }
-         
-	public function copyTT($src_path, $dst_path, $newId, $newName, $newDescription = NULL) 
+	 * Copy time table
+	 * @param $src_path
+	 * @param $dst_path
+	 * @param $newId
+	 * @param $newName
+	 * @param null $newDescription
+	 * @return bool
+	 */
+	public function copyTT($src_path, $dst_path, $newId, $newName, $newDescription = null)
 	{
-		if (!file_exists($src_path))
-			return FALSE;
-		
-		if (!is_dir($dst_path))
-			return FALSE;
-		
+		if (!file_exists($src_path)) {
+			return false;
+		}
+
+		if (!is_dir($dst_path)) {
+			return false;
+		}
+
 		$dom = new DomDocument('1.0');
 		$dom->formatOutput = true;
-		
-		if (!$dom->load($src_path))
-			return FALSE;
-		
+
+		if (!$dom->load($src_path)) {
+			return false;
+		}
+
 		$timeTableNodes = $dom->getElementsByTagName('timetable');
-		if ($timeTableNodes->length <= 0)
-			return FALSE;
-		
+		if ($timeTableNodes->length <= 0) {
+			return false;
+		}
+
 		$timeTableNode = $timeTableNodes->item(0);
-		
+
 		$timeTableNode->setAttribute('xml:id', $newId);
-		
+
 		$nameNodes = $timeTableNode->getElementsByTagName('name');
-		
+
 		if ($nameNodes->length <= 0) {
 			//create name node (normally never append)
 			$nameNode = $dom->createElement('name');
 			$timeTableNode->appendChild($nameNode);
-		}
-		else
+		} else {
 			$nameNode = $nameNodes->item(0);
-		
+		}
+
 		$nameNode->nodeValue = $newName;
-		
+
 		if (isset($newDescription) && !empty($newDescription)) {
 			$descriptionNodes = $timeTableNode->getElementsByTagName('description');
 			if ($descriptionNodes->length <= 0) {
 				//create description node (normally never append)
 				$descriptionNode = $dom->createElement('description');
 				$timeTableNode->appendChild($descriptionNode);
-			}
-			else
+			} else {
 				$descriptionNode = $descriptionNodes->item(0);
-	
+			}
+
 			$descriptionNode->nodeValue = $newDescription;
 		}
-		
-		$dst_file_path = $dst_path."/".$newId.".xml";
-		if ($dom->save($dst_file_path) === FALSE)
-			return FALSE;
-		
-		chgrp($dst_file_path, APACHE_USER);
-		chmod($dst_file_path, 0775);
-			
-		return TRUE;
+
+		$dstFilePath = $dst_path . "/" . $newId . ".xml";
+		if ($dom->save($dstFilePath) === false) {
+			return false;
+		}
+
+		chgrp($dstFilePath, APACHE_USER);
+		chmod($dstFilePath, 0775);
+
+		return true;
+	}
+
+	/**
+	 * Rename in resource
+	 * @param $name
+	 * @param $id
+	 * @return bool
+	 */
+	protected function renameInResource($name, $id)
+	{
+		if (!file_exists(USERTTDIR . $id . '.xml')) {
+			return false;
+		}
+
+		$this->objectDom->load(USERTTDIR . $id . '.xml');
+		if (!($objToRename = $this->objectDom->getElementById($id))) {
+			return false;
+		}
+		$objToRename->getElementsByTagName('name')->item(0)->nodeValue = $name;
+		$this->objectDom->save(USERTTDIR . $id . '.xml');
+
+		return true;
+	}
+
+	/**
+	 * Delete parameter
+	 * @param $id
+	 */
+	protected function deleteParameter($id)
+	{
+		if (file_exists(USERTTDIR . $id . '.xml')) {
+			unlink(USERTTDIR . $id . '.xml');
+		}
+	}
+
+	/**
+	 * Rename only
+	 * @param $p
+	 * @return bool
+	 */
+	protected function renameOnly($p)
+	{
+		//if (!($p->intervals)) return true;
+		return false;
 	}
 }
-?>