Ticket #2596: fileupload_maxk.patch

admin-functions.php

@@ -1853 +1853 @@
         // Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error'].
         $upload_error_strings = array( false,
                 __( "The uploaded file exceeds the <code>upload_max_filesize</code> directive in <code>php.ini</code>." ),
-                __( "The uploaded file exceeds the <em>MAX_FILE_SIZE</em> directive that was specified in the HTML form." ),
+                __("The uploaded file exceeds the <em>MAX_FILE_SIZE</em> value, which can be modified in the Options/Miscellaneous tab."),
                 __( "The uploaded file was only partially uploaded." ),
                 __( "No file was uploaded." ),
                 __( "Missing a temporary folder." ),

options-misc.php

@@ -16 +16 @@
 <fieldset class="options">
 <legend><?php _e('Uploading'); ?></legend>
 <table class="editform optiontable">
-<tr valign="top">
+<tr valign="top">
 <th scope="row"><?php _e('Store uploads in this folder'); ?>:</th>
 <td><input name="upload_path" type="text" id="upload_path" class="code" value="<?php echo wp_specialchars(str_replace(ABSPATH, '', get_option('upload_path')), 1); ?>" size="40" />
 <br />
@@ -32 +32 @@
 </label>
 </td>
 </tr>
+<tr valign="top">
+<th scope="row"><?php _e('Max uploaded file size (in KB)'); ?>:</th>
+<td><input name="fileupload_maxk" type="text" id="fileupload_maxk" class="code" value="<?php echo wp_specialchars(str_replace(ABSPATH, '', get_settings('fileupload_maxk')), 1); ?>" size="20" />
+</td>
+</tr>
 </table>
 </fieldset>
 
@@ -43 +48 @@
 
 <p class="submit">
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path" />
+<input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path,fileupload_maxk" /> 
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
 </p>
 </form>

options.php

@@ -73 +73 @@
                         $value = stripslashes($value);
                         $value = clean_url($value);
                         break;
+                case 'fileupload_maxk':                 
+                        // ensure $value is an integer
+                        if(!ereg("^[0-9]+$",$value)) {
+                                $value = get_settings('fileupload_maxk');
+                        }
                 default :
                         $value = stripslashes($value);
                         break;

upgrade-schema.php

@@ -221 +221 @@
         } else {
                 add_option('uploads_use_yearmonth_folders', 1);
                 add_option('upload_path', 'wp-content/uploads');
-        }
+        }       
 
         // 2.0.3
         add_option('secret', md5(uniqid(microtime())));
@@ -230 +230 @@
         add_option('blog_public', '1');
         add_option('default_link_category', 2);
         add_option('show_on_front', 'posts');
+        
+        // 10MB max by default
+        add_option('fileupload_maxk','10240');
 
         // Delete unused options
         $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing');

upload-functions.php

@@ -134 +134 @@
 <?php   else : ?>
                         <tr>
                                 <th scope="row"><label for="upload"><?php _e('File'); ?></label></th>
+                                <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo wp_specialchars(str_replace(ABSPATH, '', get_settings('fileupload_maxk')), 1) * 1024; ?>" />
                                 <td><input type="file" id="upload" name="image" /></td>
                         </tr>
 <?php   endif; ?>
@@ -151 +152 @@
                                         <input type="submit" name="delete" id="delete" class="delete alignleft" value="<?php _e('Delete File'); ?>" />
 <?php   endif; ?>
                                         <input type="hidden" name="from_tab" value="<?php echo $tab; ?>" />
-                                        <input type="hidden" name="action" value="<?php echo $id ? 'save' : 'upload'; ?>" />
+                                        <input type="hidden" name="action" value="<?php echo $id ? 'save' : 'upload'; ?>" />                                    
 <?php   if ( $post_id ) : ?>
                                         <input type="hidden" name="post_id" value="<?php echo $post_id; ?>" />
 <?php   endif; if ( $id ) : ?>
                                         <input type="hidden" name="ID" value="<?php echo $id; ?>" />
 <?php   endif; ?>
                                         <?php wp_nonce_field( 'inlineuploading' ); ?>
-                                        <div class="submit">
+                                        <div class="submit">                                            
                                                 <input type="submit" value="<?php $id ? _e('Save') : _e('Upload'); ?> &raquo;" />
                                         </div>
                                 </td>