Changeset 12824

Timestamp:

01/25/2010 07:46:24 PM (14 years ago)

Author:

ryan

Message:

Add wp-admin/includes/ms-deprecated.php. Deprecate wpmu_checkAvailableSpace. Introduce is_upload_space_available(). see #11762

Location:

trunk/wp-admin/includes

Files:

• admin.php (modified) (1 diff)
• deprecated.php (modified) (1 diff)
• media.php (modified) (2 diffs)
• ms-deprecated.php (added)
• ms.php (modified) (4 diffs)

trunk/wp-admin/includes/admin.php

@@ -56 +56 @@
 
 /** WordPress Multi-Site support API */
-if ( is_multisite() )
+if ( is_multisite() ) {
     require_once(ABSPATH . 'wp-admin/includes/ms.php');
+    require_once(ABSPATH . 'wp-admin/includes/ms-deprecated.php');
+}
 
 ?>

trunk/wp-admin/includes/deprecated.php

@@ -1 +1 @@
 <?php
+/**
+ * Deprecated admin functions from past WordPress versions. You shouldn't use these
+ * globals and functions and look for the alternatives instead. The functions
+ * and globals will be removed in a later version.
+ *
+ * @package WordPress
+ * @subpackage Deprecated
+ */
 
 /**

trunk/wp-admin/includes/media.php

@@ -1398 +1398 @@
 </div>
 
-<?php do_action('pre-upload-ui'); ?>
-
-<?php if ( $flash ) : ?>
+<?php
+// Check quota for this blog if multisite
+if ( is_multisite() && !is_upload_space_available() )
+    wp_die( __('Sorry, you must delete files before you can upload any more.') );
+
+do_action('pre-upload-ui');
+
+if ( $flash ) : ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -2230 +2235 @@
 
 add_filter('media_upload_library', 'media_upload_library');
-

trunk/wp-admin/includes/ms.php

@@ -356 +356 @@
 }
 
+/**
+ * Determines if there is any upload space left in the current blog's quota.
+ *
+ * @return bool True if space is available, false otherwise.
+ */
+function is_upload_space_available() {
+    if ( get_site_option( 'upload_space_check_disabled' ) )
+        return true;
+
+    $space_allowed = get_space_allowed();
+
+    $dir_name = trailingslashit( BLOGUPLOADDIR );
+    if ( !(is_dir($dir_name) && is_readable($dir_name)) )
+        return true;
+
+    $dir = dir($dir_name);
+    $size = 0;
+
+    while ( $file = $dir->read() ) {
+        if ( $file != '.' && $file != '..' ) {
+            if ( is_dir( $dir_name . $file) ) {
+                $size += get_dirsize($dir_name . $file);
+            } else {
+                $size += filesize($dir_name . $file);
+            }
+        }
+    }
+    $dir->close();
+    $size = $size / 1024 / 1024;
+
+    if ( ($space_allowed - $size) <= 0 )
+        return false;
+
+    return true;
+}
+
+/**
+ * Returns the upload quota for the current blog.
+ *
+ * @return int Quota
+ */
 function get_space_allowed() {
-    $spaceAllowed = get_option("blog_upload_space");
-    if ( $spaceAllowed == false )
-        $spaceAllowed = get_site_option("blog_upload_space");
-    if ( empty($spaceAllowed) || !is_numeric($spaceAllowed) )
-        $spaceAllowed = 50;
-
-    return $spaceAllowed;
+    $space_allowed = get_option('blog_upload_space');
+    if ( $space_allowed == false )
+        $space_allowed = get_site_option('blog_upload_space');
+    if ( empty($space_allowed) || !is_numeric($space_allowed) )
+        $space_allowed = 50;
+
+    return $space_allowed;
 }
 
@@ -370 +411 @@
     $used = get_dirsize( BLOGUPLOADDIR )/1024/1024;
 
-    if ($used > $space) $percentused = '100';
-    else $percentused = ( $used / $space ) * 100;
+    if ( $used > $space )
+        $percentused = '100';
+    else
+        $percentused = ( $used / $space ) * 100;
 
     if ( $space > 1000 ) {
@@ -460 +503 @@
 }
 
-/*
-  Determines if the available space defined by the admin has been exceeded by the user
-*/
-function wpmu_checkAvailableSpace() {
-    if ( get_site_option( 'upload_space_check_disabled' ) ) {
-        return true;
-    }
-    $spaceAllowed = get_space_allowed();
-
-    $dirName = trailingslashit( BLOGUPLOADDIR );
-    if (!(is_dir($dirName) && is_readable($dirName)))
-        return;
-
-    $dir = dir($dirName);
-    $size = 0;
-
-    while($file = $dir->read()) {
-        if ($file != '.' && $file != '..') {
-            if (is_dir( $dirName . $file)) {
-                $size += get_dirsize($dirName . $file);
-            } else {
-                $size += filesize($dirName . $file);
-            }
-        }
-    }
-    $dir->close();
-    $size = $size / 1024 / 1024;
-
-    if ( ($spaceAllowed - $size) <= 0 ) {
-        wp_die( __('Sorry, you must delete files before you can upload any more.') );
-    }
-}
-add_action('pre-upload-ui','wpmu_checkAvailableSpace');
-
 function format_code_lang( $code = '' ) {
     $code = strtolower(substr($code, 0, 2));
@@ -553 +562 @@
 }
 add_action( 'admin_page_access_denied', 'redirect_user_to_blog', 99 );
-
-function wpmu_menu() {
-    // deprecated. See #11763
-}
 
 function mu_options( $options ) {