Changeset 15476

Timestamp:

09/01/11 02:04:56 (9 months ago)

Author:

Alexander Trofimov

Message:

uploaders

Location:

trunk

Files:

• contact.php (modified) (1 diff)
• inc/classes/BxDolDb.php (modified) (1 diff)
• inc/classes/BxDolStorage.php (modified) (9 diffs)
• inc/classes/BxDolStorageLocal.php (modified) (2 diffs)
• inc/classes/BxDolStorageQuery.php (modified) (2 diffs)
• inc/classes/BxDolStorageS3.php (modified) (2 diffs)
• inc/classes/BxDolUploader.php (added)
• inc/js/classes/BxDolUploader.js (added)
• inc/languages.inc.php (modified) (1 diff)
• install/langs/lang-en.php (modified) (2 diffs)
• install/sql/v70.sql (modified) (1 diff)
• plugins/fileuploader.js (added)
• storage_uploader.php (added)
• templates/base/css/uploaders.css (added)
• templates/base/images/loading-spinner.gif (added)
• templates/base/popup_box.html (modified) (1 diff)
• templates/base/scripts/BxBaseFormView.php (modified) (9 diffs)
• templates/base/scripts/BxBaseUploaderHTML5.php (added)
• templates/base/scripts/BxBaseUploaderSimple.php (added)
• templates/base/uploader_button_html5.html (added)
• templates/base/uploader_button_simple.html (added)
• templates/base/uploader_form_html5.html (added)
• templates/base/uploader_form_simple.html (added)
• templates/tmpl_uni/scripts/BxTemplUploaderHTML5.php (added)
• templates/tmpl_uni/scripts/BxTemplUploaderSimple.php (added)

trunk/contact.php

@@ -90 +90 @@
                 ),
             ),
+
+
+            'attachments' => array(
+                'type' => 'files',
+                'storage_object' => 'sample2',
+                'uploaders' => array ('Simple', 'HTML5'),
+                'name' => 'attachments',
+                'caption' => _t('_Attachments'),
+                'required' => true,
+            ),
+
             'captcha' => array(
                 'type' => 'captcha',

trunk/inc/classes/BxDolDb.php

@@ -619 +619 @@
      * This function is usefull when you need to form array of parameters to pass to IN(...) SQL construction.
      * Example:
-     * \code
+     * @code
      * $a = array(2, 4.5, 'apple', 'car');
      * $s = "SELECT * FROM `t` WHERE `a` IN (" . $oDb->implode_escape($a) . ")";
      * echo $s; // outputs: SELECT * FROM `t` WHERE `a` IN (2, 4.5, 'apple', 'car')
-     * \endcode
+     * @endcode
      *
      * @param $mixed array or parameters or just one paramter

trunk/inc/classes/BxDolStorage.php

@@ -33 +33 @@
 */
 
+define('BX_DOL_STORAGE_ERR_NO_INPUT_METHOD', 1000); ///< there is such input method available
 define('BX_DOL_STORAGE_ERR_NO_FILE', 1001); ///< there is no file to upload
 define('BX_DOL_STORAGE_INVALID_FILE', 1002); ///< uploaded file is invalid or hack attempts
@@ -53 +54 @@
 define('BX_DOL_STORAGE_DEFAULT_MIME_TYPE', 'octet/stream'); ///< default mime type if it is not find by extension
 
+
 bx_import('BxDolStorageQuery');
 
@@ -159 +161 @@
      * @return id of added file on success, false on error - to get exact error code call getErrorCode()
      */
-    public function storeFile($sFilePath, $sName, $isPrivate = false, $iProfileId = 0) { }
+    public function storeFile($sMethod, $aMethodParams, $sName = false, $isPrivate = false, $iProfileId = 0) {
+
+        // setup input source using helper classes, like $_FILES or some URL for example
+
+        $sHelperClass = 'BxDolStorageHelper' . $sMethod;
+        if (!class_exists($sHelperClass)) {
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_NO_INPUT_METHOD);
+            return false;
+        }
+
+        $oHelper = new $sHelperClass($aMethodParams);
+
+        // check for errors, like size and extentions checking
+
+        if ($iImmediateError = $oHelper->getImmediateError()) {
+            $this->setErrorCode($iImmediateError);
+            return false;
+        }
+
+        $sExt = $this->getFileExt($oHelper->getName());
+        $sMimeType = $this->getMimeTypeByFileName($oHelper->getName());
+
+        if (!$this->isValidExt($sExt)) {
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_WRONG_EXT);
+            return false;
+        }
+
+        // before aupload callback + additional checking
+
+        if (!$this->onBeforeFileAdd (array(
+            'profile_id' => $iProfileId,
+            'file_name' => $oHelper->getName(),
+            'mime_type' => $sMimeType,
+            'ext' => $sExt,
+            'size' => $oHelper->getSize(),
+            'private' => $isPrivate ? 1 : 0,
+        ))) {
+            return false;
+        }
+
+        // create tmp file        
+        
+        $sTmpFile = $temp_file = tempnam(sys_get_temp_dir(), 'bxdol');;
+        if (!$oHelper->save($sTmpFile)) {
+            $this->setErrorCode(BX_DOL_STORAGE_INVALID_FILE);
+            return false;
+        }
+
+        // store file to storage engine
+
+        $sLocalId = $this->genRandName();
+        $sPath = $this->genPath($sLocalId, $this->_aObject['levels']);
+        $sRemoteNamePath = $this->genRemoteNamePath ($sPath, $sLocalId, $sExt);
+
+        if (!$this->addFileToEngine($sTmpFile, $sLocalId, $oHelper->getName(), $isPrivate, $iProfileId)) {
+            unlink($sTmpFile);
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_ENGINE_ADD);
+        }
+        unlink($sTmpFile);
+
+        // add record in db
+
+        $iTime = time();
+        $iSize = $oHelper->getSize();        
+        $bFileAdded = $this->_oDb->addFile($iProfileId, $sLocalId, $sRemoteNamePath, $oHelper->getName(), $sMimeType, $sExt, $iSize, $iTime, $isPrivate);
+        $iId = $this->_oDb->lastId();
+        if (!$bFileAdded || !$iId) {        
+            $this->deleteFileFromEngine($sPath . $sLocalId, $isPrivate);
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_DB);
+            return false;
+        }
+            
+        // after upload callback + triggers update
+    
+        if (!$this->onFileAdded (array(
+            'id' => $iId,
+            'profile_id' => $iProfileId,
+            'remote_id' => $sLocalId,
+            'path' => $sPath . $sLocalId,
+            'file_name' => $oHelper->getName(),
+            'mime_type' => $sMimeType,
+            'size' => $iSize,
+            'private' => $isPrivate ? 1 : 0,
+        ))) {
+            $this->deleteFileFromEngine($sPath . $sLocalId, $isPrivate);
+            $this->_oDb->deleteFile($iId);            
+            return false;
+        }
+
+        return $iId;
+    }
+
+    /**
+     * convert default multiple files array into more logical one
+     */
+    public function convertMultipleFilesArray($aFiles) { 
+        
+        if (!is_array($aFiles) || !is_array($aFiles['name']))
+            return false;
+        $aRet = array ();
+        foreach ($aFiles['name'] as $i => $sName) {            
+            foreach ($aFiles as $sKey => $r) {
+                if (!$aFiles['name'][$i])
+                    break;
+                $aRet[$i][$sKey] = $aFiles[$sKey][$i];
+            }            
+        }
+        return $aRet;    
+    }
 
     /**
      * the same as storeFile, but it tries to do it directly from uploaded file
      */
