<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14420] trunk: limit upload size to site's available limit, see #12853</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14420">14420</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-03 22:40:02 +0000 (Mon, 03 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>limit upload size to site's available limit, see <a href="http://trac.wordpress.org/ticket/12853">#12853</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpincludesmsdefaultfiltersphp">trunk/wp-includes/ms-default-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (14419 => 14420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-05-03 22:22:34 UTC (rev 14419)
+++ trunk/wp-admin/includes/ms.php 2010-05-03 22:40:02 UTC (rev 14420)
</span><span class="lines">@@ -399,11 +399,28 @@
</span><span class="cx"> if ( get_site_option( 'upload_space_check_disabled' ) )
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- $space_allowed = get_space_allowed();
</del><ins>+ if ( !( $space_allowed = get_upload_space_available() ) )
+ return false;
</ins><span class="cx">
</span><ins>+ return true;
+}
+
+function upload_size_limit_filter( $size ) {
+ return min( $size, get_upload_space_available() );
+}
+/**
+ * Determines if there is any upload space left in the current blog's quota.
+ *
+ * @return int of upload space available in bytes
+ */
+function get_upload_space_available() {
+ $space_allowed = get_space_allowed() * 1024 * 1024;
+ if ( get_site_option( 'upload_space_check_disabled' ) )
+ return $space_allowed;
+
</ins><span class="cx"> $dir_name = trailingslashit( BLOGUPLOADDIR );
</span><span class="cx"> if ( !( is_dir( $dir_name) && is_readable( $dir_name ) ) )
</span><del>- return true;
</del><ins>+ return $space_allowed;
</ins><span class="cx">
</span><span class="cx"> $dir = dir( $dir_name );
</span><span class="cx"> $size = 0;
</span><span class="lines">@@ -418,12 +435,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> $dir->close();
</span><del>- $size = $size / 1024 / 1024;
</del><span class="cx">
</span><span class="cx"> if ( ( $space_allowed - $size ) <= 0 )
</span><del>- return false;
</del><ins>+ return 0;
</ins><span class="cx">
</span><del>- return true;
</del><ins>+ return $space_allowed - $size;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesmsdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-default-filters.php (14419 => 14420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-default-filters.php 2010-05-03 22:22:34 UTC (rev 14419)
+++ trunk/wp-includes/ms-default-filters.php 2010-05-03 22:40:02 UTC (rev 14420)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> add_filter( 'import_upload_size_limit', 'fix_import_form_size' );
</span><span class="cx"> add_filter( 'upload_mimes', 'check_upload_mimes' );
</span><span class="cx"> add_action( 'admin_notices', 'ms_deprecated_blogs_file' );
</span><ins>+add_action( 'upload_size_limit', 'upload_size_limit_filter' );
</ins><span class="cx">
</span><span class="cx"> // Mail
</span><span class="cx"> add_filter( 'wp_mail_from', 'wordpressmu_wp_mail_from' );
</span></span></pre>
</div>
</div>
</body>
</html>