#106 - video transcoding: fixes

inc/classes/BxDolTranscoder.php

@@ -406,22 +406,21 @@ class BxDolTranscoder extends BxDol implements iBxDolFactoryObject
             }
         }
 
-        if ($sExtChange && false !== ($iDotPos = strrpos($sTmpFile, '.'))) {
-            $sExtOld = substr($sTmpFile, $iDotPos+1);
+        if ($sExtChange) {
+            $iDotPos = strrpos($sTmpFile, '.');
+            $sExtOld = false === $iDotPos ? '' : substr($sTmpFile, $iDotPos+1);
             if ($sExtOld != $sExtChange) {
                 $sTmpFileOld = $sTmpFile;
-                $sTmpFile = substr_replace ($sTmpFile, $sExtChange, $iDotPos+1, strlen($sExtOld));
+                $sTmpFile = false === $iDotPos ? $sTmpFile . '.' . $sExtChange : substr_replace($sTmpFile, $sExtChange, $iDotPos+1, strlen($sExtOld));
                 if (!rename($sTmpFileOld, $sTmpFile)) {
                     @unlink($sTmpFileOld);
                     $this->_oDb->updateQueueStatus($mixedHandler, BX_DOL_QUEUE_FAILED, "change file extension failed: $sTmpFileOld => $sTmpFile");
                     return false;
                 }
             }
-
         }
 
         $mixedHandler = $this->processHandlerForRetinaDevice($mixedHandler);
-
         
         $bRet = true;
         if ($this->_sQueueStorage) {
@@ -703,13 +702,8 @@ class BxDolTranscoder extends BxDol implements iBxDolFactoryObject
     }
 
     protected function storeFileLocally_Queue ($mixedHandler)
-    {
-        $sMethodStoreFile = 'storeFileLocally_' . $this->_aObject['source_type'];
-        $sTmpFile = $this->$sMethodStoreFile($mixedHandler);
-        if ($sTmpFile)
-            return $sTmpFile;
-        
-        $aQueue = $o->getDb->getFromQueue($r['file_id_source']);
+    {   
+        $aQueue = $this->_oDb->getFromQueue($mixedHandler);
         if (!$aQueue || !$aQueue['file_url_source'])
             return false;
 

install/sql/system.sql

@@ -1040,7 +1040,7 @@ CREATE TABLE IF NOT EXISTS `sys_objects_storage` (
 INSERT INTO `sys_objects_storage` (`object`, `engine`, `params`, `token_life`, `cache_control`, `levels`, `table_files`, `ext_mode`, `ext_allow`, `ext_deny`, `quota_size`, `current_size`, `quota_number`, `current_number`, `max_file_size`, `ts`) VALUES
 ('sys_images', 'Local', '', 360, 2592000, 0, 'sys_images', 'allow-deny', 'jpg,jpeg,jpe,gif,png', '', 0, 0, 0, 0, 0, 0),
 ('sys_cmts_images', 'Local', '', 360, 2592000, 3, 'sys_cmts_images', 'allow-deny', 'jpg,jpeg,jpe,gif,png', '', 0, 0, 0, 0, 0, 0),
-('sys_cmts_images_preview', 'Local', '', 360, 2592000, 3, 'sys_cmts_images_preview', 'allow-deny', 'jpg,jpeg,jpe,gif,png', '', 0, 0, 0, 0, 0, 0);
+('sys_cmts_images_preview', 'Local', '', 360, 2592000, 3, 'sys_cmts_images_preview', 'allow-deny', 'jpg,jpeg,jpe,gif,png', '', 0, 0, 0, 0, 0, 0),
 ('sys_transcoder_queue_files', 'Local', '', 3600, 2592000, 0, 'sys_transcoder_queue_files', 'allow-deny', 'avi,flv,mpg,mpeg,wmv,mp4,m4v,mov,divx,xvid,3gp,webm,jpg', '', 0, 0, 0, 0, 0, 0);
 
 CREATE TABLE IF NOT EXISTS `sys_storage_user_quotas` (