From b44a26eb73010260922d242875a3b4773936a084 Mon Sep 17 00:00:00 2001
From: root
Date: Mon, 15 Sep 2014 15:04:39 +0200
Subject: f5 protection and improved UI

---
 func.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'func.php')

diff --git a/func.php b/func.php
index 0a626c0..0efa43a 100644
--- a/func.php
+++ b/func.php
@@ -68,9 +68,9 @@ function video_xt_audio($VIDEO, $CACHEDIR, $FILENAME){
 	return true;
 }
 
-function convert_video($CACHEDIR, $FILENAME){
+function convert_video($CACHEDIR, $FILENAME, $MIME){
 	$fp=fopen($CACHEDIR."/".$FILENAME.".webm.txt", "w");
-	$content="extracting audio: ".$FILENAME."\n";
+	$content="converting video ".$FILENAME." to .webm\n";
 	fputs($fp, $content);
 	fclose($fp);
 	/*
@@ -81,9 +81,9 @@ function convert_video($CACHEDIR, $FILENAME){
 	*/
 	if(file_exists($CACHEDIR . "/" . $FILENAME.".webm"))
 		return true;
-	rename($CACHEDIR . "/" . $FILENAME, $CACHEDIR . "/" . $FILENAME. ".mp4");
-	exec("ffmpeg -i " . $CACHEDIR . "/" . $FILENAME. ".mp4 " .  $CACHEDIR . "/" . $FILENAME. ".webm", $pid, $ret);
-	rename($CACHEDIR . "/" . $FILENAME . ".mp4", $CACHEDIR . "/" . $FILENAME);
+//	rename($CACHEDIR . "/" . $FILENAME, $CACHEDIR . "/" . $FILENAME. ".mp4");
+	exec("ffmpeg -f ".escapeshellarg(preg_replace("/^video\//i", "", $MIME))." -i " . escapeshellarg($CACHEDIR . "/" . $FILENAME). " " . escapeshellarg($CACHEDIR . "/" . $FILENAME. ".webm"), $output, $ret);
+//	rename($CACHEDIR . "/" . $FILENAME . ".mp4", $CACHEDIR . "/" . $FILENAME);
 	if($ret != 0){
 		return false;
 	} 
-- 
cgit v1.2.3