From 52fd9fffa995bc8e762aca0a075e22008299ed1b Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Wed, 25 May 2005 04:27:55 +0000
Subject: [PATCH] - #23213: Report upload size limits in megabytes, not bytes.
---
modules/upload.module | 8 ++++----
modules/upload/upload.module | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/modules/upload.module b/modules/upload.module
index 6e58a6f13823..4ebd0a90013d 100644
--- a/modules/upload.module
+++ b/modules/upload.module
@@ -179,8 +179,8 @@ function upload_nodeapi(&$node, $op, $arg) {
// all roles prevent it.
foreach ($user->roles as $rid => $name) {
$extensions = variable_get("upload_extensions_$rid", 'jpg jpeg gif png txt html doc xls pdf ppt pps');
- $uploadsize = variable_get("upload_uploadsize_$rid", 1);
- $usersize = variable_get("upload_usersize_$rid", 1);
+ $uploadsize = variable_get("upload_uploadsize_$rid", 1) * 1024 * 1024;
+ $usersize = variable_get("upload_usersize_$rid", 1) * 1024 * 1024;
$regex = '/\.('. ereg_replace(' +', '|', preg_quote($extensions)) .')$/i';
@@ -188,11 +188,11 @@ function upload_nodeapi(&$node, $op, $arg) {
$error['extension']++;
}
- if ($file->filesize > $uploadsize * 1024 * 1024) {
+ if ($file->filesize > $uploadsize) {
$error['uploadsize']++;
}
- if ($total_usersize + $file->filesize > $usersize * 1024 * 1024) {
+ if ($total_usersize + $file->filesize > $usersize) {
$error['usersize']++;
}
}
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 6e58a6f13823..4ebd0a90013d 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -179,8 +179,8 @@ function upload_nodeapi(&$node, $op, $arg) {
// all roles prevent it.
foreach ($user->roles as $rid => $name) {
$extensions = variable_get("upload_extensions_$rid", 'jpg jpeg gif png txt html doc xls pdf ppt pps');
- $uploadsize = variable_get("upload_uploadsize_$rid", 1);
- $usersize = variable_get("upload_usersize_$rid", 1);
+ $uploadsize = variable_get("upload_uploadsize_$rid", 1) * 1024 * 1024;
+ $usersize = variable_get("upload_usersize_$rid", 1) * 1024 * 1024;
$regex = '/\.('. ereg_replace(' +', '|', preg_quote($extensions)) .')$/i';
@@ -188,11 +188,11 @@ function upload_nodeapi(&$node, $op, $arg) {
$error['extension']++;
}
- if ($file->filesize > $uploadsize * 1024 * 1024) {
+ if ($file->filesize > $uploadsize) {
$error['uploadsize']++;
}
- if ($total_usersize + $file->filesize > $usersize * 1024 * 1024) {
+ if ($total_usersize + $file->filesize > $usersize) {
$error['usersize']++;
}
}
--
GitLab