-    public function storeUploadedFile($aFile, $isPrivate = false, $iProfileId = 0) { }
+    public function storeFileFromForm($aFile, $isPrivate = false, $iProfileId = 0) {
+        return $this->storeFile('Form', array('file' => $aFile), false, $isPrivate, $iProfileId);
+    }
+
+    /**
+     * the same as storeFile, but it tries to do it directly from HTML5 file upload method
+     */
+    public function storeFileFromXhr($sName, $isPrivate = false, $iProfileId = 0) {
+        return $this->storeFile('Xhr', array('name' => $sName), false, $isPrivate, $iProfileId);
+    }
 
     /**
      * Delete file by file id.
      */
-    public function deleteFile($iFileId) { }
+    public function deleteFile($iFileId, $iProfileId = 0) { 
+        
+        $aFile = $this->_oDb->getFileById ($iFileId);
+        if (!$aFile) {
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_FILE_NOT_FOUND);
+            return false;
+        }
+
+        if (!$this->onBeforeFileDelete ($aFile, $iProfileId)) {
+            return false;
+        }
+    
+        if (!$this->deleteFileFromEngine($aFile['path'], $aFile['private'])) { 
+            return false;
+        }
+
+        if (!$this->_oDb->deleteFile($aFile['id'])) {
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_DB);
+            return false;
+        }
+
+        if (!$this->onFileDeleted ($aFile, $iProfileId)) {
+            return false;
+        }
+
+        return true;
+    }
 
     /**
@@ -178 +323 @@
     public function getFileUrlById($iFileId) { }
 
+    /**
+     * Get file info array by file id.
+     */ 
+    public function getFile($iFileId) {
+        return $this->_oDb->getFileById($iFileId);
+    }
+
+    /**
+     * Call this function after saving/associate just uploaded file id, so file is not ghost.
+     * Ghost files appear on download form automaticaly during next upload, 
+     * for example if file was uploaded but was not submitted for some reason, 
+     * so this mechanism ensure that file is not lost.
+     * @param $mixedFileIds array of file ids or just file id
+     * @param $iProfileId profile id
+     * @param return number of deleted ghost files
+     */
+    public function afterUploadCleanup($mixedFileIds, $iProfileId) {
+        return $this->_oDb->deleteGhosts($mixedFileIds, $iProfileId);
+    }
+
+    public function getGhosts($iProfileId) {
+        return $this->_oDb->getGhosts($iProfileId);
+    }    
 
     public function tmpDebugGetFilesList() {
         $sQuery = "SELECT * FROM `" . $this->_aObject['table_files'] . "`";
         return $this->_oDb->getAll($sQuery);
+    }
+
+    public function getRestrictionsTextExtensions ($iProfileId) {
+        switch ($this->_aObject['ext_mode']) {
+            case 'allow-deny':
+                if (!$this->_aObject['ext_allow'])
+                    return _t('_sys_storage_restriction_ext_all_denied');
+                return _t('_sys_storage_restriction_ext_allowed', $this->_aObject['ext_allow']);
+            case 'deny-allow':
+                if (!$this->_aObject['ext_deny'])
+                    return _t('_sys_storage_restriction_ext_all_allowed');
+                return _t('_sys_storage_restriction_ext_denied', $this->_aObject['ext_deny']);
+            default:
+                return _t('_sys_storage_restriction_ext_all_denied');
+        }
+    }
+
+    public function getRestrictionsTextFileSize ($iProfileId) {
+        return _t('_sys_storage_restriction_size', _t_format_size($this->getMaxUploadFileSize($iProfileId)));
+    }
+
+    public function getRestrictionsTextArray ($iProfileId) {
+        $aTypes = array('Extensions', 'FileSize');
+        $aRet = array();
+        foreach ($aTypes as $sType) {
+            $sFunc = 'getRestrictionsText' . $sType;
+            $s = $this->$sFunc ($iProfileId);
+            if ($s)
+                $aRet[] = $s;
+        }
+        return $aRet;
     }
 
