From: Glenn H. <thr...@us...> - 2004-10-24 19:04:46
|
Update of /cvsroot/mantisbt/mantisbt/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21243/admin Modified Files: check.php admin.css Log Message: fix for 0004749: Uploading large files fails & slogs Apache added checks in admin/check.php to explain the other settings that may be required added filesize limit to all places where bug files are uploaded added calculation to limit upload size if PHP inis are set lower than our limit Index: admin.css =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/admin/admin.css,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- admin.css 30 Sep 2004 18:31:24 -0000 1.4 +++ admin.css 24 Oct 2004 19:04:37 -0000 1.5 @@ -11,3 +11,4 @@ table.width100 { width: 100%; border: solid 1px #000000; } table.width50 { width: 50%; border: solid 1px #000000; } td.center { text-align: center; } +.error { background-color: red; color: black; } \ No newline at end of file Index: check.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/admin/check.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- check.php 12 Oct 2004 20:34:24 -0000 1.15 +++ check.php 24 Oct 2004 19:04:37 -0000 1.16 @@ -374,18 +374,40 @@ <?php if ( ini_get_bool( 'file_uploads' ) && config_get( 'allow_file_upload' ) ) { ?> - <p>File uploads are ENABLED</p> + <p>File uploads are ENABLED.</p> + <p>File uploads will be stored <?php + switch ( config_get( 'file_upload_method' ) ) { + case DATABASE: + echo 'in the DATABASE.'; + break; + case DISK: + echo 'on DISK in the directory specified by the project.'; + break; + case FTP: + echo 'on an FTP server (' . config_get( 'file_upload_ftp_server' ) . '), and cached locally.'; + break; + default: + echo 'in an illegal place.'; + } ?> </p> <p>The following size settings are in effect. Maximum upload size will be whichever of these is SMALLEST. </p> - <p>PHP variable 'upload_max_filesize': <?php echo ini_get( 'upload_max_filesize' ) ?><br /> - PHP variable 'post_max_size': <?php echo ini_get( 'post_max_size' ) ?><br /> + <p>PHP variable 'upload_max_filesize': <?php echo ini_get_number( 'upload_max_filesize' ) ?> bytes<br /> + PHP variable 'post_max_size': <?php echo ini_get_number( 'post_max_size' ) ?> bytes<br /> Mantis variable 'max_file_size': <?php echo config_get( 'max_file_size' ) ?> bytes</p> - <p>There may also be settings in Apache (or MySQL if using the SQL upload method) that prevent you from uploading files or limit the maximum file size. See the documentation for those packages if you need more information.</p> <?php + if ( DATABASE == config_get( 'file_upload_method' ) ) { + echo '<p>There may also be settings in your web server and database that prevent you from uploading files or limit the maximum file size. See the documentation for those packages if you need more information. '; + if ( 500 < min( ini_get_number( 'upload_max_filesize' ), ini_get_number( 'post_max_size' ), config_get( 'max_file_size' ) ) ) { + echo '<span class="error">Your current settings will most likely need adjustments to the PHP max_execution_time or memory_limit settings, the MySQL max_allowed_packet setting, or equivalent.</span>'; + } + } else { + echo '<p>There may also be settings in your web server that prevent you from uploading files or limit the maximum file size. See the documentation for those packages if you need more information.'; + } + echo '</p>'; } else { ?> - <p>File uploads are DISABLED. To enable them, make sure <tt>file_uploads = on</tt> is in your php.ini file and <tt>allow_file_upload = ON</tt> is in your mantis config file.</p> + <p>File uploads are DISABLED. To enable them, make sure <tt>$g_file_uploads = on</tt> is in your php.ini file and <tt>allow_file_upload = ON</tt> is in your mantis config file.</p> <?php } ?> |