#556 Files module - extension for downloaded file

modules/boonex/files/classes/BxFilesMenuView.php

@@ -29,7 +29,7 @@ class BxFilesMenuView extends BxBaseModTextMenuView
         $aFile = $this->_oModule->getContentFile($this->_aContentInfo);
         if (!$aFile || !$aFile['private']) {
             $this->addMarkers(array(
-                'file_download_token' => '',
+                'file_download_token' => '0',
                 'file_ext' => $aFile['ext'] ? $aFile['ext'] : '',
             ));
             return;
@@ -38,7 +38,7 @@ class BxFilesMenuView extends BxBaseModTextMenuView
         $oStorage = BxDolStorage::getObjectInstance($CNF['OBJECT_STORAGE']);
         if (!$oStorage) {
             $this->addMarkers(array(
-                'file_download_token' => '',
+                'file_download_token' => '0',
                 'file_ext' => $aFile['ext'],
             ));
             return;

modules/boonex/files/classes/BxFilesModule.php

@@ -72,9 +72,8 @@ class BxFilesModule extends BxBaseModTextModule
         return _t('_sys_txt_access_denied');
     }
 
-    public function actionDownload($iContentId) 
+    public function actionDownload($sToken, $iContentId) 
     {
-        $sToken = bx_get('token');
         $CNF = $this->_oConfig->CNF;
         
         $aData = $this->_oDb->getContentInfoById((int)$iContentId);

modules/boonex/files/install/sql/enable.sql

@@ -182,7 +182,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 ('bx_files_view', 'bx_files', '_bx_files_menu_set_title_view_entry', 0);
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('bx_files_view', 'bx_files', 'download-file', '_bx_files_menu_item_title_system_download_file', '_bx_files_menu_item_title_download_file', 'modules/?r=files/download/{content_id}.{file_ext}?token={file_download_token}', '', '_blank', 'download', '', 2147483647, 1, 0, 1),
+('bx_files_view', 'bx_files', 'download-file', '_bx_files_menu_item_title_system_download_file', '_bx_files_menu_item_title_download_file', 'modules/?r=files/download/{file_download_token}/{content_id}.{file_ext}', '', '_blank', 'download', '', 2147483647, 1, 0, 1),
 ('bx_files_view', 'bx_files', 'edit-file', '_bx_files_menu_item_title_system_edit_entry', '_bx_files_menu_item_title_edit_entry', 'page.php?i=edit-file&id={content_id}', '', '', 'pencil', '', 2147483647, 1, 0, 2),
 ('bx_files_view', 'bx_files', 'delete-file', '_bx_files_menu_item_title_system_delete_entry', '_bx_files_menu_item_title_delete_entry', 'page.php?i=delete-file&id={content_id}', '', '', 'remove', '', 2147483647, 1, 0, 3);