@@ -237 +436 @@
         }
 
+        if (!$this->_oDb->insertGhosts ($aFileInfo['id'], $aFileInfo['profile_id'])) {
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_DB);
+            return false;
+        }
+
         $this->setErrorCode(BX_DOL_STORAGE_ERR_OK);
         $bRet = true;        
@@ -269 +473 @@
         }
 
+        $this->_oDb->deleteGhosts ($aFileInfo['id'], $aFileInfo['profile_id']);
+
         $this->setErrorCode(BX_DOL_STORAGE_ERR_OK);
         $bRet = true;
@@ -278 +484 @@
 
     // ------------ internal functions
-
-    protected function storeUploadedFileBegin($aFile, $isPrivate = false, $iProfileId = 0) { 
-
-        if (!$aFile['size'] || !$aFile['tmp_name']) {
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_NO_FILE);
-            return false;
-        }
-
-        if (UPLOAD_ERR_OK != $aFile['error']) {
-            $this->setErrorCode((int)$aFile['error']);
-            return false;
-        }
-
-        $sExt = $this->getFileExt($aFile['name']);
-        $sMimeType = $this->getMimeTypeByFileName($aFile['name']);
-
-        if (!$this->isValidExt($sExt)) {
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_WRONG_EXT);
-            return false;
-        }
-
-        if (!$this->onBeforeFileAdd (array(
-            'profile_id' => $iProfileId,
-            'file_name' => $aFile['name'],
-            'mime_type' => $sMimeType,
-            'ext' => $sExt,
-            'size' => $aFile['size'],
-            'private' => $isPrivate ? 1 : 0,
-        ))) {
-            return false;
-        }
-
-        return true;
-    }
 
     protected function setErrorCode($i) {
@@ -335 +507 @@
             $sRet .= substr($s, 0, $i++) . '/';
         return $sRet;
+    }
+
+    protected function genRemoteNamePath ($sPath, $sLocalId, $sExt) {
+        return $sPath . $sLocalId;
     }
 
@@ -382 +558 @@
 }
 
+
+/**
+ * Handle file uploads via XMLHttpRequest
+ */
+class BxDolStorageHelperXhr {
+
+    var $sName;
+
+    function BxDolStorageHelperXhr ($aParams) {
+        $this->sName = $aParams['name'];
+    }
+
+    function getImmediateError() {
+        return BX_DOL_STORAGE_ERR_OK;
+    }
+
+    function save($path) {    
+        $input = fopen("php://input", "r");
+        $temp = tmpfile();
+        $realSize = stream_copy_to_stream($input, $temp);
+        fclose($input);
+        
+        if (false === $this->getSize() || $realSize != $this->getSize()) {
+            return false;
+        }
+        
+        $target = fopen($path, "w");        
+        fseek($temp, 0, SEEK_SET);
+        stream_copy_to_stream($temp, $target);
+        fclose($target);
+        
+        return true;
+    }
+
+    function getName() {
+        return $this->sName;
+    }
+
+    function getSize() {
+        if (isset($_SERVER["CONTENT_LENGTH"]))
+            return (int)$_SERVER["CONTENT_LENGTH"];            
+        else
+            return false;
+    }   
+}
+
+/**
+ * Handle file uploads via regular form post (uses the $_FILES array)
+ */
+class BxDolStorageHelperForm {  
+
+    var $aFile;
+
+    function BxDolStorageHelperForm ($aParams) {
+        $this->aFile = $aParams['file'];
+    }
+
+    function getImmediateError() {
+
+        if (!$this->aFile['size'] || !$this->aFile['tmp_name'])
+            return BX_DOL_STORAGE_ERR_NO_FILE;
+
+        if (UPLOAD_ERR_OK != $this->aFile['error'])
+            return (int)$this->aFile['error'];
+
+        return BX_DOL_STORAGE_ERR_OK;
+    }
+
+    function save($path) {
+        if (!move_uploaded_file($this->aFile['tmp_name'], $path)){
+            return false;
+        }
+        return true;
+    }
+
+    function getName() {
+        return $this->aFile['name'];
+    }
+
+    function getSize() {
+        return $this->aFile['size'];
+    }
+}
+

