Changeset 2889

Timestamp:

09/18/2005 07:44:14 PM (21 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()

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (83 diffs)
• link-add.php (modified) (5 diffs)
• link-manager.php (modified) (7 diffs)
• profile-update.php (modified) (1 diff)
• 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;
 
-        if ( ! current_user_can('edit_posts') )
-                die( __('You are not allowed to create posts or drafts on this blog.') );
+        if (!current_user_can('edit_posts'))
+                die(__('You are not allowed to create posts or drafts on this blog.'));
 
         // Rename.
-        $_POST['post_content']  = $_POST['content'];
-        $_POST['post_excerpt']  = $_POST['excerpt'];
+        $_POST['post_content'] = $_POST['content'];
+        $_POST['post_excerpt'] = $_POST['excerpt'];
         $_POST['post_parent'] = $_POST['parent_id'];
         $_POST['to_ping'] = $_POST['trackback_url'];
 
-        if (! empty($_POST['post_author_override'])) {
+        if (!empty ($_POST['post_author_override'])) {
                 $_POST['$post_author'] = (int) $_POST['post_author_override'];
-        } else if (! empty($_POST['post_author'])) {
-                $_POST['post_author'] = (int) $_POST['post_author'];
-        } else {
-                $_POST['post_author'] = (int) $_POST['user_ID'];
-        }
-
-        if ( ($_POST['post_author'] != $_POST['user_ID']) && ! current_user_can('edit_others_posts') )
-                die( __('You cannot post as this user.') );
-        
+        } else
+                if (!empty ($_POST['post_author'])) {
+                        $_POST['post_author'] = (int) $_POST['post_author'];
+                } else {
+                        $_POST['post_author'] = (int) $_POST['user_ID'];
+                }
+
+        if (($_POST['post_author'] != $_POST['user_ID']) && !current_user_can('edit_others_posts'))
+                die(__('You cannot post as this user.'));
+
         // What to do based on which button they pressed
-        if ('' != $_POST['saveasdraft']) $_POST['post_status'] = 'draft';
-        if ('' != $_POST['saveasprivate']) $_POST['post_status'] = 'private';
-        if ('' != $_POST['publish']) $_POST['post_status'] = 'publish';
-        if ('' != $_POST['advanced']) $_POST['post_status'] = 'draft';
-        if ('' != $_POST['savepage']) $_POST['post_status'] = 'static';
-
-        if ( 'publish' == $_POST['post_status'] && ! current_user_can('publish_posts') )
+        if ('' != $_POST['saveasdraft'])
                 $_POST['post_status'] = 'draft';
-
-        if ( !empty($_POST['edit_date']) ) {
+        if ('' != $_POST['saveasprivate'])
+                $_POST['post_status'] = 'private';
+        if ('' != $_POST['publish'])
+                $_POST['post_status'] = 'publish';
+        if ('' != $_POST['advanced'])
+                $_POST['post_status'] = 'draft';
+        if ('' != $_POST['savepage'])
+                $_POST['post_status'] = 'static';
+
+        if ('publish' == $_POST['post_status'] && !current_user_can('publish_posts'))
+                $_POST['post_status'] = 'draft';
+
+        if (!empty ($_POST['edit_date'])) {
                 $aa = $_POST['aa'];
                 $mm = $_POST['mm'];
@@ -43 +50 @@
                 $ss = $_POST['ss'];
                 $jj = ($jj > 31) ? 31 : $jj;
-                $hh = ($hh > 23) ? $hh - 24 : $hh;
-                $mn = ($mn > 59) ? $mn - 60 : $mn;
-                $ss = ($ss > 59) ? $ss - 60 : $ss;
+                $hh = ($hh > 23) ? $hh -24 : $hh;
+                $mn = ($mn > 59) ? $mn -60 : $mn;
+                $ss = ($ss > 59) ? $ss -60 : $ss;
                 $_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'];
 
-        if ( ! current_user_can('edit_post', $post_ID) )
-                die( __('You are not allowed to edit this post.') );
+        if (!current_user_can('edit_post', $post_ID))
+                die(__('You are not allowed to edit this post.'));
 
         // Rename.
         $_POST['ID'] = (int) $_POST['post_ID'];
-        $_POST['post_content']  = $_POST['content'];
-        $_POST['post_excerpt']  = $_POST['excerpt'];
+        $_POST['post_content'] = $_POST['content'];
+        $_POST['post_excerpt'] = $_POST['excerpt'];
         $_POST['post_parent'] = $_POST['parent_id'];
         $_POST['to_ping'] = $_POST['trackback_url'];
 
-        if (! empty($_POST['post_author_override'])) {
+        if (!empty ($_POST['post_author_override'])) {
                 $_POST['$post_author'] = (int) $_POST['post_author_override'];
-        } else if (! empty($_POST['post_author'])) {
-                $_POST['post_author'] = (int) $_POST['post_author'];
-        } else {
-                $_POST['post_author'] = (int) $_POST['user_ID'];
-        }
-
-        if ( ($_POST['post_author'] != $_POST['user_ID']) && ! current_user_can('edit_others_posts') )
-                die( __('You cannot post as this user.') );
+        } else
+                if (!empty ($_POST['post_author'])) {
+                        $_POST['post_author'] = (int) $_POST['post_author'];
+                } else {
+                        $_POST['post_author'] = (int) $_POST['user_ID'];
+                }
+
+        if (($_POST['post_author'] != $_POST['user_ID']) && !current_user_can('edit_others_posts'))
+                die(__('You cannot post as this user.'));
 
         // What to do based on which button they pressed
-        if ('' != $_POST['saveasdraft']) $_POST['post_status'] = 'draft';
-        if ('' != $_POST['saveasprivate']) $_POST['post_status'] = 'private';
-        if ('' != $_POST['publish']) $_POST['post_status'] = 'publish';
-        if ('' != $_POST['advanced']) $_POST['post_status'] = 'draft';
-        if ('' != $_POST['savepage']) $_POST['post_status'] = 'static';
-
-        if ( 'publish' == $_POST['post_status'] && ! current_user_can('publish_posts') )
+        if ('' != $_POST['saveasdraft'])
                 $_POST['post_status'] = 'draft';
-        
-        if ( !isset($_POST['comment_status']) )
+        if ('' != $_POST['saveasprivate'])
+                $_POST['post_status'] = 'private';
+        if ('' != $_POST['publish'])
+                $_POST['post_status'] = 'publish';
+        if ('' != $_POST['advanced'])
+                $_POST['post_status'] = 'draft';
+        if ('' != $_POST['savepage'])
+                $_POST['post_status'] = 'static';
+
+        if ('publish' == $_POST['post_status'] && !current_user_can('publish_posts'))
+                $_POST['post_status'] = 'draft';
+
+        if (!isset ($_POST['comment_status']))
                 $_POST['comment_status'] = 'closed';
 
-        if ( !isset($_POST['ping_status']) )
+        if (!isset ($_POST['ping_status']))
                 $_POST['ping_status'] = 'closed';
-        
-        if ( !empty($_POST['edit_date']) ) {
+
+        if (!empty ($_POST['edit_date'])) {
                 $aa = $_POST['aa'];
                 $mm = $_POST['mm'];
@@ -108 +121 @@
                 $ss = $_POST['ss'];
                 $jj = ($jj > 31) ? 31 : $jj;
-                $hh = ($hh > 23) ? $hh - 24 : $hh;
-                $mn = ($mn > 59) ? $mn - 60 : $mn;
-                $ss = ($ss > 59) ? $ss - 60 : $ss;
+                $hh = ($hh > 23) ? $hh -24 : $hh;
+                $mn = ($mn > 59) ? $mn -60 : $mn;
+                $ss = ($ss > 59) ? $ss -60 : $ss;
                 $_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
-        if ($_POST['meta']) :
-                foreach ($_POST['meta'] as $key => $value) :
-                        update_meta($key, $value['key'], $value['value']);
-                endforeach;
+        if ($_POST['meta'])
+                : foreach ($_POST['meta'] as $key => $value)
+                        : update_meta($key, $value['key'], $value['value']);
+        endforeach;
         endif;
 
-        if ($_POST['deletemeta']) :
-                foreach ($_POST['deletemeta'] as $key => $value) :
-                        delete_meta($key);
-                endforeach;
+        if ($_POST['deletemeta'])
+                : foreach ($_POST['deletemeta'] as $key => $value)
+                        : delete_meta($key);
+        endforeach;
         endif;
 
         add_meta($post_ID);
-        
+
         return $post_ID;
 }
@@ -141 +154 @@
         $comment_post_ID = (int) $_POST['comment_post_ID'];
 
-        if ( ! current_user_can('edit_post', $comment_post_ID) )
-                die( __('You are not allowed to edit comments on this post, so you cannot edit this comment.') );
+        if (!current_user_can('edit_post', $comment_post_ID))
+                die(__('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_email']  = $_POST['newcomment_author_email'];
+        $_POST['comment_author_email'] = $_POST['newcomment_author_email'];
         $_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'];
- 
-        if ( !empty($_POST['edit_date']) ) {
+
+        if (!empty ($_POST['edit_date'])) {
                 $aa = $_POST['aa'];
                 $mm = $_POST['mm'];
@@ -159 +172 @@
                 $ss = $_POST['ss'];
                 $jj = ($jj > 31) ? 31 : $jj;
-                $hh = ($hh > 23) ? $hh - 24 : $hh;
-                $mn = ($mn > 59) ? $mn - 60 : $mn;
-                $ss = ($ss > 59) ? $ss - 60 : $ss;
+                $hh = ($hh > 23) ? $hh -24 : $hh;
+                $mn = ($mn > 59) ? $mn -60 : $mn;
+                $ss = ($ss > 59) ? $ss -60 : $ss;
                 $_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
         }
@@ -182 +195 @@
 
         if ($post->post_status == 'static')
-                $post->page_template = get_post_meta($id, '_wp_page_template', true);   
+                $post->page_template = get_post_meta($id, '_wp_page_template', true);
 
         return $post;
@@ -234 +247 @@
 
         // Are we updating or creating?
-        if ( !empty($cat_ID) ) {
+        if (!empty ($cat_ID)) {
                 $update = true;
         } else {
@@ -244 +257 @@
         $cat_name = wp_specialchars($cat_name);
 
-        if ( empty($category_nicename) )
+        if (empty ($category_nicename))
                 $category_nicename = sanitize_title($cat_name, $cat_ID);
         else
                 $category_nicename = sanitize_title($category_nicename, $cat_ID);
 
-        if ( empty($category_description) )
+        if (empty ($category_description))
                 $category_description = '';
 
-        if ( empty($category_parent) )
+        if (empty ($category_parent))
                 $category_parent = 0;
 
-        if ( !$update)
+        if (!$update)
                 $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);
 
-        if ( $update ) {
+        if ($update) {
                 do_action('edit_category', $cat_ID);
         } else {
@@ -276 +289 @@
 
         $cat_ID = (int) $catarr['cat_ID'];
-        
+
         // First, get all of the original fields
-        $category = get_category($cat_ID, ARRAY_A);     
+        $category = get_category($cat_ID, ARRAY_A);
 
         // Escape data pulled from DB.
@@ -295 +308 @@
 
         // Don't delete the default cat.
-        if ( 1 == $cat_ID )
+        if (1 == $cat_ID)
                 return 0;
 
@@ -321 +334 @@
 }
 
-
 function wp_create_categories($categories, $post_id = '') {
-        $cat_ids = array();
+        $cat_ids = array ();
         foreach ($categories as $category) {
-                if ( $id = category_exists($category) )
+                if ($id = category_exists($category))
                         $cat_ids[] = $id;
-                else if ( $id = wp_create_category($category) )
-                        $cat_ids[] = $id;                               
-        }
-        
-        if ( $post_id )
+                else
+                        if ($id = wp_create_category($category))
+                                $cat_ids[] = $id;
+        }
+
+        if ($post_id)
                 wp_set_post_cats('', $post_id, $cat_ids);
-                
+
         return $cat_ids;
 }
@@ -339 +352 @@
 function category_exists($cat_name) {
         global $wpdb;
-        if ( !$category_nicename = sanitize_title($cat_name) )
+        if (!$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() {
-        return update_user();   
-}
-
-function update_user($user_id = 0) {
-        
-        if ( $user_id != 0 ) {
+        return edit_user();
+}
+
+function edit_user($user_id = 0) {
+
+        if ($user_id != 0) {
                 $update = true;
                 $user->ID = $user_id;
@@ -362 +375 @@
                 $user = '';
         }
-        
-        if ( isset($_POST['user_login']) )
+
+        if (isset ($_POST['user_login']))
                 $user->user_login = wp_specialchars(trim($_POST['user_login']));
 
         $pass1 = $pass2 = '';
-        if ( isset($_POST['pass1']) )
+        if (isset ($_POST['pass1']))
                 $pass1 = $_POST['pass1'];
-        if ( isset($_POST['pass2']) )
+        if (isset ($_POST['pass2']))
                 $pass2 = $_POST['pass2'];
 
-        if ( isset($_POST['email']) )
+        if (isset ($_POST['email']))
                 $user->user_email = wp_specialchars(trim($_POST['email']));
-        if ( isset($_POST['url']) ) {
+        if (isset ($_POST['url'])) {
                 $user->user_url = wp_specialchars(trim($_POST['url']));
-                $user->user_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $user->user_url) ? $user->user_url : 'http://' . $user->user_url; 
-        }
-        if ( isset($_POST['first_name']) )
+                $user->user_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
+        }
+        if (isset ($_POST['first_name']))
                 $user->first_name = wp_specialchars(trim($_POST['first_name']));
-        if ( isset($_POST['last_name']) )
+        if (isset ($_POST['last_name']))
                 $user->last_name = wp_specialchars(trim($_POST['last_name']));
-        if ( isset($_POST['nickname']) )
+        if (isset ($_POST['nickname']))
                 $user->nickname = wp_specialchars(trim($_POST['nickname']));
-        if ( isset($_POST['display_name']) )
+        if (isset ($_POST['display_name']))
                 $user->display_name = wp_specialchars(trim($_POST['display_name']));
-        if ( isset($_POST['description']) )
+        if (isset ($_POST['description']))
                 $user->description = wp_specialchars(trim($_POST['description']));
-        if ( isset($_POST['jabber']) )
+        if (isset ($_POST['jabber']))
                 $user->jabber = wp_specialchars(trim($_POST['jabber']));
-        if ( isset($_POST['aim']) )
+        if (isset ($_POST['aim']))
                 $user->aim = wp_specialchars(trim($_POST['aim']));
-        if ( isset($_POST['yim']) )
+        if (isset ($_POST['yim']))
                 $user->yim = wp_specialchars(trim($_POST['yim']));
 
-        $errors = array();
-                
+        $errors = array ();
+
         /* checking that username has been typed */
         if ($user->user_login == '')
@@ -402 +415 @@
 
         /* checking the password has been typed twice */
-        do_action('check_passwords', array($user->user_login, &$pass1, &$pass2));
-        
-        if ( !$update ) {
-                if ( $pass1 == '' || $pass2 == '' )
+        do_action('check_passwords', array ($user->user_login, & $pass1, & $pass2));
+
+        if (!$update) {
+                if ($pass1 == '' || $pass2 == '')
                         $errors['pass'] = __('<strong>ERROR</strong>: Please enter your password twice.');
         } else {
-                if ( ( empty($pass1) && !empty($pass2) ) || ( empty($pass2) && !empty($pass1) ) )
+                if ((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.');
 
-        if ( !empty($pass1) )
+        if (!empty ($pass1))
                 $user->user_pass = $pass1;
-        
-        if ( !$update && username_exists( $user_login ) )
+
+        if (!$update && username_exists($user_login))
                 $errors['user_login'] = __('<strong>ERROR</strong>: This username is already registered, please choose another one.');
 
         /* checking e-mail address */
-        if (empty($user->user_email)) {
+        if (empty ($user->user_email)) {
                 $errors['user_email'] = __("<strong>ERROR</strong>: please type an e-mail address");
-        } else if (!is_email($user->user_email)) {
-                $errors['user_email'] = __("<strong>ERROR</strong>: the email address isn't correct");
-        }
-
-        if ( count($errors) != 0 )
+        } else
+                if (!is_email($user->user_email)) {
+                        $errors['user_email'] = __("<strong>ERROR</strong>: the email address isn't correct");
+                }
+
+        if (count($errors) != 0)
                 return $errors;
-        
-        if ( $update ) {
+
+        if ($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;
-        
-        if($reassign == 'novalue') {
+
+        if ($reassign == 'novalue') {
                 $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 {
-                $reassign = (int)$reassign;
+                $reassign = (int) $reassign;
                 $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;
-        
-        if ( !empty($post_date) )
+
+        if (!empty ($post_date))
                 $post_date = "AND post_date = '$post_date'";
 
-        if ( ! empty($title) )
+        if (!empty ($title))
                 return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' $post_date");
-        else if ( ! empty($content) )
-                return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_content = '$content' $post_date");
+        else
+                if (!empty ($content))
+                        return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_content = '$content' $post_date");
 
         return 0;
@@ -497 +631 @@
 
         return $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments
-                WHERE comment_author = '$comment_author' AND comment_date = '$comment_date'");
-}
-
-function url_shorten ($url) {
+                        WHERE comment_author = '$comment_author' AND comment_date = '$comment_date'");
+}
+
+function url_shorten($url) {
         $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)
-                $short_url =  substr($short_url, 0, 32).'...';
+                $short_url = substr($short_url, 0, 32).'...';
         return $short_url;
 }
 
 function selected($selected, $current) {
-        if ($selected == $current) echo ' selected="selected"';
+        if ($selected == $current)
+                echo ' selected="selected"';
 }
 
 function checked($checked, $current) {
-        if ($checked == $current) echo ' checked="checked"';
-}
-
-function return_categories_list( $parent = 0 ) {
+        if ($checked == $current)
+                echo ' checked="checked"';
+}
+
+function return_categories_list($parent = 0) {
         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) {
- global $post_ID, $mode, $wpdb;
-
- if ($post_ID) {
-   $checked_categories = $wpdb->get_col("
-     SELECT category_id
-     FROM $wpdb->categories, $wpdb->post2cat
-     WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID'
-     ");
-
-   if(count($checked_categories) == 0)
-   {
-     // No selected categories, strange
-     $checked_categories[] = $default;
-   }
-
- } else {
-   $checked_categories[] = $default;
- }
-
- $cats = return_categories_list($parent);
- $result = array();
-
-        if ( is_array( $cats ) ) {
-                foreach($cats as $cat) {
+        global $post_ID, $mode, $wpdb;
+
+        if ($post_ID) {
+                $checked_categories = $wpdb->get_col("
+                     SELECT category_id
+                     FROM $wpdb->categories, $wpdb->post2cat
+                     WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID'
+                     ");
+
+                if (count($checked_categories) == 0) {
+                        // No selected categories, strange
+                        $checked_categories[] = $default;
+                }
+
+        } else {
+                $checked_categories[] = $default;
+        }
+
+        $cats = return_categories_list($parent);
+        $result = array ();
+
+        if (is_array($cats)) {
+                foreach ($cats as $cat) {
                         $result[$cat]['children'] = get_nested_categories($default, $cat);
                         $result[$cat]['cat_ID'] = $cat;
@@ -559 +694 @@
 
 function write_nested_categories($categories) {
- foreach($categories as $category) {
-   echo '<label for="category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'],
-     '" type="checkbox" name="post_category[]" id="category-', $category['cat_ID'], '"',
-     ($category['checked'] ? ' checked="checked"' : ""), '/> ', wp_specialchars($category['cat_name']), "</label>\n";
-
-   if(isset($category['children'])) {
-     echo "\n<span class='cat-nest'>\n";
-     write_nested_categories($category['children']);
-     echo "</span>\n";
-   }
- }
+        foreach ($categories as $category) {
+                echo '<label for="category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : ""), '/> ', wp_specialchars($category['cat_name']), "</label>\n";
+
+                if (isset ($category['children'])) {
+                        echo "\n<span class='cat-nest'>\n";
+                        write_nested_categories($category['children']);
+                        echo "</span>\n";
+                }
+        }
 }
 
 function dropdown_categories($default = 0) {
- write_nested_categories(get_nested_categories($default));
-} 
+        write_nested_categories(get_nested_categories($default));
+}
 
 // Dandy new recursive multiple category stuff.
@@ -580 +713 @@
         global $wpdb, $class;
 
-        if ( !$categories )
+        if (!$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);
-                                if ( current_user_can('manage_categories') )
-                                        $edit = "<a href='categories.php?action=edit&amp;cat_ID=$category->cat_ID' class='edit'>" . __('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') . "</a>";
+                                if (current_user_can('manage_categories'))
+                                        $edit = "<a href='categories.php?action=edit&amp;cat_ID=$category->cat_ID' class='edit'>".__('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')."</a>";
                                 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>
-                                <td>$category->category_description</td>
-                                <td>$count</td>
-                                <td>$edit</td>
-                                </tr>";
-                                cat_rows($category->cat_ID, $level + 1, $categories);
+                                                                <td>$category->category_description</td>
+                                                                <td>$count</td>
+                                                                <td>$edit</td>
+                                                                </tr>";
+                                cat_rows($category->cat_ID, $level +1, $categories);
                         }
                 }
@@ -608 +741 @@
 }
 
-function page_rows( $parent = 0, $level = 0, $pages = 0 ) {
+function page_rows($parent = 0, $level = 0, $pages = 0) {
         global $wpdb, $class, $post;
         if (!$pages)
@@ -614 +747 @@
 
         if ($pages) {
-                foreach ($pages as $post) { start_wp();
+                foreach ($pages as $post) {
+                        start_wp();
                         if ($post->post_parent == $parent) {
                                 $post->post_title = wp_specialchars($post->post_title);
@@ -634 +768 @@
 
 <?php
-                                page_rows($id, $level + 1, $pages);
+
+                                page_rows($id, $level +1, $pages);
                         }
                 }
@@ -648 +783 @@
         }
         if ($categories) {
-                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);
-                        echo "\n\t<option value='$category->cat_ID'";
-                        if ($currentparent == $category->cat_ID)
-                                echo " selected='selected'";
-                        echo ">$pad$category->cat_name</option>";
-                        wp_dropdown_cats($currentcat, $currentparent, $category->cat_ID, $level + 1, $categories);
-                } }
+                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);
+                                echo "\n\t<option value='$category->cat_ID'";
+                                if ($currentparent == $category->cat_ID)
+                                        echo " selected='selected'";
+                                echo ">$pad$category->cat_name</option>";
+                                wp_dropdown_cats($currentcat, $currentparent, $category->cat_ID, $level +1, $categories);
+                        }
+                }
         } else {
                 return false;
@@ -665 +802 @@
 function wp_create_thumbnail($file, $max_side, $effect = '') {
 
-    // 1 = GIF, 2 = JPEG, 3 = PNG
-
-    if(file_exists($file)) {
-        $type = getimagesize($file);
-        
-        // if the associated function doesn't exist - then it's not
-        // handle. duh. i hope.
-        
-        if(!function_exists('imagegif') && $type[2] == 1) {
-            $error = __('Filetype not supported. Thumbnail not created.');
-        }elseif(!function_exists('imagejpeg') && $type[2] == 2) {
-            $error = __('Filetype not supported. Thumbnail not created.');
-        }elseif(!function_exists('imagepng') && $type[2] == 3) {
-            $error = __('Filetype not supported. Thumbnail not created.');
-        } else {
-        
-            // create the initial copy from the original file
-            if($type[2] == 1) {
-                $image = imagecreatefromgif($file);
-            } elseif($type[2] == 2) {
-                $image = imagecreatefromjpeg($file);
-            } elseif($type[2] == 3) {
-                $image = imagecreatefrompng($file);
-            }
-            
+                // 1 = GIF, 2 = JPEG, 3 = PNG
+
+        if (file_exists($file)) {
+                $type = getimagesize($file);
+
+                // if the associated function doesn't exist - then it's not
+                // handle. duh. i hope.
+
+                if (!function_exists('imagegif') && $type[2] == 1) {
+                        $error = __('Filetype not supported. Thumbnail not created.');
+                }
+                elseif (!function_exists('imagejpeg') && $type[2] == 2) {
+                        $error = __('Filetype not supported. Thumbnail not created.');
+                }
+                elseif (!function_exists('imagepng') && $type[2] == 3) {
+                        $error = __('Filetype not supported. Thumbnail not created.');
+                } else {
+
+                        // create the initial copy from the original file
+                        if ($type[2] == 1) {
+                                $image = imagecreatefromgif($file);
+                        }
+                        elseif ($type[2] == 2) {
+                                $image = imagecreatefromjpeg($file);
+                        }
+                        elseif ($type[2] == 3) {
+                                $image = imagecreatefrompng($file);
+                        }
+
                         if (function_exists('imageantialias'))
-                    imageantialias($image, TRUE);
-            
-            $image_attr = getimagesize($file);
-            
-            // figure out the longest side
-            
-            if($image_attr[0] > $image_attr[1]) {
-                $image_width = $image_attr[0];
-                $image_height = $image_attr[1];
-                $image_new_width = $max_side;
-                
-                $image_ratio = $image_width/$image_new_width;
-                $image_new_height = $image_height/$image_ratio;
-                //width is > height
-            } else {
-                $image_width = $image_attr[0];
-                $image_height = $image_attr[1];
-                $image_new_height = $max_side;
-                
-                $image_ratio = $image_height/$image_new_height;
-                $image_new_width = $image_width/$image_ratio;
-                //height > width
-            }
-            
-            $thumbnail = imagecreatetruecolor($image_new_width, $image_new_height);
-            @imagecopyresampled($thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1]);
-            
-            // move the thumbnail to it's final destination
-            
-            $path = explode('/', $file);
-            $thumbpath = substr($file, 0, strrpos($file, '/')) . '/thumb-' . $path[count($path)-1];
-            
-            if($type[2] == 1) {
-                if(!imagegif($thumbnail, $thumbpath)) {
-                    $error = __("Thumbnail path invalid");
-                }
-            } elseif($type[2] == 2) {
-                if(!imagejpeg($thumbnail, $thumbpath)) {
-                    $error = __("Thumbnail path invalid");
-                }
-            } elseif($type[2] == 3) {
-                if(!imagepng($thumbnail, $thumbpath)) {
-                    $error = __("Thumbnail path invalid");
-                }
-            }
-            
-        }
-    }
-    
-    if(!empty($error))
-    {
-        return $error;
-    }
-    else
-    {
-        return 1;
-    }
+                                imageantialias($image, TRUE);
+
+                        $image_attr = getimagesize($file);
+
+                        // figure out the longest side
+
+                        if ($image_attr[0] > $image_attr[1]) {
+                                $image_width = $image_attr[0];
+                                $image_height = $image_attr[1];
+                                $image_new_width = $max_side;
+
+                                $image_ratio = $image_width / $image_new_width;
+                                $image_new_height = $image_height / $image_ratio;
+                                //width is > height
+                        } else {
+                                $image_width = $image_attr[0];
+                                $image_height = $image_attr[1];
+                                $image_new_height = $max_side;
+
+                                $image_ratio = $image_height / $image_new_height;
+                                $image_new_width = $image_width / $image_ratio;
+                                //height > width
+                        }
+
+                        $thumbnail = imagecreatetruecolor($image_new_width, $image_new_height);
+                        @ imagecopyresampled($thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1]);
+
+                        // move the thumbnail to it's final destination
+
+                        $path = explode('/', $file);
+                        $thumbpath = substr($file, 0, strrpos($file, '/')).'/thumb-'.$path[count($path) - 1];
+
+                        if ($type[2] == 1) {
+                                if (!imagegif($thumbnail, $thumbpath)) {
+                                        $error = __("Thumbnail path invalid");
+                                }
+                        }
+                        elseif ($type[2] == 2) {
+                                if (!imagejpeg($thumbnail, $thumbpath)) {
+                                        $error = __("Thumbnail path invalid");
+                                }
+                        }
+                        elseif ($type[2] == 3) {
+                                if (!imagepng($thumbnail, $thumbpath)) {
+                                        $error = __("Thumbnail path invalid");
+                                }
+                        }
+
+                }
+        }
+
+        if (!empty ($error)) {
+                return $error;
+        } else {
+                return 1;
+        }
 }
 
@@ -755 +895 @@
 
         return $wpdb->get_results("
-                SELECT meta_key, meta_value, meta_id, post_id
-                FROM $wpdb->postmeta
-                WHERE post_id = '$postid'
-                ORDER BY meta_key,meta_id",ARRAY_A);
+                        SELECT meta_key, meta_value, meta_id, post_id
+                        FROM $wpdb->postmeta
+                        WHERE post_id = '$postid'
+                        ORDER BY meta_key,meta_id", ARRAY_A);
 
 }
 
 function list_meta($meta) {
-        global $post_ID;        
+        global $post_ID;
         // Exit if no meta
-        if (!$meta) return;
+        if (!$meta)
+                return;
         $count = 0;
 ?>
@@ -775 +916 @@
         </tr>
 <?php
-                
+
+
         foreach ($meta as $entry) {
-                ++$count;
-                if ( $count % 2 ) $style = 'alternate';
-                else $style = '';
-                if ( '_' == $entry['meta_key']{0} ) $style .= ' hidden';
+                ++ $count;
+                if ($count % 2)
+                        $style = 'alternate';
+                else
+                        $style = '';
+                if ('_' == $entry['meta_key'] { 0 })
+                        $style .= ' hidden';
                 echo "
-        <tr class='$style'>
-                <td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td>
-                <td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>
-                <td align='center' width='10%'><input name='updatemeta' type='submit' class='updatemeta' tabindex='6' value='" . __('Update') ."' /></td>
-                <td align='center' width='10%'><input name='deletemeta[{$entry['meta_id']}]' type='submit' class='deletemeta' tabindex='6' value='" . __('Delete') ."' /></td>
-        </tr>
-";
+                        <tr class='$style'>
+                                <td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td>
+                                <td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>
+                                <td align='center' width='10%'><input name='updatemeta' type='submit' class='updatemeta' tabindex='6' value='".__('Update')."' /></td>
+                                <td align='center' width='10%'><input name='deletemeta[{$entry['meta_id']}]' type='submit' class='deletemeta' tabindex='6' value='".__('Delete')."' /></td>
+                        </tr>
+                ";
         }
         echo "
-        </table>
-";
+                </table>
+        ";
 }
 
@@ -798 +943 @@
 function get_meta_keys() {
         global $wpdb;
-        
+
         $keys = $wpdb->get_col("
-                SELECT meta_key
-                FROM $wpdb->postmeta
-                GROUP BY meta_key
-                ORDER BY meta_key");
-        
+                        SELECT meta_key
+                        FROM $wpdb->postmeta
+                        GROUP BY meta_key
+                        ORDER BY meta_key");
+
         return $keys;
 }
@@ -811 +956 @@
         global $wpdb;
         $keys = $wpdb->get_col("
-                SELECT meta_key
-                FROM $wpdb->postmeta
-                GROUP BY meta_key
-                ORDER BY meta_id DESC
-                LIMIT 10");
+                        SELECT meta_key
+                        FROM $wpdb->postmeta
+                        GROUP BY meta_key
+                        ORDER BY meta_id DESC
+                        LIMIT 10");
 ?>
 <h3><?php _e('Add a new custom field:') ?></h3>
@@ -829 +974 @@
 <option value="#NONE#"><?php _e('- Select -'); ?></option>
 <?php
-        foreach($keys as $key) {
+
+        foreach ($keys as $key) {
                 echo "\n\t<option value='$key'>$key</option>";
         }
@@ -843 +989 @@
 <p class="submit"><input type="submit" name="updatemeta" tabindex="9" value="<?php _e('Add Custom Field &raquo;') ?>" /></p>
 <?php
+
 }
 
 function add_meta($post_ID) {
         global $wpdb;
-        
-        $metakeyselect = $wpdb->escape( stripslashes( trim($_POST['metakeyselect']) ) );
-        $metakeyinput  = $wpdb->escape( stripslashes( trim($_POST['metakeyinput']) ) );
-        $metavalue     = $wpdb->escape( stripslashes( trim($_POST['metavalue']) ) );
-
-        if (!empty($metavalue) && ((('#NONE#' != $metakeyselect) && !empty($metakeyselect)) || !empty($metakeyinput))) {
+
+        $metakeyselect = $wpdb->escape(stripslashes(trim($_POST['metakeyselect'])));
+        $metakeyinput = $wpdb->escape(stripslashes(trim($_POST['metakeyinput'])));
+        $metavalue = $wpdb->escape(stripslashes(trim($_POST['metavalue'])));
+
+        if (!empty ($metavalue) && ((('#NONE#' != $metakeyselect) && !empty ($metakeyselect)) || !empty ($metakeyinput))) {
                 // We have a key/value pair. If both the select and the 
                 // input for the key have data, the input takes precedence:
@@ -858 +1005 @@
                 if ('#NONE#' != $metakeyselect)
                         $metakey = $metakeyselect;
-                                
+
                 if ($metakeyinput)
                         $metakey = $metakeyinput; // default
 
                 $result = $wpdb->query("
-                                INSERT INTO $wpdb->postmeta 
-                                (post_id,meta_key,meta_value) 
-                                VALUES ('$post_ID','$metakey','$metavalue')
-                        ");
+                                                INSERT INTO $wpdb->postmeta 
+                                                (post_id,meta_key,meta_value) 
+                                                VALUES ('$post_ID','$metakey','$metavalue')
+                                        ");
         }
 } // add_meta
@@ -884 +1031 @@
 function touch_time($edit = 1, $for_post = 1) {
         global $month, $post, $comment;
-        if ( $for_post && ('draft' == $post->post_status) ) {
+        if ($for_post && ('draft' == $post->post_status)) {
                 $checked = 'checked="checked" ';
                 $edit = false;
@@ -891 +1038 @@
         }
 
-        echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" '.$checked.'/> <label for="timestamp">' . __('Edit timestamp') . '</label></legend>';
-        
+        echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" '.$checked.'/> <label for="timestamp">'.__('Edit timestamp').'</label></legend>';
+
         $time_adj = time() + (get_settings('gmt_offset') * 3600);
         $post_date = ($for_post) ? $post->post_date : $comment->comment_date;
@@ -903 +1050 @@
 
         echo "<select name=\"mm\">\n";
-        for ($i=1; $i < 13; $i=$i+1) {
+        for ($i = 1; $i < 13; $i = $i +1) {
                 echo "\t\t\t<option value=\"$i\"";
                 if ($i == $mm)
-                echo " selected='selected'";
+                        echo " selected='selected'";
                 if ($i < 10) {
                         $ii = "0".$i;
@@ -913 +1060 @@
                 }
                 echo ">".$month["$ii"]."</option>\n";
-        } 
-
+        }
 ?>
 </select>
@@ -924 +1070 @@
 <?php _e('Existing timestamp'); ?>: 
         <?php
-                // We might need to readjust to display proper existing timestamp
-                if ( $for_post && ('draft' == $post->post_status) ) {
-                        $jj = mysql2date('d', $post_date);
-                        $mm = mysql2date('m', $post_date);
-                        $aa = mysql2date('Y', $post_date);
-                        $hh = mysql2date('H', $post_date);
-                        $mn = mysql2date('i', $post_date);
-                        $ss = mysql2date('s', $post_date);
-                }
-                echo "{$month[$mm]} $jj, $aa @ $hh:$mn"; ?>
+
+        // We might need to readjust to display proper existing timestamp
+        if ($for_post && ('draft' == $post->post_status)) {
+                $jj = mysql2date('d', $post_date);
+                $mm = mysql2date('m', $post_date);
+                $aa = mysql2date('Y', $post_date);
+                $hh = mysql2date('H', $post_date);
+                $mn = mysql2date('i', $post_date);
+                $ss = mysql2date('s', $post_date);
+        }
+        echo "{$month[$mm]} $jj, $aa @ $hh:$mn";
+?>
 </fieldset>
         <?php
+
 }
 
 function check_admin_referer() {
-        $adminurl = strtolower( get_settings('siteurl') ) . '/wp-admin';
-        $referer = strtolower( $_SERVER['HTTP_REFERER'] );
-        if ( !strstr($referer, $adminurl) )
+        $adminurl = strtolower(get_settings('siteurl')).'/wp-admin';
+        $referer = strtolower($_SERVER['HTTP_REFERER']);
+        if (!strstr($referer, $adminurl))
                 die(__('Sorry, you need to <a href="http://codex.wordpress.org/Enable_Sending_Referrers">enable sending referrers</a> for this feature to work.'));
         do_action('check_admin_referer');
@@ -963 +1112 @@
                 if ($markerdata) {
                         $state = true;
-                        foreach($markerdata as $markerline) {
-                                if (strstr($markerline, "# BEGIN {$marker}")) $state = false;
-                                if ($state) fwrite($f, "{$markerline}\n");
+                        foreach ($markerdata as $markerline) {
+                                if (strstr($markerline, "# BEGIN {$marker}"))
+                                        $state = false;
+                                if ($state)
+                                        fwrite($f, "{$markerline}\n");
                                 if (strstr($markerline, "# END {$marker}")) {
                                         fwrite($f, "# BEGIN {$marker}\n");
-                                        if(is_array($insertion)) foreach($insertion as $insertline) fwrite($f, "{$insertline}\n");
+                                        if (is_array($insertion))
+                                                foreach ($insertion as $insertline)
+                                                        fwrite($f, "{$insertline}\n");
                                         fwrite($f, "# END {$marker}\n");
                                         $state = true;
@@ -977 +1130 @@
                 if (!$foundit) {
                         fwrite($f, "# BEGIN {$marker}\n");
-                        foreach($insertion as $insertline) fwrite($f, "{$insertline}\n");
+                        foreach ($insertion as $insertline)
+                                fwrite($f, "{$insertline}\n");
                         fwrite($f, "# END {$marker}\n");
                 }
@@ -991 +1145 @@
 // and END markers.
 function extract_from_markers($filename, $marker) {
-        $result = array();
+        $result = array ();
 
         if (!file_exists($filename)) {
@@ -997 +1151 @@
         }
 
-        if($markerdata = explode("\n", implode('', file($filename))));
+        if ($markerdata = explode("\n", implode('', file($filename))));
         {
                 $state = false;
-                foreach($markerdata as $markerline) {
-                        if(strstr($markerline, "# END {$marker}"))      $state = false;
-                        if($state) $result[] = $markerline;
-                        if(strstr($markerline, "# BEGIN {$marker}")) $state = true;
+                foreach ($markerdata as $markerline) {
+                        if (strstr($markerline, "# END {$marker}"))
+                                $state = false;
+                        if ($state)
+                                $result[] = $markerline;
+                        if (strstr($markerline, "# BEGIN {$marker}"))
+                                $state = true;
                 }
         }
@@ -1014 +1171 @@
         $home_path = get_home_path();
 
-        if (! $wp_rewrite->using_mod_rewrite_permalinks())
+        if (!$wp_rewrite->using_mod_rewrite_permalinks())
                 return;
 
-        if ( ! ((!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess')) )
+        if (!((!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess')))
                 return;
 
-        if (! $is_apache)
+        if (!$is_apache)
                 return;
 
@@ -1027 +1184 @@
 }
 
-function the_quicktags () {
-// Browser detection sucks, but until Safari supports the JS needed for this to work people just assume it's a bug in WP
-if ( !strstr($_SERVER['HTTP_USER_AGENT'], 'Safari') ) :
-        echo '
-        <div id="quicktags">
-        <script src="../wp-includes/js/quicktags.js" type="text/javascript"></script>
-        <script type="text/javascript">edToolbar();</script>
-';
+function the_quicktags() {
+        // Browser detection sucks, but until Safari supports the JS needed for this to work people just assume it's a bug in WP
+        if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Safari'))
+                : echo '
+                        <div id="quicktags">
+                        <script src="../wp-includes/js/quicktags.js" type="text/javascript"></script>
+                        <script type="text/javascript">edToolbar();</script>
+                ';
         echo '</div>';
-endif;
+        endif;
 }
 
 function validate_current_theme() {
         $theme_loc = 'wp-content/themes';
-        $theme_root = ABSPATH . $theme_loc;
+        $theme_root = ABSPATH.$theme_loc;
 
         $template = get_settings('template');
         $stylesheet = get_settings('stylesheet');
 
-        if (($template != 'default') && (! file_exists("$theme_root/$template/index.php"))) {
+        if (($template != 'default') && (!file_exists("$theme_root/$template/index.php"))) {
                 update_option('template', 'default');
                 update_option('stylesheet', 'default');
@@ -1053 +1210 @@
         }
 
-        if (($stylesheet != 'default') && (! file_exists("$theme_root/$stylesheet/style.css"))) {
+        if (($stylesheet != 'default') && (!file_exists("$theme_root/$stylesheet/style.css"))) {
                 update_option('template', 'default');
                 update_option('stylesheet', 'default');
@@ -1074 +1231 @@
         $theme = get_current_theme();
         $templates = $themes[$theme]['Template Files'];
-        $page_templates = array();
-
-        if( is_array( $templates ) ) {
+        $page_templates = array ();
+
+        if (is_array($templates)) {
                 foreach ($templates as $template) {
-                        $template_data = implode('', file(ABSPATH . $template));
+                        $template_data = implode('', file(ABSPATH.$template));
                         preg_match("|Template Name:(.*)|i", $template_data, $name);
                         preg_match("|Description:(.*)|i", $template_data, $description);
@@ -1085 +1242 @@
                         $description = $description[1];
 
-                        if (! empty($name)) {
+                        if (!empty ($name)) {
                                 $page_templates[trim($name)] = basename($template);
                         }
@@ -1096 +1253 @@
 function page_template_dropdown($default = '') {
         $templates = get_page_templates();
-        foreach (array_keys($templates) as $template) :
-                if ($default == $templates[$template]) $selected = " selected='selected'";
-                else $selected = '';
-                echo "\n\t<option value='" . $templates[$template] . "' $selected>$template</option>";
-                endforeach;
+        foreach (array_keys($templates) as $template)
+                : if ($default == $templates[$template])
+                        $selected = " selected='selected'";
+                else
+                        $selected = '';
+        echo "\n\t<option value='".$templates[$template]."' $selected>$template</option>";
+        endforeach;
 }
 
@@ -1110 +1269 @@
                 foreach ($items as $item) {
                         // A page cannot be it's own parent.
-                        if (!empty($post_ID)) {
+                        if (!empty ($post_ID)) {
                                 if ($item->ID == $post_ID) {
                                         continue;
@@ -1122 +1281 @@
 
                         echo "\n\t<option value='$item->ID'$current>$pad $item->post_title</option>";
-                        parent_dropdown($default, $item->ID, $level + 1);
+                        parent_dropdown($default, $item->ID, $level +1);
                 }
         } else {
@@ -1139 +1298 @@
                 //echo "parent array: " . $menu_array[2];
                 if ($menu_array[2] == $parent) {
-                        if ( !current_user_can($menu_array[1]) ) {
+                        if (!current_user_can($menu_array[1])) {
                                 return false;
                         } else {
@@ -1147 +1306 @@
         }
 
-        if (isset($submenu[$parent])) {
+        if (isset ($submenu[$parent])) {
                 foreach ($submenu[$parent] as $submenu_array) {
                         if ($submenu_array[2] == $pagenow) {
-                                if ( !current_user_can($submenu_array[1]) ) {
+                                if (!current_user_can($submenu_array[1])) {
                                         return false;
                                 } else {
@@ -1158 +1317 @@
                 }
         }
-        
+
         return true;
 }
@@ -1169 +1328 @@
         global $plugin_page;
 
-        if (isset($title) && ! empty($title)) {
+        if (isset ($title) && !empty ($title)) {
                 return $title;
         }
 
         $parent = get_admin_page_parent();
-        if (empty($parent)) {
+        if (empty ($parent)) {
                 foreach ($menu as $menu_array) {
-                        if (isset($menu_array[3])) {
+                        if (isset ($menu_array[3])) {
                                 if ($menu_array[2] == $pagenow) {
                                         $title = $menu_array[3];
                                         return $menu_array[3];
-                                } else if (isset($plugin_page) && ($plugin_page == $menu_array[2])) {
-                                        $title = $menu_array[3];
-                                        return $menu_array[3];
-                                }
+                                } else
+                                        if (isset ($plugin_page) && ($plugin_page == $menu_array[2])) {
+                                                $title = $menu_array[3];
+                                                return $menu_array[3];
+                                        }
                         }
                 }
@@ -1189 +1349 @@
                 foreach (array_keys($submenu) as $parent) {
                         foreach ($submenu[$parent] as $submenu_array) {
-                                if (isset($submenu_array[3])) {
+                                if (isset ($submenu_array[3])) {
                                         if ($submenu_array[2] == $pagenow) {
                                                 $title = $submenu_array[3];
                                                 return $submenu_array[3];
-                                        } else if (isset($plugin_page) && ($plugin_page == $submenu_array[2])) {
-                                                $title = $submenu_array[3];
-                                                return $submenu_array[3];
-                                        }
+                                        } else
+                                                if (isset ($plugin_page) && ($plugin_page == $submenu_array[2])) {
+                                                        $title = $submenu_array[3];
+                                                        return $submenu_array[3];
+                                                }
                                 }
                         }
@@ -1212 +1373 @@
         global $plugin_page;
 
-        if (isset($parent_file) && ! empty($parent_file)) {
+        if (isset ($parent_file) && !empty ($parent_file)) {
                 return $parent_file;
         }
 
-        if ($pagenow == 'admin.php' && isset($plugin_page)) {
+        if ($pagenow == 'admin.php' && isset ($plugin_page)) {
                 foreach ($menu as $parent_menu) {
                         if ($parent_menu[2] == $plugin_page) {
@@ -1224 +1385 @@
                 }
         }
-                
+
         foreach (array_keys($submenu) as $parent) {
                 foreach ($submenu[$parent] as $submenu_array) {
@@ -1230 +1391 @@
                                 $parent_file = $parent;
                                 return $parent;
-                        } else if (isset($plugin_page) && ($plugin_page == $submenu_array[2])) {
-                                $parent_file = $parent;
-                                return $parent;
-                        }
+                        } else
+                                if (isset ($plugin_page) && ($plugin_page == $submenu_array[2])) {
+                                        $parent_file = $parent;
+                                        return $parent;
+                                }
                 }
         }
@@ -1246 +1408 @@
         $file = plugin_basename($file);
 
-        $menu[] = array($menu_title, $access_level, $file, $page_title);
+        $menu[] = array ($menu_title, $access_level, $file, $page_title);
 
         $admin_page_hooks[$file] = sanitize_title($menu_title);
 
         $hookname = get_plugin_page_hookname($file, '');
-        if ( !empty($function) && !empty($hookname) )
+        if (!empty ($function) && !empty ($hookname))
                 add_action($hookname, $function);
 
@@ -1268 +1430 @@
         // parent file someone is trying to link back to the parent manually.  In
         // this case, don't automatically add a link back to avoid duplication.
-        if (! isset($submenu[$parent]) && $file != $parent) {
+        if (!isset ($submenu[$parent]) && $file != $parent) {
                 foreach ($menu as $parent_menu) {
                         if ($parent_menu[2] == $parent) {
@@ -1275 +1437 @@
                 }
         }
-        
-        $submenu[$parent][] = array($menu_title, $access_level, $file, $page_title);
+
+        $submenu[$parent][] = array ($menu_title, $access_level, $file, $page_title);
 
         $hookname = get_plugin_page_hookname($file, $parent);
-        if ( !empty($function) && !empty($hookname) )
+        if (!empty ($function) && !empty ($hookname))
                 add_action($hookname, $function);
 
@@ -1294 +1456 @@
 
 function add_theme_page($page_title, $menu_title, $access_level, $file, $function = '') {
-        return add_submenu_page('themes.php', $page_title, $menu_title, $access_level, $file, $function);
-}
-
+        return add_submenu_page('themes.php', $page_title, $menu_title, $access_level, $file, $function);
+}
 
 function validate_file($file, $allowed_files = '') {
-        if ( false !== strpos($file, './'))
+        if (false !== strpos($file, './'))
                 return 1;
-        
-        if (':' == substr($file,1,1))
+
+        if (':' == substr($file, 1, 1))
                 return 2;
 
-        if ( !empty($allowed_files) && (! in_array($file, $allowed_files)) )
+        if (!empty ($allowed_files) && (!in_array($file, $allowed_files)))
                 return 3;
 
@@ -1316 +1477 @@
         $code = validate_file($file, $allowed_files);
 
-        if (! $code)
+        if (!$code)
                 return $file;
 
         switch ($code) {
-        case 1:
-                die (__('Sorry, can&#8217;t edit files with ".." in the name. If you are trying to edit a file in your WordPress home directory, you can just type the name of the file in.'));
-        
-        case 2:
-                die (__('Sorry, can&#8217;t call files with their real path.'));
-
-        case 3:
-                die (__('Sorry, that file cannot be edited.'));
+                case 1 :
+                        die(__('Sorry, can&#8217;t edit files with ".." in the name. If you are trying to edit a file in your WordPress home directory, you can just type the name of the file in.'));
+
+                case 2 :
+                        die(__('Sorry, can&#8217;t call files with their real path.'));
+
+                case 3 :
+                        die(__('Sorry, that file cannot be edited.'));
         }
 }
@@ -1333 +1494 @@
 function get_home_path() {
         $home = get_settings('home');
-        if ( $home != '' && $home != get_settings('siteurl') ) {
+        if ($home != '' && $home != get_settings('siteurl')) {
                 $home_path = parse_url($home);
                 $home_path = $home_path['path'];
                 $root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"]);
-                $home_path = trailingslashit($root . $home_path);
+                $home_path = trailingslashit($root.$home_path);
         } else {
                 $home_path = ABSPATH;
@@ -1346 +1507 @@
 
 function get_real_file_to_edit($file) {
-        if ('index.php' == $file ||
-                         '.htaccess' == $file) {
-                $real_file = get_home_path() . $file;
-        } else {
-                $real_file = ABSPATH . $file;
+        if ('index.php' == $file || '.htaccess' == $file) {
+                $real_file = get_home_path().$file;
+        } else {
+                $real_file = ABSPATH.$file;
         }
 
@@ -1356 +1516 @@
 }
 
-$wp_file_descriptions = 
-        array(
-        'index.php' => __('Main Index Template'),
-        'style.css' => __('Stylesheet'),
-        'comments.php' => __('Comments'),
-        'comments-popup.php' => __('Popup Comments'),
-        'footer.php' => __('Footer'),
-        'header.php' => __('Header'),
-        'sidebar.php' => __('Sidebar'),
-        'archive.php' => __('Archives'),
-        'category.php' => __('Category Template'),
-        'page.php' => __('Page Template'),
-        'search.php' => __('Search Results'),
-        'single.php' => __('Single Post'),
-        '404.php' => __('404 Template'),
-        'my-hacks.php' => __('my-hacks.php (legacy hacks support)'),
-        '.htaccess' => __('.htaccess (for rewrite rules)'),
+$wp_file_descriptions = array ('index.php' => __('Main Index Template'), 'style.css' => __('Stylesheet'), 'comments.php' => __('Comments'), 'comments-popup.php' => __('Popup Comments'), 'footer.php' => __('Footer'), 'header.php' => __('Header'), 'sidebar.php' => __('Sidebar'), 'archive.php' => __('Archives'), 'category.php' => __('Category Template'), 'page.php' => __('Page Template'), 'search.php' => __('Search Results'), 'single.php' => __('Single Post'), '404.php' => __('404 Template'), 'my-hacks.php' => __('my-hacks.php (legacy hacks support)'), '.htaccess' => __('.htaccess (for rewrite rules)'),
         // Deprecated files
-        'wp-layout.css' => __('Stylesheet'),
-        'wp-comments.php' => __('Comments Template'),
-        'wp-comments-popup.php' => __('Popup Comments Template')
-        );
+        'wp-layout.css' => __('Stylesheet'), 'wp-comments.php' => __('Comments Template'), 'wp-comments-popup.php' => __('Popup Comments Template'));
 
 function get_file_description($file) {
         global $wp_file_descriptions;
 
-        if ( isset($wp_file_descriptions[basename($file)] ) ) {
+        if (isset ($wp_file_descriptions[basename($file)])) {
                 return $wp_file_descriptions[basename($file)];
-        } elseif ( file_exists( ABSPATH . $file ) ) {
-                $template_data = implode('', file(ABSPATH . $file));
-                if ( preg_match("|Template Name:(.*)|i", $template_data, $name) )
+        }
+        elseif (file_exists(ABSPATH.$file)) {
+                $template_data = implode('', file(ABSPATH.$file));
+                if (preg_match("|Template Name:(.*)|i", $template_data, $name))
                         return $name[1];
         }
 
-        return basename( $file );
+        return basename($file);
 }
 
@@ -1400 +1542 @@
                 $oldfiles = array_reverse($oldfiles);
                 $oldfiles = array_unique($oldfiles);
-                if ( 5 < count($oldfiles) )
+                if (5 < count($oldfiles))
                         array_pop($oldfiles);
         } else {
@@ -1415 +1557 @@
         preg_match("|Author:(.*)|i", $plugin_data, $author_name);
         preg_match("|Author URI:(.*)|i", $plugin_data, $author_uri);
-        if ( preg_match("|Version:(.*)|i", $plugin_data, $version) )
+        if (preg_match("|Version:(.*)|i", $plugin_data, $version))
                 $version = $version[1];
         else
-                $version ='';
+                $version = '';
 
         $description = wptexturize($description[1]);
@@ -1426 +1568 @@
         $plugin = $name;
         if ('' != $plugin_uri[1] && '' != $name) {
-                $plugin = '<a href="' . $plugin_uri[1] . '" title="' . __('Visit plugin homepage') . '">' . $plugin . '</a>';
+                $plugin = '<a href="'.$plugin_uri[1].'" title="'.__('Visit plugin homepage').'">'.$plugin.'</a>';
         }
 
@@ -1432 +1574 @@
                 $author = $author_name[1];
         } else {
-                $author = '<a href="' . $author_uri[1] . '" title="' . __('Visit author homepage') . '">' . $author_name[1] . '</a>';
-        }
-
-        return array('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1]);
+                $author = '<a href="'.$author_uri[1].'" title="'.__('Visit author homepage').'">'.$author_name[1].'</a>';
+        }
+
+        return array ('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1]);
 }
 
@@ -1441 +1583 @@
         global $wp_plugins;
 
-        if (isset($wp_plugins)) {
+        if (isset ($wp_plugins)) {
                 return $wp_plugins;
         }
 
-        $wp_plugins = array();
+        $wp_plugins = array ();
         $plugin_loc = 'wp-content/plugins';
-        $plugin_root = ABSPATH . $plugin_loc;
+        $plugin_root = ABSPATH.$plugin_loc;
 
         // Files in wp-content/plugins directory
         $plugins_dir = @ dir($plugin_root);
         if ($plugins_dir) {
-                while(($file = $plugins_dir->read()) !== false) {
-                        if ( preg_match('|^\.+$|', $file) )
+                while (($file = $plugins_dir->read()) !== false) {
+                        if (preg_match('|^\.+$|', $file))
                                 continue;
-                        if (is_dir($plugin_root . '/' . $file)) {
-                                $plugins_subdir = @ dir($plugin_root . '/' . $file);
+                        if (is_dir($plugin_root.'/'.$file)) {
+                                $plugins_subdir = @ dir($plugin_root.'/'.$file);
                                 if ($plugins_subdir) {
-                                        while(($subfile = $plugins_subdir->read()) !== false) {
-                                                if ( preg_match('|^\.+$|', $subfile) )
+                                        while (($subfile = $plugins_subdir->read()) !== false) {
+                                                if (preg_match('|^\.+$|', $subfile))
                                                         continue;
-                                                if ( preg_match('|\.php$|', $subfile) )
+                                                if (preg_match('|\.php$|', $subfile))
                                                         $plugin_files[] = "$file/$subfile";
                                         }
                                 }
                         } else {
-                                if ( preg_match('|\.php$|', $file) ) 
+                                if (preg_match('|\.php$|', $file))
                                         $plugin_files[] = $file;
                         }
@@ -1478 +1620 @@
         sort($plugin_files);
 
-        foreach($plugin_files as $plugin_file) {
+        foreach ($plugin_files as $plugin_file) {
                 $plugin_data = get_plugin_data("$plugin_root/$plugin_file");
-          
-                if (empty($plugin_data['Name'])) {
+
+                if (empty ($plugin_data['Name'])) {
                         continue;
                 }
@@ -1496 +1638 @@
         $parent = get_admin_page_parent();
 
-        if ( empty($parent_page) || 'admin.php' == $parent_page ) {
-                if ( isset($admin_page_hooks[$plugin_page]) )
+        if (empty ($parent_page) || 'admin.php' == $parent_page) {
+                if (isset ($admin_page_hooks[$plugin_page]))
                         $page_type = 'toplevel';
-                else if ( isset($admin_page_hooks[$parent]) )
-                        $page_type = $admin_page_hooks[$parent];
-        } else if ( isset($admin_page_hooks[$parent_page]) ) {
-                $page_type = $admin_page_hooks[$parent_page];
-        } else {
-                $page_type = 'admin';
-        }
+                else
+                        if (isset ($admin_page_hooks[$parent]))
+                                $page_type = $admin_page_hooks[$parent];
+        } else
+                if (isset ($admin_page_hooks[$parent_page])) {
+                        $page_type = $admin_page_hooks[$parent_page];
+                } else {
+                        $page_type = 'admin';
+                }
 
         $plugin_name = preg_replace('!\.php!', '', $plugin_page);
 
-        return $page_type . '_page_' . $plugin_name;
+        return $page_type.'_page_'.$plugin_name;
 }
 
 function get_plugin_page_hook($plugin_page, $parent_page) {
         global $wp_filter;
-        
+
         $hook = get_plugin_page_hookname($plugin_page, $parent_page);
-        if ( isset($wp_filter[$hook]) )
+        if (isset ($wp_filter[$hook]))
                 return $hook;
         else
@@ -1525 +1669 @@
         $getit = __('WordPress recommends a better browser');
         echo '
-        <p id="bh" style="text-align: center;"><a href="http://browsehappy.com/" title="' . $getit . '"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></p>
-        ';
-}
-if ( strstr( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) )
+                <p id="bh" style="text-align: center;"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></p>
+                ';
+}
+if (strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE'))
         add_action('admin_footer', 'browse_happy');
 
-function documentation_link( $for ) {
+function documentation_link($for) {
         return;
 }
@@ -1537 +1681 @@
 function register_importer($id, $name, $description, $callback) {
         global $wp_importers;
-        
-        $wp_importers[$id] = array($name, $description, $callback);
+
+        $wp_importers[$id] = array ($name, $description, $callback);
 }
 
@@ -1562 +1706 @@
         return $ct;
 }
-
 ?>

trunk/wp-admin/link-add.php

@@ -76 +76 @@
          <tr>
            <th width="33%" scope="row"><?php _e('URI:') ?></th>
-           <td width="67%"><input type="text" name="linkurl" value="<?php echo wp_specialchars($_GET['linkurl'], 1); ?>" style="width: 95%;" /></td>
+           <td width="67%"><input type="text" name="link_url" value="<?php echo wp_specialchars($_GET['linkurl'], 1); ?>" style="width: 95%;" /></td>
          </tr>
          <tr>
            <th scope="row"><?php _e('Link Name:') ?></th>
-           <td><input type="text" name="name" value="<?php echo wp_specialchars( urldecode($_GET['name']), 1 ); ?>" style="width: 95%" /></td>
+           <td><input type="text" name="link_name" value="<?php echo wp_specialchars( urldecode($_GET['name']), 1 ); ?>" style="width: 95%" /></td>
          </tr>
          <tr>
                 <th scope="row"><?php _e('Short description:') ?></th>
-                <td><input type="text" name="description" value="" style="width: 95%" /></td>
+                <td><input type="text" name="link_description" value="" style="width: 95%" /></td>
                 </tr>
         <tr>
            <th scope="row"><?php _e('Category:') ?></th>
-           <td><?php category_dropdown('category'); ?></td>
+           <td><?php category_dropdown('link_category'); ?></td>
          </tr>
 </table>
@@ -100 +100 @@
             <tr>
                 <th width="33%" scope="row"><?php _e('rel:') ?></th>
-                <td width="67%"><input type="text" name="rel" id="rel" size="50" value="<?php echo $link_rel; ?>" /></td>
+                <td width="67%"><input type="text" name="link_rel" id="rel" size="50" value="<?php echo $link_rel; ?>" /></td>
                 </tr>
             <tr>
@@ -213 +213 @@
          <tr>
            <th width="33%" scope="row"><?php _e('Image URI:') ?></th>
-           <td width="67%"><input type="text" name="image" size="50" value="" style="width: 95%" /></td>
+           <td width="67%"><input type="text" name="link_image" size="50" value="" style="width: 95%" /></td>
          </tr>
 <tr>
            <th scope="row"><?php _e('RSS URI:') ?> </th>
-           <td><input name="rss_uri" type="text" id="rss_uri" value="" size="50" style="width: 95%" /></td>
+           <td><input name="link_rss" type="text" id="rss_uri" value="" size="50" style="width: 95%" /></td>
          </tr>
          <tr>
            <th scope="row"><?php _e('Notes:') ?></th>
-           <td><textarea name="notes" cols="50" rows="10" style="width: 95%"></textarea></td>
+           <td><textarea name="link_notes" cols="50" rows="10" style="width: 95%"></textarea></td>
          </tr>
          <tr>
            <th scope="row"><?php _e('Rating:') ?></th>
-           <td><select name="rating" size="1">
+           <td><select name="link_rating" size="1">
              <?php
     for ($r = 0; $r < 10; $r++) {
@@ -237 +237 @@
            <th scope="row"><?php _e('Target') ?></th>
            <td><label>
-             <input type="radio" name="target" value="_blank" />
+             <input type="radio" name="link_target" value="_blank" />
              <code>_blank</code></label>
 <br />
-<label><input type="radio" name="target" value="_top" />
+<label><input type="radio" name="link_target" value="_top" />
 <code>_top</code></label>
 <br />
-<label><input type="radio" name="target" value="" checked="checked" />
+<label><input type="radio" name="link_target" value="" checked="checked" />
 <?php _e('none') ?></label>
 <?php _e('(Note that the <code>target</code> attribute is illegal in XHTML 1.1 and 1.0 Strict.)') ?></td>
@@ -250 +250 @@
            <th scope="row"><?php _e('Visible:') ?></th>
            <td><label>
-             <input type="radio" name="visible" checked="checked" value="Y" />
+             <input type="radio" name="link_visible" checked="checked" value="Y" />
 <?php _e('Yes') ?></label><br />
-<label><input type="radio" name="visible" value="N" /> <input type="hidden" name="action" value="Add" /> 
+<label><input type="radio" name="link_visible" value="N" /> <input type="hidden" name="action" value="Add" /> 
 <?php _e('No') ?></label></td>
          </tr>

trunk/wp-admin/link-manager.php

@@ -160 +160 @@
     check_admin_referer();
 
-    $link_url = wp_specialchars($_POST['linkurl']);
-    $link_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $link_url) ? $link_url : 'http://' . $link_url; 
-    $link_name = wp_specialchars($_POST['name']);
-    $link_image = wp_specialchars($_POST['image']);
-    $link_target = $_POST['target'];
-    $link_category = $_POST['category'];
-    $link_description = $_POST['description'];
-    $link_visible = $_POST['visible'];
-    $link_rating = $_POST['rating'];
-    $link_rel = $_POST['rel'];
-    $link_notes = $_POST['notes'];
-        $link_rss_uri =  wp_specialchars($_POST['rss_uri']);
-    $auto_toggle = get_autotoggle($link_category);
+        add_link();
+        
+    header('Location: ' . $_SERVER['HTTP_REFERER'] . '?added=true');
+    break;
+  } // end Add
+
+  case 'editlink':
+  {
+ 
+        check_admin_referer();
+        
+        if (isset($links_show_cat_id) && ($links_show_cat_id != ''))
+                $cat_id = $links_show_cat_id;
+
+        if (!isset($cat_id) || ($cat_id == '')) {
+                if (!isset($links_show_cat_id) || ($links_show_cat_id == ''))
+                        $cat_id = 'All';
+        }
+        $links_show_cat_id = $cat_id;
+
+        $link_id = (int) $_POST['link_id'];
+        edit_link($link_id);
+        
+    setcookie('links_show_cat_id_' . COOKIEHASH, $links_show_cat_id, time()+600);
+    wp_redirect($this_file);
+    break;
+  } // end Save
+
+  case 'Delete':
+  {
+    check_admin_referer();
 
     if ( !current_user_can('manage_links') )
       die (__("Cheatin' uh ?"));
 
-    // 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.
-    if (($auto_toggle == 'Y') && ($link_visible == 'Y')) {
-      $wpdb->query("UPDATE $wpdb->links set link_visible = 'N' WHERE link_category = $link_category");
-    }
-    $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', $user_ID, $link_rating, '" . $link_rel . "', '" . $link_notes . "', '$link_rss_uri')");
-
-    header('Location: ' . $_SERVER['HTTP_REFERER'] . '?added=true');
-    break;
-  } // end Add
-
-  case 'editlink':
-  {
-    if (isset($submit)) {
-
-      if (isset($links_show_cat_id) && ($links_show_cat_id != ''))
-        $cat_id = $links_show_cat_id;
-
-      if (!isset($cat_id) || ($cat_id == '')) {
-        if (!isset($links_show_cat_id) || ($links_show_cat_id == ''))
-          $cat_id = 'All';
-      }
-      $links_show_cat_id = $cat_id;
-
-      check_admin_referer();
-
-      $link_id = (int) $_POST['link_id'];
-      $link_url = wp_specialchars($_POST['linkurl']);
-      $link_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $link_url) ? $link_url : 'http://' . $link_url; 
-      $link_name = wp_specialchars($_POST['name']);
-      $link_image = wp_specialchars($_POST['image']);
-      $link_target = wp_specialchars($_POST['target']);
-      $link_category = $_POST['category'];
-      $link_description = $_POST['description'];
-      $link_visible = $_POST['visible'];
-      $link_rating = $_POST['rating'];
-      $link_rel = $_POST['rel'];
-      $link_notes = $_POST['notes'];
-          $link_rss_uri =  $_POST['rss_uri'];
-      $auto_toggle = get_autotoggle($link_category);
-
-      if ( !current_user_can('manage_links') )
-        die (__("Cheatin' uh ?"));
-
-      // if we are in an auto toggle category and this one is visible then we
-      // need to make the others invisible before we update this one.
-      if (($auto_toggle == 'Y') && ($link_visible == 'Y')) {
-        $wpdb->query("UPDATE $wpdb->links set link_visible = 'N' WHERE link_category = $link_category");
-      }
-
-      $wpdb->query("UPDATE $wpdb->links SET link_url='" . $link_url . "',
-          link_name='" . $link_name . "',\n link_image='" . $link_image . "',
-          link_target='$link_target',\n link_category=$link_category,
-          link_visible='$link_visible',\n link_description='" . $link_description . "',
-          link_rating=$link_rating,
-          link_rel='" . $link_rel . "',
-          link_notes='" . $link_notes . "',
-          link_rss = '$link_rss_uri'
-          WHERE link_id=$link_id");
-    } // end if save
-    setcookie('links_show_cat_id_' . COOKIEHASH, $links_show_cat_id, time()+600);
-    wp_redirect($this_file);
-    break;
-  } // end Save
-
-  case 'Delete':
-  {
-    check_admin_referer();
-
     $link_id = (int) $_GET['link_id'];
 
-    if ( !current_user_can('manage_links') )
-      die (__("Cheatin' uh ?"));
-
-    $wpdb->query("DELETE FROM $wpdb->links WHERE link_id = $link_id");
-
+        wp_delete_link($link_id);
+        
     if (isset($links_show_cat_id) && ($links_show_cat_id != ''))
         $cat_id = $links_show_cat_id;
@@ -277 +219 @@
 
     $link_id = (int) $_GET['link_id'];
-    $row = $wpdb->get_row("SELECT * FROM $wpdb->links WHERE link_id = $link_id");
-
-    if ($row) {
-      $link_url = wp_specialchars($row->link_url, 1);
-      $link_name = wp_specialchars($row->link_name, 1);
-      $link_image = $row->link_image;
-      $link_target = $row->link_target;
-      $link_category = $row->link_category;
-      $link_description = wp_specialchars($row->link_description);
-      $link_visible = $row->link_visible;
-      $link_rating = $row->link_rating;
-      $link_rel = $row->link_rel;
-      $link_notes = wp_specialchars($row->link_notes);
-          $link_rss_uri = wp_specialchars($row->link_rss);
-    } else {
-                die( __('Link not found.') ); 
-        }
-
+ 
+        if ( !$link = get_link_to_edit($link_id) )
+                die( __('Link not found.') );
 ?>
 
@@ -305 +232 @@
          <tr>
            <th width="33%" scope="row"><?php _e('URI:') ?></th>
-           <td width="67%"><input type="text" name="linkurl" value="<?php echo $link_url; ?>" style="width: 95%;" /></td>
+           <td width="67%"><input type="text" name="link_url" value="<?php echo $link->link_url; ?>" style="width: 95%;" /></td>
          </tr>
          <tr>
            <th scope="row"><?php _e('Link Name:') ?></th>
-           <td><input type="text" name="name" value="<?php echo $link_name; ?>" style="width: 95%" /></td>
+           <td><input type="text" name="link_name" value="<?php echo $link->link_name; ?>" style="width: 95%" /></td>
          </tr>
          <tr>
             <th scope="row"><?php _e('Short description:') ?></th>
-                <td><input type="text" name="description" value="<?php echo $link_description; ?>" style="width: 95%" /></td>
+                <td><input type="text" name="link_description" value="<?php echo $link->link_description; ?>" style="width: 95%" /></td>
                 </tr>
         <tr>
            <th scope="row"><?php _e('Category:') ?></th>
-           <td><?php category_dropdown('category', $link_category); ?></td>
+           <td><?php category_dropdown('link_category', $link->link_category); ?></td>
          </tr>
 </table>
@@ -329 +256 @@
             <tr>
                 <th width="33%" scope="row"><?php _e('rel:') ?></th>
-                <td width="67%"><input type="text" name="rel" id="rel" size="50" value="<?php echo $link_rel; ?>" /></td>
+                <td width="67%"><input type="text" name="link_rel" id="rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
                 </tr>
             <tr>
@@ -442 +369 @@
          <tr>
            <th width="33%" scope="row"><?php _e('Image URI:') ?></th>
-           <td width="67%"><input type="text" name="image" size="50" value="<?php echo $link_image; ?>" style="width: 95%" /></td>
+           <td width="67%"><input type="text" name="link_image" size="50" value="<?php echo $link->link_image; ?>" style="width: 95%" /></td>
          </tr>
 <tr>
            <th scope="row"><?php _e('RSS URI:') ?> </th>
-           <td><input name="rss_uri" type="text" id="rss_uri" value="<?php echo $link_rss_uri; ?>" size="50" style="width: 95%" /></td>
+           <td><input name="link_rss" type="text" id="rss_uri" value="<?php echo $link->link_rss; ?>" size="50" style="width: 95%" /></td>
          </tr>
          <tr>
            <th scope="row"><?php _e('Notes:') ?></th>
-           <td><textarea name="notes" cols="50" rows="10" style="width: 95%"><?php echo $link_notes; ?></textarea></td>
+           <td><textarea name="link_notes" cols="50" rows="10" style="width: 95%"><?php echo $link->link_notes; ?></textarea></td>
          </tr>
          <tr>
            <th scope="row"><?php _e('Rating:') ?></th>
-           <td><select name="rating" size="1">
+           <td><select name="link_rating" size="1">
 <?php
     for ($r = 0; $r < 10; $r++) {
       echo('            <option value="'.$r.'" ');
-      if ($link_rating == $r)
+      if ($link->link_rating == $r)
         echo 'selected="selected"';
       echo('>'.$r.'</option>');
@@ -469 +396 @@
            <th scope="row"><?php _e('Target') ?></th>
            <td><label>
-          <input type="radio" name="target" value="_blank"   <?php echo(($link_target == '_blank') ? 'checked="checked"' : ''); ?> />
+          <input type="radio" name="target" value="_blank"   <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
           <code>_blank</code></label><br />
 <label>
-<input type="radio" name="target" value="_top" <?php echo(($link_target == '_top') ? 'checked="checked"' : ''); ?> />
+<input type="radio" name="target" value="_top" <?php echo(($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
 <code>_top</code></label><br />
 <label>
-<input type="radio" name="target" value=""     <?php echo(($link_target == '') ? 'checked="checked"' : ''); ?> />
+<input type="radio" name="link_target" value=""     <?php echo(($link->link_target == '') ? 'checked="checked"' : ''); ?> />
 <?php _e('none') ?></label><br />
 <?php _e('(Note that the <code>target</code> attribute is illegal in XHTML 1.1 and 1.0 Strict.)') ?></td>
@@ -482 +409 @@
            <th scope="row"><?php _e('Visible:') ?></th>
            <td><label>
-             <input type="radio" name="visible" <?php if ($link_visible == 'Y') echo "checked='checked'"; ?> value="Y" />
+             <input type="radio" name="link_visible" <?php if ($link->link_visible == 'Y') echo "checked='checked'"; ?> value="Y" />
 <?php _e('Yes') ?></label><br /><label>
-<input type="radio" name="visible" <?php if ($link_visible == 'N') echo "checked='checked'"; ?> value="N" />
+<input type="radio" name="visible" <?php if ($link->link_visible == 'N') echo "checked='checked'"; ?> value="N" />
 <?php _e('No') ?></label></td>
          </tr>

trunk/wp-admin/profile-update.php

@@ -5 +5 @@
 check_admin_referer();
 
-$errors = update_user($user_ID);
+$errors = edit_user($user_ID);
 
 if (count($errors) != 0) {

trunk/wp-admin/user-edit.php

@@ -38 +38 @@
         $errors['head'] = __('You do not have permission to edit this user.');
 else
-        $errors = update_user($user_id);
+        $errors = edit_user($user_id);
 
 if(count($errors) == 0) {