Ticket #5542: wppatch

Index: wp-includes/widgets.php
===================================================================
--- wp-includes/widgets.php     (revision 6294)
+++ wp-includes/widgets.php     (working copy)
@@ -527,6 +527,181 @@
 <?php
 }
 
+function wp_widget_bgbookmarks($args, $number = 1) {
+       extract($args, EXTR_SKIP);
+
+    $options = get_option('widget_bgbookmarks');
+
+    $linkcat_id = $options[$number]['linkcat_id'];
+    $showdesc = $options[$number]['showdesc'];
+    $bydate = $options[$number]['bydate'];
+
+    $linkcat_name = get_term_field('name', $linkcat_id, 'link_category');
+
+    $bookmark_args = array(
+               'title_before' => $before_title, 'title_after' => $after_title,
+               'category_before' => $before_widget, 'category_after' => $after_widget,
+               'show_images' => true, 'class' => 'linkcat widget',
+        'categorize' => 0,
+        'category_name' => $linkcat_name, 'category' => $linkcat_id,
+        'show_description' => $showdesc
+    );
+
+    if ($bydate) {
+      $bookmark_args['orderby'] = 'id';
+      $bookmark_args['order'] = 'DESC';
+      $bookmark_args['limit'] = 10; // xxx parameterize
+    }
+
+    $bookmark_args['title_li'] = $linkcat_name;
+
+       wp_list_bookmarks($bookmark_args);
+}
+
+function wp_widget_bgbookmarks_register() {
+  $options = get_option('widget_bgbookmarks');
+  if (!isset($options['number']))
+    $options = wp_widget_bgbookmarks_upgrade();
+  $number = (int) $options['number'];
+
+  if ( $number > 9 ) {
+    $number = 9;
+  } elseif ( $number < 1 ) {
+    $number = 1;
+  }
+
+  $dims = array( 'width' => 350, 'height' => 170 );
+  $class = array( 'classname' => 'widget_bgbookmarks' );
+
+  for ( $i = 1; $i <= 9; $i++ ) {
+    $name = sprintf( __( 'BGBookmarks %d' ), $i );
+    $id = 'bgbookmarks-' . $i;
+
+    $widget_callback = ( $i <= $number ) ? 'wp_widget_bgbookmarks' : '';
+    $control_callback = ( $i <= $number ) ? 'wp_widget_bgbookmarks_control' : '';
+
+    wp_register_sidebar_widget( $id, $name, $widget_callback, $class, $i );
+    wp_register_widget_control( $id, $name, $control_callback, $dims, $i );
+  }
+
+  add_action( 'sidebar_admin_setup', 'wp_widget_bgbookmarks_setup' );
+  add_action( 'sidebar_admin_page', 'wp_widget_bgbookmarks_page' );
+}
+
+function wp_widget_bgbookmarks_setup() {
+  $options = $newoptions = get_option( 'widget_bgbookmarks' );
+
+  if ( isset( $_POST['bgbookmarks-number-submit'] ) ) {
+    $number = (int) $_POST['bgbookmarks-number'];
+
+    if ( $number > 9 ) {
+      $number = 9;
+    } elseif ( $number < 1 ) {
+      $number = 1;
+    }
+
+    $newoptions['number'] = $number;
+  }
+
+  if ( $newoptions != $options ) {
+    $options = $newoptions;
+    update_option( 'widget_bgbookmarks', $options );
+    wp_widget_bgbookmarks_register( $options['number'] );
+  }
+}
+
+function wp_widget_bgbookmarks_page() {
+  $options = get_option( 'widget_bgbookmarks' );
+?>
+       <div class="wrap">
+               <form method="post">
+                       <h2><?php _e( 'BGBookmarks Widgets' ); ?></h2>
+                       <p style="line-height: 30px;"><?php _e( 'How many bgbookmarks widgets would you like?' ); ?>
+                               <select id="bgbookmarks-number" name="bgbookmarks-number" value="<?php echo attribute_escape( $options['number'] ); ?>">
+                                       <?php
+                                               for ( $i = 1; $i < 10; $i++ ) {
+                                                       echo '<option value="' . $i . '"' . ( $i == $options['number'] ? ' selected="selected"' : '' ) . '>' . $i . "</option>\n";
+                                               }
+                                       ?>
+                               </select>
+                               <span class="submit">
+                                       <input type="submit" value="<?php echo attribute_escape( __( 'Save' ) ); ?>" id="bgbookmarks-number-submit" name="bgbookmarks-number-submit" />
+                               </span>
+                       </p>
+               </form>
+       </div>
+<?php
+}
+
+function wp_widget_bgbookmarks_upgrade() {
+  $options = get_option( 'widget_bgbookmarks' );
+
+  $newoptions = array( 'number' => 1, 1 => $options );
+
+  update_option( 'widget_bgbookmarks', $newoptions );
+
+  $sidebars_widgets = get_option( 'sidebars_widgets' );
+  if ( is_array( $sidebars_widgets ) ) {
+    foreach ( $sidebars_widgets as $sidebar => $widgets ) {
+      if ( is_array( $widgets ) ) {
+        foreach ( $widgets as $widget )
+          $new_widgets[$sidebar][] = ( $widget == 'bgbookmarks' ) ? 'bgbookmarks-1' : $widget;
+      } else {
+        $new_widgets[$sidebar] = $widgets;
+      }
+    }
+    if ( $new_widgets != $sidebars_widgets )
+      update_option( 'sidebars_widgets', $new_widgets );
+  }
+
+  if ( isset( $_POST['bgbookmarks-submit'] ) ) {
+    $_POST['bgbookmarks-submit-1'] = $_POST['bgbookmarks-submit'];
+    $_POST['bgbookmarks-linkcat_id-1'] = $_POST['bgbookmarks-linkcat_id'];
+    $_POST['bgbookmarks-showdesc-1'] = $_POST['bgbookmarks-showdesc'];
+    $_POST['bgbookmarks-bydate-1'] = $_POST['bgbookmarks-bydate'];
+  }
+
+  return $newoptions;
+}
+
+function wp_widget_bgbookmarks_control($number) {
+  $options = $newoptions = get_option('widget_bgbookmarks');
+  if ($_POST["bgbookmarks-submit-$number"]) {
+    $newoptions[$number]['linkcat_id'] = $_POST["bgbookmarks-linkcat_id-$number"];
+    $newoptions[$number]['showdesc'] = isset($_POST["bgbookmarks-showdesc-$number"]);
+    $newoptions[$number]['bydate'] = isset($_POST["bgbookmarks-bydate-$number"]);
+  }
+  if ($options != $newoptions) {
+    $options = $newoptions;
+    update_option('widget_bgbookmarks', $options);
+  }
+  $linkcat_id = $options[$number]['linkcat_id'];
+  $showdesc = $options[$number]['showdesc'];
+  $bydate = $options[$number]['bydate'];
+?>
+  <p>
+    <label for="bgbookmarks-linkcat_id-<?php echo $number; ?>">
+      <?php _e('Category:'); ?> <select id="bgbookmarks-linkcat_id-<?php echo $number; ?>" name="bgbookmarks-linkcat_id-<?php echo $number; ?>">
+                                                <?php foreach (get_categories('type=link') as $linkcat) { $linkcat_id = $linkcat->term_id; $linkcat_name = $linkcat->name; echo "<option value=\"$linkcat_id\">$linkcat_name ($linkcat_id)</option>"; } ?>
+                                     </select>
+    </label></p>
+  </p>
+  <p>
+    <label for="bgbookmarks-showdesc-<?php echo $number; ?>">
+      <input type="checkbox" class="checkbox" id="bgbookmarks-showdesc-<?php echo $number; ?>" name="bgbookmarks-showdesc-<?php echo $number; ?>" <?php echo $showdesc ? 'checked="checked"' : ''; ?> />
+      <?php _e('Show descriptions'); ?>
+    </label>
+  </p>
+  <p>
+    <label for="bgbookmarks-bydate-<?php echo $number; ?>">
+      <input type="checkbox" class="checkbox" id="bgbookmarks-bydate-<?php echo $number; ?>" name="bgbookmarks-bydate-<?php echo $number; ?>" <?php echo $bydate ? 'checked="checked"' : ''; ?> />
+      <?php _e('Order by date'); ?>
+    </label>
+  </p>
+  <input type="hidden" id="bgbookmarks-submit-<?php echo $number; ?>" name="bgbookmarks-submit-<?php echo $number; ?>" value="1" />
+<?php
+}
+
 function wp_widget_text($args, $number = 1) {
        extract($args);
        $options = get_option('widget_text');
@@ -1158,6 +1333,7 @@
        wp_widget_text_register();
        wp_widget_rss_register();
        wp_widget_recent_comments_register();
+       wp_widget_bgbookmarks_register();
 
        $GLOBALS['wp_register_widget_defaults'] = false;