<!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>[15487] trunk/wp-admin/includes: Move dashboard_quota in dashboard.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15487">15487</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-08-02 17:56:05 +0000 (Mon, 02 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move dashboard_quota in dashboard.php. Don't perform current_user_can check before init.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (15486 => 15487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2010-08-02 17:29:34 UTC (rev 15486)
+++ trunk/wp-admin/includes/dashboard.php 2010-08-02 17:56:05 UTC (rev 15487)
</span><span class="lines">@@ -1034,6 +1034,45 @@
</span><span class="cx"> wp_widget_rss_form( $widget_options[$widget_id], $form_inputs );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Display File upload quota on dashboard
+function wp_dashboard_quota() {
+ if ( !is_multisite() || !current_user_can('edit_posts') || get_site_option( 'upload_space_check_disabled' ) )
+ return true;
+
+ $quota = get_space_allowed();
+ $used = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024;
+
+ if ( $used > $quota )
+ $percentused = '100';
+ else
+ $percentused = ( $used / $quota ) * 100;
+ $used_color = ( $percentused < 70 ) ? ( ( $percentused >= 40 ) ? 'waiting' : 'approved' ) : 'spam';
+ $used = round( $used, 2 );
+ $percentused = number_format( $percentused );
+
+ ?>
+ <p class="sub musub"><?php _e( 'Storage Space' ); ?></p>
+ <div class="table table_content musubtable">
+ <table>
+ <tr class="first">
+ <td class="first b b-posts"><?php printf( __( '<a href="%1$s" title="Manage Uploads" class="musublink">%2$sMB</a>' ), esc_url( admin_url( 'upload.php' ) ), $quota ); ?></td>
+ <td class="t posts"><?php _e( 'Space Allowed' ); ?></td>
+ </tr>
+ </table>
+ </div>
+ <div class="table table_discussion musubtable">
+ <table>
+ <tr class="first">
+ <td class="b b-comments"><?php printf( __( '<a href="%1$s" title="Manage Uploads" class="musublink">%2$sMB (%3$s%%)</a>' ), esc_url( admin_url( 'upload.php' ) ), $used, $percentused ); ?></td>
+ <td class="last t comments <?php echo $used_color;?>"><?php _e( 'Space Used' );?></td>
+ </tr>
+ </table>
+ </div>
+ <br class="clear" />
+ <?php
+}
+add_action( 'activity_box_end', 'wp_dashboard_quota' );
+
</ins><span class="cx"> /**
</span><span class="cx"> * Empty function usable by plugins to output empty dashboard widget (to be populated later by JS).
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (15486 => 15487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-08-02 17:29:34 UTC (rev 15486)
+++ trunk/wp-admin/includes/ms.php 2010-08-02 17:56:05 UTC (rev 15487)
</span><span class="lines">@@ -483,46 +483,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Display File upload quota on dashboard
-function dashboard_quota() {
- if ( get_site_option( 'upload_space_check_disabled' ) )
- return true;
-
- $quota = get_space_allowed();
- $used = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024;
-
- if ( $used > $quota )
- $percentused = '100';
- else
- $percentused = ( $used / $quota ) * 100;
- $used_color = ( $percentused < 70 ) ? ( ( $percentused >= 40 ) ? 'waiting' : 'approved' ) : 'spam';
- $used = round( $used, 2 );
- $percentused = number_format( $percentused );
-
- ?>
- <p class="sub musub"><?php _e( 'Storage Space' ); ?></p>
- <div class="table table_content musubtable">
- <table>
- <tr class="first">
- <td class="first b b-posts"><?php printf( __( '<a href="%1$s" title="Manage Uploads" class="musublink">%2$sMB</a>' ), esc_url( admin_url( 'upload.php' ) ), $quota ); ?></td>
- <td class="t posts"><?php _e( 'Space Allowed' ); ?></td>
- </tr>
- </table>
- </div>
- <div class="table table_discussion musubtable">
- <table>
- <tr class="first">
- <td class="b b-comments"><?php printf( __( '<a href="%1$s" title="Manage Uploads" class="musublink">%2$sMB (%3$s%%)</a>' ), esc_url( admin_url( 'upload.php' ) ), $used, $percentused ); ?></td>
- <td class="last t comments <?php echo $used_color;?>"><?php _e( 'Space Used' );?></td>
- </tr>
- </table>
- </div>
- <br class="clear" />
- <?php
-}
-if ( current_user_can( 'edit_posts' ) )
- add_action( 'activity_box_end', 'dashboard_quota' );
-
</del><span class="cx"> // Edit blog upload space setting on Edit Blog page
</span><span class="cx"> function upload_space_setting( $id ) {
</span><span class="cx"> $quota = get_blog_option( $id, 'blog_upload_space' );
</span></span></pre>
</div>
</div>
</body>
</html>