Changeset 3570

Timestamp:

02/27/06 04:57:30 (3 years ago)

Author:

ryan

Message:

Bookmark/link rework. #2499

Files:

• trunk/wp-admin/admin-db.php (modified) (8 diffs)
• trunk/wp-admin/admin-functions.php (modified) (9 diffs)
• trunk/wp-admin/admin-header.php (modified) (1 diff)
• trunk/wp-admin/categories.php (modified) (2 diffs)
• trunk/wp-admin/edit-link-form.php (modified) (2 diffs)
• trunk/wp-admin/index.php (modified) (1 diff)
• trunk/wp-admin/install.php (modified) (1 diff)
• trunk/wp-admin/link-add.php (modified) (3 diffs)
• trunk/wp-admin/link-categories.php (deleted)
• trunk/wp-admin/link-import.php (modified) (3 diffs)
• trunk/wp-admin/link-manager.php (modified) (3 diffs)
• trunk/wp-admin/link.php (added)
• trunk/wp-admin/list-manipulation.php (modified) (2 diffs)
• trunk/wp-admin/menu.php (modified) (2 diffs)
• trunk/wp-admin/options-misc.php (modified) (1 diff)
• trunk/wp-admin/options-writing.php (modified) (2 diffs)
• trunk/wp-admin/upgrade-functions.php (modified) (3 diffs)
• trunk/wp-admin/upgrade-schema.php (modified) (3 diffs)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-includes/links.php (modified) (12 diffs)
• trunk/wp-includes/template-functions-category.php (modified) (1 diff)
• trunk/wp-includes/version.php (modified) (1 diff)
• trunk/wp-settings.php (modified) (2 diffs)

trunk/wp-admin/admin-db.php