trunk/inc/classes/BxDolStorageLocal.php

@@ -19 +19 @@
     public function BxDolStorageLocal($aObject) {
         parent::BxDolStorage($aObject);
-    }
-
-    /**
-     * Store file in the storage area.
-     * @param $sFilePath full path to the the file, with path and file, it maybe temporary uploaded file 
-     * @param $sName file name with extention
-     * @param $isPrivate private or public file
-     * @return id of added file on success, false on error - to get exact error code call getErrorCode()
-     */
-    public function storeFile($sFilePath, $sName, $isPrivate = false, $iProfileId = 0) { }
-
-    /**
-     * the same as storeFile, but it tries to do it directly from uploaded file
-     */
-    public function storeUploadedFile($aFile, $isPrivate = false, $iProfileId = 0) { 
-
-        if (!$this->storeUploadedFileBegin($aFile, $isPrivate, $iProfileId))
-            return false;
-
-        $sExt = $this->getFileExt($aFile['name']);
-        $sMimeType = $this->getMimeTypeByFileName($aFile['name']);
-
-        $sLocalId = $this->genRandName();
-        $sPath = $this->genPath($sLocalId, $this->_aObject['levels']);
-        $sNewFileDir = $this->getObjectBaseDir($isPrivate) . $sPath;
-        $sNewFilePath = $sNewFileDir . $sLocalId;
-
-        $this->mkdir($sNewFileDir);
-        if (!file_exists($sNewFileDir) || !is_writable($sNewFileDir)) {
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_FILESYSTEM_PERM);
-            return false;
-        }
-        
-        if (!move_uploaded_file($aFile['tmp_name'], $sNewFilePath)) {
-            $this->setErrorCode(BX_DOL_STORAGE_INVALID_FILE);
-            return false;
-        }
-
-        if (!chmod ($sNewFilePath, BX_DOL_STORAGE_FILE_RIGHTS)) {
-            unlink($sNewFilePath);
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_ENGINE_ADD);
-            return false;
-        }
-
-        $iTime = time();
-        $iSize = filesize($sNewFilePath);
-        if (!$this->_oDb->addFile($iProfileId, $sLocalId, $sPath . $sLocalId, $aFile['name'], $sMimeType, $sExt, $iSize, $iTime, $isPrivate)) {
-            unlink($sNewFilePath);
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_DB);
-            return false;
-        }
-    
-        $iId = $this->_oDb->lastId();
-        if (!$iId) {
-            unlink($sNewFilePath);
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_DB);
-            return false;
-        }
-
-        if (!$this->onFileAdded (array(
-            'id' => $iId,
-            'profile_id' => $iProfileId,
-            'remote_id' => $sLocalId,
-            'path' => $sPath . $sLocalId,
-            'file_name' => $aFile['name'],
-            'mime_type' => $sMimeType,
-            'size' => $iSize,
-            'private' => $isPrivate ? 1 : 0,
-        ))) {
-            $this->_oDb->deleteFile($iId);
-            unlink($sNewFilePath);
-            return false;
-        }
-
-        return $iId;
-    }
-
-    /**
-     * Delete file by file id.
-     */
-    public function deleteFile($iFileId, $iProfileId = 0) { 
-        
-        $aFile = $this->_oDb->getFileById ($iFileId);
-        if (!$aFile) {
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_FILE_NOT_FOUND);
-            return false;
-        }
-       
-        $sFileLocation = $this->getObjectBaseDir($aFile['private']) . $aFile['path'];
-
-        if (!file_exists($sFileLocation)) {
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_FILE_NOT_FOUND);
-            return false;
-        }
-
-        if (!$this->onBeforeFileDelete ($aFile, $iProfileId)) {
-            return false;
-        }
-        
-        if (!unlink($sFileLocation)) {
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_UNLINK);
-            return false;
-        }
-
-        if (!$this->_oDb->deleteFile($aFile['id'])) {
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_DB);
-            return false;
-        }
-
-        if (!$this->onFileDeleted ($aFile, $iProfileId)) {
-            return false;
-        }
-
-        return true;
     }
 
@@ -190 +76 @@
     // ----------------    
 
