Changeset 407

Timestamp:

04/06/08 20:01:50 (5 years ago)

Author:

Tatzelwurm

Message:

diverse kleiner Fehler beseitigt

Location:

downloadDatabase/files/lib

Files:

• acp/form/DownloadDBDataAddForm.class.php (modified) (5 diffs)
• acp/form/DownloadDBDataEditForm.class.php (modified) (2 diffs)
• form/DownloadDBAddDataForm.class.php (modified) (5 diffs)
• form/DownloadDBEditDataForm.class.php (modified) (2 diffs)
• page/DownloadDBDataPage.class.php (modified) (2 diffs)
• page/DownloadDBFileDownloadPage.class.php (modified) (2 diffs)

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

@@ -65 +65 @@
                 if (isset($_POST['datum']))             $this->datum            = intval($_POST['datum']);
                 if (isset($_POST['sortOrder']))         $this->sortOrder        = intval($_POST['sortOrder']);
-                if (isset($_POST['supportThread']))     $this->supportThread = StringUtil::encodeHTML($_POST['supportThread']);
+                if (isset($_POST['supportThread']))     $this->supportThread = escapeString($_POST['supportThread']);
                 if (isset($_POST['activ']))                     $this->activ            = intval($_POST['activ']);
                 // for File Upload
@@ -114 +114 @@
                                         // import file
                                         $this->dataID = DownloadDBDataEditor::createFile($this->upload['tmp_name'], $this->upload['name'], $this->upload['type'], 'upload');
-                                        $this->groesse = FileUtil::formatFilesize($this->upload['size']);
+                                        $this->groesse = $this->upload['size'];
                                 } else {
                                         throw new UserInputException('upload');
@@ -156 +156 @@
                                                         'mimeType'              => escapeString($this->mimeType),
                                                         'link'                  => StringUtil::encodeHTML($this->link),
-                                                        'groesse'               => $this->groesse,
+                                                        'groesse'               => intval($this->groesse),
                                                         'downloads'             => intval($this->downloads),
                                                         'userID'                => intval($this->dldbUserID),
@@ -219 +219 @@
                 parent::assignVariables();
 
+                $maxFileSize = WCF::getUser()->getPermission('user.dldb.maxFileSize');
                 WCF::getTPL()->assign(array(
                         'katOptions'    => $this->katOptions,
@@ -238 +239 @@
                         'supportThread' => $this->supportThread,
                         'activ'                 => $this->activ,
-                        'action'                => 'add'
+                        'action'                => 'add',
+                        'previewExtensions' => DOWNLOADDB_ALLOWED_PREVIEW_EXT,
+                        'fileExtensions' => DOWNLOADDB_ALLOWED_FILE_EXT,
+                        'maxFileSize'   => $maxFileSize
                 ));
         }

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

@@ -121 +121 @@
                                 $this->fileName = $this->upload['name'];
                                 $this->mimeType = $this->upload['type'];
-                                $this->groesse  = FileUtil::formatFilesize($this->upload['size']);
+                                $this->groesse  = $this->upload['size'];
                                 if (StringUtil::indexOf($this->fileName, '.') !== false) {
                                         $this->fileExtension = StringUtil::toLowerCase(StringUtil::substring($this->fileName, StringUtil::lastIndexOf($this->fileName, '.') + 1));
@@ -138 +138 @@
                                                         'mimeType'              => StringUtil::encodeHTML($this->mimeType),
                                                         'link'                  => $this->link,
-                                                        'groesse'               => $this->groesse,
+                                                        'groesse'               => intval($this->groesse),
                                                         'downloads'             => intval($this->downloads),
                                                         'userID'                => intval($this->dldbUserID),

downloadDatabase/files/lib/form/DownloadDBAddDataForm.class.php

@@ -74 +74 @@
                 if (isset($_POST['previewIMG']))        $this->previewIMG       = StringUtil::encodeHTML($_POST['previewIMG']);
                 if (isset($_POST['sortOrder']))         $this->sortOrder        = intval($_POST['sortOrder']);
-                if (isset($_POST['supportThread']))     $this->supportThread = StringUtil::encodeHTML($_POST['supportThread']);
+                if (isset($_POST['supportThread']))     $this->supportThread = escapeString($_POST['supportThread']);
                 // for File Upload
                 if (isset($_FILES['upload']))           $this->upload           = $_FILES['upload'];
@@ -112 +112 @@
                                 // import upload file
                                 $this->dataID = DownloadDBDataEditor::createFile($this->upload['tmp_name'], $this->upload['name'], $this->upload['type'], 'upload');
-                                $this->groesse = FileUtil::formatFilesize($this->upload['size']);
+                                $this->groesse = $this->upload['size'];
                         } else {
                                 // no file to upload given
@@ -155 +155 @@
                                         'mimeType'              => escapeString($this->mimeType),
                                         'link'                  => StringUtil::encodeHTML($this->link),
-                                        'groesse'               => $this->groesse,
+                                        'groesse'               => intval($this->groesse),
                                         'downloads'             => intval($this->downloads),
                                         'userID'                => WCF::getUser()->userID,
@@ -238 +238 @@
                         WCF::getTPL()->assign('offlinemessage', DOWNLOADDB_OFFLINE_MESSAGE);
                 } else {
+                        $maxFileSize = WCF::getUser()->getPermission('user.dldb.maxFileSize');
                         WCF::getTPL()->assign(array(
                                 'katID'                 => $this->katID,
@@ -256 +257 @@
                                 'supportThread' => $this->supportThread,
                                 'activ'                 => $this->activ,
-                                'action'                => 'add'
+                                'action'                => 'add',
+                                'previewExtensions' => DOWNLOADDB_ALLOWED_PREVIEW_EXT,
+                                'fileExtensions' => DOWNLOADDB_ALLOWED_FILE_EXT,
+                                'maxFileSize'   => $maxFileSize
                         ));
                 }

