Changeset 415

Timestamp:

04/07/08 23:41:21 (5 years ago)

Author:

Tatzelwurm

Message:

Downloads, Verarbeitung von relativen Links, Datei Add und Edit verbessert, Vorschaubilder änderbar

Location:

downloadDatabase/files/lib

Files:

• acp/form/DownloadDBDataAddForm.class.php (modified) (3 diffs)
• acp/form/DownloadDBDataEditForm.class.php (modified) (3 diffs)
• page/DownloadDBFileDownloadPage.class.php (modified) (1 diff)

downloadDatabase/files/lib/acp/form/DownloadDBDataAddForm.class.php

@@ -91 +91 @@
                         throw new UserInputException('link', 'empty');
                 }
-                // prÃŒfen ob ein Link UND File angegeben wurden
+                if (!$this->mimeType) {
+                        // prÃŒfen ob ein relativer Pfad vorliegt und die Datei existiert
+                        if (FileUtil::isURL($this->link) == false) {
+                                if (@fopen($this->link,'rb') == false) {
+                                        throw new UserInputException('link', 'badFile');
+                                }
+                        } 
+                }
+
                 if ($this->action == 'add') {
+                        // prÃŒfen ob ein Link UND File angegeben wurden
                         if ($this->link && ($this->upload && $this->upload['error'] != 4)) {
                                 throw new UserInputException('link', 'invalid');
@@ -117 +126 @@
                                 } else {
                                         throw new UserInputException('upload');
+                                }
+                        } else {
+                                if (FileUtil::isURL($this->link) == false) {
+                                        if (StringUtil::indexOf($this->link, '/') !== false) {
+                                                $this->fileName = StringUtil::substring($this->link, StringUtil::lastIndexOf($this->link, '/') + 1);
+                                        }
+                                        if (StringUtil::indexOf($this->fileName, '.') !== false) {
+                                                $this->fileExtension = StringUtil::toLowerCase(StringUtil::substring($this->fileName, StringUtil::lastIndexOf($this->fileName, '.') + 1));
+                                        }
+                                        $this->groesse = filesize($this->link);
                                 }
                         }
@@ -169 +188 @@
                                 $dataset = DownloadDBDataEditor::createDataset(intval($this->katID), $this->name, $this->description ,array(
                                                         'link'                  => StringUtil::encodeHTML($this->link),
+                                                        'fileName'              => escapeString($this->fileName),
+                                                        'fileExtension' => escapeString($this->fileExtension),
                                                         'groesse'               => intval($this->groesse),
                                                         'downloads'             => intval($this->downloads),

downloadDatabase/files/lib/acp/form/DownloadDBDataEditForm.class.php

@@ -107 +107 @@
                                 }
                                 // neuen File anlegen
-                                $this->previewIMG = DownloadDBDataEditor::createPreview($dataset->dataID, $this->previewArray['tmp_name'],      $this->previewArray['name'], $this->previewArray['type'], 'previewIMG');
                                 $this->previewFile = $this->previewArray['name'];
-                        }
-                        // Bei neuem Upload den alten file lschen und den neuen anlegen
+                                $this->previewIMG = DownloadDBDataEditor::createPreview($this->previewArray['tmp_name'],        $this->previewArray['name'], $this->previewArray['type'], 'previewIMG');
+                        }
+                        // Bei neuem Upload den alten file löschen und den neuen anlegen
                         if ($this->upload && $this->upload['error'] != 4) {
                                 // auf Fehler beim Upload prfen
@@ -117 +117 @@
                                 }
                                 // alten File löschen und neuen anlegen
-                                DownloadDBDataEditor::updateFile($dataset->dataID, $this->fileNameAlt, $this->upload['tmp_name'], $this->upload['name'], $this->upload['type'], 'upload');
+                                DownloadDBDataEditor::updateFile($this->fileNameAlt, $this->upload['tmp_name'], $this->upload['name'], $this->upload['type'], 'upload');
                                 //Variablen anpassen
                                 $this->fileName = $this->upload['name'];
@@ -126 +126 @@
                                 }
                                 $this->link = FileUtil::addTrailingSlash(PAGE_URL).FileUtil::getRealPath('wcf/'.RELATIVE_WCF_DIR.DOWNLOADDB_FILE_DIR.intval($dataset->dataID).'_'.StringUtil::encodeHTML($this->fileName));
+                        }
+                        if (!$this->upload && (FileUtil::isURL($this->link) == false)) {
+                                        if (StringUtil::indexOf($this->link, '/') !== false) {
+                                                $this->fileName = StringUtil::substring($this->link, StringUtil::lastIndexOf($this->link, '/') + 1);
+                                        }
+                                        if (StringUtil::indexOf($this->fileName, '.') !== false) {
+                                                $this->fileExtension = StringUtil::toLowerCase(StringUtil::substring($this->fileName, StringUtil::lastIndexOf($this->fileName, '.') + 1));
+                                        }
+                                        $this->groesse = filesize($this->link);
+                                
                         }
                         // Daten endgltig speichern

downloadDatabase/files/lib/page/DownloadDBFileDownloadPage.class.php

@@ -43 +43 @@
                 // reset cache
                 WCF::getCache()->clear(WCF_DIR.'cache/', 'cache.dldbData.php');
-                if (!$this->fileName) {
+                if (!$this->fileType) {
                         if (FileUtil::isURL($this->link)) {
                                 HeaderUtil::redirect($this->link,false);
                                 exit;
                         } else {
-                        $geturl = new downloadDBDataEditor($this->dataID);
-                        $link = FileUtil::getRealPath(RELATIVE_WCF_DIR.$geturl->getURL());
-                        $size = filesize($link);
-                        $type = 'application/unknown';
-                        $name = StringUtil::toLowerCase(StringUtil::substring($this->link, StringUtil::lastIndexOf($this->link, '/') + 1));
+                                $link = FileUtil::getRealPath(RELATIVE_WCF_DIR.$this->link);
+                                $type = 'application/unknown';
                         }
                 } else {
-                        $geturl = new downloadDBDataEditor($this->dataID);
-                        $link = FileUtil::getRealPath(RELATIVE_WCF_DIR.$geturl->getURL());
-                        $size = filesize($link);
+                        $dataset = new downloadDBDataEditor($this->dataID);
+                        $link = FileUtil::getRealPath(RELATIVE_WCF_DIR.$dataset->getURL());
                         $type = $this->fileType;
-                        $name = $this->fileName;
                 }
                 // Set Download Infos
                 @ header('Content-Description: File Transfer');
                 @ header('Content-Type: '. $type);
-                @ header('Content-disposition: attachment; filename="' . $name . '"');
-                @ header('Content-Length: ' . $size);
+                @ header('Content-disposition: attachment; filename="' . $this->fileName . '"');
+                @ header('Content-Length: ' . filesize($link));
                 @ header('Pragma: no-cache');
                 @ header('Expires: 0');