+    protected function addFileToEngine($sTmpFile, $sLocalId, $sName, $isPrivate, $iProfileId) {
+        
+        $sPath = $this->genPath($sLocalId, $this->_aObject['levels']);
+        $sNewFileDir = $this->getObjectBaseDir($isPrivate) . $sPath;
+        $sNewFilePath = $sNewFileDir . $sLocalId;
+
+        $this->mkdir($sNewFileDir);
+        if (!file_exists($sNewFileDir) || !is_writable($sNewFileDir)) {
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_FILESYSTEM_PERM);
+            return false;
+        }
+        
+        if (!copy($sTmpFile, $sNewFilePath)) {
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_ENGINE_ADD);
+            return false;
+        }
+
+        if (!chmod ($sNewFilePath, BX_DOL_STORAGE_FILE_RIGHTS)) {
+            unlink($sNewFilePath);
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_ENGINE_ADD);
+            return false;
+        }
+
+        return true;
+    }
+
+    protected function deleteFileFromEngine($sFilePath, $isPrivate) { 
+
+        $sFileLocation = $this->getObjectBaseDir($isPrivate) . $sFilePath;
+
+        if (!file_exists($sFileLocation)) {
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_FILE_NOT_FOUND);
+            return false;
+        }
+
+        if (!unlink($sFileLocation)) {
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_UNLINK);
+            return false;
+        }
+
+        return true;
+    }
+
     protected function getObjectBaseDir ($isPrivate = false) {
         return BX_DIRECTORY_STORAGE . $this->_aObject['object'] . '/';

trunk/inc/classes/BxDolStorageQuery.php

@@ -47 +47 @@
         $sQuery = $this->prepare("
             UPDATE `sys_objects_storage` 
-            SET `current_size` = `current_size` + ?, `current_number` = `current_number` + ?, `ts` = ? 
+            SET `current_size` = `current_size` + ?, `current_number` = `current_number` + (?), `ts` = ? 
             WHERE `object` = ?", 
             $iSize, $iNumber, $iTime, $this->_aObject['object']
@@ -127 +127 @@
     }
 
+    public function insertGhosts($mixedFileIds, $iProfileId) {
+
+        $iTime = time();
+        if (!is_array($mixedFileIds))
+            $mixedFileIds = array($mixedFileIds);
+        
+        $iCount = 0;
+        foreach ($mixedFileIds as $iFileId) {
+            $sQuery = $this->prepare("INSERT INTO `sys_storage_ghosts` SET `id` = ?, `profile_id` = ?, `object` = ?, `created` = ?", $iFileId, $iProfileId, $this->_aObject['object'], $iTime);
+            $iCount += $this->query($sQuery);
+        }
+        return $iCount;
+    }
+
+    public function deleteGhosts($mixedFileIds, $iProfileId) {
+        $sQuery = $this->prepare("DELETE FROM `sys_storage_ghosts` WHERE `profile_id` = ? AND `object` = ? AND `id` IN (" . $this->implode_escape($mixedFileIds) . ")", $iProfileId, $this->_aObject['object']);
+        $iCount = $this->query($sQuery);
+        if ($iCount)
+            $this->query("OPTIMIZE TABLE `sys_storage_ghosts`");
+        return $iCount;
+    }
+
+    public function getGhosts($iProfileId) {
+        $sQuery = $this->prepare("SELECT `f`.* FROM `sys_storage_ghosts` AS `g` INNER JOIN " . $this->_sTableFiles . " AS `f` ON (`f`.`id` = `g`.`id` AND `f`.`profile_id` = ?) WHERE `g`.`profile_id` = ? AND `g`.`object` = ?", $iProfileId, $iProfileId, $this->_aObject['object']);
+        return $this->getAll($sQuery);
+    }
+
     public function prune() {
         $iTime = time();

trunk/inc/classes/BxDolStorageS3.php

@@ -42 +42 @@
 
     /**
-     * Store file in the storage area.
-     * @param $sFilePath full path to the the file, with path and file, it maybe temporary uploaded file 
-     * @param $sName file name with extention
-     * @param $isPrivate private or public file
-     * @return id of added file on success, false on error - to get exact error code call getErrorCode()
-     */
-    public function storeFile($sFilePath, $sName, $isPrivate = false, $iProfileId = 0) { }
-
-    /**
-     * the same as storeFile, but it tries to do it directly from uploaded file
-     */
-    public function storeUploadedFile($aFile, $isPrivate = false, $iProfileId = 0) { 
-
-        if (!$this->storeUploadedFileBegin($aFile, $isPrivate, $iProfileId))
-            return false;
-
-        $sExt = $this->getFileExt($aFile['name']);
-        $sMimeType = $this->getMimeTypeByFileName($aFile['name']);
-        
-        $sLocalId = $this->genRandName();
-        $sTmpFile = BX_DIRECTORY_PATH_TMP . $sLocalId;
-        $sPath = $this->genPath($sLocalId, $this->_aObject['levels']);
-        $sRemoteNamePath = $sPath . $sLocalId . '.' . $sExt;
-
-        if (!move_uploaded_file($aFile['tmp_name'], $sTmpFile)) {
-            $this->setErrorCode(BX_DOL_STORAGE_INVALID_FILE);
-            return false;
-        }
-       
-        $aMetaHeaders = array();
-        $aRequestHeaders = array (
-            "Content-Type"  => $sMimeType,
-        );
-        if ($this->_iCacheControl > 0) {
-            $aRequestHeaders = array_merge ($aRequestHeaders, array (
-                "Cache-Control" => "max-age=" . ($isPrivate && $this->_iCacheControl > $this->_aObject['token_life'] ? $this->_aObject['token_life'] : $this->_iCacheControl),
-            ));
-        }
-
-        $sStorageClass = $this->_bReducedRedundancy ? S3::STORAGE_CLASS_RRS : S3::STORAGE_CLASS_STANDARD;
-        $sACL = $isPrivate ? S3::ACL_AUTHENTICATED_READ : S3::ACL_PUBLIC_READ;
-        $aInputFile = $this->_s3->inputFile($sTmpFile);                        
-        if (!$this->_s3->putObject($aInputFile, $this->_sBucket, $this->getObjectBaseDir($isPrivate) . $sRemoteNamePath, $sACL, $aMetaHeaders, $aRequestHeaders, $sStorageClass)) {
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_ENGINE_ADD);
-            return false;
-        }               
-
-        $iTime = time();
-        $iSize = filesize($sTmpFile);
-        if (!$this->_oDb->addFile($iProfileId, $sLocalId, $sRemoteNamePath, $aFile['name'], $sMimeType, $sExt, $iSize, $iTime, $isPrivate)) {
-            $this->_s3->deleteObject($this->_sBucket, $this->getObjectBaseDir($isPrivate) . $sRemoteNamePath);
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_DB);
-            return false;
-        }
-    
-        $iId = $this->_oDb->lastId();
-        if (!$iId) {
-            $this->_s3->deleteObject($this->_sBucket, $this->getObjectBaseDir($isPrivate) . $sRemoteNamePath);
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_DB);
-            return false;
-        }
-
-        if (!$this->onFileAdded (array(
-            'id' => $iId,
-            'profile_id' => $iProfileId,
-            'remote_id' => $sLocalId,
-            'path' => $sRemoteNamePath,
-            'file_name' => $aFile['name'],
-            'mime_type' => $sMimeType,
-            'size' => $iSize,
-            'private' => $isPrivate ? 1 : 0,
-        ))) {
-            $this->_oDb->deleteFile($iId);
-            $this->_s3->deleteObject($this->_sBucket, $this->getObjectBaseDir($isPrivate) . $sRemoteNamePath);
-            return false;
-        }
-
-        return $iId;
-    }
-
-    /**
-     * Delete file by file id.
-     */
-    public function deleteFile($iFileId, $iProfileId = 0) { 
-        
-        $aFile = $this->_oDb->getFileById ($iFileId);
-        if (!$aFile) {
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_FILE_NOT_FOUND);
-            return false;
-        }
-
-        $sFileLocation = $this->getObjectBaseDir($aFile['private']) . $aFile['path'];
-
-        if (!$this->onBeforeFileDelete ($aFile, $iProfileId)) {
-            return false;
-        }
-        
-        if (!$this->_s3->deleteObject($this->_sBucket, $sFileLocation)) {
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_UNLINK);
-            return false;
-        }
-
-        if (!$this->_oDb->deleteFile($aFile['id'])) {
-            $this->setErrorCode(BX_DOL_STORAGE_ERR_DB);
-            return false;
-        }
-
-        if (!$this->onFileDeleted ($aFile, $iProfileId)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
      * Get file url, you need to override this to generate custom url for private files.
      * @param $iFileId file 
@@ -181 +66 @@
     // ----------------    
 
+    protected function addFileToEngine($sTmpFile, $sLocalId, $sName, $isPrivate, $iProfileId) {
+
+        $sMimeType = $this->getMimeTypeByFileName($sName);
+        $sExt = $this->getFileExt($sName);
+        $sPath = $this->genPath($sLocalId, $this->_aObject['levels']);
+        $sRemoteNamePath = $sPath . $sLocalId . ($sExt ? '.' . $sExt : '');
+
+        $aMetaHeaders = array();
+        $aRequestHeaders = array (
+            "Content-Type"  => $sMimeType,
+        );
+        if ($this->_iCacheControl > 0) {
+            $aRequestHeaders = array_merge ($aRequestHeaders, array (
+                "Cache-Control" => "max-age=" . ($isPrivate && $this->_iCacheControl > $this->_aObject['token_life'] ? $this->_aObject['token_life'] : $this->_iCacheControl),
+            ));
+        }
+
+        $sStorageClass = $this->_bReducedRedundancy ? S3::STORAGE_CLASS_RRS : S3::STORAGE_CLASS_STANDARD;
+        $sACL = $isPrivate ? S3::ACL_AUTHENTICATED_READ : S3::ACL_PUBLIC_READ;
+        $aInputFile = $this->_s3->inputFile($sTmpFile);                        
+        if (!$this->_s3->putObject($aInputFile, $this->_sBucket, $this->getObjectBaseDir($isPrivate) . $sRemoteNamePath, $sACL, $aMetaHeaders, $aRequestHeaders, $sStorageClass)) {
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_ENGINE_ADD);
+            return false;
+        }               
+
+        return true;
+    }
+
+    protected function deleteFileFromEngine($sFilePath, $isPrivate) { 
+
+        $sFileLocation = $this->getObjectBaseDir($isPrivate) . $sFilePath;
+        
+        if (!$this->_s3->deleteObject($this->_sBucket, $sFileLocation)) {
+            $this->setErrorCode(BX_DOL_STORAGE_ERR_UNLINK);
+            return false;
+        }
+
+        return true;
+    }
+
+    protected function genRemoteNamePath ($sPath, $sLocalId, $sExt) {
+        return $sPath . $sLocalId . ($sExt ? '.' . $sExt : '');
+    }
+
     protected function getObjectBaseDir ($isPrivate = false) {
         return $this->_aObject['object'] . '/';

trunk/inc/languages.inc.php

@@ -490 +490 @@
     }
 }