downloadDatabase/files/lib/form/DownloadDBEditDataForm.class.php

@@ -159 +159 @@
                                 $this->fileName = $this->upload['name'];
                                 $this->mimeType = $this->upload['type'];
-                                $this->groesse = FileUtil::formatFilesize($this->upload['size']);
+                                $this->groesse  = $this->upload['size'];
                         }
                         if (StringUtil::indexOf($this->fileName, '.') !== false) {
@@ -176 +176 @@
                                 'mimeType'              => StringUtil::encodeHTML($this->mimeType),
                                 'link'                  => $this->link,
-                                'groesse'               => $this->groesse,
+                                'groesse'               => intval($this->groesse),
                                 'downloads'             => intval($this->downloads),
                                 'userID'                => intval($this->dldbUserID),

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

@@ -86 +86 @@
                         if ($daten['dataID'] == $this->dataID && $daten['activ']) {
                                 $daten['type'] = $this->setFileTypeIcon($daten['mimeType']);
+                                $daten['groesse'] = FileUtil::formatFilesize($daten['groesse']);
                                 $IDs = explode(',',$daten['groupcheck']);
                                 $daten['canViewCat'] = false;
@@ -120 +121 @@
                                 }
                                 // Beschreibung zur Ausgabe anpassen (BBCode+Smilies)
-                                $daten['name']                  = StringUtil::unescape($this->getFormattedMessage($daten['name']));
-                                $daten['description']   = StringUtil::unescape($this->getFormattedMessage($daten['description']));
+                                $daten['name']                  = $this->getFormattedMessage(StringUtil::unescape($daten['name']));
+                                $daten['description']   = $this->getFormattedMessage(StringUtil::unescape($daten['description']));
                                 require_once(WCF_DIR.'lib/data/message/bbcode/URLParser.class.php');
                                 // URLs wandeln zur formatierten Ausgabe
-                                $daten['thread'] = $this->getFormattedMessage(URLParser::parse(StringUtil::decodeHTML($daten['thread'])));
+                                $daten['thread'] = $this->getFormattedMessage(URLParser::parse(StringUtil::decodeHTML(StringUtil::unescape($daten['thread']))));
                                 $this->daten = $daten;
                                 break;

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

@@ -36 +36 @@
         public function show() {
                 $this->readDaten();
+                // Anzahl der Downloads erhöhen
+                $sql = "UPDATE wcf".WCF_N."_dldb_data
+                                SET downloads = downloads + 1
+                                WHERE `dataID` = ".$this->dataID;
+                $row = WCF::getDB()->registerShutdownUpdate($sql);
+                // reset cache
+                WCF::getCache()->clear(WCF_DIR.'cache/', 'cache.dldbData.php');
                 if (!$this->fileName) {
-                        $link = FileUtil::downloadFileFromHttp($this->link, 'DLDB_'.$this->dataID);
+                        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));
-                        
+                        }
                 } else {
                         $geturl = new downloadDBDataEditor($this->dataID);
@@ -58 +70 @@
                 // Start Download
                 @readfile($link);
-                // Anzahl der Downloads erhöhen
-                $sql = "UPDATE wcf".WCF_N."_dldb_data
-                                SET downloads = downloads + 1
-                                WHERE `dataID` = ".$this->dataID;
-                $row = WCF::getDB()->registerShutdownUpdate($sql);
-                // reset cache
-                WCF::getCache()->clear(WCF_DIR.'cache/', 'cache.dldbData.php');
         }