Changeset 2889

Timestamp:

09/18/05 19:44:14 (3 years ago)

Author:

ryan

Message:

Link love. Add get_link(), get_link_to_edit(), add_link(), edit_link(), wp_insert_link(), wp_update_link(), wp_delete_link()

Files:

• trunk/wp-admin/admin-functions.php (modified) (83 diffs)
• trunk/wp-admin/link-add.php (modified) (5 diffs)
• trunk/wp-admin/link-manager.php (modified) (7 diffs)
• trunk/wp-admin/profile-update.php (modified) (1 diff)
• trunk/wp-admin/user-edit.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -1 +1 @@
-<?php
+
-
-// Creates a new post from the "Write Post" form using $_POST information.
@@ -5 +6 @@
-    global $user_ID;
-
- ! current_user_can('edit_posts') 
- __('You are not allowed to create posts or drafts on this blog.') 
+!current_user_can('edit_posts')
+__('You are not allowed to create posts or drafts on this blog.')
-
-    // Rename.
- 
- 
+
+
-    $_POST['post_parent'] = $_POST['parent_id'];
-    $_POST['to_ping'] = $_POST['trackback_url'];
-
- empty
+empty 
-        $_POST['$post_author'] = (int) $_POST['post_author_override'];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    // What to do based on which button they pressed
-
-
-
-
-
-
-
+
-        $_POST['post_status'] = 'draft';
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $aa = $_POST['aa'];
-        $mm = $_POST['mm'];
@@ -43 +50 @@
-        $ss = $_POST['ss'];
-        $jj = ($jj > 31) ? 31 : $jj;
- 
- 
- 
+
+
+
-        $_POST['post_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
-        $_POST['post_date_gmt'] = get_gmt_from_date("$aa-$mm-$jj $hh:$mn:$ss");
- 
+
-
-    // Create the post.
@@ -63 +70 @@
-    $post_ID = (int) $_POST['post_ID'];
-
- ! current_user_can('edit_post', $post_ID) 
- __('You are not allowed to edit this post.') 
+!current_user_can('edit_post', $post_ID)
+__('You are not allowed to edit this post.')
-
-    // Rename.
-    $_POST['ID'] = (int) $_POST['post_ID'];
- 
- 
+
+
-    $_POST['post_parent'] = $_POST['parent_id'];
-    $_POST['to_ping'] = $_POST['trackback_url'];
-
- empty
+empty 
-        $_POST['$post_author'] = (int) $_POST['post_author_override'];
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    // What to do based on which button they pressed
-
-
-
-
-
-
-
+
-        $_POST['post_status'] = 'draft';
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $_POST['comment_status'] = 'closed';
-
- !isset($_POST['ping_status']) 
+!isset ($_POST['ping_status'])
-        $_POST['ping_status'] = 'closed';
-
- !empty($_POST['edit_date']) 
+
+!empty ($_POST['edit_date'])
-        $aa = $_POST['aa'];
-        $mm = $_POST['mm'];
@@ -108 +121 @@
-        $ss = $_POST['ss'];
-        $jj = ($jj > 31) ? 31 : $jj;
- 
- 
- 
+
+
+
-        $_POST['post_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
-        $_POST['post_date_gmt'] = get_gmt_from_date("$aa-$mm-$jj $hh:$mn:$ss");
- 
+
-
-    wp_update_post($_POST);
-
-    // Meta Stuff
- :
-foreach ($_POST['meta'] as $key => $value) :
-
-   
+
+: foreach ($_POST['meta'] as $key => $value)
+: 
+
-    endif;
-
- :
-foreach ($_POST['deletemeta'] as $key => $value) :
-
-   
+
+: foreach ($_POST['deletemeta'] as $key => $value)
+: 
+
-    endif;
-
-    add_meta($post_ID);
-
+
-    return $post_ID;
-}
@@ -141 +154 @@
-    $comment_post_ID = (int) $_POST['comment_post_ID'];
-
- ! current_user_can('edit_post', $comment_post_ID) 
- __('You are not allowed to edit comments on this post, so you cannot edit this comment.') 
+!current_user_can('edit_post', $comment_post_ID)
+__('You are not allowed to edit comments on this post, so you cannot edit this comment.')
-
-    $_POST['comment_author'] = $_POST['newcomment_author'];
- 
+ 
-    $_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-    $_POST['comment_approved'] = $_POST['comment_status'];
-    $_POST['comment_content'] = $_POST['content'];
-    $_POST['comment_ID'] = (int) $_POST['comment_ID'];
-
- !empty($_POST['edit_date']) 
+
+!empty ($_POST['edit_date'])
-        $aa = $_POST['aa'];
-        $mm = $_POST['mm'];
@@ -159 +172 @@
-        $ss = $_POST['ss'];
-        $jj = ($jj > 31) ? 31 : $jj;
- 
- 
- 
+
+
+
-        $_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
-    }
@@ -182 +195 @@
-
-    if ($post->post_status == 'static')
-  
+
-
-    return $post;
@@ -234 +247 @@
-
-    // Are we updating or creating?
- !empty($cat_ID) 
+!empty ($cat_ID)
-        $update = true;
-    } else {
@@ -244 +257 @@
-    $cat_name = wp_specialchars($cat_name);
-
- empty($category_nicename) 
+empty ($category_nicename)
-        $category_nicename = sanitize_title($cat_name, $cat_ID);
-    else
-        $category_nicename = sanitize_title($category_nicename, $cat_ID);
-
- empty($category_description) 
+empty ($category_description)
-        $category_description = '';
-
- empty($category_parent) 
+empty ($category_parent)
-        $category_parent = 0;
-
- 
+
-        $query = "INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_description, category_parent) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$cat')";
-    else
@@ -262 +275 @@
-    $result = $wpdb->query($query);
-
- $update 
+$update
-        do_action('edit_category', $cat_ID);
-    } else {
@@ -276 +289 @@
-
-    $cat_ID = (int) $catarr['cat_ID'];
-
+
-    // First, get all of the original fields
-    
+
-
-    // Escape data pulled from DB.
@@ -295 +308 @@
-
-    // Don't delete the default cat.
- 1 == $cat_ID 
+1 == $cat_ID
-        return 0;
-
@@ -321 +334 @@
-}
-
-
-function wp_create_categories($categories, $post_id = '') {
-
+ 
-    foreach ($categories as $category) {
- $id = category_exists($category) 
+$id = category_exists($category)
-            $cat_ids[] = $id;
-
-
-
-
-
+
+
+
+
+
+
-        wp_set_post_cats('', $post_id, $cat_ids);
-
+
-    return $cat_ids;
-}
@@ -339 +352 @@
-function category_exists($cat_name) {
-    global $wpdb;
- !$category_nicename = sanitize_title($cat_name) 
+!$category_nicename = sanitize_title($cat_name)
-        return 0;
-
+
-    return $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename'");
-}
@@ -348 +361 @@
-
-function add_user() {
-update_user();  
-
-
-update
-
- $user_id != 0 
+edit_user();
+
+
+edit
+
+$user_id != 0
-        $update = true;
-        $user->ID = $user_id;
@@ -362 +375 @@
-        $user = '';
-    }
-
- isset($_POST['user_login']) 
+
+isset ($_POST['user_login'])
-        $user->user_login = wp_specialchars(trim($_POST['user_login']));
-
-    $pass1 = $pass2 = '';
- isset($_POST['pass1']) 
+isset ($_POST['pass1'])
-        $pass1 = $_POST['pass1'];
- isset($_POST['pass2']) 
+isset ($_POST['pass2'])
-        $pass2 = $_POST['pass2'];
-
- isset($_POST['email']) 
+isset ($_POST['email'])
-        $user->user_email = wp_specialchars(trim($_POST['email']));
- isset($_POST['url']) 
+isset ($_POST['url'])
-        $user->user_url = wp_specialchars(trim($_POST['url']));
- . $user->user_url; 
-
- isset($_POST['first_name']) 
+.$user->user_url;
+
+isset ($_POST['first_name'])
-        $user->first_name = wp_specialchars(trim($_POST['first_name']));
- isset($_POST['last_name']) 
+isset ($_POST['last_name'])
-        $user->last_name = wp_specialchars(trim($_POST['last_name']));
- isset($_POST['nickname']) 
+isset ($_POST['nickname'])
-        $user->nickname = wp_specialchars(trim($_POST['nickname']));
- isset($_POST['display_name']) 
+isset ($_POST['display_name'])
-        $user->display_name = wp_specialchars(trim($_POST['display_name']));
- isset($_POST['description']) 
+isset ($_POST['description'])
-        $user->description = wp_specialchars(trim($_POST['description']));
- isset($_POST['jabber']) 
+isset ($_POST['jabber'])
-        $user->jabber = wp_specialchars(trim($_POST['jabber']));
- isset($_POST['aim']) 
+isset ($_POST['aim'])
-        $user->aim = wp_specialchars(trim($_POST['aim']));
- isset($_POST['yim']) 
+isset ($_POST['yim'])
-        $user->yim = wp_specialchars(trim($_POST['yim']));
-
-
-
+ 
+
-    /* checking that username has been typed */
-    if ($user->user_login == '')
@@ -402 +415 @@
-
-    /* checking the password has been typed twice */
-($user->user_login, &$pass1, &
-
- !$update 
- $pass1 == '' || $pass2 == '' 
+ ($user->user_login, & $pass1, & 
+
+!$update
+$pass1 == '' || $pass2 == ''
-            $errors['pass'] = __('<strong>ERROR</strong>: Please enter your password twice.');
-    } else {
- ( empty($pass1) && !empty($pass2) ) || ( empty($pass2) && !empty($pass1) ) 
+(empty ($pass1) && !empty ($pass2)) || (empty ($pass2) && !empty ($pass1))
-            $errors['pass'] = __("<strong>ERROR</strong>: you typed your new password only once.");
-    }
-
+
-    /* checking the password has been typed twice the same */
-    if ($pass1 != $pass2)
-        $errors['pass'] = __('<strong>ERROR</strong>: Please type the same password in the two password fields.');
-
- !empty($pass1) 
+!empty ($pass1)
-        $user->user_pass = $pass1;
-
- !$update && username_exists( $user_login ) 
+
+!$update && username_exists($user_login)
-        $errors['user_login'] = __('<strong>ERROR</strong>: This username is already registered, please choose another one.');
-
-    /* checking e-mail address */
-
+ 
-        $errors['user_email'] = __("<strong>ERROR</strong>: please type an e-mail address");
-
-
-
-
-
+
+
+
+
+
+
-        return $errors;
-
- $update 
+
+$update
-        $user_id = wp_update_user(get_object_vars($user));
-    } else {
@@ -438 +452 @@
-        wp_new_user_notification($user_id);
-    }
-
+
-    return $errors;
-}
@@ -446 +460 @@
-
-    $id = (int) $id;
-
-
+
+ 
-        $post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_author = $id");
-
+
-        if ($post_ids) {
-            $post_ids = implode(',', $post_ids);
-
+
-            // Delete comments, *backs
-            $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_post_ID IN ($post_ids)");
@@ -462 +476 @@
-            $wpdb->query("DELETE FROM $wpdb->posts WHERE post_author = $id");
-        }
-
+
-        // Clean links
-        $wpdb->query("DELETE FROM $wpdb->links WHERE link_owner = $id");
-    } else {
-
+ 
-        $wpdb->query("UPDATE $wpdb->posts SET post_author = {$reassign} WHERE post_author = {$id}");
-        $wpdb->query("UPDATE $wpdb->links SET link_owner = {$reassign} WHERE link_owner = {$id}");
@@ -479 +493 @@
-}
-
+function get_link($link_id, $output = OBJECT) {
+    global $wpdb;
+    
+    $link = $wpdb->get_row("SELECT * FROM $wpdb->links WHERE link_id = '$link_id'");
+
+    if ( $output == OBJECT ) {
+        return $link;
+    } elseif ( $output == ARRAY_A ) {
+        return get_object_vars($link);
+    } elseif ( $output == ARRAY_N ) {
+        return array_values(get_object_vars($link));
+    } else {
+        return $link;
+    }
+}
+
+function get_link_to_edit($link_id) {
+    $link = get_link($link_id);
+    
+    $link->link_url = wp_specialchars($link->link_url, 1);
+    $link->link_name = wp_specialchars($link->link_name, 1);
+    $link->link_description = wp_specialchars($link->link_description);
+    $link->link_notes = wp_specialchars($link->link_notes);
+    $link->link_rss = wp_specialchars($link->link_rss);
+    
+    return $link;
+}
+
+function add_link() {
+    return edit_link(); 
+}
+
+function edit_link($link_id = '') {
+    if (!current_user_can('manage_links'))
+        die(__("Cheatin' uh ?"));
+
+    $_POST['link_url'] = wp_specialchars($_POST['link_url']);
+    //$link_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $link_url) ? $link_url : 'http://'.$link_url;
+    $_POST['link_name'] = wp_specialchars($_POST['link_name']);
+    $_POST['link_image'] = wp_specialchars($_POST['link_image']);
+    $_POST['link_rss'] = wp_specialchars($_POST['link_rss']);
+    $auto_toggle = get_autotoggle($_POST['link_category']);
+    
+    // if we are in an auto toggle category and this one is visible then we
+    // need to make the others invisible before we add this new one.
+    // FIXME Add category toggle func.
+    //if (($auto_toggle == 'Y') && ($link_visible == 'Y')) {
+    //  $wpdb->query("UPDATE $wpdb->links set link_visible = 'N' WHERE link_category = $link_category");
+    //}
+
+    if ( !empty($link_id) ) {
+        $_POST['link_id'] = $link_id;
+        return wp_update_link($_POST);
+    } else {
+        return wp_insert_link($_POST);
+    }
+}
+
+function wp_insert_link($linkdata) {
+    global $wpdb;
+    
+    extract($linkdata);
+
+    $update = false;
+    if ( !empty($link_id) )
+        $update = true;
+
+    if ( empty($link_rating) )
+        $link_rating = 0;   
+
+    if ( empty($link_target) )
+        $link_target = '';  
+
+    if ( empty($link_visible) )
+        $link_visible = 'Y';    
+    
+    if ( $update ) {
+        $wpdb->query("UPDATE $wpdb->links SET link_url='$link_url',
+            link_name='$link_name', link_image='$link_image',
+            link_target='$link_target', link_category='$link_category',
+            link_visible='$link_visible', link_description='$link_description',
+            link_rating='$link_rating', link_rel='$link_rel',
+            link_notes='$link_notes', link_rss = '$link_rss'
+            WHERE link_id='$link_id'");
+    } else {
+        $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_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', '$link_description', '$link_visible', '$link_owner', '$link_rating', '$link_rel', '$link_notes', '$link_rss')");
+        $link_id = $wpdb->insert_id;
+    }
+    
+    if ( $update )
+        do_action('edit_link', $link_id);
+    else
+        do_action('add_link', $link_id);
+
+    return $link_id;
+}
+
+function wp_update_link($linkdata) {
+    global $wpdb;
+
+    $link_id = (int) $linkdata['link_id'];
+    
+    $link = get_link($link_id, ARRAY_A);
+    
+    // Escape data pulled from DB.
+    $link = add_magic_quotes($link);
+    
+    // Merge old and new fields with new fields overwriting old ones.
+    $linkdata = array_merge($link, $linkdata);
+
+    return wp_insert_link($linkdata);
+}
+
+function wp_delete_link($link_id) {
+    global $wpdb;
+
+    return $wpdb->query("DELETE FROM $wpdb->links WHERE link_id = '$link_id'"); 
+}
+
-function post_exists($title, $content = '', $post_date = '') {
-    global $wpdb;
-
- !empty($post_date) 
+
+!empty ($post_date)
-        $post_date = "AND post_date = '$post_date'";
-
- ! empty($title) 
+!empty ($title)
-        return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' $post_date");
-
-
+
+
+
-
-    return 0;
@@ -497 +631 @@
-
-    return $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments
-
-
-
- 
+   
+
+
+
-    $short_url = str_replace('http://', '', stripslashes($url));
-    $short_url = str_replace('www.', '', $short_url);
@@ -506 +640 @@
-        $short_url = substr($short_url, 0, -1);
-    if (strlen($short_url) > 35)
- 
+
-    return $short_url;
-}
-
-function selected($selected, $current) {
-
+
+
-}
-
-function checked($checked, $current) {
-
-
-
-
+
+
+
+
+
-    global $wpdb;
-    return $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent ORDER BY category_count DESC");
@@ -524 +660 @@
-
-function get_nested_categories($default = 0, $parent = 0) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            $result[$cat]['children'] = get_nested_categories($default, $cat);
-            $result[$cat]['cat_ID'] = $cat;
@@ -559 +694 @@
-
-function write_nested_categories($categories) {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
-function dropdown_categories($default = 0) {
- 
- 
+   
+
-
-// Dandy new recursive multiple category stuff.
@@ -580 +713 @@
-    global $wpdb, $class;
-
- !$categories 
+!$categories
-        $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_name");
-
@@ -589 +722 @@
-                $count = $wpdb->get_var("SELECT COUNT(post_id) FROM $wpdb->post2cat WHERE category_id = $category->cat_ID");
-                $pad = str_repeat('&#8212; ', $level);
- current_user_can('manage_categories') 
- . __('Edit') . "</a></td><td><a href='categories.php?action=delete&amp;cat_ID=$category->cat_ID' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf(__("You are about to delete the category &quot;%s&quot;.  All of its posts will go to the default category.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), wp_specialchars($category->cat_name, 1))  . "' );\" class='delete'>" .  __('Delete') . 
+current_user_can('manage_categories')
+.__('Edit')."</a></td><td><a href='categories.php?action=delete&amp;cat_ID=$category->cat_ID' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '".sprintf(__("You are about to delete the category &quot;%s&quot;.  All of its posts will go to the default category.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), wp_specialchars($category->cat_name, 1))."' );\" class='delete'>".__('Delete').
-                else
-                    $edit = '';
-
+
-                $class = ('alternate' == $class) ? '' : 'alternate';
-                echo "<tr id='cat-$category->cat_ID' class='$class'><th scope='row'>$category->cat_ID</th><td>$pad $category->cat_name</td>
-
-
-
-
- 
+               
+               
+               
+               
+
-            }
-        }
@@ -608 +741 @@
-}
-
- $parent = 0, $level = 0, $pages = 0 
+$parent = 0, $level = 0, $pages = 0
-    global $wpdb, $class, $post;
-    if (!$pages)
@@ -614 +747 @@
-
-    if ($pages) {
-
+
+
-            if ($post->post_parent == $parent) {
-                $post->post_title = wp_specialchars($post->post_title);
@@ -634 +768 @@
-
-<?php
-
+
+
-            }
-        }
@@ -648 +783 @@
-    }
-    if ($categories) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-        return false;
@@ -665 +802 @@
-function wp_create_thumbnail($file, $max_side, $effect = '') {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if (function_exists('imageantialias'))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+