Ticket #12785: sortable-links-widget.diff

default-widgets.php

@@ -103 +103 @@
                 $show_rating = isset($instance['rating']) ? $instance['rating'] : false;
                 $show_images = isset($instance['images']) ? $instance['images'] : true;
                 $category = isset($instance['category']) ? $instance['category'] : false;
+                $orderby = isset($instance['orderby']) ? $instance['orderby'] : 'name';
+                $order = isset($instance['order']) ? $instance['order'] : 'ASC';
+                $limit = isset($instance['limit']) ? $instance['limit'] : -1;
 
+                if ( $orderby == 'rating' )
+                        $order = 'DESC';
+
                 if ( is_admin() && !$category ) {
                         // Display All Links widget as such in the widgets screen
                         echo $before_widget . $before_title. __('All Links') . $after_title . $after_widget;
@@ -116 +122 @@
                         'category_before' => $before_widget, 'category_after' => $after_widget,
                         'show_images' => $show_images, 'show_description' => $show_description,
                         'show_name' => $show_name, 'show_rating' => $show_rating,
-                        'category' => $category, 'class' => 'linkcat widget'
+                        'category' => $category, 'class' => 'linkcat widget',
+                        'orderby' => $orderby, 'order' => $order,
+                        'limit' => $limit
                 )));
         }
 
         function update( $new_instance, $old_instance ) {
                 $new_instance = (array) $new_instance;
-                $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0);
+                $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0, 'orderby' => 'name', 'limit' => -1);
                 foreach ( $instance as $field => $val ) {
                         if ( isset($new_instance[$field]) )
                                 $instance[$field] = 1;
                 }
+                if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand') ) ) {
+                        $instance['orderby'] = $new_instance['orderby'];
+                } else {
+                        $instance['orderby'] = 'name';
+                }
                 $instance['category'] = intval($new_instance['category']);
+                $instance['limit'] = (int) $new_instance['limit'];
 
                 return $instance;
         }
@@ -135 +149 @@
         function form( $instance ) {
 
                 //Defaults
-                $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false ) );
+                $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => '-1' ) );
                 $link_cats = get_terms( 'link_category');
+                if ( !isset($instance['limit']) || !$limit = (int) $instance['limit'] )
+                        $limit = -1;
 ?>
                 <p>
-                <label for="<?php echo $this->get_field_id('category'); ?>" class="screen-reader-text"><?php _e('Select Link Category'); ?></label>
-                <select class="widefat" id="<?php echo $this->get_field_id('category'); ?>" name="<?php echo $this->get_field_name('category'); ?>">
-                <option value=""><?php _e('All Links'); ?></option>
-                <?php
-                foreach ( $link_cats as $link_cat ) {
-                        echo '<option value="' . intval($link_cat->term_id) . '"'
-                                . ( $link_cat->term_id == $instance['category'] ? ' selected="selected"' : '' )
-                                . '>' . $link_cat->name . "</option>\n";
-                }
-                ?>
-                </select></p>
+                        <label for="<?php echo $this->get_field_id('category'); ?>" class="screen-reader-text"><?php _e('Select Link Category'); ?></label>
+                        <select class="widefat" id="<?php echo $this->get_field_id('category'); ?>" name="<?php echo $this->get_field_name('category'); ?>">
+                        <option value=""><?php _e('All Links'); ?></option>
+                        <?php
+                        foreach ( $link_cats as $link_cat ) {
+                                echo '<option value="' . intval($link_cat->term_id) . '"'
+                                        . ( $link_cat->term_id == $instance['category'] ? ' selected="selected"' : '' )
+                                        . '>' . $link_cat->name . "</option>\n";
+                        }
+                        ?>
+                        </select>
+                </p>
                 <p>