+
+function _t_format_size ($iSize) {
+    $a = array (
+        1024 => '_sys_format_size_b', 
+        1024*1024 => '_sys_format_size_kb',
+        1024*1024*1024 => '_sys_format_size_mb',
+        1024*1024*1024*1024 => '_sys_format_size_gb',
+        1024*1024*1024*1024*1024 => '_sys_format_size_tb',
+    );    
+    foreach ($a as $i => $sKey)
+        if ($iSize < $i)
+            return _t($sKey, round($iSize / ($i / 1024), 1));
+    return _t('_sys_format_size_b', 0);
+}

trunk/install/langs/lang-en.php

@@ -84 +84 @@
     '_Error' => 'Error',
     '_Explanation' => 'Explanation',
+    '_Failed' => 'Failed',
     '_FAQ' => 'FAQ',
     '_Female' => 'Woman',
@@ -2840 +2841 @@
     '_adm_mobile_page_homepage' => 'Homepage',
     '_adm_mobile_page_profile' => 'Profile',
+
+    '_sys_format_size_b' => '{0} bytes',
+    '_sys_format_size_kb' => '{0} Kb',
+    '_sys_format_size_mb' => '{0} Mb',
+    '_sys_format_size_gb' => '{0} Gb',
+    '_sys_format_size_tb' => '{0} Tb',
+
+    '_sys_storage_restriction_ext_all_allowed' => 'Files of any type are allowed.',
+    '_sys_storage_restriction_ext_all_denied' => 'Sorry, all file types are restricted for now',
+    '_sys_storage_restriction_ext_allowed' => 'Only files with the following types are allowed: {0}',
+    '_sys_storage_restriction_ext_denied' => 'All file types are allowed, except the following: {0}',
+
+    '_sys_storage_restriction_size' => 'Max file size is {0}',
+
+    '_sys_uploader_confirm_leaving_page' => 'Upload is is progress! Leaving the page means abort uploading!',
+    '_sys_uploader_confirm_close_popup' => 'Are you sure? It may cancel files uploading.',
+    '_sys_uploader_upload_canceled' => 'Upload was canceled',    
+
+    '_sys_uploader_simple_button_name' => 'Simple Upload',
+    '_sys_uploader_simple_title'  => 'Simple Upload',
+    '_sys_uploader_simple_submit_button' => 'Upload',
+    '_sys_uploader_simple_attach_one_more_file' => '+ Add more files',
+
+    '_sys_uploader_html5_title'  => 'Multiple Upload',
+    '_sys_uploader_html5_button_name' => 'Multiple Upload',
+    '_sys_uploader_html5_shoose_file' => 'Choose a file',
+    '_sys_uploader_html5_drop_area' => 'Drop files here to upload',
 );
 ?>

