Try to make a better filename

ynroot · Jul 8, 2017 · 3055705 · 3055705
1 parent 4459788
commit 3055705
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/objects/downloadVideo.php b/objects/downloadVideo.php
@@ -28,7 +28,7 @@
     $obj->title = __("Congratulations!");
     $obj->text = sprintf(__("Your video (%s) is downloading"), $title);
     $filename = preg_replace("/[^A-Za-z0-9]+/", "_", $title);
-    $filename = uniqid("{$filename}_", true).".mp4";
+    $filename = uniqid("{$filename}_uniqid_", true).".mp4";
     $cmd = PHP_BINDIR."/php -f youtubeDl.php {$filename} {$_POST['videoURL']} {$userId} > /dev/null 2>/dev/null &";
     exec($cmd);
     $obj->command = $cmd;

diff --git a/objects/youtubeDl.php b/objects/youtubeDl.php
@@ -27,7 +27,8 @@
 // save and encode video
 $_FILES['upl'] = array();
 $_FILES['upl']['error'] = 0;
-$_FILES['upl']['name'] = $filename;
+$videoNamePart = explode("_uniqid_", $filename); 
+$_FILES['upl']['name'] = $videoNamePart[0];
 $_FILES['upl']['tmp_name'] = "{$dir}{$filename}";
 $_FILES['upl']['dontMoveUploadedFile'] = true;
 

diff --git a/view/include/navbar.php b/view/include/navbar.php
@@ -165,7 +165,7 @@
                             <div>
                                 <a href="<?php echo $global['webSiteRootURL']; ?>charts" class="btn btn-info btn-xs btn-block">
                                     <span class="fa fa-bar-chart"></span> 
-                                    <?php echo __("Video Chart"); ?>
+                                    <?php echo __("Video Statistics"); ?>
                                 </a>
                             </div>
                         </li>

diff --git a/view/mini-upload-form/upload.php b/view/mini-upload-form/upload.php
@@ -142,8 +142,8 @@
 
     $path_parts = pathinfo($_FILES['upl']['name']);
     $mainName = preg_replace("/[^A-Za-z0-9]/", "", $path_parts['filename']);
-    $filename = uniqid($mainName . "_", true);
-
+    $filename = uniqid($mainName . "_uniqid_", true);
+    
     $video = new Video(preg_replace("/_+/", " ", $_FILES['upl']['name']), $filename, @$_FILES['upl']['videoId']);
     $video->setDuration($duration);
     if ($type == 'audio') {