-                <input class="checkbox" type="checkbox" <?php checked($instance['images'], true) ?> id="<?php echo $this->get_field_id('images'); ?>" name="<?php echo $this->get_field_name('images'); ?>" />
-                <label for="<?php echo $this->get_field_id('images'); ?>"><?php _e('Show Link Image'); ?></label><br />
-                <input class="checkbox" type="checkbox" <?php checked($instance['name'], true) ?> id="<?php echo $this->get_field_id('name'); ?>" name="<?php echo $this->get_field_name('name'); ?>" />
-                <label for="<?php echo $this->get_field_id('name'); ?>"><?php _e('Show Link Name'); ?></label><br />
-                <input class="checkbox" type="checkbox" <?php checked($instance['description'], true) ?> id="<?php echo $this->get_field_id('description'); ?>" name="<?php echo $this->get_field_name('description'); ?>" />
-                <label for="<?php echo $this->get_field_id('description'); ?>"><?php _e('Show Link Description'); ?></label><br />
-                <input class="checkbox" type="checkbox" <?php checked($instance['rating'], true) ?> id="<?php echo $this->get_field_id('rating'); ?>" name="<?php echo $this->get_field_name('rating'); ?>" />
-                <label for="<?php echo $this->get_field_id('rating'); ?>"><?php _e('Show Link Rating'); ?></label>
+                        <label for="<?php echo $this->get_field_id('orderby'); ?>"><?php _e( 'Sort by:' ); ?></label>
+                        <select name="<?php echo $this->get_field_name('orderby'); ?>" id="<?php echo $this->get_field_id('orderby'); ?>" class="widefat">
+                                <option value="name"<?php selected( $instance['orderby'], 'name' ); ?>><?php _e('Link title'); ?></option>
+                                <option value="rating"<?php selected( $instance['orderby'], 'rating' ); ?>><?php _e('Link rating'); ?></option>
+                                <option value="id"<?php selected( $instance['orderby'], 'id' ); ?>><?php _e( 'Link ID' ); ?></option>
+                                <option value="rand"<?php selected( $instance['orderby'], 'rand' ); ?>><?php _e( 'Random' ); ?></option>
+                        </select>
                 </p>
+                <p>
+                        <input class="checkbox" type="checkbox" <?php checked($instance['images'], true) ?> id="<?php echo $this->get_field_id('images'); ?>" name="<?php echo $this->get_field_name('images'); ?>" />
+                        <label for="<?php echo $this->get_field_id('images'); ?>"><?php _e('Show Link Image'); ?></label><br />
+                        <input class="checkbox" type="checkbox" <?php checked($instance['name'], true) ?> id="<?php echo $this->get_field_id('name'); ?>" name="<?php echo $this->get_field_name('name'); ?>" />
+                        <label for="<?php echo $this->get_field_id('name'); ?>"><?php _e('Show Link Name'); ?></label><br />
+                        <input class="checkbox" type="checkbox" <?php checked($instance['description'], true) ?> id="<?php echo $this->get_field_id('description'); ?>" name="<?php echo $this->get_field_name('description'); ?>" />
+                        <label for="<?php echo $this->get_field_id('description'); ?>"><?php _e('Show Link Description'); ?></label><br />
+                        <input class="checkbox" type="checkbox" <?php checked($instance['rating'], true) ?> id="<?php echo $this->get_field_id('rating'); ?>" name="<?php echo $this->get_field_name('rating'); ?>" />
+                        <label for="<?php echo $this->get_field_id('rating'); ?>"><?php _e('Show Link Rating'); ?></label>
+                </p>
+                <p>
+                        <label for="<?php echo $this->get_field_id('limit'); ?>"><?php _e('Show how many (empty for all):'); ?></label>
+                        <input id="<?php echo $this->get_field_id('limit'); ?>" name="<?php echo $this->get_field_name('limit'); ?>" type="text" value="<?php if ( $limit == -1 )  echo ''; else echo $limit; ?>" size="3" /><br />
+                </p>
+                
 <?php
         }
 }