trunk/install/sql/v70.sql

@@ -3690 +3690 @@
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+CREATE TABLE IF NOT EXISTS `sys_storage_ghosts` (
+  `id` int(11) NOT NULL,
+  `profile_id` int(10) unsigned NOT NULL,
+  `object` varchar(32) NOT NULL,
+  `created` int(10) unsigned NOT NULL,
+  UNIQUE KEY `id` (`id`,`object`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
 CREATE TABLE IF NOT EXISTS `sys_storage_mime_types` (
   `ext` varchar(32) NOT NULL,

trunk/templates/base/popup_box.html

@@ -21 +21 @@
             <div class="bx-clear"></div>
         </div>
-        <div class="bx-db-content bx-def-padding-sec">__content__</div>
+        <div class="bx-db-content bx-def-padding">__content__</div>
     </div>
 </div>

trunk/templates/base/scripts/BxBaseFormView.php

@@ -161 +161 @@
 
             case 'select_box':
-                $sRow = $this->genRowSelectBox($aInput);
+                $sRow = $this->genRowCustom($aInput, 'genInputSelectBox');
+            break;
+
+            case 'files':
+                $sRow = $this->genRowCustom($aInput, 'genInputFiles');
             break;
 
@@ -188 +192 @@
         $sErrorIcon = $this->genErrorIcon(empty($aInput['error']) ? '' : $aInput['error']);
 
-        $aInput['tr_attrs']['class'] = "bx-form-element-wrapper bx-def-margin-sec-top" . (isset($aInput['tr_attrs']['class']) ? ' ' . $aInput['tr_attrs']['class'] : '');
+        $aInput['tr_attrs']['class'] = "bx-form-element-wrapper bx-def-margin-top" . (isset($aInput['tr_attrs']['class']) ? ' ' . $aInput['tr_attrs']['class'] : '');
         if (isset($aInput['name']))
             $aInput['tr_attrs']['id'] = "bx-form-element-" . $aInput['name'];
@@ -256 +260 @@
      * @return string
      */
-    function genRowSelectBox(&$aInput) {
+    function genRowCustom(&$aInput, $sCustomMethod) {
 
         $sCaption = isset($aInput['caption']) ? bx_process_output($aInput['caption']) : '';
@@ -265 +269 @@
         $sInfoIcon = !empty($aInput['info']) ? $this->genInfoIcon($aInput['info']) : '';
 
-        $sErrorIcon = $this->genErrorIcon(empty($aInput['error']) ? '' : $aInput['error']);
-        $sInput = $this->genInputSelectBox($aInput, $sInfoIcon, $sErrorIcon);
-
-        $aInput['tr_attrs']['class'] = "bx-form-element-wrapper bx-def-margin-sec-top" . (isset($aInput['tr_attrs']['class']) ? ' ' . $aInput['tr_attrs']['class'] : '');
+        $sErrorIcon = $this->genErrorIcon(empty($aInput['error']) ? '' : $aInput['error']);        
+        $sInput = $this->$sCustomMethod($aInput, $sInfoIcon, $sErrorIcon);
+
+        $aInput['tr_attrs']['class'] = "bx-form-element-wrapper bx-def-margin-top" . (isset($aInput['tr_attrs']['class']) ? ' ' . $aInput['tr_attrs']['class'] : '');
         if (isset($aInput['name']))
             $aInput['tr_attrs']['id'] = "bx-form-element-" . $aInput['name'];
@@ -280 +284 @@
                     </div>
 
-                    <div class="value$sClassAdd">
+                    <div class="bx-form-value$sClassAdd">
                         <div class="clear_both"></div>
                             $sInput
@@ -482 +486 @@
 
         // add default className to attributes
-        $aAttrs['class'] = "bx-def-font-inputs bx-form-input-{$aInput['type']}" . (isset($aAttrs['class']) ? ' ' . $aAttrs['class'] : '');
+        $aAttrs['class'] = "bx-def-font-inputs bx-form-input-{$aInput['type']}" . ('submit' == $aInput['type'] ? ' bx-btn bx-btn-primary' : '') . (isset($aAttrs['class']) ? ' ' . $aAttrs['class'] : '');
         $aAttrs['type'] = $aInput['type'];
         if (isset($aInput['name'])) $aAttrs['name'] = $aInput['name'];
@@ -497 +501 @@
         $sAttrs = $this->convertArray2Attrs($aAttrs);
 
-        return  "<input $sAttrs />\n";
-
+        if ('submit' == $aInput['type'])
+            return  "<button $sAttrs>" . $aInput['value'] . "</button>\n";
+        else
+            return  "<input $sAttrs />\n";
     }
 
@@ -648 +654 @@
 
     /**
+     * Generate Select Box Element
+     *
+     * @param array $aInput
+     * @return string
+     */
+    function genInputFiles(&$aInput, $sInfo = '', $sError = '') {
+
+        
+
+/*
+TODO: 
+    HTML for showing uploaded file (it should be overridable by specific storage engine, like handling file uploads) 
+*/
+
+        $sUniqId = genRndPwd (8, false);
+        $sUploaders = '';
+        $oUploader = null;
+        foreach ($aInput['uploaders'] as $sUploaderObject) {
+            bx_import('BxDolUploader');
+            $oUploader = BxDolUploader::getObjectInstance($sUploaderObject, $aInput['storage_object'], $sUniqId);
+            if (!$oUploader)
+                continue;
+            $sUploaders .= $oUploader->getUploaderButton();
+        }                
+
+        $sInitGhosts = isset($aInput['init_ghosts']) && !$aInput['init_ghosts'] ? '' : $oUploader->getNameJsInstanceUploader() . '.restoreGhosts();';
+
+        // TODO: move HTML to templates
+        return 
+            '<div class="bx-form-input-files-uploaders bx-def-margin-sec-top">' . $sUploaders . '<div class="bx-clear">&nbsp;</div></div>' . 
+            $sInfo .
+            '<div id="' . $oUploader->getIdContainerErrors() . '" class="bx-form-input-files-errors bx-def-margin-sec-top">&nbsp;</div>' . 
+            '<div id="' . $oUploader->getIdContainerResult() . '" class="bx-form-input-files-result bx-def-margin-sec-top">&nbsp;</div>' . 
+            '<script>$(document).ready(function(){' . $sInitGhosts . '});</script>';
+    }
+
+    /**
      * Generate Multiple Select Element
      *
@@ -915 +958 @@
 
             if ($aAttrs and is_array($aAttrs)) {
-                $aAttrs['class'] = "bx-form-section" . (isset($aAttrs['class']) ? (' ' . $aAttrs['class']) : '');
+                $aAttrs['class'] = "bx-form-section bx-def-padding bx-def-color-bg-sec" . (isset($aAttrs['class']) ? (' ' . $aAttrs['class']) : '');
                 $sAttrs = $this->convertArray2Attrs($aAttrs);
             } else {
-                $sAttrs = ' class="bx-form-section bx-def-padding-sec bx-def-color-bg-sec" ';
+                $sAttrs = ' class="bx-form-section bx-def-padding bx-def-color-bg-sec" ';
             }