Changeset 9029

Timestamp:

09/29/2008 12:03:30 PM (16 years ago)

Author:

azaozz

Message:

Fix "select all" checkboxes and upload.php

Location:

trunk/wp-admin

Files:

• edit-comments.php (modified) (1 diff)
• js/forms.js (modified) (1 diff)
• upload.php (modified) (12 diffs)

trunk/wp-admin/edit-comments.php

@@ -15 +15 @@
 wp_enqueue_script( 'jquery-table-hotkeys' );
 
-if ( isset( $_POST['delete_all_spam'] ) ) {
+if ( isset( $_POST['delete_all_spam'] ) || isset( $_POST['delete_all_spam2'] ) ) {
     check_admin_referer('bulk-spam-delete');
 

trunk/wp-admin/js/forms.js

@@ -21 +21 @@
         return true;
     } );
-    $( 'thead :checkbox' ).click( function() {
+    $( 'thead :checkbox, tfoot :checkbox' ).click( function() {
         checkAll( $(this).parents( 'form:first' ) );
     } );

trunk/wp-admin/upload.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once('admin.php');
-//add_thickbox();
-wp_enqueue_script( 'media-upload' );
 wp_enqueue_script( 'wp-ajax-response' );
 wp_enqueue_script( 'jquery-ui-draggable' );
@@ -57 +55 @@
         $attach = implode(',', $attach);
         $attached = $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ($attach)", $parent_id) );
-
-        $message = sprintf( __ngettext('Added %1$s attachment to <strong>%2$s</strong>', 'Added %1$s attachments to <strong>%2$s</strong>', $attached, apply_filters( "the_title", $parent->post_title ) ) , $attached, apply_filters( "the_title", $parent->post_title ) );
-    }
-
-    $_GET['detached'] = 1;
-
-} elseif ( isset($_GET['action']) && isset($_GET['media']) && isset($_GET['doaction']) ) {
-    check_admin_referer('bulk-media');
-    if ( $_GET['action'] == 'delete' ) {
-        foreach( (array) $_GET['media'] as $post_id_del ) {
-            $post_del = & get_post($post_id_del);
-
-            if ( !current_user_can('delete_post', $post_id_del) )
-                wp_die( __('You are not allowed to delete this post.') );
-
-            if ( $post_del->post_type == 'attachment' )
-                if ( ! wp_delete_attachment($post_id_del) )
-                    wp_die( __('Error in deleting...') );
-        }
-
+    }
+
+    if ( isset($attached) ) {
         $location = 'upload.php';
         if ( $referer = wp_get_referer() ) {
@@ -82 +63 @@
                 $location = $referer;
         }
+    
+        $location = add_query_arg( array( 'detached' => 1, 'attached' => $attached ) , $location );
+        wp_redirect($location);
+        exit;
+    }
+
+} elseif ( isset($_GET['action']) && isset($_GET['media']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) {
+    check_admin_referer('bulk-media');
+    $doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2'];
+
+    if ( 'delete' == $doaction ) {
+        foreach( (array) $_GET['media'] as $post_id_del ) {
+            $post_del = & get_post($post_id_del);
+
+            if ( !current_user_can('delete_post', $post_id_del) )
+                wp_die( __('You are not allowed to delete this post.') );
+
+            if ( $post_del->post_type == 'attachment' )
+                if ( ! wp_delete_attachment($post_id_del) )
+                    wp_die( __('Error in deleting...') );
+        }
+
+        $location = 'upload.php';
+        if ( $referer = wp_get_referer() ) {
+            if ( false !== strpos($referer, 'upload.php') )
+                $location = $referer;
+        }
 
         $location = add_query_arg('message', 2, $location);
@@ -88 +96 @@
         exit;
     }
-} elseif ( !empty($_GET['_wp_http_referer']) ) {
-    wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI'])));
-    exit;
+} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+     wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
+     exit;
 }
 
@@ -155 +163 @@
     $_GET['message'] = '1';
     $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
+}
+
+if ( isset($_GET['attached']) && (int) $_GET['attached'] ) {
+    $attached = (int) $_GET['attached'];
+    $message = sprintf( __ngettext('Reattached %d attachment', 'Reattached %d attachments', $attached), $attached );
+    $_SERVER['REQUEST_URI'] = remove_query_arg(array('attached'), $_SERVER['REQUEST_URI']);
 }
 
@@ -294 +308 @@
 
 <div class="alignleft">
-<select name="action" id="select-action">
-<option value="" selected><?php _e('Actions'); ?></option>
+<select name="action" class="select-action">
+<option value="-1" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 <?php if ( isset($orphans) ) { ?>
@@ -301 +315 @@
 <?php } ?>
 </select>
-<input type="submit" id="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php wp_nonce_field('bulk-media'); ?>
 
@@ -325 +339 @@
 </tr>
 </thead>
+
+<tfoot>
+<tr>
+    <th scope="col" class="check-column"><input type="checkbox" /></th>
+    <th scope="col"></th>
+    <th scope="col"><?php echo _c('Media|media column header'); ?></th>
+    <th scope="col"><?php echo _c('Date Added|media column header'); ?></th>
+</tr>
+</tfoot>
 
 <tbody id="the-list" class="list:post">
@@ -384 +407 @@
 </tbody>
 </table>
-<script type="text/javascript">
-    (function($){
-        $('#submit').click(function(e) {
-            if ( 'attach' == $('#select-action').val() ) {
-                e.preventDefault();
-                findPosts.open();
-            }
-        });
-    })(jQuery);
-</script>
+
 <?php find_posts_div();
 
@@ -410 +424 @@
 
 <div class="alignleft">
-<select name="action2" id="select-action">
-<option value="" selected><?php _e('Actions'); ?></option>
+<select name="action2" class="select-action">
+<option value="-1" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 <?php if ( isset($orphans) ) { ?>
@@ -417 +431 @@
 <?php } ?>
 </select>
-<input type="submit" id="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
 </div>
 
@@ -464 +478 @@
 </div>
 
+<script type="text/javascript">
+    jQuery(function($) {
+        $('#doaction').click(function(e) {
+            if ( 'attach' == $('#posts-filter select[name="action"]').val() ) {
+                e.preventDefault();
+                findPosts.open();
+            }
+        });
+        $('#doaction2').click(function(e) {
+            if ( 'attach' == $('#posts-filter select[name="action2"]').val() ) {
+                e.preventDefault();
+                findPosts.open();
+            }
+        });
+    });
+</script>
 <?php