@@ -106 +106 @@
-        $category_parent = 0;
-
+    if ( isset($posts_private) )
+        $posts_private = (int) $posts_private;
+    else
+        $posts_private = 0;
+
+    if ( isset($links_private) )
+        $links_private = (int) $links_private;
+    else
+        $links_private = 0;
+
-    if (!$update) {
-) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$category_parent
+, links_private, posts_private) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$category_parent', '$links_private', '$posts_private
-        $cat_ID = $wpdb->insert_id;
-    } else {
-
+, links_private = '$links_private', posts_private = '$posts_private'
-    }
-
@@ -154 +164 @@
-
-    // Don't delete the default cat.
-
+
+
+
+
-        return 0;
-
@@ -167 +180 @@
-    $wpdb->query("UPDATE $wpdb->categories SET category_parent = '$parent' WHERE category_parent = '$cat_ID'");
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    wp_cache_delete($cat_ID, 'category');
-    wp_cache_delete('all_category_ids', 'category');
@@ -245 +278 @@
-
-    $link = $wpdb->get_row("SELECT * FROM $wpdb->links WHERE link_id = '$link_id'");
+    $link->link_category = wp_get_link_cats($link_id);
-
-    if ( $output == OBJECT ) {
@@ -281 +315 @@
-        $link_notes = '';
-
+    // Make sure we set a valid category
+    if (0 == count($link_category) || !is_array($link_category)) {
+        $link_category = array(get_option('default_category'));
+    }
+
-    if ( $update ) {
-        $wpdb->query("UPDATE $wpdb->links SET link_url='$link_url',
-            link_name='$link_name', link_image='$link_image',
- link_category='$link_category',
+
-            link_visible='$link_visible', link_description='$link_description',
-            link_rating='$link_rating', link_rel='$link_rel',
@@ -290 +329 @@
-            WHERE link_id='$link_id'");
-    } else {
-category, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES('$link_url','$link_name', '$link_image', '$link_target', '$link_category
+description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES('$link_url','$link_name', '$link_image', '$link_target
-        $link_id = $wpdb->insert_id;
-    }
+
+    wp_set_link_cats($link_id, $link_category);
-
-    if ( $update )
@@ -312 +353 @@
-    $link = add_magic_quotes($link);
-
+    // Passed link category list overwrites existing category list if not empty.
+    if ( isset($linkdata['link_category']) && is_array($linkdata['link_category'])
+             && 0 != count($linkdata['link_category']) )
+        $link_cats = $linkdata['link_category'];
+    else 
+        $link_cats = $link['link_category'];
+
-    // Merge old and new fields with new fields overwriting old ones.
-    $linkdata = array_merge($link, $linkdata);
+    $linkdata['link_category'] = $link_cats;
-
-    return wp_insert_link($linkdata);
@@ -322 +371 @@
-
-    do_action('delete_link', $link_id);
+    
+    $categories = wp_get_link_cats($link_id);
+    if( is_array( $categories ) ) {
+        foreach ( $categories as $category ) {
+            $wpdb->query("UPDATE $wpdb->categories SET link_count = link_count - 1 WHERE cat_ID = '$category'");
+            wp_cache_delete($category, 'category');
+        }
+    }
+
+    $wpdb->query("DELETE FROM $wpdb->link2cat WHERE link_id = '$link_id'");
-    return $wpdb->query("DELETE FROM $wpdb->links WHERE link_id = '$link_id'");
-}
+
+function wp_get_link_cats($link_ID = 0) {
+    global $wpdb;
+
+    $sql = "SELECT category_id 
+        FROM $wpdb->link2cat 
+        WHERE link_id = $link_ID 
+        ORDER BY category_id";
+
+    $result = $wpdb->get_col($sql);
+
+    if ( !$result )
+        $result = array();
+
+    return array_unique($result);
+}
+
+function wp_set_link_cats($link_ID = 0, $link_categories = array()) {
+    global $wpdb;
+    // If $link_categories isn't already an array, make it one:
+    if (!is_array($link_categories) || 0 == count($link_categories))
+        $link_categories = array(get_option('default_category'));
+
+    $link_categories = array_unique($link_categories);
+
+    // First the old categories
+    $old_categories = $wpdb->get_col("
+        SELECT category_id 
+        FROM $wpdb->link2cat 
+        WHERE link_id = $link_ID");
+
+    if (!$old_categories) {
+        $old_categories = array();
+    } else {
+        $old_categories = array_unique($old_categories);
+    }
+
+    // Delete any?
+    $delete_cats = array_diff($old_categories,$link_categories);
+
+    if ($delete_cats) {
+        foreach ($delete_cats as $del) {
+            $wpdb->query("
+                DELETE FROM $wpdb->link2cat 
+                WHERE category_id = $del 
+                    AND link_id = $link_ID 
+                ");
+        }
+    }
+
+    // Add any?
+    $add_cats = array_diff($link_categories, $old_categories);
+
+    if ($add_cats) {
+        foreach ($add_cats as $new_cat) {
+            $wpdb->query("
+                INSERT INTO $wpdb->link2cat (link_id, category_id) 
+                VALUES ($link_ID, $new_cat)");
+        }
+    }
+    
+    // Update category counts.
+    $all_affected_cats = array_unique(array_merge($link_categories, $old_categories));
+    foreach ( $all_affected_cats as $cat_id ) {
+        $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->link2cat, $wpdb->links WHERE $wpdb->links.link_id = $wpdb->link2cat.link_id AND category_id = '$cat_id'");
+        $wpdb->query("UPDATE $wpdb->categories SET link_count = '$count' WHERE cat_ID = '$cat_id'");
+        wp_cache_delete($cat_id, 'category');
+    }
+}   // wp_set_link_cats()
-
-function post_exists($title, $content = '', $post_date = '') {

trunk/wp-admin/admin-functions.php

@@ -477 +477 @@
-    $link->link_notes = wp_specialchars($link->link_notes);
-    $link->link_rss = wp_specialchars($link->link_rss);
+    $link->post_category = $link->link_category;
-
-    return $link;
@@ -492 +493 @@
-        $link->link_name = '';
-
+    $link->link_visible = 'Y';
+
-    return $link;
-}
@@ -508 +511 @@
-    $_POST['link_image'] = wp_specialchars($_POST['link_image']);
-    $_POST['link_rss'] = wp_specialchars($_POST['link_rss']);
-
-
-
-
-
-
-
-
+
-
-    if ( !empty($link_id) ) {
@@ -555 +551 @@
-
-function get_nested_categories($default = 0, $parent = 0) {
-
+link_id, $
-
-    if ($post_ID) {
@@ -568 +564 @@
-            $checked_categories[] = $default;
-        }
-
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-        $checked_categories[] = $default;
@@ -621 +627 @@
-                    $edit = "<a href='categories.php?action=edit&amp;cat_ID=$category->cat_ID' class='edit'>".__('Edit')."</a></td>";
-                    $default_cat_id = get_option('default_category');
-
-
-
+
+
+
+
-                    else
-                        $edit .= "<td style='text-align:center'>".__("Default");
@@ -634 +641 @@
-                                <td>$category->category_description</td>
-                                <td>$category->category_count</td>
+                                <td>$category->link_count</td>
-                                <td>$edit</td>
-                                </tr>";
@@ -688 +696 @@
-        foreach ($categories as $category) {
-            if ($currentcat != $category->cat_ID && $parent == $category->category_parent) {
-                $count = $wpdb->get_var("SELECT COUNT(post_id) FROM $wpdb->post2cat WHERE category_id = $category->cat_ID");
-                $pad = str_repeat('&#8211; ', $level);
-                $category->cat_name = wp_specialchars($category->cat_name);
@@ -703 +710 @@
-}
-
-link_category_dropdown($fieldname, $selected
+return_link_categories_list($parent
-    global $wpdb;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-

trunk/wp-admin/admin-header.php

@@ -41 +41 @@
-<?php break; case 'page.php' : case 'page-new.php' : ?>
-var manager = new dbxManager('pagemeta');
+<?php break; case 'link.php' : case 'link-add.php' : ?>
+var manager = new dbxManager('linkmeta');
-<?php break; endswitch; ?>
-});

trunk/wp-admin/categories.php

@@ -128 +128 @@
-        <th scope="col"><?php _e('Description') ?></th>
-        <th scope="col"><?php _e('# Posts') ?></th>
+        <th scope="col"><?php _e('# Links') ?></th>
-        <th colspan="2"><?php _e('Action') ?></th>
-    </tr>
@@ -141 +142 @@
-<?php if ( current_user_can('manage_categories') ) : ?>
-<div class="wrap">
-posts from that category, it will just set them back to the default category <strong>%s</strong>.'), get_catname(get_option('default
+the posts and bookmarks in that category.  Instead, posts in the deleted category are set to the category <strong>%s</strong> and bookmarks are set to <strong>%s</strong>.'), get_catname(get_option('default_category')), get_catname(get_option('default_link
-</div>
-

trunk/wp-admin/edit-link-form.php

@@ -1 +1 @@
-<?php
-if ( ! empty($link_id) ) {
-
-
+
-    $submit_text = __('Save Changes &raquo;');
-action="" method="post" name="editlink" id="editlink
+name="editlink" id="editlink" method="post" action="link.php
-} else {
-
-
-
-
+
+
+
-}
-
@@ -29 +27 @@
-    }
-}
-
-?>
-
-<div class="wrap"> 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</table>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</table>
-</fieldset>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-<?php else: ?>
-           <input type="hidden" name="action" value="A
+<input type="hidden" name="action" value="a
-<?php endif; ?>
-
-
+
+
+

trunk/wp-admin/index.php

@@ -121 +121 @@
-<li><a href="post-new.php"><?php _e('Write a post'); ?></a></li>
-<li><a href="profile.php"><?php _e('Update your profile or change your password'); ?></a></li>
-lin
+bookmar
-<li><a href="themes.php"><?php _e('Change your site&#8217;s look or theme'); ?></a></li>
-</ul>

trunk/wp-admin/install.php

@@ -155 +155 @@
-    update_option('default_pingback_flag', 0);
-
-// Now drop in some default links
-$wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, '".$wpdb->escape(__('Blogroll'))."')");
-$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 1, 'http://blogs.linux.ie/xeer/feed/', '');");
-$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://zengun.org/weblog/', 'Michel', 1, 'http://zengun.org/weblog/feed/', '');");
-$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://boren.nu/', 'Ryan', 1, 'http://boren.nu/feed/', '');");
-$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://photomatt.net/', 'Matt', 1, 'http://xml.photomatt.net/feed/', '');");
-$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://zed1.com/journalized/', 'Mike', 1, 'http://zed1.com/journalized/feed/', '');");
-$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://www.alexking.org/', 'Alex', 1, 'http://www.alexking.org/blog/wp-rss2.php', '');");
-$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://dougal.gunters.org/', 'Dougal', 1, 'http://dougal.gunters.org/feed/', '');");
-
-// Default category
-$wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_count, category_description) VALUES ('0', '".$wpdb->escape(__('Uncategorized'))."', '".sanitize_title(__('Uncategorized'))."', '1', '')");
+
+// Default link category
+$wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, link_count, category_description) VALUES ('0', '".$wpdb->escape(__('Blogroll'))."', '".sanitize_title(__('Blogroll'))."', '7', '')");
+
+// Now drop in some default links
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 0, 'http://blogs.linux.ie/xeer/feed/', '');");
+$wpdb->query( "INSERT INTO $wpdb->link2cat (`link_id`, `category_id`) VALUES (1, 2)" );
+
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rs