author | Dan |
Fri, 09 Nov 2007 23:36:49 -0500 | |
changeset 203 | acb9d021b860 |
parent 195 | 3daa715e0f69 |
child 235 | b3cfaf0a505c |
permissions | -rw-r--r-- |
0 | 1 |
<?php |
2 |
/* |
|
3 |
Plugin Name: Upload/download frontend |
|
23
320acf077276
At last, I fixed all those phased-out enano.homelinux.org links!
Dan
parents:
0
diff
changeset
|
4 |
Plugin URI: http://enanocms.org/ |
0 | 5 |
Description: Provides the pages Special:UploadFile and Special:DownloadFile. UploadFile is used to upload files to the site, and DownloadFile fetches the file from the database, creates thumbnails if necessary, and sends the file to the user. |
6 |
Author: Dan Fuhry |
|
181
9237767a23ae
Implemented cron image into Oxygen and St Patty as promised; fixed way-outdated version numbers in plugins
Dan
parents:
116
diff
changeset
|
7 |
Version: 1.0.2 |
23
320acf077276
At last, I fixed all those phased-out enano.homelinux.org links!
Dan
parents:
0
diff
changeset
|
8 |
Author URI: http://enanocms.org/ |
0 | 9 |
*/ |
10 |
||
11 |
/* |
|
12 |
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between |
|
181
9237767a23ae
Implemented cron image into Oxygen and St Patty as promised; fixed way-outdated version numbers in plugins
Dan
parents:
116
diff
changeset
|
13 |
* Version 1.0.2 |
0 | 14 |
* Copyright (C) 2006-2007 Dan Fuhry |
15 |
* SpecialUpdownload.php - handles uploading and downloading of user-uploaded files - possibly the most rigorously security-enforcing script in all of Enano, although sessions.php comes in a close second |
|
16 |
* |
|
17 |
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License |
|
18 |
* as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. |
|
19 |
* |
|
20 |
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied |
|
21 |
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. |
|
22 |
*/ |
|
23 |
||
24 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
25 |
||
26 |
$plugins->attachHook('base_classes_initted', ' |
|
27 |
global $paths; |
|
28 |
$paths->add_page(Array( |
|
29 |
\'name\'=>\'Upload file\', |
|
30 |
\'urlname\'=>\'UploadFile\', |
|
31 |
\'namespace\'=>\'Special\', |
|
32 |
\'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\', |
|
33 |
)); |
|
34 |
||
35 |
$paths->add_page(Array( |
|
36 |
\'name\'=>\'Download file\', |
|
37 |
\'urlname\'=>\'DownloadFile\', |
|
38 |
\'namespace\'=>\'Special\', |
|
116
77c75179bb95
Made most special pages "visible"; fixup for non-existent special page redirect in paths.php; rewrote Special:AllPages to have pagination (WiP, Special:SpecialPages is possibly next, depending on whether paginate_array works or not)
Dan
parents:
85
diff
changeset
|
39 |
\'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\', |
0 | 40 |
)); |
41 |
'); |
|
42 |
||
43 |
function page_Special_UploadFile() |
|
44 |
{ |
|
45 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
46 |
global $mime_types; |
|
47 |
if(getConfig('enable_uploads')!='1') { die_friendly('Access denied', '<p>File uploads are disabled this website.</p>'); } |
|
48 |
if ( !$session->get_permissions('upload_files') ) |
|
49 |
{ |
|
50 |
die_friendly('Access denied', '<p>File uploads are disabled for your user account or group.<p>'); |
|
51 |
} |
|
52 |
if(isset($_POST['doit'])) |
|
53 |
{ |
|
54 |
if(isset($_FILES['data'])) |
|
55 |
{ |
|
56 |
$file =& $_FILES['data']; |
|
57 |
} |
|
58 |
else |
|
59 |
{ |
|
60 |
$file = false; |
|
61 |
} |
|
181
9237767a23ae
Implemented cron image into Oxygen and St Patty as promised; fixed way-outdated version numbers in plugins
Dan
parents:
116
diff
changeset
|
62 |
if ( !is_array($file) ) |
9237767a23ae
Implemented cron image into Oxygen and St Patty as promised; fixed way-outdated version numbers in plugins
Dan
parents:
116
diff
changeset
|
63 |
{ |
9237767a23ae
Implemented cron image into Oxygen and St Patty as promised; fixed way-outdated version numbers in plugins
Dan
parents:
116
diff
changeset
|
64 |
die_friendly('Upload failed', '<p>The server could not retrieve the array $_FILES[\'data\'].</p>'); |
9237767a23ae
Implemented cron image into Oxygen and St Patty as promised; fixed way-outdated version numbers in plugins
Dan
parents:
116
diff
changeset
|
65 |
} |
9237767a23ae
Implemented cron image into Oxygen and St Patty as promised; fixed way-outdated version numbers in plugins
Dan
parents:
116
diff
changeset
|
66 |
if ( $file['size'] == 0 || $file['size'] > (int)getConfig('max_file_size') ) |
9237767a23ae
Implemented cron image into Oxygen and St Patty as promised; fixed way-outdated version numbers in plugins
Dan
parents:
116
diff
changeset
|
67 |
{ |
9237767a23ae
Implemented cron image into Oxygen and St Patty as promised; fixed way-outdated version numbers in plugins
Dan
parents:
116
diff
changeset
|
68 |
die_friendly('Upload failed', '<p>The file you uploaded is either too large or 0 bytes in length.</p>'); |
9237767a23ae
Implemented cron image into Oxygen and St Patty as promised; fixed way-outdated version numbers in plugins
Dan
parents:
116
diff
changeset
|
69 |
} |
0 | 70 |
/* |
71 |
$allowed_mime_types = Array( |
|
72 |
'text/plain', |
|
73 |
'image/png', |
|
74 |
'image/jpeg', |
|
75 |
'image/tiff', |
|
76 |
'image/gif', |
|
77 |
'text/html', // Safe because the file is stashed in the database |
|
78 |
'application/x-bzip2', |
|
79 |
'application/x-gzip', |
|
80 |
'text/x-c++' |
|
81 |
); |
|
82 |
if(function_exists('finfo_open') && $fi = finfo_open(FILEINFO_MIME, ENANO_ROOT.'/includes/magic')) // First try to use the fileinfo extension, this is the best way to determine the mimetype |
|
83 |
{ |
|
84 |
if(!$fi) die_friendly('Upload failed', '<p>Enano was unable to determine the format of the uploaded file.</p><p>'.@finfo_file($fi, $file['tmp_name']).'</p>'); |
|
85 |
$type = @finfo_file($fi, $file['tmp_name']); |
|
86 |
@finfo_close($fi); |
|
87 |
} |
|
88 |
elseif(function_exists('mime_content_type')) |
|
89 |
$type = mime_content_type($file['tmp_name']); // OK, no fileinfo function. Use a (usually) built-in PHP function |
|
90 |
elseif(isset($file['type'])) |
|
91 |
$type = $file['type']; // LAST RESORT: use the mimetype the browser sent us, though this is likely to be spoofed |
|
92 |
else // DANG! Not even the browser told us. Bail out. |
|
93 |
die_friendly('Upload failed', '<p>Enano was unable to determine the format of the uploaded file.</p>'); |
|
94 |
*/ |
|
95 |
$types = fetch_allowed_extensions(); |
|
96 |
$ext = substr($file['name'], strrpos($file['name'], '.')+1, strlen($file['name'])); |
|
181
9237767a23ae
Implemented cron image into Oxygen and St Patty as promised; fixed way-outdated version numbers in plugins
Dan
parents:
116
diff
changeset
|
97 |
if ( !isset($types[$ext]) || ( isset($types[$ext]) && !$types[$ext] ) ) |
0 | 98 |
{ |
99 |
die_friendly('Upload failed', '<p>The file type ".'.$ext.'" is not allowed.</p>'); |
|
100 |
} |
|
101 |
$type = $mime_types[$ext]; |
|
102 |
//$type = explode(';', $type); $type = $type[0]; |
|
103 |
//if(!in_array($type, $allowed_mime_types)) die_friendly('Upload failed', '<p>The file type "'.$type.'" is not allowed.</p>'); |
|
104 |
if($_POST['rename'] != '') |
|
105 |
{ |
|
106 |
$filename = $_POST['rename']; |
|
107 |
} |
|
108 |
else |
|
109 |
{ |
|
110 |
$filename = $file['name']; |
|
111 |
} |
|
112 |
$bad_chars = Array(':', '\\', '/', '<', '>', '|', '*', '?', '"', '#', '+'); |
|
113 |
foreach($bad_chars as $ch) |
|
114 |
{ |
|
115 |
if(strstr($filename, $ch) || preg_match('/^([ ]+)$/is', $filename)) die_friendly('Upload failed', '<p>The filename contains invalid characters.</p>'); |
|
116 |
} |
|
117 |
||
118 |
if ( isset ( $paths->pages[ $paths->nslist['File'] . $filename ] ) && !isset ( $_POST['update'] ) ) |
|
119 |
{ |
|
120 |
die_friendly('Upload failed', '<p>The file already exists. You can <a href="'.makeUrlNS('Special', 'UploadFile/'.$filename).'">upload a new version of this file</a>.</p>'); |
|
121 |
} |
|
122 |
else if ( isset($_POST['update']) && |
|
123 |
( !isset($paths->pages[$paths->nslist['File'].$filename]) || |
|
124 |
(isset($paths->pages[$paths->nslist['File'].$filename]) && |
|
125 |
$paths->pages[$paths->nslist['File'].$filename]['protected'] == 1 ) |
|
126 |
) |
|
127 |
) |
|
128 |
{ |
|
129 |
die_friendly('Upload failed', '<p>Either the file does not exist (and therefore cannot be updated) or the file is protected.</p>'); |
|
130 |
} |
|
131 |
||
132 |
$utime = time(); |
|
133 |
||
134 |
$filename = $db->escape($filename); |
|
135 |
$ext = substr($filename, strrpos($filename, '.'), strlen($filename)); |
|
136 |
$flen = filesize($file['tmp_name']); |
|
137 |
||
81
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
parents:
80
diff
changeset
|
138 |
$comments = ( isset($_POST['update']) ) ? $db->escape($_POST['comments']) : $db->escape(RenderMan::preprocess_text($_POST['comments'], false, false)); |
0 | 139 |
$chartag = sha1(microtime()); |
140 |
$urln = str_replace(' ', '_', $filename); |
|
141 |
||
142 |
$key = md5($filename . '_' . file_get_contents($file['tmp_name'])); |
|
143 |
$targetname = ENANO_ROOT . '/files/' . $key . '_' . $utime . $ext; |
|
144 |
||
145 |
if(!@move_uploaded_file($file['tmp_name'], $targetname)) |
|
146 |
{ |
|
147 |
die_friendly('Upload failed', '<p>Could not move uploaded file to the new location.</p>'); |
|
148 |
} |
|
149 |
||
150 |
if(getConfig('file_history') != '1') |
|
151 |
{ |
|
152 |
if(!$db->sql_query('DELETE FROM '.table_prefix.'files WHERE filename=\''.$filename.'\' LIMIT 1;')) $db->_die('The old file data could not be deleted.'); |
|
153 |
} |
|
154 |
if(!$db->sql_query('INSERT INTO '.table_prefix.'files(time_id,page_id,filename,size,mimetype,file_extension,file_key) VALUES('.$utime.', \''.$urln.'\', \''.$filename.'\', '.$flen.', \''.$type.'\', \''.$ext.'\', \''.$key.'\')')) $db->_die('The file data entry could not be inserted.'); |
|
155 |
if(!isset($_POST['update'])) |
|
156 |
{ |
|
157 |
if(!$db->sql_query('INSERT INTO '.table_prefix.'logs(time_id,date_string,log_type,action,author,page_id,namespace) VALUES('.$utime.', \''.date('d M Y h:i a').'\', \'page\', \'create\', \''.$session->username.'\', \''.$filename.'\', \''.'File'.'\');')) $db->_die('The page log could not be updated.'); |
|
158 |
if(!$db->sql_query('INSERT INTO '.table_prefix.'pages(name,urlname,namespace,protected,delvotes,delvote_ips) VALUES(\''.$filename.'\', \''.$urln.'\', \'File\', 0, 0, \'\')')) $db->_die('The page listing entry could not be inserted.'); |
|
159 |
if(!$db->sql_query('INSERT INTO '.table_prefix.'page_text(page_id,namespace,page_text,char_tag) VALUES(\''.$urln.'\', \'File\', \''.$comments.'\', \''.$chartag.'\')')) $db->_die('The page text entry could not be inserted.'); |
|
160 |
} |
|
161 |
else |
|
162 |
{ |
|
163 |
if(!$db->sql_query('INSERT INTO '.table_prefix.'logs(time_id,date_string,log_type,action,author,page_id,namespace,edit_summary) VALUES('.$utime.', \''.date('d M Y h:i a').'\', \'page\', \'reupload\', \''.$session->username.'\', \''.$filename.'\', \''.'File'.'\', \''.$comments.'\');')) $db->_die('The page log could not be updated.'); |
|
164 |
} |
|
165 |
die_friendly('Upload complete', '<p>Your file has been uploaded successfully. View the <a href="'.makeUrlNS('File', $filename).'">file\'s page</a>.</p>'); |
|
166 |
} |
|
167 |
else |
|
168 |
{ |
|
169 |
$template->header(); |
|
170 |
$fn = $paths->getParam(0); |
|
171 |
if ( $fn && !$session->get_permissions('upload_new_version') ) |
|
172 |
{ |
|
173 |
die_friendly('Access denied', '<p>Uploading new versions of files has been disabled for your user account or group.<p>'); |
|
174 |
} |
|
175 |
?> |
|
176 |
<p>Using this form you can upload a file to the <?php echo getConfig('site_name'); ?> site.</p> |
|
177 |
<p>The maximum file size is <?php |
|
178 |
// Get the max file size, and format it in a way that is user-friendly |
|
179 |
$fs = getConfig('max_file_size'); |
|
180 |
echo commatize($fs).' bytes'; |
|
181 |
$fs = (int)$fs; |
|
182 |
if($fs >= 1048576) |
|
183 |
{ |
|
184 |
$fs = round($fs / 1048576, 1); |
|
185 |
echo ' ('.$fs.' MB)'; |
|
186 |
} |
|
187 |
elseif($fs >= 1024) |
|
188 |
{ |
|
189 |
$fs = round($fs / 1024, 1); |
|
190 |
echo ' ('.$fs.' KB)'; |
|
191 |
} |
|
192 |
?>.</p> |
|
193 |
<form action="<?php echo makeUrl($paths->page); ?>" method="post" enctype="multipart/form-data"> |
|
194 |
<table border="0" cellspacing="1" cellpadding="4"> |
|
195 |
<tr><td>File:</td><td><input name="data" type="file" size="40" /></td></tr> |
|
196 |
<tr><td>Rename to:</td><td><input name="rename" type="text" size="40"<?php if($fn) echo ' value="'.$fn.'" readonly="readonly"'; ?> /></td></tr> |
|
197 |
<?php |
|
198 |
if(!$fn) echo '<tr><td>Comments:<br />(can be wiki-formatted)</td><td><textarea name="comments" rows="20" cols="60"></textarea></td></tr>'; |
|
199 |
else echo '<tr><td>Reason for uploading the new version: </td><td><input name="comments" size="50" /></td></tr>'; |
|
200 |
?> |
|
201 |
<tr><td colspan="2" style="text-align: center"> |
|
202 |
<?php |
|
203 |
if($fn) |
|
204 |
echo '<input type="hidden" name="update" value="true" />'; |
|
205 |
?> |
|
206 |
<input type="submit" name="doit" value="Upload file" /> |
|
207 |
</td></tr> |
|
208 |
</table> |
|
209 |
</form> |
|
210 |
<?php |
|
211 |
$template->footer(); |
|
212 |
} |
|
213 |
} |
|
214 |
||
215 |
function page_Special_DownloadFile() |
|
216 |
{ |
|
217 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
218 |
global $do_gzip; |
|
219 |
$filename = rawurldecode($paths->getParam(0)); |
|
220 |
$timeid = $paths->getParam(1); |
|
221 |
if($timeid && preg_match('#^([0-9]+)$#', (string)$timeid)) $tid = ' AND time_id='.$timeid; |
|
222 |
else $tid = ''; |
|
223 |
$filename = $db->escape($filename); |
|
224 |
$q = $db->sql_query('SELECT page_id,size,mimetype,time_id,file_extension,file_key FROM '.table_prefix.'files WHERE filename=\''.$filename.'\''.$tid.' ORDER BY time_id DESC;'); |
|
225 |
if(!$q) $db->_die('The file data could not be selected.'); |
|
226 |
if($db->numrows() < 1) { header('HTTP/1.1 404 Not Found'); die_friendly('File not found', '<p>The file "'.$filename.'" cannot be found.</p>'); } |
|
227 |
$row = $db->fetchrow(); |
|
228 |
$db->free_result(); |
|
229 |
||
230 |
// Check permissions |
|
231 |
$perms = $session->fetch_page_acl($row['page_id'], 'File'); |
|
232 |
if ( !$perms->get_permissions('read') ) |
|
233 |
{ |
|
234 |
die_friendly('Access denied', '<p>Access to the specified file is denied.</p>'); |
|
235 |
} |
|
236 |
||
237 |
$fname = ENANO_ROOT . '/files/' . $row['file_key'] . '_' . $row['time_id'] . $row['file_extension']; |
|
195
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
238 |
|
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
239 |
if ( isset($_GET['preview']) && substr($row['mimetype'], 0, 6) == 'image/' ) |
0 | 240 |
{ |
195
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
241 |
// Determine appropriate width and height |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
242 |
$width = ( isset($_GET['width']) ) ? intval($_GET['width'] ) : 320; |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
243 |
$height = ( isset($_GET['height']) ) ? intval($_GET['height']) : 320; |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
244 |
$cache_filename = ENANO_ROOT . "/cache/{$filename}-{$row['time_id']}-{$width}x{$height}{$row['file_extension']}"; |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
245 |
if ( file_exists($cache_filename) ) |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
246 |
{ |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
247 |
$fname = $cache_filename; |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
248 |
} |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
249 |
else |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
250 |
{ |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
251 |
$allow_scale = false; |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
252 |
$orig_fname = $fname; |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
253 |
// is caching enabled? |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
254 |
if ( getConfig('cache_thumbs') == '1' ) |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
255 |
{ |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
256 |
$fname = $cache_filename; |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
257 |
if ( is_writeable(dirname($fname)) ) |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
258 |
{ |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
259 |
$allow_scale = true; |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
260 |
} |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
261 |
} |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
262 |
else |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
263 |
{ |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
264 |
// Get a temporary file |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
265 |
// In this case, the file will not be cached and will be scaled each time it's requested |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
266 |
$temp_dir = ( is_dir('/tmp') ) ? '/tmp' : ( isset($_ENV['TEMP']) ) ? $_ENV['TEMP'] : 'SOME RANDOM NAME'; |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
267 |
// if tempnam() cannot use the specified directory name, it will fall back on the system default |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
268 |
$tempname = tempnam($temp_dir, $filename); |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
269 |
if ( $tempname && is_writeable($tempname) ) |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
270 |
{ |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
271 |
$allow_scale = true; |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
272 |
} |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
273 |
} |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
274 |
if ( $allow_scale ) |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
275 |
{ |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
276 |
$result = scale_image($orig_fname, $fname, $width, $height); |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
277 |
if ( !$result ) |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
278 |
$fname = $orig_fname; |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
279 |
} |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
280 |
else |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
281 |
{ |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
282 |
$fname = $orig_fname; |
0 | 283 |
} |
284 |
} |
|
285 |
} |
|
195
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
286 |
$handle = @fopen($fname, 'r'); |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
287 |
if ( !$handle ) |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
288 |
die('Can\'t open output file for reading'); |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
289 |
|
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
290 |
$len = filesize($fname); |
0 | 291 |
header('Content-type: '.$row['mimetype']); |
195
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
292 |
if ( isset($_GET['download']) ) |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
293 |
{ |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
294 |
header('Content-disposition: attachment, filename="' . $filename . '";'); |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
295 |
} |
0 | 296 |
header('Content-length: '.$len); |
297 |
header('Last-Modified: '.date('r', $row['time_id'])); |
|
195
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
298 |
|
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
299 |
// using this method limits RAM consumption |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
300 |
while ( !feof($handle) ) |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
301 |
{ |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
302 |
echo fread($handle, 512000); |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
303 |
} |
3daa715e0f69
Alternate scaling using GD is implemented now; images will be scaled with ImageMagick if enabled and working; else, GD will be used. No UI changes to speak of, but a check in the installer will be added in a later commit
Dan
parents:
181
diff
changeset
|
304 |
fclose($handle); |
0 | 305 |
|
80
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
parents:
23
diff
changeset
|
306 |
gzip_output(); |
0 | 307 |
|
308 |
exit; |
|
309 |
||
310 |
} |
|
311 |
||
312 |
?> |