james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upload is better now

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@150 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-06-01 22:11:53 +00:00
parent a23966c90c
commit 2c0264095b
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ext/upload/main.php
View File

@ -1,5 +1,8 @@
<?php <?php
define("UPLOAD_DEFAULT_MAX_SIZE", 256000);
define("UPLOAD_DEFAULT_COUNT", 3);
class Upload extends Extension { class Upload extends Extension {
// event handling {{{ // event handling {{{
public function receive_event($event) { public function receive_event($event) {
@ -11,7 +14,6 @@ class Upload extends Extension {
} }
if(is_a($event, 'PageRequestEvent') && ($event->page == "upload")) { if(is_a($event, 'PageRequestEvent') && ($event->page == "upload")) {
if($this->can_upload()) { if($this->can_upload()) {
global $config;
global $page; global $page;
$ok = true; $ok = true;
@ -46,7 +48,7 @@ class Upload extends Extension {
// do things {{{ // do things {{{
private function can_upload() { private function can_upload() {
global $config, $user; global $config, $user;
return $config->get_bool("upload_anon") || !$user->is_anonymous(); return $config->get_bool("upload_anon", false) || !$user->is_anonymous();
} }
private function try_upload($file) { private function try_upload($file) {
@ -57,11 +59,12 @@ class Upload extends Extension {
if(!file_exists($file['tmp_name'])) { if(!file_exists($file['tmp_name'])) {
// this happens normally with blank file boxes // this happens normally with blank file boxes
$ok = true;
} }
else if(filesize($file['tmp_name']) > $config->get_int('upload_size')) { else if(filesize($file['tmp_name']) > $config->get_int('upload_size', UPLOAD_DEFAULT_MAX_SIZE)) {
$page->add_main_block(new Block("Error with ".html_escape($file['name']), $page->add_main_block(new Block("Error with ".html_escape($file['name']),
"File too large (".filesize($file['tmp_name'])." &gt; ". "File too large (".filesize($file['tmp_name'])." &gt; ".
($config->get_int('upload_size')).")")); ($config->get_int('upload_size', UPLOAD_DEFAULT_MAX_SIZE)).")"));
} }
else if(!($info = getimagesize($file['tmp_name']))) { else if(!($info = getimagesize($file['tmp_name']))) {
$page->add_main_block(new Block("Error with ".html_escape($file['name']), $page->add_main_block(new Block("Error with ".html_escape($file['name']),
@ -104,13 +107,13 @@ class Upload extends Extension {
global $config; global $config;
$upload_list = ""; $upload_list = "";
for($i=0; $i<$config->get_int('upload_count'); $i++) { for($i=0; $i<$config->get_int('upload_count', UPLOAD_DEFAULT_COUNT); $i++) {
if($i == 0) $style = ""; // "style='display:visible'"; if($i == 0) $style = ""; // "style='display:visible'";
else $style = "style='display:none'"; else $style = "style='display:none'";
$upload_list .= "<input accept='image/jpeg,image/png,image/gif' size='10' ". $upload_list .= "<input accept='image/jpeg,image/png,image/gif' size='10' ".
"id='data$i' name='data$i' $style onchange=\"showUp('data".($i+1)."')\" type='file'>\n"; "id='data$i' name='data$i' $style onchange=\"showUp('data".($i+1)."')\" type='file'>\n";
} }
$max_size = $config->get_int('upload_size'); $max_size = $config->get_int('upload_size', UPLOAD_DEFAULT_MAX_SIZE);
$max_kb = (int)($max_size / 1024); $max_kb = (int)($max_size / 1024);
// <input type='hidden' name='max_file_size' value='$max_size' /> // <input type='hidden' name='max_file_size' value='$max_size' />
return " return "