Pfad angepasst

media.class.php

@@ -120,20 +120,14 @@ class Media {
 				$FilmeArr = $this->dirtoArray($this->PfadzumEinlesen);
 			}else{
 				$this->dirtoArray($this->PfadzumAusgeben."Filme/");
-				//var_dump($FilmeArr1);
-				//echo PHP_EOL.count($FilmeArr1);
-				//$Pfad = trim(fgets(STDIN));
 				$FilmeArr = $this->dirtoArray($this->PfadzumAusgeben."Filme3D/");
-				//var_dump($FilmeArr2);
-				//echo PHP_EOL.count($FilmeArr2);
-				//$FilmeArr = array_merge($FilmeArr1,$FilmeArr2);
 			}
 			
 			$fehlerArr = array("");
 			$Counter=0;
 			//var_dump($FilmeArr);
 			foreach ($FilmeArr as $value) {
-				$array = $this->parseMovie((($action == "einlesen")?$this->PfadzumEinlesen."/":$this->PfadzumAusgeben."Filme/").(strlen($value[0])>0?$value[0].'/':''), $value[1],$action);
+				$array = $this->parseMovie($value[3].(strlen($value[0])>0?$value[0].'/':''), $value[1],$action);
 				if(($array == false)){
 					echo $this->Console->getColoredString("       ","black", "red").PHP_EOL;
 					$fehler = $this->Console->getColoredString("Fehler!","black", "red")." ".$this->PfadzumEinlesen.'/'.(strlen($value[0])>0?$value[0].'/':'').$value[1].PHP_EOL;
@@ -757,7 +751,7 @@ class Media {
 				
 				$Endung = trim(substr($Value,strripos( $Value,".")+1));
 				if(!in_array($Endung, $this->config["FileEndungIgnor"]) ){	
-					$this->FolderArray[] = array($root, $Value);
+					$this->FolderArray[] = array($root, $Value, $dir);
 				}
 			}
 		}