* Merge module-file 18.4-18.8 to Merge184.

module/file/control.php

@@ -109,6 +109,19 @@ class file extends control
         return $this->send(array('status' => 'error', 'message' => $this->lang->file->uploadImagesExplain));
     }
 
+    /**
+     * Preview a file.
+     *
+     * @param  int    $fileID
+     * @param  string $mouse
+     * @access public
+     * @return void
+     */
+    public function preview($fileID, $mouse = '')
+    {
+        return print($this->fetch('file', 'download', "fileID=$fileID&mouse=$mouse"));
+    }
+
     /**
      * Down a file.
      *
@@ -572,7 +585,7 @@ class file extends control
      */
     public function read($fileID)
     {
-        if(!$this->loadModel('user')->isLogon()) return print(js::locate($this->createLink('user', 'login')));
+        if(!($this->app->company->guest and $this->app->user->account == 'guest') and !$this->loadModel('user')->isLogon()) return print(js::locate($this->createLink('user', 'login')));
         $file = $this->file->getById($fileID);
         if(empty($file) or !$this->file->fileExists($file)) return false;
 

module/file/lang/de.php

@@ -32,6 +32,7 @@ $lang->file->exportRange   = "Datenbereich";
 $lang->file->defaultTPL    = "Standardvorlage";
 $lang->file->setExportTPL  = "Einstellungen";
 $lang->file->preview       = "Vorschau";
+$lang->file->previewFile   = "Vorschau des Anhangs";
 $lang->file->addFile       = 'Hinzufügen';
 $lang->file->beginUpload   = 'Upload';
 $lang->file->uploadSuccess = 'Hochgeladen!';

module/file/lang/en.php

@@ -32,6 +32,7 @@ $lang->file->exportRange   = "Data";
 $lang->file->defaultTPL    = "Default";
 $lang->file->setExportTPL  = "Settings";
 $lang->file->preview       = "Preview";
+$lang->file->previewFile   = "Preview File";
 $lang->file->addFile       = 'Add';
 $lang->file->beginUpload   = 'Click to Upload';
 $lang->file->uploadSuccess = 'Uploaded!';

module/file/lang/fr.php

@@ -32,6 +32,7 @@ $lang->file->exportRange   = "Données";
 $lang->file->defaultTPL    = "Défaut";
 $lang->file->setExportTPL  = "Paramétrages";
 $lang->file->preview       = "Apperçu";
+$lang->file->previewFile   = "aperçu de la pièce jointe";
 $lang->file->addFile       = 'Ajouter';
 $lang->file->beginUpload   = 'Clic pour Charger';
 $lang->file->uploadSuccess = 'Chargé !';

module/file/lang/zh-cn.php

@@ -32,6 +32,7 @@ $lang->file->exportRange   = "导出范围";
 $lang->file->defaultTPL    = "默认模板";
 $lang->file->setExportTPL  = "设置";
 $lang->file->preview       = "预览";
+$lang->file->previewFile   = "预览附件";
 $lang->file->addFile       = '添加文件';
 $lang->file->beginUpload   = '开始上传';
 $lang->file->uploadSuccess = '上传成功';