Diff [4431:3503] for trunk – WordPress Trac

trunk/readme.html

-                      r4431
+                      r3503
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+    <title>WordPress &rsaquo; ReadMe</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" href="wp-admin/install.css" type="text/css" />
+<title>WordPress &rsaquo; ReadMe</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style type="text/css" media="screen">
+    <!--
+    html {
+        background: #eee;
+    }
+    body {
+        background: #fff;
+        color: #000;
+        font-family: Georgia, "Times New Roman", Times, serif;
+        margin-left: 25%;
+        margin-right: 25%;
+        padding: .2em 2em;
+    }
+    h1 {
+        color: #006;
+        font-size: 18px;
+        font-weight: lighter;
+    }
+    h2 {
+        font-size: 16px;
+    }
+    p, li, dt {
+        line-height: 140%;
+        padding-bottom: 2px;
+    }
+    ul, ol {
+        padding: 5px 5px 5px 20px;
+    }
+    -->
+    </style>
 </head>
 <body>
+<h1 id="logo" style="text-align: center">
+    <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
+    <br /> Version 2.1-ALPHA
+</h1>
+<p style="text-align: center">Semantic Personal Publishing Platform</p>
+<h1 style="text-align: center"><img alt="WordPress" src="http://wordpress.org/images/wordpress.gif" /> <br />
+    Version 2.0</h1>
+<p style="text-align: center"> Semantic Personal Publishing Platform </p>
 <h1>First Things First</h1>
 <p>Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I'm proud to be a part of. Thousands of hours have gone into WordPress, and we're dedicated to making it better every day. Thank you for making it part of your world.</p>
 <p style="text-align: right;">&#8212; Matt Mullenweg </p>
 <h1>Installation: Famous 5-minute install</h1>
+<h1 id="installation">Installation: Famous 5-minute install</h1>
 <ol>
     <li>Unzip the package in an empty directory</li>
 …
 <h2>Template Changes</h2>
 <p>If you have customized your templates you will probably have to make some changes to them. If you're converting your 1.2 or earlier templates, <a href="http://codex.wordpress.org/Upgrade_1.2_to_1.5">we've created a special guide for you</a>. </p>
 <h1>Online Resources</h1>
 <p>If you have any questions that aren't addressed in this document, please take advantage of WordPress' numerous online resources:</p>
 <dl>
     <dt><a href="http://codex.wordpress.org/">The WordPress Codex </a></dt>
         <dd>The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available. </dd>
+    <dd>The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available. </dd>
     <dt><a href="http://wordpress.org/development/">The Development Blog</a></dt>
         <dd>This is where you'll find the latest updates and news related to WordPress. Bookmark and check often. </dd>
+    <dd>This is where you'll find the latest updates and news related to WordPress. Bookmark and check often. </dd>
     <dt><a href="http://planet.wordpress.org/">WordPress Planet </a></dt>
         <dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web. </dd>
+    <dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web. </dd>
     <dt><a href="http://wordpress.org/support/">WordPress Support Forums</a></dt>
         <dd>If you've looked everywhere and still can't find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible. </dd>
+    <dd>If you've looked everywhere and still can't find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible. </dd>
     <dt><a href="http://codex.wordpress.org/IRC">WordPress IRC Channel</a></dt>
         <dd>Finally, there is an online chat channel that is used for discussion amoung people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (irc.freenode.net #wordpresss) </dd>
+    <dd>Finally, there is an online chat channel that is used for discussion amoung people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (irc.freenode.net #wordpresss) </dd>
 </dl>
 <h1>System Recommendations</h1>
+<h1 id="requirements">System Recommendations</h1>
 <ul>
     <li>PHP version <strong>4.1</strong> or higher</li>
 …
 <p>WordPress can <a href="http://codex.wordpress.org/Importing_from_other_blogging_software">import from a number of systems</a>. First you need to get WordPress installed and working as described above.</p>
 <h1>XML-RPC Interface</h1>
+<h1 id="templates">XML-RPC Interface</h1>
 <p>You can now post to your WordPress blog with tools like <a href="http://ecto.kung-foo.tv/">Ecto</a>, <a href="http://blogbuddy.sourceforge.net">BlogBuddy</a>, <a href="http://bloggar.com/">Bloggar</a>, <a href="http://www.ubique.ch/wapblogger/">WapBlogger</a> (post from your Wap cellphone!), <a href="http://radio.userland.com">Radio Userland</a> (which means you can use Radio's email-to-blog feature), <a href="http://www.zempt.com/">Zempt</a>, <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the Blogging APIs! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support">XML-RPC support on the Codex</a>.</p>
 <h1>Post via Email</h1>
+<p>You can post from an email client! To set this up go to your &quot;Writing&quot; options screen and fill in the connection details for your secret POP3 account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with Cron-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> URL.</p>
+<p>Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address dicrete. The script will <i>delete</i> emails that are successfully posted.</p>
+<p>You can post from an email client! To set this up go to your &quot;Writing&quot; options screen and fill in the connection details for your secret POP3 account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with Cron-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> URL. </p>
+<p> Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address dicrete. The script will <i>delete</i> emails that are successfully posted. </p>
+<h1 id="roles">User Roles </h1>
-<h1>User Roles</h1>
 <p>We've eliminated user levels in order to make way for the much more flexible roles system introduced in 2.0. You can <a href="http://codex.wordpress.org/Roles_and_Capabilities">read more about Roles and Capabilities on the Codex</a>.</p>

trunk/wp-admin/admin-db.php

-                      r4431
+                      r3503
     global $wpdb;
     $user_id = (int) $user_id;
     $query = "SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = $user_id ORDER BY ID DESC";
+    $query = "SELECT ID, post_title FROM $wpdb->posts WHERE post_status = 'draft' AND post_author = $user_id ORDER BY ID DESC";
     $query = apply_filters('get_users_drafts', $query);
     return $wpdb->get_results( $query );
 …
     $editable = get_editable_user_ids( $user_id );
     if( !$editable ) {
         $other_drafts = '';
     } else {
         $editable = join(',', $editable);
         $other_drafts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author IN ($editable) AND post_author != '$user_id' ");
+        $other_drafts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_status = 'draft' AND post_author IN ($editable) AND post_author != '$user_id' ");
+    }
 …
     } else {
         $editable = join(',', $editable);
         $authors = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name" );
+        $authors = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($editable)" );
+    }
 …
 function get_editable_user_ids( $user_id, $exclude_zeros = true ) {
     global $wpdb;
     $user = new WP_User( $user_id );
     if ( ! $user->has_cap('edit_others_posts') ) {
         if ( $user->has_cap('edit_posts') || $exclude_zeros == false )
 …
     if ( $exclude_zeros )
         $query .= " AND meta_value != '0'";
     return $wpdb->get_col( $query );
+}
 …
     extract($catarr);
-    if( trim( $cat_name ) == '' )
-        return 0;
     $cat_ID = (int) $cat_ID;
 …
         $update = false;
     $cat_name = apply_filters('pre_category_name', $cat_name);
+    $cat_name = wp_specialchars($cat_name);
     if (empty ($category_nicename))
         $category_nicename = sanitize_title($cat_name);
     else
         $category_nicename = sanitize_title($category_nicename);
-    $category_nicename = apply_filters('pre_category_nicename', $category_nicename);
     if (empty ($category_description))
         $category_description = '';
+    $category_description = apply_filters('pre_category_description', $category_description);
+    $category_parent = (int) $category_parent;
+    if ( empty($category_parent) || !get_category( $category_parent ) || $category_parent == $cat_ID )
+    if (empty ($category_parent))
         $category_parent = 0;
-    if ( isset($posts_private) )
-        $posts_private = (int) $posts_private;
-    else
-        $posts_private = 0;
-    if ( isset($links_private) )
-        $links_private = (int) $links_private;
-    else
-        $links_private = 0;
     if (!$update) {
         $wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_description, category_parent, links_private, posts_private) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$category_parent', '$links_private', '$posts_private')");
+        $wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_description, category_parent) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$category_parent')");
         $cat_ID = $wpdb->insert_id;
     } else {
         $wpdb->query ("UPDATE $wpdb->categories SET cat_name = '$cat_name', category_nicename = '$category_nicename', category_description = '$category_description', category_parent = '$category_parent', links_private = '$links_private', posts_private = '$posts_private' WHERE cat_ID = '$cat_ID'");
+    }
+        $wpdb->query ("UPDATE $wpdb->categories SET cat_name = '$cat_name', category_nicename = '$category_nicename', category_description = '$category_description', category_parent = '$category_parent' WHERE cat_ID = '$cat_ID'");
+    }
     if ( $category_nicename == '' ) {
         $category_nicename = sanitize_title($cat_name, $cat_ID );
 …
     // Don't delete the default cat.
     if ( $cat_ID == get_option('default_category') )
+    if (1 == $cat_ID)
         return 0;
-    if ( $cat_ID == get_option('default_link_category') )
-        return 0;
     $category = get_category($cat_ID);
 …
     // Delete the category.
+    if ( !$wpdb->query("DELETE FROM $wpdb->categories WHERE cat_ID = '$cat_ID'") )
+        return 0;
+    $wpdb->query("DELETE FROM $wpdb->categories WHERE cat_ID = '$cat_ID'");
     // Update children to point to new parent.
     $wpdb->query("UPDATE $wpdb->categories SET category_parent = '$parent' WHERE category_parent = '$cat_ID'");
+    // Only set posts and links to the default category if they're not in another category already.
+    $default_cat = get_option('default_category');
+    $posts = $wpdb->get_col("SELECT post_id FROM $wpdb->post2cat WHERE category_id='$cat_ID'");
+    if ( is_array($posts) ) foreach ($posts as $post_id) {
+        $cats = wp_get_post_categories($post_id);
+        if ( 1 == count($cats) )
+            $cats = array($default_cat);
+        else
+            $cats = array_diff($cats, array($cat_ID));
+        wp_set_post_categories($post_id, $cats);
+    }
+    $default_link_cat = get_option('default_link_category');
+    $links = $wpdb->get_col("SELECT link_id FROM $wpdb->link2cat WHERE category_id='$cat_ID'");
+    if ( is_array($links) ) foreach ($links as $link_id) {
+        $cats = wp_get_link_cats($link_id);
+        if ( 1 == count($cats) )
+            $cats = array($default_link_cat);
+        else
+            $cats = array_diff($cats, array($cat_ID));
+        wp_set_link_cats($link_id, $cats);
+    }
+    // TODO: Only set categories to general if they're not in another category already
+    $wpdb->query("UPDATE $wpdb->post2cat SET category_id='1' WHERE category_id='$cat_ID'");
     wp_cache_delete($cat_ID, 'category');
     wp_cache_delete('all_category_ids', 'category');
 …
     if ($post_id)
         wp_set_post_categories($post_id, $cat_ids);
+        wp_set_post_cats('', $post_id, $cat_ids);
     return $cat_ids;
 …
     // FINALLY, delete user
-    do_action('delete_user', $id);
     $wpdb->query("DELETE FROM $wpdb->users WHERE ID = $id");
     $wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = '$id'");
 …
     wp_cache_delete($user->user_login, 'userlogins');
+    do_action('delete_user', $id);
     return true;
+}
+function wp_revoke_user($id) {
+    $id = (int) $id;
+    $user = new WP_User($id);
+    $user->remove_all_caps();
+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 wp_insert_link($linkdata) {
     global $wpdb, $current_user;
     extract($linkdata);
     $update = false;
     if ( !empty($link_id) )
         $update = true;
-    if( trim( $link_name ) == '' )
-        return 0;
-    $link_name = apply_filters('pre_link_name', $link_name);
-    if( trim( $link_url ) == '' )
-        return 0;
-    $link_url = apply_filters('pre_link_url', $link_url);
     if ( empty($link_rating) )
+        $link_rating = 0;
+    else
+        $link_rating = (int) $link_rating;
+    if ( empty($link_image) )
+        $link_image = '';
+    $link_image = apply_filters('pre_link_image', $link_image);
+        $link_rating = 0;
     if ( empty($link_target) )
+        $link_target = '';
+    $link_target = apply_filters('pre_link_target', $link_target);
+        $link_target = '';
     if ( empty($link_visible) )
         $link_visible = 'Y';
+    $link_visibile = preg_replace('/[^YNyn]/', '', $link_visible);
     if ( empty($link_owner) )
         $link_owner = $current_user->id;
-    else
-        $link_owner = (int) $link_owner;
     if ( empty($link_notes) )
         $link_notes = '';
-    $link_notes = apply_filters('pre_link_notes', $link_notes);
-    if ( empty($link_description) )
-        $link_description = '';
-    $link_description = apply_filters('pre_link_description', $link_description);
-    if ( empty($link_rss) )
-        $link_rss = '';
-    $link_rss = apply_filters('pre_link_rss', $link_rss);
-    if ( empty($link_rel) )
-        $link_rel = '';
-    $link_rel = apply_filters('pre_link_rel', $link_rel);
-    // Make sure we set a valid category
-    if (0 == count($link_category) || !is_array($link_category)) {
-        $link_category = array(get_option('default_link_category'));
+    }
     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_target='$link_target', link_category='$link_category',
             link_visible='$link_visible', link_description='$link_description',
             link_rating='$link_rating', link_rel='$link_rel',
 …
             WHERE link_id='$link_id'");
     } else {
         $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES('$link_url','$link_name', '$link_image', '$link_target', '$link_description', '$link_visible', '$link_owner', '$link_rating', '$link_rel', '$link_notes', '$link_rss')");
+        $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;
+    }
+    wp_set_link_cats($link_id, $link_category);
     if ( $update )
         do_action('edit_link', $link_id);
 …
     $link_id = (int) $linkdata['link_id'];
     $link = get_link($link_id, ARRAY_A);
     // Escape data pulled from DB.
     $link = add_magic_quotes($link);
+    // Passed link category list overwrites existing category list if not empty.
+    if ( isset($linkdata['link_category']) && is_array($linkdata['link_category'])
+             && 0 != count($linkdata['link_category']) )
+        $link_cats = $linkdata['link_category'];
+    else
+        $link_cats = $link['link_category'];
     // Merge old and new fields with new fields overwriting old ones.
     $linkdata = array_merge($link, $linkdata);
-    $linkdata['link_category'] = $link_cats;
     return wp_insert_link($linkdata);
 …
     do_action('delete_link', $link_id);
+    $categories = wp_get_link_cats($link_id);
+    if( is_array( $categories ) ) {
+        foreach ( $categories as $category ) {
+            $wpdb->query("UPDATE $wpdb->categories SET link_count = link_count - 1 WHERE cat_ID = '$category'");
+            wp_cache_delete($category, 'category');
+        }
+    }
+    $wpdb->query("DELETE FROM $wpdb->link2cat WHERE link_id = '$link_id'");
+    return $wpdb->query("DELETE FROM $wpdb->links WHERE link_id = '$link_id'");
+}
+function wp_get_link_cats($link_ID = 0) {
+    global $wpdb;
+    $sql = "SELECT category_id
+        FROM $wpdb->link2cat
+        WHERE link_id = $link_ID
+        ORDER BY category_id";
+    $result = $wpdb->get_col($sql);
+    if ( !$result )
+        $result = array();
+    return array_unique($result);
+}
+function wp_set_link_cats($link_ID = 0, $link_categories = array()) {
+    global $wpdb;
+    // If $link_categories isn't already an array, make it one:
+    if (!is_array($link_categories) || 0 == count($link_categories))
+        $link_categories = array(get_option('default_link_category'));
+    $link_categories = array_unique($link_categories);
+    // First the old categories
+    $old_categories = $wpdb->get_col("
+        SELECT category_id
+        FROM $wpdb->link2cat
+        WHERE link_id = $link_ID");
+    if (!$old_categories) {
+        $old_categories = array();
+    } else {
+        $old_categories = array_unique($old_categories);
+    }
+    // Delete any?
+    $delete_cats = array_diff($old_categories,$link_categories);
+    if ($delete_cats) {
+        foreach ($delete_cats as $del) {
+            $wpdb->query("
+                DELETE FROM $wpdb->link2cat
+                WHERE category_id = $del
+                    AND link_id = $link_ID
+                ");
+        }
+    }
+    // Add any?
+    $add_cats = array_diff($link_categories, $old_categories);
+    if ($add_cats) {
+        foreach ($add_cats as $new_cat) {
+            $wpdb->query("
+                INSERT INTO $wpdb->link2cat (link_id, category_id)
+                VALUES ($link_ID, $new_cat)");
+        }
+    }
+    // Update category counts.
+    $all_affected_cats = array_unique(array_merge($link_categories, $old_categories));
+    foreach ( $all_affected_cats as $cat_id ) {
+        $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->link2cat, $wpdb->links WHERE $wpdb->links.link_id = $wpdb->link2cat.link_id AND category_id = '$cat_id'");
+        $wpdb->query("UPDATE $wpdb->categories SET link_count = '$count' WHERE cat_ID = '$cat_id'");
+        wp_cache_delete($cat_id, 'category');
+    }
+}   // wp_set_link_cats()
+    return $wpdb->query("DELETE FROM $wpdb->links WHERE link_id = '$link_id'");
+}
 function post_exists($title, $content = '', $post_date = '') {

trunk/wp-admin/admin-footer.php

-                      r4431
+                      r3503
+<div id="footer">
+<p class="logo"><a href="http://wordpress.org/" id="wordpress-logo"><img src="images/wordpress-logo.png" alt="WordPress" /></a></p>
+<p class="docs"><?php _e('<a href="http://codex.wordpress.org/">Documentation</a>'); ?> &#8212; <?php _e('<a href="http://wordpress.org/support/">Support Forums</a>'); ?><br />
+<?php bloginfo('version'); ?> &#8212; <?php printf(__('%s seconds'), timer_stop(0, 2)); ?></p>
+<div id="footer"><p><a href="http://wordpress.org/" id="wordpress-logo"><img src="images/wordpress-logo.png" alt="WordPress" /></a></p>
+<p>
+<a href="http://codex.wordpress.org/"><?php _e('Documentation'); ?></a> &#8212; <a href="http://wordpress.org/support/"><?php _e('Support Forums'); ?></a> <br />
+<?php bloginfo('version'); ?> &#8212; <?php printf(__('%s seconds'), number_format(timer_stop(), 2)); ?>
+</p>
 </div>
 <?php do_action('admin_footer', ''); ?>
 <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
+<?php
+if ( (substr(php_sapi_name(), 0, 3) == 'cgi') && spawn_pinger() ) {
+    echo '<iframe id="pingcheck" src="' . get_settings('siteurl') .'/wp-admin/execute-pings.php?time=' . time() . '" style="border:none;width:1px;height:1px;"></iframe>';
+}
+?>
 </body>
 </html>

trunk/wp-admin/admin-functions.php

-                      r4431
+                      r3503
 <?php
+// Creates a new post from the "Write Post" form using $_POST information.
 function write_post() {
-    $result = wp_write_post();
-    if( is_wp_error($result) )
-        wp_die( $result->get_error_message() );
-    else
-        return $result;
+}
-// Creates a new post from the "Write Post" form using $_POST information.
-function wp_write_post() {
     global $user_ID;
+    if ( 'page' == $_POST['post_type'] ) {
+        if ( !current_user_can('edit_pages') )
+            return new WP_Error('edit_pages', __('You are not allowed to create pages on this blog.'));
+    } else {
+        if ( !current_user_can('edit_posts') )
+            return new WP_Error('edit_posts', __('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.
 …
     if (!empty ($_POST['post_author_override'])) {
         $_POST['post_author'] = (int) $_POST['post_author_override'];
     } else {
+    } else
         if (!empty ($_POST['post_author'])) {
             $_POST['post_author'] = (int) $_POST['post_author'];
 …
+        }
+    }
+    if ($_POST['post_author'] != $_POST['user_ID']) {
+        if ( 'page' == $_POST['post_type'] ) {
+            if ( !current_user_can('edit_others_pages') )
+                return new WP_Error('edit_others_pages', __('You cannot create pages as this user.'));
+        } else {
+            if ( !current_user_can('edit_others_posts') )
+                return new WP_Error('edit_others_posts', __('You cannot post as this user.'));
+        }
+    }
+    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['advanced'])
         $_POST['post_status'] = 'draft';
+    if ( 'page' == $_POST['post_type'] ) {
+        if ('publish' == $_POST['post_status'] && !current_user_can('publish_pages'))
+            $_POST['post_status'] = 'draft';
+    } else {
+        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']))
+        $_POST['ping_status'] = 'closed';
+    if (!empty ($_POST['edit_date'])) {
+        $aa = $_POST['aa'];
+        $mm = $_POST['mm'];
+        $jj = $_POST['jj'];
+        $hh = $_POST['hh'];
+        $mn = $_POST['mn'];
+        $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;
+        $_POST['post_date'] = sprintf("%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss);
+        $_POST['post_date_gmt'] = get_gmt_from_date($_POST['post_date']);
+    }
+    // Create the post.
+    $post_ID = wp_insert_post($_POST);
+    add_meta($post_ID);
+    // Reunite any orphaned attachments with their parent
+    if ( $_POST['temp_ID'] )
+        relocate_children($_POST['temp_ID'], $post_ID);
+    // Now that we have an ID we can fix any attachment anchor hrefs
+    fix_attachment_links($post_ID);
+    return $post_ID;
+}
+// Move child posts to a new parent
+function relocate_children($old_ID, $new_ID) {
+    global $wpdb;
+    $old_ID = (int) $old_ID;
+    $new_ID = (int) $new_ID;
+    return $wpdb->query("UPDATE $wpdb->posts SET post_parent = $new_ID WHERE post_parent = $old_ID");
+}
+// Replace hrefs of attachment anchors with up-to-date permalinks.
+function fix_attachment_links($post_ID) {
+    global $wp_rewrite;
+    $post = & get_post($post_ID, ARRAY_A);
+    $search = "#<a[^>]+rel=('|\")[^'\"]*attachment[^>]*>#ie";
+    // See if we have any rel="attachment" links
+    if ( 0 == preg_match_all($search, $post['post_content'], $anchor_matches, PREG_PATTERN_ORDER) )
+        return;
+    $i = 0;
+    $search = "#[\s]+rel=(\"|')(.*?)wp-att-(\d+)\\1#i";
+    foreach ( $anchor_matches[0] as $anchor ) {
+        if ( 0 == preg_match($search, $anchor, $id_matches) )
+            continue;
+        $id = $id_matches[3];
+        // While we have the attachment ID, let's adopt any orphans.
+        $attachment = & get_post($id, ARRAY_A);
+        if ( ! empty($attachment) && ! is_object(get_post($attachment['post_parent'])) ) {
+            $attachment['post_parent'] = $post_ID;
+            // Escape data pulled from DB.
+            $attachment = add_magic_quotes($attachment);
+            wp_update_post($attachment);
+        }
+        $post_search[$i] = $anchor;
+        $post_replace[$i] = preg_replace("#href=(\"|')[^'\"]*\\1#e", "stripslashes('href=\\1').get_attachment_link($id).stripslashes('\\1')", $anchor);
+        ++$i;
+    }
+    $post['post_content'] = str_replace($post_search, $post_replace, $post['post_content']);
+    // Escape data pulled from DB.
+    $post = add_magic_quotes($post);
+    return wp_update_post($post);
+}
+// Update an existing post with values provided in $_POST.
+function edit_post() {
+    global $user_ID;
+    $post_ID = (int) $_POST['post_ID'];
+    if ( 'page' == $_POST['post_type'] ) {
+        if ( !current_user_can('edit_page', $post_ID) )
+            wp_die(__('You are not allowed to edit this page.'));
+    } else {
+        if ( !current_user_can('edit_post', $post_ID) )
+            wp_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_parent'] = $_POST['parent_id'];
+    $_POST['to_ping'] = $_POST['trackback_url'];
+    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']) {
+        if ( 'page' == $_POST['post_type'] ) {
+            if ( !current_user_can('edit_others_pages') )
+                wp_die(__('You cannot edit pages as this user.'));
+        } else {
+            if ( !current_user_can('edit_others_posts') )
+                wp_die(__('You cannot edit posts as this user.'));
+        }
+    }
+    // What to do based on which button they pressed
+    if ('' != $_POST['saveasdraft'])
+    if ('' != $_POST['savepage'])
+        $_POST['post_status'] = 'static';
+    if ('publish' == $_POST['post_status'] && !current_user_can('publish_posts'))
         $_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 ( 'page' == $_POST['post_type'] ) {
+        if ('publish' == $_POST['post_status'] && !current_user_can('edit_published_pages'))
+            $_POST['post_status'] = 'draft';
+    } else {
+        if ('publish' == $_POST['post_status'] && !current_user_can('edit_published_posts'))
+            $_POST['post_status'] = 'draft';
+    }
+    if (!isset ($_POST['comment_status']))
+        $_POST['comment_status'] = 'closed';
+    if (!isset ($_POST['ping_status']))
+        $_POST['ping_status'] = 'closed';
+    if ('static' == $_POST['post_status'] && !current_user_can('edit_pages'))
+        die(__('This user cannot edit pages.'));
     if (!empty ($_POST['edit_date'])) {
 …
+    }
+    // Create the post.
+    $post_ID = wp_insert_post($_POST);
+    add_meta($post_ID);
+    // Reunite any orphaned attachments with their parent
+    if ( $_POST['temp_ID'] )
+        relocate_children($_POST['temp_ID'], $post_ID);
+    // Now that we have an ID we can fix any attachment anchor hrefs
+    fix_attachment_links($post_ID);
+    return $post_ID;
+}
+// Move child posts to a new parent
+function relocate_children($old_ID, $new_ID) {
+    global $wpdb;
+    $old_ID = (int) $old_ID;
+    $new_ID = (int) $new_ID;
+    return $wpdb->query("UPDATE $wpdb->posts SET post_parent = $new_ID WHERE post_parent = $old_ID");
+}
+// Replace hrefs of attachment anchors with up-to-date permalinks.
+function fix_attachment_links($post_ID) {
+    global $wp_rewrite;
+    $post = & get_post($post_ID);
+    $search = "#<a[^>]+rel=('|\")[^'\"]*attachment[^>]*>#ie";
+    // See if we have any rel="attachment" links
+    if ( 0 == preg_match_all($search, $post->post_content, $anchor_matches, PREG_PATTERN_ORDER) )
+        return;
+    $i = 0;
+    $search = "# id=(\"|')p(\d+)\\1#i";
+    foreach ( $anchor_matches[0] as $anchor ) {
+        if ( 0 == preg_match($search, $anchor, $id_matches) )
+            continue;
+        $id = $id_matches[2];
+        // While we have the attachment ID, let's adopt any orphans.
+        $attachment = & get_post($id);
+        if ( ! is_object(get_post($attachment->post_parent)) ) {
+            $attachment->post_parent = $post_ID;
+            wp_update_post($attachment);
+        }
+        $post_search[$i] = $anchor;
+        $post_replace[$i] = preg_replace("#href=(\"|')[^'\"]*\\1#e", "stripslashes('href=\\1').get_attachment_link($id).stripslashes('\\1')", $anchor);
+        ++$i;
+    }
+    $post->post_content = str_replace($post_search, $post_replace, $post->post_content);
+    return wp_update_post($post);
+}
+// Update an existing post with values provided in $_POST.
+function edit_post() {
+    global $user_ID;
+    $post_ID = (int) $_POST['post_ID'];
+    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_parent'] = $_POST['parent_id'];
+    $_POST['to_ping'] = $_POST['trackback_url'];
+    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.'));
+    // 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'))
+        $_POST['post_status'] = 'draft';
+    if ('static' == $_POST['post_status'] && !current_user_can('edit_pages'))
+        die(__('This user cannot edit pages.'));
+    if (!isset ($_POST['comment_status']))
+        $_POST['comment_status'] = 'closed';
+    if (!isset ($_POST['ping_status']))
+        $_POST['ping_status'] = 'closed';
+    if (!empty ($_POST['edit_date'])) {
+        $aa = $_POST['aa'];
+        $mm = $_POST['mm'];
+        $jj = $_POST['jj'];
+        $hh = $_POST['hh'];
+        $mn = $_POST['mn'];
+        $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;
+        $_POST['post_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
+        $_POST['post_date_gmt'] = get_gmt_from_date("$aa-$mm-$jj $hh:$mn:$ss");
+    }
     // Meta Stuff
     if ($_POST['meta']) {
 …
             update_meta($key, $value['key'], $value['value']);
+    }
     if ($_POST['deletemeta']) {
         foreach ($_POST['deletemeta'] as $key => $value)
 …
     if (!current_user_can('edit_post', $comment_post_ID))
         wp_die(__('You are not allowed to edit comments on this post, so you cannot edit this comment.'));
+        die(__('You are not allowed to edit comments on this post, so you cannot edit this comment.'));
     $_POST['comment_author'] = $_POST['newcomment_author'];
 …
 // Get an existing post and format it for editing.
 function get_post_to_edit($id) {
+    global $richedit;
+    $richedit = ( 'true' == get_user_option('rich_editing') ) ? true : false;
     $post = get_post($id);
     $post->post_content = format_to_edit($post->post_content, user_can_richedit());
+    $post->post_content = format_to_edit($post->post_content, $richedit);
     $post->post_content = apply_filters('content_edit_pre', $post->post_content);
 …
     $post->post_title = apply_filters('title_edit_pre', $post->post_title);
+    $post->post_password = format_to_edit($post->post_password);
+    if ($post->post_type == 'page')
+    if ($post->post_status == 'static')
         $post->page_template = get_post_meta($id, '_wp_page_template', true);
 …
     $post->post_status = 'draft';
     $post->comment_status = get_option('default_comment_status');
     $post->ping_status = get_option('default_ping_status');
     $post->post_pingback = get_option('default_pingback_flag');
     $post->post_category = get_option('default_category');
+    $post->comment_status = get_settings('default_comment_status');
+    $post->ping_status = get_settings('default_ping_status');
+    $post->post_pingback = get_settings('default_pingback_flag');
+    $post->post_category = get_settings('default_category');
     $post->post_content = apply_filters('default_content', $post_content);
     $post->post_title = apply_filters('default_title', $post_title);
 …
 function get_comment_to_edit($id) {
+    global $richedit;
+    $richedit = ( 'true' == get_user_option('rich_editing') ) ? true : false;
     $comment = get_comment($id);
     $comment->comment_content = format_to_edit($comment->comment_content, user_can_richedit());
+    $comment->comment_content = format_to_edit($comment->comment_content, $richedit);
     $comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content);
 …
+}
-function wp_dropdown_roles( $default = false ) {
-    global $wp_roles;
-    $r = '';
-    foreach($wp_roles->role_names as $role => $name)
-        if ( $default == $role ) // Make default first in list
-            $p = "\n\t<option selected='selected' value='$role'>$name</option>";
-        else
-            $r .= "\n\t<option value='$role'>$name</option>";
-    echo $p . $r;
+}
-function get_user_to_edit($user_id) {
-    $user = new WP_User($user_id);
-    $user->user_login = wp_specialchars($user->user_login, 1);
-    $user->user_email = wp_specialchars($user->user_email, 1);
-    $user->user_url = wp_specialchars($user->user_url, 1);
-    $user->first_name = wp_specialchars($user->first_name, 1);
-    $user->last_name = wp_specialchars($user->last_name, 1);
-    $user->display_name = wp_specialchars($user->display_name, 1);
-    $user->nickname = wp_specialchars($user->nickname, 1);
-    $user->aim = wp_specialchars($user->aim, 1);
-    $user->yim = wp_specialchars($user->yim, 1);
-    $user->jabber = wp_specialchars($user->jabber, 1);
-    $user->description = wp_specialchars($user->description);
-    return $user;
+}
 // Creates a new user from the "Users" form using $_POST information.
 function add_user() {
+    if ( func_num_args() ) { // The hackiest hack that ever did hack
+        global $current_user, $wp_roles;
+        $user_id = func_get_arg(0);
+        if (isset ($_POST['role'])) {
+            if($user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap('edit_users')) {
+                $user = new WP_User($user_id);
+                $user->set_role($_POST['role']);
+            }
+        }
+    } else {
+        add_action('user_register', 'add_user'); // See above
+        return edit_user();
+    }
+    return edit_user();
+}
 function edit_user($user_id = 0) {
     global $current_user, $wp_roles, $wpdb;
     if ($user_id != 0) {
         $update = true;
 …
         $pass2 = $_POST['pass2'];
     if (isset ($_POST['role']) && current_user_can('edit_users')) {
+    if (isset ($_POST['role'])) {
         if($user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap('edit_users'))
             $user->role = $_POST['role'];
 …
         $user->display_name = wp_specialchars(trim($_POST['display_name']));
     if (isset ($_POST['description']))
         $user->description = trim($_POST['description']);
+        $user->description = wp_specialchars(trim($_POST['description']));
     if (isset ($_POST['jabber']))
         $user->jabber = wp_specialchars(trim($_POST['jabber']));
 …
         $user->yim = wp_specialchars(trim($_POST['yim']));
     $errors = new WP_Error();
+    $errors = array ();
     /* checking that username has been typed */
     if ($user->user_login == '')
         $errors->add('user_login', __('<strong>ERROR</strong>: Please enter a username.'));
+        $errors['user_login'] = __('<strong>ERROR</strong>: Please enter a username.');
     /* checking the password has been typed twice */
     do_action_ref_array('check_passwords', array ($user->user_login, & $pass1, & $pass2));
+    do_action('check_passwords', array ($user->user_login, & $pass1, & $pass2));
     if (!$update) {
         if ($pass1 == '' || $pass2 == '')
             $errors->add('pass', __('<strong>ERROR</strong>: Please enter your password twice.'));
+            $errors['pass'] = __('<strong>ERROR</strong>: Please enter your password twice.');
     } else {
         if ((empty ($pass1) && !empty ($pass2)) || (empty ($pass2) && !empty ($pass1)))
             $errors->add('pass', __("<strong>ERROR</strong>: you typed your new password only once."));
+            $errors['pass'] = __("<strong>ERROR</strong>: you typed your new password only once.");
+    }
     /* Check for "\" in password */
     if( strpos( " ".$pass1, "\\" ) )
         $errors->add('pass', __('<strong>ERROR</strong>: Passwords may not contain the character "\\".'));
+        $errors['pass'] = __('<strong>ERROR</strong>: Passwords may not contain the character "\\".');
     /* checking the password has been typed twice the same */
     if ($pass1 != $pass2)
         $errors->add('pass', __('<strong>ERROR</strong>: Please type the same password in the two password fields.'));
+        $errors['pass'] = __('<strong>ERROR</strong>: Please type the same password in the two password fields.');
     if (!empty ($pass1))
 …
     if ( !validate_username($user->user_login) )
         $errors->add('user_login', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.'));
+        $errors['user_login'] = __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.');
     if (!$update && username_exists($user->user_login))
         $errors->add('user_login', __('<strong>ERROR</strong>: This username is already registered, please choose another one.'));
+        $errors['user_login'] = __('<strong>ERROR</strong>: This username is already registered, please choose another one.');
     /* checking e-mail address */
     if (empty ($user->user_email)) {
         $errors->add('user_email', __("<strong>ERROR</strong>: please type an e-mail address"));
+        $errors['user_email'] = __("<strong>ERROR</strong>: please type an e-mail address");
     } else
         if (!is_email($user->user_email)) {
             $errors->add('user_email', __("<strong>ERROR</strong>: the email address isn't correct"));
+        }
     if ( $errors->get_error_codes() )
+            $errors['user_email'] = __("<strong>ERROR</strong>: the email address isn't correct");
+        }
+    if (count($errors) != 0)
         return $errors;
 …
         wp_new_user_notification($user_id);
+    }
+    return $user_id;
+    return $errors;
+}
 …
 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_image = wp_specialchars($link->link_image, 1);
+    $link->link_description = wp_specialchars($link->link_description, 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, 1);
+    $link->link_rel = wp_specialchars($link->link_rel, 1);
+    $link->post_category = $link->link_category;
+    $link->link_rss = wp_specialchars($link->link_rss);
     return $link;
+}
 …
     else
         $link->link_url = '';
     if ( isset($_GET['name']) )
         $link->link_name = wp_specialchars($_GET['name'], 1);
     else
         $link->link_name = '';
+    $link->link_visible = 'Y';
     return $link;
+}
 function add_link() {
     return edit_link();
+    return edit_link();
+}
 function edit_link($link_id = '') {
     if (!current_user_can('manage_links'))
         wp_die(__("Cheatin' uh ?"));
+        die(__("Cheatin' uh ?"));
     $_POST['link_url'] = wp_specialchars($_POST['link_url']);
 …
     $_POST['link_image'] = wp_specialchars($_POST['link_image']);
     $_POST['link_rss'] = wp_specialchars($_POST['link_rss']);
+    $_POST['link_category'] = $_POST['post_category'];
+    $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) ) {
 …
 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");
+    return $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent ORDER BY category_count DESC LIMIT 100");
+}
 …
 function get_nested_categories($default = 0, $parent = 0) {
     global $post_ID, $link_id, $mode, $wpdb;
+    global $post_ID, $mode, $wpdb;
     if ($post_ID) {
 …
             $checked_categories[] = $default;
+        }
+    } else if ($link_id) {
+        $checked_categories = $wpdb->get_col("
+             SELECT category_id
+             FROM $wpdb->categories, $wpdb->link2cat
+             WHERE $wpdb->link2cat.category_id = cat_ID AND $wpdb->link2cat.link_id = '$link_id'
+             ");
+        if (count($checked_categories) == 0) {
+            // No selected categories, strange
+            $checked_categories[] = $default;
+        }
     } else {
         $checked_categories[] = $default;
 …
+        }
+    }
     usort($result, 'sort_cats');
 …
 function write_nested_categories($categories) {
     foreach ($categories as $category) {
         echo '<li id="category-', $category['cat_ID'], '"><label for="in-category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="in-category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : ""), '/> ', wp_specialchars($category['cat_name']), "</label></li>\n";
         if ( $category['children'] ) {
             echo "<ul>\n";
+        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 "</ul>\n";
+            echo "</span>\n";
+        }
+    }
 …
+}
-function return_link_categories_list($parent = 0) {
-    global $wpdb;
-    return $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent ORDER BY link_count DESC");
+}
-function get_nested_link_categories( $default = 0, $parent = 0 ) {
-    global $post_ID, $link_id, $mode, $wpdb;
-    if ($link_id) {
-        $checked_categories = $wpdb->get_col("
-             SELECT category_id
-             FROM $wpdb->categories, $wpdb->link2cat
-             WHERE $wpdb->link2cat.category_id = cat_ID AND $wpdb->link2cat.link_id = '$link_id'
-             ");
-        if (count($checked_categories) == 0) {
-            // No selected categories, strange
-            $checked_categories[] = $default;
+        }
-    } else {
-        $checked_categories[] = $default;
+    }
-    $cats = return_link_categories_list($parent);
-    $result = array ();
-    if (is_array($cats)) {
-        foreach ($cats as $cat) {
-            $result[$cat]['children'] = get_nested_link_categories($default, $cat);
-            $result[$cat]['cat_ID'] = $cat;
-            $result[$cat]['checked'] = in_array($cat, $checked_categories);
-            $result[$cat]['cat_name'] = get_the_category_by_ID($cat);
+        }
+    }
-    usort($result, 'sort_cats');
-    return $result;
+}
-function dropdown_link_categories($default = 0) {
-    write_nested_categories(get_nested_link_categories($default));
+}
 // Dandy new recursive multiple category stuff.
 function cat_rows($parent = 0, $level = 0, $categories = 0) {
+    global $wpdb, $class;
     if (!$categories)
         $categories = get_categories('hide_empty=0');
+        $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_name");
     if ($categories) {
         foreach ($categories as $category) {
             if ($category->category_parent == $parent) {
+                echo "\t" . _cat_row( $category, $level );
+                $category->cat_name = wp_specialchars($category->cat_name);
+                $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>";
+                    $default_cat_id = get_option('default_category');
+                    if ($category->cat_ID != $default_cat_id)
+                        $edit .= "<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 .= "<td style='text-align:center'>".__("Default");
+                }
+                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);
+            }
 …
+}
+function _cat_row( $category, $level, $name_override = false ) {
+    global $class;
+    $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>";
+        $default_cat_id = get_option('default_category');
+        $default_link_cat_id = get_option('default_link_category');
+        if ( ($category->cat_ID != $default_cat_id) && ($category->cat_ID != $default_link_cat_id) )
+            $edit .= "<td><a href='" . wp_nonce_url("categories.php?action=delete&amp;cat_ID=$category->cat_ID", 'delete-category_' . $category->cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf(__("You are about to delete the category &quot;%s&quot;.\\nAll of its posts will go into the default category of &quot;%s&quot;\\nAll of its bookmarks will go into the default category of &quot;%s&quot;.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), js_escape($category->cat_name), js_escape(get_catname($default_cat_id)), js_escape(get_catname($default_link_cat_id))) . "' );\" class='delete'>".__('Delete')."</a>";
+        else
+            $edit .= "<td style='text-align:center'>".__("Default");
+    } else
+        $edit = '';
+    $class = ( ( defined('DOING_AJAX') && DOING_AJAX ) || " class='alternate'" == $class ) ? '' : " class='alternate'";
+    $category->category_count = number_format( $category->category_count );
+    $category->link_count = number_format( $category->link_count );
+    return "<tr id='cat-$category->cat_ID'$class>
+        <th scope='row' style='text-align: center'>$category->cat_ID</th>
+        <td>" . ( $name_override ? $name_override : $pad . ' ' . $category->cat_name ) . "</td>
+        <td>$category->category_description</td>
+        <td align='center'>$category->category_count</td>
+        <td align='center'>$category->link_count</td>
+        <td>$edit</td>\n\t</tr>\n";
+}
+function page_rows($parent = 0, $level = 0, $pages = 0, $hierarchy = true) {
+function page_rows($parent = 0, $level = 0, $pages = 0) {
     global $wpdb, $class, $post;
     if (!$pages)
+        $pages = get_pages('sort_column=menu_order');
+    if (! $pages)
+        return false;
+    foreach ($pages as $post) {
+        setup_postdata($post);
+        if ( $hierarchy && ($post->post_parent != $parent) )
+            continue;
+        $post->post_title = wp_specialchars($post->post_title);
+        $pad = str_repeat('&#8212; ', $level);
+        $id = $post->ID;
+        $class = ('alternate' == $class) ? '' : 'alternate';
+        $pages = $wpdb->get_results("SELECT * FROM $wpdb->posts WHERE post_status = 'static' ORDER BY menu_order");
+    if ($pages) {
+        foreach ($pages as $post) {
+            start_wp();
+            if ($post->post_parent == $parent) {
+                $post->post_title = wp_specialchars($post->post_title);
+                $pad = str_repeat('&#8212; ', $level);
+                $id = $post->ID;
+                $class = ('alternate' == $class) ? '' : 'alternate';
 ?>
   <tr id='page-<?php echo $id; ?>' class='<?php echo $class; ?>'>
     <th scope="row" style="text-align: center"><?php echo $post->ID; ?></th>
+    <th scope="row"><?php echo $post->ID; ?></th>
     <td>
+      <?php echo $pad; ?><?php the_title() ?>
+      <?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?>
+      <?php echo $pad; ?><?php the_title() ?>
     </td>
     <td><?php the_author() ?></td>
     <td><?php echo mysql2date('Y-m-d g:i a', $post->post_modified); ?></td>
     <td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit"><?php _e('View'); ?></a></td>
     <td><?php if ( current_user_can('edit_page', $id) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td>
     <td><?php if ( current_user_can('delete_page', $id) ) { echo "<a href='" . wp_nonce_url("page.php?action=delete&amp;post=$id", 'delete-page_' . $id) .  "' class='delete' onclick=\"return deleteSomething( 'page', " . $id . ", '" . sprintf(__("You are about to delete the &quot;%s&quot; page.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), js_escape(get_the_title()) ) . "' );\">" . __('Delete') . "</a>"; } ?></td>
+    <td><?php if ( current_user_can('edit_pages') ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td>
+    <td><?php if ( current_user_can('edit_pages') ) { echo "<a href='post.php?action=delete&amp;post=$id' class='delete' onclick=\"return deleteSomething( 'page', " . $id . ", '" . sprintf(__("You are about to delete the &quot;%s&quot; page.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), wp_specialchars(get_the_title('','',0), 1)) . "' );\">" . __('Delete') . "</a>"; } ?></td>
   </tr>
 <?php
+        if ( $hierarchy) page_rows($id, $level + 1, $pages);
+    }
+}
+function user_row( $user_object, $style = '' ) {
+    if ( !(is_object($user_object) && is_a($user_object, 'WP_User')) )
+        $user_object = new WP_User( (int) $user_object );
+    $email = $user_object->user_email;
+    $url = $user_object->user_url;
+    $short_url = str_replace('http://', '', $url);
+    $short_url = str_replace('www.', '', $short_url);
+    if ('/' == substr($short_url, -1))
+        $short_url = substr($short_url, 0, -1);
+    if (strlen($short_url) > 35)
+        $short_url =  substr($short_url, 0, 32).'...';
+    $numposts = get_usernumposts($user_object->ID);
+    $r = "<tr id='user-$user_object->ID'$style>
+        <td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' value='{$user_object->ID}' /> <label for='user_{$user_object->ID}'>{$user_object->ID}</label></td>
+        <td><label for='user_{$user_object->ID}'><strong>$user_object->user_login</strong></label></td>
+        <td><label for='user_{$user_object->ID}'>$user_object->first_name $user_object->last_name</label></td>
+        <td><a href='mailto:$email' title='" . sprintf(__('e-mail: %s'), $email) . "'>$email</a></td>
+        <td><a href='$url' title='website: $url'>$short_url</a></td>";
+    $r .= "\n\t\t<td align='center'>";
+    if ($numposts > 0) {
+        $r .= "<a href='edit.php?author=$user_object->ID' title='" . __('View posts by this author') . "' class='edit'>";
+        $r .= sprintf(__('View %1$s %2$s'), $numposts, __ngettext('post', 'posts', $numposts));
+    }
+    $r .= "</td>\n\t\t<td>";
+    $edit_link = add_query_arg('wp_http_referer', wp_specialchars(urlencode(stripslashes($_SERVER['REQUEST_URI']))), "user-edit.php?user_id=$user_object->ID");
+    if ( current_user_can('edit_user', $user_object->ID) )
+        $r .= "<a href='$edit_link' class='edit'>".__('Edit')."</a>";
+    $r .= "</td>\n\t</tr>";
+    return $r;
+                page_rows($id, $level +1, $pages);
+            }
+        }
+    } else {
+        return false;
+    }
+}
 function wp_dropdown_cats($currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0) {
     global $wpdb;
     if (!$categories)
         $categories = get_categories('hide_empty=0');
+    global $wpdb, $bgcolor;
+    if (!$categories) {
+        $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_name");
+    }
     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);
 …
+}
+function link_category_dropdown($fieldname, $selected = 0) {
+    global $wpdb;
+    $results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $wpdb->linkcategories ORDER BY cat_id");
+    echo "\n<select name='$fieldname' size='1'>\n";
+    foreach ($results as $row) {
+        echo "\n\t<option value='$row->cat_id'";
+        if ($row->cat_id == $selected)
+            echo " selected='selected'";
+        echo ">$row->cat_id : " . wp_specialchars($row->cat_name);
+        if ($row->auto_toggle == 'Y')
+            echo ' (auto toggle)';
+        echo "</option>";
+    }
+    echo "\n</select>\n";
+}
 function wp_create_thumbnail($file, $max_side, $effect = '') {
 …
         return $error;
     } else {
-        apply_filters( 'wp_create_thumbnail', $thumbpath );
         return $thumbpath;
+    }
 …
     global $post_ID;
     // Exit if no meta
+    if (!$meta) {
+        echo '<tbody id="the-list"><tr style="display: none;"><td>&nbsp;</td></tr></tbody>'; //TBODY needed for list-manipulation JS
+    if (!$meta)
         return;
+    }
     $count = 0;
 ?>
     <thead>
+<table id='meta-list' cellpadding="3">
     <tr>
         <th><?php _e('Key') ?></th>
 …
         <th colspan='2'><?php _e('Action') ?></th>
     </tr>
-    </thead>
 <?php
+    $r ="\n\t<tbody id='the-list'>";
     foreach ($meta as $entry) {
         ++ $count;
 …
         if ('_' == $entry['meta_key'] { 0 })
             $style .= ' hidden';
+        if ( is_serialized($entry['meta_value']) ) {
+            if ( is_serialized_string($entry['meta_value']) ) {
+                // this is a serialized string, so we should display it
+                $entry['meta_value'] = maybe_unserialize($entry['meta_value']);
+            } else {
+                // this is a serialized array/object so we should NOT display it
+                --$count;
+                continue;
+            }
+        }
+        $key_js = js_escape($entry['meta_key']);
+        $entry['meta_key'] = wp_specialchars( $entry['meta_key'], true );
+        $entry['meta_value'] = wp_specialchars( $entry['meta_value'], true );
+        $r .= "\n\t<tr id='meta-{$entry['meta_id']}' class='$style'>";
+        $r .= "\n\t\t<td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td>";
+        $r .= "\n\t\t<td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>";
+        $r .= "\n\t\t<td align='center'><input name='updatemeta' type='submit' class='updatemeta' tabindex='6' value='".__('Update')."' /><br />";
+        $r .= "\n\t\t<input name='deletemeta[{$entry['meta_id']}]' type='submit' onclick=\"return deleteSomething( 'meta', {$entry['meta_id']}, '";
+        $r .= sprintf(__("You are about to delete the &quot;%s&quot; custom field on this post.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), $key_js);
+        $r .= "' );\" class='deletemeta' tabindex='6' value='".__('Delete')."' /></td>";
+        $r .= "\n\t</tr>";
+    }
+    echo $r;
+    echo "\n\t</tbody>";
+        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'><input name='updatemeta' type='submit' class='updatemeta' tabindex='6' value='".__('Update')."' /><br />
+                <input name='deletemeta[{$entry['meta_id']}]' type='submit' class='deletemeta' tabindex='6' value='".__('Delete')."' /></td>
+            </tr>
+        ";
+    }
+    echo "
+        </table>
+    ";
+}
 …
 function meta_form() {
     global $wpdb;
-    $limit = (int) apply_filters('postmeta_form_limit', 30);
     $keys = $wpdb->get_col("
+        SELECT meta_key
+        FROM $wpdb->postmeta
+        GROUP BY meta_key
+        ORDER BY meta_id DESC
+        LIMIT $limit");
+    natcasesort($keys);
+            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>
 <table id="newmeta" cellspacing="3" cellpadding="3">
+<table cellspacing="3" cellpadding="3">
     <tr>
 <th colspan="2"><?php _e('Key') ?></th>
 …
     <tr valign="top">
         <td align="right" width="18%">
 <?php if ( $keys ) : ?>
+<?php if ($keys) : ?>
 <select id="metakeyselect" name="metakeyselect" tabindex="7">
 <option value="#NONE#"><?php _e('- Select -'); ?></option>
 <?php
+    foreach ( $keys as $key ) {
+        $key = wp_specialchars($key, 1);
+    foreach ($keys as $key) {
         echo "\n\t<option value='$key'>$key</option>";
+    }
 …
 </table>
 <p class="submit"><input type="submit" id="updatemetasub" name="updatemeta" tabindex="9" value="<?php _e('Add Custom Field &raquo;') ?>" /></p>
+<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;
-    $post_ID = (int) $post_ID;
     $metakeyselect = $wpdb->escape(stripslashes(trim($_POST['metakeyselect'])));
     $metakeyinput = $wpdb->escape(stripslashes(trim($_POST['metakeyinput'])));
+    $metavalue = maybe_serialize(stripslashes((trim($_POST['metavalue']))));
+    $metavalue = $wpdb->escape($metavalue);
+    $metavalue = $wpdb->escape(stripslashes(trim($_POST['metavalue'])));
     if ( ('0' === $metavalue || !empty ($metavalue)) && ((('#NONE#' != $metakeyselect) && !empty ($metakeyselect)) || !empty ($metakeyinput)) ) {
 …
         // input for the key have data, the input takes precedence:
         if ('#NONE#' != $metakeyselect)
+        if ('#NONE#' != $metakeyselect)
             $metakey = $metakeyselect;
 …
                         VALUES ('$post_ID','$metakey','$metavalue')
                     ");
+        return $wpdb->insert_id;
+    }
+    return false;
+    }
 } // add_meta
 function delete_meta($mid) {
     global $wpdb;
+    $mid = (int) $mid;
+    return $wpdb->query("DELETE FROM $wpdb->postmeta WHERE meta_id = '$mid'");
+    $result = $wpdb->query("DELETE FROM $wpdb->postmeta WHERE meta_id = '$mid'");
+}
 function update_meta($mid, $mkey, $mvalue) {
     global $wpdb;
+    $mvalue = maybe_serialize(stripslashes($mvalue));
+    $mvalue = $wpdb->escape($mvalue);
+    $mid = (int) $mid;
     return $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '$mkey', meta_value = '$mvalue' WHERE meta_id = '$mid'");
+}
-function get_post_meta_by_id($mid) {
-    global $wpdb;
-    $mid = (int) $mid;
-    $meta = $wpdb->get_row("SELECT * FROM $wpdb->postmeta WHERE meta_id = '$mid'");
-    if ( is_serialized_string($meta->meta_value) )
-        $meta->meta_value = maybe_unserialize($meta->meta_value);
-    return $meta;
+}
 function touch_time($edit = 1, $for_post = 1) {
     global $wp_locale, $post, $comment;
+    global $month, $post, $comment;
     if ( $for_post )
 …
     echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" /> <label for="timestamp">'.__('Edit timestamp').'</label></legend>';
     $time_adj = time() + (get_option('gmt_offset') * 3600);
+    $time_adj = time() + (get_settings('gmt_offset') * 3600);
     $post_date = ($for_post) ? $post->post_date : $comment->comment_date;
     $jj = ($edit) ? mysql2date('d', $post_date) : gmdate('d', $time_adj);
 …
     $ss = ($edit) ? mysql2date('s', $post_date) : gmdate('s', $time_adj);
     echo "<select name=\"mm\" onchange=\"edit_date.checked=true\">\n";
+    echo "<select name=\"mm\">\n";
     for ($i = 1; $i < 13; $i = $i +1) {
         echo "\t\t\t<option value=\"$i\"";
         if ($i == $mm)
+            echo ' selected="selected"';
+        echo '>' . $wp_locale->get_month($i) . "</option>\n";
+            echo " selected='selected'";
+        if ($i < 10) {
+            $ii = "0".$i;
+        } else {
+            $ii = "$i";
+        }
+        echo ">".$month["$ii"]."</option>\n";
+    }
 ?>
 </select>
 <input type="text" id="jj" name="jj" value="<?php echo $jj; ?>" size="2" maxlength="2" onchange="edit_date.checked=true"/>
 <input type="text" id="aa" name="aa" value="<?php echo $aa ?>" size="4" maxlength="5" onchange="edit_date.checked=true" /> @
 <input type="text" id="hh" name="hh" value="<?php echo $hh ?>" size="2" maxlength="2" onchange="edit_date.checked=true" /> :
 <input type="text" id="mn" name="mn" value="<?php echo $mn ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
 <input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
+<input type="text" id="jj" name="jj" value="<?php echo $jj; ?>" size="2" maxlength="2" />
+<input type="text" id="aa" name="aa" value="<?php echo $aa ?>" size="4" maxlength="5" /> @
+<input type="text" id="hh" name="hh" value="<?php echo $hh ?>" size="2" maxlength="2" /> :
+<input type="text" id="mn" name="mn" value="<?php echo $mn ?>" size="2" maxlength="2" />
+<input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" />
 <?php
     if ( $edit ) {
         _e('Existing timestamp');
+        //echo ': ' . $wp_locale->get_month($mm) . "$jj, $aa @ $hh:$mn";
+        echo sprintf(__(': %1$s %2$s, %3$s @ %4$s:%5$s'), $wp_locale->get_month($mm), $jj, $aa, $hh, $mn);
+        echo ": {$month[$mm]} $jj, $aa @ $hh:$mn";
+    }
 ?>
 …
         if ($markerdata) {
             $state = true;
             foreach ($markerdata as $n => $markerline) {
+            foreach ($markerdata as $markerline) {
                 if (strstr($markerline, "# BEGIN {$marker}"))
                     $state = false;
+                if ($state) {
+                    if ( $n + 1 < count($markerdata) )
+                        fwrite($f, "{$markerline}\n");
+                    else
+                        fwrite($f, "{$markerline}");
+                }
+                if ($state)
+                    fwrite($f, "{$markerline}\n");
                 if (strstr($markerline, "# END {$marker}")) {
                     fwrite($f, "# BEGIN {$marker}\n");
 …
+}
+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">if ( typeof tinyMCE == "undefined" || tinyMCE.configs.length < 1 ) edToolbar();</script>
+        </div>
+';
+    else echo '
+<script type="text/javascript">
+function edInsertContent(myField, myValue) {
+    //IE support
+    if (document.selection) {
+        myField.focus();
+        sel = document.selection.createRange();
+        sel.text = myValue;
+        myField.focus();
+    }
+    //MOZILLA/NETSCAPE support
+    else if (myField.selectionStart || myField.selectionStart == "0") {
+        var startPos = myField.selectionStart;
+        var endPos = myField.selectionEnd;
+        myField.value = myField.value.substring(0, startPos)
+                      + myValue
+                      + myField.value.substring(endPos, myField.value.length);
+        myField.focus();
+        myField.selectionStart = startPos + myValue.length;
+        myField.selectionEnd = startPos + myValue.length;
+    } else {
+        myField.value += myValue;
+        myField.focus();
+    }
+}
+</script>
+';
+}
+function validate_current_theme() {
+    $theme_loc = 'wp-content/themes';
+    $theme_root = ABSPATH.$theme_loc;
+    $template = get_settings('template');
+    $stylesheet = get_settings('stylesheet');
+    if (($template != 'default') && (!file_exists("$theme_root/$template/index.php"))) {
+        update_option('template', 'default');
+        update_option('stylesheet', 'default');
+        do_action('switch_theme', 'Default');
+        return false;
+    }
+    if (($stylesheet != 'default') && (!file_exists("$theme_root/$stylesheet/style.css"))) {
+        update_option('template', 'default');
+        update_option('stylesheet', 'default');
+        do_action('switch_theme', 'Default');
+        return false;
+    }
+    return true;
+}
 function get_broken_themes() {
     global $wp_broken_themes;
 …
 function parent_dropdown($default = 0, $parent = 0, $level = 0) {
     global $wpdb, $post_ID;
     $items = $wpdb->get_results("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = $parent AND post_type = 'page' ORDER BY menu_order");
+    $items = $wpdb->get_results("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = $parent AND post_status = 'static' ORDER BY menu_order");
     if ($items) {
 …
     global $menu;
     global $submenu;
-    global $_wp_menu_nopriv;
-    global $_wp_submenu_nopriv;
-    global $plugin_page;
     $parent = get_admin_page_parent();
+    /*echo "pa: $parent pn: $pagenow pp: $plugin_page<br/>";
+    echo "<pre>";
+    print_r($_wp_menu_nopriv);
+    print_r($_wp_submenu_nopriv);
+    echo "</pre>";*/
+    if ( isset($_wp_submenu_nopriv[$parent][$pagenow]) )
+        return false;
+    if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$parent][$plugin_page]) )
+        return false;
+    if ( empty($parent) ) {
+        if ( isset($_wp_menu_nopriv[$pagenow]) )
+            return false;
+        if ( isset($_wp_submenu_nopriv[$pagenow][$pagenow]) )
+            return false;
+        if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page]) )
+            return false;
+        foreach (array_keys($_wp_submenu_nopriv) as $key) {
+            if ( isset($_wp_submenu_nopriv[$key][$pagenow]) )
+    foreach ($menu as $menu_array) {
+        //echo "parent array: " . $menu_array[2];
+        if ($menu_array[2] == $parent) {
+            if (!current_user_can($menu_array[1])) {
                 return false;
             if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$key][$plugin_page]) )
             return false;
+        }
         return true;
+            } else {
+                break;
+            }
+        }
+    }
 …
         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 {
                     return true;
+                else
+                    return false;
+            }
+        }
+    }
+    foreach ($menu as $menu_array) {
+        if ($menu_array[2] == $parent) {
+            if (current_user_can($menu_array[1]))
+                return true;
+            else
+                return false;
+        }
+    }
+                }
+            }
+        }
+    }
     return true;
+}
 …
     global $pagenow;
     global $plugin_page;
+    global $_wp_real_parent_file;
+    global $_wp_menu_nopriv;
+    global $_wp_submenu_nopriv;
+    if ( !empty ($parent_file) ) {
+        if ( isset($_wp_real_parent_file[$parent_file]) )
+            $parent_file = $_wp_real_parent_file[$parent_file];
+    if (isset ($parent_file) && !empty ($parent_file)) {
         return $parent_file;
+    }
 …
             if ($parent_menu[2] == $plugin_page) {
                 $parent_file = $plugin_page;
+                if ( isset($_wp_real_parent_file[$parent_file]) )
+                    $parent_file = $_wp_real_parent_file[$parent_file];
+                return $parent_file;
+            }
+        }
+        if ( isset($_wp_menu_nopriv[$plugin_page]) ) {
+            $parent_file = $plugin_page;
+            if ( isset($_wp_real_parent_file[$parent_file]) )
+                    $parent_file = $_wp_real_parent_file[$parent_file];
+            return $parent_file;
+        }
+    }
+    if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page]) ) {
+        $parent_file = $pagenow;
+        if ( isset($_wp_real_parent_file[$parent_file]) )
+            $parent_file = $_wp_real_parent_file[$parent_file];
+        return $parent_file;
+                return $plugin_page;
+            }
+        }
+    }
     foreach (array_keys($submenu) as $parent) {
         foreach ($submenu[$parent] as $submenu_array) {
-            if ( isset($_wp_real_parent_file[$parent]) )
-                $parent = $_wp_real_parent_file[$parent];
             if ($submenu_array[2] == $pagenow) {
                 $parent_file = $parent;
 …
     global $submenu;
     global $menu;
+    global $_wp_real_parent_file;
+    global $_wp_submenu_nopriv;
+    global $_wp_menu_nopriv;
+    $parent = plugin_basename($parent);
     $file = plugin_basename($file);
-    $parent = plugin_basename($parent);
-    if ( isset($_wp_real_parent_file[$parent]) )
-        $parent = $_wp_real_parent_file[$parent];
-    if ( !current_user_can($access_level) ) {
-        $_wp_submenu_nopriv[$parent][$file] = true;
-        return false;
+    }
     // If the parent doesn't already have a submenu, add a link to the parent
 …
     // 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 && current_user_can($parent_menu[1]) ) {
+            if ($parent_menu[2] == $parent) {
                 $submenu[$parent][] = $parent_menu;
+            }
 …
     switch ($code) {
         case 1 :
             wp_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.'));
+            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 :
             wp_die(__('Sorry, can&#8217;t call files with their real path.'));
+            die(__('Sorry, can&#8217;t call files with their real path.'));
         case 3 :
             wp_die(__('Sorry, that file cannot be edited.'));
+            die(__('Sorry, that file cannot be edited.'));
+    }
+}
 function get_home_path() {
     $home = get_option('home');
     if ($home != '' && $home != get_option('siteurl')) {
+    $home = get_settings('home');
+    if ($home != '' && $home != get_settings('siteurl')) {
         $home_path = parse_url($home);
         $home_path = $home_path['path'];
 …
         return $wp_file_descriptions[basename($file)];
+    }
     elseif ( file_exists( ABSPATH . $file ) && is_file( ABSPATH . $file ) ) {
         $template_data = implode('', file( ABSPATH . $file ));
+    elseif (file_exists(ABSPATH.$file)) {
+        $template_data = implode('', file(ABSPATH.$file));
         if (preg_match("|Template Name:(.*)|i", $template_data, $name))
             return $name[1];
 …
     preg_match("|Author URI:(.*)|i", $plugin_data, $author_uri);
     if (preg_match("|Version:(.*)|i", $plugin_data, $version))
         $version = trim($version[1]);
+        $version = $version[1];
     else
         $version = '';
     $description = wptexturize(trim($description[1]));
+    $description = wptexturize($description[1]);
     $name = $plugin_name[1];
 …
     $plugin = $name;
     if ('' != $plugin_uri[1] && '' != $name) {
         $plugin = '<a href="' . trim($plugin_uri[1]) . '" title="'.__('Visit plugin homepage').'">'.$plugin.'</a>';
+        $plugin = '<a href="'.$plugin_uri[1].'" title="'.__('Visit plugin homepage').'">'.$plugin.'</a>';
+    }
     if ('' == $author_uri[1]) {
         $author = trim($author_name[1]);
     } else {
         $author = '<a href="' . trim($author_uri[1]) . '" title="'.__('Visit author homepage').'">' . trim($author_name[1]) . '</a>';
+        $author = $author_name[1];
+    } else {
+        $author = '<a href="'.$author_uri[1].'" title="'.__('Visit author homepage').'">'.$author_name[1].'</a>';
+    }
 …
     $wp_plugins = array ();
+    $plugin_root = ABSPATH . PLUGINDIR;
+    $plugin_loc = 'wp-content/plugins';
+    $plugin_root = ABSPATH.$plugin_loc;
     // Files in wp-content/plugins directory
 …
+    }
     if ( !$plugins_dir || !$plugin_files )
+    if (!$plugins_dir || !$plugin_files) {
         return $wp_plugins;
+    foreach ( $plugin_files as $plugin_file ) {
+        if ( !is_readable("$plugin_root/$plugin_file") )
+    }
+    sort($plugin_files);
+    foreach ($plugin_files as $plugin_file) {
+        if ( !is_readable("$plugin_root/$plugin_file"))
             continue;
         $plugin_data = get_plugin_data("$plugin_root/$plugin_file");
         if ( empty ($plugin_data['Name']) )
+        if (empty ($plugin_data['Name'])) {
             continue;
+        }
         $wp_plugins[plugin_basename($plugin_file)] = $plugin_data;
+    }
-    uasort($wp_plugins, create_function('$a, $b', 'return strnatcasecmp($a["Name"], $b["Name"]);'));
     return $wp_plugins;
 …
         __("Failed to write file to disk."));
+    // Accepted MIME types are set here as PCRE. Override with $override['mimes'].
+    $mimes = apply_filters('upload_mimes', array (
+        'jpg|jpeg|jpe' => 'image/jpeg',
+        'gif' => 'image/gif',
+        'png' => 'image/png',
+        'bmp' => 'image/bmp',
+        'tif|tiff' => 'image/tiff',
+        'ico' => 'image/x-icon',
+        'asf|asx|wax|wmv|wmx' => 'video/asf',
+        'avi' => 'video/avi',
+        'mov|qt' => 'video/quicktime',
+        'mpeg|mpg|mpe' => 'video/mpeg',
+        'txt|c|cc|h' => 'text/plain',
+        'rtx' => 'text/richtext',
+        'css' => 'text/css',
+        'htm|html' => 'text/html',
+        'mp3|mp4' => 'audio/mpeg',
+        'ra|ram' => 'audio/x-realaudio',
+        'wav' => 'audio/wav',
+        'ogg' => 'audio/ogg',
+        'mid|midi' => 'audio/midi',
+        'wma' => 'audio/wma',
+        'rtf' => 'application/rtf',
+        'js' => 'application/javascript',
+        'pdf' => 'application/pdf',
+        'doc' => 'application/msword',
+        'pot|pps|ppt' => 'application/vnd.ms-powerpoint',
+        'wri' => 'application/vnd.ms-write',
+        'xla|xls|xlt|xlw' => 'application/vnd.ms-excel',
+        'mdb' => 'application/vnd.ms-access',
+        'mpp' => 'application/vnd.ms-project',
+        'swf' => 'application/x-shockwave-flash',
+        'class' => 'application/java',
+        'tar' => 'application/x-tar',
+        'zip' => 'application/zip',
+        'gz|gzip' => 'application/x-gzip',
+        'exe' => 'application/x-msdownload'
+    ));
     // All tests are on by default. Most can be turned off by $override[{test_name}] = false;
     $test_form = true;
 …
         return $upload_error_handler($file, __('Specified file failed upload test.'));
     // A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
+    // A correct MIME type will pass this test.
     if ( $test_type ) {
+        $wp_filetype = wp_check_filetype($file['name'], $mimes);
+        extract($wp_filetype);
+        $type = false;
+        $ext = false;
+        foreach ($mimes as $ext_preg => $mime_match) {
+            $ext_preg = '![^.]\.(' . $ext_preg . ')$!i';
+            if ( preg_match($ext_preg, $file['name'], $ext_matches) ) {
+                $type = $mime_match;
+                $ext = $ext_matches[1];
+            }
+        }
         if ( !$type || !$ext )
 …
                 $filename = str_replace("$number$ext", ++$number . $ext, $filename);
+        }
-        $filename = str_replace($ext, '', $filename);
-        $filename = sanitize_title_with_dashes($filename) . $ext;
+    }
 …
     $new_file = $uploads['path'] . "/$filename";
     if ( false === @ move_uploaded_file($file['tmp_name'], $new_file) )
         wp_die(printf(__('The uploaded file could not be moved to %s.'), $uploads['path']));
+        die(printf(__('The uploaded file could not be moved to %s.'), $file['path']));
     // Set correct file permissions
 …
     // Compute the URL
     $url = $uploads['url'] . "/$filename";
+    $return = apply_filters( 'wp_handle_upload', array('file' => $new_file, 'url' => $url, 'type' => $type) );
+    return $return;
+    return array('file' => $new_file, 'url' => $url, 'type' => $type);
+}
 …
 function wp_import_upload_form($action) {
-    $size = strtolower( ini_get('upload_max_filesize') );
-    $bytes = 0;
-    if ( strstr( $size, 'k' ) )
-        $bytes = $size * 1024;
-    if ( strstr( $size, 'm' ) )
-        $bytes = $size * 1024 * 1024;
-    if ( strstr( $size, 'g' ) )
-        $bytes = $size * 1024 * 1024 * 1024;
 ?>
+<form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo $action ?>">
+<p>
+<label for="upload"><?php _e('Choose a file from your computer:'); ?></label> (<?php printf( __('Maximum size: %s'), $size ); ?>)
+<input type="file" id="upload" name="import" size="25" />
+<script type="text/javascript">
+function cancelUpload() {
+o = document.getElementById('uploadForm');
+o.method = 'GET';
+o.action.value = 'view';
+o.submit();
+}
+</script>
+<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo $action ?>">
+<label for="upload"><?php _e('File:'); ?></label><input type="file" id="upload" name="import" />
 <input type="hidden" name="action" value="save" />
+<input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
+</p>
+<p class="submit">
+<input type="submit" value="<?php _e('Upload file and import'); ?> &raquo;" />
+</p>
+<div id="buttons">
+<input type="submit" value="<?php _e('Import'); ?>" />
+<input type="button" value="<?php _e('Cancel'); ?>" onclick="cancelUpload()" />
+</div>
 </form>
 <?php
+<?php
+}
 …
     $url = $file['url'];
     $file = addslashes( $file['file'] );
+    $file = $file['file'];
     $filename = basename($file);
 …
+}
+function user_can_richedit() {
+    if ( 'true' != get_user_option('rich_editing') )
+        return false;
+    if ( preg_match('!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT']) )
+        return false;
+    return true; // Best guess
+}
 function the_attachment_links($id = false) {
     $id = (int) $id;
     $post = & get_post($id);
     if ( $post->post_type != 'attachment' )
+    if ( $post->post_status != 'attachment' )
         return false;
     $icon = get_attachment_icon($post->ID);
+    $attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true );
+    $thumb = isset($attachment_data['thumb']);
 ?>
+<form id="the-attachment-links">
+<table>
+    <col />
+    <col class="widefat" />
+    <tr>
+        <th scope="row"><?php _e('URL') ?></th>
+        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><?php echo $post->guid ?></textarea></td>
+    </tr>
+<p><?php _e('Text linked to file') ?><br />
+<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo basename($post->guid) ?></a></textarea></p>
+<p><?php _e('Text linked to subpost') ?><br />
+<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $post->post_title ?></a></textarea></p>
 <?php if ( $icon ) : ?>
+    <tr>
+        <th scope="row"><?php $thumb ? _e('Thumbnail linked to file') : _e('Image linked to file'); ?></th>
+        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid; ?>"><?php echo $icon ?></a></textarea></td>
+    </tr>
+    <tr>
+        <th scope="row"><?php $thumb ? _e('Thumbnail linked to page') : _e('Image linked to file'); ?></th>
+        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment wp-att-<?php echo $post->ID; ?>"><?php echo $icon ?></a></textarea></td>
+    </tr>
+<?php else : ?>
+    <tr>
+        <th scope="row"><?php _e('Link to file') ?></th>
+        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo basename($post->guid);  ?></a></textarea></td>
+    </tr>
+    <tr>
+        <th scope="row"><?php _e('Link to page') ?></th>
+        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment wp-att-<?php echo $post->ID ?>"><?php the_title(); ?></a></textarea></td>
+    </tr>
+<p><?php _e('Thumbnail linked to file') ?><br />
+<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo $icon ?></a></textarea></p>
+<p><?php _e('Thumbnail linked to subpost') ?><br />
+<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $icon ?></a></textarea></p>
 <?php endif; ?>
-</table>
-</form>
 <?php
+}
 …
+}
-function wp_reset_vars($vars) {
-    for ($i=0; $i<count($vars); $i += 1) {
-        $var = $vars[$i];
-        global $$var;
-        if (!isset($$var)) {
-            if (empty($_POST["$var"])) {
-                if (empty($_GET["$var"]))
-                    $$var = '';
-                else
-                    $$var = $_GET["$var"];
-            } else {
-                $$var = $_POST["$var"];
+            }
+        }
+    }
+}
-// If siteurl or home changed, reset cookies and flush rewrite rules.
-function update_home_siteurl($old_value, $value) {
-    global $wp_rewrite, $user_login, $user_pass_md5;
-    if ( defined("WP_INSTALLING") )
-        return;
-    // If home changed, write rewrite rules to new location.
-    $wp_rewrite->flush_rules();
-    // Clear cookies for old paths.
-    wp_clearcookie();
-    // Set cookies for new paths.
-    wp_setcookie($user_login, $user_pass_md5, true, get_option('home'), get_option('siteurl'));
+}
-add_action('update_option_home', 'update_home_siteurl', 10, 2);
-add_action('update_option_siteurl', 'update_home_siteurl', 10, 2);
-function wp_crop_image($src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false) {
-    if ( ctype_digit($src_file) ) // Handle int as attachment ID
-        $src_file = get_attached_file($src_file);
-    $src = wp_load_image($src_file);
-    if ( !is_resource($src) )
-        return $src;
-    $dst = imagecreatetruecolor($dst_w, $dst_h);
-    if ( $src_abs ) {
-        $src_w -= $src_x;
-        $src_h -= $src_y;
+    }
-    imageantialias($dst, true);
-    imagecopyresampled($dst, $src, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-    if ( !$dst_file )
-        $dst_file = str_replace(basename($src_file), 'cropped-'.basename($src_file), $src_file);
-    $dst_file = preg_replace('/\\.[^\\.]+$/', '.jpg', $dst_file);
-    if ( imagejpeg($dst, $dst_file) )
-        return $dst_file;
-    else
-        return false;
+}
-function wp_load_image($file) {
-    if ( ctype_digit($file) )
-        $file = get_attached_file($file);
-    if ( !file_exists($file) )
-        return "File '$file' doesn't exist?";
-    $contents = file_get_contents($file);
-    $image = imagecreatefromstring($contents);
-    if ( !is_resource($image) )
-        return "File '$file' is not image?";
-    return $image;
+}
 ?>

trunk/wp-admin/admin-header.php

-                      r4431
+                      r3503
 <?php
+<?php
 @header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 if (!isset($_GET["page"])) require_once('admin.php');
 if ( $editing ) {
+    wp_enqueue_script( array("dbx-admin-key?pagenow=$pagenow",'admin-custom-fields') );
+    if ( current_user_can('manage_categories') )
+        wp_enqueue_script( 'ajaxcat' );
+    if ( user_can_richedit() )
+        wp_enqueue_script( 'wp_tiny_mce' );
+    $dbx_js = true;
+    $cat_js = true;
+}
+get_admin_page_title();
+if ( $list_js || $cat_js )
+    $sack_js = true;
 ?>
+<?php get_admin_page_title(); ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
+<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
 <title><?php bloginfo('name') ?> &rsaquo; <?php echo $title; ?> &#8212; WordPress</title>
+<link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+<?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
+<link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+<?php endif; ?>
+<link rel="stylesheet" href="<?php echo get_settings('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
 <script type="text/javascript">
 //<![CDATA[
 …
 //]]>
 </script>
+<script type="text/javascript" src="../wp-includes/js/fat.js"></script>
+<?php if ( $xfn_js ) { ?>
+<script type="text/javascript" src="xfn.js"></script>
+<?php } ?>
+<?php if ( $sack_js ) { ?>
+<script type="text/javascript" src="../wp-includes/js/tw-sack.js"></script>
+<?php } ?>
+<?php if ( $list_js ) { ?>
+<script type="text/javascript" src="list-manipulation.js"></script>
+<?php } ?>
+<?php if ( $dbx_js ) { ?>
+<script type="text/javascript" src="../wp-includes/js/dbx.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+addLoadEvent( function() {
+<?php switch ( $pagenow ) : case 'post.php' : ?>
+var manager = new dbxManager('postmeta');
+<?php break; case 'page-new.php' : ?>
+var manager = new dbxManager('pagemeta');
+<?php break; endswitch; ?>
+});
+//]]>
+</script>
+<script type="text/javascript" src="../wp-includes/js/dbx-key.js"></script>
+<?php } ?>
+<?php if ( $editing && user_can_richedit() ) { ?>
+<script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce_gzip.php?ver=20051211"></script>
+<?php } ?>
+<?php if ( $cat_js ) { ?>
+<script type="text/javascript" src="cat-js.php"></script>
+<?php } ?>
 <?php if ( ($parent_file != 'link-manager.php') && ($parent_file != 'options-general.php') ) : ?>
 <style type="text/css">* html { overflow-x: hidden; }</style>
+<?php endif;
+if ( isset($page_hook) )
+    do_action('admin_print_scripts-' . $page_hook);
+else if ( isset($plugin_page) )
+    do_action('admin_print_scripts-' . $plugin_page);
+do_action('admin_print_scripts');
+if ( isset($page_hook) )
+    do_action('admin_head-' . $page_hook);
+else if ( isset($plugin_page) )
+    do_action('admin_head-' . $plugin_page);
+do_action('admin_head');
+?>
+<?php endif; ?>
+<?php do_action('admin_head'); ?>
 </head>
 <body>
 <div id="wphead">
 <h1><?php echo wptexturize(get_option(('blogname'))); ?> <span>(<a href="<?php echo get_option('home') . '/'; ?>"><?php _e('View site &raquo;') ?></a>)</span></h1>
+<h1><?php echo wptexturize(get_settings(('blogname'))); ?> <span>(<a href="<?php echo get_settings('home') . '/'; ?>"><?php _e('View site') ?> &raquo;</a>)</span></h1>
 </div>
 <div id="user_info"><p><?php printf(__('Howdy, <strong>%s</strong>.'), $user_identity) ?> [<a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Sign Out'); ?></a>, <a href="profile.php"><?php _e('My Profile'); ?></a>] </p></div>
+<div id="user_info"><p><?php printf(__('Howdy, <strong>%s</strong>.'), $user_identity) ?> [<a href="<?php echo get_settings('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Sign Out'); ?></a>, <a href="profile.php"><?php _e('My Account'); ?></a>] </p></div>
 <?php

trunk/wp-admin/admin.php

-                      r4431
+                      r3503
 if ( get_option('db_version') != $wp_db_version )
     wp_die(sprintf(__("Your database is out-of-date.  Please <a href='%s'>upgrade</a>."), get_option('siteurl') . '/wp-admin/upgrade.php'));
+    die (sprintf(__("Your database is out-of-date.  Please <a href='%s'>upgrade</a>."), get_option('siteurl') . '/wp-admin/upgrade.php'));
 require_once(ABSPATH . 'wp-admin/admin-functions.php');
 require_once(ABSPATH . 'wp-admin/admin-db.php');
 require_once(ABSPATH . WPINC . '/registration.php');
+require_once(ABSPATH . WPINC . '/registration-functions.php');
 auth_redirect();
 …
 update_category_cache();
 wp_get_current_user();
+get_currentuserinfo();
 $posts_per_page = get_option('posts_per_page');
 $what_to_show = get_option('what_to_show');
 $date_format = get_option('date_format');
 $time_format = get_option('time_format');
+$posts_per_page = get_settings('posts_per_page');
+$what_to_show = get_settings('what_to_show');
+$date_format = get_settings('date_format');
+$time_format = get_settings('time_format');
+wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
+$wpvarstoreset = array('profile','redirect','redirect_url','a','popuptitle','popupurl','text', 'trackback', 'pingback');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
+wp_enqueue_script( 'fat' );
+$editing = false;
+if (isset($_GET['page'])) {
+    $plugin_page = stripslashes($_GET['page']);
+    $plugin_page = plugin_basename($plugin_page);
+}
+$xfn_js = $sack_js = $list_js = $cat_js = $dbx_js = $editing = false;
 require(ABSPATH . '/wp-admin/menu.php');
 // Handle plugin admin pages.
+if (isset($plugin_page)) {
+if (isset($_GET['page'])) {
+    $plugin_page = stripslashes($_GET['page']);
+    $plugin_page = plugin_basename($plugin_page);
     $page_hook = get_plugin_page_hook($plugin_page, $pagenow);
     if ( $page_hook ) {
-        do_action('load-' . $page_hook);
         if (! isset($_GET['noheader']))
             require_once(ABSPATH . '/wp-admin/admin-header.php');
         do_action($page_hook);
     } else {
         if ( validate_file($plugin_page) ) {
             wp_die(__('Invalid plugin page'));
+            die(__('Invalid plugin page'));
+        }
+        if (! file_exists(ABSPATH . PLUGINDIR . "/$plugin_page"))
+            wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+        do_action('load-' . $plugin_page);
+        if (! file_exists(ABSPATH . "wp-content/plugins/$plugin_page"))
+            die(sprintf(__('Cannot load %s.'), $plugin_page));
         if (! isset($_GET['noheader']))
             require_once(ABSPATH . '/wp-admin/admin-header.php');
         include(ABSPATH . PLUGINDIR . "/$plugin_page");
+        include(ABSPATH . "wp-content/plugins/$plugin_page");
+    }
     include(ABSPATH . 'wp-admin/admin-footer.php');
     exit();
 } else if (isset($_GET['import'])) {
     $importer = $_GET['import'];
-    if ( ! current_user_can('import') )
-        wp_die(__('You are not allowed to import.'));
     if ( validate_file($importer) ) {
         wp_die(__('Invalid importer.'));
+        die(__('Invalid importer.'));
+    }
     if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
         wp_die(__('Cannot load importer.'));
+        die(__('Cannot load importer.'));
     include(ABSPATH . "wp-admin/import/$importer.php");
+    $parent_file = 'edit.php';
+    $submenu_file = 'import.php';
+    $parent_file = 'import.php';
     $title = __('Import');
     if (! isset($_GET['noheader']))
         require_once(ABSPATH . 'wp-admin/admin-header.php');
 …
     call_user_func($wp_importers[$importer][2]);
     include(ABSPATH . 'wp-admin/admin-footer.php');
     exit();
-} else {
-    do_action("load-$pagenow");
+}

trunk/wp-admin/bookmarklet.php

-                      r4431
+                      r3503
 if ( ! current_user_can('edit_posts') )
     wp_die(__('Cheatin&#8217; uh?'));
+    die ("Cheatin' uh?");
 if ('b' == $a):
 …
 $popuptitle = wp_specialchars(stripslashes($popuptitle));
 $text       = wp_specialchars(stripslashes(urldecode($text)));
 $popuptitle = funky_javascript_fix($popuptitle);
 $text       = funky_javascript_fix($text);
 $post_title = wp_specialchars($_REQUEST['post_title']);
 if (!empty($post_title))
 …
 else
     $post->post_title = $popuptitle;
 $content  = wp_specialchars($_REQUEST['content']);
 …
 <head>
 <title><?php bloginfo('name') ?> &rsaquo; Bookmarklet &#8212; WordPress</title>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
+<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
 <link rel="stylesheet" href="wp-admin.css" type="text/css" />

trunk/wp-admin/cat-js.php

-                      r4431
+                      r3503
 <?php
 require_once('../wp-config.php');
 cache_javascript_headers();
+require_once('admin.php');
+header('Content-type: text/javascript; charset=' . get_settings('blog_charset'), true);
 ?>
+addLoadEvent(function(){catList=new listMan('categorychecklist');catList.ajaxRespEl='jaxcat';catList.topAdder=1;catList.alt=0;catList.showLink=0;});
+var ajaxCat = new sack();
+var newcat;
+function newCatAddIn() {
+    if ( !document.getElementById('jaxcat') ) return false;
+    var ajaxcat = document.createElement('span');
+    ajaxcat.id = 'ajaxcat';
+    newcat = document.createElement('input');
+    newcat.type = 'text';
+    newcat.name = 'newcat';
+    newcat.id = 'newcat';
+    newcat.size = '16';
+    newcat.setAttribute('autocomplete', 'off');
+    newcat.onkeypress = ajaxNewCatKeyPress;
+    var newcatSub = document.createElement('input');
+    newcatSub.type = 'button';
+    newcatSub.name = 'Button';
+    newcatSub.id = 'catadd';
+    newcatSub.value = '<?php echo addslashes(__('Add')); ?>';
+    newcatSub.onclick = ajaxNewCat;
+    ajaxcat.appendChild(newcat);
+    ajaxcat.appendChild(newcatSub);
+    document.getElementById('jaxcat').appendChild(ajaxcat);
+    howto = document.createElement('span');
+    howto.innerHTML = '<?php echo addslashes(__('Separate multiple categories with commas.')); ?>';
+    howto.id = 'howto';
+    ajaxcat.appendChild(howto);
+}
 addLoadEvent(newCatAddIn);
+function newCatAddIn() {
+    var jaxcat = $('jaxcat');
+    if ( !jaxcat )
+function getResponseElement() {
+    var p = document.getElementById('ajaxcatresponse');
+    if (!p) {
+        p = document.createElement('span');
+        document.getElementById('jaxcat').appendChild(p);
+        p.id = 'ajaxcatresponse';
+    }
+    return p;
+}
+function newCatLoading() {
+    var p = getResponseElement();
+    p.innerHTML = '<?php echo addslashes(__('Sending Data...')); ?>';
+}
+function newCatLoaded() {
+    var p = getResponseElement();
+    p.innerHTML = '<?php echo addslashes(__('Data Sent...')); ?>';
+}
+function newCatInteractive() {
+    var p = getResponseElement();
+    p.innerHTML = '<?php echo addslashes(__('Processing Request...')); ?>';
+}
+function newCatCompletion() {
+    var p = getResponseElement();
+    var id    = 0;
+    var ids   = new Array();
+    var names = new Array();
+    ids   = myPload( ajaxCat.response );
+    names = myPload( newcat.value );
+    for ( i = 0; i < ids.length; i++ ) {
+        id = ids[i].replace(/[\n\r]+/g, "");
+        if ( id == '-1' ) {
+            p.innerHTML = "<?php echo addslashes(__("You don't have permission to do that.")); ?>";
+            return;
+        }
+        if ( id == '0' ) {
+            p.innerHTML = "<?php echo addslashes(__('That category name is invalid.  Try something else.')); ?>";
+            return;
+        }
+        var exists = document.getElementById('category-' + id);
+        if (exists) {
+            var moveIt = exists.parentNode;
+            var container = moveIt.parentNode;
+            container.removeChild(moveIt);
+            container.insertBefore(moveIt, container.firstChild);
+            moveIt.id = 'new-category-' + id;
+            exists.checked = 'checked';
+            var nowClass = moveIt.className;
+            moveIt.className = nowClass + ' fade';
+            Fat.fade_all();
+            moveIt.className = nowClass;
+        } else {
+            var catDiv = document.getElementById('categorychecklist');
+            var newLabel = document.createElement('label');
+            newLabel.setAttribute('for', 'category-' + id);
+            newLabel.id = 'new-category-' + id;
+            newLabel.className = 'selectit fade';
+            var newCheck = document.createElement('input');
+            newCheck.type = 'checkbox';
+            newCheck.value = id;
+            newCheck.name = 'post_category[]';
+            newCheck.id = 'category-' + id;
+            newLabel.appendChild(newCheck);
+            var newLabelText = document.createTextNode(' ' + names[i]);
+            newLabel.appendChild(newLabelText);
+            catDiv.insertBefore(newLabel, catDiv.firstChild);
+            newCheck.checked = 'checked';
+            Fat.fade_all();
+            newLabel.className = 'selectit';
+        }
+        newcat.value = '';
+    }
+    p.parentNode.removeChild(p);
+//  var id = parseInt(ajaxCat.response, 10);
+}
+function ajaxNewCatKeyPress(e) {
+    if (!e) {
+        if (window.event) {
+            e = window.event;
+        } else {
+            return;
+        }
+    }
+    if (e.keyCode == 13) {
+        ajaxNewCat();
+        e.returnValue = false;
+        e.cancelBubble = true;
         return false;
+    jaxcat.update('<span id="ajaxcat"><input type="text" name="newcat" id="newcat" size="16" autocomplete="off"/><input type="button" name="Button" id="catadd" value="<?php _e('Add'); ?>"/><span id="howto"><?php _e('Separate multiple categories with commas.'); ?></span></span>');
+    $('newcat').onkeypress = function(e) { return killSubmit("catList.ajaxAdder('category','jaxcat');", e); };
+    $('catadd').onclick = function() { catList.ajaxAdder('category', 'jaxcat'); };
+    }
+}
+function ajaxNewCat() {
+    var newcat = document.getElementById('newcat');
+    var split_cats = new Array(1);
+    var catString = '';
+    catString = 'ajaxnewcat=' + encodeURIComponent(newcat.value);
+    ajaxCat.requestFile = 'edit-form-ajax-cat.php';
+    ajaxCat.method = 'GET';
+    ajaxCat.onLoading = newCatLoading;
+    ajaxCat.onLoaded = newCatLoaded;
+    ajaxCat.onInteractive = newCatInteractive;
+    ajaxCat.onCompletion = newCatCompletion;
+    ajaxCat.runAJAX(catString);
+}
+function myPload( str ) {
+    var fixedExplode = new Array();
+    var comma = new String(',');
+    var count = 0;
+    var currentElement = '';
+    for( x=0; x < str.length; x++) {
+        andy = str.charAt(x);
+        if ( comma.indexOf(andy) != -1 ) {
+            currentElement = currentElement.replace(new RegExp('^\\s*(.*?)\\s*$', ''), '$1'); // trim
+            fixedExplode[count] = currentElement;
+            currentElement = "";
+            count++;
+        } else {
+            currentElement += andy;
+        }
+    }
+    if ( currentElement != "" )
+        fixedExplode[count] = currentElement;
+    return fixedExplode;
+}

trunk/wp-admin/categories.php

-                      r4431
+                      r3503
 $title = __('Categories');
 $parent_file = 'edit.php';
+$list_js = true;
+wp_reset_vars(array('action', 'cat'));
+$wpvarstoreset = array('action','cat');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
 switch($action) {
 …
 case 'addcat':
+    check_admin_referer('add-category');
+    if ( !current_user_can('manage_categories') )
+        die (__('Cheatin&#8217; uh?'));
+    wp_insert_category($_POST);
+    if ( !current_user_can('manage_categories') )
+        wp_die(__('Cheatin&#8217; uh?'));
+    if( wp_insert_category($_POST ) ) {
+        wp_redirect('categories.php?message=1#addcat');
+    } else {
+        wp_redirect('categories.php?message=4#addcat');
+    }
+    header('Location: categories.php?message=1#addcat');
 break;
 case 'delete':
+    $cat_ID = (int) $_GET['cat_ID'];
     check_admin_referer('delete-category_' .  $cat_ID);
+    check_admin_referer();
     if ( !current_user_can('manage_categories') )
         wp_die(__('Cheatin&#8217; uh?'));
+        die (__('Cheatin&#8217; uh?'));
+    $cat_ID = (int) $_GET['cat_ID'];
     $cat_name = get_catname($cat_ID);
+    // Don't delete the default cats.
+    if ( $cat_ID == get_option('default_category') )
+        wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+    if ( $cat_ID == get_option('default_link_category') )
+        wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one for bookmarks"), $cat_name));
+    if ( 1 == $cat_ID )
+        die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));
     wp_delete_category($cat_ID);
     wp_redirect('categories.php?message=2');
+    header('Location: categories.php?message=2');
 break;
 …
     $cat_ID = (int) $_GET['cat_ID'];
     $category = get_category_to_edit($cat_ID);
+    include('edit-category-form.php');
+    ?>
+<div class="wrap">
+ <h2><?php _e('Edit Category') ?></h2>
+ <form name="editcat" action="categories.php" method="post">
+      <table class="editform" width="100%" cellspacing="2" cellpadding="5">
+        <tr>
+          <th width="33%" scope="row"><?php _e('Category name:') ?></th>
+          <td width="67%"><input name="cat_name" type="text" value="<?php echo wp_specialchars($category->cat_name); ?>" size="40" /> <input type="hidden" name="action" value="editedcat" />
+<input type="hidden" name="cat_ID" value="<?php echo $category->cat_ID ?>" /></td>
+        </tr>
+        <tr>
+            <th scope="row"><?php _e('Category slug:') ?></th>
+            <td><input name="category_nicename" type="text" value="<?php echo wp_specialchars($category->category_nicename); ?>" size="40" /></td>
+        </tr>
+        <tr>
+            <th scope="row"><?php _e('Category parent:') ?></th>
+            <td>
+            <select name='category_parent'>
+      <option value='0' <?php if (!$category->category_parent) echo " selected='selected'"; ?>><?php _e('None') ?></option>
+      <?php wp_dropdown_cats($category->cat_ID, $category->category_parent); ?>
+      </select></td>
+        </tr>
+        <tr>
+            <th scope="row"><?php _e('Description:') ?></th>
+            <td><textarea name="category_description" rows="5" cols="50" style="width: 97%;"><?php echo wp_specialchars($category->category_description, 1); ?></textarea></td>
+        </tr>
+        </table>
+      <p class="submit"><input type="submit" name="submit" value="<?php _e('Edit category') ?> &raquo;" /></p>
+ </form>
+ <p><a href="categories.php"><?php _e('&laquo; Return to category list'); ?></a></p>
+</div>
+    <?php
 break;
 case 'editedcat':
-    $cat_ID = (int) $_POST['cat_ID'];
-    check_admin_referer('update-category_' . $cat_ID);
     if ( !current_user_can('manage_categories') )
         wp_die(__('Cheatin&#8217; uh?'));
+        die (__('Cheatin&#8217; uh?'));
     wp_update_category($_POST);
     wp_redirect('categories.php?message=3');
+    header('Location: categories.php?message=3');
 break;
 default:
-wp_enqueue_script( 'admin-categories' );
 require_once ('admin-header.php');
 …
 $messages[2] = __('Category deleted.');
 $messages[3] = __('Category updated.');
-$messages[4] = __('Category not added.');
 ?>
 …
     <h2><?php _e('Categories') ?> </h2>
 <?php endif; ?>
+<table class="widefat">
+    <thead>
+<table id="the-list-x" width="100%" cellpadding="3" cellspacing="3">
     <tr>
         <th scope="col" style="text-align: center"><?php _e('ID') ?></th>
+        <th scope="col"><?php _e('ID') ?></th>
         <th scope="col"><?php _e('Name') ?></th>
         <th scope="col"><?php _e('Description') ?></th>
+        <th scope="col" width="90" style="text-align: center"><?php _e('Posts') ?></th>
+        <th scope="col" width="90" style="text-align: center"><?php _e('Bookmarks') ?></th>
+        <th colspan="2" style="text-align: center"><?php _e('Action') ?></th>
+        <th scope="col"><?php _e('# Posts') ?></th>
+        <th colspan="2"><?php _e('Action') ?></th>
     </tr>
-    </thead>
-    <tbody id="the-list">
 <?php
 cat_rows();
 ?>
-    </tbody>
 </table>
+<div id="ajax-response"></div>
 </div>
 …
 <?php if ( current_user_can('manage_categories') ) : ?>
 <div class="wrap">
 <p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and bookmarks in that category.  Instead, posts in the deleted category are set to the category <strong>%s</strong> and bookmarks are set to <strong>%s</strong>.'), get_catname(get_option('default_category')), get_catname(get_option('default_link_category'))) ?></p>
+<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete posts from that category, it will just set them back to the default category <strong>%s</strong>.'), get_catname(get_option('default_category'))) ?></p>
 </div>
+<?php include('edit-category-form.php'); ?>
+<div class="wrap">
+    <h2><?php _e('Add New Category') ?></h2>
+    <form name="addcat" id="addcat" action="categories.php" method="post">
+        <p><?php _e('Name:') ?><br />
+        <input type="text" name="cat_name" value="" /></p>
+        <p><?php _e('Category parent:') ?><br />
+        <select name='category_parent' class='postform'>
+        <option value='0'><?php _e('None') ?></option>
+        <?php wp_dropdown_cats(0); ?>
+        </select></p>
+        <p><?php _e('Description: (optional)') ?> <br />
+        <textarea name="category_description" rows="5" cols="50" style="width: 97%;"></textarea></p>
+        <p class="submit"><input type="hidden" name="action" value="addcat" /><input type="submit" name="submit" value="<?php _e('Add Category &raquo;') ?>" /></p>
+    </form>
+</div>
 <?php endif; ?>
 …
 include('admin-footer.php');
 ?>

trunk/wp-admin/edit-comments.php

-                      r4431
+                      r3503
 $title = __('Edit Comments');
 $parent_file = 'edit.php';
 wp_enqueue_script( 'admin-comments' );
+$list_js = true;
 require_once('admin-header.php');
 …
+    }
+}
-function getNumChecked(form)
+{
-    var num = 0;
-    for (i = 0, n = form.elements.length; i < n; i++) {
-        if(form.elements[i].type == "checkbox") {
-            if(form.elements[i].checked == true)
-                num++;
+        }
+    }
-    return num;
+}
 //-->
 </script>
 <div class="wrap">
 <h2><?php _e('Comments'); ?></h2>
 <form name="searchform" action="" method="get" id="editcomments">
+<form name="searchform" action="" method="get">
   <fieldset>
   <legend><?php _e('Show Comments That Contain...') ?></legend>
 …
   <input type="submit" name="submit" value="<?php _e('Search') ?>"  />
   <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
   <?php _e('(Searches within comment text, e-mail, URL, and IP address.)') ?>
+  <?php _e('(Searches within comment text, e-mail, URI, and IP address.)') ?>
   </fieldset>
 </form>
 …
 <?php
 if ( !empty( $_POST['delete_comments'] ) ) :
-    check_admin_referer('bulk-comments');
     $i = 0;
     foreach ($_POST['delete_comments'] as $comment) : // Check the permissions on each
         $comment = (int) $comment;
         $post_id = $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = $comment");
+        // $authordata = get_userdata( $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $post_id") );
+        if ( current_user_can('edit_post', $post_id) ) {
+            if ( !empty( $_POST['spam_button'] ) )
+                wp_set_comment_status($comment, 'spam');
+            else
+                wp_set_comment_status($comment, 'delete');
+        $authordata = get_userdata( $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $post_id") );
+        if ( current_user_can('edit_post', $post_id) ) :
+            wp_set_comment_status($comment, "delete");
             ++$i;
+        }
+        endif;
     endforeach;
+    echo '<div style="background-color: rgb(207, 235, 247);" id="message" class="updated fade"><p>';
+    if ( !empty( $_POST['spam_button'] ) )
+        printf(__('%s comments marked as spam.'), $i);
+    else
+        printf(__('%s comments deleted.'), $i);
+    echo '</p></div>';
+    echo "<div class='wrap'><p>" . sprintf(__('%s comments deleted.'), $i) . "</p></div>";
 endif;
 …
             $start = '';
         echo "<ol id='the-comment-list' class='commentlist' $start>";
+        echo "<ol id='the-list' class='commentlist' $start>";
         $i = 0;
         foreach ($comments as $comment) {
 …
                 $class .= ' alternate';
             echo "<li id='comment-$comment->comment_ID' class='$class'>";
+?>
+<p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
+?>
+        <p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('E-mail:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url ) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
+        <?php comment_text() ?>
+<?php comment_text() ?>
+<p><?php comment_date('M j, g:i A');  ?> &#8212; [
+<?php
+if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+    echo " <a href='comment.php?action=editcomment&amp;comment=".$comment->comment_ID."'>" .  __('Edit') . '</a>';
+    echo ' | <a href="' . wp_nonce_url('comment.php?action=deletecomment&amp;p=' . $comment->comment_post_ID . '&amp;comment=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> ';
+    if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
+        echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&amp;p=' . $comment->comment_post_ID . '&amp;comment=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>';
+        echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&amp;p=' . $comment->comment_post_ID . '&amp;comment=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>';
+    }
+    echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&amp;delete_type=spam&amp;p=" . $comment->comment_post_ID . "&amp;comment=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to mark as spam."), js_escape( $comment->comment_author))  . "', theCommentList );\">" . __('Spam') . "</a> ";
+}
+$post = get_post($comment->comment_post_ID);
+$post_title = wp_specialchars( $post->post_title, 'double' );
+$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
+?>
+ | <a href="<?php echo get_permalink($comment->comment_post_ID); ?>" title="<?php echo $post_title; ?>"><?php _e('View Post') ?></a> ]</p>
+        <p><?php _e('Posted'); echo ' '; comment_date('M j, g:i A');
+            if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+                echo " | <a href=\"post.php?action=editcomment&amp;comment=".$comment->comment_ID."\">" . __('Edit Comment') . "</a>";
+                echo " | <a href=\"post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), wp_specialchars( $comment->comment_author, 1 ))  . "' );\">" . __('Delete Comment') . "</a> &#8212; ";
+            } // end if any comments to show
+            // Get post title
+            if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+                $post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID = $comment->comment_post_ID");
+                $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
+                ?> <a href="post.php?action=edit&amp;post=<?php echo $comment->comment_post_ID; ?>"><?php printf(__('Edit Post &#8220;%s&#8221;'), stripslashes($post_title)); ?></a>
+                <?php } ?>
+             | <a href="<?php echo get_permalink($comment->comment_post_ID); ?>"><?php _e('View Post') ?></a></p>
         </li>
 <?php } // end foreach($comment) ?>
+<?php } // end foreach ?>
 </ol>
 …
 <?php
     } else { //no comments to show
+    } else {
         ?>
         <p>
         <strong><?php _e('No comments found.') ?></strong></p>
         <?php
     } // end if ($comments)
 …
     if ($comments) {
+        echo '<form name="deletecomments" id="deletecomments" action="" method="post"> ';
+        wp_nonce_field('bulk-comments');
+        echo '<table class="widefat">
+<thead>
+        echo '<form name="deletecomments" id="deletecomments" action="" method="post">
+        <table width="100%" cellpadding="3" cellspacing="3">
   <tr>
     <th scope="col" style="text-align: center"><input type="checkbox" onclick="checkAll(document.getElementById(\'deletecomments\'));" /></th>
+    <th scope="col">*</th>
     <th scope="col">' .  __('Name') . '</th>
     <th scope="col">' .  __('E-mail') . '</th>
     <th scope="col">' . __('IP') . '</th>
     <th scope="col">' . __('Comment Excerpt') . '</th>
+    <th scope="col" colspan="3" style="text-align: center">' .  __('Actions') . '</th>
+  </tr>
+</thead>';
+    <th scope="col" colspan="3">' .  __('Actions') . '</th>
+  </tr>';
         foreach ($comments as $comment) {
         $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
-        $comment_status = wp_get_comment_status($comment->comment_ID);
         $class = ('alternate' == $class) ? '' : 'alternate';
-        $class .= ('unapproved' == $comment_status) ? ' unapproved' : '';
 ?>
   <tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'>
+  <tr class='<?php echo $class; ?>'>
     <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
     <td><?php comment_author_link() ?></td>
 …
     <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></td>
     <td><?php comment_excerpt(); ?></td>
+    <td>
+        <?php if ('unapproved' == $comment_status) { ?>
+            (Unapproved)
+        <?php } else { ?>
+            <a href="<?php echo get_permalink($comment->comment_post_ID); ?>#comment-<?php comment_ID() ?>" class="edit"><?php _e('View') ?></a>
+        <?php } ?>
+    </td>
+    <td><a href="<?php echo get_permalink($comment->comment_post_ID); ?>#comment-<?php comment_ID() ?>" class="edit"><?php _e('View') ?></a></td>
     <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
     echo "<a href='comment.php?action=editcomment&amp;comment=$comment->comment_ID' class='edit'>" .  __('Edit') . "</a>"; } ?></td>
+    echo "<a href='post.php?action=editcomment&amp;comment=$comment->comment_ID' class='edit'>" .  __('Edit') . "</a>"; } ?></td>
     <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+        echo "<a href=\"comment.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape( $comment->comment_author ))  . "', theCommentList );\" class='delete'>" . __('Delete') . "</a> ";
+        } ?></td>
+            echo "<a href=\"post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('" . sprintf(__("You are about to delete this comment by \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), $comment->comment_author) . "')\"    class='delete'>" . __('Delete') . "</a>"; } ?></td>
   </tr>
         <?php
         } // end foreach
     ?></table>
 <p class="submit"><input type="submit" name="delete_button" class="delete" value="<?php _e('Delete Checked Comments &raquo;') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php _e("Please select some comments to delete"); ?>'); return false } return confirm('<?php printf(__("You are about to delete %s comments permanently \\n  \'Cancel\' to stop, \'OK\' to delete."), "' + numchecked + '"); ?>')" />
             <input type="submit" name="spam_button" value="<?php _e('Mark Checked Comments as Spam &raquo;') ?>" onclick="return confirm('<?php _e("You are about to mark these comments as spam \\n  \'Cancel\' to stop, \'OK\' to mark as spam.") ?>')" /></p>
+    <p><a href="javascript:;" onclick="checkAll(document.getElementById('deletecomments')); return false; "><?php _e('Invert Checkbox Selection') ?></a></p>
+            <p class="submit"><input type="submit" name="Submit" value="<?php _e('Delete Checked Comments') ?> &raquo;" onclick="return confirm('<?php _e("You are about to delete these comments permanently \\n  \'Cancel\' to stop, \'OK\' to delete.") ?>')" /> </p>
   </form>
-<div id="ajax-response"></div>
 <?php
     } else {

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

-                      r4431
+                      r3503
 <div class="wrap">
+<h2 id="write-post"><?php _e('Write Post'); ?><?php if ( 0 != $post_ID ) : ?>
+ <small class="quickjump"><a href="#preview-post"><?php _e('preview &darr;'); ?></a></small><?php endif; ?></h2>
 <?php
 …
     $form_action = 'post';
     $temp_ID = -1 * time();
+    $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />";
+    wp_nonce_field('add-post');
+    $form_extra = "<input type='hidden' name='temp_ID' value='$temp_ID' />";
 } else {
     $form_action = 'editpost';
+    $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
+    wp_nonce_field('update-post_' .  $post_ID);
+    $form_extra = "<input type='hidden' name='post_ID' value='$post_ID' />";
+}
 …
     $already_pinged = explode("\n", trim($post->pinged));
     foreach ($already_pinged as $pinged_url) {
         $pings .= "\n\t<li>" . wp_specialchars($pinged_url) . "</li>";
+        $pings .= "\n\t<li>$pinged_url</li>";
+    }
     $pings .= '</ul>';
 …
 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
+<input type="hidden" id="hiddenaction" name="action" value="<?php echo $form_action ?>" />
+<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
+<input type="hidden" name="action" value="<?php echo $form_action ?>" />
 <input type="hidden" name="post_author" value="<?php echo $post->post_author ?>" />
-<input type="hidden" id="post_type" name="post_type" value="post" />
 <?php echo $form_extra ?>
 …
 <div id="moremeta">
 <div id="grabit" class="dbx-group">
-<fieldset id="categorydiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Categories') ?></h3>
-<div class="dbx-content">
-<p id="jaxcat"></p>
-<ul id="categorychecklist"><?php dropdown_categories(); ?></ul></div>
-</fieldset>
 <fieldset id="commentstatusdiv" class="dbx-box">
 …
 <fieldset id="passworddiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Post Password') ?></h3>
+<h3 class="dbx-handle"><?php _e('Password-Protect Post') ?></h3>
 <div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo $post->post_password ?>" /></div>
 </fieldset>
 <fieldset id="slugdiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Post Slug') ?></h3>
+<h3 class="dbx-handle"><?php _e('Post slug') ?></h3>
 <div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo $post->post_name ?>" /></div>
 </fieldset>
+<fieldset id="poststatusdiv" class="dbx-box">
+<fieldset id="categorydiv" class="dbx-box">
+<h3 class="dbx-handle"><?php _e('Categories') ?></h3>
+<div class="dbx-content">
+<p id="jaxcat"></p>
+<div id="categorychecklist"><?php dropdown_categories(get_settings('default_category')); ?></div></div>
+</fieldset>
+<fieldset class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Post Status') ?></h3>
 <div class="dbx-content"><?php if ( current_user_can('publish_posts') ) : ?>
 <label for="post_status_publish" class="selectit"><input id="post_status_publish" name="post_status" type="radio" value="publish" <?php checked($post->post_status, 'publish'); checked($post->post_status, 'future'); ?> /> <?php _e('Published') ?></label>
+<label for="post_status_publish" class="selectit"><input id="post_status_publish" name="post_status" type="radio" value="publish" <?php checked($post->post_status, 'publish'); ?> /> <?php _e('Published') ?></label>
 <?php endif; ?>
       <label for="post_status_draft" class="selectit"><input id="post_status_draft" name="post_status" type="radio" value="draft" <?php checked($post->post_status, 'draft'); ?> /> <?php _e('Draft') ?></label>
 …
 <?php if ( current_user_can('edit_posts') ) : ?>
 <fieldset id="posttimestampdiv" class="dbx-box">
+<fieldset class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Post Timestamp'); ?>:</h3>
 <div class="dbx-content"><?php touch_time(($action == 'edit')); ?></div>
 …
 <?php endif; ?>
+<?php
+$authors = get_editable_authors( $current_user->id ); // TODO: ROLE SYSTEM
+if ( $authors && count( $authors ) > 1 ) :
+?>
+<?php if ( $authors = get_editable_authors( $current_user->id ) ) : // TODO: ROLE SYSTEM ?>
 <fieldset id="authordiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Post Author'); ?>:</h3>
+<h3 class="dbx-handle"><?php _e('Post author'); ?>:</h3>
 <div class="dbx-content">
 <select name="post_author_override" id="post_author_override">
 …
 <legend><?php _e('Post') ?></legend>
+    <?php the_editor($post->post_content); ?>
+</fieldset>
+<?php
+ $rows = get_settings('default_post_edit_rows');
+ if (($rows < 3) || ($rows > 100)) {
+     $rows = 12;
+ }
+?>
+<?php the_quicktags(); ?>
+<div><textarea <?php if ( user_can_richedit() ) echo 'title="true" '; ?>rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="2" id="content"><?php echo user_can_richedit() ? wp_richedit_pre($post->post_content) : $post->post_content; ?></textarea></div>
+</fieldset>
+<script type="text/javascript">
+<!--
+edCanvas = document.getElementById('content');
+<?php if ( user_can_richedit() ) : ?>
+// This code is meant to allow tabbing from Title to Post (TinyMCE).
+if ( tinyMCE.isMSIE )
+    document.getElementById('title').onkeydown = function (e)
+        {
+            e = e ? e : window.event;
+            if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
+                var i = tinyMCE.selectedInstance;
+                if(typeof i ==  'undefined')
+                    return true;
+                                tinyMCE.execCommand("mceStartTyping");
+                this.blur();
+                i.contentWindow.focus();
+                e.returnValue = false;
+                return false;
+            }
+        }
+else
+    document.getElementById('title').onkeypress = function (e)
+        {
+            e = e ? e : window.event;
+            if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
+                var i = tinyMCE.selectedInstance;
+                if(typeof i ==  'undefined')
+                    return true;
+                                tinyMCE.execCommand("mceStartTyping");
+                this.blur();
+                i.contentWindow.focus();
+                e.returnValue = false;
+                return false;
+            }
+        }
+<?php endif; ?>
+//-->
+</script>
 <?php echo $form_pingback ?>
 …
+<p class="submit">
+<span id="autosave"></span>
+<?php echo $saveasdraft; ?>
+<input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="4" />
+<p class="submit"><?php echo $saveasdraft; ?> <input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="4" />
 <?php
 if ('publish' != $post->post_status || 0 == $post_ID) {
 …
 if ( !empty($_REQUEST['popupurl']) )
     echo wp_specialchars($_REQUEST['popupurl']);
 else if ( url_to_postid(wp_get_referer()) == $post_ID )
+else if ( url_to_postid($_SERVER['HTTP_REFERER']) == $post_ID )
     echo 'redo';
 else
     echo wp_specialchars(wp_get_referer());
+    echo wp_specialchars($_SERVER['HTTP_REFERER']);
 ?>" /></p>
 …
 if (current_user_can('upload_files')) {
     $uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
     $uploading_iframe_src = wp_nonce_url("upload.php?style=inline&amp;tab=upload&amp;post_id=$uploading_iframe_ID", 'inlineuploading');
+    $uploading_iframe_src = "inline-uploading.php?action=view&amp;post=$uploading_iframe_ID";
     $uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
     if ( false != $uploading_iframe_src )
         echo '<iframe id="uploading" frameborder="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';
+        echo '<iframe id="uploading" border="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';
+}
 ?>
 …
 <div id="advancedstuff" class="dbx-group" >
-<div class="dbx-box-wrapper">
 <fieldset id="postexcerpt" class="dbx-box">
-<div class="dbx-handle-wrapper">
 <h3 class="dbx-handle"><?php _e('Optional Excerpt') ?></h3>
-</div>
-<div class="dbx-content-wrapper">
 <div class="dbx-content"><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea></div>
+</div>
+</fieldset>
+</div>
+<div class="dbx-box-wrapper">
+<fieldset id="trackbacksdiv" class="dbx-box">
+<div class="dbx-handle-wrapper">
+</fieldset>
+<fieldset class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Trackbacks') ?></h3>
-</div>
-<div class="dbx-content-wrapper">
 <div class="dbx-content"><?php _e('Send trackbacks to'); ?>: <?php echo $form_trackback; ?> (<?php _e('Separate multiple URIs with spaces'); ?>)
 <?php
 …
 ?>
 </div>
+</div>
+</fieldset>
+</div>
+<div class="dbx-box-wrapper">
+</fieldset>
 <fieldset id="postcustom" class="dbx-box">
-<div class="dbx-handle-wrapper">
 <h3 class="dbx-handle"><?php _e('Custom Fields') ?></h3>
-</div>
-<div class="dbx-content-wrapper">
 <div id="postcustomstuff" class="dbx-content">
 <table cellpadding="3">
+<?php
+$metadata = has_meta($post_ID);
+list_meta($metadata);
+?>
 </table>
+<?php
+<?php
+if($metadata = has_meta($post_ID)) {
+?>
+<?php
+    list_meta($metadata);
+?>
+<?php
+}
     meta_form();
 ?>
+<div id="ajax-response"></div>
+</div>
+</div>
+</fieldset>
+</div>
+</div>
+</fieldset>
 <?php do_action('dbx_post_advanced'); ?>
 …
 </div>
 <?php if ('edit' == $action) : $delete_nonce = wp_create_nonce( 'delete-post_' . $post_ID ); ?>
 <input name="deletepost" class="button delete" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this post') ?>" <?php echo "onclick=\"if ( confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), js_escape($post->post_title) ) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> />
+<?php if ('edit' == $action) : ?>
+<input name="deletepost" class="button" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this post') ?>" <?php echo "onclick=\"return confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), addslashes($post->post_title) ) . "')\""; ?> />
 <?php endif; ?>

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

-                      r4431
+                      r3503
 ?>
+<form name="post" action="comment.php" method="post" id="post">
+<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
+<form name="post" action="post.php" method="post" id="post">
 <div class="wrap">
 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
 …
 </script>
 <fieldset id="namediv">
     <legend><label for="name"><?php _e('Name:') ?></label></legend>
+    <legend><?php _e('Name:') ?></legend>
     <div>
       <input type="text" name="newcomment_author" size="25" value="<?php echo $comment->comment_author ?>" tabindex="1" id="name" />
+      <input type="text" name="newcomment_author" size="22" value="<?php echo $comment->comment_author ?>" tabindex="1" id="name" />
     </div>
 </fieldset>
 <fieldset id="emaildiv">
         <legend><label for="email"><?php _e('E-mail:') ?></label></legend>
+        <legend><?php _e('E-mail:') ?></legend>
         <div>
           <input type="text" name="newcomment_author_email" size="20" value="<?php echo $comment->comment_author_email ?>" tabindex="2" id="email" />
+          <input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email ?>" tabindex="2" id="email" />
     </div>
 </fieldset>
 <fieldset id="uridiv">
         <legend><label for="URL"><?php _e('URL:') ?></label></legend>
+        <legend><?php _e('URI:') ?></legend>
         <div>
           <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo $comment->comment_author_url ?>" tabindex="3" id="URL" />
 …
 <fieldset style="clear: both;">
         <legend><?php _e('Comment') ?></legend>
+    <?php the_editor($comment->comment_content, 'content', 'newcomment_author_url'); ?>
+<?php the_quicktags(); ?>
+<?php
+ $rows = get_settings('default_post_edit_rows');
+ if (($rows < 3) || ($rows > 100)) {
+     $rows = 10;
+ }
+?>
+<div><textarea title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content" style="width: 99%"><?php echo user_can_richedit() ? wp_richedit_pre($comment->comment_content) : $comment->comment_content; ?></textarea></div>
 </fieldset>
+<script type="text/javascript">
+<!--
+edCanvas = document.getElementById('content');
+<?php if ( user_can_richedit() ) : ?>
+// This code is meant to allow tabbing from Author URL to Post (TinyMCE).
+if ( tinyMCE.isMSIE )
+    document.getElementById('newcomment_author_url').onkeydown = function (e)
+        {
+            e = e ? e : window.event;
+            if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
+                var i = tinyMCE.selectedInstance;
+                if(typeof i ==  'undefined')
+                    return true;
+                                tinyMCE.execCommand("mceStartTyping");
+                this.blur();
+                i.contentWindow.focus();
+                e.returnValue = false;
+                return false;
+            }
+        }
+else
+    document.getElementById('newcomment_author_url').onkeypress = function (e)
+        {
+            e = e ? e : window.event;
+            if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
+                var i = tinyMCE.selectedInstance;
+                if(typeof i ==  'undefined')
+                    return true;
+                                tinyMCE.execCommand("mceStartTyping");
+                this.blur();
+                i.contentWindow.focus();
+                e.returnValue = false;
+                return false;
+            }
+        }
+<?php endif; ?>
+//-->
+</script>
 <p class="submit"><input type="submit" name="editcomment" id="editcomment" value="<?php echo $submitbutton_text ?>" style="font-weight: bold;" tabindex="6" />
   <input name="referredby" type="hidden" id="referredby" value="<?php echo wp_get_referer(); ?>" />
+  <input name="referredby" type="hidden" id="referredby" value="<?php echo $_SERVER['HTTP_REFERER']; ?>" />
 </p>
 …
 <?php if ( current_user_can('edit_posts') ) : ?>
     <tr>
         <th scope="row" valign="top"><?php _e('Edit time'); ?>:</th>
         <td><?php touch_time(('editcomment' == $action), 0); ?> </td>
+        <th scope="row"><?php _e('Edit time'); ?>:</th>
+        <td><?php touch_time(('editcomment' == $action), 0); ?></td>
     </tr>
 <?php endif; ?>
     <tr>
+        <th scope="row" valign="top"><?php _e('Delete'); $delete_nonce = wp_create_nonce( 'delete-comment_' . $comment->comment_ID ); ?>:</th>
+        <td><input name="deletecomment" class="button delete" type="submit" id="deletecomment" tabindex="10" value="<?php _e('Delete this comment') ?>" <?php echo "onclick=\"if ( confirm('" . __("You are about to delete this comment \\n  \'Cancel\' to stop, \'OK\' to delete.") . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true; } return false;\""; ?> />
+        <input type="hidden" name="comment" value="<?php echo $comment->comment_ID ?>" />
+        <input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" />
+        <input type="hidden" name="noredir" value="1" />
+    </td>
+        <th scope="row"><?php _e('Delete'); ?>:</th>
+        <td><p><a class="delete" href="post.php?action=confirmdeletecomment&amp;noredir=true&amp;comment=<?php echo $comment->comment_ID; ?>&amp;p=<?php echo $comment->comment_post_ID; ?>"><?php _e('Delete comment') ?></a></p></td>
     </tr>
 </table>

trunk/wp-admin/edit-form.php

-                      r4431
+                      r3503
 <?php the_quicktags(); ?>
 <?php
  $rows = get_option('default_post_edit_rows');
+ $rows = get_settings('default_post_edit_rows');
  if (($rows < 3) || ($rows > 100)) {
      $rows = 10;
 …
 <input type="hidden" name="post_pingback" value="<?php echo get_option('default_pingback_flag') ?>" id="post_pingback" />
 <p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Locator">URL</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Locator">URL</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') ?>
+<p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Identifier">URI</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') ?>
     <input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>
 …
       echo '<input name="advanced" type="submit" id="advancededit" tabindex="7" value="' .  __('Advanced Editing &raquo;') . '" />';
   } ?>
   <input name="referredby" type="hidden" id="referredby" value="<?php if ( wp_get_referer() ) echo urlencode(wp_get_referer()); ?>" />
+  <input name="referredby" type="hidden" id="referredby" value="<?php if (isset($_SERVER['HTTP_REFERER'])) echo urlencode($_SERVER['HTTP_REFERER']); ?>" />
 </p>

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

-                      r4431
+                      r3503
 <?php
 if ( ! empty($link_id) ) {
+    $heading = __('Edit Link');
+    $editing = true;
+    $heading = __('Edit a link:');
     $submit_text = __('Save Changes &raquo;');
+    $form = '<form name="editlink" id="editlink" method="post" action="link.php">';
+    $nonce_action = 'update-bookmark_' . $link_id;
+    $form = '<form action="" method="post" name="editlink" id="editlink">';
 } else {
+    $heading = __('Add Link');
+    $editing = false;
+    $heading = __('<strong>Add</strong> a link:');
     $submit_text = __('Add Link &raquo;');
+    $form = '<form name="addlink" id="addlink" method="post" action="link.php">';
+    $nonce_action = 'add-bookmark';
+    $form = '<form name="addlink" method="post" action="link-manager.php">';
+}
 …
+    }
+}
 ?>
 <div class="wrap">
+<h2><?php echo $heading ?></h2>
+<?php echo $form ?>
+<?php wp_nonce_field($nonce_action); ?>
+<div id="poststuff">
+<div id="moremeta">
+<div id="grabit" class="dbx-group">
+<fieldset id="categorydiv" class="dbx-box">
+<h3 class="dbx-handle"><?php _e('Categories') ?></h3>
+<div class="dbx-content">
+<p id="jaxcat"></p>
+<ul id="categorychecklist"><?php dropdown_link_categories(get_option('default_link_category')); ?></ul>
+</div>
+</fieldset>
+<fieldset class="dbx-box">
+<h3 class="dbx-handle"><?php _e('Target') ?></h3>
+<div class="dbx-content">
+<label for="link_target_blank" class="selectit">
+<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
+<code>_blank</code></label>
+<label for="link_target_top" class="selectit">
+<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo(($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
+<code>_top</code></label>
+<label for="link_target_none" class="selectit">
+<input id="link_target_none" type="radio" name="link_target" value="" <?php echo(($link->link_target == '') ? 'checked="checked"' : ''); ?> />
+<?php _e('none') ?></label>
+</div>
+</fieldset>
+<fieldset class="dbx-box">
+<h3 class="dbx-handle"><?php _e('Visible') ?></h3>
+<div class="dbx-content">
+<label for="link_visible_yes" class="selectit">
+<input id="link_visible_yes" type="radio" name="link_visible" <?php if ($link->link_visible == 'Y') echo "checked='checked'"; ?> value="Y" />
+<?php _e('Yes') ?></label>
+<label for="link_visible_no" class="selectit">
+<input id="link_visible_no" type="radio" name="link_visible" <?php if ($link->link_visible == 'N') echo "checked='checked'"; ?> value="N" />
+<?php _e('No') ?></label>
+</div>
+</fieldset>
+</div>
+</div>
+<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+<tr>
+<th scope="row" valign="top"><label for="link_name"><?php _e('Name:') ?></label></th>
+<td><input type="text" name="link_name" value="<?php echo $link->link_name; ?>" style="width: 95%" /></td>
+</tr>
+<tr>
+<th width="20%" scope="row" valign="top"><label for="link_url"><?php _e('Address:') ?></label></th>
+<td width="80%"><input type="text" name="link_url" value="<?php echo $link->link_url; if ( empty( $link->link_url ) ) echo 'http://'; ?>" style="width: 95%" /></td>
+</tr>
+<tr>
+<th scope="row" valign="top"><label for="link_description"><?php _e('Description:') ?></label></th>
+<td><input type="text" name="link_description" value="<?php echo $link->link_description; ?>" style="width: 95%" /></td>
+</tr>
+</table>
+<p class="submit">
+<input type="submit" name="submit" value="<?php echo $submit_text ?>" />
+</p>
+<div id="advancedstuff" class="dbx-group" >
+<fieldset id="xfn" class="dbx-box">
+<h3 class="dbx-handle"><?php _e('Link Relationship (XFN)') ?></h3>
+<div class="dbx-content">
+<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+    <tr>
+        <th width="20%" scope="row"><?php _e('rel:') ?></th>
+        <td width="80%"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
+    </tr>
+    <tr>
+        <th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th>
+        <td>
+            <table cellpadding="3" cellspacing="5">
+                <tr>
+                    <th scope="row"> <?php _e('identity') ?> </th>
+                    <td>
+                        <label for="me">
+                        <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
+                        <?php _e('another web address of mine') ?></label>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row"> <?php _e('friendship') ?> </th>
+                    <td>
+                        <label for="contact">
+                        <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
+                        <label for="acquaintance">
+                        <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php _e('acquaintance') ?></label>
+                        <label for="friend">
+                        <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
+                        <label for="friendship">
+                        <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row"> <?php _e('physical') ?> </th>
+                    <td>
+                        <label for="met">
+                        <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
+                        <?php _e('met') ?></label>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row"> <?php _e('professional') ?> </th>
+                    <td>
+                        <label for="co-worker">
+                        <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
+                        <?php _e('co-worker') ?></label>
+                        <label for="colleague">
+                        <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
+                        <?php _e('colleague') ?></label>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row"> <?php _e('geographical') ?> </th>
+                    <td>
+                        <label for="co-resident">
+                        <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
+                        <?php _e('co-resident') ?></label>
+                        <label for="neighbor">
+                        <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> />
+                        <?php _e('neighbor') ?></label>
+                        <label for="geographical">
+                        <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
+                        <?php _e('none') ?></label>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row"> <?php _e('family') ?> </th>
+                    <td>
+                        <label for="child">
+                        <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
+                        <?php _e('child') ?></label>
+                        <label for="kin">
+                        <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin', 'radio'); ?>  />
+                        <?php _e('kin') ?></label>
+                        <label for="parent">
+                        <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent', 'radio'); ?> />
+                        <?php _e('parent') ?></label>
+                        <label for="sibling">
+                        <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling', 'radio'); ?> />
+                        <?php _e('sibling') ?></label>
+                        <label for="spouse">
+                        <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse', 'radio'); ?> />
+                        <?php _e('spouse') ?></label>
+                        <label for="family">
+                        <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
+                        <?php _e('none') ?></label>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row"> <?php _e('romantic') ?> </th>
+                    <td>
+                        <label for="muse">
+                        <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
+                        <?php _e('muse') ?></label>
+                        <label for="crush">
+                        <input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />
+                        <?php _e('crush') ?></label>
+                        <label for="date">
+                        <input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />
+                        <?php _e('date') ?></label>
+                        <label for="romantic">
+                        <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
+                        <?php _e('sweetheart') ?></label>
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+</div>
+</fieldset>
+<fieldset id="advanced" class="dbx-box">
+<h3 class="dbx-handle"><?php _e('Advanced') ?></h3>
+<div class="dbx-content">
+<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+    <tr>
+        <th width="20%" scope="row"><?php _e('Image Address:') ?></th>
+        <td width="80%"><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 Address:') ?> </th>
+        <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="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="link_rating" size="1">
+        <?php
+            for ($r = 0; $r < 10; $r++) {
+                echo('            <option value="'.$r.'" ');
+                if ($link->link_rating == $r)
+                    echo 'selected="selected"';
+                echo('>'.$r.'</option>');
+            }
+        ?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
+        </td>
+    </tr>
+  <?php echo $form ?>
+  <h2><?php echo $heading ?></h2>
+<fieldset class="options">
+    <legend><?php _e('Basics') ?></legend>
+        <table class="editform" width="100%" cellspacing="2" cellpadding="5">
+         <tr>
+           <th width="33%" scope="row"><?php _e('URI:') ?></th>
+           <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="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="link_description" value="<?php echo $link->link_description; ?>" style="width: 95%" /></td>
+            </tr>
+        <tr>
+           <th scope="row"><?php _e('Category:') ?></th>
+           <td><?php link_category_dropdown('link_category', $link->link_category); ?></td>
+         </tr>
 </table>
 </fieldset>
+       <p class="submit">
+       <input type="submit" name="submit" value="<?php echo $submit_text ?>" />
+       </p>
+    <fieldset class="options">
+        <legend><?php _e('Link Relationship (XFN)') ?></legend>
+        <table class="editform" width="100%" cellspacing="2" cellpadding="5">
+            <tr>
+                <th width="33%" scope="row"><?php _e('rel:') ?></th>
+                <td width="67%"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
+            </tr>
+            <tr>
+                <th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th>
+                <td>
+                    <table cellpadding="3" cellspacing="5">
+              <tr>
+              <th scope="row"> <?php _e('identity') ?> </th>
+              <td>
+                <label for="me">
+                <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
+          <?php _e('another web address of mine') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('friendship') ?> </th>
+              <td>
+                <label for="contact">
+                <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
+                <label for="acquaintance">
+                <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php _e('acquaintance') ?></label>
+                <label id="friend">
+                <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
+                <label for="friendship">
+                <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('physical') ?> </th>
+              <td>
+                <label for="met">
+                <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
+          <?php _e('met') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('professional') ?> </th>
+              <td>
+                <label for="co-worker">
+                <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
+          <?php _e('co-worker') ?></label>
+                <label for="colleague">
+                <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
+          <?php _e('colleague') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('geographical') ?> </th>
+              <td>
+                <label for="co-resident">
+                <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
+          <?php _e('co-resident') ?></label>
+                <label for="neighbor">
+                <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> />
+          <?php _e('neighbor') ?></label>
+                <label for="geographical">
+                <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
+          <?php _e('none') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('family') ?> </th>
+              <td>
+                <label for="child">
+                <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
+          <?php _e('child') ?></label>
+                <label for="kin">
+                <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin', 'radio'); ?>  />
+          <?php _e('kin') ?></label>
+                <label for="parent">
+                <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent', 'radio'); ?> />
+          <?php _e('parent') ?></label>
+                <label for="sibling">
+                <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling', 'radio'); ?> />
+          <?php _e('sibling') ?></label>
+                <label for="spouse">
+                <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse', 'radio'); ?> />
+          <?php _e('spouse') ?></label>
+                <label for="family">
+                <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
+          <?php _e('none') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('romantic') ?> </th>
+              <td>
+                <label for="muse">
+                <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
+         <?php _e('muse') ?></label>
+                <label for="crush">
+                <input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />
+         <?php _e('crush') ?></label>
+                <label for="date">
+                <input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />
+         <?php _e('date') ?></label>
+                <label for="romantic">
+                <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
+         <?php _e('sweetheart') ?></label>
+              </td>
+            </tr>
+        </table>
+          </td>
+            </tr>
+</table>
+</fieldset>
+       <p class="submit">
+       <input type="submit" name="submit" value="<?php echo $submit_text ?>" />
+       </p>
+<fieldset class="options">
+        <legend><?php _e('Advanced') ?></legend>
+        <table class="editform" width="100%" cellspacing="2" cellpadding="5">
+         <tr>
+           <th width="33%" scope="row"><?php _e('Image URI:') ?></th>
+           <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="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="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="link_rating" size="1">
+<?php
+    for ($r = 0; $r < 10; $r++) {
+      echo('            <option value="'.$r.'" ');
+      if ($link->link_rating == $r)
+        echo 'selected="selected"';
+      echo('>'.$r.'</option>');
+    }
+?>
+           </select>
+         &nbsp;<?php _e('(Leave at 0 for no rating.)') ?> </td>
+         </tr>
+         <tr>
+           <th scope="row"><?php _e('Target') ?></th>
+           <td><label>
+          <input type="radio" name="link_target" value="_blank"   <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
+          <code>_blank</code></label><br />
+<label>
+<input type="radio" name="link_target" value="_top" <?php echo(($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
+<code>_top</code></label><br />
+<label>
+<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>
+         </tr>
+         <tr>
+           <th scope="row"><?php _e('Visible:') ?></th>
+           <td><label>
+             <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="link_visible" <?php if ($link->link_visible == 'N') echo "checked='checked'"; ?> value="N" />
+<?php _e('No') ?></label></td>
+         </tr>
+</table>
+</fieldset>
+<p class="submit"><input type="submit" name="submit" value="<?php echo $submit_text ?>" /></p>
+<?php if ( $editing ) : ?>
+          <input type="hidden" name="action" value="editlink" />
+          <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
+          <input type="hidden" name="order_by" value="<?php echo wp_specialchars($order_by, 1); ?>" />
+          <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />
+<?php else: ?>
+        <input type="hidden" name="action" value="Add" />
+<?php endif; ?>
+</form>
 </div>
-<?php if ( $link_id ) : ?>
-<input type="hidden" name="action" value="save" />
-<input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
-<input type="hidden" name="order_by" value="<?php echo wp_specialchars($order_by, 1); ?>" />
-<input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />
-<?php else: ?>
-<input type="hidden" name="action" value="add" />
-<?php endif; ?>
-</div>
-</form>
-</div>

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

-                      r4431
+                      r3503
 <div class="wrap">
+<h2 id="write-post"><?php _e('Write Page'); ?></h2>
+<h2 id="write-post"><?php _e('Write Page'); ?><?php if ( 0 != $post_ID ) : ?>
+<small class="quickjump"><a href="#preview-post"><?php _e('preview &darr;'); ?></a></small><?php endif; ?></h2>
 <?php
 if (0 == $post_ID) {
     $form_action = 'post';
-    $nonce_action = 'add-page';
     $temp_ID = -1 * time();
     $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />";
+    $form_extra = "<input type='hidden' name='temp_ID' value='$temp_ID' />";
 } else {
     $form_action = 'editpost';
+    $nonce_action = 'update-page_' . $post_ID;
+    $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
+}
+$sendto = wp_get_referer();
+    $form_extra = "<input type='hidden' name='post_ID' value='$post_ID' />";
+}
+$sendto = $_SERVER['HTTP_REFERER'];
 if ( 0 != $post_ID && $sendto == get_permalink($post_ID) )
 …
 ?>
+<form name="post" action="page.php" method="post" id="post">
+<?php
+wp_nonce_field($nonce_action);
+<form name="post" action="post.php" method="post" id="post">
+<?php
 if (isset($mode) && 'bookmarklet' == $mode) {
     echo '<input type="hidden" name="mode" value="bookmarklet" />';
 …
 ?>
 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
+<input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' />
+<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
+<input type="hidden" name="action" value='<?php echo $form_action ?>' />
 <?php echo $form_extra ?>
 <input type="hidden" id="post_type" name="post_type" value="page" />
+<input type="hidden" name="post_status" value="static" />
 <script type="text/javascript">
+// <![CDATA[
+<!--
 function focusit() { // focus on first input field
     document.post.title.focus();
+}
 addLoadEvent(focusit);
 // ]]>
+//-->
 </script>
 <div id="poststuff">
 …
 </fieldset>
-<fieldset class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Status') ?></h3>
-<div class="dbx-content"><?php if ( current_user_can('publish_pages') ) : ?>
-<label for="post_status_publish" class="selectit"><input id="post_status_publish" name="post_status" type="radio" value="publish" <?php checked($post->post_status, 'publish'); checked($post->post_status, 'future'); ?> /> <?php _e('Published') ?></label>
-<?php endif; ?>
-      <label for="post_status_draft" class="selectit"><input id="post_status_draft" name="post_status" type="radio" value="draft" <?php checked($post->post_status, 'draft'); ?> /> <?php _e('Draft') ?></label>
-      <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="radio" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php _e('Private') ?></label></div>
-</fieldset>
 <fieldset id="passworddiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Page Password') ?></h3>
+<h3 class="dbx-handle"><?php _e('Password-Protect Post') ?></h3>
 <div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo $post->post_password ?>" /></div>
 </fieldset>
 …
 <?php if ( 0 != count( get_page_templates() ) ) { ?>
 <fieldset id="pagetemplate" class="dbx-box">
+<fieldset id="pageparent" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Page Template:') ?></h3>
 <div class="dbx-content"><p><select name="page_template">
 …
 <fieldset id="slugdiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Page Slug') ?></h3>
+<h3 class="dbx-handle"><?php _e('Post slug') ?></h3>
 <div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo $post->post_name ?>" /></div>
 </fieldset>
 …
 <?php if ( $authors = get_editable_authors( $current_user->id ) ) : // TODO: ROLE SYSTEM ?>
 <fieldset id="authordiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Page Author'); ?>:</h3>
+<h3 class="dbx-handle"><?php _e('Post author'); ?>:</h3>
 <div class="dbx-content">
 <select name="post_author_override" id="post_author_override">
 …
 <fieldset id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>">
     <legend><?php _e('Page Content') ?></legend>
+    <?php the_editor($post->post_content); ?>
+</fieldset>
+<?php
+ $rows = get_settings('default_post_edit_rows');
+ if (($rows < 3) || ($rows > 100)) {
+     $rows = 10;
+ }
+?>
+<?php the_quicktags(); ?>
+<div><textarea title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content"><?php echo user_can_richedit() ? wp_richedit_pre($post->post_content) : $post->post_content; ?></textarea></div>
+</fieldset>
+<script type="text/javascript">
+<!--
+edCanvas = document.getElementById('content');
+<?php if ( user_can_richedit() ) : ?>
+// This code is meant to allow tabbing from Title to Post (TinyMCE).
+if ( tinyMCE.isMSIE )
+    document.getElementById('title').onkeydown = function (e)
+        {
+            e = e ? e : window.event;
+            if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
+                var i = tinyMCE.selectedInstance;
+                if(typeof i ==  'undefined')
+                    return true;
+                                tinyMCE.execCommand("mceStartTyping");
+                this.blur();
+                i.contentWindow.focus();
+                e.returnValue = false;
+                return false;
+            }
+        }
+else
+    document.getElementById('title').onkeypress = function (e)
+        {
+            e = e ? e : window.event;
+            if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
+                var i = tinyMCE.selectedInstance;
+                if(typeof i ==  'undefined')
+                    return true;
+                                tinyMCE.execCommand("mceStartTyping");
+                this.blur();
+                i.contentWindow.focus();
+                e.returnValue = false;
+                return false;
+            }
+        }
+<?php endif; ?>
+//-->
+</script>
 <p class="submit">
+<span id="autosave"></span>
+<input name="save" type="submit" id="save" tabindex="3" value="<?php _e('Save and Continue Editing'); ?>" />
+<input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="4" />
+<?php
+if ('publish' != $post->post_status || 0 == $post_ID):
+?>
+<?php if ( current_user_can('publish_pages') ) : ?>
+    <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
+<?php endif; endif;?>
+<?php if ( $post_ID ) : ?>
+<input name="save" type="submit" id="save" tabindex="5" value=" <?php _e('Save and Continue Editing'); ?> "/>
+<input name="savepage" type="submit" id="savepage" tabindex="6" value="<?php $post_ID ? _e('Save') : _e('Create New Page') ?> &raquo;" />
+<?php else : ?>
+<input name="savepage" type="submit" id="savepage" tabindex="6" value="<?php _e('Create New Page') ?> &raquo;" />
+<?php endif; ?>
 <input name="referredby" type="hidden" id="referredby" value="<?php echo $sendto; ?>" />
 </p>
 …
 if (current_user_can('upload_files')) {
     $uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
     $uploading_iframe_src = wp_nonce_url("upload.php?style=inline&amp;tab=upload&amp;post_id=$uploading_iframe_ID", 'inlineuploading');
+    $uploading_iframe_src = "inline-uploading.php?action=view&amp;post=$uploading_iframe_ID";
     $uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
     if ( false != $uploading_iframe_src )
         echo '<iframe id="uploading" frameborder="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';
+        echo '<iframe id="uploading" border="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';
+}
 ?>
 …
 <h3 class="dbx-handle"><?php _e('Custom Fields') ?></h3>
 <div id="postcustomstuff" class="dbx-content">
-<table cellpadding="3">
 <?php
+$metadata = has_meta($post_ID);
+list_meta($metadata);
+?>
+</table>
+<?php
+if($metadata = has_meta($post_ID)) {
+?>
+<?php
+    list_meta($metadata);
+?>
+<?php
+}
     meta_form();
 ?>
 </div>
-<div id="ajax-response"></div>
 </fieldset>
 …
 </div>
+<?php if ('edit' == $action) :
+    $delete_nonce = wp_create_nonce( 'delete-page_' . $post_ID );
+    if ( current_user_can('delete_page', $post->ID) ) ?>
+        <input name="deletepost" class="button delete" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this page') ?>" <?php echo "onclick=\"if ( confirm('" . sprintf(__("You are about to delete this page \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), js_escape($post->post_title) ) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> />
+<?php endif; ?>
+</div>
+<?php if ('edit' == $action) : ?>
+        <input name="deletepost" class="delete" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this page') ?>" <?php echo "onclick=\"return confirm('" . sprintf(__("You are about to delete this page \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), $wpdb->escape($post->post_title) ) . "')\""; ?> />
+<?php endif; ?>
 </form>
 </div>
+</div>

trunk/wp-admin/edit-pages.php

-                      r4431
+                      r3503
 $title = __('Pages');
 $parent_file = 'edit.php';
 wp_enqueue_script( 'listman' );
+$list_js = true;
 require_once('admin-header.php');
 ?>
 …
 <div class="wrap">
 <h2><?php _e('Page Management'); ?></h2>
 <p><?php _e('Pages are like posts except they live outside of the normal blog chronology and can be hierarchical. You can use pages to organize and manage any amount of content.'); ?> <a href="page-new.php"><?php _e('Create a new page &raquo;'); ?></a></p>
+<p><?php _e('Pages are like posts except they live outside of the normal blog chronology and can be hierarchical. You can use pages to organize and manage any amount of content.'); ?> <a href="page-new.php"><?php _e('Create a new page'); ?> &raquo;</a></p>
 <form name="searchform" action="" method="get">
 …
 <?php
-wp('post_type=page&orderby=menu_order&what_to_show=posts&posts_per_page=-1&posts_per_archive_page=-1');
+if ( $_GET['s'] )
+    $all = false;
+$show_post_type = 'page';
+if ( isset($_GET['s']) )
+    wp();
 else
     $all = true;
+    $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts WHERE post_status = 'static'");
 if ($posts) {
 ?>
+<table class="widefat">
+  <thead>
+  <tr>
+    <th scope="col" style="text-align: center"><?php _e('ID') ?></th>
+    <th scope="col"><?php _e('Title') ?></th>
+<table id="the-list-x" width="100%" cellpadding="3" cellspacing="3">
+  <tr>
+    <th scope="col"><?php _e('ID') ?></th>
+    <th scope="col"><?php _e('Title') ?></th>
     <th scope="col"><?php _e('Owner') ?></th>
     <th scope="col"><?php _e('Updated') ?></th>
+    <th scope="col" colspan="3" style="text-align: center"><?php _e('Action'); ?></th>
+    <th scope="col"></th>
+    <th scope="col"></th>
+    <th scope="col"></th>
+  </tr>
+<?php
+if ( isset($_GET['s']) ) {
+foreach ( $posts as $post ) :
+    $class = ('alternate' != $class) ? 'alternate' : ''; ?>
+  <tr id='page-<?php echo $id; ?>' class='<?php echo $class; ?>'>
+    <th scope="row"><?php echo $post->ID; ?></th>
+    <td>
+      <?php echo $pad; ?><?php the_title() ?>
+    </td>
+    <td><?php the_author() ?></td>
+    <td><?php echo mysql2date('Y-m-d g:i a', $post->post_modified); ?></td>
+    <td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit"><?php _e('View'); ?></a></td>
+    <td><?php if ( current_user_can('edit_pages') ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td>
+    <td><?php if ( current_user_can('edit_pages') ) { echo "<a href='post.php?action=delete&amp;post=$id' class='delete' onclick=\"return deleteSomething( 'page', " . $id . ", '" . sprintf(__("You are about to delete the &quot;%s&quot; page.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), wp_specialchars(get_the_title('','',0), 1)) . "' );\">" . __('Delete') . "</a>"; } ?></td>
   </tr>
-  </thead>
-  <tbody id="the-list">
 <?php
+page_rows(0, 0, $posts, $all);
+endforeach;
+} else {
+    page_rows();
+}
 ?>
+  </tbody>
+</table>
+</table>
 <div id="ajax-response"></div>
 …
 ?>
 <h3><a href="page-new.php"><?php _e('Create New Page &raquo;'); ?></a></h3>
+<h3><a href="page-new.php"><?php _e('Create New Page'); ?> &raquo;</a></h3>
 </div>

trunk/wp-admin/edit.php

-                      r4431
+                      r3503
 $title = __('Posts');
 $parent_file = 'edit.php';
 wp_enqueue_script( 1 == $_GET['c'] ? 'admin-comments' : 'listman' );
+$list_js = true;
 require_once('admin-header.php');
 …
 <h2>
 <?php
+wp('what_to_show=posts&posts_per_page=15&posts_per_archive_page=-1');
+$what_to_show = 'posts';
+$posts_per_page = 15;
+$posts_per_archive_page = -1;
+wp();
 if ( is_month() ) {
 …
 </h2>
 <form name="searchform" id="searchform" action="" method="get">
+<form name="searchform" action="" method="get" style="float: left; width: 16em; margin-right: 3em;">
   <fieldset>
   <legend><?php _e('Search Posts&hellip;') ?></legend>
   <input type="text" name="s" value="<?php if (isset($s)) echo wp_specialchars($s, 1); ?>" size="17" />
   <input type="submit" name="submit" value="<?php _e('Search') ?>" class="button" />
+  <input type="submit" name="submit" value="<?php _e('Search') ?>"  />
   </fieldset>
 </form>
 <?php $arc_result = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'post' ORDER BY post_date DESC");
+<?php $arc_result = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_date != '0000-00-00 00:00:00' ORDER BY post_date DESC");
 if ( count($arc_result) ) { ?>
 <form name="viewarc" id="viewarc" action="" method="get">
+<form name="viewarc" action="" method="get" style="float: left; width: 20em; margin-bottom: 1em;">
     <fieldset>
     <legend><?php _e('Browse Month&hellip;') ?></legend>
     <select name='m'>
     <?php
+        foreach ($arc_result as $arc_row) {
+            if ( $arc_row->yyear == 0 )
+                continue;
+            $arc_row->mmonth = zeroise($arc_row->mmonth, 2);
+            if( isset($_GET['m']) && $arc_row->yyear . $arc_row->mmonth == (int) $_GET['m'] )
+        foreach ($arc_result as $arc_row) {
+            $arc_year  = $arc_row->yyear;
+            $arc_month = $arc_row->mmonth;
+            if( isset($_GET['m']) && $arc_year . zeroise($arc_month, 2) == (int) $_GET['m'] )
                 $default = 'selected="selected"';
             else
                 $default = null;
             echo "<option $default value='$arc_row->yyear$arc_row->mmonth'>";
             echo $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear";
+            echo "<option $default value=\"" . $arc_year.zeroise($arc_month, 2) . '">';
+            echo $month[zeroise($arc_month, 2)] . " $arc_year";
             echo "</option>\n";
+        }
     ?>
     </select>
         <input type="submit" name="submit" value="<?php _e('Show Month') ?>" class="button" />
+        <input type="submit" name="submit" value="<?php _e('Show Month') ?>"  />
     </fieldset>
 </form>
 …
 <?php } ?>
-<form name="viewcat" id="viewcat" action="" method="get">
-    <fieldset>
-    <legend><?php _e('Browse Category&hellip;') ?></legend>
-    <?php wp_dropdown_categories('show_option_all='.__('All').'&hide_empty=1&hierarchical=1&show_count=1&selected='.$cat);?>
-    <input type="submit" name="submit" value="<?php _e('Show Category') ?>" class="button" />
-    </fieldset>
-</form>
-<?php do_action('restrict_manage_posts'); ?>
 <br style="clear:both;" />
 <?php
 // define the columns to display, the syntax is 'internal name' => 'display name'
 $posts_columns = array(
 …
 ?>
+<table class="widefat">
+    <thead>
+<table id="the-list-x" width="100%" cellpadding="3" cellspacing="3">
     <tr>
 …
     </tr>
-    </thead>
-    <tbody id="the-list">
 <?php
 if ($posts) {
 $bgcolor = '';
 foreach ($posts as $post) { start_wp();
-add_filter('the_title','wp_specialchars');
 $class = ('alternate' == $class) ? '' : 'alternate';
 ?>
 …
     switch($column_name) {
     case 'id':
         ?>
         <th scope="row" style="text-align: center"><?php echo $id ?></th>
+        <th scope="row"><?php echo $id ?></th>
         <?php
         break;
 …
     case 'comments':
         ?>
         <td style="text-align: center"><a href="edit.php?p=<?php echo $id ?>&amp;c=1">
+        <td><a href="edit.php?p=<?php echo $id ?>&amp;c=1">
       <?php comments_number(__('0'), __('1'), __('%')) ?>
       </a></td>
 …
     case 'control_delete':
         ?>
         <td><?php if ( current_user_can('delete_post',$post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete' onclick=\"return deleteSomething( 'post', " . $id . ", '" . sprintf(__("You are about to delete this post &quot;%s&quot;.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), js_escape(get_the_title()) ) . "' );\">" . __('Delete') . "</a>"; } ?></td>
+        <td><?php if ( current_user_can('edit_post',$post->ID) ) { echo "<a href='post.php?action=delete&amp;post=$id' class='delete' onclick=\"return deleteSomething( 'post', " . $id . ", '" . sprintf(__("You are about to delete this post &quot;%s&quot;.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), wp_specialchars(get_the_title('', ''), 1) ) . "' );\">" . __('Delete') . "</a>"; } ?></td>
         <?php
         break;
 …
 <?php
 } // end if ($posts)
+?>
+    </tbody>
+?>
 </table>
 …
     if ($comments) {
     ?>
+<h3 id="comments"><?php _e('Comments') ?></h3>
+<ol id="the-comment-list" class="commentlist">
+<?php
+$i = 0;
+<h3><?php _e('Comments') ?></h3>
+<ol id="comments">
+<?php
 foreach ($comments as $comment) {
+        ++$i; $class = '';
+        $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
+            $comment_status = wp_get_comment_status($comment->comment_ID);
+            if ('unapproved' == $comment_status)
+                $class .= ' unapproved';
+            if ($i % 2)
+                $class .= ' alternate';
+            echo "<li id='comment-$comment->comment_ID' class='$class'>";
+?>
+<p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
+<?php comment_text() ?>
+<p><?php comment_date('M j, g:i A');  ?> &#8212; [
+<?php
+if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+    echo " <a href='comment.php?action=editcomment&amp;comment=".$comment->comment_ID."\'>" .  __('Edit') . '</a>';
+    echo ' | <a href="' . wp_nonce_url('comment.php?action=deletecomment&amp;p=' . $post->ID . '&amp;comment=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> ';
+    if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
+        echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&amp;p=' . $post->ID . '&amp;comment=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>';
+        echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&amp;p=' . $post->ID . '&amp;comment=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>';
+    }
+    echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&amp;delete_type=spam&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to mark as spam."), js_escape( $comment->comment_author))  . "', theCommentList );\">" . __('Spam') . "</a> ]";
+} // end if any comments to show
+?>
+</p>
+        </li>
+$comment_status = wp_get_comment_status($comment->comment_ID);
+?>
+<li <?php if ("unapproved" == $comment_status) echo "class='unapproved'"; ?> >
+  <?php comment_date('Y-n-j') ?>
+  @
+  <?php comment_time('g:m:s a') ?>
+  <?php
+            if ( current_user_can('edit_post', $post->ID) ) {
+                echo "[ <a href=\"post.php?action=editcomment&amp;comment=".$comment->comment_ID."\">" .  __('Edit') . "</a>";
+                echo " - <a href=\"post.php?action=deletecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('" . sprintf(__("You are about to delete this comment by \'%s\'\\n  \'OK\' to delete, \'Cancel\' to stop."), $comment->comment_author) . "')\">" . __('Delete') . "</a> ";
+                if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
+                    if ('approved' == wp_get_comment_status($comment->comment_ID)) {
+                        echo " - <a href=\"post.php?action=unapprovecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">" . __('Unapprove') . "</a> ";
+                    } else {
+                        echo " - <a href=\"post.php?action=approvecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">" . __('Approve') . "</a> ";
+                    }
+                }
+                echo "]";
+            } // end if any comments to show
+            ?>
+  <br />
+  <strong>
+  <?php comment_author() ?>
+  (
+  <?php comment_author_email_link() ?>
+  /
+  <?php comment_author_url_link() ?>
+  )</strong> (IP:
+  <?php comment_author_IP() ?>
+  )
+  <?php comment_text() ?>
+</li>
+<!-- /comment -->
 <?php //end of the loop, don't delete
         } // end foreach

trunk/wp-admin/import.php

-                      r4431
+                      r3503
 require_once ('admin.php');
 $title = __('Import');
 $parent_file = 'edit.php';
+$parent_file = 'import.php';
 require_once ('admin-header.php');
 ?>
 …
 } else {
 ?>
 <table class="widefat">
+<table width="100%" cellpadding="3" cellspacing="3">
 <?php
 …
     foreach ($importers as $id => $data) {
         $style = ('class="alternate"' == $style || 'class="alternate active"' == $style) ? '' : 'alternate';
         $action = "<a href='admin.php?import=$id' title='".wptexturize(strip_tags($data[1]))."'>{$data[0]}</a>";
+        $action = "<a href='admin.php?import=$id' title='{$data[1]}'>{$data[0]}</a>";
         if ($style != '')
 …
         echo "
             <tr $style>
                 <td class='import-system'>$action</td>
                 <td class='desc'>{$data[1]}</td>
+                <td class=\"togl\">$action</td>
+                <td class=\"desc\">{$data[1]}</td>
             </tr>";
+    }

trunk/wp-admin/import/blogger.php

-                      r4431
+                      r3503
     function restart() {
         delete_option('import-blogger');
         wp_redirect("admin.php?import=blogger");
+        header("Location: admin.php?import=blogger");
         die();
+    }
 …
         if ($header) curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
         $response = curl_exec ($ch);
         if ($parse) {
             $response = $this->parse_response($response);
 …
             return $response;
+        }
         return $response;
+    }
 …
         update_option('import-blogger', $this->import);
+    }
     // Redirects to next step
     function do_next_step() {
         wp_redirect("admin.php?import=blogger&noheader=true&blog={$_GET['blog']}");
+        header("Location: admin.php?import=blogger&noheader=true&blog={$_GET['blog']}");
         die();
+    }
 …
                 $this->login_form(__('The script will log into your Blogger account, change some settings so it can read your blog, and restore the original settings when it\'s done. Here\'s what you do:').'</p><ol><li>'.__('Back up your Blogger template.').'</li><li>'.__('Back up any other Blogger settings you might need later.').'</li><li>'.__('Log out of Blogger').'</li><li>'.__('Log in <em>here</em> with your Blogger username and password.').'</li><li>'.__('On the next screen, click one of your Blogger blogs.').'</li><li>'.__('Do not close this window or navigate away until the process is complete.').'</li></ol>');
+            }
             // Try logging in. If we get an array of cookies back, we at least connected.
+            // Try logging in. If we get an array of cookies back, we at least connected.
             $this->import['cookies'] = $this->login_blogger($_POST['user'], $_POST['pass']);
             if ( !is_array( $this->import['cookies'] ) ) {
                 $this->login_form(__('Login failed. Please enter your credentials again.'));
+            }
             // Save the password so we can log the browser in when it's time to publish.
             $this->import['pass'] = $_POST['pass'];
 …
             preg_match_all('#posts\.g\?blogID=(\d+)">([^<]+)</a>#U', $response['body'], $blogsary);
             if ( ! count( $blogsary[1] < 1 ) )
                 wp_die(__('No blogs found for this user.'));
+                die(__('No blogs found for this user.'));
             $this->import['blogs'] = array();
             $template = '<MainPage><br /><br /><br /><p>'.__('Are you looking for %title%? It is temporarily out of service. Please try again in a few minutes. Meanwhile, discover <a href="http://wordpress.org/">a better blogging tool</a>.').'</p><BloggerArchives><a class="archive" href="<$BlogArchiveURL$>"><$BlogArchiveName$></a><br /></BloggerArchives></MainPage><ArchivePage><Blogger><wordpresspost><$BlogItemDateTime$>|W|P|<$BlogItemAuthorNickname$>|W|P|<$BlogItemBody$>|W|P|<$BlogItemNumber$>|W|P|<$BlogItemTitle$>|W|P|<$BlogItemAuthorEmail$><BlogItemCommentsEnabled><BlogItemComments><wordpresscomment><$BlogCommentDateTime$>|W|P|<$BlogCommentAuthor$>|W|P|<$BlogCommentBody$></BlogItemComments></BlogItemCommentsEnabled></Blogger></ArchivePage>';
 …
+            }
             update_option('import-blogger', $this->import);
             wp_redirect("admin.php?import=blogger&noheader=true&step=1");
+            header("Location: admin.php?import=blogger&noheader=true&step=1");
+        }
         die();
 …
                             $response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode=0", $headers);
                             if ( $response['code'] >= 400 )
                                 wp_die('<h2>'.__('Failed attempt to change publish mode from FTP to BlogSpot.').'</h2><pre>' . addslashes(print_r($headers, 1)) . addslashes(print_r($response, 1)) . '</pre>');
+                                die('<h2>'.__('Failed attempt to change publish mode from FTP to BlogSpot.').'</h2><pre>' . addslashes(print_r($headers, 1)) . addslashes(print_r($response, 1)) . '</pre>');
                             $this->import['blogs'][$_GET['blog']]['url'] = 'http://' . $optary['modify']['subdomain'] . '.blogspot.com/';
                             sleep(2);
 …
                     $response = $this->post_blogger($posturl, $headers, $paramary);
                     if ( $response['code'] >= 400 || strstr($response['body'], 'There are errors on this form') )
                         wp_die('<p>'.__('Error on form submission. Retry or reset the importer.').'</p>' . addslashes(print_r($response, 1)));
+                        die('<p>'.__('Error on form submission. Retry or reset the importer.').'</p>' . addslashes(print_r($response, 1)));
+                }
                 $output .= "<del><p>$blog_opt</p></del>\n";
 …
                 $form.= $body;
                 $form.= "</div><script type='text/javascript'>forms=document.getElementsByTagName('form');for(i=0;i<forms.length;i++){if(forms[i].action.search('{$blog_opt}')){forms[i].submit();break;}}</script>";
                 $output.= '<p>'.sprintf(__('<strong>%s</strong> in progress, please wait...'), $blog_opt)."</p>\n";
+                $output.= '<p>'.sprintf('<strong>%s</strong> in progress, please wait...', $blog_opt)."</p>\n";
             } else {
                 $output.= "<p>$blog_opt</p>\n";
 …
         $bloghtml = $this->get_blogger($this->import['blogs'][$_GET['blog']]['url']);
         if (! strstr($bloghtml['body'], '<a class="archive"') )
             wp_die(__('Your Blogger blog did not take the new template or did not respond.'));
+            die(__('Your Blogger blog did not take the new template or did not respond.'));
         preg_match_all('#<a class="archive" href="([^"]*)"#', $bloghtml['body'], $archives);
         foreach ($archives[1] as $archive) {
 …
                 $archive = $this->get_blogger($url);
                 if ( $archive['code'] > 200 )
                     continue;
+                    continue;
                 $posts = explode('<wordpresspost>', $archive['body']);
                 for ($i = 1; $i < count($posts); $i = $i + 1) {
 …
                     $post_author_name = $wpdb->escape(trim($postinfo[1]));
                     $post_author_email = $postinfo[5] ? $postinfo[5] : 'user@wordpress.org';
                     if ( $this->lump_authors ) {
                         // Ignore Blogger authors. Use the current user_ID for all posts imported.
 …
                             $user_password = substr(md5(uniqid(microtime())), 0, 6);
                             $result = wp_create_user( $user_login, $user_password, $user_email );
                             $status.= sprintf(__('Registered user <strong>%s</strong>.'), $user_login);
+                            $status.= sprintf('Registered user <strong>%s</strong>.', $user_login);
                             $this->import['blogs'][$_GET['blog']]['newusers'][] = $user_login;
+                        }
 …
                     $postminute = zeroise($post_date_His[1], 2);
                     $postsecond = zeroise($post_date_His[2], 2);
                     if (($post_date[2] == 'PM') && ($posthour != '12'))
                         $posthour = $posthour + 12;
                     else if (($post_date[2] == 'AM') && ($posthour == '12'))
                         $posthour = '00';
                     $post_date = "$postyear-$postmonth-$postday $posthour:$postminute:$postsecond";
                     $post_content = addslashes($post_content);
                     $post_content = str_replace(array('<br>','<BR>','<br/>','<BR/>','<br />','<BR />'), "\n", $post_content); // the XHTML touch... ;)
                     $post_title = addslashes($post_title);
                     $post_status = 'publish';
                     if ( $ID = post_exists($post_title, '', $post_date) ) {
                         $post_array[$i]['ID'] = $ID;
 …
+                }
                 $status = sprintf(__('%s post(s) parsed, %s skipped...'), $postcount,  $skippedpostcount).' '.
                     sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcount, $skippedcommentcount).' '.
+                    sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcoun, $skippedcommentcount).' '.
                     ' <strong>'.__('Done').'</strong>';
                 $import = $this->import;
 …
                         sleep(2);
                         if ( $response['code'] >= 400 )
                             wp_die('<h1>'.__('Error restoring publishMode').'</h1><p>'.__('Please tell the devs.').'</p>' . addslashes(print_r($response, 1)) );
+                            die('<h1>Error restoring publishMode.</h1><p>Please tell the devs.</p>' . addslashes(print_r($response, 1)) );
+                    }
+                }
 …
             $this->restart();
+        }
         if ( isset($_GET['noheader']) ) {
+            header('Content-Type: text/html; charset=utf-8');
+            $this->import = get_option('import-blogger');
+            $this->import = get_settings('import-blogger');
             if ( false === $this->import ) {
 …
+            }
 //echo "Step $step.";
 //wp_die('<pre>'.print_r($this->import,1).'</pre');
+//die('<pre>'.print_r($this->import,1).'</pre');
             switch ($step) {
                 case 0 :
 …
+            }
             die;
         } else {
             $this->greet();
 …
 $blogger_import = new Blogger_Import();
 register_importer('blogger', __('Blogger and Blog*Spot'), __('Import <strong>posts and comments</strong> from your Blogger account'), array ($blogger_import, 'start'));
+register_importer('blogger', 'Blogger', __('Import posts and comments from a Blogger account'), array ($blogger_import, 'start'));
 ?>

trunk/wp-admin/import/dotclear.php

Property svn:eol-style deleted

-                      r4431
+                      r3503
 <?php
-/*
- * Dotclear import plugin
- * by Thomas Quinot - http://thomas.quinot.org/
- */
 /**
     Add These Functions to make our lives easier
 …
+    {
     global $wpdb;
     $cat_id -= 0;   // force numeric
     $name = $wpdb->get_var('SELECT cat_ID FROM '.$wpdb->categories.' WHERE category_nicename="'.$category_nicename.'"');
     return $name;
+    }
 …
+    {
         echo '<div class="wrap">';
         echo '<h2>'.__('Import DotClear').'</h2>';
+        echo '<h2>'.__('Import Dotclear').'</h2>';
         echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'</p>';
+    }
 …
         echo '</div>';
+    }
     function greet()
+    {
         echo '<div class="narrow"><p>'.__('Howdy! This importer allows you to extract posts from a DotClear database into your blog.  Mileage may vary.').'</p>';
         echo '<p>'.__('Your DotClear Configuration settings are as follows:').'</p>';
+        echo '<p>'.__('Howdy! This importer allows you to extract posts from a Dotclear database into your blog.  Mileage may vary.').'</p>';
+        echo '<p>'.__('Your Dotclear Configuration settings are as follows:').'</p>';
         echo '<form action="admin.php?import=dotclear&amp;step=1" method="post">';
         $this->db_form();
         echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Categories').' &raquo;" /></p>';
         echo '</form></div>';
+        echo '<input type="submit" name="submit" value="'.__('Import Categories').'" />';
+        echo '</form>';
+    }
 …
         $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
         set_magic_quotes_runtime(0);
         $dbprefix = get_option('dcdbprefix');
+        $prefix = get_option('tpre');
         // Get Categories
         return $dcdb->get_results('SELECT * FROM '.$dbprefix.'categorie', ARRAY_A);
+    }
+        return $dcdb->get_results('SELECT * FROM dc_categorie', ARRAY_A);
+    }
     function get_dc_users()
+    {
 …
         $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
         set_magic_quotes_runtime(0);
         $dbprefix = get_option('dcdbprefix');
+        $prefix = get_option('tpre');
         // Get Users
         return $dcdb->get_results('SELECT * FROM '.$dbprefix.'user', ARRAY_A);
+    }
+        return $dcdb->get_results('SELECT * FROM dc_user', ARRAY_A);
+    }
     function get_dc_posts()
+    {
 …
         $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
         set_magic_quotes_runtime(0);
         $dbprefix = get_option('dcdbprefix');
+        $prefix = get_option('tpre');
         // Get Posts
         return $dcdb->get_results('SELECT '.$dbprefix.'post.*, '.$dbprefix.'categorie.cat_libelle_url AS post_cat_name
                         FROM '.$dbprefix.'post INNER JOIN '.$dbprefix.'categorie
                           ON '.$dbprefix.'post.cat_id = '.$dbprefix.'categorie.cat_id', ARRAY_A);
+    }
+        return $dcdb->get_results('SELECT dc_post.*, dc_categorie.cat_libelle_url AS post_cat_name
+                        FROM dc_post INNER JOIN dc_categorie
+                          ON dc_post.cat_id = dc_categorie.cat_id', ARRAY_A);
+    }
     function get_dc_comments()
+    {
 …
         $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
         set_magic_quotes_runtime(0);
         $dbprefix = get_option('dcdbprefix');
+        $prefix = get_option('tpre');
         // Get Comments
         return $dcdb->get_results('SELECT * FROM '.$dbprefix.'comment', ARRAY_A);
+    }
+        return $dcdb->get_results('SELECT * FROM dc_comment', ARRAY_A);
+    }
     function get_dc_links()
+    {
 …
         $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
         set_magic_quotes_runtime(0);
         $dbprefix = get_option('dcdbprefix');
         return $dcdb->get_results('SELECT * FROM '.$dbprefix.'link ORDER BY position', ARRAY_A);
+    }
+        $prefix = get_option('tpre');
+        return $dcdb->get_results('SELECT * FROM dc_link ORDER BY position', ARRAY_A);
+    }
     function cat2wp($categories='')
+    {
 …
                 $count++;
                 extract($category);
                 // Make Nice Variables
                 $name = $wpdb->escape($cat_libelle_url);
 …
                 $dccat2wpcat[$id] = $ret_id;
+            }
             // Store category translation for future use
             add_option('dccat2wpcat',$dccat2wpcat);
 …
         return false;
+    }
     function users2wp($users='')
+    {
 …
         $count = 0;
         $dcid2wpid = array();
         // Midnight Mojo
         if(is_array($users))
 …
                 $count++;
                 extract($user);
                 // Make Nice Variables
                 $name = $wpdb->escape(csc ($name));
                 $RealName = $wpdb->escape(csc ($user_pseudo));
                 if($uinfo = get_userdatabylogin($name))
+                {
                     $ret_id = wp_insert_user(array(
                                 'ID'        => $uinfo->ID,
 …
+                }
                 $dcid2wpid[$user_id] = $ret_id;
                 // Set Dotclear-to-WordPress permissions translation
                 // Update Usermeta Data
                 $user = new WP_User($ret_id);
 …
                 else if(2  <= $wp_perms) { $user->set_role('contributor'); }
                 else                     { $user->set_role('subscriber'); }
                 update_usermeta( $ret_id, 'wp_user_level', $wp_perms);
                 update_usermeta( $ret_id, 'rich_editing', 'false');
 …
                 update_usermeta( $ret_id, 'last_name', csc ($user_nom));
             }// End foreach($users as $user)
             // Store id translation array for future use
             add_option('dcid2wpid',$dcid2wpid);
             echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> users imported.'), $count).'<br /><br /></p>';
             return true;
         }// End if(is_array($users)
         echo __('No Users to Import!');
         return false;
     }// End function user2wp()
     function posts2wp($posts='')
+    {
 …
                 $count++;
                 extract($post);
                 // Set Dotclear-to-WordPress status translation
                 $stattrans = array(0 => 'draft', 1 => 'publish');
                 $comment_status_map = array (0 => 'closed', 1 => 'open');
                 //Can we do this more efficiently?
                 $uinfo = ( get_userdatabylogin( $user_id ) ) ? get_userdatabylogin( $user_id ) : 1;
 …
                 $Title = $wpdb->escape(csc ($post_titre));
                 $post_content = textconv ($post_content);
-                $post_excerpt = "";
                 if ($post_chapo != "") {
                     $post_excerpt = textconv ($post_chapo);
 …
                 $post_content = $wpdb->escape ($post_content);
                 $post_status = $stattrans[$post_pub];
                 // Import Post data into WordPress
                 if($pinfo = post_exists($Title,$post_content))
+                {
 …
+                }
                 $dcposts2wpposts[$post_id] = $ret_id;
                 // Make Post-to-Category associations
                 $cats = array();
                 if($cat1 = get_catbynicename($post_cat_name)) { $cats[1] = $cat1; }
                 if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); }
+                if(!empty($cats)) { wp_set_post_cats('', $ret_id, $cats); }
+            }
+        }
         // Store ID translation for later use
         add_option('dcposts2wpposts',$dcposts2wpposts);
         echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> posts imported.'), $count).'<br /><br /></p>';
         return true;
+    }
+        return true;
+    }
     function comments2wp($comments='')
+    {
 …
         $dccm2wpcm = array();
         $postarr = get_option('dcposts2wpposts');
         // Magic Mojo
         if(is_array($comments))
 …
                 $count++;
                 extract($comment);
                 // WordPressify Data
                 $comment_ID = ltrim($comment_id, '0');
 …
                 $web = "http://".$wpdb->escape($comment_site);
                 $message = $wpdb->escape(textconv ($comment_content));
                 if($cinfo = comment_exists($name, $comment_dt))
+                {
 …
+            }
             // Store Comment ID translation for future use
             add_option('dccm2wpcm', $dccm2wpcm);
+            add_option('dccm2wpcm', $dccm2wpcm);
             // Associate newly formed categories with posts
             get_comment_count($ret_id);
             echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> comments imported.'), $count).'<br /><br /></p>';
             return true;
 …
         return false;
+    }
     function links2wp($links='')
+    {
 …
         global $wpdb;
         $count = 0;
         // Deal with the links
         if(is_array($links))
 …
                 $count++;
                 extract($link);
                 if ($title != "") {
                     if ($cinfo = link_cat_exists (csc ($title))) {
 …
                     $linkname = $wpdb->escape(csc ($label));
                     $description = $wpdb->escape(csc ($title));
                     if($linfo = link_exists($linkname)) {
                         $ret_id = wp_insert_link(array(
 …
         return false;
+    }
     function import_categories()
+    {
         // Category Import
+    {
+        // Category Import
         $cats = $this->get_dc_cats();
         $this->cat2wp($cats);
         add_option('dc_cats', $cats);
         echo '<form action="admin.php?import=dotclear&amp;step=2" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Users'));
 …
+    }
     function import_users()
+    {
 …
         $users = $this->get_dc_users();
         $this->users2wp($users);
         echo '<form action="admin.php?import=dotclear&amp;step=3" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Posts'));
         echo '</form>';
+    }
     function import_posts()
+    {
 …
         $posts = $this->get_dc_posts();
         $this->posts2wp($posts);
         echo '<form action="admin.php?import=dotclear&amp;step=4" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Comments'));
         echo '</form>';
+    }
     function import_comments()
+    {
 …
         $comments = $this->get_dc_comments();
         $this->comments2wp($comments);
         echo '<form action="admin.php?import=dotclear&amp;step=5" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Links'));
         echo '</form>';
+    }
     function import_links()
+    {
 …
         $this->links2wp($links);
         add_option('dc_links', $links);
         echo '<form action="admin.php?import=dotclear&amp;step=6" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Finish'));
         echo '</form>';
+    }
     function cleanup_dcimport()
+    {
         delete_option('dcdbprefix');
+        delete_option('tpre');
         delete_option('dc_cats');
         delete_option('dcid2wpid');
 …
         $this->tips();
+    }
     function tips()
+    {
         echo '<p>'.__('Welcome to WordPress.  We hope (and expect!) that you will find this platform incredibly rewarding!  As a new WordPress user coming from DotClear, there are some things that we would like to point out.  Hopefully, they will help your transition go as smoothly as possible.').'</p>';
+        echo '<p>'.__('Welcome to WordPress.  We hope (and expect!) that you will find this platform incredibly rewarding!  As a new WordPress user coming from Dotclear, there are some things that we would like to point out.  Hopefully, they will help your transition go as smoothly as possible.').'</p>';
         echo '<h3>'.__('Users').'</h3>';
         echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password.  Forget it.  You didn\'t have that login in DotClear, why should you have it here?  Instead we have taken care to import all of your users into our system.  Unfortunately there is one downside.  Because both WordPress and DotClear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users.  <strong>Every user has the same username, but their passwords are reset to password123.</strong>  So <a href="%1$s">Login</a> and change it.'), '/wp-login.php').'</p>';
+        echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password.  Forget it.  You didn\'t have that login in Dotclear, why should you have it here?  Instead we have taken care to import all of your users into our system.  Unfortunately there is one downside.  Because both WordPress and Dotclear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users.  <strong>Every user has the same username, but their passwords are reset to password123.</strong>  So <a href="%1$s">Login</a> and change it.'), '/wp-login.php').'</p>';
         echo '<h3>'.__('Preserving Authors').'</h3>';
         echo '<p>'.__('Secondly, we have attempted to preserve post authors.  If you are the only author or contributor to your blog, then you are safe.  In most cases, we are successful in this preservation endeavor.  However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'</p>';
         echo '<h3>'.__('Textile').'</h3>';
         echo '<p>'.__('Also, since you\'re coming from DotClear, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/category/development/wordpress/textile/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>';
+        echo '<p>'.__('Also, since you\'re coming from Dotclear, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/2004/04/19/wordpress-plugin-textile-20/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>';
         echo '<h3>'.__('WordPress Resources').'</h3>';
         echo '<p>'.__('Finally, there are numerous WordPress resources around the internet.  Some of them are:').'</p>';
         echo '<ul>';
         echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>';
         echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums</a>').'</li>';
+        echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums').'</li>';
         echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>';
         echo '</ul>';
         echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '../wp-login.php').'</p>';
+    }
+        echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '/wp-login.php').'</p>';
+    }
     function db_form()
+    {
         echo '<table class="editform">';
         printf('<tr><th><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('Dotclear Database User:'));
         printf('<tr><th><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('DotClear Database Password:'));
         printf('<tr><th><label for="dbname">%s</label></th><td><input type="text" name="dbname" id="dbname" /></td></tr>', __('Dotclear Database Name:'));
         printf('<tr><th><label for="dbhost">%s</label></th><td><input type="text" name="dbhost" nameid="dbhost" value="localhost" /></td></tr>', __('DotClear Database Host:'));
         printf('<tr><th><label for="dbprefix">%s</label></th><td><input type="text" name="dbprefix" id="dbprefix" value="dc_"/></td></tr>', __('DotClear Table prefix:'));
         printf('<tr><th><label for="dccharset">%s</label></th><td><input type="text" name="dccharset" id="dccharset" value="ISO-8859-15"/></td></tr>', __('Originating character set:'));
         echo '</table>';
+    }
+        echo '<ul>';
+        printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" /></li>', __('Dotclear Database User:'));
+        printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" /></li>', __('Dotclear Database Password:'));
+        printf('<li><label for="dbname">%s</label> <input type="text" name="dbname" /></li>', __('Dotclear Database Name:'));
+        printf('<li><label for="dbhost">%s</label> <input type="text" name="dbhost" value="localhost" /></li>', __('Dotclear Database Host:'));
+        /* printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" /></li>', __('Dotclear Table prefix (if any):')); */
+        printf('<li><label for="dccharset">%s</label> <input type="text" name="dccharset" value="ISO-8859-15"/></li>', __('Originating character set:'));
+        echo '</ul>';
+    }
     function dispatch()
+    {
 …
             $step = (int) $_GET['step'];
         $this->header();
         if ( $step > 0 )
+        {
 …
+            {
                 if(get_option('dcuser'))
                     delete_option('dcuser');
+                    delete_option('dcuser');
                 add_option('dcuser',$_POST['dbuser']);
+            }
 …
+            {
                 if(get_option('dcpass'))
                     delete_option('dcpass');
+                    delete_option('dcpass');
                 add_option('dcpass',$_POST['dbpass']);
+            }
             if($_POST['dbname'])
+            {
                 if(get_option('dcname'))
                     delete_option('dcname');
+                    delete_option('dcname');
                 add_option('dcname',$_POST['dbname']);
+            }
 …
                     delete_option('dccharset');
                 add_option('dccharset',$_POST['dccharset']);
+            }
+            }
             if($_POST['dbprefix'])
+            {
                 if(get_option('dcdbprefix'))
                     delete_option('dcdbprefix');
                 add_option('dcdbprefix',$_POST['dbprefix']);
+            }
+                if(get_option('tpre'))
+                    delete_option('tpre');
+                add_option('tpre',$_POST['dbprefix']);
+            }
 …
                 break;
+        }
         $this->footer();
+    }
 …
     function Dotclear_Import()
+    {
         // Nothing.
+        // Nothing.
+    }
+}
 $dc_import = new Dotclear_Import();
 register_importer('dotclear', __('DotClear'), __('Import posts from a DotClear Blog'), array ($dc_import, 'dispatch'));
+register_importer('dotclear', 'Dotclear', __('Import posts from a Dotclear Blog'), array ($dc_import, 'dispatch'));
 ?>

trunk/wp-admin/import/greymatter.php

-                      r4431
+                      r3503
-<?php
-class GM_Import {
-    var $gmnames = array ();
-    function header() {
-        echo '<div class="wrap">';
-        echo '<h2>'.__('Import Greymatter').'</h2>';
+    }
-    function footer() {
-        echo '</div>';
+    }
-    function greet() {
-        $this->header();
-?>
-<p><?php _e('This is a basic GreyMatter to WordPress import script.') ?></p>
-<p><?php _e('What it does:') ?></p>
-<ul>
-<li><?php _e('Parses gm-authors.cgi to import (new) authors. Everyone is imported at level 1.') ?></li>
-<li><?php _e('Parses the entries cgi files to import posts, comments, and karma on posts (although karma is not used on WordPress yet).<br />If authors are found not to be in gm-authors.cgi, imports them at level 0.') ?></li>
-<li><?php _e("Detects duplicate entries or comments. If you don't import everything the first time, or this import should fail in the middle, duplicate entries will not be made when you try again.") ?></li>
-</ul>
-<p><?php _e('What it does not:') ?></p>
-<ul>
-<li><?php _e('Parse gm-counter.cgi, gm-banlist.cgi, gm-cplog.cgi (you can make a CP log hack if you really feel like it, but I question the need of a CP log).') ?></li>
-<li><?php _e('Import gm-templates.') ?></li>
-<li><?php _e("Doesn't keep entries on top.")?></li>
-</ul>
-<p>&nbsp;</p>
-<form name="stepOne" method="get">
-<input type="hidden" name="import" value="greymatter" />
-<input type="hidden" name="step" value="1" />
-<h3><?php _e('Second step: GreyMatter details:') ?></h3>
-<p><table cellpadding="0">
-<tr>
-<td><?php _e('Path to GM files:') ?></td>
-<td><input type="text" style="width:300px" name="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
-</tr>
-<tr>
-<td><?php _e('Path to GM entries:') ?></td>
-<td><input type="text" style="width:300px" name="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
-</tr>
-<tr>
-<td colspan="2"><br /><?php _e("This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)") ?></td>
-</tr>
-<tr>
-<td><?php _e("Last entry's number:") ?></td>
-<td><input type="text" name="lastentry" value="00000001" /></td>
-</tr>
-</table>
-</p>
-<p><?php _e("When you're ready, click OK to start importing: ") ?><input type="submit" name="submit" value="<?php _e('OK') ?>" class="search" /></p>
-</form>
-<p>&nbsp</p>
-<?php
-        $this->footer();
+    }
-    function gm2autobr($string) { // transforms GM's |*| into b2's <br />\n
-        $string = str_replace("|*|","<br />\n",$string);
-        return($string);
+    }
-    function import() {
-        global $wpdb;
-        $wpvarstoreset = array('gmpath', 'archivespath', 'lastentry');
-        for ($i=0; $i<count($wpvarstoreset); $i += 1) {
-            $wpvar = $wpvarstoreset[$i];
-            if (!isset($$wpvar)) {
-                if (empty($_POST["$wpvar"])) {
-                    if (empty($_GET["$wpvar"])) {
-                        $$wpvar = '';
-                    } else {
-                        $$wpvar = $_GET["$wpvar"];
+                    }
-                } else {
-                    $$wpvar = $_POST["$wpvar"];
+                }
+            }
+        }
-        if (!chdir($archivespath))
-            wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $archivespath));
-        if (!chdir($gmpath))
-            wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $gmpath));
-        $this->header();
-?>
-<p><?php _e('The importer is running...') ?></p>
-<ul>
-<li><?php _e('importing users...') ?><ul><?php
-    chdir($gmpath);
-    $userbase = file("gm-authors.cgi");
-    foreach($userbase as $user) {
-        $userdata=explode("|", $user);
-        $user_ip="127.0.0.1";
-        $user_domain="localhost";
-        $user_browser="server";
-        $s=$userdata[4];
-        $user_joindate=substr($s,6,4)."-".substr($s,0,2)."-".substr($s,3,2)." 00:00:00";
-        $user_login=$wpdb->escape($userdata[0]);
-        $pass1=$wpdb->escape($userdata[1]);
-        $user_nickname=$wpdb->escape($userdata[0]);
-        $user_email=$wpdb->escape($userdata[2]);
-        $user_url=$wpdb->escape($userdata[3]);
-        $user_joindate=$wpdb->escape($user_joindate);
-        $user_id = username_exists($user_login);
-        if ($user_id) {
-            printf('<li>'.__('user %s').'<strong>'.__('Already exists').'</strong></li>', "<em>$user_login</em>");
-            $this->gmnames[$userdata[0]] = $user_id;
-            continue;
+        }
-        $user_info = array("user_login"=>"$user_login", "user_pass"=>"$pass1", "user_nickname"=>"$user_nickname", "user_email"=>"$user_email", "user_url"=>"$user_url", "user_ip"=>"$user_ip", "user_domain"=>"$user_domain", "user_browser"=>"$user_browser", "dateYMDhour"=>"$user_joindate", "user_level"=>"1", "user_idmode"=>"nickname");
-        $user_id = wp_insert_user($user_info);
-        $this->gmnames[$userdata[0]] = $user_id;
-        printf('<li>'.__('user %s...').' <strong>'.__('Done').'</strong></li>', "<em>$user_login</em>");
+    }
-?></ul><strong><?php _e('Done') ?></strong></li>
-<li><?php _e('importing posts, comments, and karma...') ?><br /><ul><?php
-    chdir($archivespath);
-    for($i = 0; $i <= $lastentry; $i = $i + 1) {
-        $entryfile = "";
-        if ($i<10000000) {
-            $entryfile .= "0";
-            if ($i<1000000) {
-                $entryfile .= "0";
-                if ($i<100000) {
-                    $entryfile .= "0";
-                    if ($i<10000) {
-                        $entryfile .= "0";
-                        if ($i<1000) {
-                            $entryfile .= "0";
-                            if ($i<100) {
-                                $entryfile .= "0";
-                                if ($i<10) {
-                                    $entryfile .= "0";
-        }}}}}}}
-        $entryfile .= "$i";
-        if (is_file($entryfile.".cgi")) {
-            $entry=file($entryfile.".cgi");
-            $postinfo=explode("|",$entry[0]);
-            $postmaincontent=$this->gm2autobr($entry[2]);
-            $postmorecontent=$this->gm2autobr($entry[3]);
-            $post_author=trim($wpdb->escape($postinfo[1]));
-            $post_title=$this->gm2autobr($postinfo[2]);
-            printf('<li>'.__('entry # %s : %s : by %s'), $entryfile, $post_title, $postinfo[1]);
-            $post_title=$wpdb->escape($post_title);
-            $postyear=$postinfo[6];
-            $postmonth=zeroise($postinfo[4],2);
-            $postday=zeroise($postinfo[5],2);
-            $posthour=zeroise($postinfo[7],2);
-            $postminute=zeroise($postinfo[8],2);
-            $postsecond=zeroise($postinfo[9],2);
-            if (($postinfo[10]=="PM") && ($posthour!="12"))
-                $posthour=$posthour+12;
-            $post_date="$postyear-$postmonth-$postday $posthour:$postminute:$postsecond";
-            $post_content=$postmaincontent;
-            if (strlen($postmorecontent)>3)
-                $post_content .= "<!--more--><br /><br />".$postmorecontent;
-            $post_content=$wpdb->escape($post_content);
-            $post_karma=$postinfo[12];
-            $post_status = 'publish'; //in greymatter, there are no drafts
-            $comment_status = 'open';
-            $ping_status = 'closed';
-            if ($post_ID = post_exists($post_title, '', $post_date)) {
-                echo ' ';
-                _e('(already exists)');
-            } else {
-                //just so that if a post already exists, new users are not created by checkauthor
-                // we'll check the author is registered, or if it's a deleted author
-                $user_id = username_exists($post_author);
-                if (!$user_id) {    // if deleted from GM, we register the author as a level 0 user
-                    $user_ip="127.0.0.1";
-                    $user_domain="localhost";
-                    $user_browser="server";
-                    $user_joindate="1979-06-06 00:41:00";
-                    $user_login=$wpdb->escape($post_author);
-                    $pass1=$wpdb->escape("password");
-                    $user_nickname=$wpdb->escape($post_author);
-                    $user_email=$wpdb->escape("user@deleted.com");
-                    $user_url=$wpdb->escape("");
-                    $user_joindate=$wpdb->escape($user_joindate);
-                    $user_info = array("user_login"=>$user_login, "user_pass"=>$pass1, "user_nickname"=>$user_nickname, "user_email"=>$user_email, "user_url"=>$user_url, "user_ip"=>$user_ip, "user_domain"=>$user_domain, "user_browser"=>$user_browser, "dateYMDhour"=>$user_joindate, "user_level"=>0, "user_idmode"=>"nickname");
-                    $user_id = wp_insert_user($user_info);
-                    $this->gmnames[$postinfo[1]] = $user_id;
-                    echo ': ';
-                    printf(__('registered deleted user %s at level 0 '), "<em>$user_login</em>");
+                }
-                if (array_key_exists($postinfo[1], $this->gmnames)) {
-                    $post_author = $this->gmnames[$postinfo[1]];
-                } else {
-                    $post_author = $user_id;
+                }
-                $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt');
-                $post_ID = wp_insert_post($postdata);
+            }
-            $c=count($entry);
-            if ($c>4) {
-                $numAddedComments = 0;
-                $numComments = 0;
-                for ($j=4;$j<$c;$j++) {
-                    $entry[$j]=$this->gm2autobr($entry[$j]);
-                    $commentinfo=explode("|",$entry[$j]);
-                    $comment_post_ID=$post_ID;
-                    $comment_author=$wpdb->escape($commentinfo[0]);
-                    $comment_author_email=$wpdb->escape($commentinfo[2]);
-                    $comment_author_url=$wpdb->escape($commentinfo[3]);
-                    $comment_author_IP=$wpdb->escape($commentinfo[1]);
-                    $commentyear=$commentinfo[7];
-                    $commentmonth=zeroise($commentinfo[5],2);
-                    $commentday=zeroise($commentinfo[6],2);
-                    $commenthour=zeroise($commentinfo[8],2);
-                    $commentminute=zeroise($commentinfo[9],2);
-                    $commentsecond=zeroise($commentinfo[10],2);
-                    if (($commentinfo[11]=="PM") && ($commenthour!="12"))
-                        $commenthour=$commenthour+12;
-                    $comment_date="$commentyear-$commentmonth-$commentday $commenthour:$commentminute:$commentsecond";
-                    $comment_content=$wpdb->escape($commentinfo[12]);
-                    if (!comment_exists($comment_author, $comment_date)) {
-                        $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_author_IP', 'comment_date', 'comment_content', 'comment_approved');
-                        $commentdata = wp_filter_comment($commentdata);
-                        wp_insert_comment($commentdata);
-                        $numAddedComments++;
+                    }
-                    $numComments++;
+                }
-                if ($numAddedComments > 0) {
-                    echo ': ';
-                    printf(__('imported %d comment(s)'), $numAddedComments);
+                }
-                $preExisting = $numComments - numAddedComments;
-                if ($preExisting > 0) {
-                    echo ' ';
-                    printf(__('ignored %d pre-existing comments'), $preExisting);
+                }
+            }
-            echo '... <strong>'.__('Done').'</strong></li>';
+        }
+    }
-    ?>
-</ul><strong><?php _e('Done') ?></strong></li></ul>
-<p>&nbsp;</p>
-<p><?php _e('Completed Greymatter import!') ?></p>
-<?php
-    $this->footer();
+    }
-    function dispatch() {
-        if (empty ($_GET['step']))
-            $step = 0;
-        else
-            $step = (int) $_GET['step'];
-        switch ($step) {
-            case 0 :
-                $this->greet();
-                break;
-            case 1:
-                $this->import();
-                break;
+        }
+    }
-    function GM_Import() {
-        // Nothing.
+    }
+}
-$gm_import = new GM_Import();
-register_importer('greymatter', __('Greymatter'), __('Import posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch'));
-?>

trunk/wp-admin/import/livejournal.php

-                      r4431
+                      r3503
         return strtr($string, $trans_tbl);
+    }
     function greet() {
-        echo '<div class="narrow">';
         echo '<p>'.__('Howdy! This importer allows you to extract posts from LiveJournal XML export file into your blog.  Pick a LiveJournal file to upload and click Import.').'</p>';
         wp_import_upload_form("admin.php?import=livejournal&amp;step=1");
-        echo '</div>';
+    }
     function import_posts() {
         global $wpdb, $current_user;
         set_magic_quotes_runtime(0);
         $importdata = file($this->file); // Read the file into an array
 …
         $posts = $posts[1];
         unset($importdata);
         echo '<ol>';
+        echo '<ol>';
         foreach ($posts as $post) {
+            flush();
             preg_match('|<subject>(.*?)</subject>|is', $post, $post_title);
             $post_title = $wpdb->escape(trim($post_title[1]));
 …
             preg_match_all('|<comment>(.*?)</comment>|is', $post, $comments);
             $comments = $comments[1];
             if ( $comments ) {
                 $comment_post_ID = $post_id;
 …
+            }
             echo '</li>';
+            flush();
+            ob_flush();
+        }
         echo '</ol>';
 …
         $this->import_posts();
         wp_import_cleanup($file['id']);
         echo '<h3>';
         printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home'));
 …
         $this->header();
         switch ($step) {
             case 0 :
 …
                 break;
+        }
         $this->footer();
+    }
     function LJ_Import() {
         // Nothing.
+        // Nothing.
+    }
+}
 …
 $livejournal_import = new LJ_Import();
 register_importer('livejournal', __('LiveJournal'), __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch'));
+register_importer('livejournal', 'LiveJournal', __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch'));
 ?>

trunk/wp-admin/import/mt.php

-                      r4431
+                      r3503
     function header() {
         echo '<div class="wrap">';
         echo '<h2>'.__('Import Movable Type and TypePad').'</h2>';
+        echo '<h2>'.__('Import Movable Type').'</h2>';
+    }
 …
         $this->header();
 ?>
-<div class="narrow">
 <p><?php _e('Howdy! We&#8217;re about to begin the process to import all of your Movable Type entries into WordPress. To begin, select a file to upload and click Import.'); ?></p>
 <?php wp_import_upload_form( add_query_arg('step', 1) ); ?>
     <p><?php _e('The importer is smart enough not to import duplicates, so you can run this multiple times without worry if&#8212;for whatever reason&#8212;it doesn\'t finish. If you get an <strong>out of memory</strong> error try splitting up the import file into pieces.'); ?> </p>
-</div>
 <?php
         $this->footer();
 …
         $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID");
 ?><select name="userselect[<?php echo $n; ?>]">
     <option value="#NONE#"><?php _e('- Select -') ?></option>
+    <option value="#NONE#">- Select -</option>
     <?php
 …
     function mt_authors_form() {
 ?>
-<div class="wrap">
-<h2><?php _e('Assign Authors'); ?></h2>
 <p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.'); ?></p>
 <p><?php _e('Below, you can see the names of the authors of the MovableType posts in <i>italics</i>. For each of these names, you can either pick an author in your WordPress installation from the menu, or enter a name for the author in the textbox.'); ?></p>
 …
         foreach ($authors as $author) {
             ++ $j;
             echo '<li>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');
+            echo '<li><i>'.$author.'</i><br />'.'<input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30">';
             $this->users_form($j);
             echo '</li>';
+        }
         echo '<input type="submit" value="'.__('Submit').'">'.'<br/>';
+        echo '<input type="submit" value="Submit">'.'<br/>';
         echo '</form>';
+        echo '</ol></div>';
+        echo '</ol>';
+        flush();
+    }
 …
         $file = wp_import_handle_upload();
         if ( isset($file['error']) ) {
+            $this->header();
+            echo '<p>'.__('Sorry, there has been an error').'.</p>';
+            echo '<p><strong>' . $file['error'] . '</strong></p>';
+            $this->footer();
+            echo $file['error'];
             return;
+        }
 …
         global $wpdb;
         $i = -1;
         echo "<div class='wrap'><ol>";
+        echo "<ol>";
         foreach ($this->posts as $post) {
             if ('' != trim($post)) {
 …
                 // We want the excerpt
                 preg_match("|-----\nEXCERPT:(.*)|s", $post, $excerpt);
                 $post_excerpt = $wpdb->escape(trim($excerpt[1]));
+                $excerpt = $wpdb->escape(trim($excerpt[1]));
                 $post = preg_replace("|(-----\nEXCERPT:.*)|s", '', $post);
 …
+                }
                 if ( $num_comments )
                     printf(' '.__('(%s comments)'), $num_comments);
+                    printf(__('(%s comments)'), $num_comments);
                 // Finally the pings
 …
+                }
                 if ( $num_pings )
                     printf(' '.__('(%s pings)'), $num_pings);
+                    printf(__('(%s pings)'), $num_pings);
                 echo "</li>";
+            }
+            flush();
+        }
 …
         wp_import_cleanup($this->id);
         echo '<h3>'.sprintf(__('All done. <a href="%s">Have fun!</a>'), get_option('home')).'</h3></div>';
+        echo '<h3>'.sprintf(__('All done. <a href="%s">Have fun!</a>'), get_option('home')).'</h3>';
+    }
     function import() {
         $this->id = (int) $_GET['id'];
         $this->file = get_attached_file($this->id);
         $this->get_authors_from_post();
 …
     function MT_Import() {
         // Nothing.
+        // Nothing.
+    }
+}
 …
 $mt_import = new MT_Import();
 register_importer('mt', __('Movable Type and TypePad'), __('Imports <strong>posts and comments</strong> from your Movable Type or TypePad blog'), array ($mt_import, 'dispatch'));
+register_importer('mt', 'Movable Type', __('Import posts and comments from your Movable Type blog'), array ($mt_import, 'dispatch'));
 ?>

trunk/wp-admin/import/rss.php

-                      r4431
+                      r3503
         return strtr($string, $trans_tbl);
+    }
     function greet() {
-        echo '<div class="narrow">';
         echo '<p>'.__('Howdy! This importer allows you to extract posts from any RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';
         wp_import_upload_form("admin.php?import=rss&amp;step=1");
-        echo '</div>';
+    }
     function get_posts() {
         global $wpdb;
         set_magic_quotes_runtime(0);
         $datalines = file($this->file); // Read the file into an array
 …
         foreach ($this->posts as $post) {
             preg_match('|<title>(.*?)</title>|is', $post, $post_title);
             $post_title = str_replace(array('<![CDATA[', ']]>'), '', $wpdb->escape( trim($post_title[1]) ));
+            $post_title = $wpdb->escape(trim($post_title[1]));
             preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $post_date_gmt);
+            preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $post_date);
             if ($post_date_gmt) {
                 $post_date_gmt = strtotime($post_date_gmt[1]);
+            if ($post_date) {
+                $post_date = strtotime($post_date[1]);
             } else {
                 // if we don't already have something from pubDate
                 preg_match('|<dc:date>(.*?)</dc:date>|is', $post, $post_date_gmt);
                 $post_date_gmt = preg_replace('|([-+])([0-9]+):([0-9]+)$|', '\1\2\3', $post_date_gmt[1]);
                 $post_date_gmt = str_replace('T', ' ', $post_date_gmt);
                 $post_date_gmt = strtotime($post_date_gmt);
+                preg_match('|<dc:date>(.*?)</dc:date>|is', $post, $post_date);
+                $post_date = preg_replace('|([-+])([0-9]+):([0-9]+)$|', '\1\2\3', $post_date[1]);
+                $post_date = str_replace('T', ' ', $post_date);
+                $post_date = strtotime($post_date);
+            }
+            $post_date_gmt = gmdate('Y-m-d H:i:s', $post_date_gmt);
+            $post_date = get_date_from_gmt( $post_date_gmt );
+            $post_date = gmdate('Y-m-d H:i:s', $post_date);
             preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
 …
             $post_author = 1;
             $post_status = 'publish';
             $this->posts[$index] = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_status', 'guid', 'categories');
+            $this->posts[$index] = compact('post_author', 'post_date', 'post_content', 'post_title', 'post_status', 'guid', 'categories');
             $index++;
+        }
 …
         $this->import_posts();
         wp_import_cleanup($file['id']);
         echo '<h3>';
         printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home'));
 …
         $this->header();
         switch ($step) {
             case 0 :
 …
                 break;
+        }
         $this->footer();
+    }
     function RSS_Import() {
         // Nothing.
+        // Nothing.
+    }
+}
 …
 $rss_import = new RSS_Import();
 register_importer('rss', __('RSS'), __('Import posts from an RSS feed'), array ($rss_import, 'dispatch'));
+register_importer('rss', 'RSS', __('Import posts from an RSS feed'), array ($rss_import, 'dispatch'));
 ?>

trunk/wp-admin/import/textpattern.php

-                      r4431
+                      r3503
+    {
     global $wpdb;
     $cat_id -= 0;   // force numeric
     $name = $wpdb->get_var('SELECT cat_ID FROM '.$wpdb->categories.' WHERE category_nicename="'.$category_nicename.'"');
     return $name;
+    }
 …
         echo '</div>';
+    }
     function greet() {
         echo '<div class="narrow">';
+    function greet()
+    {
         echo '<p>'.__('Howdy! This importer allows you to extract posts from any Textpattern 4.0.2+ into your blog. This has not been tested on previous versions of Textpattern.  Mileage may vary.').'</p>';
         echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>';
         echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
         $this->db_form();
         echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Categories').' &raquo;" /></p>';
+        echo '<input type="submit" name="submit" value="'.__('Import Categories').'" />';
         echo '</form>';
-        echo '</div>';
+    }
 …
         set_magic_quotes_runtime(0);
         $prefix = get_option('tpre');
         // Get Categories
         return $txpdb->get_results('SELECT
 …
                                      ARRAY_A);
+    }
     function get_txp_users()
+    {
 …
         set_magic_quotes_runtime(0);
         $prefix = get_option('tpre');
         // Get Users
         return $txpdb->get_results('SELECT
                                         user_id,
 …
                                     FROM '.$prefix.'txp_users', ARRAY_A);
+    }
     function get_txp_posts()
+    {
 …
         set_magic_quotes_runtime(0);
         $prefix = get_option('tpre');
         // Get Posts
         return $txpdb->get_results('SELECT
 …
                                     ', ARRAY_A);
+    }
     function get_txp_comments()
+    {
 …
         set_magic_quotes_runtime(0);
         $prefix = get_option('tpre');
         // Get Comments
         return $txpdb->get_results('SELECT * FROM '.$prefix.'txp_discuss', ARRAY_A);
+    }
         function get_txp_links()
+    {
 …
         set_magic_quotes_runtime(0);
         $prefix = get_option('tpre');
         return $txpdb->get_results('SELECT
                                         id,
 …
                                       ARRAY_A);
+    }
     function cat2wp($categories='')
+    {
 …
                 $count++;
                 extract($category);
                 // Make Nice Variables
                 $name = $wpdb->escape($name);
                 $title = $wpdb->escape($title);
                 if($cinfo = category_exists($name))
+                {
 …
                 $txpcat2wpcat[$id] = $ret_id;
+            }
             // Store category translation for future use
             add_option('txpcat2wpcat',$txpcat2wpcat);
 …
         return false;
+    }
     function users2wp($users='')
+    {
 …
         $count = 0;
         $txpid2wpid = array();
         // Midnight Mojo
         if(is_array($users))
 …
                 $count++;
                 extract($user);
                 // Make Nice Variables
                 $name = $wpdb->escape($name);
                 $RealName = $wpdb->escape($RealName);
                 if($uinfo = get_userdatabylogin($name))
+                {
                     $ret_id = wp_insert_user(array(
                                 'ID'            => $uinfo->ID,
 …
+                }
                 $txpid2wpid[$user_id] = $ret_id;
                 // Set Textpattern-to-WordPress permissions translation
                 $transperms = array(1 => '10', 2 => '9', 3 => '5', 4 => '4', 5 => '3', 6 => '2', 7 => '0');
                 // Update Usermeta Data
                 $user = new WP_User($ret_id);
 …
                 if('2'  == $transperms[$privs]) { $user->set_role('contributor'); }
                 if('0'  == $transperms[$privs]) { $user->set_role('subscriber'); }
                 update_usermeta( $ret_id, 'wp_user_level', $transperms[$privs] );
                 update_usermeta( $ret_id, 'rich_editing', 'false');
             }// End foreach($users as $user)
             // Store id translation array for future use
             add_option('txpid2wpid',$txpid2wpid);
             echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> users imported.'), $count).'<br /><br /></p>';
             return true;
         }// End if(is_array($users)
         echo __('No Users to Import!');
         return false;
     }// End function user2wp()
     function posts2wp($posts='')
+    {
 …
                 $count++;
                 extract($post);
                 // Set Textpattern-to-WordPress status translation
                 $stattrans = array(1 => 'draft', 2 => 'private', 3 => 'draft', 4 => 'publish', 5 => 'publish');
                 //Can we do this more efficiently?
                 $uinfo = ( get_userdatabylogin( $AuthorID ) ) ? get_userdatabylogin( $AuthorID ) : 1;
 …
                 $Excerpt = $wpdb->escape($Excerpt);
                 $post_status = $stattrans[$Status];
                 // Import Post data into WordPress
                 if($pinfo = post_exists($Title,$Body))
+                {
 …
+                }
                 $txpposts2wpposts[$ID] = $ret_id;
                 // Make Post-to-Category associations
                 $cats = array();
 …
                 if($cat2 = get_catbynicename($Category2)) { $cats[2] = $cat2; }
                 if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); }
+                if(!empty($cats)) { wp_set_post_cats('', $ret_id, $cats); }
+            }
+        }
         // Store ID translation for later use
         add_option('txpposts2wpposts',$txpposts2wpposts);
         echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> posts imported.'), $count).'<br /><br /></p>';
         return true;
+    }
+        return true;
+    }
     function comments2wp($comments='')
+    {
 …
         $txpcm2wpcm = array();
         $postarr = get_option('txpposts2wpposts');
         // Magic Mojo
         if(is_array($comments))
 …
                 $count++;
                 extract($comment);
                 // WordPressify Data
                 $comment_ID = ltrim($discussid, '0');
 …
                 $web = $wpdb->escape($web);
                 $message = $wpdb->escape($message);
                 if($cinfo = comment_exists($name, $posted))
+                {
 …
+            }
             // Store Comment ID translation for future use
             add_option('txpcm2wpcm', $txpcm2wpcm);
+            add_option('txpcm2wpcm', $txpcm2wpcm);
             // Associate newly formed categories with posts
             get_comment_count($ret_id);
             echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> comments imported.'), $count).'<br /><br /></p>';
             return true;
 …
         return false;
+    }
     function links2wp($links='')
+    {
 …
         global $wpdb;
         $count = 0;
         // Deal with the links
         if(is_array($links))
 …
                 $count++;
                 extract($link);
                 // Make nice vars
                 $category = $wpdb->escape($category);
                 $linkname = $wpdb->escape($linkname);
                 $description = $wpdb->escape($description);
                 if($linfo = link_exists($linkname))
+                {
 …
         return false;
+    }
     function import_categories()
+    {
         // Category Import
+    {
+        // Category Import
         $cats = $this->get_txp_cats();
         $this->cat2wp($cats);
         add_option('txp_cats', $cats);
         echo '<form action="admin.php?import=textpattern&amp;step=2" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Users'));
 …
+    }
     function import_users()
+    {
 …
         $users = $this->get_txp_users();
         $this->users2wp($users);
         echo '<form action="admin.php?import=textpattern&amp;step=3" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Posts'));
         echo '</form>';
+    }
     function import_posts()
+    {
 …
         $posts = $this->get_txp_posts();
         $this->posts2wp($posts);
         echo '<form action="admin.php?import=textpattern&amp;step=4" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Comments'));
         echo '</form>';
+    }
     function import_comments()
+    {
 …
         $comments = $this->get_txp_comments();
         $this->comments2wp($comments);
         echo '<form action="admin.php?import=textpattern&amp;step=5" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Import Links'));
         echo '</form>';
+    }
     function import_links()
+    {
 …
         $this->links2wp($links);
         add_option('txp_links', $links);
         echo '<form action="admin.php?import=textpattern&amp;step=6" method="post">';
         printf('<input type="submit" name="submit" value="%s" />', __('Finish'));
         echo '</form>';
+    }
     function cleanup_txpimport()
+    {
 …
         $this->tips();
+    }
     function tips()
+    {
 …
         echo '<p>'.__('Secondly, we have attempted to preserve post authors.  If you are the only author or contributor to your blog, then you are safe.  In most cases, we are successful in this preservation endeavor.  However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'</p>';
         echo '<h3>'.__('Textile').'</h3>';
         echo '<p>'.__('Also, since you\'re coming from Textpattern, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/category/development/wordpress/textile/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>';
+        echo '<p>'.__('Also, since you\'re coming from Textpattern, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/2004/04/19/wordpress-plugin-textile-20/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>';
         echo '<h3>'.__('WordPress Resources').'</h3>';
         echo '<p>'.__('Finally, there are numerous WordPress resources around the internet.  Some of them are:').'</p>';
         echo '<ul>';
         echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>';
         echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums</a>').'</li>';
+        echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums').'</li>';
         echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>';
         echo '</ul>';
         echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '/wp-login.php').'</p>';
+    }
     function db_form()
+    {
         echo '<table class="editform">';
         printf('<tr><th scope="row"><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('Textpattern Database User:'));
         printf('<tr><th scope="row"><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('Textpattern Database Password:'));
         printf('<tr><th scope="row"><label for="dbname">%s</label></th><td><input type="text" id="dbname" name="dbname" /></td></tr>', __('Textpattern Database Name:'));
         printf('<tr><th scope="row"><label for="dbhost">%s</label></th><td><input type="text" id="dbhost" name="dbhost" value="localhost" /></td></tr>', __('Textpattern Database Host:'));
         printf('<tr><th scope="row"><label for="dbprefix">%s</label></th><td><input type="text" name="dbprefix" id="dbprefix"  /></td></tr>', __('Textpattern Table prefix (if any):'));
         echo '</table>';
+    }
+        echo '<ul>';
+        printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" /></li>', __('Textpattern Database User:'));
+        printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" /></li>', __('Textpattern Database Password:'));
+        printf('<li><label for="dbname">%s</label> <input type="text" name="dbname" /></li>', __('Textpattern Database Name:'));
+        printf('<li><label for="dbhost">%s</label> <input type="text" name="dbhost" value="localhost" /></li>', __('Textpattern Database Host:'));
+        printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" /></li>', __('Textpattern Table prefix (if any):'));
+        echo '</ul>';
+    }
     function dispatch()
+    {
 …
             $step = (int) $_GET['step'];
         $this->header();
         if ( $step > 0 )
+        {
 …
+            {
                 if(get_option('txpuser'))
                     delete_option('txpuser');
+                    delete_option('txpuser');
                 add_option('txpuser',$_POST['dbuser']);
+            }
 …
+            {
                 if(get_option('txppass'))
                     delete_option('txppass');
+                    delete_option('txppass');
                 add_option('txppass',$_POST['dbpass']);
+            }
             if($_POST['dbname'])
+            {
                 if(get_option('txpname'))
                     delete_option('txpname');
+                    delete_option('txpname');
                 add_option('txpname',$_POST['dbname']);
+            }
 …
                     delete_option('tpre');
                 add_option('tpre',$_POST['dbprefix']);
+            }
+            }
 …
                 break;
+        }
         $this->footer();
+    }
 …
     function Textpattern_Import()
+    {
         // Nothing.
+        // Nothing.
+    }
+}
 $txp_import = new Textpattern_Import();
 register_importer('textpattern', __('Textpattern'), __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch'));
+register_importer('textpattern', 'Textpattern', __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch'));
 ?>

trunk/wp-admin/index.php

-                      r4431
+                      r3503
 require_once('admin.php');
 $title = __('Dashboard');
-$parent_file = 'index.php';
 require_once('admin-header.php');
 require_once (ABSPATH . WPINC . '/rss.php');
+require_once (ABSPATH . WPINC . '/rss-functions.php');
 $today = current_time('mysql', 1);
 …
 <div class="wrap">
 <h2><?php _e('Welcome to WordPress'); ?></h2>
+<h2><?php _e('Dashboard'); ?></h2>
 <div id="zeitgeist">
 …
 ?>
 <div id="incominglinks">
 <h3><?php _e('Incoming Links'); ?> <cite><a href="http://www.technorati.com/search/<?php echo trailingslashit(get_option('home')); ?>?partner=wordpress"><?php _e('More &raquo;'); ?></a></cite></h3>
+<h3><?php _e('Incoming Links'); ?> <cite><a href="http://www.technorati.com/search/<?php echo trailingslashit(get_option('home')); ?>?partner=wordpress"><?php _e('More'); ?> &raquo;</a></cite></h3>
 <ul>
 <?php
 …
 foreach ($rss->items as $item ) {
 ?>
     <li><a href="<?php echo wp_filter_kses($item['link']); ?>"><?php echo wptexturize(wp_specialchars($item['title'])); ?></a></li>
+    <li><a href="<?php echo wp_filter_kses($item['link']); ?>"><?php echo wp_specialchars($item['title']); ?></a></li>
 <?php } ?>
 </ul>
 …
 <p><strong><a href="moderation.php"><?php echo sprintf(__('Comments in moderation (%s)'), number_format($numcomments) ); ?> &raquo;</a></strong></p>
 <?php endif; ?>
+</div>
 <ul>
 …
 ?>
 </ul>
+</div>
 <?php endif; ?>
 <?php
 if ( $recentposts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' AND post_date_gmt < '$today' ORDER BY post_date DESC LIMIT 5") ) :
+if ( $recentposts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_status = 'publish' AND post_date_gmt < '$today' ORDER BY post_date DESC LIMIT 5") ) :
 ?>
 <div>
 …
 <?php
 if ( $scheduled = $wpdb->get_results("SELECT ID, post_title, post_date_gmt FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'future' ORDER BY post_date ASC") ) :
+if ( $scheduled = $wpdb->get_results("SELECT ID, post_title, post_date_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_date_gmt > '$today' ORDER BY post_date ASC") ) :
 ?>
 <div>
 …
 <h3><?php _e('Blog Stats'); ?></h3>
 <?php
 $numposts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish'");
+$numposts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_status = 'publish'");
 if (0 < $numposts) $numposts = number_format($numposts);
 …
 </div>
+<h3><?php _e('Welcome to WordPress'); ?></h3>
 <p><?php _e('Use these links to get started:'); ?></p>
 <ul>
+<?php if ( current_user_can('edit_posts') ) : ?>
+    <li><a href="post-new.php"><?php _e('Write a post'); ?></a></li>
+<?php endif; ?>
+    <li><a href="profile.php"><?php _e('Update your profile or change your password'); ?></a></li>
+<?php if ( current_user_can('manage_links') ) : ?>
+    <li><a href="link-add.php"><?php _e('Add a bookmark to your blogroll'); ?></a></li>
+<?php endif; ?>
+<?php if ( current_user_can('switch_themes') ) : ?>
+    <li><a href="themes.php"><?php _e('Change your site&#8217;s look or theme'); ?></a></li>
+<?php endif; ?>
+<li><a href="post.php"><?php _e('Write a post'); ?></a></li>
+<li><a href="profile.php"><?php _e('Update your profile or change your password'); ?></a></li>
+<li><a href="link-add.php"><?php _e('Add a link to your blogroll'); ?></a></li>
+<li><a href="themes.php"><?php _e('Change your site&#8217;s look or theme'); ?></a></li>
 </ul>
+<p><?php _e("Need help with WordPress? Please see our <a href='http://codex.wordpress.org/'>documentation</a> or visit the <a href='http://wordpress.org/support/'>support forums</a>."); ?></p>
+<p><?php _e("Below is the latest news from the official WordPress development blog, click on a title to read the full entry. If you need help with WordPress please see our <a href='http://codex.wordpress.org/'>great documentation</a> or if that doesn't help visit the <a href='http://wordpress.org/support/'>support forums</a>."); ?></p>
 <?php
 $rss = @fetch_rss('http://wordpress.org/development/feed/');
 if ( isset($rss->items) && 0 != count($rss->items) ) {
 ?>
-<div id="devnews">
 <h3><?php _e('WordPress Development Blog'); ?></h3>
 <?php
 …
+}
 ?>
+</div>
 <?php
 …
 ?>
 <div id="planetnews">
 <h3><?php _e('Other WordPress News'); ?></h3>
+<h3><?php _e('Other WordPress News'); ?> <a href="http://planet.wordpress.org/"><?php _e('more'); ?> &raquo;</a></h3>
 <ul>
 <?php
 $rss->items = array_slice($rss->items, 0, 20);
 foreach ($rss->items as $item ) {
-$title = wp_specialchars($item['title']);
-$author = preg_replace( '|(.+?):.+|s', '$1', $item['title'] );
-$post = preg_replace( '|.+?:(.+)|s', '$1', $item['title'] );
 ?>
 <li><a href='<?php echo wp_filter_kses($item['link']); ?>'><span class="post"><?php echo $post; ?></span><span class="hidden"> - </span><cite><?php echo $author; ?></cite></a></li>
+<li><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a></li>
 <?php
+    }
 ?>
 </ul>
-<p class="readmore"><a href="http://planet.wordpress.org/"><?php _e('Read more'); ?> &raquo;</a></p>
 </div>
 <?php

trunk/wp-admin/install.php

-                      r4431
+                      r3503
 <?php
 define('WP_INSTALLING', true);
+if (!file_exists('../wp-config.php')) {
+  require_once('../wp-includes/functions.php');
+  wp_die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Installing_WordPress#Step_3:_Set_up_wp-config.php'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.", "WordPress &rsaquo; Error");
+}
+if (!file_exists('../wp-config.php'))
+    die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
 require_once('../wp-config.php');
 require_once('./upgrade-functions.php');
+$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+$guessurl = str_replace('/wp-admin/install.php?step=2', '', $schema . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) );
 if (isset($_GET['step']))
 …
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+    <title><?php _e('WordPress &rsaquo; Installation'); ?></title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title><?php _e('WordPress &rsaquo; Installation'); ?></title>
+    <link rel="stylesheet" href="install.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+    <?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
+    <link rel="stylesheet" href="install-rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+    <?php endif; ?>
+    <style media="screen" type="text/css">
+    <!--
+    html {
+        background: #eee;
+    }
+    body {
+        background: #fff;
+        color: #000;
+        font-family: Georgia, "Times New Roman", Times, serif;
+        margin-left: 20%;
+        margin-right: 20%;
+        padding: .2em 2em;
+    }
+    h1 {
+        color: #006;
+        font-size: 18px;
+        font-weight: lighter;
+    }
+    h2 {
+        font-size: 16px;
+    }
+    p, li, dt {
+        line-height: 140%;
+        padding-bottom: 2px;
+    }
+    ul, ol {
+        padding: 5px 5px 5px 20px;
+    }
+    #logo {
+        margin-bottom: 2em;
+    }
+    .step a, .step input {
+        font-size: 2em;
+    }
+    td input {
+        font-size: 1.5em;
+    }
+    .step, th {
+        text-align: right;
+    }
+    #footer {
+        text-align: center;
+        border-top: 1px solid #ccc;
+        padding-top: 1em;
+        font-style: italic;
+    }
+    -->
+    </style>
 </head>
 <body>
 …
 <?php
 // Let's check to make sure WP isn't already installed.
+if ( is_blog_installed() ) die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
+$wpdb->hide_errors();
+$installed = $wpdb->get_results("SELECT * FROM $wpdb->users");
+if ($installed) die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
+$wpdb->show_errors();
 switch($step) {
     case 0:
 ?>
 <p><?php printf(__('Welcome to WordPress installation. We&#8217;re now going to go through a few steps to get you up and running with the latest in personal publishing platforms. You may want to peruse the <a href="%s">ReadMe documentation</a> at your leisure.'), '../readme.html'); ?></p>
+<h2 class="step"><a href="install.php?step=1"><?php _e('First Step &raquo;'); ?></a></h2>
+<?php
+        break;
+    <h2 class="step"><a href="install.php?step=1"><?php _e('First Step &raquo;'); ?></a></h2>
+<?php
+    break;
     case 1:
 ?>
 <h1><?php _e('First Step'); ?></h1>
 …
 <form id="setup" method="post" action="install.php?step=2">
+    <table width="100%">
+        <tr>
+            <th width="33%"><?php _e('Weblog title:'); ?></th>
+            <td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
+        </tr>
+        <tr>
+            <th><?php _e('Your e-mail:'); ?></th>
+            <td><input name="admin_email" type="text" id="admin_email" size="25" /></td>
+        </tr>
+        <tr>
+            <th scope="row"  valign="top"> <?php __('Privacy:'); ?></th>
+            <td><label><input type="checkbox" name="blog_public" value="1" checked="checked" /> <?php _e('I would like my blog to appear in search engines like Google and Technorati.'); ?></label></td>
+        </tr>
+    </table>
+    <p><em><?php _e('Double-check that email address before continuing.'); ?></em></p>
+    <h2 class="step"><input type="submit" name="Submit" value="<?php _e('Continue to Second Step &raquo;'); ?>" /></h2>
+<table width="100%">
+<tr>
+<th width="33%"><?php _e('Weblog title:'); ?></th>
+<td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
+</tr>
+<tr>
+<th><?php _e('Your e-mail:'); ?></th>
+    <td><input name="admin_email" type="text" id="admin_email" size="25" /></td>
+</tr>
+</table>
+<p><em><?php _e('Double-check that email address before continuing.'); ?></em></p>
+<h2 class="step">
+<input type="submit" name="Submit" value="<?php _e('Continue to Second Step &raquo;'); ?>" />
+</h2>
 </form>
 <?php
         break;
+    break;
     case 2:
+        // Fill in the data we gathered
+        $weblog_title = stripslashes($_POST['weblog_title']);
         $admin_email = stripslashes($_POST['admin_email']);
         $public = (int) $_POST['blog_public'];
         // check e-mail address
         if (empty($admin_email)) {
             die(__("<strong>ERROR</strong>: please type your e-mail address"));
         } else if (!is_email($admin_email)) {
             die(__("<strong>ERROR</strong>: the e-mail address isn't correct"));
+        }
+// Fill in the data we gathered
+$weblog_title = stripslashes($_POST['weblog_title']);
+$admin_email = stripslashes($_POST['admin_email']);
+// check e-mail address
+if (empty($admin_email)) {
+    die (__("<strong>ERROR</strong>: please type your e-mail address"));
+} else if (!is_email($admin_email)) {
+    die (__("<strong>ERROR</strong>: the e-mail address isn't correct"));
+}
 ?>
 <h1><?php _e('Second Step'); ?></h1>
 …
 <?php
+    $result = wp_install($weblog_title, __('admin'), $admin_email, $public);
+    extract($result);
+flush();
+// Set everything up
+wp_cache_flush();
+make_db_current_silent();
+populate_options();
+populate_roles();
+update_option('blogname', $weblog_title);
+update_option('admin_email', $admin_email);
+// Now drop in some default links
+$wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, '".$wpdb->escape(__('Blogroll'))."')");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 1, 'http://blogs.linux.ie/xeer/feed/', '');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://zengun.org/weblog/', 'Michel', 1, 'http://zengun.org/weblog/feed/', '');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://boren.nu/', 'Ryan', 1, 'http://boren.nu/feed/', '');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://photomatt.net/', 'Matt', 1, 'http://xml.photomatt.net/feed/', '');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://zed1.com/journalized/', 'Mike', 1, 'http://zed1.com/journalized/feed/', '');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://www.alexking.org/', 'Alex', 1, 'http://www.alexking.org/blog/wp-rss2.php', '');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://dougal.gunters.org/', 'Dougal', 1, 'http://dougal.gunters.org/feed/', '');");
+// Default category
+$wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_count, category_description) VALUES ('0', '".$wpdb->escape(__('Uncategorized'))."', '".sanitize_title(__('Uncategorized'))."', '1', '')");
+// First post
+$now = date('Y-m-d H:i:s');
+$now_gmt = gmdate('Y-m-d H:i:s');
+$wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_excerpt, post_title, post_category, post_name, post_modified, post_modified_gmt, comment_count, to_ping, pinged, post_content_filtered) VALUES ('1', '$now', '$now_gmt', '".$wpdb->escape(__('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!'))."', '', '".$wpdb->escape(__('Hello world!'))."', '0', '".$wpdb->escape(__('hello-world'))."', '$now', '$now_gmt', '1', '', '', '')");
+$wpdb->query( "INSERT INTO $wpdb->post2cat (`rel_id`, `post_id`, `category_id`) VALUES (1, 1, 1)" );
+// Default comment
+$wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_date, comment_date_gmt, comment_content) VALUES ('1', '".$wpdb->escape(__('Mr WordPress'))."', '', 'http://wordpress.org/', '$now', '$now_gmt', '".$wpdb->escape(__('Hi, this is a comment.<br />To delete a comment, just log in, and view the posts\' comments, there you will have the option to edit or delete them.'))."')");
+// First Page
+$wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_excerpt, post_title, post_category, post_name, post_modified, post_modified_gmt, post_status, to_ping, pinged, post_content_filtered) VALUES ('1', '$now', '$now_gmt', '".$wpdb->escape(__('This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.'))."', '', '".$wpdb->escape(__('About'))."', '0', '".$wpdb->escape(__('about'))."', '$now', '$now_gmt', 'static', '', '', '')");
+$wp_rewrite->flush_rules();
+// Set up admin user
+$random_password = substr(md5(uniqid(microtime())), 0, 6);
+$display_name_array = explode('@', $admin_email);
+$display_name = $display_name_array[0];
+$wpdb->query("INSERT INTO $wpdb->users (ID, user_login, user_pass, user_email, user_registered, display_name, user_nicename) VALUES ( '1', 'admin', MD5('$random_password'), '$admin_email', NOW(), '$display_name', 'admin')");
+$wpdb->query("INSERT INTO $wpdb->usermeta (user_id, meta_key, meta_value) VALUES ({$wpdb->insert_id}, '{$table_prefix}user_level', '10');");
+$admin_caps = serialize(array('administrator' => true));
+$wpdb->query("INSERT INTO $wpdb->usermeta (user_id, meta_key, meta_value) VALUES ({$wpdb->insert_id}, '{$table_prefix}capabilities', '{$admin_caps}');");
+$message_headers = 'From: ' . $weblog_title . ' <wordpress@' . $_SERVER['SERVER_NAME'] . '>';
+$message = sprintf(__("Your new WordPress blog has been successfully set up at:
+%1\$s
+You can log in to the administrator account with the following information:
+Username: admin
+Password: %2\$s
+We hope you enjoy your new weblog. Thanks!
+--The WordPress Team
+http://wordpress.org/
+"), $guessurl, $random_password);
+@wp_mail($admin_email, __('New WordPress Blog'), $message, $message_headers);
+wp_cache_flush();
 ?>
 <p><em><?php _e('Finished!'); ?></em></p>
 <p><?php printf(__('Now you can <a href="%1$s">log in</a> with the <strong>username</strong> "<code>admin</code>" and <strong>password</strong> "<code>%2$s</code>".'), '../wp-login.php', $password); ?></p>
 <p><?php _e('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you. If you lose it, you will have to delete the tables from the database yourself, and re-install WordPress. So to review:'); ?></p>
+<p><?php printf(__('Now you can <a href="%1$s">log in</a> with the <strong>username</strong> "<code>admin</code>" and <strong>password</strong> "<code>%2$s</code>".'), '../wp-login.php', $random_password); ?></p>
+<p><?php _e('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you. If you lose it, you will have to delete the tables from the database yourself, and re-install WordPress. So to review:'); ?>
+</p>
 <dl>
     <dt><?php _e('Username'); ?></dt>
         <dd><code><?php _e('admin') ?></code></dd>
     <dt><?php _e('Password'); ?></dt>
         <dd><code><?php echo $password; ?></code></dd>
+<dt><?php _e('Username'); ?></dt>
+<dd><code>admin</code></dd>
+<dt><?php _e('Password'); ?></dt>
+<dd><code><?php echo $random_password; ?></code></dd>
     <dt><?php _e('Login address'); ?></dt>
         <dd><a href="../wp-login.php">wp-login.php</a></dd>
+<dd><a href="../wp-login.php">wp-login.php</a></dd>
 </dl>
 <p><?php _e('Were you expecting more steps? Sorry to disappoint. All done! :)'); ?></p>
+<?php
+        break;
+<?php
+    break;
+}
 ?>
 <p id="footer"><?php _e('<a href="http://wordpress.org/">WordPress</a>, personal publishing platform.'); ?></p>
 </body>

trunk/wp-admin/link-add.php

-                      r4431
+                      r3503
 require_once('admin.php');
 $title = __('Add Bookmark');
+$title = __('Add Link');
 $this_file = 'link-manager.php';
 $parent_file = 'link-manager.php';
 wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image',
+$wpvarstoreset = array('action', 'cat_id', 'linkurl', 'name', 'image',
                        'description', 'visible', 'target', 'category', 'link_id',
                        'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
+                       'notes', 'linkcheck[]'));
+                       'notes', 'linkcheck[]');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
+wp_enqueue_script( array('xfn', 'dbx-admin-key?pagenow=link.php') );
+if ( current_user_can( 'manage_categories' ) )
+    wp_enqueue_script( 'ajaxcat' );
+$xfn_js = true;
 require('admin-header.php');
 ?>
 …
 ?>
+<div id="wp-link-bookmarklet"  class="wrap">
+<h3><?php _e('Add Link Bookmarklet'); ?></h3>
+<p><?php _e('Right click on the following link and choose "Bookmark This Link..." to create an add link shortcut. Right now this only works on Mozilla or Netscape, but we’re working on it.'); ?></p>
+<?php printf(__('<p><a href="%s" title="Link add bookmarklet">Link This</a></p>'), "javascript:void(linkmanpopup=window.open('" . get_option('siteurl') . "/wp-admin/link-add.php?action=popup&amp;linkurl='+escape(location.href)+'&amp;name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?>
+<div class="wrap">
+<?php printf(__('<p>You can drag <a href="%s" title="Link add bookmarklet">Link This</a> to your toolbar and when you click it a window will pop up that will allow you to add whatever site you&#8217;re on to your links! Right now this only works on Mozilla or Netscape, but we&#8217;re working on it.</p>'), "javascript:void(linkmanpopup=window.open('" . get_settings('siteurl') . "/wp-admin/link-add.php?action=popup&amp;linkurl='+escape(location.href)+'&amp;name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?>
 </div>

trunk/wp-admin/link-import.php

-                      r4431
+                      r3503
         include_once('admin-header.php');
         if ( !current_user_can('manage_links') )
             wp_die(__('Cheatin&#8217; uh?'));
+            die (__("Cheatin&#8217; uh?"));
         $opmltype = 'blogrolling'; // default.
 …
 <h2><?php _e('Import your blogroll from another system') ?> </h2>
 <form enctype="multipart/form-data" action="link-import.php" method="post" name="blogroll">
-<?php wp_nonce_field('import-bookmarks') ?>
 <p><?php _e('If a program or website you use allows you to export your bookmarks or subscriptions as OPML you may import them here.'); ?>
+<p><?php _e('If a program or website you use allows you to export your links or subscriptions as OPML you may import them here.'); ?>
 <div style="width: 70%; margin: auto; height: 8em;">
 <input type="hidden" name="step" value="1" />
 …
 </div>
 <p style="clear: both; margin-top: 1em;"><?php _e('Now select a category you want to put these bookmarks in.') ?><br />
+<p style="clear: both; margin-top: 1em;"><?php _e('Now select a category you want to put these links in.') ?><br />
 <?php _e('Category:') ?> <select name="cat_id">
 <?php
 $categories = get_categories('hide_empty=0');
+$categories = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $wpdb->linkcategories ORDER BY cat_id");
 foreach ($categories as $category) {
 ?>
 <option value="<?php echo $category->cat_ID; ?>"><?php echo wp_specialchars($category->cat_name); ?></option>
+<option value="<?php echo $category->cat_id; ?>"><?php echo $category->cat_id.': '.$category->cat_name; ?></option>
 <?php
 } // end foreach
 …
 </select></p>
 <p class="submit"><input type="submit" name="submit" value="<?php _e('Import OPML File &raquo;') ?>" /></p>
+<p class="submit"><input type="submit" name="submit" value="<?php _e('Import OPML File') ?> &raquo;" /></p>
 </form>
 …
     case 1: {
-        check_admin_referer('import-bookmarks');
                 include_once('admin-header.php');
                 if ( !current_user_can('manage_links') )
                     wp_die(__('Cheatin&#8217; uh?'));
+                    die (__("Cheatin' uh ?"));
 ?>
 <div class="wrap">
 …
                     if ( isset($file['error']) )
                         wp_die($file['error']);
+                        die($file['error']);
                     $url = $file['url'];
 …
                         if ('http' == substr($titles[$i], 0, 4))
                             $titles[$i] = '';
+                        $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]);
+                        wp_insert_link($link);
+                        // FIXME:  Use wp_insert_link().
+                        $query = "INSERT INTO $wpdb->links (link_url, link_name, link_target, link_category, link_description, link_owner, link_rss)
+                                VALUES('{$urls[$i]}', '".$wpdb->escape($names[$i])."', '', $cat_id, '".$wpdb->escape($descriptions[$i])."', $user_ID, '{$feeds[$i]}')\n";
+                        $result = $wpdb->query($query);
                         echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
+                    }
 ?>
      <p><?php printf(__('Inserted %1$d bookmarks into category %2$s. All done! Go <a href="%3$s">manage those bookmarks</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
+     <p><?php printf(__('Inserted %1$d links into category %2$s. All done! Go <a href="%3$s">manage those links</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
 <?php
                 } // end if got url

trunk/wp-admin/link-manager.php

-                      r4431
+                      r3503
 <?php
 // Links
 // Copyright (C) 2002, 2003 Mike Little -- mike@zed1.com
 require_once ('admin.php');
 $title = __('Manage Bookmarks');
+require_once('admin.php');
+$title = __('Manage Links');
 $this_file = $parent_file = 'link-manager.php';
+wp_enqueue_script( 'listman' );
+wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'));
+if (empty ($cat_id))
+    $cat_id = 'all';
+if (empty ($order_by))
+    $order_by = 'order_name';
+$title = __('Manage Bookmarks');
+include_once ("./admin-header.php");
+if (!current_user_can('manage_links'))
+    wp_die(__("You do not have sufficient permissions to edit the bookmarks for this blog."));
+switch ($order_by) {
+    case 'order_id' :
+        $sqlorderby = 'id';
+        break;
+    case 'order_url' :
+        $sqlorderby = 'url';
+        break;
+    case 'order_desc' :
+        $sqlorderby = 'description';
+        break;
+    case 'order_owner' :
+        $sqlorderby = 'owner';
+        break;
+    case 'order_rating' :
+        $sqlorderby = 'rating';
+        break;
+    case 'order_name' :
+    default :
+        $sqlorderby = 'name';
+        break;
+$list_js = true;
+$wpvarstoreset = array('action','cat_id', 'linkurl', 'name', 'image',
+                       'description', 'visible', 'target', 'category', 'link_id',
+                       'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
+                       'notes', 'linkcheck[]');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
+$links_show_cat_id = $_COOKIE['links_show_cat_id_' . COOKIEHASH];
+$links_show_order = $_COOKIE['links_show_order_' . COOKIEHASH];
+if ('' != $_POST['assign']) $action = 'assign';
+if ('' != $_POST['visibility']) $action = 'visibility';
+if ('' != $_POST['move']) $action = 'move';
+if ('' != $_POST['linkcheck']) $linkcheck = $_POST[linkcheck];
+switch ($action) {
+  case 'assign':
+  {
+    check_admin_referer();
+    // check the current user's level first.
+    if ( !current_user_can('manage_links') )
+      die (__("Cheatin' uh ?"));
+    //for each link id (in $linkcheck[]): if the current user level >= the
+    //userlevel of the owner of the link then we can proceed.
+    if (count($linkcheck) == 0) {
+        header('Location: ' . $this_file);
+        exit;
+    }
+    $all_links = join(',', $linkcheck);
+    $results = $wpdb->get_results("SELECT link_id, link_owner FROM $wpdb->links LEFT JOIN $wpdb->users ON link_owner = ID WHERE link_id in ($all_links)");
+    foreach ($results as $row) {
+       $ids_to_change[] = $row->link_id;
+    }
+    // should now have an array of links we can change
+    $all_links = join(',', $ids_to_change);
+    $q = $wpdb->query("update $wpdb->links SET link_owner='$newowner' WHERE link_id IN ($all_links)");
+    header('Location: ' . $this_file);
+    break;
+  }
+  case 'visibility':
+  {
+    check_admin_referer();
+    // check the current user's level first.
+    if ( !current_user_can('manage_links') )
+      die (__("Cheatin' uh ?"));
+    //for each link id (in $linkcheck[]): toggle the visibility
+    if (count($linkcheck) == 0) {
+        header('Location: ' . $this_file);
+        exit;
+    }
+    $all_links = join(',', $linkcheck);
+    $results = $wpdb->get_results("SELECT link_id, link_visible FROM $wpdb->links WHERE link_id in ($all_links)");
+    foreach ($results as $row) {
+        if ($row->link_visible == 'Y') { // ok to proceed
+            $ids_to_turnoff[] = $row->link_id;
+        } else {
+            $ids_to_turnon[] = $row->link_id;
+        }
+    }
+    // should now have two arrays of links to change
+    if (count($ids_to_turnoff)) {
+        $all_linksoff = join(',', $ids_to_turnoff);
+        $q = $wpdb->query("update $wpdb->links SET link_visible='N' WHERE link_id IN ($all_linksoff)");
+    }
+    if (count($ids_to_turnon)) {
+        $all_linkson = join(',', $ids_to_turnon);
+        $q = $wpdb->query("update $wpdb->links SET link_visible='Y' WHERE link_id IN ($all_linkson)");
+    }
+    header('Location: ' . $this_file);
+    break;
+  }
+  case 'move':
+  {
+    check_admin_referer();
+    // check the current user's level first.
+    if ( !current_user_can('manage_links') )
+      die (__("Cheatin' uh ?"));
+    //for each link id (in $linkcheck[]) change category to selected value
+    if (count($linkcheck) == 0) {
+        header('Location: ' . $this_file);
+        exit;
+    }
+    $all_links = join(',', $linkcheck);
+    // should now have an array of links we can change
+    $q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
+    header('Location: ' . $this_file);
+    break;
+  }
+  case 'Add':
+  {
+    check_admin_referer();
+    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 ?"));
+    $link_id = (int) $_GET['link_id'];
+    wp_delete_link($link_id);
+    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;
+    setcookie('links_show_cat_id_' . COOKIEHASH, $links_show_cat_id, time()+600);
+    wp_redirect($this_file);
+    break;
+  } // end Delete
+  case 'linkedit': {
+    $xfn_js = true;
+    include_once ('admin-header.php');
+    if ( !current_user_can('manage_links') )
+        die(__('You do not have sufficient permissions to edit the links for this blog.'));
+    $link_id = (int) $_GET['link_id'];
+    if ( !$link = get_link_to_edit($link_id) )
+        die( __('Link not found.') );
+    include('edit-link-form.php');
+    break;
+  } // end linkedit
+  case __("Show"):
+  {
+    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;
+    if (!isset($order_by) || ($order_by == '')) {
+        if (!isset($links_show_order) || ($links_show_order == ''))
+        $order_by = 'order_name';
+    }
+    $links_show_order = $order_by;
+    //break; fall through
+  } // end Show
+  case "popup":
+  {
+    $link_url = stripslashes($_GET["linkurl"]);
+    $link_name = stripslashes($_GET["name"]);
+    //break; fall through
+  }
+  default:
+  {
+    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;
+    if (isset($links_show_order) && ($links_show_order != ''))
+        $order_by = $links_show_order;
+    if (!isset($order_by) || ($order_by == ''))
+        $order_by = 'order_name';
+    $links_show_order = $order_by;
+    setcookie('links_show_cat_id_' . COOKIEHASH, $links_show_cat_id, time()+600);
+    setcookie('links_show_order_' . COOKIEHASH, $links_show_order, time()+600);
+    include_once ("./admin-header.php");
+    if ( !current_user_can('manage_links') )
+      die(__("You do not have sufficient permissions to edit the links for this blog."));
+    switch ($order_by)
+    {
+        case 'order_id':     $sqlorderby = 'id';          break;
+        case 'order_url':    $sqlorderby = 'url';         break;
+        case 'order_desc':   $sqlorderby = 'description'; break;
+        case 'order_owner':  $sqlorderby = 'owner';       break;
+        case 'order_rating': $sqlorderby = 'rating';      break;
+        case 'order_name':
+        default:             $sqlorderby = 'name';        break;
+    }
+  if ($action != "popup") {
 ?>
 <script type="text/javascript">
 …
 </script>
-<?php
-if ( isset($_GET['deleted']) ) {
-    echo '<div style="background-color: rgb(207, 235, 247);" id="message" class="updated fade"><p>';
-    $deleted = (int) $_GET['deleted'];
-    printf(__('%s bookmarks deleted.'), $deleted);
-    echo '</p></div>';
+}
-?>
 <div class="wrap">
+<h2><?php _e('Blogroll Management'); ?></h2>
+<p><?php _e('Here you add links to sites that you visit often and share them on your blog. When you have a list of links in your sidebar to other blogs, it&#8217;s called a &#8220;blogroll.&#8221;'); ?></p>
+<form id="cats" method="get" action="">
+<p><?php
+$categories = get_categories("hide_empty=1&type=link");
+$select_cat = "<select name=\"cat_id\">\n";
+$select_cat .= '<option value="all"'  . (($cat_id == 'all') ? " selected='selected'" : '') . '>' . __('All') . "</option>\n";
+foreach ((array) $categories as $cat)
+    $select_cat .= '<option value="' . $cat->cat_ID . '"' . (($cat->cat_ID == $cat_id) ? " selected='selected'" : '') . '>' . wp_specialchars($cat->cat_name) . "</option>\n";
+$select_cat .= "</select>\n";
+$select_order = "<select name=\"order_by\">\n";
+$select_order .= '<option value="order_id"' . (($order_by == 'order_id') ? " selected='selected'" : '') . '>' .  __('Bookmark ID') . "</option>\n";
+$select_order .= '<option value="order_name"' . (($order_by == 'order_name') ? " selected='selected'" : '') . '>' .  __('Name') . "</option>\n";
+$select_order .= '<option value="order_url"' . (($order_by == 'order_url') ? " selected='selected'" : '') . '>' .  __('Address') . "</option>\n";
+$select_order .= "</select>\n";
+printf(__('Currently showing %1$s links ordered by %2$s'), $select_cat, $select_order);
+?>
+<input type="submit" name="action" value="<?php _e('Update &raquo;') ?>" /></p>
+    <form name="cats" method="post" action="">
+    <table width="75%" cellpadding="3" cellspacing="3">
+      <tr>
+        <td>
+        <?php _e('<strong>Show</strong> links in category:'); ?><br />
+        </td>
+        <td>
+          <?php _e('<strong>Order</strong> by:');?>
+        </td>
+        <td>&nbsp;</td>
+      </tr>
+      <tr>
+        <td>
+<?php
+    $results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $wpdb->linkcategories ORDER BY cat_id");
+    echo "        <select name=\"cat_id\">\n";
+    echo "          <option value=\"All\"";
+    if ($cat_id == 'All')
+      echo " selected='selected'";
+    echo "> " . __('All') . "</option>\n";
+    foreach ($results as $row) {
+      echo "          <option value=\"".$row->cat_id."\"";
+      if ($row->cat_id == $cat_id)
+        echo " selected='selected'";
+        echo ">".$row->cat_id.": ".wp_specialchars($row->cat_name);
+        if ($row->auto_toggle == 'Y')
+            echo ' '.__('(auto toggle)');
+        echo "</option>\n";
+    }
+    echo "        </select>\n";
+?>
+        </td>
+        <td>
+          <select name="order_by">
+            <option value="order_id"     <?php if ($order_by == 'order_id')     echo " selected='selected'";?>><?php _e('Link ID') ?></option>
+            <option value="order_name"   <?php if ($order_by == 'order_name')   echo " selected='selected'";?>><?php _e('Name') ?></option>
+            <option value="order_url"    <?php if ($order_by == 'order_url')    echo " selected='selected'";?>><?php _e('URI') ?></option>
+            <option value="order_desc"   <?php if ($order_by == 'order_desc')   echo " selected='selected'";?>><?php _e('Description') ?></option>
+            <option value="order_owner"  <?php if ($order_by == 'order_owner')  echo " selected='selected'";?>><?php _e('Owner') ?></option>
+            <option value="order_rating" <?php if ($order_by == 'order_rating') echo " selected='selected'";?>><?php _e('Rating') ?></option>
+          </select>
+        </td>
+        <td>
+          <input type="submit" name="action" value="<?php _e('Show') ?>" />
+        </td>
+      </tr>
+    </table>
+    </form>
+</div>
+<form name="links" id="links" method="post" action="">
+<div class="wrap">
+    <input type="hidden" name="link_id" value="" />
+    <input type="hidden" name="action" value="" />
+    <input type="hidden" name="order_by" value="<?php echo wp_specialchars($order_by, 1); ?>" />
+    <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />
+  <table id="the-list-x" width="100%" cellpadding="3" cellspacing="3">
+    <tr>
+      <th width="15%"><?php _e('Name') ?></th>
+      <th><?php _e('URI') ?></th>
+      <th><?php _e('Category') ?></th>
+      <th><?php _e('rel') ?></th>
+      <th><?php _e('Image') ?></th>
+      <th><?php _e('Visible') ?></th>
+      <th colspan="2"><?php _e('Action') ?></th>
+      <th>&nbsp;</th>
+  </tr>
+<?php
+    $sql = "SELECT link_url, link_name, link_image, link_description, link_visible,
+            link_category AS cat_id, cat_name AS category, $wpdb->users.user_login, link_id,
+            link_rating, link_rel
+            FROM $wpdb->links
+            LEFT JOIN $wpdb->linkcategories ON $wpdb->links.link_category = $wpdb->linkcategories.cat_id
+            LEFT JOIN $wpdb->users ON $wpdb->users.ID = $wpdb->links.link_owner ";
+    if (isset($cat_id) && ($cat_id != 'All')) {
+      $sql .= " WHERE link_category = $cat_id ";
+    }
+    $sql .= ' ORDER BY link_' . $sqlorderby;
+    // echo "$sql";
+    $links = $wpdb->get_results($sql);
+    if ($links) {
+        foreach ($links as $link) {
+            $link->link_name = wp_specialchars($link->link_name);
+            $link->link_category = wp_specialchars($link->link_category);
+            $link->link_description = wp_specialchars($link->link_description);
+            $link->link_url = wp_specialchars($link->link_url);
+            $short_url = str_replace('http://', '', $link->link_url);
+            $short_url = str_replace('www.', '', $short_url);
+            if ('/' == substr($short_url, -1))
+                $short_url = substr($short_url, 0, -1);
+            if (strlen($short_url) > 35)
+                $short_url =  substr($short_url, 0, 32).'...';
+            $image = ($link->link_image != null) ? __('Yes') : __('No');
+            $visible = ($link->link_visible == 'Y') ? __('Yes') : __('No');
+            ++$i;
+            $style = ($i % 2) ? '' : ' class="alternate"';
+?>
+    <tr id="link-<?php echo $link->link_id; ?>" valign="middle" <?php echo $style; ?>>
+        <td><strong><?php echo $link->link_name; ?></strong><br />
+<?php
+        echo sprintf(__('Description: %s'), $link->link_description) . "</td>";
+        echo "<td><a href=\"$link->link_url\" title=\"" . sprintf(__('Visit %s'), $link->link_name) . "\">$short_url</a></td>";
+        echo <<<LINKS
+        <td>$link->category</td>
+        <td>$link->link_rel</td>
+        <td align='center'>$image</td>
+        <td align='center'>$visible</td>
+LINKS;
+            $show_buttons = 1; // default
+            if ($show_buttons) {
+        echo '<td><a href="link-manager.php?link_id=' . $link->link_id . '&amp;action=linkedit" class="edit">' . __('Edit') . '</a></td>';
+        echo '<td><a href="link-manager.php?link_id=' . $link->link_id . '&amp;action=Delete"' .  " onclick=\"return deleteSomething( 'link', $link->link_id , '" . sprintf(__("You are about to delete the &quot;%s&quot; link to %s.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), wp_specialchars($link->link_name,1), wp_specialchars($link->link_url)) . '\' );" class="delete">' . __('Delete') . '</a></td>';
+        echo '<td><input type="checkbox" name="linkcheck[]" value="' . $link->link_id . '" /></td>';
+            } else {
+              echo "<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\n";
+            }
+        echo "\n    </tr>\n";
+        }
+    }
+?>
+</table>
+<div id="ajax-response"></div>
+</div>
+<div class="wrap">
+  <table width="100%" cellpadding="3" cellspacing="3">
+    <tr><th colspan="4"><?php _e('Manage Multiple Links:') ?></th></tr>
+    <tr><td colspan="4"><?php _e('Use the checkboxes on the right to select multiple links and choose an action below:') ?></td></tr>
+    <tr>
+        <td>
+          <?php _e('Assign ownership to:'); ?>
+<?php
+    $results = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY ID");
+    echo "          <select name=\"newowner\" size=\"1\">\n";
+    foreach ($results as $row) {
+      echo "            <option value=\"".$row->ID."\"";
+      echo ">".$row->user_login;
+      echo "</option>\n";
+    }
+    echo "          </select>\n";
+?>
+        <input name="assign" type="submit" id="assign" value="<?php _e('Go') ?>" />
+        </td>
+        <td>
+          <input name="visibility" type="submit" id="visibility" value="<?php _e('Toggle Visibility') ?>" />
+        </td>
+        <td>
+          <?php _e('Move to category:'); link_category_dropdown('category'); ?> <input name="move" type="submit" id="move" value="<?php _e('Go') ?>" />
+        </td>
+        <td align="right">
+          <a href="#" onclick="checkAll(document.getElementById('links')); return false; "><?php _e('Toggle Checkboxes') ?></a>
+        </td>
+    </tr>
+</table>
+<?php
+  } // end if !popup
+?>
+</div>
 </form>
+<form id="links" method="post" action="link.php">
+<?php wp_nonce_field('bulk-bookmarks') ?>
+<input type="hidden" name="link_id" value="" />
+<input type="hidden" name="action" value="" />
+<input type="hidden" name="order_by" value="<?php echo wp_specialchars($order_by, 1); ?>" />
+<input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />
+<table class="widefat">
+    <thead>
+    <tr>
+        <th width="15%"><?php _e('Name') ?></th>
+        <th><?php _e('URL') ?></th>
+        <th><?php _e('Categories') ?></th>
+        <th style="text-align: center"><?php _e('rel') ?></th>
+        <th style="text-align: center"><?php _e('Visible') ?></th>
+        <th colspan="2" style="text-align: center"><?php _e('Action') ?></th>
+        <th style="text-align: center"><input type="checkbox" onclick="checkAll(document.getElementById('links'));" /></th>
+    </tr>
+    </thead>
+    <tbody id="the-list">
+<?php
+if ( 'all' == $cat_id )
+    $cat_id = '';
+$links = get_bookmarks("category=$cat_id&hide_invisible=0&orderby=$sqlorderby&hide_empty=0");
+if ($links)
+    foreach ($links as $link) {
+        $link->link_name = wp_specialchars($link->link_name);
+        $link->link_description = wp_specialchars($link->link_description);
+        $link->link_url = wp_specialchars($link->link_url);
+        $link->link_category = wp_get_link_cats($link->link_id);
+        $short_url = str_replace('http://', '', $link->link_url);
+        $short_url = str_replace('www.', '', $short_url);
+        if ('/' == substr($short_url, -1))
+            $short_url = substr($short_url, 0, -1);
+        if (strlen($short_url) > 35)
+            $short_url = substr($short_url, 0, 32).'...';
+        $visible = ($link->link_visible == 'Y') ? __('Yes') : __('No');
+        ++ $i;
+        $style = ($i % 2) ? '' : ' class="alternate"';
+?>
+    <tr id="link-<?php echo $link->link_id; ?>" valign="middle" <?php echo $style; ?>>
+        <td><strong><?php echo $link->link_name; ?></strong><br />
+        <?php
+        echo $link->link_description . "</td>";
+        echo "<td><a href=\"$link->link_url\" title=\"".sprintf(__('Visit %s'), $link->link_name)."\">$short_url</a></td>";
+        ?>
+        <td>
+        <?php
+        $cat_names = array();
+        foreach ($link->link_category as $category) {
+            $cat_name = get_the_category_by_ID($category);
+            $cat_name = wp_specialchars($cat_name);
+            if ( $cat_id != $category )
+                $cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
+            $cat_names[] = $cat_name;
+        }
+        echo implode(', ', $cat_names);
+        ?>
+        </td>
+        <td><?php echo $link->link_rel; ?></td>
+        <td align='center'><?php echo $visible; ?></td>
+<?php
+        echo '<td><a href="link.php?link_id='.$link->link_id.'&amp;action=edit" class="edit">'.__('Edit').'</a></td>';
+        echo '<td><a href="' . wp_nonce_url('link.php?link_id='.$link->link_id.'&amp;action=delete', 'delete-bookmark_' . $link->link_id ) . '"'." onclick=\"return deleteSomething( 'link', $link->link_id , '".sprintf(__("You are about to delete the &quot;%s&quot; bookmark to %s.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($link->link_name), js_escape($link->link_url)).'\' );" class="delete">'.__('Delete').'</a></td>';
+        echo '<td align="center"><input type="checkbox" name="linkcheck[]" value="'.$link->link_id.'" /></td>';
+        echo "\n    </tr>\n";
+    }
+?>
+    </tbody>
+</table>
+<div id="ajax-response"></div>
+<p class="submit"><input type="submit" class="button" name="deletebookmarks" id="deletebookmarks" value="<?php _e('Delete Checked Bookmarks') ?> &raquo;" onclick="return confirm('<?php _e("You are about to delete these bookmarks permanently \\n  \'Cancel\' to stop, \'OK\' to delete.") ?>')" /></p>
+</form>
+</div>
+<?php
+    break;
+  } // end default
+} // end case
+?>
 <?php include('admin-footer.php'); ?>

trunk/wp-admin/menu-header.php

-                      r4431
+                      r3503
     if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
     if ( !empty($submenu[$item[2]]) || current_user_can($item[1]) ) {
         if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") )
             echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+    if ( current_user_can($item[1]) ) {
+        if ( file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") )
+            echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
         else
             echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
+            echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
+    }
+}
 …
 $menu_hook = get_plugin_page_hook($item[2], $parent_file);
 if (file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") || ! empty($menu_hook)) {
+if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") || ! empty($menu_hook)) {
     if ( 'admin.php' == $pagenow )
         echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+        echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
     else
         echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
+        echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
  } else {
     echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
+    echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
+ }
 endforeach;
 …
 </ul>
+<?php
+else :
+?>
+<div id="minisub"></div>
+<?php
+endif;
+do_action('admin_notices');
+?>
+<?php endif; ?>

trunk/wp-admin/menu.php

-                      r4431
+                      r3503
 // The URL of the item's file
 $menu[0] = array(__('Dashboard'), 'read', 'index.php');
+if ( strstr($_SERVER['REQUEST_URI'], 'edit-pages.php') )
+    $menu[5] = array(__('Write'), 'edit_pages', 'page-new.php');
+else
+    $menu[5] = array(__('Write'), 'edit_posts', 'post-new.php');
+if ( strstr($_SERVER['REQUEST_URI'], 'page-new.php') )
+    $menu[10] = array(__('Manage'), 'edit_pages', 'edit-pages.php');
+else
+    $menu[10] = array(__('Manage'), 'edit_posts', 'edit.php');
+$menu[20] = array(__('Blogroll'), 'manage_links', 'link-manager.php');
+$menu[5] = array(__('Write'), 'edit_posts', 'post.php');
+$menu[10] = array(__('Manage'), 'edit_posts', 'edit.php');
+$menu[20] = array(__('Links'), 'manage_links', 'link-manager.php');
 $menu[25] = array(__('Presentation'), 'switch_themes', 'themes.php');
 $menu[30] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
 if ( current_user_can('edit_users') )
     $menu[35] = array(__('Users'), 'edit_users', 'users.php');
+    $menu[35] = array(__('Users'), 'read', 'profile.php');
 else
     $menu[35] = array(__('Profile'), 'read', 'profile.php');
 $menu[40] = array(__('Options'), 'manage_options', 'options-general.php');
+$menu[45] = array(__('Import'), 'import', 'import.php');
+$submenu['post-new.php'][5] = array(__('Write Post'), 'edit_posts', 'post-new.php');
+$submenu['post-new.php'][10] = array(__('Write Page'), 'edit_pages', 'page-new.php');
+$submenu['post.php'][5] = array(__('Write Post'), 'edit_posts', 'post.php');
+$submenu['post.php'][10] = array(__('Write Page'), 'edit_pages', 'page-new.php');
 $submenu['edit.php'][5] = array(__('Posts'), 'edit_posts', 'edit.php');
 $submenu['edit.php'][10] = array(__('Pages'), 'edit_pages', 'edit-pages.php');
-$submenu['edit.php'][12] = array(__('Uploads'), 'upload_files', 'upload.php');
 $submenu['edit.php'][15] = array(__('Categories'), 'manage_categories', 'categories.php');
 $submenu['edit.php'][20] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
 $awaiting_mod = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'");
 $submenu['edit.php'][25] = array(sprintf(__("Awaiting Moderation (%s)"), "<span id='awaitmod'>$awaiting_mod</span>"), 'edit_posts', 'moderation.php');
+$submenu['edit.php'][25] = array(sprintf(__("Awaiting Moderation (%s)"), $awaiting_mod), 'edit_posts', 'moderation.php');
 $submenu['edit.php'][30] = array(__('Files'), 'edit_files', 'templates.php');
-$submenu['edit.php'][35] = array(__('Import'), 'import', 'import.php');
-$submenu['edit.php'][40] = array(__('Export'), 'import', 'export.php');
 $submenu['link-manager.php'][5] = array(__('Manage Blogroll'), 'manage_links', 'link-manager.php');
+$submenu['link-manager.php'][5] = array(__('Manage Links'), 'manage_links', 'link-manager.php');
 $submenu['link-manager.php'][10] = array(__('Add Link'), 'manage_links', 'link-add.php');
+$submenu['link-manager.php'][15] = array(__('Link Categories'), 'manage_links', 'link-categories.php');
 $submenu['link-manager.php'][20] = array(__('Import Links'), 'manage_links', 'link-import.php');
+if ( current_user_can('edit_users') ) {
+    $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
+    $submenu['users.php'][5] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');
+    $submenu['users.php'][10] = array(__('Your Profile'), 'read', 'profile.php');
+} else {
+    $submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
+}
+$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
+$submenu['profile.php'][10] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');
 $submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
 …
 $submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
 $submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
+$submenu['options-general.php'][30] = array(__('Privacy'), 'manage_options', 'options-privacy.php');
+$submenu['options-general.php'][35] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
+$submenu['options-general.php'][40] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
+$submenu['options-general.php'][30] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
+$submenu['options-general.php'][35] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
 $submenu['plugins.php'][5] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
 …
+}
-$_wp_submenu_nopriv = array();
-$_wp_menu_nopriv = array();
-// Loop over submenus and remove pages for which the user does not have privs.
-foreach ($submenu as $parent => $sub) {
-    foreach ($sub as $index => $data) {
-        if ( ! current_user_can($data[1]) ) {
-            unset($submenu[$parent][$index]);
-            $_wp_submenu_nopriv[$parent][$data[2]] = true;
+        }
+    }
-    if ( empty($submenu[$parent]) )
-        unset($submenu[$parent]);
+}
-// Loop over the top-level menu.
-// Menus for which the original parent is not acessible due to lack of privs will have the next
-// submenu in line be assigned as the new menu parent.
-foreach ( $menu as $id => $data ) {
-    if ( empty($submenu[$data[2]]) )
-        continue;
-    $subs = $submenu[$data[2]];
-    $first_sub = array_shift($subs);
-    $old_parent = $data[2];
-    $new_parent = $first_sub[2];
-    // If the first submenu is not the same as the assigned parent,
-    // make the first submenu the new parent.
-    if ( $new_parent != $old_parent ) {
-        $_wp_real_parent_file[$old_parent] = $new_parent;
-        $menu[$id][2] = $new_parent;
-        foreach ($submenu[$old_parent] as $index => $data) {
-            $submenu[$new_parent][$index] = $submenu[$old_parent][$index];
-            unset($submenu[$old_parent][$index]);
+        }
-        unset($submenu[$old_parent]);
-        $_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+    }
+}
 do_action('admin_menu', '');
+// Remove menus that have no accessible submenus and require privs that the user does not have.
+// Run re-parent loop again.
+foreach ( $menu as $id => $data ) {
+    // If submenu is empty...
+    if ( empty($submenu[$data[2]]) ) {
+        // And user doesn't have privs, remove menu.
+        if ( ! current_user_can($data[1]) ) {
+            $_wp_menu_nopriv[$data[2]] = true;
+            unset($menu[$id]);
+        }
+    }
+}
+unset($id);
+uksort($menu, "strnatcasecmp"); // make it all pretty
+ksort($menu); // make it all pretty
 if (! user_can_access_admin_page()) {
     wp_die( __('You do not have sufficient permissions to access this page.') );
+    die( __('You do not have sufficient permissions to access this page.') );
+}

trunk/wp-admin/moderation.php

-                      r4431
+                      r3503
 $title = __('Moderate comments');
 $parent_file = 'edit.php';
+wp_enqueue_script( 'admin-comments' );
+wp_reset_vars(array('action', 'item_ignored', 'item_deleted', 'item_approved', 'item_spam', 'feelinglucky'));
+$list_js = true;
+$wpvarstoreset = array('action', 'item_ignored', 'item_deleted', 'item_approved', 'item_spam', 'feelinglucky');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
 $comment = array();
 …
 case 'update':
+    check_admin_referer('moderate-comments');
+    if ( !current_user_can('moderate_comments') )
+        wp_die(__('Your level is not high enough to moderate comments.'));
+    if ( ! current_user_can('moderate_comments') )
+    die('<p>'.__('Your level is not high enough to moderate comments.').'</p>');
     $item_ignored = 0;
 …
             case 'approve':
                 wp_set_comment_status($key, 'approve');
                 if ( get_option('comments_notify') == true ) {
+                if ( get_settings('comments_notify') == true ) {
                     wp_notify_postauthor($key);
+                }
 …
     $file = basename(__FILE__);
     wp_redirect("$file?ignored=$item_ignored&deleted=$item_deleted&approved=$item_approved&spam=$item_spam");
+    header("Location: $file?ignored=$item_ignored&deleted=$item_deleted&approved=$item_approved&spam=$item_spam");
     exit();
 …
 ?>
 <div class="wrap">
 …
     <h2><?php _e('Moderation Queue') ?></h2>
     <form name="approval" action="moderation.php" method="post">
-    <?php wp_nonce_field('moderate-comments') ?>
     <input type="hidden" name="action" value="update" />
     <ol id="the-comment-list" class="commentlist">
+    <ol id="the-list" class="commentlist">
 <?php
 $i = 0;
     foreach($comments as $comment) {
     ++$i;
     $comment_date = mysql2date(get_option("date_format") . " @ " . get_option("time_format"), $comment->comment_date);
+    $comment_date = mysql2date(get_settings("date_format") . " @ " . get_settings("time_format"), $comment->comment_date);
     $post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID='$comment->comment_post_ID'");
     if ($i % 2) $class = 'js-unapproved alternate';
     else $class = 'js-unapproved';
     echo "\n\t<li id='comment-$comment->comment_ID' class='$class'>";
+    if ($i % 2) $class = 'class="alternate"';
+    else $class = '';
+    echo "\n\t<li id='comment-$comment->comment_ID' $class>";
     ?>
     <p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
+    <p><strong><?php _e('Name:') ?></strong> <?php comment_author_link() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('E-mail:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a> | <strong><?php _e('Date:') ?></strong> <?php comment_date(); ?></p>
 <?php comment_text() ?>
+<p><?php comment_date('M j, g:i A'); ?> &#8212; [ <?php
+echo '<a href="comment.php?action=editcomment&amp;comment='.$comment->comment_ID.'">' . __('Edit') . '</a> | ';
+echo " <a href=\"post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($comment->comment_author)) . "', theCommentList );\">" . __('Delete ') . "</a> | "; ?>
+<?php
+$post = get_post($comment->comment_post_ID);
+$post_title = wp_specialchars( $post->post_title, 'double' );
+$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
+?>
+<a href="<?php echo get_permalink($comment->comment_post_ID); ?>" title="<?php echo $post_title; ?>"><?php _e('View Post') ?></a> ] &#8212;
+ <?php _e('Bulk action:') ?>
+    <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-approve" value="approve" /> <label for="comment-<?php echo $comment->comment_ID; ?>-approve"><?php _e('Approve') ?></label> &nbsp;
+    <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-spam" value="spam" /> <label for="comment-<?php echo $comment->comment_ID; ?>-spam"><?php _e('Spam') ?></label> &nbsp;
+    <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-delete" value="delete" /> <label for="comment-<?php echo $comment->comment_ID; ?>-delete"><?php _e('Delete') ?></label> &nbsp;
+    <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment-<?php echo $comment->comment_ID; ?>-nothing" value="later" checked="checked" /> <label for="comment-<?php echo $comment->comment_ID; ?>-nothing"><?php _e('Defer until later') ?></label>
+<p><?php
+echo '<a href="post.php?action=editcomment&amp;comment='.$comment->comment_ID.'">' . __('Edit') . '</a> | ';?>
+<a href="<?php echo get_permalink($comment->comment_post_ID); ?>"><?php _e('View Post') ?></a> |
+<?php
+echo " <a href=\"post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), wp_specialchars($comment->comment_author, 1)) . "' );\">" . __('Delete just this comment') . "</a> | "; ?>  <?php _e('Bulk action:') ?>
+    <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment[<?php echo $comment->comment_ID; ?>]-approve" value="approve" /> <label for="comment[<?php echo $comment->comment_ID; ?>]-approve"><?php _e('Approve') ?></label>
+    <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment[<?php echo $comment->comment_ID; ?>]-spam" value="spam" /> <label for="comment[<?php echo $comment->comment_ID; ?>]-spam"><?php _e('Spam') ?></label>
+    <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment[<?php echo $comment->comment_ID; ?>]-delete" value="delete" /> <label for="comment[<?php echo $comment->comment_ID; ?>]-delete"><?php _e('Delete') ?></label>
+    <input type="radio" name="comment[<?php echo $comment->comment_ID; ?>]" id="comment[<?php echo $comment->comment_ID; ?>]-nothing" value="later" checked="checked" /> <label for="comment[<?php echo $comment->comment_ID; ?>]-nothing"><?php _e('Defer until later') ?></label>
     </p>
 …
 <div id="ajax-response"></div>
     <p class="submit"><input type="submit" name="submit" value="<?php _e('Bulk Moderate Comments &raquo;') ?>" /></p>
+    <p class="submit"><input type="submit" name="submit" value="<?php _e('Moderate Comments &raquo;') ?>" /></p>
 <script type="text/javascript">
 // <![CDATA[
 …
+include('admin-footer.php');
+?>
+include('admin-footer.php') ?>

trunk/wp-admin/options-discussion.php

-                      r4431
+                      r3503
 include('admin-header.php');
+if ($action == 'retrospam') {
+    if ( $_GET['move'] == 'true' ) {
+        retrospam_mgr::move_spam( $_GET[ids] );
+    }
+    $retrospaminator = new retrospam_mgr();
+    $result = $retrospaminator->find_spam();
+    echo $retrospaminator->display_edit_form( $result );
+    include('./admin-footer.php');
+    exit;
+}
 ?>
 …
 <h2><?php _e('Discussion Options') ?></h2>
 <form method="post" action="options.php">
-<?php wp_nonce_field('update-options') ?>
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
 <fieldset class="options">
 <legend><?php _e('Usual settings for an article:<br /><small><em>(These settings may be overridden for individual articles.)</em></small>') ?></legend>
 …
 <li>
 <label for="default_pingback_flag">
 <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> />
+<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_settings('default_pingback_flag')); ?> />
 <?php _e('Attempt to notify any Weblogs linked to from the article (slows down posting.)') ?></label>
 </li>
 <li>
 <label for="default_ping_status">
 <input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> />
+<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_settings('default_ping_status')); ?> />
 <?php _e('Allow link notifications from other Weblogs (pingbacks and trackbacks.)') ?></label>
 </li>
 <li>
 <label for="default_comment_status">
 <input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> />
+<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_settings('default_comment_status')); ?> />
 <?php _e('Allow people to post comments on the article') ?></label>
 </li>
 …
 <li>
 <label for="comments_notify">
 <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
+<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_settings('comments_notify')); ?> />
 <?php _e('Anyone posts a comment') ?> </label>
 </li>
 <li>
 <label for="moderation_notify">
 <input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> />
+<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_settings('moderation_notify')); ?> />
 <?php _e('A comment is held for moderation') ?> </label>
 </li>
 …
 <li>
 <label for="comment_moderation">
 <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> />
 <?php _e('An administrator must always approve the comment') ?> </label>
+<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_settings('comment_moderation')); ?> />
+<?php _e('An administrator must approve the comment (regardless of any matches below)') ?> </label>
 </li>
 <li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li>
 <li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li>
+<li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_settings('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li>
+<li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_settings('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li>
 </ul>
 </fieldset>
 <fieldset class="options">
 <legend><?php _e('Comment Moderation') ?></legend>
 <p><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p>
+<p><?php printf(__('Hold a comment in the queue if it contains more than %s links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_settings('comment_max_links'). '" />' ) ?></p>
 <p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="moderation.php">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
+<p><?php _e('When a comment contains any of these words in its content, name, URI, e-mail, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://codex.wordpress.org/Spam_Words">Common spam words</a>.') ?></p>
 <p>
 <textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea>
+</p>
+<p>
+<a id="retrospambutton" href="options-discussion.php?action=retrospam"><?php _e('Check past comments against moderation list'); ?></a>
 </p>
 </fieldset>
 <fieldset class="options">
 <legend><?php _e('Comment Blacklist') ?></legend>
 <p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be deleted. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
+<p><?php _e('This is a list of words that you want completely blacklisted from your blog. Be very careful what you add here, because if a comment matches something here it will be completely nuked and there will be no notification. Remember that partial words can match, so if there is any chance something here might match it would be better to put it in the moderation box above.') ?></p>
 <p>
 <textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea>
 </p>
+<p><label for="open_proxy_check">
+<input name="open_proxy_check" type="checkbox" id="open_proxy_check" value="1" <?php checked('1', get_settings('open_proxy_check')); ?> />
+<?php _e('Blacklist comments from open and insecure proxies.') ?></label></p>
 </fieldset>
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys" />
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
 </p>
 </form>
+<input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys,open_proxy_check" />
+<input type="submit" name="Submit" value="<?php _e('Update Options') ?>" />
+</p>
+</form>
 </div>
 <?php include('./admin-footer.php'); ?>

trunk/wp-admin/options-general.php

-                      r4431
+                      r3503
 <h2><?php _e('General Options') ?></h2>
 <form method="post" action="options.php">
-<?php wp_nonce_field('update-options') ?>
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
 <table class="optiontable">
 <tr valign="top">
 …
 </tr>
 <tr valign="top">
 <th scope="row"><?php _e('WordPress address (URL):') ?></th>
+<th scope="row"><?php _e('WordPress address (URI):') ?></th>
 <td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code" /></td>
 </tr>
 <tr valign="top">
 <th scope="row"><?php _e('Blog address (URL):') ?></th>
+<th scope="row"><?php _e('Blog address (URI):') ?></th>
 <td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code" /><br /><?php _e('If you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different than the directory</a> you installed WordPress in, enter that address here.'); ?></td>
 </tr>
 …
 <th scope="row"><?php _e('Membership:') ?></th>
 <td> <label for="users_can_register">
 <input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_option('users_can_register')); ?> />
+<input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_settings('users_can_register')); ?> />
 <?php _e('Anyone can register') ?></label><br />
 <label for="comment_registration">
 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
+<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_settings('comment_registration')); ?> />
 <?php _e('Users must be registered and logged in to comment') ?>
 </label>
 …
 <th scope="row"><?php _e('New User Default Role:') ?></th>
 <td><label for="default_role">
+<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select></label>
+<select name="default_role" id="default_role"><?php
+foreach($wp_roles->role_names as $role => $name) {
+    $selected = (get_settings('default_role') == $role) ? 'selected="selected"' : '';
+    echo "<option {$selected} value=\"{$role}\">{$name}</option>";
+}
+?></select></label>
 </td>
 </tr>
 …
 <th scope="row"><?php _e('Times in the weblog should differ by:') ?> </th>
 <td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" />
 <?php _e('hours') ?> (<?php _e('Your timezone offset, for example <code>-6</code> for Central Time.'); ?>)</td>
+<?php _e('hours') ?> </td>
 </tr>
 <tr>
 <th scope="row"><?php _e('Default date format:') ?></th>
 <td><input name="date_format" type="text" id="date_format" size="30" value="<?php form_option('date_format'); ?>" /><br />
 <?php _e('Output:') ?> <strong><?php echo mysql2date(get_option('date_format'), current_time('mysql')); ?></strong></td>
+<?php _e('Output:') ?> <strong><?php echo mysql2date(get_settings('date_format'), current_time('mysql')); ?></strong></td>
 </tr>
 <tr>
 <th scope="row"><?php _e('Default time format:') ?></th>
 <td><input name="time_format" type="text" id="time_format" size="30" value="<?php form_option('time_format'); ?>" /><br />
 <?php _e('Output:') ?> <strong><?php echo gmdate(get_option('time_format'), current_time('timestamp')); ?></strong></td>
+<?php _e('Output:') ?> <strong><?php echo gmdate(get_settings('time_format'), current_time('timestamp')); ?></strong></td>
 </tr>
 <tr>
 <th scope="row">&nbsp;</th>
 <td><?php _e('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Update options" to update sample output.') ?> </td>
+<td><?php _e('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Save option to update sample output.') ?> </td>
 </tr>
 <tr>
 …
 <?php
 for ($day_index = 0; $day_index <= 6; $day_index++) :
+    $selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
+    echo "\n\t<option value='$day_index' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
+if ($day_index == get_settings('start_of_week')) $selected = " selected='selected'";
+else $selected = '';
+echo "\n\t<option value='$day_index' $selected>$weekday[$day_index]</option>";
 endfor;
 ?>
 …
 </fieldset>
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" />
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="blogname,blogdescription,siteurl,admin_email,users_can_register,gmt_offset,date_format,time_format,home,start_of_week,comment_registration,default_role" />

trunk/wp-admin/options-head.php

-                      r4431
+                      r3503
+<?php wp_reset_vars(array('action', 'standalone', 'option_group_id')); ?>
+<?php
+$wpvarstoreset = array('action','standalone', 'option_group_id');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
+?>
 <br clear="all" />

trunk/wp-admin/options-misc.php

-                      r4431
+                      r3503
 <h2><?php _e('Miscellaneous Options') ?></h2>
 <form method="post" action="options.php">
+<?php wp_nonce_field('update-options') ?>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
 <fieldset class="options">
 <legend><?php _e('Uploading'); ?></legend>
 …
 <tr valign="top">
 <th scope="row"><?php _e('Store uploads in this folder'); ?>:</th>
 <td><input name="upload_path" type="text" id="upload_path" class="code" value="<?php echo wp_specialchars(str_replace(ABSPATH, '', get_option('upload_path')), 1); ?>" size="40" />
+<td><input name="upload_path" type="text" id="upload_path" class="code" value="<?php echo str_replace(ABSPATH, '', get_settings('upload_path')); ?>" size="40" />
 <br />
 <?php _e('Default is <code>wp-content/uploads</code>'); ?>
 …
 <td>
 <label for="uploads_use_yearmonth_folders">
 <input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1" <?php checked('1', get_option('uploads_use_yearmonth_folders')); ?> />
+<input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1" <?php checked('1', get_settings('uploads_use_yearmonth_folders')); ?> />
 <?php _e('Organize my uploads into month- and year-based folders'); ?>
 </label>
 …
 </fieldset>
 <p><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_option('use_linksupdate')); ?> />
 <label for="use_linksupdate"><?php _e('Track Bookmarks&#8217; Update Times') ?></label></p>
+<p><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_settings('use_linksupdate')); ?> />
+<label for="use_linksupdate"><?php _e('Track Links&#8217; Update Times') ?></label></p>
 <p>
 <label><input type="checkbox" name="hack_file" value="1" <?php checked('1', get_option('hack_file')); ?> /> <?php _e('Use legacy <code>my-hacks.php</code> file support') ?></label>
+<label><input type="checkbox" name="hack_file" value="1" <?php checked('1', get_settings('hack_file')); ?> /> <?php _e('Use legacy <code>my-hacks.php</code> file support') ?></label>
 </p>
 …
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path" />
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+<input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" />
 </p>
 </form>

trunk/wp-admin/options-permalink.php

-                      r4431
+                      r3503
 var aInputs = document.getElementsByTagName('input');
 for (var i = 0; i < aInputs.length; i++) {
+for (var i = 0; i < aInputs.length; i++) {
 aInputs[i].onclick = aInputs[i].onkeyup = upit;
+}
 …
 $home_path = get_home_path();
+if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
+    check_admin_referer('update-permalink');
+if ( isset($_POST) ) {
     if ( isset($_POST['permalink_structure']) ) {
         $permalink_structure = $_POST['permalink_structure'];
 …
         $wp_rewrite->set_permalink_structure($permalink_structure);
+    }
     if ( isset($_POST['category_base']) ) {
         $category_base = $_POST['category_base'];
 …
+    }
+}
 $permalink_structure = get_option('permalink_structure');
 $category_base = get_option('category_base');
+$permalink_structure = get_settings('permalink_structure');
+$category_base = get_settings('category_base');
 if ( (!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess') )
 …
 <div class="wrap">
   <h2><?php _e('Customize Permalink Structure') ?></h2>
+<form name="form" action="options-permalink.php" method="post">
+<?php wp_nonce_field('update-permalink') ?>
+<p class="submit"><input type="submit" name="submit" value="<?php _e('Update Permalink Structure &raquo;') ?>" /></p>
+  <p><?php _e('By default WordPress uses web <abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
+  <p><?php _e('By default WordPress uses web URIs which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URI structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
 <?php
 …
     );
 ?>
+<form name="form" action="options-permalink.php" method="post">
 <h3><?php _e('Common options:'); ?></h3>
 <p>
     <label>
 <input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> />
 <?php _e('Default'); ?><br /> <span> &raquo; <code><?php echo get_option('home'); ?>/?p=123</code></span>
+<?php _e('Default'); ?><br /> <span> &raquo; <code><?php echo get_settings('home'); ?>/?p=123</code></span>
    </label>
 </p>
 …
     <label>
 <input name="selection" type="radio" value="<?php echo $structures[1]; ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> />
 <?php _e('Date and name based'); ?><br /> <span> &raquo; <code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></span>
+<?php _e('Date and name based'); ?><br /> <span> &raquo; <code><?php echo get_settings('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></span>
    </label>
 </p>
 …
     <label>
 <input name="selection" type="radio" value="<?php echo $structures[2]; ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> />
 <?php _e('Numeric'); ?><br /> <span> &raquo; <code><?php echo get_option('home') . $prefix  ; ?>/archives/123</code></span>
+<?php _e('Numeric'); ?><br /> <span> &raquo; <code><?php echo get_settings('home') . $prefix  ; ?>/archives/123</code></span>
    </label>
 </p>
 …
 <?php } ?>
  />
 <?php _e('Custom, specify below'); ?>
+<?php _e('Custom, specify below'); ?>
 </label>
 <br />
 </p>
 <p id="customstructure"><?php _e('Custom structure'); ?>: <input name="permalink_structure" id="permalink_structure" type="text" class="code" style="width: 60%;" value="<?php echo wp_specialchars($permalink_structure, 1); ?>" size="50" /></p>
+<p id="customstructure"><?php _e('Custom structure'); ?>: <input name="permalink_structure" id="permalink_structure" type="text" class="code" style="width: 60%;" value="<?php echo $permalink_structure; ?>" size="50" /></p>
 <h3><?php _e('Optional'); ?></h3>
 <?php if ($is_apache) : ?>
     <p><?php _e('If you like, you may enter a custom prefix for your category <abbr title="Universal Resource Locator">URL</abbr>s here. For example, <code>/taxonomy/tags</code> would make your category links like <code>http://example.org/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
+    <p><?php _e('If you like, you may enter a custom prefix for your category URIs here. For example, <code>/taxonomy/tags</code> would make your category links like <code>http://example.org/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
 <?php else : ?>
     <p><?php _e('If you like, you may enter a custom prefix for your category <abbr title="Universal Resource Locator">URL</abbr>s here. For example, <code>/index.php/taxonomy/tags</code> would make your category links like <code>http://example.org/index.php/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
+    <p><?php _e('If you like, you may enter a custom prefix for your category URIs here. For example, <code>/index.php/taxonomy/tags</code> would make your category links like <code>http://example.org/index.php/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
 <?php endif; ?>
     <p>
   <?php _e('Category base'); ?>: <input name="category_base" type="text" class="code"  value="<?php echo wp_specialchars($category_base, 1); ?>" size="30" />
+  <?php _e('Category base'); ?>: <input name="category_base" type="text" class="code"  value="<?php echo $category_base; ?>" size="30" />
      </p>
     <p class="submit">
 …
   <p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Make_a_Directory_Writable">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">
-<?php wp_nonce_field('update-permalink') ?>
    <p>
 <textarea rows="5" style="width: 98%;" name="rules"><?php echo $wp_rewrite->mod_rewrite_rules(); ?>

trunk/wp-admin/options-reading.php

-                      r4431
+                      r3503
 <div class="wrap">
 <h2><?php _e('Reading Options') ?></h2>
+<form name="form1" method="post" action="options.php">
+<?php wp_nonce_field('update-options') ?>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<?php if ( get_pages() ): ?>
+<fieldset class="options">
+<legend><?php _e('Front Page') ?></legend>
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
+<tr valign="top">
+<th width="33%" scope="row"><?php _e('Front page displays:')?></th>
+<td>
+    <p><label>
+        <input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> />
+        <?php _e('Your latest posts'); ?>
+    </label>
+    </p>
+    <p><label>
+        <input name="show_on_front" type="radio" value="page" class="tog" <?php checked('page', get_option('show_on_front')); ?> />
+        <?php printf(__('A <a href="%s">static page</a> (select below)'), 'edit-pages.php'); ?>
+    </label>
+    </p>
+<ul>
+    <li><?php printf(__('Front page: %s'), wp_dropdown_pages("name=page_on_front&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_on_front'))); ?></li>
+    <li><?php printf(__('Posts page: %s'), wp_dropdown_pages("name=page_for_posts&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_for_posts'))); ?></li>
+</ul>
+<?php if ( 'page' == get_option('show_on_front') && get_option('page_for_posts') == get_option('page_on_front') ) : ?>
+<div id="front-page-warning" class="updated fade-ff0000">
+    <p>
+        <?php _e('<strong>Warning:</strong> these pages should not be the same!'); ?>
+    </p>
+</div>
+<?php endif; ?>
+</fieldset>
+</td>
+</tr>
+</table>
+</fieldset>
+<?php endif; ?>
+<form name="form1" method="post" action="options.php">
 <fieldset class="options">
 <legend><?php _e('Blog Pages') ?></legend>
 <table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
 <tr valign="top">
 <th width="33%" scope="row"><?php _e('Show at most:') ?></th>
 …
 <input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" />
 <select name="what_to_show" id="what_to_show" >
 <option value="days" <?php selected('days', get_option('what_to_show')); ?>><?php _e('days') ?></option>
 <option value="posts" <?php selected('posts', get_option('what_to_show')); ?>><?php _e('posts') ?></option>
+<option value="days" <?php selected('days', get_settings('what_to_show')); ?>><?php _e('days') ?></option>
+<option value="posts" <?php selected('posts', get_settings('what_to_show')); ?>><?php _e('posts') ?></option>
 </select>
 </td>
 …
 <fieldset class="options">
 <legend><?php _e('Syndication Feeds') ?></legend>
 <table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
 <tr valign="top">
 <th width="33%" scope="row"><?php _e('Show the most recent:') ?></th>
 …
 <th scope="row"><?php _e('For each article, show:') ?> </th>
 <td>
+<p><label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?> /> <?php _e('Full text') ?></label><br />
+<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label></p>
+<p><?php _e('Note: If you use the <code>&lt;--more--&gt;</code> feature, it will cut off posts in RSS feeds.'); ?></p>
+<label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_settings('rss_use_excerpt')); ?>  /> <?php _e('Full text') ?></label><br />
+<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_settings('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label>
 </td>
 </tr>
 </table>
 </fieldset>
 <table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
 <tr valign="top">
 <th width="33%" scope="row"><?php _e('Encoding for pages and feeds:') ?></th>
 …
 </table>
 <p>
 <label><input type="checkbox" name="gzipcompression" value="1" <?php checked('1', get_option('gzipcompression')); ?> />
+<label><input type="checkbox" name="gzipcompression" value="1" <?php checked('1', get_settings('gzipcompression')); ?> />
 <?php _e('WordPress should compress articles (gzip) if browsers ask for them') ?></label>
 </p>
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="posts_per_page,what_to_show,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" />
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+<input type="hidden" name="page_options" value="posts_per_page,what_to_show,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression" />
+<input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" />
 </p>
 </form>

trunk/wp-admin/options-writing.php

-                      r4431
+                      r3503
 <h2><?php _e('Writing Options') ?></h2>
 <form method="post" action="options.php">
+<?php wp_nonce_field('update-options') ?>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
 <tr valign="top">
 <th width="33%" scope="row"> <?php _e('Size of the post box:') ?></th>
 …
 <td>
 <label for="rich_editing">
 <input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_option('rich_editing')); ?> />
+<input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_settings('rich_editing')); ?> />
 <?php _e('Users should use the visual rich editor by default') ?></label><br />
 <label for="use_smilies">
 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_option('use_smilies')); ?> />
+<input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_settings('use_smilies')); ?> />
 <?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label><br />
 <label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_option('use_balanceTags')); ?> /> <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label>
+<label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_settings('use_balanceTags')); ?> /> <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label>
 </td>
 </tr>
 …
 $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_name");
 foreach ($categories as $category) :
+if ($category->cat_ID == get_option('default_category')) $selected = " selected='selected'";
+else $selected = '';
+echo "\n\t<option value='$category->cat_ID' $selected>$category->cat_name</option>";
+endforeach;
+?>
+</select></td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('Default bookmark category:') ?></th>
+<td><select name="default_link_category" id="default_link_category">
+<?php
+foreach ($categories as $category) :
+if ($category->cat_ID == get_option('default_link_category')) $selected = " selected='selected'";
+if ($category->cat_ID == get_settings('default_category')) $selected = " selected='selected'";
 else $selected = '';
 echo "\n\t<option value='$category->cat_ID' $selected>$category->cat_name</option>";
 …
 <fieldset class="options">
 <legend><?php _e('Post via e-mail') ?></legend>
+<legend><?php _e('Writing by e-mail') ?></legend>
 <p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <code>%s</code>, <code>%s</code>, <code>%s</code>.'), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5)) ?></p>
 <table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
 <tr valign="top">
 <th scope="row"><?php _e('Mail server:') ?></th>
 …
 </tr>
 <tr valign="top">
 <th scope="row"><?php _e('Default mail category:') ?></th>
+<th scope="row"><?php _e('Default post by mail category:') ?></th>
 <td><select name="default_email_category" id="default_email_category">
 <?php
 //Alreay have $categories from default_category
 foreach ($categories as $category) :
 if ($category->cat_ID == get_option('default_email_category')) $selected = " selected='selected'";
+if ($category->cat_ID == get_settings('default_email_category')) $selected = " selected='selected'";
 else $selected = '';
 echo "\n\t<option value='$category->cat_ID' $selected>$category->cat_name</option>";
 …
 <fieldset class="options">
 <legend><?php _e('Update Services') ?></legend>
+<?php if ( get_option('blog_public') ) : ?>
+<p><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="http://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service <abbr title="Universal Resource Locator">URL</abbr>s with line breaks.') ?></p>
+<p><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="http://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service URIs with line breaks.') ?></p>
 <textarea name="ping_sites" id="ping_sites" style="width: 98%;" rows="3" cols="50"><?php form_option('ping_sites'); ?></textarea>
-<?php else : ?>
-    <p><?php printf(__('WordPress is not notifying any <a href="http://codex.wordpress.org/Update_Services">Update Services</a> because of your blog\'s <a href="%s">privacy settings</a>'), 'options-privacy.php'); ?>
-<?php endif; ?>
 </fieldset>
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,rich_editing,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category,use_balanceTags,default_link_category" />
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+<input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,rich_editing,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category,use_balanceTags" />
+<input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" />
 </p>
 </form>

trunk/wp-admin/options.php

-                      r4431
+                      r3503
 $parent_file = 'options-general.php';
+wp_reset_vars(array('action'));
+$wpvarstoreset = array('action');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
 if ( !current_user_can('manage_options') )
+    wp_die(__('Cheatin&#8217; uh?'));
+function sanitize_option($option, $value) { // Remember to call stripslashes!
+    switch ($option) {
+        case 'admin_email':
+            $value = stripslashes($value);
+            $value = sanitize_email($value);
+            break;
+        case 'default_post_edit_rows':
+        case 'mailserver_port':
+        case 'comment_max_links':
+            $value = stripslashes($value);
+            $value = abs((int) $value);
+            break;
+        case 'posts_per_page':
+        case 'posts_per_rss':
+            $value = stripslashes($value);
+            $value = (int) $value;
+            if ( empty($value) ) $value = 1;
+            if ( $value < -1 ) $value = abs($value);
+            break;
+        case 'default_ping_status':
+        case 'default_comment_status':
+            $value = stripslashes($value);
+            // Options that if not there have 0 value but need to be something like "closed"
+            if ( $value == '0' || $value == '')
+                $value = 'closed';
+            break;
+        case 'blogdescription':
+        case 'blogname':
+            if (current_user_can('unfiltered_html') == false)
+                $value = wp_filter_post_kses( $value ); // calls stripslashes then addslashes
+            $value = stripslashes($value);
+            break;
+        case 'blog_charset':
+            $value = preg_replace('/[^a-zA-Z0-9_-]/', '', $value); // strips slashes
+            break;
+        case 'date_format':
+        case 'time_format':
+        case 'mailserver_url':
+        case 'mailserver_login':
+        case 'mailserver_pass':
+        case 'ping_sites':
+        case 'upload_path':
+            $value = strip_tags($value);
+            $value = wp_filter_kses($value); // calls stripslashes then addslashes
+            $value = stripslashes($value);
+            break;
+        case 'gmt_offset':
+            $value = preg_replace('/[^0-9:.-]/', '', $value); // strips slashes
+            break;
+        case 'siteurl':
+        case 'home':
+            $value = stripslashes($value);
+            $value = clean_url($value);
+            break;
+        default :
+            $value = stripslashes($value);
+            break;
+    }
+    return $value;
+}
+    die ( __('Cheatin&#8217; uh?') );
 switch($action) {
 …
 case 'update':
     $any_changed = 0;
+    check_admin_referer();
+    check_admin_referer('update-options');
+    if ( !$_POST['page_options'] ) {
+        foreach ( (array) $_POST as $key => $value) {
+            if ( !in_array($key, array('_wpnonce', '_wp_http_referer')) )
+                $options[] = $key;
+    if (!$_POST['page_options']) {
+        foreach ($_POST as $key => $value) {
+            $options[] = $key;
+        }
     } else {
 …
+    }
+    // Save for later.
+    $old_siteurl = get_settings('siteurl');
+    $old_home = get_settings('home');
+    // HACK
+    // Options that if not there have 0 value but need to be something like "closed"
+    $nonbools = array('default_ping_status', 'default_comment_status');
     if ($options) {
         foreach ($options as $option) {
             $option = trim($option);
+            $value = trim($_POST[$option]);
+            $value = sanitize_option($option, $value); // This does stripslashes on those that need it
+            update_option($option, $value);
+            $value = trim(stripslashes($_POST[$option]));
+                if( in_array($option, $nonbools) && ( $value == '0' || $value == '') )
+                $value = 'closed';
+            if( $option == 'blogdescription' || $option == 'blogname' )
+                if (current_user_can('unfiltered_html') == false)
+                    $value = wp_filter_post_kses( $value );
+            if (update_option($option, $value) ) {
+                $any_changed++;
+            }
+        }
+    }
+    $referred = remove_query_arg('updated' , wp_get_referer());
+    $goback = add_query_arg('updated', 'true', wp_get_referer());
+    if ($any_changed) {
+            // If siteurl or home changed, reset cookies.
+            if ( get_settings('siteurl') != $old_siteurl || get_settings('home') != $old_home ) {
+                // If home changed, write rewrite rules to new location.
+                $wp_rewrite->flush_rules();
+                // Get currently logged in user and password.
+                get_currentuserinfo();
+                // Clear cookies for old paths.
+                wp_clearcookie();
+                // Set cookies for new paths.
+                wp_setcookie($user_login, $user_pass_md5, true, get_settings('home'), get_settings('siteurl'));
+            }
+            //$message = sprintf(__('%d setting(s) saved... '), $any_changed);
+    }
+    $referred = remove_query_arg('updated' , $_SERVER['HTTP_REFERER']);
+    $goback = add_query_arg('updated', 'true', $_SERVER['HTTP_REFERER']);
     $goback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $goback);
     wp_redirect($goback);
 …
 <div class="wrap">
+  <h2><?php _e('All Options'); ?></h2>
+  <form name="form" action="options.php" method="post" id="all-options">
+  <?php wp_nonce_field('update-options') ?>
+  <h2><?php _e('All options'); ?></h2>
+  <form name="form" action="options.php" method="post">
   <input type="hidden" name="action" value="update" />
-    <p class="submit"><input type="submit" name="Update" value="<?php _e('Update Options &raquo;') ?>" /></p>
   <table width="98%">
 <?php
 $options = $wpdb->get_results("SELECT * FROM $wpdb->options ORDER BY option_name");
+foreach ( (array) $options as $option) :
+    $disabled = '';
+    if ( is_serialized($option->option_value) ) {
+        if ( is_serialized_string($option->option_value) ) {
+            // this is a serialized string, so we should display it
+            $value = wp_specialchars(maybe_unserialize($option->option_value), 'single');
+            $options_to_update[] = $option->option_name;
+            $class = 'all-options';
+        } else {
+            $value = 'SERIALIZED DATA';
+            $disabled = ' disabled="disabled"';
+            $class = 'all-options disabled';
+        }
+    } else {
+        $value = wp_specialchars($option->option_value, 'single');
+        $options_to_update[] = $option->option_name;
+        $class = 'all-options';
+    }
+foreach ($options as $option) :
+    $value = wp_specialchars($option->option_value);
     echo "
 <tr>
     <th scope='row'><label for='$option->option_name'>$option->option_name</label></th>
+<td>";
+    if (stristr($value, "\n")) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>$value</textarea>";
+    else echo "<input class='$class' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . $value . "'$disabled />";
+    echo "</td>
+    <td><input type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . $value . "' /></td>
     <td>$option->option_description</td>
 </tr>";
 …
 ?>
   </table>
+<?php $options_to_update = implode(',', $options_to_update); ?>
+<p class="submit"><input type="hidden" name="page_options" value="<?php echo wp_specialchars($options_to_update, true); ?>" /><input type="submit" name="Update" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<p class="submit"><input type="submit" name="Update" value="<?php _e('Update Settings &raquo;') ?>" /></p>
   </form>
 </div>

trunk/wp-admin/page-new.php

-                      r4431
+                      r3503
 require_once('admin.php');
 $title = __('New Page');
 $parent_file = 'post-new.php';
+$parent_file = 'post.php';
 $editing = true;
-wp_enqueue_script('prototype');
-wp_enqueue_script('autosave');
 require_once('admin-header.php');
 ?>
 <?php if ( (isset($_GET['posted']) && $_GET['posted'])  || isset($_GET['saved'])  ) : ?>
 <div id="message" class="updated fade"><p><strong><?php _e('Page saved.') ?></strong> <a href="edit-pages.php"><?php _e('Manage pages'); ?></a> | <a href="<?php echo get_page_link( isset($_GET['posted']) ? $_GET['posted'] : $_GET['saved'] ); ?>"><?php _e('View page') ; ?> &raquo;</a></p></div>
+<?php if ( isset($_GET['saved']) ) : ?>
+<div id="message" class="updated fade"><p><strong><?php _e('Page saved.') ?> <a href="edit-pages.php"><?php _e('Manage pages'); ?> &raquo;</a></strong></p></div>
 <?php endif; ?>
 …
 if ( current_user_can('edit_pages') ) {
     $action = 'post';
+    get_currentuserinfo();
     $post = get_default_post_to_edit();
     $post->post_type = 'page';
+    $post->post_status = 'static';
     include('edit-page-form.php');

trunk/wp-admin/plugin-editor.php

-                      r4431
+                      r3503
 $parent_file = 'plugins.php';
+wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file'));
+$wpvarstoreset = array('action','redirect','profile','error','warning','a','file');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
 $plugins = get_plugins();
 …
 $file = validate_file_to_edit($file, $plugin_files);
 $real_file = get_real_file_to_edit( PLUGINDIR . "/$file");
+$real_file = get_real_file_to_edit("wp-content/plugins/$file");
 switch($action) {
 …
 case 'update':
-    check_admin_referer('edit-plugin_' . $file);
     if ( !current_user_can('edit_plugins') )
         wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
+    die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
     $newcontent = stripslashes($_POST['newcontent']);
 …
         fwrite($f, $newcontent);
         fclose($f);
         wp_redirect("plugin-editor.php?file=$file&a=te");
+        header("Location: plugin-editor.php?file=$file&a=te");
     } else {
         wp_redirect("plugin-editor.php?file=$file");
+        header("Location: plugin-editor.php?file=$file");
+    }
 …
 default:
+    require_once('admin-header.php');
+    if ( !current_user_can('edit_plugins') )
+    die('<p>'.__('You have do not have sufficient permissions to edit plugins for this blog.').'</p>');
+    if ( !current_user_can('edit_plugins') )
+        wp_die('<p>'.__('You do not have sufficient permissions to edit plugins for this blog.').'</p>');
+    require_once('admin-header.php');
+    update_recently_edited(PLUGINDIR . "/$file");
+    update_recently_edited("wp-content/plugins/$file");
     if (!is_file($real_file))
         $error = 1;
     if (!$error) {
         $f = fopen($real_file, 'r');
 …
     <?php   if (!$error) { ?>
   <form name="template" id="template" action="plugin-editor.php" method="post">
-  <?php wp_nonce_field('edit-plugin_' . $file) ?>
          <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
      <input type="hidden" name="action" value="update" />
 …
      <p class="submit">
 <?php
     echo "<input type='submit' name='submit' value='    " . __('Update File &raquo;') . "' tabindex='2' />";
+    echo "<input type='submit' name='submit' value='    " . __('Update File') . " &raquo;' tabindex='2' />";
 ?>
 </p>

trunk/wp-admin/plugins.php

-                      r4431
+                      r3503
 if ( isset($_GET['action']) ) {
+    check_admin_referer();
     if ('activate' == $_GET['action']) {
+        check_admin_referer('activate-plugin_' . $_GET['plugin']);
+        $current = get_option('active_plugins');
+        $current = get_settings('active_plugins');
         if (!in_array($_GET['plugin'], $current)) {
             $current[] = trim( $_GET['plugin'] );
             sort($current);
             update_option('active_plugins', $current);
             include(ABSPATH . PLUGINDIR . '/' . trim( $_GET['plugin'] ));
+            include(ABSPATH . 'wp-content/plugins/' . trim( $_GET['plugin'] ));
             do_action('activate_' . trim( $_GET['plugin'] ));
+        }
         wp_redirect('plugins.php?activate=true');
+        header('Location: plugins.php?activate=true');
     } else if ('deactivate' == $_GET['action']) {
+        check_admin_referer('deactivate-plugin_' . $_GET['plugin']);
+        $current = get_option('active_plugins');
+        $current = get_settings('active_plugins');
         array_splice($current, array_search( $_GET['plugin'], $current), 1 ); // Array-fu!
         update_option('active_plugins', $current);
         do_action('deactivate_' . trim( $_GET['plugin'] ));
         wp_redirect('plugins.php?deactivate=true');
+        header('Location: plugins.php?deactivate=true');
+    }
     exit;
 …
 // If any plugins don't exist, axe 'em
 $check_plugins = get_option('active_plugins');
+$check_plugins = get_settings('active_plugins');
 // Sanity check.  If the active plugin list is not an array, make it an
 …
 if ( !is_array($check_plugins) ) {
     $check_plugins = array();
     update_option('active_plugins', $check_plugins);
+    update_option('active_plugins', $check_plugins);
+}
 …
 // plugins.
 foreach ($check_plugins as $check_plugin) {
     if (!file_exists(ABSPATH . PLUGINDIR . '/' . $check_plugin)) {
             $current = get_option('active_plugins');
+    if (!file_exists(ABSPATH . 'wp-content/plugins/' . $check_plugin)) {
+            $current = get_settings('active_plugins');
             $key = array_search($check_plugin, $current);
             if ( false !== $key && NULL !== $key ) {
 …
 <?php
 if ( get_option('active_plugins') )
     $current_plugins = get_option('active_plugins');
+if ( get_settings('active_plugins') )
+    $current_plugins = get_settings('active_plugins');
 $plugins = get_plugins();
 …
 } else {
 ?>
+<table class="widefat plugins">
+    <thead>
+<table width="100%" cellpadding="3" cellspacing="3">
     <tr>
         <th><?php _e('Plugin'); ?></th>
         <th style="text-align: center"><?php _e('Version'); ?></th>
+        <th><?php _e('Version'); ?></th>
         <th><?php _e('Description'); ?></th>
         <th style="text-align: center"<?php if ( current_user_can('edit_plugins') ) echo ' colspan="2"'; ?>><?php _e('Action'); ?></th>
+        <th><?php _e('Action'); ?></th>
     </tr>
-    </thead>
 <?php
     $style = '';
+    function sort_plugins($plug1, $plug2) {
+        return strnatcasecmp($plug1['Name'], $plug2['Name']);
+    }
+    uksort($plugins, 'sort_plugins');
     foreach($plugins as $plugin_file => $plugin_data) {
 …
         if (!empty($current_plugins) && in_array($plugin_file, $current_plugins)) {
             $toggle = "<a href='" . wp_nonce_url("plugins.php?action=deactivate&amp;plugin=$plugin_file", 'deactivate-plugin_' . $plugin_file) . "' title='".__('Deactivate this plugin')."' class='delete'>".__('Deactivate')."</a>";
+            $action = "<a href='plugins.php?action=deactivate&amp;plugin=$plugin_file' title='".__('Deactivate this plugin')."' class='delete'>".__('Deactivate')."</a>";
             $plugin_data['Title'] = "<strong>{$plugin_data['Title']}</strong>";
             $style .= $style == 'alternate' ? ' active' : 'active';
         } else {
             $toggle = "<a href='" . wp_nonce_url("plugins.php?action=activate&amp;plugin=$plugin_file", 'activate-plugin_' . $plugin_file) . "' title='".__('Activate this plugin')."' class='edit'>".__('Activate')."</a>";
+            $action = "<a href='plugins.php?action=activate&amp;plugin=$plugin_file' title='".__('Activate this plugin')."' class='edit'>".__('Activate')."</a>";
+        }
         $plugin_data['Description'] = wp_kses($plugin_data['Description'], array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array()) ); ;
+        if ( $style != '' )
+            $style = 'class="' . $style . '"';
+        if ( is_writable(ABSPATH . 'wp-content/plugins/' . $plugin_file) )
+            $edit = "<a href='plugin-editor.php?file=$plugin_file' title='".__('Open this file in the Plugin Editor')."' class='edit'>".__('Edit')."</a>";
+        else
+            $edit = '';
+        if ($style != '') $style = 'class="' . $style . '"';
         echo "
     <tr $style>
         <td class='name'>{$plugin_data['Title']}</td>
         <td class='vers'>{$plugin_data['Version']}</td>
+        <td class='desc'><p>{$plugin_data['Description']} <cite>".sprintf(__('By %s'), $plugin_data['Author']).".</cite></p></td>
+        <td class='togl'>$toggle</td>";
+        if ( current_user_can('edit_plugins') )
+        echo "
+        <td>$edit</td>";
+        echo"
+        <td class='desc'>{$plugin_data['Description']} <cite>".sprintf(__('By %s'), $plugin_data['Author']).".</cite></td>
+        <td class='togl'>$action</td>
     </tr>";
+    }
 …
 ?>
 <p><?php _e(sprintf('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.', PLUGINDIR)); ?></p>
+<p><?php _e('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>wp-content/plugins</code> directory and it will be automatically deactivated.'); ?></p>
 <h2><?php _e('Get More Plugins'); ?></h2>
+<p><?php _e('You can find additional plugins for your site in the <a href="http://wordpress.org/extend/plugins/">WordPress plugin directory</a>.'); ?></p>
+<p><?php _e(sprintf('To install a plugin you generally just need to upload the plugin file into your <code>%s</code> directory. Once a plugin is uploaded, you may activate it here.', PLUGINDIR)); ?></p>
+<p><?php _e('You can find additional plugins for your site in the <a href="http://wordpress.org/extend/plugins/">WordPress plugin directory</a>. To install a plugin you generally just need to upload the plugin file into your <code>wp-content/plugins</code> directory. Once a plugin is uploaded, you may activate it here.'); ?></p>
 </div>

trunk/wp-admin/post.php

-                      r4431
+                      r3503
 require_once('admin.php');
+$parent_file = 'edit.php';
+$submenu_file = 'edit.php';
+wp_reset_vars(array('action', 'safe_mode', 'withcomments', 'posts', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder'));
+if ( isset( $_POST['deletepost'] ) )
+    $action = 'delete';
+$wpvarstoreset = array('action', 'safe_mode', 'withcomments', 'posts', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder' );
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+            $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
+if (isset($_POST['deletepost'])) {
+$action = "delete";
+}
+// Fix submenu highlighting for pages.
+if ( isset($_REQUEST['post']) && 'static' == get_post_status($_REQUEST['post']) )
+    $submenu_file = 'page-new.php';
+$editing = true;
 switch($action) {
-case 'postajaxpost':
 case 'post':
+    $parent_file = 'post-new.php';
+    $submenu_file = 'post-new.php';
+    check_admin_referer('add-post');
+    $post_ID = 'post' == $action ? write_post() : edit_post();
+    $post_ID = write_post();
     // Redirect.
 …
             break;
         default:
             $location = 'post-new.php';
+            $location = 'post.php';
             break;
+        }
     } else {
+        $location = "post-new.php?posted=$post_ID";
+    }
+        $location = 'post.php?posted=true';
+    }
+    if ( 'static' == $_POST['post_status'] )
+        $location = "page-new.php?saved=true";
     if ( isset($_POST['save']) )
         $location = "post.php?action=edit&post=$post_ID";
     wp_redirect($location);
+    header("Location: $location");
     exit();
     break;
 …
 case 'edit':
     $title = __('Edit');
+    $editing = true;
+    require_once('admin-header.php');
     $post_ID = $p = (int) $_GET['post'];
-    $post = get_post($post_ID);
-    if($post->post_status == 'draft') {
-        wp_enqueue_script('prototype');
-        wp_enqueue_script('autosave');
+    }
-    require_once('admin-header.php');
     if ( !current_user_can('edit_post', $post_ID) )
 …
     $post = get_post_to_edit($post_ID);
+    include('edit-form-advanced.php');
+    if ($post->post_status == 'static')
+        include('edit-page-form.php');
+    else
+        include('edit-form-advanced.php');
     ?>
     <div id='preview' class='wrap'>
     <h2 id="preview-post"><?php _e('Post Preview (updated when post is saved)'); ?></h2>
         <iframe src="<?php echo wp_specialchars(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" width="100%" height="600" ></iframe>
+    <h2 id="preview-post"><?php _e('Post Preview (updated when post is saved)'); ?> <small class="quickjump"><a href="#write-post"><?php _e('edit &uarr;'); ?></a></small></h2>
+        <iframe src="<?php echo add_query_arg('preview', 'true', get_permalink($post->ID)); ?>" width="100%" height="600" ></iframe>
     </div>
     <?php
 …
     $post_id = (int) $_POST['post_ID'];
-    check_admin_referer('update-attachment_' . $post_id);
     // Don't let these be changed
     unset($_POST['guid']);
     $_POST['post_type'] = 'attachment';
+    $_POST['post_status'] = 'attachment';
     // Update the thumbnail filename
 …
 case 'editpost':
+    $post_ID = (int) $_POST['post_ID'];
+    check_admin_referer('update-post_' . $post_ID);
+    $post_ID = edit_post();
+    if ($_POST['save']) {
+        $location = $_SERVER['HTTP_REFERER'];
+    } elseif ($_POST['updatemeta']) {
+        $location = $_SERVER['HTTP_REFERER'] . '&message=2#postcustom';
+    } elseif ($_POST['deletemeta']) {
+        $location = $_SERVER['HTTP_REFERER'] . '&message=3#postcustom';
+    } elseif (isset($_POST['referredby']) && $_POST['referredby'] != $_SERVER['HTTP_REFERER']) {
+        $location = $_POST['referredby'];
+        if ( $_POST['referredby'] == 'redo' )
+            $location = get_permalink( $post_ID );
+    } elseif ($action == 'editattachment') {
+        $location = 'attachments.php';
+    } else {
+        $location = 'post.php';
+    }
+    header ('Location: ' . $location); // Send user on their way while we keep working
+    exit();
+    break;
+case 'delete':
+    check_admin_referer();
+    $post_id = (isset($_GET['post']))  ? intval($_GET['post']) : intval($_POST['post_ID']);
+    $post = & get_post($post_id);
+    $post_ID = edit_post();
+    if ( 'post' == $_POST['originalaction'] ) {
+        if (!empty($_POST['mode'])) {
+        switch($_POST['mode']) {
+            case 'bookmarklet':
+                $location = $_POST['referredby'];
+                break;
+            case 'sidebar':
+                $location = 'sidebar.php?a=b';
+                break;
+            default:
+                $location = 'post-new.php';
+                break;
+    if ( !current_user_can('edit_post', $post_id) )
+        die( __('You are not allowed to delete this post.') );
+    if ( $post->post_status == 'attachment' ) {
+        if ( ! wp_delete_attachment($post_id) )
+            die( __('Error in deleting...') );
+    } else {
+        if ( !wp_delete_post($post_id) )
+            die( __('Error in deleting...') );
+    }
+    $sendback = $_SERVER['HTTP_REFERER'];
+    if (strstr($sendback, 'post.php')) $sendback = get_settings('siteurl') .'/wp-admin/post.php';
+    elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php';
+    $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
+    header ('Location: ' . $sendback);
+    break;
+case 'editcomment':
+    $title = __('Edit Comment');
+    $parent_file = 'edit.php';
+    require_once ('admin-header.php');
+    get_currentuserinfo();
+    $comment = (int) $_GET['comment'];
+    if ( ! $comment = get_comment($comment) )
+        die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'javascript:history.go(-1)'));
+    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
+        die( __('You are not allowed to edit comments on this post.') );
+    $comment = get_comment_to_edit($comment);
+    include('edit-form-comment.php');
+    break;
+case 'confirmdeletecomment':
+    require_once('./admin-header.php');
+    $comment = (int) $_GET['comment'];
+    $p = (int) $_GET['p'];
+    if ( ! $comment = get_comment($comment) )
+        die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
+        die( __('You are not allowed to delete comments on this post.') );
+    echo "<div class='wrap'>\n";
+    echo "<p>" . __('<strong>Caution:</strong> You are about to delete the following comment:') . "</p>\n";
+    echo "<table border='0'>\n";
+    echo "<tr><td>" . __('Author:') . "</td><td>$comment->comment_author</td></tr>\n";
+    echo "<tr><td>" . __('E-mail:') . "</td><td>$comment->comment_author_email</td></tr>\n";
+    echo "<tr><td>". __('URL:') . "</td><td>$comment->comment_author_url</td></tr>\n";
+    echo "<tr><td>". __('Comment:') . "</td><td>$comment->comment_content</td></tr>\n";
+    echo "</table>\n";
+    echo "<p>" . __('Are you sure you want to do that?') . "</p>\n";
+    echo "<form action='".get_settings('siteurl')."/wp-admin/post.php' method='get'>\n";
+    echo "<input type='hidden' name='action' value='deletecomment' />\n";
+    echo "<input type='hidden' name='p' value='$p' />\n";
+    echo "<input type='hidden' name='comment' value='{$comment->comment_ID}' />\n";
+    echo "<input type='hidden' name='noredir' value='1' />\n";
+    echo "<input type='submit' value='" . __('Yes') . "' />";
+    echo "&nbsp;&nbsp;";
+    echo "<input type='button' value='" . __('No') . "' onclick=\"self.location='". get_settings('siteurl') ."/wp-admin/edit.php?p=$p&amp;c=1#comments';\" />\n";
+    echo "</form>\n";
+    echo "</div>\n";
+    break;
+case 'deletecomment':
+    check_admin_referer();
+    $comment = (int) $_GET['comment'];
+    $p = (int) $_GET['p'];
+    if (isset($_GET['noredir'])) {
+        $noredir = true;
+    } else {
+        $noredir = false;
+    }
+    $postdata = get_post($p) or die(sprintf(__('Oops, no post with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+    if ( ! $comment = get_comment($comment) )
+             die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'post.php'));
+    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
+        die( __('You are not allowed to edit comments on this post.') );
+    wp_set_comment_status($comment->comment_ID, "delete");
+    do_action('delete_comment', $comment->comment_ID);
+    if (($_SERVER['HTTP_REFERER'] != "") && (false == $noredir)) {
+        header('Location: ' . $_SERVER['HTTP_REFERER']);
+    } else {
+        header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
+    }
+    break;
+case 'unapprovecomment':
+    check_admin_referer();
+    $comment = (int) $_GET['comment'];
+    $p = (int) $_GET['p'];
+    if (isset($_GET['noredir'])) {
+        $noredir = true;
+    } else {
+        $noredir = false;
+    }
+    if ( ! $comment = get_comment($comment) )
+        die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
+        die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
+    wp_set_comment_status($comment->comment_ID, "hold");
+    if (($_SERVER['HTTP_REFERER'] != "") && (false == $noredir)) {
+        header('Location: ' . $_SERVER['HTTP_REFERER']);
+    } else {
+        header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
+    }
+    break;
+case 'mailapprovecomment':
+    $comment = (int) $_GET['comment'];
+    if ( ! $comment = get_comment($comment) )
+             die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
+        die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
+    if ('1' != $comment->comment_approved) {
+        wp_set_comment_status($comment->comment_ID, 'approve');
+        if (true == get_option('comments_notify'))
+            wp_notify_postauthor($comment->comment_ID);
+    }
+    header('Location: ' . get_option('siteurl') . '/wp-admin/moderation.php?approved=1');
+    break;
+case 'approvecomment':
+    $comment = (int) $_GET['comment'];
+    $p = (int) $_GET['p'];
+    if (isset($_GET['noredir'])) {
+        $noredir = true;
+    } else {
+        $noredir = false;
+    }
+    if ( ! $comment = get_comment($comment) )
+        die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
+        die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
+    wp_set_comment_status($comment->comment_ID, "approve");
+    if (get_settings("comments_notify") == true) {
+        wp_notify_postauthor($comment->comment_ID);
+    }
+    if (($_SERVER['HTTP_REFERER'] != "") && (false == $noredir)) {
+        header('Location: ' . $_SERVER['HTTP_REFERER']);
+    } else {
+        header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
+    }
+    break;
+case 'editedcomment':
+    edit_comment();
+    $referredby = $_POST['referredby'];
+    if (!empty($referredby)) {
+        header('Location: ' . $referredby);
+    } else {
+        header ("Location: edit.php?p=$comment_post_ID&c=1#comments");
+    }
+    break;
+default:
+    $title = __('Create New Post');
+    require_once ('./admin-header.php');
+?>
+<?php if ( isset($_GET['posted']) ) : ?>
+<div id="message" class="updated fade"><p><?php printf(__('Post saved. <a href="%s">View site &raquo;</a>'), get_bloginfo('home') . '/'); ?></p></div>
+<?php endif; ?>
+<?php
+    if ( current_user_can('edit_posts') ) {
+        $action = 'post';
+        get_currentuserinfo();
+        if ( $drafts = get_users_drafts( $user_ID ) ) {
+            ?>
+            <div class="wrap">
+            <p><strong><?php _e('Your Drafts:') ?></strong>
+            <?php
+            $num_drafts = count($drafts);
+            if ( $num_drafts > 15 ) $num_drafts = 15;
+            for ( $i = 0; $i < $num_drafts; $i++ ) {
+                $draft = $drafts[$i];
+                if ( 0 != $i )
+                    echo ', ';
+                $draft->post_title = stripslashes($draft->post_title);
+                if ( empty($draft->post_title) )
+                    $draft->post_title = sprintf(__('Post # %s'), $draft->ID);
+                echo "<a href='post.php?action=edit&amp;post=$draft->ID' title='" . __('Edit this draft') . "'>$draft->post_title</a>";
+            }
+        } else {
+            $location = "post-new.php?posted=$post_ID";
+            ?>
+            <?php if ( 15 < count($drafts) ) { ?>
+            , <a href="edit.php"><?php echo sprintf(__('and %s more'), (count($drafts) - 15) ); ?> &raquo;</a>
+            <?php } ?>
+            .</p>
+            </div>
+            <?php
+        }
+        if ( isset($_POST['save']) )
+            $location = "post.php?action=edit&post=$post_ID";
+    } else {
+        $referredby = '';
+        if ( !empty($_POST['referredby']) )
+            $referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']);
+        $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
+        if ($_POST['save']) {
+            $location = "post.php?action=edit&post=$post_ID";
+        } elseif ($_POST['updatemeta']) {
+            $location = wp_get_referer() . '&message=2#postcustom';
+        } elseif ($_POST['deletemeta']) {
+            $location = wp_get_referer() . '&message=3#postcustom';
+        } elseif (!empty($referredby) && $referredby != $referer) {
+            $location = $_POST['referredby'];
+            if ( $_POST['referredby'] == 'redo' )
+                $location = get_permalink( $post_ID );
+        } elseif ($action == 'editattachment') {
+            $location = 'attachments.php';
+        } else {
+            $location = 'post-new.php';
+        }
+    }
+    wp_redirect($location); // Send user on their way while we keep working
+    exit();
+    break;
+case 'delete':
+    $post_id = (isset($_GET['post']))  ? intval($_GET['post']) : intval($_POST['post_ID']);
+    check_admin_referer('delete-post_' . $post_id);
+    $post = & get_post($post_id);
+    if ( !current_user_can('delete_post', $post_id) )
+        wp_die( __('You are not allowed to delete this post.') );
+    if ( $post->post_type == 'attachment' ) {
+        if ( ! wp_delete_attachment($post_id) )
+            wp_die( __('Error in deleting...') );
+    } else {
+        if ( !wp_delete_post($post_id) )
+            wp_die( __('Error in deleting...') );
+    }
+    $sendback = wp_get_referer();
+    if (strstr($sendback, 'post.php')) $sendback = get_option('siteurl') .'/wp-admin/post-new.php';
+    elseif (strstr($sendback, 'attachments.php')) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
+    $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
+    wp_redirect($sendback);
+    exit();
+    break;
+default:
+    wp_redirect('edit.php');
+    exit();
+        $post = get_default_post_to_edit();
+        include('edit-form-advanced.php');
+?>
+<div class="wrap">
+<?php echo '<h3>'.__('WordPress bookmarklet').'</h3>
+<p>'.__('Right click on the following link and choose "Add to favorites" to create a posting shortcut.').'</p>'; ?>
+<p>
+<?php
+if ($is_NS4 || $is_gecko) {
+?>
+<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press It - %s'), wp_specialchars(get_settings('blogname'))); ?></a>
+<?php
+} else if ($is_winIE) {
+?>
+<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
+<script type="text/javascript">
+<!--
+function oneclickbookmarklet(blah) {
+window.open ("profile.php?action=IErightclick", "oneclickbookmarklet", "width=500, height=450, location=0, menubar=0, resizable=0, scrollbars=1, status=1, titlebar=0, toolbar=0, screenX=120, left=120, screenY=120, top=120");
+}
+// -->
+</script>
+<br />
+<br />
+<?php _e('One-click bookmarklet:') ?><br />
+<a href="javascript:oneclickbookmarklet(0);"><?php _e('click here') ?></a>
+<?php
+} else if ($is_opera) {
+?>
+<a href="javascript:location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/post.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
+<?php
+} else if ($is_macIE) {
+?>
+<a href="javascript:Q='';location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
+<?php
+}
+?>
+</p>
+</div>
+<?php
+} else {
+?>
+<div class="wrap">
+<p><?php printf(__('Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to raise your level to 1, in order to be authorized to post.<br />
+You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
+When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)'), get_settings('admin_email')); ?>
+</p>
+</div>
+<?php
+}
     break;
 } // end switch
+/* </Edit> */
 include('admin-footer.php');
 ?>

trunk/wp-admin/profile-update.php

-                      r4431
+                      r3503
 <?php
-$parent_file = 'profile.php';
-$submenu_file = 'profile.php';
 require_once('admin.php');
 check_admin_referer('update-profile_' . $user_ID);
+check_admin_referer();
 if ( !$_POST )
     wp_die( __('No post?') );
+    die( __('No post?') );
 $errors = edit_user($user_ID);
+if ( is_wp_error( $errors ) ) {
+    foreach( $errors->get_error_messages() as $message )
+        echo "$message<br />";
+if (count($errors) != 0) {
+    foreach ($errors as $id => $error) {
+        echo $error . '<br/>';
+    }
     exit;
+}
+if ( rich_edit_exists() ) {
+    if ( !isset( $_POST['rich_editing'] ) )
+        $_POST['rich_editing'] = 'false';
+    update_user_option( $current_user->id, 'rich_editing', $_POST['rich_editing'], true );
+}
+if ( !isset( $_POST['rich_editing'] ) )
+    $_POST['rich_editing'] = 'false';
+update_user_option( $current_user->id, 'rich_editing', $_POST['rich_editing'], true );
 do_action('personal_options_update');

trunk/wp-admin/profile.php

-                      r4431
+                      r3503
 $title = __('Profile');
+if ( current_user_can('edit_users') )
+    $parent_file = 'users.php';
+else
+    $parent_file = 'profile.php';
+$parent_file = 'profile.php';
 include_once('admin-header.php');
 $profileuser = get_user_to_edit($user_ID);
+$profileuser = new WP_User($user_ID);
 $bookmarklet_height= 440;
 …
 <h2><?php _e('Your Profile and Personal Options'); ?></h2>
 <form name="profile" id="your-profile" action="profile-update.php" method="post">
-<?php wp_nonce_field('update-profile_' . $user_ID) ?>
 <p>
 <input type="hidden" name="from" value="profile" />
 <input type="hidden" name="checkuser_id" value="<?php echo $user_ID ?>" />
 </p>
-<h3><?php _e('Personal Options'); ?></h3>
-<?php if ( rich_edit_exists() ) : // don't bother showing the option if the editor has been removed ?>
-<p><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_user_option('rich_editing')); ?> />
-<?php _e('Use the visual editor when writing') ?></label></p>
-<?php endif; ?>
-<?php do_action('profile_personal_options'); ?>
-<p class="submit"><input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" /></p>
 <fieldset>
 …
 <br clear="all" />
 <fieldset>
 <legend><?php _e('About Yourself'); ?></legend>
 <p class="desc"><?php _e('Share a little biographical information. '); ?></p>
+<legend><?php _e('About yourself'); ?></legend>
+<p class="desc"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p>
 <p><textarea name="description" rows="5" cols="30"><?php echo $profileuser->description ?></textarea></p>
 </fieldset>
 …
 <br clear="all" />
+<h3><?php _e('Personal Options'); ?></h3>
+<p><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_user_option('rich_editing')); ?> />
+<?php _e('Use the visual rich editor when writing') ?></label></p>
+<?php do_action('profile_personal_options'); ?>
   <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
     <?php
 …
     ?>
   </table>
+<p class="submit"><input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" /></p>
+<p class="submit">
+<input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" />
+</p>
 </form>

trunk/wp-admin/setup-config.php

-                      r4431
+                      r3503
 define('WP_INSTALLING', true);
+if (file_exists('../wp-config.php'))
+    die("The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.");
 if (!file_exists('../wp-config-sample.php'))
     die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
 $configFile = file('../wp-config-sample.php');
 if (!is_writable('../')) die("Sorry, I can't write to the directory. You'll have to either change the permissions on your WordPress directory or create your wp-config.php manually.");
+if (isset($_GET['step']))
+    $step = $_GET['step'];
+else
+    $step = 0;
+$step = 0;
+if(isset($_GET['step'])) $step = $_GET['step'];
 header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 …
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <style media="screen" type="text/css">
+    <!--
+    html {
+        background: #eee;
+    }
+    <!--
     body {
-        background: #fff;
-        color: #000;
         font-family: Georgia, "Times New Roman", Times, serif;
+        margin-left: 20%;
+        margin-right: 20%;
+        padding: .2em 2em;
+    }
+    h1 {
+        color: #006;
+        font-size: 18px;
+        font-weight: lighter;
+    }
+    h2 {
+        font-size: 16px;
+    }
+    p, li, dt {
+        line-height: 140%;
+        padding-bottom: 2px;
+    }
+    ul, ol {
+        padding: 5px 5px 5px 20px;
+        margin-left: 15%;
+        margin-right: 15%;
+    }
     #logo {
+        margin-bottom: 2em;
+        margin: 0;
+        padding: 0;
+        background-image: url(http://wordpress.org/images/logo.png);
+        background-repeat: no-repeat;
+        height: 60px;
+        border-bottom: 4px solid #333;
+    }
+    .step a, .step input {
+        font-size: 2em;
+    #logo a {
+        display: block;
+        height: 60px;
+    }
     td input {
         font-size: 1.5em;
+    #logo a span {
+        display: none;
+    }
     .step, th {
         text-align: right;
+    p, li {
+        line-height: 140%;
+    }
+    #footer {
+        text-align: center;
+        border-top: 1px solid #ccc;
+        padding-top: 1em;
+        font-style: italic;
+    }
+    -->
+    -->
     </style>
 </head>
 <body>
 <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
+<body>
+<h1 id="logo"><a href="http://wordpress.org/"><span>WordPress</span></a></h1>
 <?php
-// Check if wp-config.php has been created
-if (file_exists('../wp-config.php'))
-    die("<p>The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p></body></html>");
 switch($step) {
     case 0:
 ?>
 <p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p>
 <ol>
   <li>Database name</li>
   <li>Database username</li>
   <li>Database password</li>
+  <li>Database password</li>
   <li>Database host</li>
   <li>Table prefix (if you want to run more than one WordPress in a single database) </li>
 …
     ?>
 </p>
 <form method="post" action="setup-config.php?step=2">
+<form method="post" action="setup-config.php?step=2">
   <p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
   <table>
     <tr>
       <th scope="row">Database Name</th>
       <td><input name="dbname" type="text" size="25" value="wordpress" /></td>
+      <td><input name="dbname" type="text" size="45" value="wordpress" /></td>
       <td>The name of the database you want to run WP in. </td>
     </tr>
     <tr>
       <th scope="row">User Name</th>
       <td><input name="uname" type="text" size="25" value="username" /></td>
+      <td><input name="uname" type="text" size="45" value="username" /></td>
       <td>Your MySQL username</td>
     </tr>
     <tr>
       <th scope="row">Password</th>
       <td><input name="pwd" type="text" size="25" value="password" /></td>
+      <td><input name="pwd" type="text" size="45" value="password" /></td>
       <td>...and MySQL password.</td>
     </tr>
     <tr>
       <th scope="row">Database Host</th>
       <td><input name="dbhost" type="text" size="25" value="localhost" /></td>
+      <td><input name="dbhost" type="text" size="45" value="localhost" /></td>
       <td>99% chance you won't need to change this value.</td>
     </tr>
     <tr>
       <th scope="row">Table Prefix</th>
       <td><input name="prefix" type="text" id="prefix" value="wp_" size="25" /></td>
+      <td><input name="prefix" type="text" id="prefix" value="wp_" size="45" /></td>
       <td>If you want to run multiple WordPress installations in a single database, change this.</td>
     </tr>
+  </table>
+  <h2 class="step">
+  <input name="submit" type="submit" value="Submit" />
+  </h2>
+  </table>
+  <input name="submit" type="submit" value="Submit" />
 </form>
 <?php
     break;
     case 2:
     $dbname  = trim($_POST['dbname']);
 …
 <?php
     break;
+}
+?>
+<p id="footer"><a href="http://wordpress.org/">WordPress</a>, personal publishing platform.</p>
+?>
 </body>
 </html>

trunk/wp-admin/sidebar.php

-                      r4431
+                      r3503
 if ( ! current_user_can('edit_posts') )
     wp_die(__('Cheatin&#8217; uh?'));
+    die ("Cheatin' uh ?");
 if ('b' == $_GET['a']) {
 …
 <body id="sidebar">
 <h1 id="wphead"><a href="http://wordpress.org/" rel="external">WordPress</a></h1>
 <form name="post" action="post.php" method="post">
+<form name="post" action="post.php" method="POST">
 <div><input type="hidden" name="action" value="post" />
 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />

trunk/wp-admin/templates.php

-                      r4431
+                      r3503
 $parent_file =  'edit.php';
+wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file'));
+$wpvarstoreset = array('action','redirect','profile','error','warning','a','file');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
 $recents = get_option('recently_edited');
 …
 case 'update':
-    check_admin_referer('edit-file_' . $file);
     if ( ! current_user_can('edit_files') )
         wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
+    die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
     $newcontent = stripslashes($_POST['newcontent']);
 …
             fwrite($f, $newcontent);
             fclose($f);
             wp_redirect("templates.php?file=$file&a=te");
+            header("Location: templates.php?file=$file&a=te");
         } else {
             wp_redirect("templates.php?file=$file&a=err");
+            header("Location: templates.php?file=$file&a=err");
+        }
     } else {
         wp_redirect("templates.php?file=$file&a=err");
+        header("Location: templates.php?file=$file&a=err");
+    }
 …
     require_once('./admin-header.php');
     if ( ! current_user_can('edit_files') )
         wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
+    die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
     if ( strstr( $file, 'wp-config.php' ) )
     wp_die('<p>'.__('The config file cannot be edited or viewed through the web interface. Sorry!').'</p>');
+    die('<p>'.__('The config file cannot be edited or viewed through the web interface. Sorry!').'</p>');
     update_recently_edited($file);
 …
     if (!is_file($real_file))
         $error = true;
     if (!$error) {
         $f = @ fopen($real_file, 'r');
         if ( $f ) {
+            if ( filesize($real_file ) > 0 ) {
+                $content = fread($f, filesize($real_file));
+                $content = htmlspecialchars($content);
+            } else {
+                $content = '';
+            }
+            $content = fread($f, filesize($real_file));
+            $content = htmlspecialchars($content);
         } else {
             $error = true;
 …
     <?php else: ?>
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
     <?php endif; ?>
+    <?php endif; ?>
 <?php endif; ?>
  <div class="wrap">
 …
 echo '<ol>';
 foreach ($recents as $recent) :
     echo "<li><a href='templates.php?file=" . wp_specialchars($recent, true) . "'>" . get_file_description(basename($recent)) . "</a></li>";
+    echo "<li><a href='templates.php?file=$recent'>" . get_file_description(basename($recent)) . "</a></li>";
 endforeach;
 echo '</ol>';
 …
 <?php if (!$error) { ?>
   <form name="template" id="template" action="templates.php" method="post">
-  <?php wp_nonce_field('edit-file_' . $file) ?>
      <div><textarea cols="70" rows="25" name="newcontent" id='newcontent' tabindex="1"><?php echo $content ?></textarea>
      <input type="hidden" name="action" value="update" />
 …
      <p class="submit">
 <?php
     echo "<input type='submit' name='submit' value='    " . __('Update File &raquo;') . "' tabindex='2' />";
+    echo "<input type='submit' name='submit' value='    " . __('Update File') . " &raquo;' tabindex='2' />";
 ?>
 </p>

trunk/wp-admin/theme-editor.php

-                      r4431
+                      r3503
 $parent_file = 'themes.php';
+wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme'));
+$wpvarstoreset = array('action','redirect','profile','error','warning','a','file', 'theme');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
 $themes = get_themes();
 …
 if ( ! isset($themes[$theme]) )
     wp_die(__('The requested theme does not exist.'));
+    die(__('The requested theme does not exist.'));
 $allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files']);
 …
 case 'update':
-    check_admin_referer('edit-theme_' . $file . $theme);
     if ( !current_user_can('edit_themes') )
         wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
+    die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
     $newcontent = stripslashes($_POST['newcontent']);
 …
         fwrite($f, $newcontent);
         fclose($f);
         $location = "theme-editor.php?file=$file&theme=$theme&a=te";
+        header("Location: theme-editor.php?file=$file&theme=$theme&a=te");
     } else {
         $location = "theme-editor.php?file=$file&theme=$theme";
+        header("Location: theme-editor.php?file=$file&theme=$theme");
+    }
-    $location = wp_kses_no_null($location);
-    $strip = array('%0d', '%0a');
-    $location = str_replace($strip, '', $location);
-    header("Location: $location");
     exit();
 …
 default:
+    require_once('admin-header.php');
     if ( !current_user_can('edit_themes') )
+        wp_die('<p>'.__('You do not have sufficient permissions to edit themes for this blog.').'</p>');
+    require_once('admin-header.php');
+    die('<p>'.__('You have do not have sufficient permissions to edit themes for this blog.').'</p>');
     update_recently_edited($file);
     if (!is_file($real_file))
         $error = 1;
     if (!$error && filesize($real_file) > 0) {
         $f = fopen($real_file, 'r');
 …
 ?>
  </select>
  <input type="submit" name="Submit" value="<?php _e('Select &raquo;') ?>" class="button" />
+ <input type="submit" name="Submit" value="<?php _e('Select') ?> &raquo;" />
  </form>
  </div>
 …
     ?>
   <form name="template" id="template" action="theme-editor.php" method="post">
-  <?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
          <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
      <input type="hidden" name="action" value="update" />
 …
      <p class="submit">
 <?php
     echo "<input type='submit' name='submit' value='    " . __('Update File &raquo;') . "' tabindex='2' />";
+    echo "<input type='submit' name='submit' value='    " . __('Update File') . " &raquo;' tabindex='2' />";
 ?>
 </p>

trunk/wp-admin/themes.php

-                      r4431
+                      r3503
 if ( isset($_GET['action']) ) {
     check_admin_referer('switch-theme_' . $_GET['template']);
+    check_admin_referer();
     if ('activate' == $_GET['action']) {
         if ( isset($_GET['template']) )
             update_option('template', $_GET['template']);
         if ( isset($_GET['stylesheet']) )
             update_option('stylesheet', $_GET['stylesheet']);
         do_action('switch_theme', get_current_theme());
         wp_redirect('themes.php?activated=true');
+        header('Location: themes.php?activated=true');
         exit;
+    }
 …
     $screenshot = $themes[$theme_name]['Screenshot'];
     $stylesheet_dir = $themes[$theme_name]['Stylesheet Dir'];
     $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=$template&amp;stylesheet=$stylesheet", 'switch-theme_' . $template);
+    $activate_link = "themes.php?action=activate&amp;template=$template&amp;stylesheet=$stylesheet";
 ?>
 <div class="available-theme">
 …
 <?php
     $theme = '';
     $theme_names = array_keys($broken_themes);
     natcasesort($theme_names);

trunk/wp-admin/update-links.php

-                      r4431
+                      r3503
 if ( !get_option('use_linksupdate') )
     wp_die(__('Feature disabled.'));
+    die(__('Feature disabled.'));
 $link_uris = $wpdb->get_col("SELECT link_url FROM $wpdb->links");
 if ( !$link_uris )
     wp_die(__('No links'));
+    die('No links');
 $link_uris = urlencode( join( $link_uris, "\n" ) );
 …
 $http_request  = "POST /updated-batch/ HTTP/1.0\r\n";
 $http_request .= "Host: api.pingomatic.com\r\n";
 $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_option('blog_charset')."\r\n";
+$http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_settings('blog_charset')."\r\n";
 $http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
 $http_request .= 'User-Agent: WordPress/' . $wp_version . "\r\n";
 …
 $response = '';
 if ( false !== ( $fs = @fsockopen('api.pingomatic.com', 80, $errno, $errstr, 5) ) ) {
+if( false !== ( $fs = fsockopen('api.pingomatic.com', 80, $errno, $errstr, 5) ) ) {
     fwrite($fs, $http_request);
     while ( !feof($fs) )

trunk/wp-admin/upgrade-functions.php

-                      r4431
+                      r3503
 <?php
-if ( file_exists(ABSPATH . 'wp-content/install.php') )
-    require (ABSPATH . 'wp-content/install.php');
 require_once(ABSPATH . '/wp-admin/admin-functions.php');
-require_once(ABSPATH . '/wp-admin/admin-db.php');
 require_once(ABSPATH . '/wp-admin/upgrade-schema.php');
-require_once(ABSPATH . WPINC . '/registration.php');
-if ( !function_exists('wp_install') ) :
-function wp_install($blog_title, $user_name, $user_email, $public, $meta='') {
-    global $wp_rewrite;
-    wp_cache_flush();
-    make_db_current_silent();
-    populate_options();
-    populate_roles();
-    update_option('blogname', $blog_title);
-    update_option('admin_email', $user_email);
-    update_option('blog_public', $public);
-    $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-    $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-    update_option('siteurl', $guessurl);
-    // If not a public blog, don't ping.
-    if ( ! $public )
-        update_option('default_pingback_flag', 0);
-    // Create default user.  If the user already exists, the user tables are
-    // being shared among blogs.  Just set the role in that case.
-    $user_id = username_exists($user_name);
-    if ( !$user_id ) {
-        $random_password = substr(md5(uniqid(microtime())), 0, 6);
-        $user_id = wp_create_user($user_name, $random_password, $user_email);
-    } else {
-        $random_password = __('User already exists.  Password inherited.');
+    }
-    $user = new WP_User($user_id);
-    $user->set_role('administrator');
-    wp_install_defaults($user_id);
-    $wp_rewrite->flush_rules();
-    wp_new_blog_notification($blog_title, $guessurl, $user_id, $random_password);
-    wp_cache_flush();
-    return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $random_password);
+}
-endif;
-if ( !function_exists('wp_install_defaults') ) :
-function wp_install_defaults($user_id) {
-    global $wpdb;
-    // Default category
-    $wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_count, category_description) VALUES ('0', '".$wpdb->escape(__('Uncategorized'))."', '".sanitize_title(__('Uncategorized'))."', '1', '')");
-    // Default link category
-    $wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, link_count, category_description) VALUES ('0', '".$wpdb->escape(__('Blogroll'))."', '".sanitize_title(__('Blogroll'))."', '7', '')");
-    // Now drop in some default links
-    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://inphotos.org/', 'Donncha', 0, 'http://inphotos.org/feed/', '');");
-    $wpdb->query( "INSERT INTO $wpdb->link2cat (`link_id`, `category_id`) VALUES (1, 2)" );
-    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://zengun.org/weblog/', 'Michel', 0, 'http://zengun.org/weblog/feed/', '');");
-    $wpdb->query( "INSERT INTO $wpdb->link2cat (`link_id`, `category_id`) VALUES (2, 2)" );
-    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://boren.nu/', 'Ryan', 0, 'http://boren.nu/feed/', '');");
-    $wpdb->query( "INSERT INTO $wpdb->link2cat (`link_id`, `category_id`) VALUES (3, 2)" );
-    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://photomatt.net/', 'Matt', 0, 'http://xml.photomatt.net/feed/', '');");
-    $wpdb->query( "INSERT INTO $wpdb->link2cat (`link_id`, `category_id`) VALUES (4, 2)" );
-    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://zed1.com/journalized/', 'Mike', 0, 'http://zed1.com/journalized/feed/', '');");
-    $wpdb->query( "INSERT INTO $wpdb->link2cat (`link_id`, `category_id`) VALUES (5, 2)" );
-    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://www.alexking.org/', 'Alex', 0, 'http://www.alexking.org/blog/wp-rss2.php', '');");
-    $wpdb->query( "INSERT INTO $wpdb->link2cat (`link_id`, `category_id`) VALUES (6, 2)" );
-    $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://dougal.gunters.org/', 'Dougal', 0, 'http://dougal.gunters.org/feed/', '');");
-    $wpdb->query( "INSERT INTO $wpdb->link2cat (`link_id`, `category_id`) VALUES (7, 2)" );
-    // First post
-    $now = date('Y-m-d H:i:s');
-    $now_gmt = gmdate('Y-m-d H:i:s');
-    $wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_excerpt, post_title, post_category, post_name, post_modified, post_modified_gmt, comment_count, to_ping, pinged, post_content_filtered) VALUES ($user_id, '$now', '$now_gmt', '".$wpdb->escape(__('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!'))."', '', '".$wpdb->escape(__('Hello world!'))."', '0', '".$wpdb->escape(__('hello-world'))."', '$now', '$now_gmt', '1', '', '', '')");
-    $wpdb->query( "INSERT INTO $wpdb->post2cat (`rel_id`, `post_id`, `category_id`) VALUES (1, 1, 1)" );
-    // Default comment
-    $wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_date, comment_date_gmt, comment_content) VALUES ('1', '".$wpdb->escape(__('Mr WordPress'))."', '', 'http://wordpress.org/', '$now', '$now_gmt', '".$wpdb->escape(__('Hi, this is a comment.<br />To delete a comment, just log in and view the post&#039;s comments. There you will have the option to edit or delete them.'))."')");
-    // First Page
-    $wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_excerpt, post_title, post_category, post_name, post_modified, post_modified_gmt, post_status, post_type, to_ping, pinged, post_content_filtered) VALUES ($user_id, '$now', '$now_gmt', '".$wpdb->escape(__('This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.'))."', '', '".$wpdb->escape(__('About'))."', '0', '".$wpdb->escape(__('about'))."', '$now', '$now_gmt', 'publish', 'page', '', '', '')");
+}
-endif;
-if ( !function_exists('wp_new_blog_notification') ) :
-function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
-    $user = new WP_User($user_id);
-    $email = $user->user_email;
-    $name = $user->user_login;
-    $message_headers = 'From: "' . $blog_title . '" <wordpress@' . $_SERVER['SERVER_NAME'] . '>';
-    $message = sprintf(__("Your new WordPress blog has been successfully set up at:
-%1\$s
-You can log in to the administrator account with the following information:
-Username: %2\$s
-Password: %3\$s
-We hope you enjoy your new weblog. Thanks!
---The WordPress Team
-http://wordpress.org/
-"), $blog_url, $name, $password);
-    @wp_mail($email, __('New WordPress Blog'), $message, $message_headers);
+}
-endif;
-if ( !function_exists('wp_upgrade') ) :
-function wp_upgrade() {
-    global $wp_current_db_version, $wp_db_version;
-    $wp_current_db_version = __get_option('db_version');
-    // We are up-to-date.  Nothing to do.
-    if ( $wp_db_version == $wp_current_db_version )
-        return;
-    wp_cache_flush();
-    make_db_current_silent();
-    upgrade_all();
-    wp_cache_flush();
+}
-endif;
 // Functions to be called in install and upgrade scripts
 function upgrade_all() {
 …
             $wp_current_db_version = 2541;
+    }
     populate_options();
 …
         upgrade_130();
+    }
     if ( $wp_current_db_version < 3308 )
         upgrade_160();
-    if ( $wp_current_db_version < 3845 )
-        upgrade_210();
     $wp_rewrite->flush_rules();
     update_option('db_version', $wp_db_version);
+}
 …
+        }
+    }
     $categories = $wpdb->get_results("SELECT cat_ID, cat_name, category_nicename FROM $wpdb->categories");
     foreach ($categories as $category) {
 …
         $catwhere = '';
     endif;
     $allposts = $wpdb->get_results("SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere");
     if ($allposts) :
 …
 function upgrade_110() {
     global $wpdb;
     // Set user_nicename.
     $users = $wpdb->get_results("SELECT ID, user_nickname, user_nicename FROM $wpdb->users");
 …
 function upgrade_130() {
     global $wpdb;
+    global $wpdb, $table_prefix;
     // Remove extraneous backslashes.
 …
     // Obsolete tables
     $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues');
     $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiontypes');
     $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroups');
     $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroup_options');
+    $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optionvalues');
+    $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optiontypes');
+    $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optiongroups');
+    $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optiongroup_options');
     // Update comments table to use comment_type
 …
 function upgrade_160() {
     global $wpdb, $wp_current_db_version;
+    global $wpdb, $table_prefix, $wp_current_db_version;
     populate_roles_160();
 …
             update_usermeta( $user->ID, 'nickname', $wpdb->escape($user->user_nickname) );
         if ( !empty( $user->user_level ) )
             update_usermeta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
+            update_usermeta( $user->ID, $table_prefix . 'user_level', $user->user_level );
         if ( !empty( $user->user_icq ) )
             update_usermeta( $user->ID, 'icq', $wpdb->escape($user->user_icq) );
 …
             $wpdb->query("UPDATE $wpdb->users SET display_name = '$id' WHERE ID = '$user->ID'");
         endif;
         // FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
         $caps = get_usermeta( $user->ID, $wpdb->prefix . 'capabilities');
+        $caps = get_usermeta( $user->ID, $table_prefix . 'capabilities');
         if ( empty($caps) || defined('RESET_CAPS') ) {
             $level = get_usermeta($user->ID, $wpdb->prefix . 'user_level');
+            $level = get_usermeta($user->ID, $table_prefix . 'user_level');
             $role = translate_level_to_role($level);
             update_usermeta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
+        }
+            update_usermeta( $user->ID, $table_prefix . 'capabilities', array($role => true) );
+        }
     endforeach;
     $old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
 …
         $wpdb->query("ALTER TABLE $wpdb->users DROP $old");
     $wpdb->show_errors();
     if ( 0 == $wpdb->get_var("SELECT SUM(category_count) FROM $wpdb->categories") ) { // Create counts
         $categories = $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories");
 …
             post_type = ''
             WHERE ID = $object->ID");
             $meta = get_post_meta($object->ID, 'imagedata', true);
             if ( ! empty($meta['file']) )
                 add_post_meta($object->ID, '_wp_attached_file', $meta['file']);
+        }
+    }
+}
-function upgrade_210() {
-    global $wpdb, $wp_current_db_version;
-    if ( $wp_current_db_version < 3506 ) {
-        // Update status and type.
-        $posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
-        if ( ! empty($posts) ) foreach ($posts as $post) {
-            $status = $post->post_status;
-            $type = 'post';
-            if ( 'static' == $status ) {
-                $status = 'publish';
-                $type = 'page';
-            } else if ( 'attachment' == $status ) {
-                $status = 'inherit';
-                $type = 'attachment';
+            }
-            $wpdb->query("UPDATE $wpdb->posts SET post_status = '$status', post_type = '$type' WHERE ID = '$post->ID'");
+        }
+    }
-    if ( $wp_current_db_version < 3845 ) {
-        populate_roles_210();
+    }
-    if ( $wp_current_db_version < 3531 ) {
-        // Give future posts a post_status of future.
-        $now = gmdate('Y-m-d H:i:59');
-        $wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
-        $posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
-        if ( !empty($posts) )
-            foreach ( $posts as $post )
-                wp_schedule_single_event(mysql2date('U', $post->post_date), 'publish_future_post', array($post->ID));
+    }
-    if ( $wp_current_db_version < 3570 ) {
-        // Create categories for link categories if a category with the same
-        // name doesn't exist.  Create a map of link cat IDs to cat IDs.
-        $link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM $wpdb->linkcategories");
-        foreach ( $link_cats as $link_cat) {
-            if ( $cat_id = category_exists($link_cat->cat_name) ) {
-                $link_cat_id_map[$link_cat->cat_id] = $cat_id;
-                $default_link_cat = $cat_id;
-            } else {
-                $link_cat_id_map[$link_cat->cat_id] = wp_create_category($link_cat->cat_name);
-                $default_link_cat = $link_cat_id_map[$link_cat->cat_id];
+            }
+        }
-        // Associate links to cats.
-        $links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
-        if ( !empty($links) ) foreach ( $links as $link ) {
-            $link_cat = $link_cat_id_map[$link->link_category];
-            $cat = $wpdb->get_row("SELECT * FROM $wpdb->link2cat WHERE link_id = '$link->link_id' AND category_id = '$link_cat'");
-            if (!$cat && 0 != $link->link_category) {
-                $wpdb->query("INSERT INTO $wpdb->link2cat (link_id, category_id)
-                    VALUES ('$link->link_id', '$link_cat')");
+            }
+        }
-        // Set default to the last category we grabbed during the upgrade loop.
-        update_option('default_link_category', $default_link_cat);
-        // Count links per category.
-        if ( 0 == $wpdb->get_var("SELECT SUM(link_count) FROM $wpdb->categories") ) {
-            $categories = $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories");
-            foreach ( $categories as $cat_id ) {
-                $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->link2cat, $wpdb->links WHERE $wpdb->links.link_id = $wpdb->link2cat.link_id AND category_id = '$cat_id'");
-                $wpdb->query("UPDATE $wpdb->categories SET link_count = '$count' WHERE cat_ID = '$cat_id'");
+            }
+        }
+    }
 …
 function dbDelta($queries, $execute = true) {
     global $wpdb;
     // Seperate individual queries into an array
     if( !is_array($queries) ) {
 …
         if('' == $queries[count($queries) - 1]) array_pop($queries);
+    }
     $cqueries = array(); // Creation Queries
     $iqueries = array(); // Insertion Queries
     $for_update = array();
     // Create a tablename index for an array ($cqueries) of queries
     foreach($queries as $qry) {
 …
             // Unrecognized query type
+        }
+    }
+    }
     // Check to see which tables and fields exist
 …
                 //echo "<hr/><pre>\n".print_r(strtolower($table), true).":\n".print_r($cqueries, true)."</pre><hr/>";
                 // For every field line specified in the query
                 foreach($flds as $fld) {
 …
                     preg_match("|^([^ ]*)|", trim($fld), $fvals);
                     $fieldname = $fvals[1];
                     // Verify the found field name
                     $validfield = true;
 …
+                    }
                     $fld = trim($fld);
                     // If it's a valid field, add it to the field array
                     if($validfield) {
 …
+                    }
+                }
                 // Fetch the table column structure from the database
                 $tablefields = $wpdb->get_results("DESCRIBE {$table};");
                 // For every field in the table
                 foreach($tablefields as $tablefield) {
+                foreach($tablefields as $tablefield) {
                     // If the table field exists in the field array...
                     if(array_key_exists(strtolower($tablefield->Field), $cfields)) {
 …
                             $for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
+                        }
                         // Get the default value from the array
                             //echo "{$cfields[strtolower($tablefield->Field)]}<br>";
 …
                     $for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname;
+                }
                 // Index stuff goes here
                 // Fetch the table index structure from the database
                 $tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};");
                 if($tableindices) {
                     // Clear the index array
 …
                         $index_columns = '';
                         // For each column in the index
                         foreach($index_data['columns'] as $column_data) {
+                        foreach($index_data['columns'] as $column_data) {
                             if($index_columns != '') $index_columns .= ',';
                             // Add the field to the column list string

trunk/wp-admin/upgrade-schema.php

-                      r4431
+                      r3503
   category_parent bigint(20) NOT NULL default '0',
   category_count bigint(20) NOT NULL default '0',
-  link_count bigint(20) NOT NULL default '0',
-  posts_private tinyint(1) NOT NULL default '0',
-  links_private tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (cat_ID),
   KEY category_nicename (category_nicename)
 …
   KEY comment_post_ID (comment_post_ID)
 );
+CREATE TABLE $wpdb->link2cat (
+  rel_id bigint(20) NOT NULL auto_increment,
+  link_id bigint(20) NOT NULL default '0',
+  category_id bigint(20) NOT NULL default '0',
+  PRIMARY KEY  (rel_id),
+  KEY link_id (link_id,category_id)
+CREATE TABLE $wpdb->linkcategories (
+  cat_id bigint(20) NOT NULL auto_increment,
+  cat_name tinytext NOT NULL,
+  auto_toggle enum('Y','N') NOT NULL default 'N',
+  show_images enum('Y','N') NOT NULL default 'Y',
+  show_description enum('Y','N') NOT NULL default 'N',
+  show_rating enum('Y','N') NOT NULL default 'Y',
+  show_updated enum('Y','N') NOT NULL default 'Y',
+  sort_order varchar(64) NOT NULL default 'rand',
+  sort_desc enum('Y','N') NOT NULL default 'N',
+  text_before_link varchar(128) NOT NULL default '<li>',
+  text_after_link varchar(128) NOT NULL default '<br />',
+  text_after_all varchar(128) NOT NULL default '</li>',
+  list_limit int(11) NOT NULL default '-1',
+  PRIMARY KEY  (cat_id)
 );
 CREATE TABLE $wpdb->links (
 …
   post_category int(4) NOT NULL default '0',
   post_excerpt text NOT NULL,
   post_status enum('publish','draft','private','static','object','attachment','inherit','future') NOT NULL default 'publish',
+  post_status enum('publish','draft','private','static','object','attachment') NOT NULL default 'publish',
   comment_status enum('open','closed','registered_only') NOT NULL default 'open',
   ping_status enum('open','closed') NOT NULL default 'open',
 …
   guid varchar(255) NOT NULL default '',
   menu_order int(11) NOT NULL default '0',
   post_type varchar(20) NOT NULL default 'post',
+  post_type varchar(100) NOT NULL default '',
   post_mime_type varchar(100) NOT NULL default '',
   comment_count bigint(20) NOT NULL default '0',
   PRIMARY KEY  (ID),
+  KEY post_name (post_name),
+  KEY type_status_date (post_type,post_status,post_date,ID)
+  KEY post_name (post_name)
 );
 CREATE TABLE $wpdb->users (
 …
     add_option('blacklist_keys');
     add_option('comment_registration', 0);
+    add_option('open_proxy_check', 1);
     add_option('rss_language', 'en');
     add_option('html_type', 'text/html');
 …
         add_option('upload_path', 'wp-content/uploads');
+    }
-    // 2.0.3
-    add_option('secret', md5(uniqid(microtime())));
-    // 2.1
-    add_option('blog_public', '1');
-    add_option('default_link_category', 2);
-    add_option('show_on_front', 'posts');
     // Delete unused options
     $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action');
+    $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog');
     foreach ($unusedoptions as $option) :
         delete_option($option);
 …
 function populate_roles() {
+    populate_roles_160();
+    populate_roles_210();
+    populate_roles_160();
+}
 …
     add_role('contributor', __('Contributor'));
     add_role('subscriber', __('Subscriber'));
     // Add caps for Administrator role
     $role = get_role('administrator');
 …
     $role->add_cap('level_1');
     $role->add_cap('level_0');
     // Add caps for Editor role
     $role = get_role('editor');
 …
     $role->add_cap('level_1');
     $role->add_cap('level_0');
     // Add caps for Author role
     $role = get_role('author');
 …
     $role->add_cap('level_1');
     $role->add_cap('level_0');
     // Add caps for Contributor role
     $role = get_role('contributor');
 …
     $role->add_cap('level_1');
     $role->add_cap('level_0');
     // Add caps for Subscriber role
     $role = get_role('subscriber');
 …
+}
-function populate_roles_210() {
-    $roles = array('administrator', 'editor');
-    foreach ($roles as $role) {
-        $role = get_role($role);
-        if ( empty($role) )
-            continue;
-        $role->add_cap('edit_others_pages');
-        $role->add_cap('edit_published_pages');
-        $role->add_cap('publish_pages');
-        $role->add_cap('delete_pages');
-        $role->add_cap('delete_others_pages');
-        $role->add_cap('delete_published_pages');
-        $role->add_cap('delete_posts');
-        $role->add_cap('delete_others_posts');
-        $role->add_cap('delete_published_posts');
-        $role->add_cap('delete_private_posts');
-        $role->add_cap('edit_private_posts');
-        $role->add_cap('read_private_posts');
-        $role->add_cap('delete_private_pages');
-        $role->add_cap('edit_private_pages');
-        $role->add_cap('read_private_pages');
+    }
-    $role = get_role('administrator');
-    if ( ! empty($role) ) {
-        $role->add_cap('delete_users');
-        $role->add_cap('create_users');
+    }
-    $role = get_role('author');
-    if ( ! empty($role) ) {
-        $role->add_cap('delete_posts');
-        $role->add_cap('delete_published_posts');
+    }
-    $role = get_role('contributor');
-    if ( ! empty($role) ) {
-        $role->add_cap('delete_posts');
+    }
+}
 ?>

trunk/wp-admin/upgrade.php

-                      r4431
+                      r3503
 <?php
 define('WP_INSTALLING', true);
+if (!file_exists('../wp-config.php'))
+    die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Installing_WordPress#Step_3:_Set_up_wp-config.php'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
+if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config-sample.php with the proper database connection information and renamed it to wp-config.php.");
 require('../wp-config.php');
 timer_start();
 require_once(ABSPATH . '/wp-admin/upgrade-functions.php');
+if (isset($_GET['step']))
+    $step = $_GET['step'];
+else
+    $step = 0;
+@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+$step = $_GET['step'];
+if (!$step) $step = 0;
+header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+    <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
+    <title><?php _e('WordPress &rsaquo; Upgrade'); ?></title>
+    <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/install.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+    <?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
+    <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/install-rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+    <?php endif; ?>
+    <title>WordPress &rsaquo; Upgrade</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style media="screen" type="text/css">
+    <!--
+    html {
+        background: #eee;
+    }
+    body {
+        background: #fff;
+        color: #000;
+        font-family: Georgia, "Times New Roman", Times, serif;
+        margin-left: 20%;
+        margin-right: 20%;
+        padding: .2em 2em;
+    }
+    h1 {
+        color: #006;
+        font-size: 18px;
+        font-weight: lighter;
+    }
+    h2 {
+        font-size: 16px;
+    }
+    p, li, dt {
+        line-height: 140%;
+        padding-bottom: 2px;
+    }
+    ul, ol {
+        padding: 5px 5px 5px 20px;
+    }
+    #logo {
+        margin-bottom: 2em;
+    }
+.step a, .step input {
+    font-size: 2em;
+}
+.step, th {
+    text-align: right;
+}
+#footer {
+text-align: center; border-top: 1px solid #ccc; padding-top: 1em; font-style: italic;
+}
+    -->
+    </style>
 </head>
 <body>
 …
 <?php
 switch($step) {
     case 0:
         $goback = wp_specialchars(wp_get_referer());
+    $goback = wp_specialchars($_SERVER['HTTP_REFERER'], 1);
 ?>
 <p><?php _e('This file upgrades you from any previous version of WordPress to the latest. It may take a while though, so be patient.'); ?></p>
 <h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress &raquo;'); ?></a></h2>
+    <h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress &raquo;'); ?></a></h2>
 <?php
+        break;
+    break;
     case 1:
+        wp_upgrade();
+    wp_cache_flush();
+    make_db_current_silent();
+    upgrade_all();
+    wp_cache_flush();
         if ( empty( $_GET['backto'] ) )
             $backto = __get_option('home');
         else
             $backto = wp_specialchars( $_GET['backto'] , 1 );
+    if ( empty( $_GET['backto'] ) )
+        $backto = __get_option('home');
+    else
+        $backto = wp_specialchars( $_GET['backto'] , 1 );
 ?>
 <h2><?php _e('Step 1'); ?></h2>
 …
 <?php
         break;
+    break;
+}
 ?>

trunk/wp-admin/user-edit.php

-                      r4431
+                      r3503
 $title = __('Edit User');
+if ( current_user_can('edit_users') )
+    $parent_file = 'users.php';
+else
+    $parent_file = 'profile.php';
+$parent_file = 'profile.php';
 $submenu_file = 'users.php';
+wp_reset_vars(array('action', 'redirect', 'profile', 'user_id', 'wp_http_referer'));
+$wp_http_referer = remove_query_arg(array('update', 'delete_count'), stripslashes($wp_http_referer));
+$user_id = (int) $user_id;
+if ( !$user_id )
+    wp_die(__('Invalid user ID.'));
+$wpvarstoreset = array('action', 'redirect', 'profile', 'user_id');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
 switch ($action) {
 …
 case 'update':
+check_admin_referer('update-user_' . $user_id);
+if ( !current_user_can('edit_user', $user_id) )
+    wp_die(__('You do not have permission to edit this user.'));
+$errors = edit_user($user_id);
+if( !is_wp_error( $errors ) ) {
+    $redirect = "user-edit.php?user_id=$user_id&updated=true";
+    $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
+    wp_redirect($redirect);
+$errors = array();
+if (!current_user_can('edit_users'))
+    $errors['head'] = __('You do not have permission to edit this user.');
+else
+    $errors = edit_user($user_id);
+if(count($errors) == 0) {
+    header("Location: user-edit.php?user_id=$user_id&updated=true");
     exit;
+}
 default:
-$profileuser = get_user_to_edit($user_id);
-if ( !current_user_can('edit_user', $user_id) )
-        wp_die(__('You do not have permission to edit this user.'));
 include ('admin-header.php');
+$profileuser = new WP_User($user_id);
+if (!current_user_can('edit_users')) $errors['head'] = __('You do not have permission to edit this user.');
 ?>
 …
 <div id="message" class="updated fade">
     <p><strong><?php _e('User updated.') ?></strong></p>
-    <?php if ( $wp_http_referer ) : ?>
-    <p><a href="<?php echo wp_specialchars($wp_http_referer); ?>"><?php _e('&laquo; Back to Authors and Users'); ?></a></p>
-    <?php endif; ?>
 </div>
 <?php endif; ?>
 <?php if ( is_wp_error( $errors ) ) : ?>
+<?php if ( count($errors) != 0 ) : ?>
 <div class="error">
     <ul>
     <?php
+    foreach( $errors->get_error_messages() as $message )
+        echo "<li>$message</li>";
+    foreach($errors as $error) echo "<li>$error</li>";
     ?>
     </ul>
 …
 <form name="profile" id="your-profile" action="user-edit.php" method="post">
-<?php wp_nonce_field('update-user_' . $user_id) ?>
-<?php if ( $wp_http_referer ) : ?>
-    <input type="hidden" name="wp_http_referer" value="<?php echo wp_specialchars($wp_http_referer); ?>" />
-<?php endif; ?>
 <p>
 <input type="hidden" name="from" value="profile" />
 …
 // print_r($profileuser);
 echo '<select name="role">';
-$role_list = '';
-$user_has_role = false;
 foreach($wp_roles->role_names as $role => $name) {
+    if ( $profileuser->has_cap($role) ) {
+        $selected = ' selected="selected"';
+        $user_has_role = true;
+    } else {
+        $selected = '';
+    }
+    $role_list .= "<option value=\"{$role}\"{$selected}>{$name}</option>";
+}
+if ( $user_has_role )
+    $role_list .= '<option value="">' . __('&mdash; No role for this blog &mdash;') . '</option>';
+else
+    $role_list .= '<option value="" selected="selected">' . __('&mdash; No role for this blog &mdash;') . '</option>';
+echo $role_list . '</select>';
+    $selected = ($profileuser->has_cap($role)) ? ' selected="selected"' : '';
+    echo "<option value=\"{$role}\"{$selected}>{$name}</option>";
+}
+echo '</select>';
 ?></label></p>

trunk/wp-admin/users.php

-                      r4431
+                      r3503
 <?php
 require_once('admin.php');
 require_once( ABSPATH . WPINC . '/registration.php');
+require_once( ABSPATH . WPINC . '/registration-functions.php');
 $title = __('Users');
+if ( current_user_can('edit_users') )
+    $parent_file = 'users.php';
+else
+    $parent_file = 'profile.php';
+$parent_file = 'profile.php';
 $action = $_REQUEST['action'];
 $update = '';
-if ( empty($_POST) ) {
-    $referer = '<input type="hidden" name="wp_http_referer" value="'. wp_specialchars(stripslashes($_SERVER['REQUEST_URI'])) . '" />';
-} elseif ( isset($_POST['wp_http_referer']) ) {
-    $redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), urlencode(stripslashes($_POST['wp_http_referer'])));
-    $referer = '<input type="hidden" name="wp_http_referer" value="' . wp_specialchars($redirect) . '" />';
-} else {
-    $redirect = 'users.php';
+}
-// WP_User_Search class
-// by Mark Jaquith
-class WP_User_Search {
-    var $results;
-    var $search_term;
-    var $page;
-    var $raw_page;
-    var $users_per_page = 50;
-    var $first_user;
-    var $last_user;
-    var $query_limit;
-    var $query_from_where;
-    var $total_users_for_query = 0;
-    var $too_many_total_users = false;
-    var $search_errors;
-    function WP_User_Search ($search_term = '', $page = '') { // constructor
-        $this->search_term = $search_term;
-        $this->raw_page = ( '' == $page ) ? false : (int) $page;
-        $this->page = (int) ( '' == $page ) ? 1 : $page;
-        $this->prepare_query();
-        $this->query();
-        $this->prepare_vars_for_template_usage();
-        $this->do_paging();
+    }
-    function prepare_query() {
-        global $wpdb;
-        $this->first_user = ($this->page - 1) * $this->users_per_page;
-        $this->query_limit = 'LIMIT ' . $this->first_user . ',' . $this->users_per_page;
-        if ( $this->search_term ) {
-            $searches = array();
-            $search_sql = 'AND (';
-            foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-                $searches[] = $col . " LIKE '%$this->search_term%'";
-            $search_sql .= implode(' OR ', $searches);
-            $search_sql .= ')';
+        }
-        $this->query_from_where = "FROM $wpdb->users WHERE 1=1 $search_sql";
+    }
-    function query() {
-        global $wpdb;
-        $this->results = $wpdb->get_col('SELECT ID ' . $this->query_from_where . $this->query_limit);
-        if ( $this->results )
-            $this->total_users_for_query = $wpdb->get_var('SELECT COUNT(ID) ' . $this->query_from_where); // no limit
-        else
-            $this->search_errors = new WP_Error('no_matching_users_found', __('No matching users were found!'));
+    }
-    function prepare_vars_for_template_usage() {
-        $this->search_term = stripslashes($this->search_term); // done with DB, from now on we want slashes gone
+    }
-    function do_paging() {
-        if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
-            $this->paging_text = paginate_links( array(
-                'total' => ceil($this->total_users_for_query / $this->users_per_page),
-                'current' => $this->page,
-                'prev_text' => '&laquo; Previous Page',
-                'next_text' => 'Next Page &raquo;',
-                'base' => 'users.php?%_%',
-                'format' => 'userspage=%#%',
-                'add_args' => array( 'usersearch' => urlencode($this->search_term) )
-            ) );
+        }
+    }
-    function get_results() {
-        return (array) $this->results;
+    }
-    function page_links() {
-        echo $this->paging_text;
+    }
-    function results_are_paged() {
-        if ( $this->paging_text )
-            return true;
-        return false;
+    }
-    function is_search() {
-        if ( $this->search_term )
-            return true;
-        return false;
+    }
+}
 switch ($action) {
 case 'promote':
     check_admin_referer('bulk-users');
+    check_admin_referer();
     if (empty($_POST['users'])) {
         wp_redirect($redirect);
+        header('Location: users.php');
+    }
     if ( !current_user_can('edit_users') )
         wp_die(__('You can&#8217;t edit users.'));
     $userids = $_POST['users'];
+        die(__('You can&#8217;t edit users.'));
+    $userids = $_POST['users'];
     $update = 'promote';
+    foreach($userids as $id) {
+        if ( ! current_user_can('edit_user', $id) )
+            wp_die(__('You can&#8217;t edit that user.'));
+    foreach($userids as $id) {
         // The new role of the current user must also have edit_users caps
         if($id == $current_user->id && !$wp_roles->role_objects[$_POST['new_role']]->has_cap('edit_users')) {
 …
+        }
         $user = new WP_User($id);
         $user->set_role($_POST['new_role']);
+    }
     wp_redirect(add_query_arg('update', $update, $redirect));
+        $user = new WP_User($id);
+        $user->set_role($_POST['new_role']);
+    }
+    header('Location: users.php?update=' . $update);
 break;
 …
 case 'dodelete':
     check_admin_referer('delete-users');
+    check_admin_referer();
     if ( empty($_POST['users']) ) {
         wp_redirect($redirect);
+    }
     if ( !current_user_can('delete_users') )
         wp_die(__('You can&#8217;t delete users.'));
+        header('Location: users.php');
+    }
+    if ( !current_user_can('edit_users') )
+        die(__('You can&#8217;t delete users.'));
     $userids = $_POST['users'];
     $update = 'del';
+    $delete_count = 0;
+    foreach ( (array) $userids as $id) {
+        if ( ! current_user_can('delete_user', $id) )
+            wp_die(__('You can&#8217;t delete that user.'));
+    foreach ($userids as $id) {
         if($id == $current_user->id) {
             $update = 'err_admin_del';
             continue;
+        }
         switch($_POST['delete_option']) {
+        switch($_POST['delete_option']) {
         case 'delete':
             wp_delete_user($id);
 …
             break;
+        }
+        ++$delete_count;
+    }
+    $redirect = add_query_arg('delete_count', $delete_count, $redirect);
+    wp_redirect(add_query_arg('update', $update, $redirect));
+    }
+    header('Location: users.php?update=' . $update);
 break;
 …
 case 'delete':
+    check_admin_referer('bulk-users');
+    if ( empty($_POST['users']) )
+        wp_redirect($redirect);
+    if ( !current_user_can('delete_users') )
+        $errors = new WP_Error('edit_users', __('You can&#8217;t delete users.'));
+    check_admin_referer();
+    if (empty($_POST['users'])) {
+        header('Location: users.php');
+    }
+    if ( !current_user_can('edit_users') )
+        $error['edit_users'] = __('You can&#8217;t delete users.');
     $userids = $_POST['users'];
 …
 ?>
 <form action="" method="post" name="updateusers" id="updateusers">
-<?php wp_nonce_field('delete-users') ?>
-<?php echo $referer; ?>
 <div class="wrap">
 <h2><?php _e('Delete Users'); ?></h2>
 …
 <?php
     $go_delete = false;
     foreach ( (array) $userids as $id ) {
         $user = new WP_User($id);
         if ( $id == $current_user->id ) {
+    foreach ($userids as $id) {
+        $user = new WP_User($id);
+        if ($id == $current_user->id) {
             echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
         } else {
 …
             $go_delete = true;
+        }
+    }
+    $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
+    $user_dropdown = '<select name="reassign_user">';
+    foreach ( (array) $all_logins as $login )
+        if ( $login->ID == $current_user->id || !in_array($login->ID, $userids) )
+            $user_dropdown .= "<option value=\"{$login->ID}\">{$login->user_login}</option>";
+    $user_dropdown .= '</select>';
+    ?>
+    </ul>
+<?php if ( $go_delete ) : ?>
+    <p><?php _e('What should be done with posts and links owned by this user?'); ?></p>
+    }
+    $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
+    $user_dropdown = '<select name="reassign_user">';
+    foreach ($all_logins as $login) {
+        if ( $login->ID == $current_user->id || !in_array($login->ID, $userids) ) {
+            $user_dropdown .= "<option value=\"{$login->ID}\">{$login->user_login}</option>";
+        }
+    }
+    $user_dropdown .= '</select>';
+    ?>
+    </ul>
+<?php if($go_delete) : ?>
+    <p><?php _e('What should be done with posts and links owned by this user?'); ?></p>
     <ul style="list-style:none;">
         <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
 …
 case 'adduser':
+    check_admin_referer('add-user');
+    if ( ! current_user_can('create_users') )
+        wp_die(__('You can&#8217;t create users.'));
+    $user_id = add_user();
+    $update = 'add';
+    if ( is_wp_error( $user_id ) )
+        $add_user_errors = $user_id;
+    else {
+        $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_POST['user_login']), true));
+        $redirect = add_query_arg('usersearch', $new_user_login, $redirect);
+        wp_redirect(add_query_arg('update', $update, $redirect) . '#user-' . $user_id);
+    check_admin_referer();
+    $errors = add_user();
+    if(count($errors) == 0) {
+        header('Location: users.php?update=add');
         die();
+    }
 default:
+    wp_enqueue_script('admin-users');
+    include('admin-header.php');
+    // Query the users
+    $wp_user_search = new WP_User_Search($_GET['usersearch'], $_GET['userspage']);
+    // Make the user objects
+    foreach ( $wp_user_search->get_results() as $userid ) {
+    include ('admin-header.php');
+    $userids = $wpdb->get_col("SELECT ID FROM $wpdb->users;");
+    foreach($userids as $userid) {
         $tmp_user = new WP_User($userid);
         $roles = $tmp_user->roles;
         $role = array_shift($roles);
         $roleclasses[$role][$tmp_user->user_login] = $tmp_user;
+    }
+    if ( isset($_GET['update']) ) :
+    }
+    ?>
+    <?php
+    if (isset($_GET['update'])) :
         switch($_GET['update']) {
         case 'del':
+        case 'del_many':
+        ?>
+            <?php $delete_count = (int) $_GET['delete_count']; ?>
+            <div id="message" class="updated fade"><p><?php printf(__('%1$s %2$s deleted.'), $delete_count, __ngettext('user', 'users', $delete_count) ); ?></p></div>
+        ?>
+            <div id="message" class="updated fade"><p><?php _e('User deleted.'); ?></p></div>
         <?php
             break;
 …
             break;
+        }
+    endif; ?>
+<?php if ( is_wp_error( $errors ) ) : ?>
+    endif;
+    if ( isset($errors) ) : ?>
     <div class="error">
         <ul>
         <?php
+            foreach ( $errors->get_error_messages() as $message )
+                echo "<li>$message</li>";
+        foreach($errors as $error) echo "<li>$error</li>";
         ?>
         </ul>
     </div>
+<?php endif; ?>
+    <?php
+    endif;
+    ?>
+<form action="" method="post" name="updateusers" id="updateusers">
 <div class="wrap">
+    <?php if ( $wp_user_search->is_search() ) : ?>
+        <h2><?php printf(__('Users Matching "%s" by Role'), wp_specialchars($wp_user_search->search_term)); ?></h2>
+    <?php else : ?>
+        <h2><?php _e('User List by Role'); ?></h2>
+    <?php endif; ?>
+    <form action="" method="get" name="search" id="search">
+        <p><input type="text" name="usersearch" id="usersearch" value="<?php echo wp_specialchars($wp_user_search->search_term, 1); ?>" /> <input type="submit" value="<?php _e('Search     users &raquo;'); ?>" class="button" /></p>
+    </form>
+    <?php if ( is_wp_error( $wp_user_search->search_errors ) ) : ?>
+        <div class="error">
+            <ul>
+            <?php
+                foreach ( $wp_user_search->search_errors->get_error_messages() as $message )
+                    echo "<li>$message</li>";
+            ?>
+            </ul>
+        </div>
+    <?php endif; ?>
+<?php if ( $wp_user_search->get_results() ) : ?>
+    <?php if ( $wp_user_search->is_search() ) : ?>
+        <p><a href="users.php"><?php _e('&laquo; Back to All Users'); ?></a></p>
+    <?php endif; ?>
+    <h3><?php
+    if ( 0 == $wp_user_search->first_user && $wp_user_search->total_users_for_query <= 50 )
+        printf(__('%3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query);
+    else
+        printf(__('%1$s &#8211; %2$s of %3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query); ?></h3>
+    <?php if ( $wp_user_search->results_are_paged() ) : ?>
+        <div class="user-paging-text"><p><?php $wp_user_search->page_links(); ?></p></div>
+    <?php endif; ?>
+<form action="" method="post" name="updateusers" id="updateusers">
+<?php wp_nonce_field('bulk-users') ?>
+<table class="widefat">
+<?php
+foreach($roleclasses as $role => $roleclass) {
+    uksort($roleclass, "strnatcasecmp");
+?>
+<tr>
+<?php if ( !empty($role) ) : ?>
+    <th colspan="7"><h3><?php echo $wp_roles->role_names[$role]; ?></h3></th>
+<?php else : ?>
+    <th colspan="7"><h3><em><?php _e('No role for this blog'); ?></h3></th>
+<?php endif; ?>
+</tr>
+<tr class="thead">
+    <h2><?php _e('User List by Role'); ?></h2>
+  <table cellpadding="3" cellspacing="3" width="100%">
+    <?php
+    foreach($roleclasses as $role => $roleclass) {
+        ksort($roleclass);
+        ?>
+    <tr>
+    <th colspan="8" align="left">
+  <h3><?php echo $wp_roles->role_names[$role]; ?></h3>
+  </th></tr>
+    <tr>
     <th><?php _e('ID') ?></th>
     <th><?php _e('Username') ?></th>
 …
     <th><?php _e('E-mail') ?></th>
     <th><?php _e('Website') ?></th>
+    <th colspan="2" style="text-align: center"><?php _e('Actions') ?></th>
+</tr>
+</thead>
+<tbody id="role-<?php echo $role; ?>"><?php
+$style = '';
+foreach ( (array) $roleclass as $user_object ) {
+    $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
+    echo "\n\t" . user_row($user_object, $style);
+    <th><?php _e('Posts') ?></th>
+    <th>&nbsp;</th>
+    </tr>
+    <?php
+    $style = '';
+    foreach ($roleclass as $user_object) {
+        $email = $user_object->user_email;
+        $url = $user_object->user_url;
+        $short_url = str_replace('http://', '', $url);
+        $short_url = str_replace('www.', '', $short_url);
+        if ('/' == substr($short_url, -1))
+            $short_url = substr($short_url, 0, -1);
+        if (strlen($short_url) > 35)
+        $short_url =  substr($short_url, 0, 32).'...';
+        $style = ('class="alternate"' == $style) ? '' : 'class="alternate"';
+        $numposts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_author = '$user_object->ID' and post_status = 'publish'");
+        if (0 < $numposts) $numposts = "<a href='edit.php?author=$user_object->ID' title='" . __('View posts') . "'>$numposts</a>";
+        echo "
+<tr $style>
+    <td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' value='{$user_object->ID}' /> <label for='user_{$user_object->ID}'>{$user_object->ID}</label></td>
+    <td><label for='user_{$user_object->ID}'><strong>$user_object->user_login</strong></label></td>
+    <td><label for='user_{$user_object->ID}'>$user_object->first_name $user_object->last_name</label></td>
+    <td><a href='mailto:$email' title='" . sprintf(__('e-mail: %s'), $email) . "'>$email</a></td>
+    <td><a href='$url' title='website: $url'>$short_url</a></td>";
+    echo "<td align='right'>$numposts</td>";
+    echo '<td>';
+    if (current_user_can('edit_users'))
+        echo "<a href='user-edit.php?user_id=$user_object->ID' class='edit'>".__('Edit')."</a>";
+    echo '</td>';
+    echo '</tr>';
+    }
+    ?>
+<?php
+    }
+?>
+  </table>
+    <h2><?php _e('Update Users'); ?></h2>
+<?php
+$role_select = '<select name="new_role">';
+foreach($wp_roles->role_names as $role => $name) {
+    $role_select .= "<option value=\"{$role}\">{$name}</option>";
+}
+?>
+</tbody>
+<?php } ?>
+</table>
+<?php if ( $wp_user_search->results_are_paged() ) : ?>
+    <div class="user-paging-text"><p><?php $wp_user_search->page_links(); ?></p></div>
+<?php endif; ?>
+    <h3><?php _e('Update Selected'); ?></h3>
+    <ul style="list-style:none;">
+        <li><input type="radio" name="action" id="action0" value="delete" /> <label for="action0"><?php _e('Delete checked users.'); ?></label></li>
+        <li>
+            <input type="radio" name="action" id="action1" value="promote" /> <label for="action1"><?php _e('Set the Role of checked users to:'); ?></label>
+            <select name="new_role" onchange="getElementById('action1').checked = 'true'"><?php wp_dropdown_roles(); ?></select>
+        </li>
+    </ul>
+    <p class="submit" style="width: 420px">
+        <?php echo $referer; ?>
+        <input type="submit" value="<?php _e('Bulk Update &raquo;'); ?>" />
+    </p>
+</form>
+<?php endif; ?>
+</div>
+<?php
+    if ( is_wp_error($add_user_errors) ) {
+        foreach ( array('user_login' => 'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) {
+            $var = 'new_' . $var;
+            $$var = wp_specialchars(stripslashes($_POST[$formpost]));
+        }
+        unset($name);
+    }
+?>
+<div class="wrap">
+<h2 id="add-new-user"><?php _e('Add New User') ?></h2>
+<div class="narrow">
+<?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-register.php').'</p>'; ?>
+<form action="#add-new-user" method="post" name="adduser" id="adduser">
+<?php wp_nonce_field('add-user') ?>
+<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+    <tr>
+        <th scope="row" width="33%"><?php _e('Username (required)') ?><input name="action" type="hidden" id="action" value="adduser" /></th>
+        <td width="66%"><input name="user_login" type="text" id="user_login" value="<?php echo $new_user_login; ?>" /></td>
+    </tr>
+    <tr>
+        <th scope="row"><?php _e('First Name') ?> </th>
+        <td><input name="first_name" type="text" id="first_name" value="<?php echo $new_user_firstname; ?>" /></td>
+    </tr>
+    <tr>
+        <th scope="row"><?php _e('Last Name') ?> </th>
+        <td><input name="last_name" type="text" id="last_name" value="<?php echo $new_user_lastname; ?>" /></td>
+    </tr>
+    <tr>
+        <th scope="row"><?php _e('E-mail (required)') ?></th>
+        <td><input name="email" type="text" id="email" value="<?php echo $new_user_email; ?>" /></td>
+    </tr>
+    <tr>
+        <th scope="row"><?php _e('Website') ?></th>
+        <td><input name="url" type="text" id="url" value="<?php echo $new_user_uri; ?>" /></td>
+    </tr>
+<?php if ( apply_filters('show_password_fields', true) ) : ?>
+    <tr>
+        <th scope="row"><?php _e('Password (twice)') ?> </th>
+        <td><input name="pass1" type="password" id="pass1" />
+        <br />
+        <input name="pass2" type="password" id="pass2" /></td>
+    </tr>
+<?php endif; ?>
+    <tr>
+        <th scope="row"><?php _e('Role'); ?></th>
+        <td><select name="role" id="role">
+            <?php
+            if ( !$new_user_role )
+                $new_user_role = get_option('default_role');
+            wp_dropdown_roles($new_user_role);
+            ?>
+            </select>
+        </td>
+    </tr>
+</table>
+<p class="submit">
+    <?php echo $referer; ?>
+    <input name="adduser" type="submit" id="addusersub" value="<?php _e('Add User &raquo;') ?>" />
+</p>
+$role_select .= '</select>';
+?>
+  <ul style="list-style:none;">
+    <li><input type="radio" name="action" id="action0" value="delete" /> <label for="action0"><?php _e('Delete checked users.'); ?></label></li>
+    <li><input type="radio" name="action" id="action1" value="promote" /> <?php echo '<label for="action1">'.__('Set the Role of checked users to:')."</label> $role_select"; ?></li>
+  </ul>
+    <p class="submit"><input type="submit" value="<?php _e('Update &raquo;'); ?>" /></p>
 </div>
 </form>
+<?php if ( is_wp_error( $add_user_errors ) ) : ?>
+    <div class="error">
+        <?php
+            foreach ( $add_user_errors->get_error_messages() as $message )
+                echo "<p>$message</p>";
+        ?>
+    </div>
+<div class="wrap">
+<h2><?php _e('Add New User') ?></h2>
+<?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_settings('siteurl').'/wp-register.php').'</p>'; ?>
+<form action="" method="post" name="adduser" id="adduser">
+  <table class="editform" width="100%" cellspacing="2" cellpadding="5">
+    <tr>
+      <th scope="row" width="33%"><?php _e('Nickname') ?>
+      <input name="action" type="hidden" id="action" value="adduser" /></th>
+      <td width="66%"><input name="user_login" type="text" id="user_login" value="<?php echo $new_user_login; ?>" /></td>
+    </tr>
+    <tr>
+      <th scope="row"><?php _e('First Name') ?> </th>
+      <td><input name="first_name" type="text" id="first_name" value="<?php echo $new_user_firstname; ?>" /></td>
+    </tr>
+    <tr>
+      <th scope="row"><?php _e('Last Name') ?> </th>
+      <td><input name="last_name" type="text" id="last_name" value="<?php echo $new_user_lastname; ?>" /></td>
+    </tr>
+    <tr>
+      <th scope="row"><?php _e('E-mail') ?></th>
+      <td><input name="email" type="text" id="email" value="<?php echo $new_user_email; ?>" /></td>
+    </tr>
+    <tr>
+      <th scope="row"><?php _e('Website') ?></th>
+      <td><input name="url" type="text" id="url" value="<?php echo $new_user_uri; ?>" /></td>
+    </tr>
+<?php
+$show_password_fields = apply_filters('show_password_fields', true);
+if ( $show_password_fields ) :
+?>
+    <tr>
+      <th scope="row"><?php _e('Password (twice)') ?> </th>
+      <td><input name="pass1" type="password" id="pass1" />
+      <br />
+      <input name="pass2" type="password" id="pass2" /></td>
+    </tr>
 <?php endif; ?>
+<div id="ajax-response"></div>
+  </table>
+  <p class="submit">
+    <input name="adduser" type="submit" id="adduser" value="<?php _e('Add User') ?> &raquo;" />
+  </p>
+  </form>
 </div>
+<?php
+    <?php
 break;
+} // end of the $action switch
+}
 include('admin-footer.php');

trunk/wp-admin/wp-admin.css

-                      r4431
+                      r3503
     background: #c00;
     color: #fff;
+}
-#devnews h4 {
-    font-family: Georgia, "Times New Roman", Times, serif;
-    font-size: 18px;
-    font-weight: normal;
+}
 …
+}
-#planetnews li .post {
-    font-family: Georgia, "Times New Roman", Times, serif;
-    font-size: 18px;
-    display: block;
-    height: 60px;
-    overflow: hidden;
+}
-#planetnews .hidden {
-    display: none;
+}
-.readmore {
-    clear: both;
-    text-align: right;
-    margin-right: 5em;
+}
-.widefat {
-    width: 100%;
+}
-.widefat td, .widefat th {
-    padding: 5px 6px;
+}
-.widefat th {
-    text-align: left;
+}
-.plugins p {
-    margin: 4px;
-    padding: 0;
+}
-.plugins .name {
-    font-size: 16px;
+}
-.import-system {
-    font-size: 16px;
+}
-thead, .thead {
-    background: #dfdfdf
+}
-#import-upload-form {
-    margin: auto;
-    background: #eee;
-    padding: 1em;
+}
 a.edit, a.delete, a.edit:hover, a.delete:hover {
     border-bottom: none;
 …
+}
+fieldset span.cat-nest {
+    display: block;
+    margin-left: 10px;
+}
 fieldset.options {
     padding: 1em;
 …
 fieldset.options legend {
+    font-size: 1.5em;
+    font-weight: bold;
+    font-family: Georgia, "Times New Roman", Times, serif;
+    font-size: 16px;
+}
 …
 h2 {
     border-bottom: .5em solid #e5f3ff;
+    border-bottom: .5em solid #f0f8ff;
     color: #333;
     font: normal 32px/5px serif;
+    font: normal 30px/5px serif;
     margin: 5px 10px;
+}
+h2 small.quickjump {
+    display: block;
+    text-align: right;
+}
+h2 small.quickjump a {
+    text-decoration: none;
+    border-bottom: 0;
+    font-size: 15px;
+    background: #f0f8ff;
+    padding: 5px 10px;
+}
 …
 p, li, dl, dd, dt {
     line-height: 140%;
+    line-height: 130%;
+}
 …
     padding: 0px;
     margin-bottom: 16px;
     height: 17em;
+    height: 15em;
     width: 100%;
 /*  overflow-y: hidden;*/
 …
 .commentlist li {
+    border-bottom: 1px solid #ccc;
+    padding: 1em 1em .2em;
+    margin: 0;
+}
+.commentlist p {
+    padding: 0;
+    margin: 0 0 .8em;
+    border-bottom: 1px solid #369;
+    padding: .3em 1em;
+}
 …
+}
 .submit input, .submit input:focus, .button, .button:focus {
+.submit input, .submit input:focus, .button {
     background: url( images/fade-butt.png );
     border: 3px double #999;
 …
+}
-.button, .button:focus {
-    padding: 0.15em;
+}
-* html .button {
-    padding: 0;
+}
 .submit, .editform th, #postcustomsubmit {
     text-align: right;
 …
     width: 33%;
     text-align: right;
-    font-size: 1.3em;
-    font-weight: normal;
+}
 …
+}
+.approve {
+    display: none;
+}
+.unapproved .approve {
+    display: inline;
+}
+.unapproved .unapprove {
+    display: none;
+}
+.updated, .confirm {
+    background: #CFEBF7 url(images/notice.gif) no-repeat 1em;
+.updated {
+    background: #CFEBF7 url(images/notice.gif) no-repeat 1em ;
     border: 1px solid #2580B2;
     margin: 1em 5% 10px;
 …
     clear: both;
     margin: 15px 5%;
+    padding: 1em;
+}
+.narrow {
+    width: 450px;
+    margin: auto;
+}
+.narrow p {
+    line-height: 150%;
+    padding: .5em 1em;
+}
 .wrap h2 {
     margin: .4em 0 .5em;
+    margin: .8em 0 .5em;
     clear: both;
+}
+* html .wrap h2 {
+    margin-top: 1em;
+}
+table .vers {
+table .vers, table .name {
     text-align: center;
+}
-textarea.all-options, input.all-options {
-    width: 250px;
+}
-input.disabled, textarea.disabled {
-    background: #ccc;
+}
 #adminmenu {
     background: #83B4D8;
+    background: #6da6d1;
     border-top: 3px solid #448abd;
     margin: 0;
+    padding: .2em .2em .3em 2em;
+}
+    padding: .2em .2em .2em 2em;
+}
 #adminmenu .current, #submenu .current {
     font-weight: bold;
-    text-decoration: none;
+}
 …
     margin: 0;
     padding: 3px 5px;
     border-bottom: none;
+}
 #adminmenu a:hover, #adminmenu a.current {
+    text-decoration: none;
+}
+#adminmenu a:hover, .current {
     background: #ddeaf4;
     color: #333;
 …
+}
+#adminmenu a.current {
+    background: #0d324f;
+    border-right: 2px solid #4f96c8;
+    border-top: 1px solid #96c0de;
+    color: #fff;
+    padding-bottom: 8px;
+}
+#submenu, #minisub {
+#submenu {
     background: #0d324f;
     border-bottom: none;
     margin: 0;
     padding: 3px 2em 0 3em;
-    height: 25px;
+}
-#minisub {
-    height: 6px;
+}
 …
     color: #fff;
     font-size: 12px;
     padding: .3em .4em .4em;
+    padding: .3em .4em .33em;
+}
 …
 #submenu li {
     line-height: 180%;
+    line-height: 170%;
+}
 …
+}
+#postdiv, #titlediv, #guiddiv {
+#titlediv, #guiddiv {
+    margin: 0 8px 0 0;
+    padding: 0px;
+}
+#postdiv {
     margin: 0 8px 0 0;
     padding: 0px;
 …
+}
-#postdivrich #content {
-    padding: .7em;
-    line-height: 140%;
+}
 #titlediv input, #guiddiv input {
     margin: 0px;
     width: 100%;
+}
+#quicktags {
+    margin-left: -1px;
+}
 …
+}
 input.delete:hover {
+#deletepost:hover {
     background: #ce0000;
     color: #fff;
+}
-#deletebookmarks:hover {
-    background: #ce0000;
-    color: #fff;
+}
-#postdivrich #quicktags {
-    background: #f0f0ee;
-    padding: 0px;
-    border: 1px solid #ccc;
-    border-bottom: none;
+}
-#postdiv #quicktags {
-    padding-right: 6px;
+}
-#postdivrich #quicktags {
-    display: none;
+}
-#quicktags #ed_toolbar {
-    padding: 0px 2px;
+}
-#ed_toolbar input {
-    background: #fff url( images/fade-butt.png ) repeat-x 0px -2px;
-    margin: 3px 2px 2px;
+}
 …
 #quicktags #ed_code {
     font-family: "Courier New", Courier, mono;
-    margin-bottom: 3px;
+}
 #title {
+    font-size: 1.7em;
+    padding: 4px;
+    font-size: 1.5em;
+}
 …
     clear: both;
     text-align: center;
+    width: 500px;
+    margin: auto;
+    height: 100px;
+}
+#footer .docs {
+    padding-top: 19px;
+    line-height: 160%;
+}
+#footer .docs a {
+    text-decoration: underline;
+}
+#footer .logo {
+    float: left;
+}
+#login {
+    background: #fff;
+    border: 1px solid #a2a2a2;
+    margin: 5em auto;
+    padding: 1.5em;
+    width: 25em;
+}
+#login #login_error {
+    background: #c00;
+    border: 1px solid #a40000;
+    color: #fff;
+    font-size: 16px;
+    font-weight: bold;
+    padding: .5em;
+    text-align: center;
+}
+#login h1 {
+    background: url(images/wordpress-logo.png) no-repeat top left;
+    margin-top: 0;
+}
+#login h1 a {
+    display: block;
+    text-indent: -1000px;
+    height: 66px;
+    border-bottom: none;
+}
+#login input {
+    padding: 3px;
+}
+#login ul {
+    list-style: none;
     margin: 0;
     padding: 0;
+}
+#login {
+    position: relative;
+    background: url('images/login-bkg-tile.gif') no-repeat top center;
+    color: #fff;
+    margin: 5em auto;
+    padding: 20px 50px 0;
+    width: 325px;
+}
+#login #login_error {
+    background: #0e3350;
+    border: 1px solid #2571ab;
+    color: #ebcd4e;
+    font-size: 11px;
+    font-weight: bold;
+    padding: .6em;
+#login ul li {
+    display: inline;
+    margin-left: 1.4em;
     text-align: center;
+}
+#login #login_error a {
+    color: #ebcd4e;
+    border-color: #ebcd4e;
+}
+#login #send {
+    color: #fff;
+    text-align: left;
+    font-weight: normal;
+    font-size: 1.1em;
+}
+#login h1 a {
+    margin: 0 auto;
+    height: 88px;
+    width: 320px;
+    display: block;
+    border-bottom: none;
+}
+#login .hide {
+    display: none;
+}
+#login .message {
+    font-size: 10pt;
+    text-align: center;
+}
+#login .register {
+    font-size: 20px;
+}
+#login input {
+    padding: 4px;
+}
+#login ul {
+    background: url('images/login-bkg-bottom.gif') no-repeat bottom center;
+    list-style: none;
+    margin: 0 -50px;
+    padding: 10px 50px 25px;;
+}
+#login ul:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+#login ul li {
+    float: left;
+    font-size: 12px;
+    padding: 5px 0;
+    text-align: center;
+}
+#login ul li a {
+    display: block;
+    color: #84c4f0;
+    border: none;
+    padding: 4px 1px 5px;
+    width: 160px;
+}
+#login ul li a:hover {
+    background: #0e3350;
+    border: 1px solid #2571ab;
+    padding: 3px 0 4px;
+    color: #fff;
+}
+#login .input {
+    font-size: 1.8em;
+    margin-top: 3px;
+    width: 97%;
+}
+#login p label {
+    font-size: 11px;
+#login #log, #pwd {
+    font-size: 1.7em;
+    width: 80%;
+}
 #login #submit {
+    margin: 0;
+    font-size: 15px;
+}
+.plugins p {
+}
+#login .fullwidth {
+    width: 320px;
+}
+#searchform {
+    float: left;
+    margin-right: 1em;
+    width: 18em;
+}
+#viewarc {
+    float: left;
+    width: 23em;
+    margin-bottom: 1em;
+}
+#viewcat {
+    float: left;
+    width: 30em;
+    margin-bottom: 1em;
+    font-size: 1.7em;
+}
 …
     float: right;
     width: 170px;
+    overflow: hidden;
+}
+#templateside h3, #postcustom p.submit {
+}
+#templateside h3, #postcustom p {
     margin: 0;
+}
 …
 #zeitgeist {
     background: #eee;
     border: 1px solid #c5c5c5;
+    border: 1px solid #69c;
     float: right;
     font-size: 90%;
 …
+}
-* html #zeitgeist h2 {
-    padding-top: 10px;
+}
 #zeitgeist h2 {
     margin-top: .4em;
 …
 .alternate.active .name {
     background: #8B8;
+}
-#namediv, #emaildiv, #uridiv {
-    float: left;
+}
-#ajax-response {
-    padding: .5em;
+}
 …
+}
+#categorydiv ul {
+    list-style: none;
+    padding: 0;
+    margin-left: 10px;
+}
+#categorychecklist {
+#categorydiv div div {
     height: 12em;
     overflow: auto;
-    margin-top: 8px;
+}
-#categorychecklist li {
-    margin: 0;
-    padding: 0;
+}
 #ajaxcat input {
     border: 1px solid #ccc;
+}
-#your-profile #rich_editing {
-    border: none;
-    background: #fff;
+}
 …
     float: left;
     width: 40%;
     padding: .5em 2em 1em;
     margin: 1em 1em 1em 0;
+    padding: .5em 2em;
+    margin: 1em;
+}
 …
+}
-#moremeta fieldset.dbx-box-closed {
-    background: url(images/box-butt.gif) no-repeat bottom;
-    padding-bottom: 9px;
+}
 /* handles */
 …
+}
-#advancedstuff h3.dbx-handle {
-    margin-left: 7px;
-    margin-bottom: -7px;
-    padding: 6px 1em 0 3px;
-    height: 19px;
-    font-size: 12px;
-    background: #2685af url(images/box-head-right.gif) no-repeat top right;
+}
-#advancedstuff div.dbx-handle-wrapper {
-    margin: 0 0 0 -7px;
-    background: #fff url(images/box-head-left.gif) no-repeat top left;
+}
-#advancedstuff div.dbx-content {
-    margin-left: 8px;
-    background: url(images/box-bg-right.gif) repeat-y right;
-    padding: 10px 10px 15px 0px;
+}
-#postexcerpt div.dbx-content {
-    margin-right: 0;
-    padding-right: 17px;
+}
-#advancedstuff div.dbx-content-wrapper {
-    margin-left: -7px;
-    margin-right: 0;
-    background: url(images/box-bg-left.gif) repeat-y left;
+}
-#advancedstuff fieldset.dbx-box {
-    padding-bottom: 9px;
-    margin-left: 6px;
-    background: url(images/box-butt-right.gif) no-repeat bottom right;
+}
-#advancedstuff div.dbx-box-wrapper {
-    background: url(images/box-butt-left.gif) no-repeat bottom left;
+}
-#advancedstuff .dbx-box-closed div.dbx-content-wrapper {
-    padding-bottom: 2px;
-    background: url(images/box-butt-left.gif) no-repeat bottom left;
+}
-#advancedstuff .dbx-box {
-    background: url(images/box-butt-right.gif) no-repeat bottom right;
+}
 /* handle cursors */
 .dbx-handle-cursor {
     cursor: move;
+}
 /* toggle images */
 a.dbx-toggle, a.dbx-toggle:visited {
 …
     height: 22px;
     width: 22px;
-    top: 3px;
-    right: 5px;
     background-position: 0 -3px;
+}
 …
     height: 22px;
     width: 22px;
-    top: 3px;
-    right: 5px;
     background-position: 0 -28px;
+}
 …
+}
+#newcat {
+    width: 120px;
+    margin-right: 5px;
+}
+input #catadd {
+    background: #a4a4a4;
+#newcat { width: 120px; margin-right: 5px; }
+input#catadd {  background: #a4a4a4;
     border-bottom: 1px solid #898989;
     border-left: 1px solid #bcbcbc;
 …
     margin-bottom: 2px;
     text-align: center;
+    width: 37px;
+}
+    width: 37px; }
 #howto {
     font-size: 11px;
 …
     display: block;
+}
 #jaxcat {
     margin: 0;
     padding: 0;
+}
-#ajax-response.alignleft {
-    margin-left: 2em;
+}
-#postdivrich #edButtons {
-    padding-left: 3px;
+}
-#postdivrich #content, #postdivrich #content:active {
-    border: 1px solid #ccc;
+}
-#edButtons input, #edButtons input:active {
-    margin: 0px 2px -1px;
+}
-#edButtons input.edButtonFore, #edButtons input.edButtonFore:active {
-    background: #f0f0ee;
-    border-bottom: 1px solid #f0f0ee;
+}
-#edButtons input.edButtonBack, #edButtons input.edButtonBack:active {
-    background: #fff url( images/fade-butt.png ) repeat-x 0px 15px;
-    border-bottom: 1px solid #ccc;
+}
-.page-numbers {
-    padding: 4px 7px;
-    border: 1px solid #fff;
-    margin-right: 3px;
+}
-a.page-numbers {
-    border: 1px solid #ccc;
+}
-a.page-numbers:hover {
-    border: 1px solid #999;
+}
-.page-numbers.current {
-    border: 1px solid #999;
-    font-weight: bold;
+}

trunk/wp-admin/xfn.js

r4431	r3503
39	39	var aInputs = document.getElementsByTagName('input');
40	40
41		for (var i = 0; i < aInputs.length; i++) {
	41	for (var i = 0; i < aInputs.length; i++) {
42	42	aInputs[i].onclick = aInputs[i].onkeyup = upit;
43	43	}

trunk/wp-atom.php

-                      r4431
+                      r3503
+}
 header('Content-type: application/atom+xml; charset=' . get_option('blog_charset'), true);
+header('Content-type: application/atom+xml; charset=' . get_settings('blog_charset'), true);
 $more = 1;
 ?>
 <?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
 <feed version="0.3"
   xmlns="http://purl.org/atom/ns#"
 …
         <?php the_category_rss('rdf') ?>
         <summary type="text/plain" mode="escaped"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
 <?php if ( !get_option('rss_use_excerpt') ) : ?>
+<?php if ( !get_settings('rss_use_excerpt') ) : ?>
         <content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
 <?php endif; ?>
 …
 <?php do_action('atom_entry'); ?>
     </entry>
     <?php $items_count++; if (($items_count == get_option('posts_per_rss')) && empty($m)) { break; } } } ?>
+    <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
 </feed>

trunk/wp-blog-header.php

-                      r4431
+                      r3503
     if ( strstr( $_SERVER['PHP_SELF'], 'wp-admin') ) $path = '';
     else $path = 'wp-admin/';
+  require_once( dirname(__FILE__) . '/wp-includes/functions.php');
+  wp_die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='{$path}setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.", "WordPress &rsaquo; Error");
+    die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='{$path}setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
+}

trunk/wp-comments-post.php

-                      r4431
+                      r3503
 } elseif ( 'closed' ==  $status->comment_status ) {
     do_action('comment_closed', $comment_post_ID);
     wp_die( __('Sorry, comments are closed for this item.') );
+    die( __('Sorry, comments are closed for this item.') );
 } elseif ( 'draft' == $status->post_status ) {
     do_action('comment_on_draft', $comment_post_ID);
 …
 // If the user is logged in
 $user = wp_get_current_user();
 if ( $user->ID ) :
     $comment_author       = $wpdb->escape($user->display_name);
     $comment_author_email = $wpdb->escape($user->user_email);
     $comment_author_url   = $wpdb->escape($user->user_url);
+get_currentuserinfo();
+if ( $user_ID ) :
+    $comment_author       = $wpdb->escape($user_identity);
+    $comment_author_email = $wpdb->escape($user_email);
+    $comment_author_url   = $wpdb->escape($user_url);
 else :
     if ( get_option('comment_registration') )
         wp_die( __('Sorry, you must be logged in to post a comment.') );
+        die( __('Sorry, you must be logged in to post a comment.') );
 endif;
 $comment_type = '';
 if ( get_option('require_name_email') && !$user->ID ) {
+if ( get_settings('require_name_email') && !$user_ID ) {
     if ( 6 > strlen($comment_author_email) || '' == $comment_author )
         wp_die( __('Error: please fill the required fields (name, email).') );
+        die( __('Error: please fill the required fields (name, email).') );
     elseif ( !is_email($comment_author_email))
         wp_die( __('Error: please enter a valid email address.') );
+        die( __('Error: please enter a valid email address.') );
+}
 if ( '' == $comment_content )
     wp_die( __('Error: please type a comment.') );
+    die( __('Error: please type a comment.') );
 $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'user_ID');
 $comment_id = wp_new_comment( $commentdata );
+wp_new_comment( $commentdata );
+$comment = get_comment($comment_id);
+if ( !$user->ID ) :
+    setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
+    setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
+    setcookie('comment_author_url_' . COOKIEHASH, clean_url($comment->comment_author_url), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
+if ( !$user_ID ) :
+    setcookie('comment_author_' . COOKIEHASH, stripslashes($comment_author), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
+    setcookie('comment_author_email_' . COOKIEHASH, stripslashes($comment_author_email), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
+    setcookie('comment_author_url_' . COOKIEHASH, stripslashes($comment_author_url), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
 endif;
+$location = ( empty($_POST['redirect_to']) ? get_permalink($comment_post_ID) : $_POST['redirect_to'] ) . '#comment-' . $comment_id;
+$location = apply_filters('comment_post_redirect', $location, $comment);
+$location = ( empty( $_POST['redirect_to'] ) ) ? get_permalink( $comment_post_ID ) : $_POST['redirect_to'];
 wp_redirect($location);
+wp_redirect( $location );
 ?>

trunk/wp-commentsrss2.php

-                      r4431
+                      r3503
+}
 header('Content-type: text/xml;charset=' . get_option('blog_charset'), true);
+header('Content-type: text/xml;charset=' . get_settings('blog_charset'), true);
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
+echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>';
 ?>
 <!-- generator="wordpress/<?php echo $wp_version ?>" -->
 …
             comment_author_url, comment_date, comment_date_gmt, comment_content, comment_post_ID,
             $wpdb->posts.ID, $wpdb->posts.post_password FROM $wpdb->comments
             LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE comment_post_ID = '" . get_the_ID() . "'
             AND $wpdb->comments.comment_approved = '1' AND $wpdb->posts.post_status = 'publish'
+            LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE comment_post_ID = '$id'
+            AND $wpdb->comments.comment_approved = '1' AND $wpdb->posts.post_status IN ('publish', 'static', 'object')
             AND post_date_gmt < '" . gmdate("Y-m-d H:i:59") . "'
             ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss') );
+            ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss') );
         } else { // if no post id passed in, we'll just ue the last 10 comments.
             $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_author_email,
             comment_author_url, comment_date, comment_date_gmt, comment_content, comment_post_ID,
             $wpdb->posts.ID, $wpdb->posts.post_password FROM $wpdb->comments
             LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE $wpdb->posts.post_status = 'publish'
+            LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE $wpdb->posts.post_status IN ('publish', 'static', 'object')
             AND $wpdb->comments.comment_approved = '1' AND post_date_gmt < '" . gmdate("Y-m-d H:i:s") . "'
             ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss') );
+            ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss') );
+        }
     // this line is WordPress' motor, do not delete it.
         if ($comments) {
             foreach ($comments as $comment) {
-                $GLOBALS['comment'] =& $comment;
                 // Some plugins may need to know the metadata
                 // associated with this comment's post:
 …
             $title = apply_filters('the_title_rss', $title);
             printf(__('Comment on %1$s by %2$s'), $title, get_comment_author_rss());
         } else {
             printf(__('by: %s'), get_comment_author_rss());
+        } else {
+            printf(__('by: %s'), get_comment_author_rss());
         } ?></title>
         <link><?php comment_link() ?></link>
 …
     </item>
 <?php
+            }
+            }
+        }
+    }

trunk/wp-config-sample.php

Property svn:eol-style changed from native to CRLF

trunk/wp-content/plugins/hello.php

r4431	r3503
42	42	$lyrics = explode("\n", $lyrics);
43	43	// And then randomly choose a line
44		$chosen = wptexturize( $lyrics[ mt_rand(0, count($lyrics) ~~- 1~~) ] );
	44	$chosen = wptexturize( $lyrics[ mt_rand(0, count($lyrics) ) ] );
45	45
46	46	// This just echoes the chosen line, we'll position it later

trunk/wp-content/themes/classic/comments-popup.php

-                      r4431
+                      r3503
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
      <title><?php echo get_option('blogname'); ?> - <?php echo sprintf(__("Comments on %s"), the_title('','',false)); ?></title>
+     <title><?php echo get_settings('blogname'); ?> - <?php echo sprintf(__("Comments on %s"), the_title('','',false)); ?></title>
     <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
+    <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
     <style type="text/css" media="screen">
         @import url( <?php bloginfo('stylesheet_url'); ?> );
 …
 <body id="commentspopup">
 <h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
+<h1 id="header"><a href="" title="<?php echo get_settings('blogname'); ?>"><?php echo get_settings('blogname'); ?></a></h1>
 <h2 id="comments"><?php _e("Comments"); ?></h2>
 <p><a href="<?php echo get_option('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
+<p><a href="<?php echo get_settings('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
 <?php if ('open' == $post->ping_status) { ?>
 <p><?php _e("The <abbr title=\"Universal Resource Locator\">URL</abbr> to TrackBack this entry is:"); ?> <em><?php trackback_url() ?></em></p>
+<p><?php _e("The <acronym title=\"Uniform Resource Identifier\">URI</acronym> to TrackBack this entry is:"); ?> <em><?php trackback_url() ?></em></p>
 <?php } ?>
 <?php
 // this line is WordPress' motor, do not delete it.
+$commenter = wp_get_current_commenter();
+extract($commenter);
+$comment_author = (isset($_COOKIE['comment_author_' . COOKIEHASH])) ? trim($_COOKIE['comment_author_'. COOKIEHASH]) : '';
+$comment_author_email = (isset($_COOKIE['comment_author_email_'. COOKIEHASH])) ? trim($_COOKIE['comment_author_email_'. COOKIEHASH]) : '';
+$comment_author_url = (isset($_COOKIE['comment_author_url_'. COOKIEHASH])) ? trim($_COOKIE['comment_author_url_'. COOKIEHASH]) : '';
 $comments = get_approved_comments($id);
 $commentstatus = get_post($id);
 …
 <p><?php _e("Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed:"); ?> <code><?php echo allowed_tags(); ?></code></p>
 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+<form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
     <p>
       <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
 …
     <p>
       <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
        <label for="url"><?php _e("<abbr title=\"Universal Resource Locator\">URL</abbr>"); ?></label>
+       <label for="url"><?php _e("<acronym title=\"Uniform Resource Identifier\">URI</acronym>"); ?></label>
     </p>
 …
 <script type="text/javascript">
 <!--
 document.onkeypress = function esc(e) {
+document.onkeypress = function esc(e) {
     if(typeof(e) == "undefined") { e=event; }
     if (e.keyCode == 27) { self.close(); }

trunk/wp-content/themes/classic/comments.php

r4431	r3503
28	28	<p><?php comments_rss_link(__('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.')); ?>
29	29	<?php if ( pings_open() ) : ?>
30		<a href="<?php trackback_url() ?>" rel="trackback"><?php _e('TrackBack <abbr title="Uni~~versal Resource Locator">URL~~</abbr>'); ?></a>
	30	<a href="<?php trackback_url() ?>" rel="trackback"><?php _e('TrackBack <abbr title="Uniform Resource Identifier">URI</abbr>'); ?></a>
31	31	<?php endif; ?>
32	32	</p>

trunk/wp-content/themes/classic/header.php

-                      r4431
+                      r3503
     <title><?php bloginfo('name'); ?><?php wp_title(); ?></title>
     <meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats please -->
 …
     <link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>" />
     <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="<?php bloginfo('atom_url'); ?>" />
     <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
     <?php wp_get_archives('type=monthly&format=link'); ?>

trunk/wp-content/themes/classic/index.php

-                      r4431
+                      r3503
 <?php the_date('','<h2>','</h2>'); ?>
 <div class="post" id="post-<?php the_ID(); ?>">
      <h3 class="storytitle"><a href="<?php the_permalink() ?>" rel="bookmark"><?php the_title(); ?></a></h3>
     <div class="meta"><?php _e("Filed under:"); ?> <?php the_category(',') ?> &#8212; <?php the_author() ?> @ <?php the_time() ?> <?php edit_post_link(__('Edit This')); ?></div>
     <div class="storycontent">
         <?php the_content(__('(more...)')); ?>
     </div>
     <div class="feedback">
             <?php wp_link_pages(); ?>

trunk/wp-content/themes/classic/sidebar.php

-                      r4431
+                      r3503
 <ul>
+    <?php wp_list_pages('title_li=' . __('Pages:')); ?>
+    <?php wp_list_bookmarks('title_after=&title_before='); ?>
+    <?php wp_list_categories('title_li=' . __('Categories:')); ?>
+    <?php wp_list_pages(); ?>
+    <?php get_links_list(); ?>
+ <li id="categories"><?php _e('Categories:'); ?>
+    <ul>
+    <?php wp_list_cats(); ?>
+    </ul>
+ </li>
  <li id="search">
    <label for="s"><?php _e('Search:'); ?></label>
    <form id="searchform" method="get" action="<?php bloginfo('home'); ?>">
+   <label for="s"><?php _e('Search:'); ?></label>
+   <form id="searchform" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
     <div>
         <input type="text" name="s" id="s" size="15" /><br />

trunk/wp-content/themes/default/archive.php

-                      r4431
+                      r3503
          <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
 <?php /* If this is a category archive */ if (is_category()) { ?>
+<?php /* If this is a category archive */ if (is_category()) { ?>
         <h2 class="pagetitle">Archive for the '<?php echo single_cat_title(); ?>' Category</h2>
       <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
         <h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
      <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
         <h2 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h2>
 …
         <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
         <h2 class="pagetitle">Archive for <?php the_time('Y'); ?></h2>
+      <?php /* If this is a search */ } elseif (is_search()) { ?>
+        <h2 class="pagetitle">Search Results</h2>
       <?php /* If this is an author archive */ } elseif (is_author()) { ?>
         <h2 class="pagetitle">Author Archive</h2>
 …
                 <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h3>
                 <small><?php the_time('l, F jS, Y') ?></small>
                 <div class="entry">
                     <?php the_content() ?>
                 </div>
                 <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
             </div>
         <?php endwhile; ?>
 …
             <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
         </div>
     <?php else : ?>
 …
     <?php endif; ?>
     </div>

trunk/wp-content/themes/default/archives.php

-                      r4431
+                      r3503
 <h2>Archives by Subject:</h2>
   <ul>
      <?php wp_list_categories(); ?>
+     <?php wp_list_cats(); ?>
   </ul>
 </div>
+</div>
 <?php get_footer(); ?>

trunk/wp-content/themes/default/attachment.php

-                      r4431
+                      r3503
     <div id="content" class="widecolumn">
   <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
         <div class="navigation">
             <div class="alignleft">&nbsp;</div>
 …
         <div class="post" id="post-<?php the_ID(); ?>">
             <h2><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &raquo; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
             <div class="entry">
+            <div class="entrytext">
                 <p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
                 <?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
                 <?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
+                <?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?>
                 <p class="postmetadata alt">
                     <small>
 …
                         and is filed under <?php the_category(', ') ?>.
                         You can follow any responses to this entry through the <?php comments_rss_link('RSS 2.0'); ?> feed.
                         <?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
                             // Both Comments and Pings are open ?>
                             You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(true); ?>" rel="trackback">trackback</a> from your own site.
                         <?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
                             // Only Pings are Open ?>
                             Responses are currently closed, but you can <a href="<?php trackback_url(true); ?> " rel="trackback">trackback</a> from your own site.
                         <?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
                             // Comments are open, Pings are not ?>
                             You can skip to the end and leave a response. Pinging is currently not allowed.
                         <?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
                             // Neither Comments, nor Pings are open ?>
                             Both comments and pings are currently closed.
+                            Both comments and pings are currently closed.
                         <?php } edit_post_link('Edit this entry.','',''); ?>
                     </small>
                 </p>
             </div>
         </div>
     <?php comments_template(); ?>
     <?php endwhile; else: ?>
         <p>Sorry, no attachments matched your criteria.</p>
 <?php endif; ?>
     </div>

trunk/wp-content/themes/default/comments-popup.php

-                      r4431
+                      r3503
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
      <title><?php echo get_option('blogname'); ?> - Comments on <?php the_title(); ?></title>
+     <title><?php echo get_settings('blogname'); ?> - Comments on <?php the_title(); ?></title>
     <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
+    <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
     <style type="text/css" media="screen">
         @import url( <?php bloginfo('stylesheet_url'); ?> );
 …
 <body id="commentspopup">
 <h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
+<h1 id="header"><a href="" title="<?php echo get_settings('blogname'); ?>"><?php echo get_settings('blogname'); ?></a></h1>
 <h2 id="comments">Comments</h2>
 <p><a href="<?php echo get_option('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
+<p><a href="<?php echo get_settings('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
 <?php if ('open' == $post->ping_status) { ?>
 <p>The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
+<p>The <acronym title="Uniform Resource Identifier">URI</acronym> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
 <?php } ?>
 <?php
 // this line is WordPress' motor, do not delete it.
+$commenter = wp_get_current_commenter();
+extract($commenter);
+$comment_author = (isset($_COOKIE['comment_author_' . COOKIEHASH])) ? trim($_COOKIE['comment_author_'. COOKIEHASH]) : '';
+$comment_author_email = (isset($_COOKIE['comment_author_email_'. COOKIEHASH])) ? trim($_COOKIE['comment_author_email_'. COOKIEHASH]) : '';
+$comment_author_url = (isset($_COOKIE['comment_author_url_'. COOKIEHASH])) ? trim($_COOKIE['comment_author_url_'. COOKIEHASH]) : '';
 $comments = get_approved_comments($id);
 $post = get_post($id);
 …
 <p>Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+<form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
     <p>
       <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
 …
     <p>
       <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
        <label for="url"><abbr title="Universal Resource Locator">URL</abbr></label>
+       <label for="url"><acronym title="Uniform Resource Identifier">URI</acronym></label>
     </p>
 …
 <script type="text/javascript">
 <!--
 document.onkeypress = function esc(e) {
+document.onkeypress = function esc(e) {
     if(typeof(e) == "undefined") { e=event; }
     if (e.keyCode == 27) { self.close(); }

trunk/wp-content/themes/default/comments.php

-                      r4431
+                      r3503
             if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
                 ?>
                 <p class="nocomments">This post is password protected. Enter the password to view comments.<p>
                 <?php
                 return;
 …
         </li>
     <?php /* Changes every other comment to a different class */
+    <?php /* Changes every other comment to a different class */
         if ('alt' == $oddcomment) $oddcomment = '';
         else $oddcomment = 'alt';
 …
   <?php if ('open' == $post->comment_status) : ?>
         <!-- If comments are open, but there are no comments. -->
      <?php else : // comments are closed ?>
         <!-- If comments are closed. -->
         <p class="nocomments">Comments are closed.</p>
     <?php endif; ?>
 <?php endif; ?>

trunk/wp-content/themes/default/footer.php

r4431	r3503
2	2	<hr />
3	3	<div id="footer">
4		~~<!-- If you'd like to support WordPress, having the "powered by" link someone on your blog is the best way, it's our only promotion or advertising. -->~~
5	4	<p>
6	5	<?php bloginfo('name'); ?> is proudly powered by

trunk/wp-content/themes/default/functions.php

-                      r4431
+                      r3503
 function kubrick_header_image() {
     return apply_filters('kubrick_header_image', get_option('kubrick_header_image'));
+    return apply_filters('kubrick_header_image', get_settings('kubrick_header_image'));
+}
 …
 function kubrick_header_color() {
     return apply_filters('kubrick_header_color', get_option('kubrick_header_color'));
+    return apply_filters('kubrick_header_color', get_settings('kubrick_header_color'));
+}
 …
     if ( false === $color )
         return 'white';
     return $color;
+}
 function kubrick_header_display() {
     return apply_filters('kubrick_header_display', get_option('kubrick_header_display'));
+    return apply_filters('kubrick_header_display', get_settings('kubrick_header_display'));
+}
 …
                     if ( isset($_REQUEST['toggledisplay']) ) {
                         if ( false === get_option('kubrick_header_display') )
+                        if ( false === get_settings('kubrick_header_display') )
                             update_option('kubrick_header_display', 'none');
                         else
 …
+                }
             } else {
                 if ( isset($_REQUEST['headerimage']) ) {
                     if ( '' == $_REQUEST['headerimage'] )
 …
                         update_option('kubrick_header_image', $_REQUEST['headerimage']);
+                }
                 if ( isset($_REQUEST['fontcolor']) ) {
                     if ( '' == $_REQUEST['fontcolor'] )
 …
                         update_option('kubrick_header_color', $_REQUEST['fontcolor']);
+                }
                 if ( isset($_REQUEST['fontdisplay']) ) {
                     if ( '' == $_REQUEST['fontdisplay'] || 'inline' == $_REQUEST['fontdisplay'] )
 …
+            }
             //print_r($_REQUEST);
             wp_redirect("themes.php?page=functions.php&saved=true");
+            header("Location: themes.php?page=functions.php&saved=true");
             die;
+        }
 …
 <script type="text/javascript" src="../wp-includes/js/colorpicker.js"></script>
 <script type='text/javascript'>
-// <![CDATA[
     function pickColor(color) {
         ColorPicker_targetInput.value = color;
 …
+    }
     addLoadEvent(kInit);
-// ]]>
 </script>
 <style type='text/css'>
 …
         font-size: 1.2em;
         text-align: center;
+    }
+    }
     #kubrick-header #header {
         text-decoration: none;
 …
         <br />
         <div id="nonJsForm">
             <form method="post" action="">
+            <form method="POST">
                 <div class="zerosize"><input type="submit" name="defaultsubmit" value="Save" /></div>
                 <label for="njfontcolor">Font Color:</label><input type="text" name="njfontcolor" id="njfontcolor" value="<?php echo kubrick_header_color(); ?>" /> Any CSS color (<code>red</code> or <code>#FF0000</code> or <code>rgb(255, 0, 0)</code>)<br />
 …
                 <label for="njlowercolor">Lower Color:</label><input type="text" name="njlowercolor" id="njlowercolor" value="#<?php echo kubrick_lower_color(); ?>" /> HEX only (<code>#FF0000</code> or <code>#F00</code>)<br />
                 <input type="hidden" name="hi" id="hi" value="<?php echo kubrick_header_image(); ?>" />
                 <input type="submit" name="toggledisplay" id="toggledisplay" value="Toggle Text" />
+                <label> </label><input type="submit" name="toggledisplay" id="toggledisplay" value="Toggle Text" />
                 <input type="submit" name="defaults" value="Use Defaults" />
                 <input type="submit" class="defbutton" name="submitform" value="&nbsp;&nbsp;Save&nbsp;&nbsp;" />
 …
                 <input type="button" name="revert" value="Revert" onclick="kRevert()" />
                 <input type="button" value="Advanced" onclick="toggleAdvanced()" />
+                <input type="submit" name="submitform" class="defbutton" value="Save" onclick="cp.hidePopup('prettyplease')" />
                 <input type="hidden" name="action" value="save" />
                 <input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo kubrick_header_display(); ?>" />
 …
                 <input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo kubrick_lower_color(); ?>" />
                 <input type="hidden" name="headerimage" id="headerimage" value="<?php echo kubrick_header_image(); ?>" />
-                <p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php _e('Update Header &raquo;'); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
             </form>
             <div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div>
             <div id="advanced">
                 <form id="jsAdvanced" style="display:none;" action="">
+                <form id="jsAdvanced" style="display:none;">
                     <label for="advfontcolor">Font Color (CSS): </label><input type="text" id="advfontcolor" onchange="advUpdate(this.value, 'fontcolor')" value="<?php echo kubrick_header_color(); ?>" /><br />
                     <label for="advuppercolor">Upper Color (HEX): </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo kubrick_upper_color(); ?>" /><br />

trunk/wp-content/themes/default/header.php

-                      r4431
+                      r3503
 <style type="text/css" media="screen">
+<?php
+// Checks to see whether it needs a sidebar or not
+if ( !$withcomments && !is_single() ) {
+?>
+/*  To accomodate differing install paths of WordPress, images are referred only here,
+    and not in the wp-layout.css file. If you prefer to use only CSS for colors and what
+    not, then go right ahead and delete the following lines, and the image files. */
+    body { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbgcolor.jpg"); }
+<?php /* Checks to see whether it needs a sidebar or not */ if ((! $withcomments) && (! is_single())) { ?>
     #page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbg.jpg") repeat-y top; border: none; }
 <?php } else { // No sidebar ?>
     #page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbgwide.jpg") repeat-y top; border: none; }
 <?php } ?>
+    #header { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickheader.jpg") no-repeat bottom center; }
+    #footer { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickfooter.jpg") no-repeat bottom; border: none;}
+/*  Because the template is slightly different, size-wise, with images, this needs to be set here
+    If you don't want to use the template's images, you can also delete the following two lines. */
+    #header     { margin: 0 !important; margin: 0 0 0 1px; padding: 1px; height: 198px; width: 758px; }
+    #headerimg  { margin: 7px 9px 0; height: 192px; width: 740px; }
+/*  To ease the insertion of a personal header image, I have done it in such a way,
+    that you simply drop in an image called 'personalheader.jpg' into your /images/
+    directory. Dimensions should be at least 760px x 200px. Anything above that will
+    get cropped off of the image. */
+    /*
+    #headerimg { background: url('<?php bloginfo('stylesheet_directory'); ?>/images/personalheader.jpg') no-repeat top;}
+    */
 </style>
 …
 <div id="header">
     <div id="headerimg">
         <h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
+        <h1><a href="<?php echo get_settings('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
         <div class="description"><?php bloginfo('description'); ?></div>
     </div>

trunk/wp-content/themes/default/index.php

-                      r4431
+                      r3503
     <?php if (have_posts()) : ?>
         <?php while (have_posts()) : the_post(); ?>
             <div class="post" id="post-<?php the_ID(); ?>">
                 <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
                 <small><?php the_time('F jS, Y') ?> <!-- by <?php the_author() ?> --></small>
                 <div class="entry">
                     <?php the_content('Read the rest of this entry &raquo;'); ?>
                 </div>
                 <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
             </div>
         <?php endwhile; ?>
 …
             <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
         </div>
     <?php else : ?>

trunk/wp-content/themes/default/links.php

r4431	r3503
14	14	</ul>
15	15
16		</div>
	16	</div>
17	17
18	18	<?php get_footer(); ?>

trunk/wp-content/themes/default/page.php

-                      r4431
+                      r3503
         <div class="post" id="post-<?php the_ID(); ?>">
         <h2><?php the_title(); ?></h2>
             <div class="entry">
+            <div class="entrytext">
                 <?php the_content('<p class="serif">Read the rest of this page &raquo;</p>'); ?>
                 <?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
+                <?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?>
             </div>
         </div>

trunk/wp-content/themes/default/search.php

-                      r4431
+                      r3503
         <h2 class="pagetitle">Search Results</h2>
         <div class="navigation">
             <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
 …
         <?php while (have_posts()) : the_post(); ?>
             <div class="post">
                 <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h3>
                 <small><?php the_time('l, F jS, Y') ?></small>
                 <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
             </div>
         <?php endwhile; ?>
 …
             <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
         </div>
     <?php else : ?>
 …
     <?php endif; ?>
     </div>

trunk/wp-content/themes/default/searchform.php

r4431	r3503
1	1	<form method="get" id="searchform" action="<?php bloginfo('home'); ?>/">
2		<div><input type="text" value="<?php ~~the_search_query(~~); ?>" name="s" id="s" />
	2	<div><input type="text" value="<?php echo wp_specialchars($s, 1); ?>" name="s" id="s" />
3	3	<input type="submit" id="searchsubmit" value="Search" />
4	4	</div>

trunk/wp-content/themes/default/sidebar.php

-                      r4431
+                      r3503
     <div id="sidebar">
         <ul>
             <li>
                 <?php include (TEMPLATEPATH . '/searchform.php'); ?>
 …
             <?php /* If this is a category archive */ } elseif (is_category()) { ?>
             <p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p>
             <?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
             <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
             for the day <?php the_time('l, F jS, Y'); ?>.</p>
             <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
             <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
 …
             <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
             for the year <?php the_time('Y'); ?>.</p>
          <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
             <p>You have searched the <a href="<?php echo bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
             for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
+            for <strong>'<?php echo wp_specialchars($s); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
             <?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
 …
             </li>
+            <?php wp_list_categories('optioncount=1&hierarchical=0&title_li=<h2>Categories</h2>'); ?>
+            <li><h2>Categories</h2>
+                <ul>
+                <?php wp_list_cats('sort_column=name&optioncount=1&hierarchical=0'); ?>
+                </ul>
+            </li>
             <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>
                 <?php wp_list_bookmarks(); ?>
+            <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>
+                <?php get_links_list(); ?>
                 <li><h2>Meta</h2>
                 <ul>
 …
                 </li>
             <?php } ?>
         </ul>
     </div>

trunk/wp-content/themes/default/single.php

-                      r4431
+                      r3503
     <div id="content" class="widecolumn">
   <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
         <div class="navigation">
             <div class="alignleft"><?php previous_post_link('&laquo; %link') ?></div>
             <div class="alignright"><?php next_post_link('%link &raquo;') ?></div>
         </div>
         <div class="post" id="post-<?php the_ID(); ?>">
             <h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
             <div class="entry">
+            <div class="entrytext">
                 <?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
                 <?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
+                <?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?>
                 <p class="postmetadata alt">
                     <small>
 …
                         and is filed under <?php the_category(', ') ?>.
                         You can follow any responses to this entry through the <?php comments_rss_link('RSS 2.0'); ?> feed.
                         <?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
                             // Both Comments and Pings are open ?>
                             You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(true); ?>" rel="trackback">trackback</a> from your own site.
                         <?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
                             // Only Pings are Open ?>
                             Responses are currently closed, but you can <a href="<?php trackback_url(true); ?> " rel="trackback">trackback</a> from your own site.
                         <?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
                             // Comments are open, Pings are not ?>
                             You can skip to the end and leave a response. Pinging is currently not allowed.
                         <?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
                             // Neither Comments, nor Pings are open ?>
                             Both comments and pings are currently closed.
+                            Both comments and pings are currently closed.
                         <?php } edit_post_link('Edit this entry.','',''); ?>
                     </small>
                 </p>
             </div>
         </div>
     <?php comments_template(); ?>
     <?php endwhile; else: ?>
         <p>Sorry, no posts matched your criteria.</p>
 <?php endif; ?>
     </div>

trunk/wp-content/themes/default/style.css

-                      r4431
+                      r3503
 Theme URI: http://wordpress.org/
 Description: The default WordPress theme based on the famous <a href="http://binarybonsai.com/kubrick/">Kubrick</a>.
 Version: 1.6
+Version: 1.5
 Author: Michael Heilemann
 Author URI: http://binarybonsai.com/
 …
     The CSS, XHTML and design is released under GPL:
     http://www.opensource.org/licenses/gpl-license.php
+    *** REGARDING IMAGES ***
+    All CSS that involves the use of images, can be found in the 'index.php' file.
+    This is to ease installation inside subdirectories of a server.
+    Have fun, and don't be afraid to contact me if you have questions.
 */
 …
     font-size: 62.5%; /* Resets 1em to 10px */
     font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif;
     background: #d5d6d7 url('images/kubrickbgcolor.jpg');
+    background-color: #d5d6d7;
     color: #333;
     text-align: center;
 …
 #header {
+    background: #73a0c5 url('images/kubrickheader.jpg') no-repeat bottom center;
+    }
+#headerimg  {
+    margin: 7px 9px 0;
+    height: 192px;
+    width: 740px;
+    }
+    background-color: #73a0c5;
+    }
 #content {
 …
     line-height: 1.6em;
+    }
 .narrowcolumn .postmetadata {
     text-align: center;
 …
 #footer {
+    background: #eee url('images/kubrickfooter.jpg') no-repeat top;
+    border: none;
+    background-color: #eee;
+    }
 …
     font: 0.9em 'Lucida Grande', Verdana, Arial, Sans-Serif;
+    }
 .commentlist li {
     font-weight: bold;
 …
     color: #777;
+    }
 code {
     font: 1.1em 'Courier New', Courier, Fixed;
 …
     text-decoration: underline;
+    }
 #wp-calendar #prev a {
     font-size: 9pt;
 …
 /* Begin Structure */
 body {
     margin: 0 0 20px 0;
+    margin: 0;
     padding: 0;
+    }
 …
     border: 1px solid #959596;
+    }
 #header {
+    padding: 0;
+    margin: 0 auto;
+    height: 200px;
+    width: 100%;
     background-color: #73a0c5;
-    margin: 0 0 0 1px;
-    padding: 0;
-    height: 200px;
-    width: 758px;
+    }
 …
     width: 450px;
+    }
 .post {
     margin: 0 0 40px;
 …
 #footer {
     padding: 0;
+    padding: 0 0 0 1px;
     margin: 0 auto;
     width: 760px;
 …
     will of course center the image. This is much better than using
     align="center", being much more futureproof (and valid) */
 img.centered {
     display: block;
 …
     margin-right: auto;
+    }
 img.alignright {
     padding: 4px;
 …
     float: right;
+    }
 .alignleft {
     float: left
 …
     list-style-image: none;
+    }
 #sidebar ul, #sidebar ul ol {
     margin: 0;
 …
 #sidebar #searchform #s {
     width: 108px;
+    width: 115px;
     padding: 2px;
+    }

trunk/wp-feed.php

-                      r4431
+                      r3503
+}
+do_feed();
+// Remove the pad, if present.
+$feed = preg_replace('/^_+/', '', $feed);
+if ($feed == '' || $feed == 'feed') {
+    $feed = 'rss2';
+}
+if ( is_single() || ($withcomments == 1) ) {
+    require(ABSPATH . 'wp-commentsrss2.php');
+} else {
+    switch ($feed) {
+    case 'atom':
+        require(ABSPATH . 'wp-atom.php');
+        break;
+    case 'rdf':
+        require(ABSPATH . 'wp-rdf.php');
+        break;
+    case 'rss':
+        require(ABSPATH . 'wp-rss.php');
+        break;
+    case 'rss2':
+        require(ABSPATH . 'wp-rss2.php');
+        break;
+    case 'comments-rss2':
+        require(ABSPATH . 'wp-commentsrss2.php');
+        break;
+    }
+}
 ?>

trunk/wp-includes/cache.php

-                      r4431
+                      r3503
+}
 define('CACHE_SERIAL_HEADER', "<?php\n/*");
 define('CACHE_SERIAL_FOOTER', "*/\n?".">");
+define('CACHE_SERIAL_HEADER', "<?php\n//");
+define('CACHE_SERIAL_FOOTER', "\n?".">");
 class WP_Object_Cache {
 …
     var $warm_cache_hits = 0;
     var $cache_misses = 0;
-    var $secret = '';
     function acquire_lock() {
 …
         if ( ! $this->acquire_lock() )
             return false;
         $this->rm_cache_dir();
         $this->cache = array ();
         $this->dirty_objects = array ();
         $this->non_existant_objects = array ();
         $this->release_lock();
 …
+        }
         $cache_file = $this->cache_dir.$this->get_group_dir($group)."/".$this->hash($id).'.php';
+        $cache_file = $this->cache_dir.$this->get_group_dir($group)."/".md5($id.DB_PASSWORD).'.php';
         if (!file_exists($cache_file)) {
             $this->non_existant_objects[$group][$id] = true;
 …
+        }
         $this->cache[$group][$id] = unserialize(base64_decode(substr(@ file_get_contents($cache_file), strlen(CACHE_SERIAL_HEADER), -strlen(CACHE_SERIAL_FOOTER))));
+        $this->cache[$group][$id] = unserialize(substr(@ file_get_contents($cache_file), strlen(CACHE_SERIAL_HEADER), -strlen(CACHE_SERIAL_FOOTER)));
         if (false === $this->cache[$group][$id])
             $this->cache[$group][$id] = '';
 …
         return "{$this->blog_id}/$group";
+    }
-    function hash($data) {
-        if ( function_exists('hash_hmac') ) {
-            return hash_hmac('md5', $data, $this->secret);
-        } else {
-            return md5($data . $this->secret);
+        }
+    }
 …
                 foreach ($dogs as $catt)
                     $this->cache['category'][$catt->cat_ID] = $catt;
+                foreach ($this->cache['category'] as $catt) {
+                    $curcat = $catt->cat_ID;
+                    $fullpath = '/'.$this->cache['category'][$catt->cat_ID]->category_nicename;
+                    while ($this->cache['category'][$curcat]->category_parent != 0) {
+                        $curcat = $this->cache['category'][$curcat]->category_parent;
+                        $fullpath = '/'.$this->cache['category'][$curcat]->category_nicename.$fullpath;
+                    }
+                    $this->cache['category'][$catt->cat_ID]->fullpath = $fullpath;
+                }
+            }
         } else
 …
                 if ($file == '.' or $file == '..')
                     continue;
                 if (@ is_dir($dir . DIRECTORY_SEPARATOR . $file))
                     $stack[] = $dir . DIRECTORY_SEPARATOR . $file;
 …
             $ids = array_unique($ids);
             foreach ($ids as $id) {
                 $cache_file = $group_dir.$this->hash($id).'.php';
+                $cache_file = $group_dir.md5($id.DB_PASSWORD).'.php';
                 // Remove the cache file if the key is not set.
 …
                 $temp_file = tempnam($group_dir, 'tmp');
                 $serial = CACHE_SERIAL_HEADER.base64_encode(serialize($this->cache[$group][$id])).CACHE_SERIAL_FOOTER;
+                $serial = CACHE_SERIAL_HEADER.serialize($this->cache[$group][$id]).CACHE_SERIAL_FOOTER;
                 $fd = @fopen($temp_file, 'w');
                 if ( false === $fd ) {
 …
                         @ unlink($temp_file);
                     else
                         $errors++;
+                        $errors++;
+                }
                 @ chmod($cache_file, $file_perms);
 …
         $this->release_lock();
         if ( $errors )
             return false;
 …
             return;
-        if ( ! defined('ENABLE_CACHE') )
-            return;
         // Disable the persistent cache if safe_mode is on.
         if ( ini_get('safe_mode') && ! defined('ENABLE_CACHE') )
 …
             $this->expiration_time = CACHE_EXPIRATION_TIME;
+        if ( defined('WP_SECRET') )
+            $this->secret = WP_SECRET;
+        else
+            $this->secret = DB_PASSWORD . DB_USER . DB_NAME . DB_HOST . ABSPATH;
+        $this->blog_id = $this->hash($blog_id);
+        $this->blog_id = md5($blog_id);
+    }
+}

trunk/wp-includes/capabilities.php

-                      r4431
+                      r3503
     var $role_names = array();
     var $role_key;
-    var $use_db = true;
     function WP_Roles() {
+        $this->_init();
+    }
+    function _init () {
+        global $wpdb;
+        global $wp_user_roles;
+        $this->role_key = $wpdb->prefix . 'user_roles';
+        if ( ! empty($wp_user_roles) ) {
+            $this->roles = $wp_user_roles;
+            $this->use_db = false;
+        } else {
+            $this->roles = get_option($this->role_key);
+        }
+        global $table_prefix;
+        $this->role_key = $table_prefix . 'user_roles';
+        $this->roles = get_option($this->role_key);
         if ( empty($this->roles) )
             return;
-        $this->role_objects = array();
-        $this->role_names =  array();
         foreach ($this->roles as $role => $data) {
             $this->role_objects[$role] = new WP_Role($role, $this->roles[$role]['capabilities']);
 …
             'name' => $display_name,
             'capabilities' => $capabilities);
+        if ( $this->use_db )
+            update_option($this->role_key, $this->roles);
+        update_option($this->role_key, $this->roles);
         $this->role_objects[$role] = new WP_Role($role, $capabilities);
         $this->role_names[$role] = $display_name;
         return $this->role_objects[$role];
+    }
     function remove_role($role) {
         if ( ! isset($this->role_objects[$role]) )
             return;
         unset($this->role_objects[$role]);
         unset($this->role_names[$role]);
         unset($this->roles[$role]);
+        if ( $this->use_db )
+            update_option($this->role_key, $this->roles);
+        update_option($this->role_key, $this->roles);
+    }
     function add_cap($role, $cap, $grant = true) {
         $this->roles[$role]['capabilities'][$cap] = $grant;
+        if ( $this->use_db )
+            update_option($this->role_key, $this->roles);
+        update_option($this->role_key, $this->roles);
+    }
     function remove_cap($role, $cap) {
         unset($this->roles[$role]['capabilities'][$cap]);
+        if ( $this->use_db )
+            update_option($this->role_key, $this->roles);
+        update_option($this->role_key, $this->roles);
+    }
 …
+    {
         return isset($this->role_names[$role]);
+    }
+    }
+}
 …
     function WP_User($id, $name = '') {
         global $wpdb;
+        global $table_prefix;
         if ( empty($id) && empty($name) )
 …
         $this->id = $this->ID;
+        $this->_init_caps();
+    }
+    function _init_caps() {
+        global $wpdb;
+        $this->cap_key = $wpdb->prefix . 'capabilities';
+        $this->cap_key = $table_prefix . 'capabilities';
         $this->caps = &$this->{$this->cap_key};
         if ( ! is_array($this->caps) )
 …
         $this->get_role_caps();
+    }
     function get_role_caps() {
         global $wp_roles;
         if ( ! isset($wp_roles) )
             $wp_roles = new WP_Roles();
 …
         //Build $allcaps from role caps, overlay user's $caps
         $this->allcaps = array();
         foreach( (array) $this->roles as $role) {
+        foreach($this->roles as $role) {
             $role = $wp_roles->get_role($role);
             $this->allcaps = array_merge($this->allcaps, $role->capabilities);
 …
         $this->allcaps = array_merge($this->allcaps, $this->caps);
+    }
     function add_role($role) {
         $this->caps[$role] = true;
 …
         $this->update_user_level_from_caps();
+    }
     function remove_role($role) {
         if ( empty($this->roles[$role]) || (count($this->roles) <= 1) )
 …
         $this->get_role_caps();
+    }
     function set_role($role) {
         foreach($this->roles as $oldrole)
+        foreach($this->roles as $oldrole)
             unset($this->caps[$oldrole]);
+        if ( !empty($role) ) {
+            $this->caps[$role] = true;
+            $this->roles = array($role => true);
+        } else {
+            $this->roles = false;
+        }
+        $this->caps[$role] = true;
+        $this->roles = array($role => true);
         update_usermeta($this->id, $this->cap_key, $this->caps);
         $this->get_role_caps();
 …
+        }
+    }
     function update_user_level_from_caps() {
         global $wpdb;
+        global $table_prefix;
         $this->user_level = array_reduce(array_keys($this->allcaps),    array(&$this, 'level_reduction'), 0);
         update_usermeta($this->id, $wpdb->prefix.'user_level', $this->user_level);
+    }
+        update_usermeta($this->id, $table_prefix.'user_level', $this->user_level);
+    }
     function add_cap($cap, $grant = true) {
         $this->caps[$cap] = $grant;
 …
         update_usermeta($this->id, $this->cap_key, $this->caps);
+    }
+    function remove_all_caps() {
+        global $wpdb;
+        $this->caps = array();
+        update_usermeta($this->id, $this->cap_key, '');
+        update_usermeta($this->id, $wpdb->prefix.'user_level', '');
+        $this->get_role_caps();
+    }
     //has_cap(capability_or_role_name) or
     //has_cap('edit_post', post_id)
 …
         if ( is_numeric($cap) )
             $cap = $this->translate_level_to_cap($cap);
         $args = array_slice(func_get_args(), 1);
         $args = array_merge(array($cap, $this->id), $args);
 …
     switch ($cap) {
-    case 'delete_user':
-        $caps[] = 'delete_users';
-        break;
-    case 'edit_user':
-        $caps[] = 'edit_users';
-        break;
-    case 'delete_post':
-        $author_data = get_userdata($user_id);
-        //echo "post ID: {$args[0]}<br/>";
-        $post = get_post($args[0]);
-        if ( 'page' == $post->post_type ) {
-            $args = array_merge(array('delete_page', $user_id), $args);
-            return call_user_func_array('map_meta_cap', $args);
+        }
-        $post_author_data = get_userdata($post->post_author);
-        //echo "current user id : $user_id, post author id: " . $post_author_data->ID . "<br/>";
-        // If the user is the author...
-        if ($user_id == $post_author_data->ID) {
-            // If the post is published...
-            if ($post->post_status == 'publish')
-                $caps[] = 'delete_published_posts';
-            else
-                // If the post is draft...
-                $caps[] = 'delete_posts';
-        } else {
-            // The user is trying to edit someone else's post.
-            $caps[] = 'delete_others_posts';
-            // The post is published, extra cap required.
-            if ($post->post_status == 'publish')
-                $caps[] = 'delete_published_posts';
-            else if ($post->post_status == 'private')
-                $caps[] = 'delete_private_posts';
+        }
-        break;
-    case 'delete_page':
-        $author_data = get_userdata($user_id);
-        //echo "post ID: {$args[0]}<br/>";
-        $page = get_page($args[0]);
-        $page_author_data = get_userdata($page->post_author);
-        //echo "current user id : $user_id, page author id: " . $page_author_data->ID . "<br/>";
-        // If the user is the author...
-        if ($user_id == $page_author_data->ID) {
-            // If the page is published...
-            if ($page->post_status == 'publish')
-                $caps[] = 'delete_published_pages';
-            else
-                // If the page is draft...
-                $caps[] = 'delete_pages';
-        } else {
-            // The user is trying to edit someone else's page.
-            $caps[] = 'delete_others_pages';
-            // The page is published, extra cap required.
-            if ($page->post_status == 'publish')
-                $caps[] = 'delete_published_pages';
-            else if ($page->post_status == 'private')
-                $caps[] = 'delete_private_pages';
+        }
-        break;
         // edit_post breaks down to edit_posts, edit_published_posts, or
         // edit_others_posts
 …
         //echo "post ID: {$args[0]}<br/>";
         $post = get_post($args[0]);
-        if ( 'page' == $post->post_type ) {
-            $args = array_merge(array('edit_page', $user_id), $args);
-            return call_user_func_array('map_meta_cap', $args);
+        }
         $post_author_data = get_userdata($post->post_author);
         //echo "current user id : $user_id, post author id: " . $post_author_data->ID . "<br/>";
 …
             if ($post->post_status == 'publish')
                 $caps[] = 'edit_published_posts';
+            else if ($post->post_status == 'static')
+                $caps[] = 'edit_pages';
             else
                 // If the post is draft...
                 $caps[] = 'edit_posts';
         } else {
+            if ($post->post_status == 'static') {
+                $caps[] = 'edit_pages';
+                break;
+            }
             // The user is trying to edit someone else's post.
             $caps[] = 'edit_others_posts';
 …
             if ($post->post_status == 'publish')
                 $caps[] = 'edit_published_posts';
-            else if ($post->post_status == 'private')
-                $caps[] = 'edit_private_posts';
+        }
-        break;
-    case 'edit_page':
-        $author_data = get_userdata($user_id);
-        //echo "post ID: {$args[0]}<br/>";
-        $page = get_page($args[0]);
-        $page_author_data = get_userdata($page->post_author);
-        //echo "current user id : $user_id, page author id: " . $page_author_data->ID . "<br/>";
-        // If the user is the author...
-        if ($user_id == $page_author_data->ID) {
-            // If the page is published...
-            if ($page->post_status == 'publish')
-                $caps[] = 'edit_published_pages';
-            else
-                // If the page is draft...
-                $caps[] = 'edit_pages';
-        } else {
-            // The user is trying to edit someone else's page.
-            $caps[] = 'edit_others_pages';
-            // The page is published, extra cap required.
-            if ($page->post_status == 'publish')
-                $caps[] = 'edit_published_pages';
-            else if ($page->post_status == 'private')
-                $caps[] = 'edit_private_pages';
+        }
         break;
     case 'read_post':
         $post = get_post($args[0]);
+        if ( 'page' == $post->post_type ) {
+            $args = array_merge(array('read_page', $user_id), $args);
+            return call_user_func_array('map_meta_cap', $args);
+        }
         if ( 'private' != $post->post_status ) {
             $caps[] = 'read';
             break;
+        }
+            break;
+        }
         $author_data = get_userdata($user_id);
         $post_author_data = get_userdata($post->post_author);
 …
             $caps[] = 'read_private_posts';
         break;
-    case 'read_page':
-        $page = get_page($args[0]);
-        if ( 'private' != $page->post_status ) {
-            $caps[] = 'read';
-            break;
+        }
-        $author_data = get_userdata($user_id);
-        $page_author_data = get_userdata($post->post_author);
-        if ($user_id == $page_author_data->ID)
-            $caps[] = 'read';
-        else
-            $caps[] = 'read_private_pages';
-        break;
     default:
         // If no meta caps match, return the original cap.
 …
 // Capability checking wrapper around the global $current_user object.
 function current_user_can($capability) {
     $current_user = wp_get_current_user();
+    global $current_user;
     $args = array_slice(func_get_args(), 1);
 …
+}
+//
+// These are deprecated.  Use current_user_can().
+//
+/* returns true if $user_id can create a new post */
+function user_can_create_post($user_id, $blog_id = 1, $category_id = 'None') {
+    $author_data = get_userdata($user_id);
+    return ($author_data->user_level > 1);
+}
+/* returns true if $user_id can create a new post */
+function user_can_create_draft($user_id, $blog_id = 1, $category_id = 'None') {
+    $author_data = get_userdata($user_id);
+    return ($author_data->user_level >= 1);
+}
+/* returns true if $user_id can edit $post_id */
+function user_can_edit_post($user_id, $post_id, $blog_id = 1) {
+    $author_data = get_userdata($user_id);
+    $post = get_post($post_id);
+    $post_author_data = get_userdata($post->post_author);
+    if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' &&  $author_data->user_level < 2))
+         || ($author_data->user_level > $post_author_data->user_level)
+         || ($author_data->user_level >= 10) ) {
+        return true;
+    } else {
+        return false;
+    }
+}
+/* returns true if $user_id can delete $post_id */
+function user_can_delete_post($user_id, $post_id, $blog_id = 1) {
+    // right now if one can edit, one can delete
+    return user_can_edit_post($user_id, $post_id, $blog_id);
+}
+/* returns true if $user_id can set new posts' dates on $blog_id */
+function user_can_set_post_date($user_id, $blog_id = 1, $category_id = 'None') {
+    $author_data = get_userdata($user_id);
+    return (($author_data->user_level > 4) && user_can_create_post($user_id, $blog_id, $category_id));
+}
+/* returns true if $user_id can edit $post_id's date */
+function user_can_edit_post_date($user_id, $post_id, $blog_id = 1) {
+    $author_data = get_userdata($user_id);
+    return (($author_data->user_level > 4) && user_can_edit_post($user_id, $post_id, $blog_id));
+}
+/* returns true if $user_id can edit $post_id's comments */
+function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {
+    // right now if one can edit a post, one can edit comments made on it
+    return user_can_edit_post($user_id, $post_id, $blog_id);
+}
+/* returns true if $user_id can delete $post_id's comments */
+function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {
+    // right now if one can edit comments, one can delete comments
+    return user_can_edit_post_comments($user_id, $post_id, $blog_id);
+}
+function user_can_edit_user($user_id, $other_user) {
+    $user  = get_userdata($user_id);
+    $other = get_userdata($other_user);
+    if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
+        return true;
+    else
+        return false;
+}
 ?>

trunk/wp-includes/class-snoopy.php

-                      r4431
+                      r3503
+{
     /**** Public variables ****/
     /* user definable vars */
 …
     var $proxy_user     =   "";                 // proxy user to use
     var $proxy_pass     =   "";                 // proxy password to use
     var $agent          =   "Snoopy v1.2.3";    // agent we masquerade as
     var $referer        =   "";                 // referer info to pass
 …
                                                 // NOTE: this currently does not respect
                                                 // dates, domains or paths.
     var $user           =   "";                 // user for http authentication
     var $pass           =   "";                 // password for http authentication
     // http accept types
     var $accept         =   "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
     var $results        =   "";                 // where the content is put
     var $error          =   "";                 // error messages sent here
     var $response_code  =   "";                 // response code returned from server
     var $headers        =   array();            // headers returned from server sent here
     var $maxlength      =   8192;               // max return data length (body)
+    var $maxlength      =   500000;             // max return data length (body)
     var $read_timeout   =   0;                  // timeout on read operations, in seconds
                                                 // supported only since PHP 4 Beta 4
 …
                                                 // as these functions are not stable
                                                 // as of this Snoopy release.
     /**** Private variables ****/
+    /**** Private variables ****/
     var $_maxlinelen    =   4096;               // max line length (headers)
     var $_httpmethod    =   "GET";              // default http request method
     var $_httpversion   =   "HTTP/1.0";         // default http request version
 …
     var $_frameurls     =   array();            // frame src urls
     var $_framedepth    =   0;                  // increments on frame depth
     var $_isproxy       =   false;              // set if using a proxy server
     var $_fp_timeout    =   30;                 // timeout for socket connection
 …
     function fetch($URI)
+    {
         //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
         $URI_PARTS = parse_url($URI);
 …
         if (empty($URI_PARTS["path"]))
             $URI_PARTS["path"] = '';
         switch(strtolower($URI_PARTS["scheme"]))
+        {
 …
                         $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
+                    }
                     $this->_disconnect($fp);
 …
                         $frameurls = $this->_frameurls;
                         $this->_frameurls = array();
                         while(list(,$frameurl) = each($frameurls))
+                        {
 …
                                 break;
+                        }
+                    }
+                    }
+                }
                 else
 …
                     return false;
+                }
                 return true;
+                return true;
                 break;
             case "https":
 …
                             break;
+                    }
+                }
                 return true;
+                }
+                return true;
                 break;
             default:
 …
                 return false;
                 break;
+        }
+        }
         return true;
+    }
 …
+    {
         unset($postdata);
         $postdata = $this->_prepare_post_body($formvars, $formfiles);
         $URI_PARTS = parse_url($URI);
         if (!empty($URI_PARTS["user"]))
 …
                         $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
+                    }
                     $this->_disconnect($fp);
 …
                         /* url was redirected, check if we've hit the max depth */
                         if($this->maxredirs > $this->_redirectdepth)
+                        {
+                        {
                             if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
                                 $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
                             // only follow redirect if it's on this site, or offsiteok is true
                             if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
 …
                         $frameurls = $this->_frameurls;
                         $this->_frameurls = array();
                         while(list(,$frameurl) = each($frameurls))
+                        {
+                        {
                             if($this->_framedepth < $this->maxframes)
+                            {
 …
                                 break;
+                        }
+                    }
+                    }
+                }
                 else
 …
                     return false;
+                }
                 return true;
+                return true;
                 break;
             case "https":
 …
                     /* url was redirected, check if we've hit the max depth */
                     if($this->maxredirs > $this->_redirectdepth)
+                    {
+                    {
                         if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
                             $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+                            $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
                         // only follow redirect if it's on this site, or offsiteok is true
 …
                     while(list(,$frameurl) = each($frameurls))
+                    {
+                    {
                         if($this->_framedepth < $this->maxframes)
+                        {
 …
                             break;
+                    }
+                }
                 return true;
+                }
+                return true;
                 break;
             default:
                 // not a valid protocol
 …
                 return false;
                 break;
+        }
+        }
         return true;
+    }
 …
+    {
         if ($this->fetch($URI))
+        {
+        {
             if($this->lastredirectaddr)
                 $URI = $this->lastredirectaddr;
 …
     function fetchform($URI)
+    {
         if ($this->fetch($URI))
+        {
+        {
             if(is_array($this->results))
 …
             else
                 $this->results = $this->_stripform($this->results);
             return true;
+        }
 …
             return false;
+    }
 /*======================================================================*\
     Function:   fetchtext
 …
+    {
         if($this->fetch($URI))
+        {
+        {
             if(is_array($this->results))
+            {
 …
+    {
         if($this->submit($URI,$formvars, $formfiles))
+        {
+        {
             if($this->lastredirectaddr)
                 $URI = $this->lastredirectaddr;
 …
+    {
         if($this->submit($URI,$formvars, $formfiles))
+        {
+        {
             if($this->lastredirectaddr)
                 $URI = $this->lastredirectaddr;
 …
+    }
 /*======================================================================*\
 …
+    }
 /*======================================================================*\
     Function:   set_submit_normal
 …
+    }
 /*======================================================================*\
     Private functions
 \*======================================================================*/
 /*======================================================================*\
     Function:   _striplinks
 …
     function _striplinks($document)
+    {
+    {
         preg_match_all("'<\s*a\s.*?href\s*=\s*          # find <a href=
                         ([\"\'])?                   # find single or double quote
 …
                                                     # quote, otherwise match up to next space
                         'isx",$document,$links);
         // catenate the non-empty matches from the conditional subpattern
 …
             if(!empty($val))
                 $match[] = $val;
+        }
+        }
         while(list($key,$val) = each($links[3]))
+        {
             if(!empty($val))
                 $match[] = $val;
+        }
+        }
         // return the links
         return $match;
 …
     function _stripform($document)
+    {
+    {
         preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
         // catenate the matches
         $match = implode("\r\n",$elements[0]);
         // return the links
         return $match;
+    }
 /*======================================================================*\
     Function:   _striptext
 …
     function _striptext($document)
+    {
         // I didn't use preg eval (//e) since that is only available in PHP 4.0.
         // so, list your entities one by one here. I included some of the
         // more common ones.
         $search = array("'<script[^>]*?>.*?</script>'si",   // strip out javascript
                         "'<[\/\!]*?[^<>]*?>'si",            // strip out html tags
 …
                             "ß",
                         );
         $text = preg_replace($search,$replace,$document);
         return $text;
+    }
 …
     function _expandlinks($links,$URI)
+    {
         preg_match("/^[^\?]+/",$URI,$match);
 …
         $match_root =
         $match_part["scheme"]."://".$match_part["host"];
         $search = array(    "|^http://".preg_quote($this->host)."|i",
                             "|^(\/)|i",
 …
                             "|/[^\/]+/\.\./|"
                         );
         $replace = array(   "",
                             $match_root."/",
 …
                             "/",
                             "/"
                         );
+                        );
         $expandedLinks = preg_replace($search,$replace,$links);
 …
                 $URI        the full URI
                 $body       body contents to send if any (POST)
     Output:
 \*======================================================================*/
+    Output:
+\*======================================================================*/
     function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
+    {
 …
         if($this->passcookies && $this->_redirectaddr)
             $this->setcookies();
         $URI_PARTS = parse_url($URI);
         if(empty($url))
             $url = "/";
         $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
+        $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
         if(!empty($this->agent))
             $headers .= "User-Agent: ".$this->agent."\r\n";
 …
             $headers .= "Referer: ".$this->referer."\r\n";
         if(!empty($this->cookies))
+        {
+        {
             if(!is_array($this->cookies))
                 $this->cookies = (array)$this->cookies;
             reset($this->cookies);
             if ( count($this->cookies) > 0 ) {
 …
             $headers .= "\r\n";
+        }
         if(!empty($body))
+        if(!empty($body))
             $headers .= "Content-length: ".strlen($body)."\r\n";
         if(!empty($this->user) || !empty($this->pass))
+        if(!empty($this->user) || !empty($this->pass))
             $headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
         //add proxy auth headers
         if(!empty($this->proxy_user))
+        if(!empty($this->proxy_user))
             $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass)."\r\n";
         $headers .= "\r\n";
         // set the read timeout if needed
         if ($this->read_timeout > 0)
             socket_set_timeout($fp, $this->read_timeout);
         $this->timed_out = false;
         fwrite($fp,$headers.$body,strlen($headers.$body));
         $this->_redirectaddr = false;
         unset($this->headers);
         while($currentHeader = fgets($fp,$this->_maxlinelen))
+        {
 …
                 return false;
+            }
             if($currentHeader == "\r\n")
                 break;
             // if a header begins with Location: or URI:, set the redirect
             if(preg_match("/^(Location:|URI:)/i",$currentHeader))
 …
                     $this->_redirectaddr = $matches[2];
+            }
             if(preg_match("|^HTTP/|",$currentHeader))
+            {
 …
+                {
                     $this->status= $status[1];
+                }
+                }
                 $this->response_code = $currentHeader;
+            }
             $this->headers[] = $currentHeader;
+        }
 …
             return false;
+        }
         // check if there is a a redirect meta tag
         if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+        {
             $this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+            $this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+        }
 …
         else
             $this->results = $results;
         return true;
+    }
 …
                 $URI        the full URI
                 $body       body contents to send if any (POST)
     Output:
 \*======================================================================*/
+    Output:
+\*======================================================================*/
     function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
+    {
 …
             $this->setcookies();
         $headers = array();
+        $headers = array();
         $URI_PARTS = parse_url($URI);
         if(empty($url))
             $url = "/";
         // GET ... header not needed for curl
         //$headers[] = $http_method." ".$url." ".$this->_httpversion;
+        //$headers[] = $http_method." ".$url." ".$this->_httpversion;
         if(!empty($this->agent))
             $headers[] = "User-Agent: ".$this->agent;
 …
             $headers[] = "Referer: ".$this->referer;
         if(!empty($this->cookies))
+        {
+        {
             if(!is_array($this->cookies))
                 $this->cookies = (array)$this->cookies;
             reset($this->cookies);
             if ( count($this->cookies) > 0 ) {
 …
                 $headers[] = "Content-type: $content_type";
+        }
         if(!empty($body))
+        if(!empty($body))
             $headers[] = "Content-length: ".strlen($body);
         if(!empty($this->user) || !empty($this->pass))
+        if(!empty($this->user) || !empty($this->pass))
             $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
         for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
             $safer_header = strtr( $headers[$curr_header], "\"", " " );
             $cmdline_params .= " -H \"".$safer_header."\"";
+        }
         if(!empty($body))
             $cmdline_params .= " -d \"$body\"";
         if($this->read_timeout > 0)
             $cmdline_params .= " -m ".$this->read_timeout;
         $headerfile = tempnam($temp_dir, "sno");
         $safer_URI = strtr( $URI, "\"", " " ); // strip quotes from the URI to avoid shell access
         exec(escapeshellcmd($this->curl_path." -D \"$headerfile\"".$cmdline_params." \"".$safer_URI."\""),$results,$return);
         if($return)
+        {
 …
             return false;
+        }
         $results = implode("\r\n",$results);
         $result_headers = file("$headerfile");
         $this->_redirectaddr = false;
         unset($this->headers);
         for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
+        {
             // if a header begins with Location: or URI:, set the redirect
             if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
 …
                     $this->_redirectaddr = $matches[2];
+            }
             if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
                 $this->response_code = $result_headers[$currentHeader];
 …
         // check if there is a a redirect meta tag
         if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+        {
             $this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+            $this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+        }
 …
         unlink("$headerfile");
         return true;
+    }
 …
     Purpose:    set cookies for a redirection
 \*======================================================================*/
     function setcookies()
+    {
 …
+    }
 /*======================================================================*\
     Function:   _check_timeout
 …
     Input:      $fp file pointer
 \*======================================================================*/
     function _connect(&$fp)
+    {
 …
+            {
                 $this->_isproxy = true;
                 $host = $this->proxy_host;
                 $port = $this->proxy_port;
 …
             $port = $this->port;
+        }
         $this->status = 0;
         if($fp = fsockopen(
                     $host,
 …
     Input:      $fp file pointer
 \*======================================================================*/
     function _disconnect($fp)
+    {
 …
+    }
 /*======================================================================*\
     Function:   _prepare_post_body
 …
     Output:     post body
 \*======================================================================*/
     function _prepare_post_body($formvars, $formfiles)
+    {
 …
         if (count($formvars) == 0 && count($formfiles) == 0)
             return;
         switch ($this->_submit_type) {
             case "application/x-www-form-urlencoded":
 …
             case "multipart/form-data":
                 $this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
                 reset($formvars);
                 while(list($key,$val) = each($formvars)) {
 …
+                    }
+                }
                 reset($formfiles);
                 while (list($field_name, $file_names) = each($formfiles)) {
 …
                         $fp = fopen($file_name, "r");
+                        while (!feof($fp)) {
+                            $file_content .= fread($fp, filesize($file_name));
+                        }
+                        $file_content = fread($fp, filesize($file_name));
                         fclose($fp);
                         $base_name = basename($file_name);

trunk/wp-includes/classes.php

-                      r4431
+                      r3503
 <?php
+class WP_Query {
+    var $query;
+    var $query_vars;
+    var $queried_object;
+    var $queried_object_id;
+    var $request;
+    var $posts;
+    var $post_count = 0;
+    var $current_post = -1;
+    var $in_the_loop = false;
+    var $post;
+    var $is_single = false;
+    var $is_preview = false;
+    var $is_page = false;
+    var $is_archive = false;
+    var $is_date = false;
+    var $is_year = false;
+    var $is_month = false;
+    var $is_day = false;
+    var $is_time = false;
+    var $is_author = false;
+    var $is_category = false;
+    var $is_search = false;
+    var $is_feed = false;
+    var $is_trackback = false;
+    var $is_home = false;
+    var $is_404 = false;
+    var $is_comments_popup = false;
+    var $is_admin = false;
+    var $is_attachment = false;
+    function init_query_flags() {
+        $this->is_single = false;
+        $this->is_page = false;
+        $this->is_archive = false;
+        $this->is_date = false;
+        $this->is_year = false;
+        $this->is_month = false;
+        $this->is_day = false;
+        $this->is_time = false;
+        $this->is_author = false;
+        $this->is_category = false;
+        $this->is_search = false;
+        $this->is_feed = false;
+        $this->is_trackback = false;
+        $this->is_home = false;
+        $this->is_404 = false;
+        $this->is_paged = false;
+        $this->is_admin = false;
+        $this->is_attachment = false;
+    }
+    function init () {
+        unset($this->posts);
+        unset($this->query);
+        unset($this->query_vars);
+        unset($this->queried_object);
+        unset($this->queried_object_id);
+        $this->post_count = 0;
+        $this->current_post = -1;
+        $this->in_the_loop = false;
+        $this->init_query_flags();
+    }
+    // Reparse the query vars.
+    function parse_query_vars() {
+        $this->parse_query('');
+    }
+    // Parse a query string and set query type booleans.
+    function parse_query ($query) {
+        if ( !empty($query) || !isset($this->query) ) {
+            $this->init();
+            parse_str($query, $qv);
+            $this->query = $query;
+            $this->query_vars = $qv;
+        }
+        if ('404' == $qv['error']) {
+            $this->is_404 = true;
+            if ( !empty($query) ) {
+                do_action('parse_query', array(&$this));
+            }
+            return;
+        }
+        $qv['m'] =  (int) $qv['m'];
+        $qv['p'] =  (int) $qv['p'];
+        // Compat.  Map subpost to attachment.
+        if ( '' != $qv['subpost'] )
+            $qv['attachment'] = $qv['subpost'];
+        if ( '' != $qv['subpost_id'] )
+            $qv['attachment_id'] = $qv['subpost_id'];
+        if ( ('' != $qv['attachment']) || (int) $qv['attachment_id'] ) {
+            $this->is_single = true;
+            $this->is_attachment = true;
+        } elseif ('' != $qv['name']) {
+            $this->is_single = true;
+        } elseif ( $qv['p'] ) {
+            $this->is_single = true;
+        } elseif (('' != $qv['hour']) && ('' != $qv['minute']) &&('' != $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day'])) {
+            // If year, month, day, hour, minute, and second are set, a single
+            // post is being queried.
+            $this->is_single = true;
+        } elseif ('' != $qv['static'] || '' != $qv['pagename'] || '' != $qv['page_id']) {
+            $this->is_page = true;
+            $this->is_single = false;
+        } elseif (!empty($qv['s'])) {
+            $this->is_search = true;
+            switch ($qv['show_post_type']) {
+            case 'page' :
+                $this->is_page = true;
+                break;
+            case 'attachment' :
+                $this->is_attachment = true;
+                break;
+            }
+        } else {
+        // Look for archive queries.  Dates, categories, authors.
+            if ( (int) $qv['second']) {
+                $this->is_time = true;
+                $this->is_date = true;
+            }
+            if ( (int) $qv['minute']) {
+                $this->is_time = true;
+                $this->is_date = true;
+            }
+            if ( (int) $qv['hour']) {
+                $this->is_time = true;
+                $this->is_date = true;
+            }
+            if ( (int) $qv['day']) {
+                if (! $this->is_date) {
+                    $this->is_day = true;
+                    $this->is_date = true;
+                }
+            }
+            if ( (int)  $qv['monthnum']) {
+                if (! $this->is_date) {
+                    $this->is_month = true;
+                    $this->is_date = true;
+                }
+            }
+            if ( (int)  $qv['year']) {
+                if (! $this->is_date) {
+                    $this->is_year = true;
+                    $this->is_date = true;
+                }
+            }
+            if ( (int)  $qv['m']) {
+                $this->is_date = true;
+                if (strlen($qv['m']) > 9) {
+                    $this->is_time = true;
+                } else if (strlen($qv['m']) > 7) {
+                    $this->is_day = true;
+                } else if (strlen($qv['m']) > 5) {
+                    $this->is_month = true;
+                } else {
+                    $this->is_year = true;
+                }
+            }
+            if ('' != $qv['w']) {
+                $this->is_date = true;
+            }
+            if (empty($qv['cat']) || ($qv['cat'] == '0')) {
+                $this->is_category = false;
+            } else {
+                if (stristr($qv['cat'],'-')) {
+                    $this->is_category = false;
+                } else {
+                    $this->is_category = true;
+                }
+            }
+            if ('' != $qv['category_name']) {
+                $this->is_category = true;
+            }
+            if ((empty($qv['author'])) || ($qv['author'] == '0')) {
+                $this->is_author = false;
+            } else {
+                $this->is_author = true;
+            }
+            if ('' != $qv['author_name']) {
+                $this->is_author = true;
+            }
+            if ( ($this->is_date || $this->is_author || $this->is_category)) {
+                $this->is_archive = true;
+            }
+            if ( 'attachment' == $qv['show_post_type'] ) {
+                $this->is_attachment = true;
+            }
+        }
+        if ('' != $qv['feed']) {
+            $this->is_feed = true;
+        }
+        if ('' != $qv['tb']) {
+            $this->is_trackback = true;
+        }
+        if ('' != $qv['paged']) {
+            $this->is_paged = true;
+        }
+        if ('' != $qv['comments_popup']) {
+            $this->is_comments_popup = true;
+        }
+        //if we're previewing inside the write screen
+        if ('' != $qv['preview']) {
+            $this->is_preview = true;
+        }
+        if (strstr($_SERVER['PHP_SELF'], 'wp-admin/')) {
+            $this->is_admin = true;
+        }
+        if ( ! ($this->is_attachment || $this->is_archive || $this->is_single || $this->is_page || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup)) {
+            $this->is_home = true;
+        }
+        if ( !empty($query) ) {
+            do_action('parse_query', array(&$this));
+        }
+    }
+    function set_404() {
+        $this->init_query_flags();
+        $this->is_404 = true;
+    }
+    function get($query_var) {
+        if (isset($this->query_vars[$query_var])) {
+            return $this->query_vars[$query_var];
+        }
+        return '';
+    }
+    function set($query_var, $value) {
+        $this->query_vars[$query_var] = $value;
+    }
+    function &get_posts() {
+        global $wpdb, $pagenow, $user_ID;
+        do_action('pre_get_posts', array(&$this));
+        // Shorthand.
+        $q = $this->query_vars;
+        // First let's clear some variables
+        $whichcat = '';
+        $whichauthor = '';
+        $whichpage = '';
+        $result = '';
+        $where = '';
+        $limits = '';
+        $distinct = '';
+        $join = '';
+        if ( !isset($q['posts_per_page']) || $q['posts_per_page'] == 0 )
+            $q['posts_per_page'] = get_settings('posts_per_page');
+        if ( !isset($q['what_to_show']) )
+            $q['what_to_show'] = get_settings('what_to_show');
+        if ( isset($q['showposts']) && $q['showposts'] ) {
+            $q['showposts'] = (int) $q['showposts'];
+            $q['posts_per_page'] = $q['showposts'];
+        }
+        if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
+            $q['posts_per_page'] = $q['posts_per_archive_page'];
+        if ( !isset($q['nopaging']) ) {
+            if ($q['posts_per_page'] == -1) {
+                $q['nopaging'] = true;
+            } else {
+                $q['nopaging'] = false;
+            }
+        }
+        if ( $this->is_feed ) {
+            $q['posts_per_page'] = get_settings('posts_per_rss');
+            $q['what_to_show'] = 'posts';
+        }
+        if (isset($q['page'])) {
+            $q['page'] = trim($q['page'], '/');
+            $q['page'] = (int) $q['page'];
+        }
+        $add_hours = intval(get_settings('gmt_offset'));
+        $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
+        $wp_posts_post_date_field = "post_date"; // "DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)";
+        // If a month is specified in the querystring, load that month
+        if ( (int) $q['m'] ) {
+            $q['m'] = '' . preg_replace('|[^0-9]|', '', $q['m']);
+            $where .= ' AND YEAR(post_date)=' . substr($q['m'], 0, 4);
+            if (strlen($q['m'])>5)
+                $where .= ' AND MONTH(post_date)=' . substr($q['m'], 4, 2);
+            if (strlen($q['m'])>7)
+                $where .= ' AND DAYOFMONTH(post_date)=' . substr($q['m'], 6, 2);
+            if (strlen($q['m'])>9)
+                $where .= ' AND HOUR(post_date)=' . substr($q['m'], 8, 2);
+            if (strlen($q['m'])>11)
+                $where .= ' AND MINUTE(post_date)=' . substr($q['m'], 10, 2);
+            if (strlen($q['m'])>13)
+                $where .= ' AND SECOND(post_date)=' . substr($q['m'], 12, 2);
+        }
+        if ( (int) $q['hour'] ) {
+            $q['hour'] = '' . intval($q['hour']);
+            $where .= " AND HOUR(post_date)='" . $q['hour'] . "'";
+        }
+        if ( (int) $q['minute'] ) {
+            $q['minute'] = '' . intval($q['minute']);
+            $where .= " AND MINUTE(post_date)='" . $q['minute'] . "'";
+        }
+        if ( (int) $q['second'] ) {
+            $q['second'] = '' . intval($q['second']);
+            $where .= " AND SECOND(post_date)='" . $q['second'] . "'";
+        }
+        if ( (int) $q['year'] ) {
+            $q['year'] = '' . intval($q['year']);
+            $where .= " AND YEAR(post_date)='" . $q['year'] . "'";
+        }
+        if ( (int) $q['monthnum'] ) {
+            $q['monthnum'] = '' . intval($q['monthnum']);
+            $where .= " AND MONTH(post_date)='" . $q['monthnum'] . "'";
+        }
+        if ( (int) $q['day'] ) {
+            $q['day'] = '' . intval($q['day']);
+            $where .= " AND DAYOFMONTH(post_date)='" . $q['day'] . "'";
+        }
+        // Compat.  Map subpost to attachment.
+        if ( '' != $q['subpost'] )
+            $q['attachment'] = $q['subpost'];
+        if ( '' != $q['subpost_id'] )
+            $q['attachment_id'] = $q['subpost_id'];
+        if ('' != $q['name']) {
+            $q['name'] = sanitize_title($q['name']);
+            $where .= " AND post_name = '" . $q['name'] . "'";
+        } else if ('' != $q['pagename']) {
+            $q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
+            $page_paths = '/' . trim($q['pagename'], '/');
+            $q['pagename'] = sanitize_title(basename($page_paths));
+            $q['name'] = $q['pagename'];
+            $page_paths = explode('/', $page_paths);
+            foreach($page_paths as $pathdir)
+                $page_path .= ($pathdir!=''?'/':'') . sanitize_title($pathdir);
+            $all_page_ids = get_all_page_ids();
+            $reqpage = 0;
+            if (is_array($all_page_ids)) { foreach ( $all_page_ids as $page_id ) {
+                $page = get_page($page_id);
+                if ( $page->fullpath == $page_path ) {
+                    $reqpage = $page_id;
+                    break;
+                }
+            } }
+            $where .= " AND (ID = '$reqpage')";
+        } elseif ('' != $q['attachment']) {
+            $q['attachment'] = str_replace('%2F', '/', urlencode(urldecode($q['attachment'])));
+            $attach_paths = '/' . trim($q['attachment'], '/');
+            $q['attachment'] = sanitize_title(basename($attach_paths));
+            $q['name'] = $q['attachment'];
+            $where .= " AND post_name = '" . $q['attachment'] . "'";
+        }
+        if ( (int) $q['w'] ) {
+            $q['w'] = ''.intval($q['w']);
+            $where .= " AND WEEK(post_date, 1)='" . $q['w'] . "'";
+        }
+        if ( intval($q['comments_popup']) )
+            $q['p'] = intval($q['comments_popup']);
+        // If a attachment is requested by number, let it supercede any post number.
+        if ( ($q['attachment_id'] != '') && (intval($q['attachment_id']) != 0) )
+            $q['p'] = (int) $q['attachment_id'];
+        // If a post number is specified, load that post
+        if (($q['p'] != '') && intval($q['p']) != 0) {
+            $q['p'] =  (int) $q['p'];
+            $where = ' AND ID = ' . $q['p'];
+        }
+        if (($q['page_id'] != '') && (intval($q['page_id']) != 0)) {
+            $q['page_id'] = intval($q['page_id']);
+            $q['p'] = $q['page_id'];
+            $where = ' AND ID = '.$q['page_id'];
+        }
+        // If a search pattern is specified, load the posts that match
+        if (!empty($q['s'])) {
+            $q['s'] = addslashes_gpc($q['s']);
+            $search = ' AND (';
+            $q['s'] = preg_replace('/, +/', ' ', $q['s']);
+            $q['s'] = str_replace(',', ' ', $q['s']);
+            $q['s'] = str_replace('"', ' ', $q['s']);
+            $q['s'] = trim($q['s']);
+            if ($q['exact']) {
+                $n = '';
+            } else {
+                $n = '%';
+            }
+            if (!$q['sentence']) {
+                $s_array = explode(' ',$q['s']);
+                $q['search_terms'] = $s_array;
+                $search .= '((post_title LIKE \''.$n.$s_array[0].$n.'\') OR (post_content LIKE \''.$n.$s_array[0].$n.'\'))';
+                for ( $i = 1; $i < count($s_array); $i = $i + 1) {
+                    $search .= ' AND ((post_title LIKE \''.$n.$s_array[$i].$n.'\') OR (post_content LIKE \''.$n.$s_array[$i].$n.'\'))';
+                }
+                $search .= ' OR (post_title LIKE \''.$n.$q['s'].$n.'\') OR (post_content LIKE \''.$n.$q['s'].$n.'\')';
+                $search .= ')';
+            } else {
+                $search = ' AND ((post_title LIKE \''.$n.$q['s'].$n.'\') OR (post_content LIKE \''.$n.$q['s'].$n.'\'))';
+            }
+        }
+        // Category stuff
+        if ((empty($q['cat'])) || ($q['cat'] == '0') ||
+                // Bypass cat checks if fetching specific posts
+                ( $this->is_single || $this->is_page )) {
+            $whichcat='';
+        } else {
+            $q['cat'] = ''.urldecode($q['cat']).'';
+            $q['cat'] = addslashes_gpc($q['cat']);
+            if (stristr($q['cat'],'-')) {
+                // Note: if we have a negative, we ignore all the positives. It must
+                // always mean 'everything /except/ this one'. We should be able to do
+                // multiple negatives but we don't :-(
+                $eq = '!=';
+                $andor = 'AND';
+                $q['cat'] = explode('-',$q['cat']);
+                $q['cat'] = intval($q['cat'][1]);
+            } else {
+                $eq = '=';
+                $andor = 'OR';
+            }
+            $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) ";
+            $cat_array = preg_split('/[,\s]+/', $q['cat']);
+            $whichcat .= ' AND (category_id '.$eq.' '.intval($cat_array[0]);
+            $whichcat .= get_category_children($cat_array[0], ' '.$andor.' category_id '.$eq.' ');
+            for ($i = 1; $i < (count($cat_array)); $i = $i + 1) {
+                $whichcat .= ' '.$andor.' category_id '.$eq.' '.intval($cat_array[$i]);
+                $whichcat .= get_category_children($cat_array[$i], ' '.$andor.' category_id '.$eq.' ');
+            }
+            $whichcat .= ')';
+            if ($eq == '!=') {
+                $q['cat'] = '-'.$q['cat']; // Put back the knowledge that we are excluding a category.
+            }
+        }
+        // Category stuff for nice URIs
+        global $cache_categories;
+        if ('' != $q['category_name']) {
+            $cat_paths = '/' . trim(urldecode($q['category_name']), '/');
+            $q['category_name'] = sanitize_title(basename($cat_paths));
+            $cat_paths = explode('/', $cat_paths);
+            foreach($cat_paths as $pathdir)
+                $cat_path .= ($pathdir!=''?'/':'') . sanitize_title($pathdir);
+            $all_cat_ids = get_all_category_ids();
+            $q['cat'] = 0; $partial_match = 0;
+            foreach ( $all_cat_ids as $cat_id ) {
+                $cat = get_category($cat_id);
+                if ( $cat->fullpath == $cat_path ) {
+                    $q['cat'] = $cat_id;
+                    break;
+                } elseif ( $cat->category_nicename == $q['category_name'] ) {
+                    $partial_match = $cat_id;
+                }
+            }
+            //if we don't match the entire hierarchy fallback on just matching the nicename
+            if (!$q['cat'] && $partial_match) {
+                $q['cat'] = $partial_match;
+            }
+            $tables = ", $wpdb->post2cat, $wpdb->categories";
+            $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) LEFT JOIN $wpdb->categories ON ($wpdb->post2cat.category_id = $wpdb->categories.cat_ID) ";
+            $whichcat = " AND (category_id = '" . $q['cat'] . "'";
+            $whichcat .= get_category_children($q['cat'], " OR category_id = ");
+            $whichcat .= ")";
+        }
+        // Author/user stuff
+        if ((empty($q['author'])) || ($q['author'] == '0')) {
+            $whichauthor='';
+        } else {
+            $q['author'] = ''.urldecode($q['author']).'';
+            $q['author'] = addslashes_gpc($q['author']);
+            if (stristr($q['author'], '-')) {
+                $eq = '!=';
+                $andor = 'AND';
+                $q['author'] = explode('-', $q['author']);
+                $q['author'] = ''.intval($q['author'][1]);
+            } else {
+                $eq = '=';
+                $andor = 'OR';
+            }
+            $author_array = preg_split('/[,\s]+/', $q['author']);
+            $whichauthor .= ' AND (post_author '.$eq.' '.intval($author_array[0]);
+            for ($i = 1; $i < (count($author_array)); $i = $i + 1) {
+                $whichauthor .= ' '.$andor.' post_author '.$eq.' '.intval($author_array[$i]);
+            }
+            $whichauthor .= ')';
+        }
+        // Author stuff for nice URIs
+        if ('' != $q['author_name']) {
+            if (stristr($q['author_name'],'/')) {
+                $q['author_name'] = explode('/',$q['author_name']);
+                if ($q['author_name'][count($q['author_name'])-1]) {
+                    $q['author_name'] = $q['author_name'][count($q['author_name'])-1];#no trailing slash
+                } else {
+                    $q['author_name'] = $q['author_name'][count($q['author_name'])-2];#there was a trailling slash
+                }
+            }
+            $q['author_name'] = sanitize_title($q['author_name']);
+            $q['author'] = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_nicename='".$q['author_name']."'");
+            $whichauthor .= ' AND (post_author = '.intval($q['author']).')';
+        }
+        $where .= $search.$whichcat.$whichauthor;
+        if ((empty($q['order'])) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC'))) {
+            $q['order']='DESC';
+        }
+        // Order by
+        if (empty($q['orderby'])) {
+            $q['orderby']='date '.$q['order'];
+        } else {
+            // Used to filter values
+            $allowed_keys = array('author', 'date', 'category', 'title', 'modified');
+            $q['orderby'] = urldecode($q['orderby']);
+            $q['orderby'] = addslashes_gpc($q['orderby']);
+            $orderby_array = explode(' ',$q['orderby']);
+            if (!in_array($orderby_array[0],$allowed_keys)) {
+                $orderby_array[0] = 'date';
+            }
+            $q['orderby'] = $orderby_array[0].' '.$q['order'];
+            if (count($orderby_array)>1) {
+                for ($i = 1; $i < (count($orderby_array)); $i = $i + 1) {
+                    // Only allow certain values for safety
+                    if (in_array($orderby_array[$i],$allowed_keys)) {
+                        $q['orderby'] .= ',post_'.$orderby_array[$i].' '.$q['order'];
+                    }
+                }
+            }
+        }
+        $now = gmdate('Y-m-d H:i:59');
+        //only select past-dated posts, except if a logged in user is viewing a single: then, if they
+        //can edit the post, we let them through
+        if ($pagenow != 'post.php' && $pagenow != 'edit.php' && !($this->is_single && $user_ID)) {
+            $where .= " AND post_date_gmt <= '$now'";
+            $distinct = 'DISTINCT';
+        }
+        if ( $this->is_attachment ) {
+            $where .= ' AND (post_status = "attachment")';
+        } elseif ($this->is_page) {
+            $where .= ' AND (post_status = "static")';
+        } elseif ($this->is_single) {
+            $where .= ' AND (post_status != "static")';
+        } else {
+            $where .= ' AND (post_status = "publish"';
+            if (isset($user_ID) && ('' != intval($user_ID)))
+                $where .= " OR post_author = $user_ID AND post_status != 'draft' AND post_status != 'static')";
+            else
+                $where .= ')';
+        }
+        if (! $this->is_attachment )
+            $where .= ' AND post_status != "attachment"';
+        // Apply filters on where and join prior to paging so that any
+        // manipulations to them are reflected in the paging by day queries.
+        $where = apply_filters('posts_where', $where);
+        $join = apply_filters('posts_join', $join);
+        // Paging
+        if (empty($q['nopaging']) && ! $this->is_single) {
+            $page = $q['paged'];
+            if (empty($page)) {
+                $page = 1;
+            }
+            if (($q['what_to_show'] == 'posts')) {
+                $pgstrt = '';
+                $pgstrt = (intval($page) -1) * $q['posts_per_page'] . ', ';
+                $limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
+            } elseif ($q['what_to_show'] == 'days') {
+                $startrow = $q['posts_per_page'] * (intval($page)-1);
+                $start_date = $wpdb->get_var("SELECT max(post_date) FROM $wpdb->posts $join WHERE (1=1) $where GROUP BY year(post_date), month(post_date), dayofmonth(post_date) ORDER BY post_date DESC LIMIT $startrow,1");
+                $endrow = $startrow + $q['posts_per_page'] - 1;
+                $end_date = $wpdb->get_var("SELECT min(post_date) FROM $wpdb->posts $join WHERE (1=1) $where GROUP BY year(post_date), month(post_date), dayofmonth(post_date) ORDER BY post_date DESC LIMIT $endrow,1");
+                if ($page > 1) {
+                    $where .= " AND post_date >= '$end_date' AND post_date <= '$start_date'";
+                } else {
+                    $where .= " AND post_date >= '$end_date'";
+                }
+            }
+        }
+        // Apply post-paging filters on where and join.  Only plugins that
+        // manipulate paging queries should use these hooks.
+        $where = apply_filters('posts_where_paged', $where);
+        $groupby = " $wpdb->posts.ID ";
+        $groupby = apply_filters('posts_groupby', $groupby);
+        $join = apply_filters('posts_join_paged', $join);
+        $orderby = "post_" . $q['orderby'];
+        $orderby = apply_filters('posts_orderby', $orderby);
+        $request = " SELECT $distinct * FROM $wpdb->posts $join WHERE 1=1" . $where . " GROUP BY " . $groupby . " ORDER BY " . $orderby . " $limits";
+        $this->request = apply_filters('posts_request', $request);
+        $this->posts = $wpdb->get_results($this->request);
+        // Check post status to determine if post should be displayed.
+        if ($this->is_single) {
+            $status = get_post_status($this->posts[0]);
+            if ( ('publish' != $status) && ('static' != $status) ) {
+                if ( ! (isset($user_ID) && ('' != intval($user_ID))) ) {
+                    // User must be logged in to view unpublished posts.
+                    $this->posts = array();
+                } else {
+                    if ('draft' == $status) {
+                        // User must have edit permissions on the draft to preview.
+                        if (! current_user_can('edit_post', $this->posts[0]->ID)) {
+                            $this->posts = array();
+                        } else {
+                            $this->is_preview = true;
+                            $this->posts[0]->post_date = current_time('mysql');
+                        }
+                    } else {
+                        if (! current_user_can('read_post', $this->posts[0]->ID))
+                            $this->posts = array();
+                    }
+                }
+            } else {
+                if (mysql2date('U', $this->posts[0]->post_date_gmt) > mysql2date('U', $now)) { //it's future dated
+                    $this->is_preview = true;
+                    if (!current_user_can('edit_post', $this->posts[0]->ID)) {
+                        $this->posts = array ( );
+                    }
+                }
+            }
+        }
+        update_post_caches($this->posts);
+        $this->posts = apply_filters('the_posts', $this->posts);
+        $this->post_count = count($this->posts);
+        if ($this->post_count > 0) {
+            $this->post = $this->posts[0];
+        }
+        // Save any changes made to the query vars.
+        $this->query_vars = $q;
+        return $this->posts;
+    }
+    function next_post() {
+        $this->current_post++;
+        $this->post = $this->posts[$this->current_post];
+        return $this->post;
+    }
+    function the_post() {
+        global $post;
+        $this->in_the_loop = true;
+        $post = $this->next_post();
+        setup_postdata($post);
+        if ( $this->current_post == 0 ) // loop has just started
+            do_action('loop_start');
+    }
+    function have_posts() {
+        if ($this->current_post + 1 < $this->post_count) {
+            return true;
+        } elseif ($this->current_post + 1 == $this->post_count) {
+            do_action('loop_end');
+            // Do some cleaning up after the loop
+            $this->rewind_posts();
+        }
+        $this->in_the_loop = false;
+        return false;
+    }
+    function rewind_posts() {
+        $this->current_post = -1;
+        if ($this->post_count > 0) {
+            $this->post = $this->posts[0];
+        }
+    }
+    function &query($query) {
+        $this->parse_query($query);
+        return $this->get_posts();
+    }
+    function get_queried_object() {
+        if (isset($this->queried_object)) {
+            return $this->queried_object;
+        }
+        $this->queried_object = NULL;
+        $this->queried_object_id = 0;
+        if ($this->is_category) {
+            $cat = $this->get('cat');
+            $category = &get_category($cat);
+            $this->queried_object = &$category;
+            $this->queried_object_id = $cat;
+        } else if ($this->is_single) {
+            $this->queried_object = $this->post;
+            $this->queried_object_id = $this->post->ID;
+        } else if ($this->is_page) {
+            $this->queried_object = $this->post;
+            $this->queried_object_id = $this->post->ID;
+        } else if ($this->is_author) {
+            $author_id = $this->get('author');
+            $author = get_userdata($author_id);
+            $this->queried_object = $author;
+            $this->queried_object_id = $author_id;
+        }
+        return $this->queried_object;
+    }
+    function get_queried_object_id() {
+        $this->get_queried_object();
+        if (isset($this->queried_object_id)) {
+            return $this->queried_object_id;
+        }
+        return 0;
+    }
+    function WP_Query ($query = '') {
+        if (! empty($query)) {
+            $this->query($query);
+        }
+    }
+}
+class retrospam_mgr {
+    var $spam_words;
+    var $comments_list;
+    var $found_comments;
+    function retrospam_mgr() {
+        global $wpdb;
+        $list = explode("\n", get_settings('moderation_keys') );
+        $list = array_unique( $list );
+        $this->spam_words = $list;
+        $this->comment_list = $wpdb->get_results("SELECT comment_ID AS ID, comment_content AS text, comment_approved AS approved, comment_author_url AS url, comment_author_ip AS ip, comment_author_email AS email FROM $wpdb->comments ORDER BY comment_ID ASC");
+    }   // End of class constructor
+    function move_spam( $id_list ) {
+        global $wpdb;
+        $cnt = 0;
+        $id_list = explode( ',', $id_list );
+        foreach ( $id_list as $comment ) {
+            if ( $wpdb->query("update $wpdb->comments set comment_approved = '0' where comment_ID = '$comment'") ) {
+                $cnt++;
+            }
+        }
+        echo "<div class='updated'><p>$cnt comment";
+        if ($cnt != 1 ) echo "s";
+        echo " moved to the moderation queue.</p></div>\n";
+    }   // End function move_spam
+    function find_spam() {
+        $in_queue = 0;
+        foreach( $this->comment_list as $comment ) {
+            if( $comment->approved == 1 ) {
+                foreach( $this->spam_words as $word ) {
+                    $word = trim($word);
+                    if ( empty( $word ) )
+                        continue;
+                    $fulltext = strtolower($comment->email.' '.$comment->url.' '.$comment->ip.' '.$comment->text);
+                    if( strpos( $fulltext, strtolower($word) ) != FALSE ) {
+                        $this->found_comments[] = $comment->ID;
+                        break;
+                    }
+                }
+            } else {
+                $in_queue++;
+            }
+        }
+        return array( 'found' => $this->found_comments, 'in_queue' => $in_queue );
+    }   // End function find_spam
+    function display_edit_form( $counters ) {
+        $numfound = count($counters[found]);
+        $numqueue = $counters[in_queue];
+        $body = '<p>' . sprintf(__('Suspected spam comments: <strong>%s</strong>'), $numfound) . '</p>';
+        if ( count($counters[found]) > 0 ) {
+            $id_list = implode( ',', $counters[found] );
+            $body .= '<p><a href="options-discussion.php?action=retrospam&amp;move=true&amp;ids='.$id_list.'">'. __('Move suspect comments to moderation queue &raquo;') . '</a></p>';
+        }
+        $head = '<div class="wrap"><h2>' . __('Check Comments Results:') . '</h2>';
+        $foot .= '<p><a href="options-discussion.php">' . __('&laquo; Return to Discussion Options page.') . '</a></p></div>';
+        return $head . $body . $foot;
+    }   // End function display_edit_form
+}
+class WP_Rewrite {
+    var $permalink_structure;
+    var $category_base;
+    var $category_structure;
+    var $author_base = 'author';
+    var $author_structure;
+    var $date_structure;
+    var $page_structure;
+    var $search_base = 'search';
+    var $search_structure;
+    var $comments_base = 'comments';
+    var $feed_base = 'feed';
+    var $comments_feed_structure;
+    var $feed_structure;
+    var $front;
+    var $root = '';
+    var $index = 'index.php';
+    var $matches = '';
+    var $rules;
+    var $use_verbose_rules = false;
+    var $rewritecode =
+        array(
+                    '%year%',
+                    '%monthnum%',
+                    '%day%',
+                    '%hour%',
+                    '%minute%',
+                    '%second%',
+                    '%postname%',
+                    '%post_id%',
+                    '%category%',
+                    '%author%',
+                    '%pagename%',
+                    '%search%'
+                    );
+    var $rewritereplace =
+        array(
+                    '([0-9]{4})',
+                    '([0-9]{1,2})',
+                    '([0-9]{1,2})',
+                    '([0-9]{1,2})',
+                    '([0-9]{1,2})',
+                    '([0-9]{1,2})',
+                    '([^/]+)',
+                    '([0-9]+)',
+                    '(.+?)',
+                    '([^/]+)',
+                    '([^/]+)',
+                    '(.+)'
+                    );
+    var $queryreplace =
+        array (
+                    'year=',
+                    'monthnum=',
+                    'day=',
+                    'hour=',
+                    'minute=',
+                    'second=',
+                    'name=',
+                    'p=',
+                    'category_name=',
+                    'author_name=',
+                    'pagename=',
+                    's='
+                    );
+    var $feeds = array ('feed', 'rdf', 'rss', 'rss2', 'atom');
+    function using_permalinks() {
+        if (empty($this->permalink_structure))
+            return false;
+        else
+            return true;
+    }
+    function using_index_permalinks() {
+        if (empty($this->permalink_structure)) {
+            return false;
+        }
+        // If the index is not in the permalink, we're using mod_rewrite.
+        if (preg_match('#^/*' . $this->index . '#', $this->permalink_structure)) {
+            return true;
+        }
+        return false;
+    }
+    function using_mod_rewrite_permalinks() {
+        if ( $this->using_permalinks() && ! $this->using_index_permalinks())
+            return true;
+        else
+            return false;
+    }
+    function preg_index($number) {
+        $match_prefix = '$';
+        $match_suffix = '';
+        if (! empty($this->matches)) {
+            $match_prefix = '$' . $this->matches . '[';
+            $match_suffix = ']';
+        }
+        return "$match_prefix$number$match_suffix";
+    }
+    function page_rewrite_rules() {
+        $uris = get_settings('page_uris');
+        $attachment_uris = get_settings('page_attachment_uris');
+        $rewrite_rules = array();
+        $page_structure = $this->get_page_permastruct();
+        if( is_array( $attachment_uris ) ) {
+            foreach ($attachment_uris as $uri => $pagename) {
+                $this->add_rewrite_tag('%pagename%', "($uri)", 'attachment=');
+                $rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure));
+            }
+        }
+        if( is_array( $uris ) ) {
+            foreach ($uris as $uri => $pagename) {
+                $this->add_rewrite_tag('%pagename%', "($uri)", 'pagename=');
+                $rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure));
+            }
+        }
+        return $rewrite_rules;
+    }
+    function get_date_permastruct() {
+        if (isset($this->date_structure)) {
+            return $this->date_structure;
+        }
+        if (empty($this->permalink_structure)) {
+            $this->date_structure = '';
+            return false;
+        }
+        // The date permalink must have year, month, and day separated by slashes.
+        $endians = array('%year%/%monthnum%/%day%', '%day%/%monthnum%/%year%', '%monthnum%/%day%/%year%');
+        $this->date_structure = '';
+        $date_endian = '';
+        foreach ($endians as $endian) {
+            if (false !== strpos($this->permalink_structure, $endian)) {
+                $date_endian= $endian;
+                break;
+            }
+        }
+        if ( empty($date_endian) )
+            $date_endian = '%year%/%monthnum%/%day%';
+        // Do not allow the date tags and %post_id% to overlap in the permalink
+        // structure. If they do, move the date tags to $front/date/.
+        $front = $this->front;
+        preg_match_all('/%.+?%/', $this->permalink_structure, $tokens);
+        $tok_index = 1;
+        foreach ($tokens[0] as $token) {
+            if ( ($token == '%post_id%') && ($tok_index <= 3) ) {
+                $front = $front . 'date/';
+                break;
+            }
+        }
+        $this->date_structure = $front . $date_endian;
+        return $this->date_structure;
+    }
+    function get_year_permastruct() {
+        $structure = $this->get_date_permastruct($this->permalink_structure);
+        if (empty($structure)) {
+            return false;
+        }
+        $structure = str_replace('%monthnum%', '', $structure);
+        $structure = str_replace('%day%', '', $structure);
+        $structure = preg_replace('#/+#', '/', $structure);
+        return $structure;
+    }
+    function get_month_permastruct() {
+        $structure = $this->get_date_permastruct($this->permalink_structure);
+        if (empty($structure)) {
+            return false;
+        }
+        $structure = str_replace('%day%', '', $structure);
+        $structure = preg_replace('#/+#', '/', $structure);
+        return $structure;
+    }
+    function get_day_permastruct() {
+        return $this->get_date_permastruct($this->permalink_structure);
+    }
+    function get_category_permastruct() {
+        if (isset($this->category_structure)) {
+            return $this->category_structure;
+        }
+        if (empty($this->permalink_structure)) {
+            $this->category_structure = '';
+            return false;
+        }
+        if (empty($this->category_base))
+            $this->category_structure = $this->front . 'category/';
+        else
+            $this->category_structure = $this->category_base . '/';
+        $this->category_structure .= '%category%';
+        return $this->category_structure;
+    }
+    function get_author_permastruct() {
+        if (isset($this->author_structure)) {
+            return $this->author_structure;
+        }
+        if (empty($this->permalink_structure)) {
+            $this->author_structure = '';
+            return false;
+        }
+        $this->author_structure = $this->front . $this->author_base . '/%author%';
+        return $this->author_structure;
+    }
+    function get_search_permastruct() {
+        if (isset($this->search_structure)) {
+            return $this->search_structure;
+        }
+        if (empty($this->permalink_structure)) {
+            $this->search_structure = '';
+            return false;
+        }
+        $this->search_structure = $this->root . $this->search_base . '/%search%';
+        return $this->search_structure;
+    }
+    function get_page_permastruct() {
+        if (isset($this->page_structure)) {
+            return $this->page_structure;
+        }
+        if (empty($this->permalink_structure)) {
+            $this->page_structure = '';
+            return false;
+        }
+        $this->page_structure = $this->root . '%pagename%';
+        return $this->page_structure;
+    }
+    function get_feed_permastruct() {
+        if (isset($this->feed_structure)) {
+            return $this->feed_structure;
+        }
+        if (empty($this->permalink_structure)) {
+            $this->feed_structure = '';
+            return false;
+        }
+        $this->feed_structure = $this->root . $this->feed_base . '/%feed%';
+        return $this->feed_structure;
+    }
+    function get_comment_feed_permastruct() {
+        if (isset($this->comment_feed_structure)) {
+            return $this->comment_feed_structure;
+        }
+        if (empty($this->permalink_structure)) {
+            $this->comment_feed_structure = '';
+            return false;
+        }
+        $this->comment_feed_structure = $this->root . $this->comments_base . '/' . $this->feed_base . '/%feed%';
+        return $this->comment_feed_structure;
+    }
+    function add_rewrite_tag($tag, $pattern, $query) {
+        // If the tag already exists, replace the existing pattern and query for
+        // that tag, otherwise add the new tag, pattern, and query to the end of
+        // the arrays.
+        $position = array_search($tag, $this->rewritecode);
+        if (FALSE !== $position && NULL !== $position) {
+            $this->rewritereplace[$position] = $pattern;
+            $this->queryreplace[$position] = $query;
+        } else {
+            $this->rewritecode[] = $tag;
+            $this->rewritereplace[] = $pattern;
+            $this->queryreplace[] = $query;
+        }
+    }
+    function generate_rewrite_rules($permalink_structure, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true) {
+        $feedregex2 = '';
+        foreach ($this->feeds as $feed_name) {
+            $feedregex2 .= $feed_name . '|';
+        }
+        $feedregex2 = '(' . trim($feedregex2, '|') .  ')/?$';
+        $feedregex = $this->feed_base  . '/' . $feedregex2;
+        $trackbackregex = 'trackback/?$';
+        $pageregex = 'page/?([0-9]{1,})/?$';
+        $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
+        preg_match_all('/%.+?%/', $permalink_structure, $tokens);
+        $num_tokens = count($tokens[0]);
+        $index = $this->index;
+        $feedindex = $index;
+        $trackbackindex = $index;
+        for ($i = 0; $i < $num_tokens; ++$i) {
+            if (0 < $i) {
+                $queries[$i] = $queries[$i - 1] . '&';
+            }
+            $query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
+            $queries[$i] .= $query_token;
+        }
+        $structure = $permalink_structure;
+        if ($front != '/') {
+            $structure = str_replace($front, '', $structure);
+        }
+        $structure = trim($structure, '/');
+        if ($walk_dirs) {
+            $dirs = explode('/', $structure);
+        } else {
+            $dirs[] = $structure;
+        }
+        $num_dirs = count($dirs);
+        $front = preg_replace('|^/+|', '', $front);
+        $post_rewrite = array();
+        $struct = $front;
+        for ($j = 0; $j < $num_dirs; ++$j) {
+            $struct .= $dirs[$j] . '/';
+            $struct = ltrim($struct, '/');
+            $match = str_replace($this->rewritecode, $this->rewritereplace, $struct);
+            $num_toks = preg_match_all('/%.+?%/', $struct, $toks);
+            $query = $queries[$num_toks - 1];
+            $pagematch = $match . $pageregex;
+            $pagequery = $index . '?' . $query . '&paged=' . $this->preg_index($num_toks + 1);
+            $feedmatch = $match . $feedregex;
+            $feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+            $feedmatch2 = $match . $feedregex2;
+            $feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+            if ($forcomments) {
+                $feedquery .= '&withcomments=1';
+                $feedquery2 .= '&withcomments=1';
+            }
+            $rewrite = array();
+            if ($feed)
+                $rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2);
+            if ($paged)
+                $rewrite = array_merge($rewrite, array($pagematch => $pagequery));
+            if ($num_toks) {
+                $post = false;
+                $page = false;
+                if (strstr($struct, '%postname%') || strstr($struct, '%post_id%')
+                        || strstr($struct, '%pagename%')
+                        || (strstr($struct, '%year%') &&  strstr($struct, '%monthnum%') && strstr($struct, '%day%') && strstr($struct, '%hour%') && strstr($struct, '%minute') && strstr($struct, '%second%'))) {
+                    $post = true;
+                    if  ( strstr($struct, '%pagename%') )
+                        $page = true;
+                    $trackbackmatch = $match . $trackbackregex;
+                    $trackbackquery = $trackbackindex . '?' . $query . '&tb=1';
+                    $match = rtrim($match, '/');
+                    $submatchbase = str_replace(array('(',')'),'',$match);
+                    $sub1 = $submatchbase . '/([^/]+)/';
+                    $sub1tb = $sub1 . $trackbackregex;
+                    $sub1feed = $sub1 . $feedregex;
+                    $sub1feed2 = $sub1 . $feedregex2;
+                    $sub1 .= '?$';
+                    $sub2 = $submatchbase . '/attachment/([^/]+)/';
+                    $sub2tb = $sub2 . $trackbackregex;
+                    $sub2feed = $sub2 . $feedregex;
+                    $sub2feed2 = $sub2 . $feedregex2;
+                    $sub2 .= '?$';
+                    $subquery = $index . '?attachment=' . $this->preg_index(1);
+                    $subtbquery = $subquery . '&tb=1';
+                    $subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
+                    $match = $match . '(/[0-9]+)?/?$';
+                    $query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1);
+                } else {
+                    $match .= '?$';
+                    $query = $index . '?' . $query;
+                }
+                $rewrite = array_merge($rewrite, array($match => $query));
+                if ($post) {
+                    $rewrite = array_merge(array($trackbackmatch => $trackbackquery), $rewrite);
+                    if ( ! $page )
+                        $rewrite = array_merge($rewrite, array($sub1 => $subquery, $sub1tb => $subtbquery, $sub1feed => $subfeedquery, $sub1feed2 => $subfeedquery));
+                    $rewrite = array_merge($rewrite, array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery));
+                }
+            }
+            $post_rewrite = array_merge($rewrite, $post_rewrite);
+        }
+        return $post_rewrite;
+    }
+    function generate_rewrite_rule($permalink_structure, $walk_dirs = false) {
+        return $this->generate_rewrite_rules($permalink_structure, false, false, false, $walk_dirs);
+    }
+    /* rewrite_rules
+     * Construct rewrite matches and queries from permalink structure.
+     * Returns an associate array of matches and queries.
+     */
+    function rewrite_rules() {
+        $rewrite = array();
+        if (empty($this->permalink_structure)) {
+            return $rewrite;
+        }
+        // Post
+        $post_rewrite = $this->generate_rewrite_rules($this->permalink_structure);
+        $post_rewrite = apply_filters('post_rewrite_rules', $post_rewrite);
+        // Date
+        $date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct());
+        $date_rewrite = apply_filters('date_rewrite_rules', $date_rewrite);
+        // Root
+        $root_rewrite = $this->generate_rewrite_rules($this->root . '/');
+        $root_rewrite = apply_filters('root_rewrite_rules', $root_rewrite);
+        // Comments
+        $comments_rewrite = $this->generate_rewrite_rules($this->root . $this->comments_base, true, true, true);
+        $comments_rewrite = apply_filters('comments_rewrite_rules', $comments_rewrite);
+        // Search
+        $search_structure = $this->get_search_permastruct();
+        $search_rewrite = $this->generate_rewrite_rules($search_structure);
+        $search_rewrite = apply_filters('search_rewrite_rules', $search_rewrite);
+        // Categories
+        $category_rewrite = $this->generate_rewrite_rules($this->get_category_permastruct());
+        $category_rewrite = apply_filters('category_rewrite_rules', $category_rewrite);
+        // Authors
+        $author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct());
+        $author_rewrite = apply_filters('author_rewrite_rules', $author_rewrite);
+        // Pages
+        $page_rewrite = $this->page_rewrite_rules();
+        $page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
+        // Put them together.
+        $this->rules = array_merge($page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite);
+        do_action('generate_rewrite_rules', array(&$this));
+        $this->rules = apply_filters('rewrite_rules_array', $this->rules);
+        return $this->rules;
+    }
+    function wp_rewrite_rules() {
+        $this->rules = get_option('rewrite_rules');
+        if ( empty($this->rules) ) {
+            $this->matches = 'matches';
+            $this->rewrite_rules();
+            update_option('rewrite_rules', $this->rules);
+        }
+        return $this->rules;
+    }
+    function mod_rewrite_rules() {
+        if ( ! $this->using_permalinks()) {
+            return '';
+        }
+        $site_root = parse_url(get_settings('siteurl'));
+        $site_root = trailingslashit($site_root['path']);
+        $home_root = parse_url(get_settings('home'));
+        $home_root = trailingslashit($home_root['path']);
+        $rules = "<IfModule mod_rewrite.c>\n";
+        $rules .= "RewriteEngine On\n";
+        $rules .= "RewriteBase $home_root\n";
+        if ($this->use_verbose_rules) {
+            $this->matches = '';
+            $rewrite = $this->rewrite_rules();
+            $num_rules = count($rewrite);
+            $rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" .
+                "RewriteCond %{REQUEST_FILENAME} -d\n" .
+                "RewriteRule ^.*$ - [S=$num_rules]\n";
+            foreach ($rewrite as $match => $query) {
+                // Apache 1.3 does not support the reluctant (non-greedy) modifier.
+                $match = str_replace('.+?', '.+', $match);
+                // If the match is unanchored and greedy, prepend rewrite conditions
+                // to avoid infinite redirects and eclipsing of real files.
+                if ($match == '(.+)/?$' || $match == '([^/]+)/?$' ) {
+                    //nada.
+                }
+                if (strstr($query, $this->index)) {
+                    $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+                } else {
+                    $rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+                }
+            }
+        } else {
+            $rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" .
+                "RewriteCond %{REQUEST_FILENAME} !-d\n" .
+                "RewriteRule . {$home_root}{$this->index} [L]\n";
+        }
+        $rules .= "</IfModule>\n";
+        $rules = apply_filters('mod_rewrite_rules', $rules);
+        $rules = apply_filters('rewrite_rules', $rules);  // Deprecated
+        return $rules;
+    }
+    function flush_rules() {
+        generate_page_rewrite_rules();
+        delete_option('rewrite_rules');
+        $this->wp_rewrite_rules();
+        if ( function_exists('save_mod_rewrite_rules') )
+            save_mod_rewrite_rules();
+    }
+    function init() {
+        $this->permalink_structure = get_settings('permalink_structure');
+        $this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
+        $this->root = '';
+        if ($this->using_index_permalinks()) {
+            $this->root = $this->index . '/';
+        }
+        $this->category_base = get_settings('category_base');
+        unset($this->category_structure);
+        unset($this->author_structure);
+        unset($this->date_structure);
+        unset($this->page_structure);
+        unset($this->search_structure);
+        unset($this->feed_structure);
+        unset($this->comment_feed_structure);
+    }
+    function set_permalink_structure($permalink_structure) {
+        if ($permalink_structure != $this->permalink_structure) {
+            update_option('permalink_structure', $permalink_structure);
+            $this->init();
+        }
+    }
+    function set_category_base($category_base) {
+        if ($category_base != $this->category_base) {
+            update_option('category_base', $category_base);
+            $this->init();
+        }
+    }
+    function WP_Rewrite() {
+        $this->init();
+    }
+}
 class WP {
+    var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 's', 'search', 'exact', 'sentence', 'debug', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots');
+    var $private_query_vars = array('offset', 'posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging', 'post_type');
+    var $extra_query_vars = array();
+    var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 's', 'search', 'exact', 'sentence', 'debug', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview');
+    var $private_query_vars = array('posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging', 'show_post_type');
     var $query_vars;
 …
     var $matched_query;
     var $did_permalink = false;
-    function add_query_var($qv) {
-        $this->public_query_vars[] = $qv;
+    }
     function parse_request($extra_query_vars = '') {
 …
         $this->query_vars = array();
         if ( is_array($extra_query_vars) )
             $this->extra_query_vars = & $extra_query_vars;
         else if (! empty($extra_query_vars))
             parse_str($extra_query_vars, $this->extra_query_vars);
+        if (! empty($extra_query_vars))
+            parse_str($extra_query_vars, $extra_query_vars);
+        else
+            $extra_query_vars = array();
         // Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
 …
             $this->did_permalink = true;
+            if ( isset($_SERVER['PATH_INFO']) )
+                $pathinfo = $_SERVER['PATH_INFO'];
+            else
+                $pathinfo = '';
+            $pathinfo = $_SERVER['PATH_INFO'];
             $pathinfo_array = explode('?', $pathinfo);
             $pathinfo = str_replace("%", "%25", $pathinfo_array[0]);
+            $pathinfo = $pathinfo_array[0];
             $req_uri = $_SERVER['REQUEST_URI'];
             $req_uri_array = explode('?', $req_uri);
             $req_uri = $req_uri_array[0];
             $self = $_SERVER['PHP_SELF'];
+            $home_path = parse_url(get_option('home'));
+            if ( isset($home_path['path']) )
+                $home_path = $home_path['path'];
+            else
+                $home_path = '';
+            $home_path = parse_url(get_settings('home'));
+            $home_path = $home_path['path'];
             $home_path = trim($home_path, '/');
 …
             // front.  For path info requests, this leaves us with the requesting
             // filename, if any.  For 404 requests, this leaves us with the
             // requested permalink.
+            // requested permalink.
             $req_uri = str_replace($pathinfo, '', $req_uri);
             $req_uri = trim($req_uri, '/');
 …
                     // Got a match.
                     $this->matched_rule = $match;
                     // Trim the query of everything up to the '?'.
                     $query = preg_replace("!^.+\?!", '', $query);
 …
                     // Parse the query.
                     parse_str($query, $perma_query_vars);
+                    parse_str($query, $query_vars);
                     // If we're processing a 404 request, clear the error var
 …
                 if (isset($error))
                     unset($error);
                 if ( isset($perma_query_vars) && strstr($_SERVER['PHP_SELF'], 'wp-admin/') )
                     unset($perma_query_vars);
+                if ( isset($query_vars) && strstr($_SERVER['PHP_SELF'], 'wp-admin/') )
+                    unset($query_vars);
                 $this->did_permalink = false;
+            }
 …
         for ($i=0; $i<count($this->public_query_vars); $i += 1) {
             $wpvar = $this->public_query_vars[$i];
             if (isset($this->extra_query_vars[$wpvar]))
                 $this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
+            if (isset($extra_query_vars[$wpvar]))
+                $this->query_vars[$wpvar] = $extra_query_vars[$wpvar];
             elseif (isset($GLOBALS[$wpvar]))
                 $this->query_vars[$wpvar] = $GLOBALS[$wpvar];
 …
             elseif (!empty($_GET[$wpvar]))
                 $this->query_vars[$wpvar] = $_GET[$wpvar];
+            elseif (!empty($perma_query_vars[$wpvar]))
+                $this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
+        }
+        foreach ($this->private_query_vars as $var) {
+            if (isset($this->extra_query_vars[$var]))
+                $this->query_vars[$var] = $this->extra_query_vars[$var];
+            elseif (isset($GLOBALS[$var]) && '' != $GLOBALS[$var])
+                $this->query_vars[$var] = $GLOBALS[$var];
+            elseif (!empty($query_vars[$wpvar]))
+                $this->query_vars[$wpvar] = $query_vars[$wpvar];
+            else
+                $this->query_vars[$wpvar] = '';
+        }
         if ( isset($error) )
             $this->query_vars['error'] = $error;
-        $this->query_vars = apply_filters('request', $this->query_vars);
-        do_action_ref_array('parse_request', array(&$this));
+    }
     function send_headers() {
+        global $current_user;
         @header('X-Pingback: '. get_bloginfo('pingback_url'));
         if ( is_user_logged_in() )
 …
         if ( !empty($this->query_vars['error']) && '404' == $this->query_vars['error'] ) {
             status_header( 404 );
-            if ( !is_user_logged_in() )
-                nocache_headers();
-            @header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
         } else if ( empty($this->query_vars['feed']) ) {
             @header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 …
             // Support for Conditional GET
+            if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
+                $client_etag = stripslashes(stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
+            if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
             else $client_etag = false;
 …
             $client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;
             // Make a timestamp for our most recent modification...
+            // Make a timestamp for our most recent modification...
             $wp_modified_timestamp = strtotime($wp_last_modified);
 …
+            }
+        }
-        do_action_ref_array('send_headers', array(&$this));
+    }
     function build_query_string() {
         $this->query_string = '';
+        foreach (array_keys($this->query_vars) as $wpvar) {
+            if ( '' != $this->query_vars[$wpvar] ) {
+        foreach ($this->public_query_vars as $wpvar) {
+            if (isset($this->query_vars[$wpvar]) && '' != $this->query_vars[$wpvar]) {
                 $this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
                 $this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
 …
+        }
+        // query_string filter deprecated.  Use request filter instead.
+        global $wp_filter;
+        if ( isset($wp_filter['query_string']) ) {  // Don't bother filtering and parsing if no plugins are hooked in.
+            $this->query_string = apply_filters('query_string', $this->query_string);
+            parse_str($this->query_string, $this->query_vars);
+        }
+        foreach ($this->private_query_vars as $wpvar) {
+            if (isset($GLOBALS[$wpvar]) && '' != $GLOBALS[$wpvar]) {
+                $this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
+                $this->query_string .= $wpvar . '=' . rawurlencode($GLOBALS[$wpvar]);
+            }
+        }
+        $this->query_string = apply_filters('query_string', $this->query_string);
+    }
 …
     function init() {
         wp_get_current_user();
+        get_currentuserinfo();
+    }
     function query_posts() {
         $this->build_query_string();
         query_posts($this->query_vars);
+        query_posts($this->query_string);
+    }
 …
             $wp_query->set_404();
             status_header( 404 );
-            nocache_headers();
         }   elseif( is_404() != true ) {
             status_header( 200 );
 …
         $this->handle_404();
         $this->register_globals();
-        do_action_ref_array('wp', array(&$this));
+    }
 …
+}
-class WP_Error {
-    var $errors = array();
-    var $error_data = array();
-    function WP_Error($code = '', $message = '', $data = '') {
-        if ( empty($code) )
-            return;
-        $this->errors[$code][] = $message;
-        if ( ! empty($data) )
-            $this->error_data[$code] = $data;
+    }
-    function get_error_codes() {
-        if ( empty($this->errors) )
-            return array();
-        return array_keys($this->errors);
+    }
-    function get_error_code() {
-        $codes = $this->get_error_codes();
-        if ( empty($codes) )
-            return '';
-        return $codes[0];
+    }
-    function get_error_messages($code = '') {
-        // Return all messages if no code specified.
-        if ( empty($code) ) {
-            $all_messages = array();
-            foreach ( $this->errors as $code => $messages )
-                $all_messages = array_merge($all_messages, $messages);
-            return $all_messages;
+        }
-        if ( isset($this->errors[$code]) )
-            return $this->errors[$code];
-        else
-            return array();
+    }
-    function get_error_message($code = '') {
-        if ( empty($code) )
-            $code = $this->get_error_code();
-        $messages = $this->get_error_messages($code);
-        if ( empty($messages) )
-            return '';
-        return $messages[0];
+    }
-    function get_error_data($code = '') {
-        if ( empty($code) )
-            $code = $this->get_error_code();
-        if ( isset($this->error_data[$code]) )
-            return $this->error_data[$code];
-        return null;
+    }
-    function add($code, $message, $data = '') {
-        $this->errors[$code][] = $message;
-        if ( ! empty($data) )
-            $this->error_data[$code] = $data;
+    }
-    function add_data($data, $code = '') {
-        if ( empty($code) )
-            $code = $this->get_error_code();
-        $this->error_data[$code] = $data;
+    }
+}
-function is_wp_error($thing) {
-    if ( is_object($thing) && is_a($thing, 'WP_Error') )
-        return true;
-    return false;
+}
-// A class for displaying various tree-like structures. Extend the Walker class to use it, see examples at the bottom
-class Walker {
-    var $tree_type;
-    var $db_fields;
-    //abstract callbacks
-    function start_lvl($output) { return $output; }
-    function end_lvl($output)   { return $output; }
-    function start_el($output)  { return $output; }
-    function end_el($output)    { return $output; }
-    function walk($elements, $to_depth) {
-        $args = array_slice(func_get_args(), 2); $parents = array(); $depth = 1; $previous_element = ''; $output = '';
-        //padding at the end
-        $last_element->post_parent = 0;
-        $last_element->post_id = 0;
-        $elements[] = $last_element;
-        $id_field = $this->db_fields['id'];
-        $parent_field = $this->db_fields['parent'];
-        $flat = ($to_depth == -1) ? true : false;
-        foreach ( $elements as $element ) {
-            // If flat, start and end the element and skip the level checks.
-            if ( $flat) {
-                // Start the element.
-                if ( isset($element->$id_field) && $element->$id_field != 0 ) {
-                    $cb_args = array_merge( array($output, $element, $depth - 1), $args);
-                    $output = call_user_func_array(array(&$this, 'start_el'), $cb_args);
+                }
-                // End the element.
-                if ( isset($element->$id_field) && $element->$id_field != 0 ) {
-                    $cb_args = array_merge( array($output, $element, $depth - 1), $args);
-                    $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
+                }
-                continue;
+            }
-            // Walk the tree.
-            if ( !empty($previous_element) && ($element->$parent_field == $previous_element->$id_field) ) {
-                // Previous element is my parent. Descend a level.
-                array_unshift($parents, $previous_element);
-                $depth++; //always do this so when we start the element further down, we know where we are
-                if ( !$to_depth || ($depth < $to_depth) ) { //only descend if we're below $to_depth
-                    $cb_args = array_merge( array($output, $depth - 1), $args);
-                    $output = call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
+                }
-            } else if ( $element->$parent_field == $previous_element->$parent_field) {
-                // On the same level as previous element.
-                if ( !$to_depth || ($depth <= $to_depth) ) {
-                    $cb_args = array_merge( array($output, $previous_element, $depth - 1), $args);
-                    $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
+                }
-            } else if ( $depth > 1 ) {
-                // Ascend one or more levels.
-                if ( !$to_depth || ($depth <= $to_depth) ) {
-                    $cb_args = array_merge( array($output, $previous_element, $depth - 1), $args);
-                    $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
+                }
-                while ( $parent = array_shift($parents) ) {
-                    $depth--;
-                    if ( !$to_depth || ($depth < $to_depth) ) {
-                        $cb_args = array_merge( array($output, $depth - 1), $args);
-                        $output = call_user_func_array(array(&$this, 'end_lvl'), $cb_args);
-                        $cb_args = array_merge( array($output, $parent, $depth - 1), $args);
-                        $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
+                    }
-                    if ( $element->$parent_field == $parents[0]->$id_field ) {
-                        break;
+                    }
+                }
-            } else if ( !empty($previous_element) ) {
-                // Close off previous element.
-                if ( !$to_depth || ($depth <= $to_depth) ) {
-                    $cb_args = array_merge( array($output, $previous_element, $depth - 1), $args);
-                    $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
+                }
+            }
-            // Start the element.
-            if ( !$to_depth || ($depth <= $to_depth) ) {
-                if ( $element->$id_field != 0 ) {
-                    $cb_args = array_merge( array($output, $element, $depth - 1), $args);
-                    $output = call_user_func_array(array(&$this, 'start_el'), $cb_args);
+                }
+            }
-            $previous_element = $element;
+        }
-        return $output;
+    }
+}
-class Walker_Page extends Walker {
-    var $tree_type = 'page';
-    var $db_fields = array ('parent' => 'post_parent', 'id' => 'ID'); //TODO: decouple this
-    function start_lvl($output, $depth) {
-        $indent = str_repeat("\t", $depth);
-        $output .= "$indent<ul>\n";
-        return $output;
+    }
-    function end_lvl($output, $depth) {
-        $indent = str_repeat("\t", $depth);
-        $output .= "$indent</ul>\n";
-        return $output;
+    }
-    function start_el($output, $page, $depth, $current_page, $show_date, $date_format) {
-        if ( $depth )
-            $indent = str_repeat("\t", $depth);
-        $css_class = 'page_item';
-        if ( $page->ID == $current_page )
-            $css_class .= ' current_page_item';
-        $output .= $indent . '<li class="' . $css_class . '"><a href="' . get_page_link($page->ID) . '" title="' . wp_specialchars($page->post_title, 1) . '">' . $page->post_title . '</a>';
-        if ( !empty($show_date) ) {
-            if ( 'modified' == $show_date )
-                $time = $page->post_modified;
-            else
-                $time = $page->post_date;
-            $output .= " " . mysql2date($date_format, $time);
+        }
-        return $output;
+    }
-    function end_el($output, $page, $depth) {
-        $output .= "</li>\n";
-        return $output;
+    }
+}
-class Walker_PageDropdown extends Walker {
-    var $tree_type = 'page';
-    var $db_fields = array ('parent' => 'post_parent', 'id' => 'ID'); //TODO: decouple this
-    function start_el($output, $page, $depth, $args) {
-        $pad = str_repeat('&nbsp;', $depth * 3);
-        $output .= "\t<option value=\"$page->ID\"";
-        if ( $page->ID == $args['selected'] )
-                $output .= ' selected="selected"';
-        $output .= '>';
-        $title = wp_specialchars($page->post_title);
-        $output .= "$pad$title";
-        $output .= "</option>\n";
-        return $output;
+    }
+}
-class Walker_Category extends Walker {
-    var $tree_type = 'category';
-    var $db_fields = array ('parent' => 'category_parent', 'id' => 'cat_ID'); //TODO: decouple this
-    function start_lvl($output, $depth, $args) {
-        if ( 'list' != $args['style'] )
-            return $output;
-        $indent = str_repeat("\t", $depth);
-        $output .= "$indent<ul class='children'>\n";
-        return $output;
+    }
-    function end_lvl($output, $depth, $args) {
-        if ( 'list' != $args['style'] )
-            return $output;
-        $indent = str_repeat("\t", $depth);
-        $output .= "$indent</ul>\n";
-        return $output;
+    }
-    function start_el($output, $category, $depth, $args) {
-        extract($args);
-        $link = '<a href="' . get_category_link($category->cat_ID) . '" ';
-        if ( $use_desc_for_title == 0 || empty($category->category_description) )
-            $link .= 'title="'. sprintf(__("View all posts filed under %s"), wp_specialchars($category->cat_name, 1)) . '"';
-        else
-            $link .= 'title="' . wp_specialchars(apply_filters('category_description',$category->category_description,$category),1) . '"';
-        $link .= '>';
-        $link .= apply_filters('list_cats', $category->cat_name, $category).'</a>';
-        if ( (! empty($feed_image)) || (! empty($feed)) ) {
-            $link .= ' ';
-            if ( empty($feed_image) )
-                $link .= '(';
-            $link .= '<a href="' . get_category_rss_link(0, $category->cat_ID, $category->category_nicename) . '"';
-            if ( !empty($feed) ) {
-                $title = ' title="' . $feed . '"';
-                $alt = ' alt="' . $feed . '"';
-                $name = $feed;
-                $link .= $title;
+            }
-            $link .= '>';
-            if ( !empty($feed_image) )
-                $link .= "<img src='$feed_image' $alt$title" . ' />';
-            else
-                $link .= $name;
-            $link .= '</a>';
-            if (empty($feed_image))
-                $link .= ')';
+        }
-        if ( isset($show_count) && $show_count )
-            $link .= ' ('.intval($category->category_count).')';
-        if ( isset($show_date) && $show_date ) {
-            $link .= ' ' . gmdate('Y-m-d', $category->last_update_timestamp);
+        }
-        if ( 'list' == $args['style'] ) {
-            $output .= "\t<li";
-            if ( ($category->cat_ID == $current_category) && is_category() )
-                $output .=  ' class="current-cat"';
-            $output .= ">$link\n";
-        } else {
-            $output .= "\t$link<br />\n";
+        }
-        return $output;
+    }
-    function end_el($output, $page, $depth, $args) {
-        if ( 'list' != $args['style'] )
-            return $output;
-        $output .= "</li>\n";
-        return $output;
+    }
+}
-class Walker_CategoryDropdown extends Walker {
-    var $tree_type = 'category';
-    var $db_fields = array ('parent' => 'category_parent', 'id' => 'cat_ID'); //TODO: decouple this
-    function start_el($output, $category, $depth, $args) {
-        $pad = str_repeat('&nbsp;', $depth * 3);
-        $cat_name = apply_filters('list_cats', $category->cat_name, $category);
-        $output .= "\t<option value=\"".$category->cat_ID."\"";
-        if ( $category->cat_ID == $args['selected'] )
-            $output .= ' selected="selected"';
-        $output .= '>';
-        $output .= $pad.$cat_name;
-        if ( $args['show_count'] )
-            $output .= '&nbsp;&nbsp;('. $category->category_count .')';
-        if ( $args['show_last_update'] ) {
-            $format = 'Y-m-d';
-            $output .= '&nbsp;&nbsp;' . gmdate($format, $category->last_update_timestamp);
+        }
-        $output .= "</option>\n";
-        return $output;
+    }
+}
-class WP_Ajax_Response {
-    var $responses = array();
-    function WP_Ajax_Response( $args = '' ) {
-        if ( !empty($args) )
-            $this->add($args);
+    }
-    // a WP_Error object can be passed in 'id' or 'data'
-    function add( $args = '' ) {
-        if ( is_array($args) )
-            $r = &$args;
-        else
-            parse_str($args, $r);
-        $defaults = array('what' => 'object', 'action' => false, 'id' => '0', 'old_id' => false,
-                'data' => '', 'supplemental' => array());
-        $r = array_merge($defaults, $r);
-        extract($r);
-        if ( is_wp_error($id) ) {
-            $data = $id;
-            $id = 0;
+        }
-        $response = '';
-        if ( is_wp_error($data) )
-            foreach ( $data->get_error_codes() as $code )
-                $response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message($code) . "]]></wp_error>";
-        else
-            $response = "<response_data><![CDATA[$data]]></response_data>";
-        $s = '';
-        if ( (array) $supplemental )
-            foreach ( $supplemental as $k => $v )
-                $s .= "<$k><![CDATA[$v]]></$k>";
-        if ( false === $action )
-            $action = $_POST['action'];
-        $x = '';
-        $x .= "<response action='$action_$id'>"; // The action attribute in the xml output is formatted like a nonce action
-        $x .=   "<$what id='$id'" . ( false !== $old_id ? "old_id='$old_id'>" : '>' );
-        $x .=       $response;
-        $x .=       $s;
-        $x .=   "</$what>";
-        $x .= "</response>";
-        $this->responses[] = $x;
-        return $x;
+    }
-    function send() {
-        header('Content-type: text/xml');
-        echo "<?xml version='1.0' standalone='yes'?><wp_ajax>";
-        foreach ( $this->responses as $response )
-            echo $response;
-        echo '</wp_ajax>';
-        die();
+    }
+}
 ?>

trunk/wp-includes/default-filters.php

-                      r4431
+                      r3503
 add_filter('pre_comment_author_url', 'clean_url');
+add_filter('pre_comment_content', 'stripslashes', 1);
 add_filter('pre_comment_content', 'wp_rel_nofollow', 15);
 add_filter('pre_comment_content', 'balanceTags', 30);
+add_filter('pre_comment_content', 'addslashes', 50);
 add_filter('pre_comment_author_name', 'wp_filter_kses');
 …
 add_filter('comment_email', 'antispambot');
-add_filter('comment_flood_filter', 'wp_throttle_comment_flood', 10, 3);
 add_filter('comment_url', 'clean_url');
 add_filter('comment_text', 'convert_chars');
 add_filter('comment_text', 'make_clickable');
-add_filter('comment_text', 'force_balance_tags', 25);
 add_filter('comment_text', 'wpautop', 30);
 add_filter('comment_text', 'convert_smilies', 20);
 add_filter('comment_excerpt', 'convert_chars');
-// Categories
-add_filter('pre_category_name', 'strip_tags');
-add_filter('pre_category_name', 'trim');
-add_filter('pre_category_name', 'wp_filter_kses');
-add_filter('pre_category_name', 'wp_specialchars', 30);
-add_filter('pre_category_description', 'wp_filter_kses');
-//Links
-add_filter('pre_link_name', 'strip_tags');
-add_filter('pre_link_name', 'trim');
-add_filter('pre_link_name', 'wp_filter_kses');
-add_filter('pre_link_name', 'wp_specialchars', 30);
-add_filter('pre_link_description', 'wp_filter_kses');
-add_filter('pre_link_notes', 'wp_filter_kses');
-add_filter('pre_link_url', 'strip_tags');
-add_filter('pre_link_url', 'trim');
-add_filter('pre_link_url', 'clean_url');
-add_filter('pre_link_image', 'strip_tags');
-add_filter('pre_link_image', 'trim');
-add_filter('pre_link_image', 'clean_url');
-add_filter('pre_link_rss', 'strip_tags');
-add_filter('pre_link_rss', 'trim');
-add_filter('pre_link_rss', 'clean_url');
-add_filter('pre_link_target', 'strip_tags');
-add_filter('pre_link_target', 'trim');
-add_filter('pre_link_target', 'wp_filter_kses');
-add_filter('pre_link_target', 'wp_specialchars', 30);
-add_filter('pre_link_rel', 'strip_tags');
-add_filter('pre_link_rel', 'trim');
-add_filter('pre_link_rel', 'wp_filter_kses');
-add_filter('pre_link_rel', 'wp_specialchars', 30);
-// Users
-add_filter('pre_user_display_name', 'strip_tags');
-add_filter('pre_user_display_name', 'trim');
-add_filter('pre_user_display_name', 'wp_filter_kses');
-add_filter('pre_user_display_name', 'wp_specialchars', 30);
-add_filter('pre_user_first_name', 'strip_tags');
-add_filter('pre_user_first_name', 'trim');
-add_filter('pre_user_first_name', 'wp_filter_kses');
-add_filter('pre_user_first_name', 'wp_specialchars', 30);
-add_filter('pre_user_last_name', 'strip_tags');
-add_filter('pre_user_last_name', 'trim');
-add_filter('pre_user_last_name', 'wp_filter_kses');
-add_filter('pre_user_last_name', 'wp_specialchars', 30);
-add_filter('pre_user_nickname', 'strip_tags');
-add_filter('pre_user_nickname', 'trim');
-add_filter('pre_user_nickname', 'wp_filter_kses');
-add_filter('pre_user_nickname', 'wp_specialchars', 30);
-add_filter('pre_user_description', 'trim');
-add_filter('pre_user_description', 'wp_filter_kses');
-add_filter('pre_user_url', 'strip_tags');
-add_filter('pre_user_url', 'trim');
-add_filter('pre_user_url', 'clean_url');
-add_filter('pre_user_email', 'trim');
-add_filter('pre_user_email', 'sanitize_email');
 // Places to balance tags on input
 …
 add_filter('the_title_rss', 'strip_tags');
 add_filter('the_title_rss', 'ent2ncr', 8);
-add_filter('the_title_rss', 'wp_specialchars');
 add_filter('the_content_rss', 'ent2ncr', 8);
 add_filter('the_excerpt_rss', 'convert_chars');
 add_filter('the_excerpt_rss', 'ent2ncr', 8);
 add_filter('comment_author_rss', 'ent2ncr', 8);
 add_filter('comment_text_rss', 'wp_specialchars');
+add_filter('comment_text_rss', 'htmlspecialchars');
 add_filter('comment_text_rss', 'ent2ncr', 8);
 add_filter('bloginfo_rss', 'ent2ncr', 8);
 add_filter('the_author', 'ent2ncr', 8);
+// Misc filters
+add_filter('option_ping_sites', 'privacy_ping_filter');
+add_filter('option_blog_charset', 'wp_specialchars');
+add_filter('mce_plugins', '_mce_load_rtl_plugin');
+add_filter('mce_buttons', '_mce_add_direction_buttons');
+// Actions
+add_action('publish_post', 'generic_ping');
+add_action('wp_head', 'rsd_link');
-// Actions
-add_action('wp_head', 'rsd_link');
-add_action('wp_head', 'locale_stylesheet');
-add_action('publish_future_post', 'wp_publish_post', 10, 1);
-add_action('wp_head', 'noindex', 1);
-add_action('wp_head', 'wp_print_scripts');
-if(!defined('DOING_CRON'))
-    add_action('init', 'wp_cron');
-add_action('do_feed_rdf', 'do_feed_rdf', 10, 1);
-add_action('do_feed_rss', 'do_feed_rss', 10, 1);
-add_action('do_feed_rss2', 'do_feed_rss2', 10, 1);
-add_action('do_feed_atom', 'do_feed_atom', 10, 1);
-add_action('do_pings', 'do_all_pings', 10, 1);
-add_action('do_robots', 'do_robots');
-add_action('sanitize_comment_cookies', 'sanitize_comment_cookies');
-add_action('admin_print_scripts', 'wp_print_scripts', 20);
-add_action('mce_options', '_mce_set_direction');
 ?>

trunk/wp-includes/functions.php

-                      r4431
+                      r3503
 <?php
+require_once(dirname(__FILE__).'/compat.php');
+require_once(dirname(__FILE__).'/functions-compat.php');
+if ( !function_exists('_') ) {
+    function _($string) {
+        return $string;
+    }
+}
+function get_profile($field, $user = false) {
+    global $wpdb;
+    if ( !$user )
+        $user = $wpdb->escape($_COOKIE[USER_COOKIE]);
+    return $wpdb->get_var("SELECT $field FROM $wpdb->users WHERE user_login = '$user'");
+}
 function mysql2date($dateformatstring, $mysqlstring, $translate = true) {
     global $wp_locale;
+    global $month, $weekday, $month_abbrev, $weekday_abbrev;
     $m = $mysqlstring;
     if ( empty($m) ) {
 …
+    }
     $i = mktime(substr($m,11,2),substr($m,14,2),substr($m,17,2),substr($m,5,2),substr($m,8,2),substr($m,0,4));
-    if( 'U' == $dateformatstring )
-        return $i;
     if ( -1 == $i || false == $i )
         $i = 0;
+    if ( !empty($wp_locale->month) && !empty($wp_locale->weekday) && $translate ) {
+        $datemonth = $wp_locale->get_month(date('m', $i));
+        $datemonth_abbrev = $wp_locale->get_month_abbrev($datemonth);
+        $dateweekday = $wp_locale->get_weekday(date('w', $i));
+        $dateweekday_abbrev = $wp_locale->get_weekday_abbrev($dateweekday);
+        $datemeridiem = $wp_locale->get_meridiem(date('a', $i));
+        $datemeridiem_capital = $wp_locale->get_meridiem(date('A', $i));
+    if ( !empty($month) && !empty($weekday) && $translate ) {
+        $datemonth = $month[date('m', $i)];
+        $datemonth_abbrev = $month_abbrev[$datemonth];
+        $dateweekday = $weekday[date('w', $i)];
+        $dateweekday_abbrev = $weekday_abbrev[$dateweekday];
         $dateformatstring = ' '.$dateformatstring;
         $dateformatstring = preg_replace("/([^\\\])D/", "\\1".backslashit($dateweekday_abbrev), $dateformatstring);
 …
         $dateformatstring = preg_replace("/([^\\\])l/", "\\1".backslashit($dateweekday), $dateformatstring);
         $dateformatstring = preg_replace("/([^\\\])M/", "\\1".backslashit($datemonth_abbrev), $dateformatstring);
-        $dateformatstring = preg_replace("/([^\\\])a/", "\\1".backslashit($datemeridiem), $dateformatstring);
-        $dateformatstring = preg_replace("/([^\\\])A/", "\\1".backslashit($datemeridiem_capital), $dateformatstring);
         $dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring)-1);
 …
         case 'mysql':
             if ( $gmt ) $d = gmdate('Y-m-d H:i:s');
             else $d = gmdate('Y-m-d H:i:s', (time() + (get_option('gmt_offset') * 3600)));
+            else $d = gmdate('Y-m-d H:i:s', (time() + (get_settings('gmt_offset') * 3600)));
             return $d;
             break;
         case 'timestamp':
             if ( $gmt ) $d = time();
             else $d = time() + (get_option('gmt_offset') * 3600);
+            else $d = time() + (get_settings('gmt_offset') * 3600);
             return $d;
             break;
 …
 function date_i18n($dateformatstring, $unixtimestamp) {
     global $wp_locale;
+    global $month, $weekday, $month_abbrev, $weekday_abbrev;
     $i = $unixtimestamp;
+    if ( (!empty($wp_locale->month)) && (!empty($wp_locale->weekday)) ) {
+        $datemonth = $wp_locale->get_month(date('m', $i));
+        $datemonth_abbrev = $wp_locale->get_month_abbrev($datemonth);
+        $dateweekday = $wp_locale->get_weekday(date('w', $i));
+        $dateweekday_abbrev = $wp_locale->get_weekday_abbrev($dateweekday);
+        $datemeridiem = $wp_locale->get_meridiem(date('a', $i));
+        $datemeridiem_capital = $wp_locale->get_meridiem(date('A', $i));
+    if ( (!empty($month)) && (!empty($weekday)) ) {
+        $datemonth = $month[date('m', $i)];
+        $datemonth_abbrev = $month_abbrev[$datemonth];
+        $dateweekday = $weekday[date('w', $i)];
+        $dateweekday_abbrev = $weekday_abbrev[$dateweekday];
         $dateformatstring = ' '.$dateformatstring;
         $dateformatstring = preg_replace("/([^\\\])D/", "\\1".backslashit($dateweekday_abbrev), $dateformatstring);
 …
         $dateformatstring = preg_replace("/([^\\\])l/", "\\1".backslashit($dateweekday), $dateformatstring);
         $dateformatstring = preg_replace("/([^\\\])M/", "\\1".backslashit($datemonth_abbrev), $dateformatstring);
-        $dateformatstring = preg_replace("/([^\\\])a/", "\\1".backslashit($datemeridiem), $dateformatstring);
-        $dateformatstring = preg_replace("/([^\\\])A/", "\\1".backslashit($datemeridiem_capital), $dateformatstring);
         $dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring)-1);
+    }
     $j = @date($dateformatstring, $i);
     return $j;
+}
+    }
 function get_weekstartend($mysqlstring, $start_of_week) {
 …
     $i = 86400;
     if ( $weekday < get_option('start_of_week') )
         $weekday = 7 - (get_option('start_of_week') - $weekday);
     while ($weekday > get_option('start_of_week')) {
+    if ( $weekday < get_settings('start_of_week') )
+        $weekday = 7 - (get_settings('start_of_week') - $weekday);
+    while ($weekday > get_settings('start_of_week')) {
         $weekday = date('w',$day);
         if ( $weekday < get_option('start_of_week') )
             $weekday = 7 - (get_option('start_of_week') - $weekday);
+        if ( $weekday < get_settings('start_of_week') )
+            $weekday = 7 - (get_settings('start_of_week') - $weekday);
         $day = $day - 86400;
 …
 function get_lastpostdate($timezone = 'server') {
     global $cache_lastpostdate, $pagenow, $wpdb;
     $add_seconds_blog = get_option('gmt_offset') * 3600;
+    $add_seconds_blog = get_settings('gmt_offset') * 3600;
     $add_seconds_server = date('Z');
+    $now = current_time('mysql', 1);
     if ( !isset($cache_lastpostdate[$timezone]) ) {
         switch(strtolower($timezone)) {
             case 'gmt':
                 $lastpostdate = $wpdb->get_var("SELECT post_date_gmt FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1");
+                $lastpostdate = $wpdb->get_var("SELECT post_date_gmt FROM $wpdb->posts WHERE post_date_gmt <= '$now' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1");
                 break;
             case 'blog':
                 $lastpostdate = $wpdb->get_var("SELECT post_date FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1");
+                $lastpostdate = $wpdb->get_var("SELECT post_date FROM $wpdb->posts WHERE post_date_gmt <= '$now' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1");
                 break;
             case 'server':
                 $lastpostdate = $wpdb->get_var("SELECT DATE_ADD(post_date_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1");
+                $lastpostdate = $wpdb->get_var("SELECT DATE_ADD(post_date_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_date_gmt <= '$now' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1");
                 break;
+        }
 …
 function get_lastpostmodified($timezone = 'server') {
     global $cache_lastpostmodified, $pagenow, $wpdb;
     $add_seconds_blog = get_option('gmt_offset') * 3600;
+    $add_seconds_blog = get_settings('gmt_offset') * 3600;
     $add_seconds_server = date('Z');
+    $now = current_time('mysql', 1);
     if ( !isset($cache_lastpostmodified[$timezone]) ) {
         switch(strtolower($timezone)) {
             case 'gmt':
                 $lastpostmodified = $wpdb->get_var("SELECT post_modified_gmt FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_modified_gmt DESC LIMIT 1");
+                $lastpostmodified = $wpdb->get_var("SELECT post_modified_gmt FROM $wpdb->posts WHERE post_modified_gmt <= '$now' AND post_status = 'publish' ORDER BY post_modified_gmt DESC LIMIT 1");
                 break;
             case 'blog':
                 $lastpostmodified = $wpdb->get_var("SELECT post_modified FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_modified_gmt DESC LIMIT 1");
+                $lastpostmodified = $wpdb->get_var("SELECT post_modified FROM $wpdb->posts WHERE post_modified_gmt <= '$now' AND post_status = 'publish' ORDER BY post_modified_gmt DESC LIMIT 1");
                 break;
             case 'server':
                 $lastpostmodified = $wpdb->get_var("SELECT DATE_ADD(post_modified_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_modified_gmt DESC LIMIT 1");
+                $lastpostmodified = $wpdb->get_var("SELECT DATE_ADD(post_modified_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_modified_gmt <= '$now' AND post_status = 'publish' ORDER BY post_modified_gmt DESC LIMIT 1");
                 break;
+        }
 …
+}
+function user_pass_ok($user_login,$user_pass) {
+    global $cache_userdata;
+    if ( empty($cache_userdata[$user_login]) ) {
+        $userdata = get_userdatabylogin($user_login);
+    } else {
+        $userdata = $cache_userdata[$user_login];
+    }
+    return (md5($user_pass) == $userdata->user_pass);
+}
+function get_usernumposts($userid) {
+    global $wpdb;
+    return $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_author = '$userid' AND post_status = 'publish'");
+}
+// examine a url (supposedly from this blog) and try to
+// determine the post ID it represents.
+function url_to_postid($url) {
+    global $wp_rewrite;
+    // First, check to see if there is a 'p=N' or 'page_id=N' to match against
+    preg_match('#[?&](p|page_id)=(\d+)#', $url, $values);
+    $id = intval($values[2]);
+    if ( $id ) return $id;
+    // Check to see if we are using rewrite rules
+    $rewrite = $wp_rewrite->wp_rewrite_rules();
+    // Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options
+    if ( empty($rewrite) )
+        return 0;
+    // $url cleanup by Mark Jaquith
+    // This fixes things like #anchors, ?query=strings, missing 'www.',
+    // added 'www.', or added 'index.php/' that will mess up our WP_Query
+    // and return a false negative
+    // Get rid of the #anchor
+    $url_split = explode('#', $url);
+    $url = $url_split[0];
+    // Get rid of URI ?query=string
+    $url_split = explode('?', $url);
+    $url = $url_split[0];
+    // Add 'www.' if it is absent and should be there
+    if ( false !== strpos(get_settings('home'), '://www.') && false === strpos($url, '://www.') )
+        $url = str_replace('://', '://www.', $url);
+    // Strip 'www.' if it is present and shouldn't be
+    if ( false === strpos(get_settings('home'), '://www.') )
+        $url = str_replace('://www.', '://', $url);
+    // Strip 'index.php/' if we're not using path info permalinks
+    if ( false === strpos($rewrite, 'index.php/') )
+        $url = str_replace('index.php/', '', $url);
+    if ( false !== strpos($url, get_settings('home')) ) {
+        // Chop off http://domain.com
+        $url = str_replace(get_settings('home'), '', $url);
+    } else {
+        // Chop off /path/to/blog
+        $home_path = parse_url(get_settings('home'));
+        $home_path = $home_path['path'];
+        $url = str_replace($home_path, '', $url);
+    }
+    // Trim leading and lagging slashes
+    $url = trim($url, '/');
+    $request = $url;
+    // Done with cleanup
+    // Look for matches.
+    $request_match = $request;
+    foreach ($rewrite as $match => $query) {
+        // If the requesting file is the anchor of the match, prepend it
+        // to the path info.
+        if ( (! empty($url)) && (strpos($match, $url) === 0) ) {
+            $request_match = $url . '/' . $request;
+        }
+        if ( preg_match("!^$match!", $request_match, $matches) ) {
+            // Got a match.
+            // Trim the query of everything up to the '?'.
+            $query = preg_replace("!^.+\?!", '', $query);
+            // Substitute the substring matches into the query.
+            eval("\$query = \"$query\";");
+            $query = new WP_Query($query);
+            if ( $query->is_single || $query->is_page )
+                return $query->post->ID;
+            else
+                return 0;
+        }
+    }
+    return 0;
+}
 function maybe_unserialize($original) {
+    if ( is_serialized($original) ) // don't attempt to unserialize data that wasn't serialized going in
+        if ( false !== $gm = @ unserialize($original) )
+            return $gm;
+    return $original;
+}
+function is_serialized($data) {
+    if ( !is_string($data) ) // if it isn't a string, it isn't serialized
+        return false;
+    $data = trim($data);
+    if ( preg_match("/^[adobis]:[0-9]+:.*[;}]/si",$data) ) // this should fetch all legitimately serialized data
+        return true;
+    return false;
+}
+function is_serialized_string($data) {
+    if ( !is_string($data) ) // if it isn't a string, it isn't a serialized string
+        return false;
+    $data = trim($data);
+    if ( preg_match("/^s:[0-9]+:.*[;}]/si",$data) ) // this should fetch all serialized strings
+        return true;
+    return false;
+    if ( false !== $gm = @ unserialize($original) )
+        return $gm;
+    else
+        return $original;
+}
 /* Options functions */
 function get_option($setting) {
+function get_settings($setting) {
     global $wpdb;
 …
     // If home is not set use siteurl.
     if ( 'home' == $setting && '' == $value )
         return get_option('siteurl');
+        return get_settings('siteurl');
     if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
 …
+}
+function get_option($option) {
+    return get_settings($option);
+}
+function get_user_option( $option, $user = 0 ) {
+    global $wpdb, $current_user;
+    if ( empty($user) )
+        $user = $current_user;
+    else
+        $user = get_userdata($user);
+    if ( isset( $user->{$wpdb->prefix . $option} ) ) // Blog specific
+        return $user->{$wpdb->prefix . $option};
+    elseif ( isset( $user->{$option} ) ) // User specific and cross-blog
+        return $user->{$option};
+    else // Blog global
+        return get_option( $option );
+}
 function form_option($option) {
     echo wp_specialchars( get_option($option), 1 );
+    echo htmlspecialchars( get_option($option), ENT_QUOTES );
+}
 …
+    }
     $_newvalue = $newvalue;
     $newvalue = maybe_serialize($newvalue);
+    if ( is_array($newvalue) || is_object($newvalue) )
+        $newvalue = serialize($newvalue);
     wp_cache_set($option_name, $newvalue, 'options');
 …
     $wpdb->query("UPDATE $wpdb->options SET option_value = '$newvalue' WHERE option_name = '$option_name'");
     if ( $wpdb->rows_affected == 1 ) {
         do_action("update_option_{$option_name}", $oldvalue, $_newvalue);
+        do_action("update_option_{$option_name}", $oldvalue, $newvalue);
         return true;
+    }
     return false;
+}
+function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
+    global $wpdb;
+    if ( !$global )
+        $option_name = $wpdb->prefix . $option_name;
+    return update_usermeta( $user_id, $option_name, $newvalue );
+}
 …
         return;
+    $value = maybe_serialize($value);
+    if ( is_array($value) || is_object($value) )
+        $value = serialize($value);
     wp_cache_set($name, $value, 'options');
 …
+}
+function maybe_serialize($data) {
+    if ( is_string($data) )
+        $data = trim($data);
+    elseif ( is_array($data) || is_object($data) )
+        return serialize($data);
+    if ( is_serialized($data) )
+        return serialize($data);
+    return $data;
+function add_post_meta($post_id, $key, $value, $unique = false) {
+    global $wpdb, $post_meta_cache;
+    if ( $unique ) {
+        if ( $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key
+= '$key' AND post_id = '$post_id'") ) {
+            return false;
+        }
+    }
+    $original = $value;
+    if ( is_array($value) || is_object($value) )
+        $value = $wpdb->escape(serialize($value));
+    $wpdb->query("INSERT INTO $wpdb->postmeta (post_id,meta_key,meta_value) VALUES ('$post_id','$key','$value')");
+    $post_meta_cache['$post_id'][$key][] = $original;
+    return true;
+}
+function delete_post_meta($post_id, $key, $value = '') {
+    global $wpdb, $post_meta_cache;
+    if ( empty($value) ) {
+        $meta_id = $wpdb->get_var("SELECT meta_id FROM $wpdb->postmeta WHERE
+post_id = '$post_id' AND meta_key = '$key'");
+    } else {
+        $meta_id = $wpdb->get_var("SELECT meta_id FROM $wpdb->postmeta WHERE
+post_id = '$post_id' AND meta_key = '$key' AND meta_value = '$value'");
+    }
+    if ( !$meta_id )
+        return false;
+    if ( empty($value) ) {
+        $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = '$post_id'
+AND meta_key = '$key'");
+        unset($post_meta_cache['$post_id'][$key]);
+    } else {
+        $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = '$post_id'
+AND meta_key = '$key' AND meta_value = '$value'");
+        $cache_key = $post_meta_cache['$post_id'][$key];
+        if ($cache_key) foreach ( $cache_key as $index => $data )
+            if ( $data == $value )
+                unset($post_meta_cache['$post_id'][$key][$index]);
+    }
+    unset($post_meta_cache['$post_id'][$key]);
+    return true;
+}
+function get_post_meta($post_id, $key, $single = false) {
+    global $wpdb, $post_meta_cache;
+    if ( isset($post_meta_cache[$post_id][$key]) ) {
+        if ( $single ) {
+            return maybe_unserialize( $post_meta_cache[$post_id][$key][0] );
+        } else {
+            return maybe_unserialize( $post_meta_cache[$post_id][$key] );
+        }
+    }
+    $metalist = $wpdb->get_results("SELECT meta_value FROM $wpdb->postmeta WHERE post_id = '$post_id' AND meta_key = '$key'", ARRAY_N);
+    $values = array();
+    if ( $metalist ) {
+        foreach ($metalist as $metarow) {
+            $values[] = $metarow[0];
+        }
+    }
+    if ( $single ) {
+        if ( count($values) ) {
+            $return = maybe_unserialize( $values[0] );
+        } else {
+            return '';
+        }
+    } else {
+        $return = $values;
+    }
+    return maybe_unserialize($return);
+}
+function update_post_meta($post_id, $key, $value, $prev_value = '') {
+    global $wpdb, $post_meta_cache;
+    $original_value = $value;
+    if ( is_array($value) || is_object($value) )
+        $value = $wpdb->escape(serialize($value));
+    $original_prev = $prev_value;
+    if ( is_array($prev_value) || is_object($prev_value) )
+        $prev_value = $wpdb->escape(serialize($prev_value));
+    if (! $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key
+= '$key' AND post_id = '$post_id'") ) {
+        return false;
+    }
+    if ( empty($prev_value) ) {
+        $wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE
+meta_key = '$key' AND post_id = '$post_id'");
+        $cache_key = $post_meta_cache['$post_id'][$key];
+        if ( !empty($cache_key) )
+            foreach ($cache_key as $index => $data)
+                $post_meta_cache['$post_id'][$key][$index] = $original_value;
+    } else {
+        $wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE
+meta_key = '$key' AND post_id = '$post_id' AND meta_value = '$prev_value'");
+        $cache_key = $post_meta_cache['$post_id'][$key];
+        if ( !empty($cache_key) )
+            foreach ($cache_key as $index => $data)
+                if ( $data == $original_prev )
+                    $post_meta_cache['$post_id'][$key][$index] = $original_value;
+    }
+    return true;
+}
+// Deprecated.  Use get_post().
+function get_postdata($postid) {
+    $post = &get_post($postid);
+    $postdata = array (
+        'ID' => $post->ID,
+        'Author_ID' => $post->post_author,
+        'Date' => $post->post_date,
+        'Content' => $post->post_content,
+        'Excerpt' => $post->post_excerpt,
+        'Title' => $post->post_title,
+        'Category' => $post->post_category,
+        'post_status' => $post->post_status,
+        'comment_status' => $post->comment_status,
+        'ping_status' => $post->ping_status,
+        'post_password' => $post->post_password,
+        'to_ping' => $post->to_ping,
+        'pinged' => $post->pinged,
+        'post_name' => $post->post_name
+    );
+    return $postdata;
+}
+// Retrieves post data given a post ID or post object.
+// Handles post caching.
+function &get_post(&$post, $output = OBJECT) {
+    global $post_cache, $wpdb;
+    if ( empty($post) ) {
+        if ( isset($GLOBALS['post']) )
+            $_post = & $GLOBALS['post'];
+        else
+            $_post = null;
+    } elseif ( is_object($post) ) {
+        if ( 'static' == $post->post_status )
+            return get_page($post, $output);
+        if ( !isset($post_cache[$post->ID]) )
+            $post_cache[$post->ID] = &$post;
+        $_post = & $post_cache[$post->ID];
+    } else {
+        if ( $_post = wp_cache_get($post, 'pages') )
+            return get_page($_post, $output);
+        elseif ( isset($post_cache[$post]) )
+            $_post = & $post_cache[$post];
+        else {
+            $query = "SELECT * FROM $wpdb->posts WHERE ID = '$post' LIMIT 1";
+            $_post = & $wpdb->get_row($query);
+            if ( 'static' == $_post->post_status )
+                return get_page($_post, $output);
+            $post_cache[$post] = & $_post;
+        }
+    }
+    if ( defined(WP_IMPORTING) )
+        unset($post_cache);
+    if ( $output == OBJECT ) {
+        return $_post;
+    } elseif ( $output == ARRAY_A ) {
+        return get_object_vars($_post);
+    } elseif ( $output == ARRAY_N ) {
+        return array_values(get_object_vars($_post));
+    } else {
+        return $_post;
+    }
+}
+function &get_children($post = 0, $output = OBJECT) {
+    global $post_cache, $wpdb;
+    if ( empty($post) ) {
+        if ( isset($GLOBALS['post']) )
+            $post_parent = & $GLOBALS['post']->post_parent;
+        else
+            return false;
+    } elseif ( is_object($post) ) {
+        $post_parent = $post->post_parent;
+    } else {
+        $post_parent = $post;
+    }
+    $post_parent = (int) $post_parent;
+    $query = "SELECT * FROM $wpdb->posts WHERE post_parent = $post_parent";
+    $children = $wpdb->get_results($query);
+    if ( $children ) {
+        foreach ( $children as $key => $child ) {
+            $post_cache[$child->ID] =& $children[$key];
+            $kids[$child->ID] =& $children[$key];
+        }
+    } else {
+        return false;
+    }
+    if ( $output == OBJECT ) {
+        return $kids;
+    } elseif ( $output == ARRAY_A ) {
+        foreach ( $kids as $kid )
+            $weeuns[$kid->ID] = get_object_vars($kids[$kid->ID]);
+        return $weeuns;
+    } elseif ( $output == ARRAY_N ) {
+        foreach ( $kids as $kid )
+            $babes[$kid->ID] = array_values(get_object_vars($kids[$kid->ID]));
+        return $babes;
+    } else {
+        return $kids;
+    }
+}
+function set_page_path($page) {
+    $page->fullpath = '/' . $page->post_name;
+    $path = $page->fullpath;
+    $curpage = $page;
+    while ($curpage->post_parent != 0) {
+        $curpage = get_page($curpage->post_parent);
+        $path = '/' . $curpage->post_name . $path;
+    }
+    $page->fullpath = $path;
+    return $page;
+}
+// Retrieves page data given a page ID or page object.
+// Handles page caching.
+function &get_page(&$page, $output = OBJECT) {
+    global $wpdb;
+    if ( empty($page) ) {
+        if ( isset($GLOBALS['page']) ) {
+            $_page = & $GLOBALS['page'];
+            wp_cache_add($_page->ID, $_page, 'pages');
+        } else {
+            $_page = null;
+        }
+    } elseif ( is_object($page) ) {
+        if ( 'static' != $page->post_status )
+            return get_post($page, $output);
+        wp_cache_add($page->ID, $page, 'pages');
+        $_page = $page;
+    } else {
+        if ( isset($GLOBALS['page']) && ($page == $GLOBALS['page']->ID) ) {
+            $_page = & $GLOBALS['page'];
+            wp_cache_add($_page->ID, $_page, 'pages');
+        } elseif ( $_page = $GLOBALS['post_cache'][$page] ) {
+            return get_post($page, $output);
+        } elseif ( $_page = wp_cache_get($page, 'pages') ) {
+            // Got it.
+        } else {
+            $query = "SELECT * FROM $wpdb->posts WHERE ID= '$page' LIMIT 1";
+            $_page = & $wpdb->get_row($query);
+            if ( 'static' != $_page->post_status )
+                return get_post($_page, $output);
+            wp_cache_add($_page->ID, $_page, 'pages');
+        }
+    }
+    if (!isset($_page->fullpath)) {
+        $_page = set_page_path($_page);
+        wp_cache_replace($_page->cat_ID, $_page, 'pages');
+    }
+    if ( $output == OBJECT ) {
+        return $_page;
+    } elseif ( $output == ARRAY_A ) {
+        return get_object_vars($_page);
+    } elseif ( $output == ARRAY_N ) {
+        return array_values(get_object_vars($_page));
+    } else {
+        return $_page;
+    }
+}
+function set_category_path($cat) {
+    $cat->fullpath = '/' . $cat->category_nicename;
+    $path = $cat->fullpath;
+    $curcat = $cat;
+    while ($curcat->category_parent != 0) {
+        $curcat = get_category($curcat->category_parent);
+        $path = '/' . $curcat->category_nicename . $path;
+    }
+    $cat->fullpath = $path;
+    return $cat;
+}
+// Retrieves category data given a category ID or category object.
+// Handles category caching.
+function &get_category(&$category, $output = OBJECT) {
+    global $wpdb;
+    if ( empty($category) )
+        return null;
+    if ( is_object($category) ) {
+        wp_cache_add($category->cat_ID, $category, 'category');
+        $_category = $category;
+    } else {
+        if ( ! $_category = wp_cache_get($category, 'category') ) {
+            $_category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = '$category' LIMIT 1");
+            wp_cache_add($category, $_category, 'category');
+        }
+    }
+    if ( !isset($_category->fullpath) ) {
+        $_category = set_category_path($_category);
+        wp_cache_replace($_category->cat_ID, $_category, 'category');
+    }
+    if ( $output == OBJECT ) {
+        return $_category;
+    } elseif ( $output == ARRAY_A ) {
+        return get_object_vars($_category);
+    } elseif ( $output == ARRAY_N ) {
+        return array_values(get_object_vars($_category));
+    } else {
+        return $_category;
+    }
+}
+// Retrieves comment data given a comment ID or comment object.
+// Handles comment caching.
+function &get_comment(&$comment, $output = OBJECT) {
+    global $comment_cache, $wpdb;
+    if ( empty($comment) )
+        return null;
+    if ( is_object($comment) ) {
+        if ( !isset($comment_cache[$comment->comment_ID]) )
+            $comment_cache[$comment->comment_ID] = &$comment;
+        $_comment = & $comment_cache[$comment->comment_ID];
+    } else {
+        if ( !isset($comment_cache[$comment]) ) {
+            $_comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment' LIMIT 1");
+            $comment_cache[$comment->comment_ID] = & $_comment;
+        } else {
+            $_comment = & $comment_cache[$comment];
+        }
+    }
+    if ( $output == OBJECT ) {
+        return $_comment;
+    } elseif ( $output == ARRAY_A ) {
+        return get_object_vars($_comment);
+    } elseif ( $output == ARRAY_N ) {
+        return array_values(get_object_vars($_comment));
+    } else {
+        return $_comment;
+    }
+}
+function get_catname($cat_ID) {
+    $category = &get_category($cat_ID);
+    return $category->cat_name;
+}
+function get_all_category_ids() {
+    global $wpdb;
+    if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category') ) {
+        $cat_ids = $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories");
+        wp_cache_add('all_category_ids', $cat_ids, 'category');
+    }
+    return $cat_ids;
+}
+function get_all_page_ids() {
+    global $wpdb;
+    if ( ! $page_ids = wp_cache_get('all_page_ids', 'pages') ) {
+        $page_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_status='static'");
+        wp_cache_add('all_page_ids', $page_ids, 'pages');
+    }
+    return $page_ids;
+}
 function gzip_compression() {
     if ( !get_option('gzipcompression') ) return false;
+    if ( !get_settings('gzipcompression') ) return false;
     if ( extension_loaded('zlib') ) {
         ob_start('ob_gzhandler');
+    }
+}
+// functions to count the page generation time (from phpBB2)
+// ( or just any time between timer_start() and timer_stop() )
+function timer_stop($display = 0, $precision = 3) { //if called like timer_stop(1), will echo $timetotal
+    global $timestart, $timeend;
+    $mtime = microtime();
+    $mtime = explode(' ',$mtime);
+    $mtime = $mtime[1] + $mtime[0];
+    $timeend = $mtime;
+    $timetotal = $timeend-$timestart;
+    if ( $display )
+        echo number_format($timetotal,$precision);
+    return $timetotal;
+}
+function weblog_ping($server = '', $path = '') {
+    global $wp_version;
+    include_once (ABSPATH . WPINC . '/class-IXR.php');
+    // using a timeout of 3 seconds should be enough to cover slow servers
+    $client = new IXR_Client($server, ((!strlen(trim($path)) || ('/' == $path)) ? false : $path));
+    $client->timeout = 3;
+    $client->useragent .= ' -- WordPress/'.$wp_version;
+    // when set to true, this outputs debug messages by itself
+    $client->debug = false;
+    $home = trailingslashit( get_option('home') );
+    if ( !$client->query('weblogUpdates.extendedPing', get_settings('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
+        $client->query('weblogUpdates.ping', get_settings('blogname'), $home);
+}
+function generic_ping($post_id = 0) {
+    $services = get_settings('ping_sites');
+    $services = preg_replace("|(\s)+|", '$1', $services); // Kill dupe lines
+    $services = trim($services);
+    if ( '' != $services ) {
+        $services = explode("\n", $services);
+        foreach ($services as $service) {
+            weblog_ping($service);
+        }
+    }
+    return $post_id;
+}
+// Send a Trackback
+function trackback($trackback_url, $title, $excerpt, $ID) {
+    global $wpdb, $wp_version;
+    if ( empty($trackback_url) )
+        return;
+    $title = urlencode($title);
+    $excerpt = urlencode($excerpt);
+    $blog_name = urlencode(get_settings('blogname'));
+    $tb_url = $trackback_url;
+    $url = urlencode(get_permalink($ID));
+    $query_string = "title=$title&url=$url&blog_name=$blog_name&excerpt=$excerpt";
+    $trackback_url = parse_url($trackback_url);
+    $http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?'.$trackback_url['query'] : '') . " HTTP/1.0\r\n";
+    $http_request .= 'Host: '.$trackback_url['host']."\r\n";
+    $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_settings('blog_charset')."\r\n";
+    $http_request .= 'Content-Length: '.strlen($query_string)."\r\n";
+    $http_request .= "User-Agent: WordPress/" . $wp_version;
+    $http_request .= "\r\n\r\n";
+    $http_request .= $query_string;
+    if ( '' == $trackback_url['port'] )
+        $trackback_url['port'] = 80;
+    $fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4);
+    @fputs($fs, $http_request);
+/*
+    $debug_file = 'trackback.log';
+    $fp = fopen($debug_file, 'a');
+    fwrite($fp, "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n");
+    while(!@feof($fs)) {
+        fwrite($fp, @fgets($fs, 4096));
+    }
+    fwrite($fp, "\n\n");
+    fclose($fp);
+*/
+    @fclose($fs);
+    $tb_url = addslashes( $tb_url );
+    $wpdb->query("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', '$tb_url') WHERE ID = '$ID'");
+    return $wpdb->query("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, '$tb_url', '')) WHERE ID = '$ID'");
+}
 …
         $link_text = $matches[4][$i];
         $content = str_replace($link_match, $link_text.' '.$link_number, $content);
         $link_url = ((strtolower(substr($link_url,0,7)) != 'http://') && (strtolower(substr($link_url,0,8)) != 'https://')) ? get_option('home') . $link_url : $link_url;
+        $link_url = ((strtolower(substr($link_url,0,7)) != 'http://') && (strtolower(substr($link_url,0,8)) != 'https://')) ? get_settings('home') . $link_url : $link_url;
         $links_summary .= "\n".$link_number.' '.$link_url;
+    }
 …
         fclose($fp);
+    }
+}
+function spawn_pinger() {
+    global $wpdb;
+    $doping = false;
+    if ( $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE TRIM(to_ping) != '' LIMIT 1") )
+        $doping = true;
+    if ( $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_pingme' OR meta_key = '_encloseme' LIMIT 1") )
+        $doping = true;
+    if ( substr(php_sapi_name(), 0, 3) == 'cgi' )
+        return $doping;
+    if ( $doping ) {
+        $ping_url = get_settings('siteurl') .'/wp-admin/execute-pings.php';
+        $parts = parse_url($ping_url);
+        $argyle = @ fsockopen($parts['host'], $_SERVER['SERVER_PORT'], $errno, $errstr, 0.01);
+        if ( $argyle )
+            fputs($argyle, "GET {$parts['path']}?time=".time()." HTTP/1.0\r\nHost: {$_SERVER['HTTP_HOST']}\r\n\r\n");
+       }
+}
 …
+    }
+    $code = preg_replace('/.*?(\d{3}).*/i', '$1', $response);
+    $headers['status_code'] = $code;
+    if ( '302' == $code || '301' == $code )
+        return wp_get_http_headers( $url, ++$red );
     preg_match('/.*([0-9]{3}).*/', $response, $return);
     $headers['response'] = $return[1]; // HTTP response code eg 204, 200, 404
-    $code = $headers['response'];
-    if ( ('302' == $code || '301' == $code) && isset($headers['location']) )
-        return wp_get_http_headers( $headers['location'], ++$red );
     return $headers;
+}
+// Deprecated.  Use the new post loop.
+function start_wp() {
+    global $wp_query, $post;
+    // Since the old style loop is being used, advance the query iterator here.
+    $wp_query->next_post();
+    setup_postdata($post);
+}
+// Setup global post data.
+function setup_postdata($post) {
+    global $id, $postdata, $authordata, $day, $page, $pages, $multipage, $more, $numpages, $wp_query;
+    global $pagenow;
+    $id = $post->ID;
+    $authordata = get_userdata($post->post_author);
+    $day = mysql2date('d.m.y', $post->post_date);
+    $currentmonth = mysql2date('m', $post->post_date);
+    $numpages = 1;
+    $page = get_query_var('page');
+    if ( !$page )
+        $page = 1;
+    if ( is_single() || is_page() )
+        $more = 1;
+    $content = $post->post_content;
+    if ( preg_match('/<!--nextpage-->/', $content) ) {
+        if ( $page > 1 )
+            $more = 1;
+        $multipage = 1;
+        $content = str_replace("\n<!--nextpage-->\n", '<!--nextpage-->', $content);
+        $content = str_replace("\n<!--nextpage-->", '<!--nextpage-->', $content);
+        $content = str_replace("<!--nextpage-->\n", '<!--nextpage-->', $content);
+        $pages = explode('<!--nextpage-->', $content);
+        $numpages = count($pages);
+    } else {
+        $pages[0] = $post->post_content;
+        $multipage = 0;
+    }
+    return true;
+}
 …
+}
+// Filters: these are the core of WP's plugin architecture
+function merge_filters($tag) {
+    global $wp_filter;
+    if ( isset($wp_filter['all']) ) {
+        foreach ($wp_filter['all'] as $priority => $functions) {
+            if ( isset($wp_filter[$tag][$priority]) )
+                $wp_filter[$tag][$priority] = array_merge($wp_filter['all'][$priority], $wp_filter[$tag][$priority]);
+            else
+                $wp_filter[$tag][$priority] = array_merge($wp_filter['all'][$priority], array());
+            $wp_filter[$tag][$priority] = array_unique($wp_filter[$tag][$priority]);
+        }
+    }
+    if ( isset($wp_filter[$tag]) )
+        ksort( $wp_filter[$tag] );
+}
+function apply_filters($tag, $string) {
+    global $wp_filter;
+    $args = array_slice(func_get_args(), 2);
+    merge_filters($tag);
+    if ( !isset($wp_filter[$tag]) ) {
+        return $string;
+    }
+    foreach ($wp_filter[$tag] as $priority => $functions) {
+        if ( !is_null($functions) ) {
+            foreach($functions as $function) {
+                $all_args = array_merge(array($string), $args);
+                $function_name = $function['function'];
+                $accepted_args = $function['accepted_args'];
+                if ( $accepted_args == 1 )
+                    $the_args = array($string);
+                elseif ( $accepted_args > 1 )
+                    $the_args = array_slice($all_args, 0, $accepted_args);
+                elseif ( $accepted_args == 0 )
+                    $the_args = NULL;
+                else
+                    $the_args = $all_args;
+                $string = call_user_func_array($function_name, $the_args);
+            }
+        }
+    }
+    return $string;
+}
+function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
+    global $wp_filter;
+    // check that we don't already have the same filter at the same priority
+    if ( isset($wp_filter[$tag]["$priority"]) ) {
+        foreach($wp_filter[$tag]["$priority"] as $filter) {
+            // uncomment if we want to match function AND accepted_args
+            // if ( $filter == array($function, $accepted_args) ) {
+            if ( $filter['function'] == $function_to_add ) {
+                return true;
+            }
+        }
+    }
+    // So the format is wp_filter['tag']['array of priorities']['array of ['array (functions, accepted_args)]']
+    $wp_filter[$tag]["$priority"][] = array('function'=>$function_to_add, 'accepted_args'=>$accepted_args);
+    return true;
+}
+function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
+    global $wp_filter;
+    // rebuild the list of filters
+    if ( isset($wp_filter[$tag]["$priority"]) ) {
+        foreach($wp_filter[$tag]["$priority"] as $filter) {
+            if ( $filter['function'] != $function_to_remove ) {
+                $new_function_list[] = $filter;
+            }
+        }
+        $wp_filter[$tag]["$priority"] = $new_function_list;
+    }
+    return true;
+}
+// The *_action functions are just aliases for the *_filter functions, they take special strings instead of generic content
+function do_action($tag, $arg = '') {
+    global $wp_filter;
+    $extra_args = array_slice(func_get_args(), 2);
+    if ( is_array($arg) )
+        $args = array_merge($arg, $extra_args);
+    else
+        $args = array_merge(array($arg), $extra_args);
+    merge_filters($tag);
+    if ( !isset($wp_filter[$tag]) ) {
+        return;
+    }
+    foreach ($wp_filter[$tag] as $priority => $functions) {
+        if ( !is_null($functions) ) {
+            foreach($functions as $function) {
+                $function_name = $function['function'];
+                $accepted_args = $function['accepted_args'];
+                if ( $accepted_args == 1 ) {
+                    if ( is_array($arg) )
+                        $the_args = $arg;
+                    else
+                        $the_args = array($arg);
+                } elseif ( $accepted_args > 1 ) {
+                    $the_args = array_slice($args, 0, $accepted_args);
+                } elseif ( $accepted_args == 0 ) {
+                    $the_args = NULL;
+                } else {
+                    $the_args = $args;
+                }
+                $string = call_user_func_array($function_name, $the_args);
+            }
+        }
+    }
+}
+function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
+    add_filter($tag, $function_to_add, $priority, $accepted_args);
+}
+function remove_action($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
+    remove_filter($tag, $function_to_remove, $priority, $accepted_args);
+}
+function get_page_uri($page_id) {
+    $page = get_page($page_id);
+    $uri = urldecode($page->post_name);
+    // A page cannot be it's own parent.
+    if ( $page->post_parent == $page->ID )
+        return $uri;
+    while ($page->post_parent != 0) {
+        $page = get_page($page->post_parent);
+        $uri = urldecode($page->post_name) . "/" . $uri;
+    }
+    return $uri;
+}
+function get_posts($args) {
+    global $wpdb;
+    parse_str($args, $r);
+    if ( !isset($r['numberposts']) )
+        $r['numberposts'] = 5;
+    if ( !isset($r['offset']) )
+        $r['offset'] = 0;
+    if ( !isset($r['category']) )
+        $r['category'] = '';
+    if ( !isset($r['orderby']) )
+        $r['orderby'] = 'post_date';
+    if ( !isset($r['order']) )
+        $r['order'] = 'DESC';
+    $now = current_time('mysql');
+    $posts = $wpdb->get_results(
+        "SELECT DISTINCT * FROM $wpdb->posts " .
+        ( empty( $r['category'] ) ? "" : ", $wpdb->post2cat " ) .
+        " WHERE post_date <= '$now' AND (post_status = 'publish') ".
+        ( empty( $r['category'] ) ? "" : "AND $wpdb->posts.ID = $wpdb->post2cat.post_id AND $wpdb->post2cat.category_id = " . $r['category']. " " ) .
+        " GROUP BY $wpdb->posts.ID ORDER BY " . $r['orderby'] . " " . $r['order'] . " LIMIT " . $r['offset'] . ',' . $r['numberposts'] );
+    update_post_caches($posts);
+    return $posts;
+}
+function &query_posts($query) {
+    global $wp_query;
+    return $wp_query->query($query);
+}
 function update_post_cache(&$posts) {
     global $post_cache;
 …
     if ( empty($dogs) )
         return;
     foreach ($dogs as $catt)
         $category_cache[$catt->post_id][$catt->category_id] = &get_category($catt->category_id);
 …
 function update_post_caches(&$posts) {
     global $post_cache, $category_cache, $post_meta_cache;
+    global $post_cache, $category_cache, $comment_count_cache, $post_meta_cache;
     global $wpdb;
 …
         $post_id_array[] = $posts[$i]->ID;
         $post_cache[$posts[$i]->ID] = &$posts[$i];
+        $comment_count_cache[$posts[$i]->ID] = $posts[$i]->comment_count;
+    }
 …
     update_post_category_cache($post_id_list);
-    update_postmeta_cache($post_id_list);
+}
-function update_postmeta_cache($post_id_list = '') {
-    global $wpdb, $post_meta_cache;
-    // We should validate this comma-separated list for the upcoming SQL query
-    $post_id_list = preg_replace('|[^0-9,]|', '', $post_id_list);
-    // we're marking each post as having its meta cached (with no keys... empty array), to prevent posts with no meta keys from being queried again
-    // any posts that DO have keys will have this empty array overwritten with a proper array, down below
-    $post_id_array = explode(',', $post_id_list);
-    foreach ( (array) $post_id_array as $pid )
-        $post_meta_cache[$pid] = array();
     // Get post-meta info
     if ( $meta_list = $wpdb->get_results("SELECT post_id, meta_key, meta_value FROM $wpdb->postmeta WHERE post_id IN($post_id_list) ORDER BY post_id, meta_key", ARRAY_A) ) {
         // Change from flat structure to hierarchical:
+        if ( !isset($post_meta_cache) )
+            $post_meta_cache = array();
+        $post_meta_cache = array();
         foreach ($meta_list as $metarow) {
             $mpid = (int) $metarow['post_id'];
+            $mpid = $metarow['post_id'];
             $mkey = $metarow['meta_key'];
             $mval = $metarow['meta_value'];
 …
 function update_category_cache() {
     return true;
+}
+function wp_head() {
+    do_action('wp_head');
+}
+function wp_footer() {
+    do_action('wp_footer');
+}
+function is_single ($post = '') {
+    global $wp_query;
+    if ( !$wp_query->is_single )
+        return false;
+    if ( empty( $post) )
+        return true;
+    $post_obj = $wp_query->get_queried_object();
+    if ( $post == $post_obj->ID )
+        return true;
+    elseif ( $post == $post_obj->post_title )
+        return true;
+    elseif ( $post == $post_obj->post_name )
+        return true;
+    return false;
+}
+function is_page ($page = '') {
+    global $wp_query;
+    if ( !$wp_query->is_page )
+        return false;
+    if ( empty($page) )
+        return true;
+    $page_obj = $wp_query->get_queried_object();
+    if ( $page == $page_obj->ID )
+        return true;
+    elseif ( $page == $page_obj->post_title )
+        return true;
+    else if ( $page == $page_obj->post_name )
+        return true;
+    return false;
+}
+function is_attachment () {
+    global $wp_query;
+    return $wp_query->is_attachment;
+}
+function is_preview() {
+    global $wp_query;
+    return $wp_query->is_preview;
+}
+function is_archive () {
+    global $wp_query;
+    return $wp_query->is_archive;
+}
+function is_date () {
+    global $wp_query;
+    return $wp_query->is_date;
+}
+function is_year () {
+    global $wp_query;
+    return $wp_query->is_year;
+}
+function is_month () {
+    global $wp_query;
+    return $wp_query->is_month;
+}
+function is_day () {
+    global $wp_query;
+    return $wp_query->is_day;
+}
+function is_time () {
+    global $wp_query;
+    return $wp_query->is_time;
+}
+function is_author ($author = '') {
+    global $wp_query;
+    if ( !$wp_query->is_author )
+        return false;
+    if ( empty($author) )
+        return true;
+    $author_obj = $wp_query->get_queried_object();
+    if ( $author == $author_obj->ID )
+        return true;
+    elseif ( $author == $author_obj->nickname )
+        return true;
+    elseif ( $author == $author_obj->user_nicename )
+        return true;
+    return false;
+}
+function is_category ($category = '') {
+    global $wp_query;
+    if ( !$wp_query->is_category )
+        return false;
+    if ( empty($category) )
+        return true;
+    $cat_obj = $wp_query->get_queried_object();
+    if ( $category == $cat_obj->cat_ID )
+        return true;
+    else if ( $category == $cat_obj->cat_name )
+        return true;
+    elseif ( $category == $cat_obj->category_nicename )
+        return true;
+    return false;
+}
+function is_search () {
+    global $wp_query;
+    return $wp_query->is_search;
+}
+function is_feed () {
+    global $wp_query;
+    return $wp_query->is_feed;
+}
+function is_trackback () {
+    global $wp_query;
+    return $wp_query->is_trackback;
+}
+function is_admin () {
+    global $wp_query;
+    return ( $wp_query->is_admin || strstr($_SERVER['REQUEST_URI'], 'wp-admin/') );
+}
+function is_home () {
+    global $wp_query;
+    return $wp_query->is_home;
+}
+function is_404 () {
+    global $wp_query;
+    return $wp_query->is_404;
+}
+function is_comments_popup () {
+    global $wp_query;
+    return $wp_query->is_comments_popup;
+}
+function is_paged () {
+    global $wp_query;
+    return $wp_query->is_paged;
+}
+function in_the_loop() {
+    global $wp_query;
+    return $wp_query->in_the_loop;
+}
+function get_query_var($var) {
+    global $wp_query;
+    return $wp_query->get($var);
+}
+function have_posts() {
+    global $wp_query;
+    return $wp_query->have_posts();
+}
+function rewind_posts() {
+    global $wp_query;
+    return $wp_query->rewind_posts();
+}
+function the_post() {
+    global $wp_query;
+    $wp_query->the_post();
+}
+function get_theme_root() {
+    return apply_filters('theme_root', ABSPATH . "wp-content/themes");
+}
+function get_theme_root_uri() {
+    return apply_filters('theme_root_uri', get_settings('siteurl') . "/wp-content/themes", get_settings('siteurl'));
+}
+function get_stylesheet() {
+    return apply_filters('stylesheet', get_settings('stylesheet'));
+}
+function get_stylesheet_directory() {
+    $stylesheet = get_stylesheet();
+    $stylesheet_dir = get_theme_root() . "/$stylesheet";
+    return apply_filters('stylesheet_directory', $stylesheet_dir, $stylesheet);
+}
+function get_stylesheet_directory_uri() {
+    $stylesheet = rawurlencode( get_stylesheet() );
+    $stylesheet_dir_uri = get_theme_root_uri() . "/$stylesheet";
+    return apply_filters('stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet);
+}
+function get_stylesheet_uri() {
+    $stylesheet_dir_uri = get_stylesheet_directory_uri();
+    $stylesheet_uri = $stylesheet_dir_uri . "/style.css";
+    return apply_filters('stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
+}
+function get_template() {
+    $template = get_settings('template');
+    if (!file_exists(get_theme_root() . "/$template")) { //works for dirs too
+        update_option('template', 'default');
+        update_option('stylesheet', 'default');
+    }
+    return apply_filters('template', get_settings('template'));
+}
+function get_template_directory() {
+    $template = get_template();
+    $template_dir = get_theme_root() . "/$template";
+    return apply_filters('template_directory', $template_dir, $template);
+}
+function get_template_directory_uri() {
+    $template = get_template();
+    $template_dir_uri = get_theme_root_uri() . "/$template";
+    return apply_filters('template_directory_uri', $template_dir_uri, $template);
+}
+function get_theme_data($theme_file) {
+    $theme_data = implode('', file($theme_file));
+    preg_match("|Theme Name:(.*)|i", $theme_data, $theme_name);
+    preg_match("|Theme URI:(.*)|i", $theme_data, $theme_uri);
+    preg_match("|Description:(.*)|i", $theme_data, $description);
+    preg_match("|Author:(.*)|i", $theme_data, $author_name);
+    preg_match("|Author URI:(.*)|i", $theme_data, $author_uri);
+    preg_match("|Template:(.*)|i", $theme_data, $template);
+    if ( preg_match("|Version:(.*)|i", $theme_data, $version) )
+        $version = $version[1];
+    else
+        $version ='';
+    if ( preg_match("|Status:(.*)|i", $theme_data, $status) )
+        $status = $status[1];
+    else
+        $status ='publish';
+    $description = wptexturize($description[1]);
+    $name = $theme_name[1];
+    $name = trim($name);
+    $theme = $name;
+    if ( '' == $author_uri[1] ) {
+        $author = $author_name[1];
+    } else {
+        $author = '<a href="' . $author_uri[1] . '" title="' . __('Visit author homepage') . '">' . $author_name[1] . '</a>';
+    }
+    return array('Name' => $name, 'Title' => $theme, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1], 'Status' => $status);
+}
+function get_themes() {
+    global $wp_themes;
+    global $wp_broken_themes;
+    if ( isset($wp_themes) )
+        return $wp_themes;
+    $themes = array();
+    $wp_broken_themes = array();
+    $theme_root = get_theme_root();
+    $theme_loc = str_replace(ABSPATH, '', $theme_root);
+    // Files in wp-content/themes directory
+    $themes_dir = @ dir($theme_root);
+    if ( $themes_dir ) {
+        while(($theme_dir = $themes_dir->read()) !== false) {
+            if ( is_dir($theme_root . '/' . $theme_dir) && is_readable($theme_root . '/' . $theme_dir) ) {
+                if ( $theme_dir{0} == '.' || $theme_dir == '..' || $theme_dir == 'CVS' ) {
+                    continue;
+                }
+                $stylish_dir = @ dir($theme_root . '/' . $theme_dir);
+                $found_stylesheet = false;
+                while (($theme_file = $stylish_dir->read()) !== false) {
+                    if ( $theme_file == 'style.css' ) {
+                        $theme_files[] = $theme_dir . '/' . $theme_file;
+                        $found_stylesheet = true;
+                        break;
+                    }
+                }
+                if ( !$found_stylesheet ) {
+                    $wp_broken_themes[$theme_dir] = array('Name' => $theme_dir, 'Title' => $theme_dir, 'Description' => __('Stylesheet is missing.'));
+                }
+            }
+        }
+    }
+    if ( !$themes_dir || !$theme_files ) {
+        return $themes;
+    }
+    sort($theme_files);
+    foreach($theme_files as $theme_file) {
+        if ( ! is_readable("$theme_root/$theme_file") ) {
+            $wp_broken_themes[$theme_file] = array('Name' => $theme_file, 'Title' => $theme_file, 'Description' => __('File not readable.'));
+            continue;
+        }
+        $theme_data = get_theme_data("$theme_root/$theme_file");
+        $name = $theme_data['Name'];
+        $title = $theme_data['Title'];
+        $description = wptexturize($theme_data['Description']);
+        $version = $theme_data['Version'];
+        $author = $theme_data['Author'];
+        $template = $theme_data['Template'];
+        $stylesheet = dirname($theme_file);
+        foreach (array('png', 'gif', 'jpg', 'jpeg') as $ext) {
+            if (file_exists("$theme_root/$stylesheet/screenshot.$ext")) {
+                $screenshot = "screenshot.$ext";
+                break;
+            }
+        }
+        if ( empty($name) ) {
+            $name = dirname($theme_file);
+            $title = $name;
+        }
+        if ( empty($template) ) {
+            if ( file_exists(dirname("$theme_root/$theme_file/index.php")) ) {
+                $template = dirname($theme_file);
+            } else {
+                continue;
+            }
+        }
+        $template = trim($template);
+        if ( !file_exists("$theme_root/$template/index.php") ) {
+            $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.'));
+            continue;
+        }
+        $stylesheet_files = array();
+        $stylesheet_dir = @ dir("$theme_root/$stylesheet");
+        if ( $stylesheet_dir ) {
+            while(($file = $stylesheet_dir->read()) !== false) {
+                if ( !preg_match('|^\.+$|', $file) && preg_match('|\.css$|', $file) )
+                    $stylesheet_files[] = "$theme_loc/$stylesheet/$file";
+            }
+        }
+        $template_files = array();
+        $template_dir = @ dir("$theme_root/$template");
+        if ( $template_dir ) {
+            while(($file = $template_dir->read()) !== false) {
+                if ( !preg_match('|^\.+$|', $file) && preg_match('|\.php$|', $file) )
+                    $template_files[] = "$theme_loc/$template/$file";
+            }
+        }
+        $template_dir = dirname($template_files[0]);
+        $stylesheet_dir = dirname($stylesheet_files[0]);
+        if ( empty($template_dir) )
+            $template_dir = '/';
+        if ( empty($stylesheet_dir) )
+            $stylesheet_dir = '/';
+        // Check for theme name collision.  This occurs if a theme is copied to
+        // a new theme directory and the theme header is not updated.  Whichever
+        // theme is first keeps the name.  Subsequent themes get a suffix applied.
+        // The Default and Classic themes always trump their pretenders.
+        if ( isset($themes[$name]) ) {
+            if ( ('WordPress Default' == $name || 'WordPress Classic' == $name) &&
+                     ('default' == $stylesheet || 'classic' == $stylesheet) ) {
+                // If another theme has claimed to be one of our default themes, move
+                // them aside.
+                $suffix = $themes[$name]['Stylesheet'];
+                $new_name = "$name/$suffix";
+                $themes[$new_name] = $themes[$name];
+                $themes[$new_name]['Name'] = $new_name;
+            } else {
+                $name = "$name/$stylesheet";
+            }
+        }
+        $themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status'], 'Screenshot' => $screenshot);
+    }
+    // Resolve theme dependencies.
+    $theme_names = array_keys($themes);
+    foreach ($theme_names as $theme_name) {
+        $themes[$theme_name]['Parent Theme'] = '';
+        if ( $themes[$theme_name]['Stylesheet'] != $themes[$theme_name]['Template'] ) {
+            foreach ($theme_names as $parent_theme_name) {
+                if ( ($themes[$parent_theme_name]['Stylesheet'] == $themes[$parent_theme_name]['Template']) && ($themes[$parent_theme_name]['Template'] == $themes[$theme_name]['Template']) ) {
+                    $themes[$theme_name]['Parent Theme'] = $themes[$parent_theme_name]['Name'];
+                    break;
+                }
+            }
+        }
+    }
+    $wp_themes = $themes;
+    return $themes;
+}
+function get_theme($theme) {
+    $themes = get_themes();
+    if ( array_key_exists($theme, $themes) )
+        return $themes[$theme];
+    return NULL;
+}
+function get_current_theme() {
+    $themes = get_themes();
+    $theme_names = array_keys($themes);
+    $current_template = get_settings('template');
+    $current_stylesheet = get_settings('stylesheet');
+    $current_theme = 'WordPress Default';
+    if ( $themes ) {
+        foreach ($theme_names as $theme_name) {
+            if ( $themes[$theme_name]['Stylesheet'] == $current_stylesheet &&
+                    $themes[$theme_name]['Template'] == $current_template ) {
+                $current_theme = $themes[$theme_name]['Name'];
+                break;
+            }
+        }
+    }
+    return $current_theme;
+}
+function get_query_template($type) {
+    $template = '';
+    if ( file_exists(TEMPLATEPATH . "/{$type}.php") )
+        $template = TEMPLATEPATH . "/{$type}.php";
+    return apply_filters("{$type}_template", $template);
+}
+function get_404_template() {
+    return get_query_template('404');
+}
+function get_archive_template() {
+    return get_query_template('archive');
+}
+function get_author_template() {
+    return get_query_template('author');
+}
+function get_category_template() {
+    $template = '';
+    if ( file_exists(TEMPLATEPATH . "/category-" . get_query_var('cat') . '.php') )
+        $template = TEMPLATEPATH . "/category-" . get_query_var('cat') . '.php';
+    else if ( file_exists(TEMPLATEPATH . "/category.php") )
+        $template = TEMPLATEPATH . "/category.php";
+    return apply_filters('category_template', $template);
+}
+function get_date_template() {
+    return get_query_template('date');
+}
+function get_home_template() {
+    $template = '';
+    if ( file_exists(TEMPLATEPATH . "/home.php") )
+        $template = TEMPLATEPATH . "/home.php";
+    else if ( file_exists(TEMPLATEPATH . "/index.php") )
+        $template = TEMPLATEPATH . "/index.php";
+    return apply_filters('home_template', $template);
+}
+function get_page_template() {
+    global $wp_query;
+    $id = $wp_query->post->ID;
+    $template = get_post_meta($id, '_wp_page_template', true);
+    if ( 'default' == $template )
+        $template = '';
+    if ( ! empty($template) && file_exists(TEMPLATEPATH . "/$template") )
+        $template = TEMPLATEPATH . "/$template";
+    else if ( file_exists(TEMPLATEPATH . "/page.php") )
+        $template = TEMPLATEPATH . "/page.php";
+    else
+        $template = '';
+    return apply_filters('page_template', $template);
+}
+function get_paged_template() {
+    return get_query_template('paged');
+}
+function get_search_template() {
+    return get_query_template('search');
+}
+function get_single_template() {
+    return get_query_template('single');
+}
+function get_attachment_template() {
+    global $posts;
+    $type = explode('/', $posts[0]->post_mime_type);
+    if ( $template = get_query_template($type[0]) )
+        return $template;
+    elseif ( $template = get_query_template($type[1]) )
+        return $template;
+    elseif ( $template = get_query_template("$type[0]_$type[1]") )
+        return $template;
+    else
+        return get_query_template('attachment');
+}
+function get_comments_popup_template() {
+    if ( file_exists( TEMPLATEPATH . '/comments-popup.php') )
+        $template = TEMPLATEPATH . '/comments-popup.php';
+    else
+        $template = get_theme_root() . '/default/comments-popup.php';
+    return apply_filters('comments_popup_template', $template);
+}
+// Borrowed from the PHP Manual user notes. Convert entities, while
+// preserving already-encoded entities:
+function htmlentities2($myHTML) {
+    $translation_table=get_html_translation_table (HTML_ENTITIES,ENT_QUOTES);
+    $translation_table[chr(38)] = '&';
+    return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&amp;" , strtr($myHTML, $translation_table));
+}
+function is_plugin_page() {
+    global $plugin_page;
+    if ( isset($plugin_page) )
+        return true;
+    return false;
+}
 …
     $ret = '';
     if ( is_array(func_get_arg(0)) ) {
         if ( @func_num_args() < 2 || '' == @func_get_arg(1) )
+        if ( @func_num_args() < 2 )
             $uri = $_SERVER['REQUEST_URI'];
         else
             $uri = @func_get_arg(1);
     } else {
         if ( @func_num_args() < 3 || '' == @func_get_arg(2) )
+        if ( @func_num_args() < 3 )
             $uri = $_SERVER['REQUEST_URI'];
         else
             $uri = @func_get_arg(2);
+    }
-    if ( $frag = strstr($uri, '#') )
-        $uri = substr($uri, 0, -strlen($frag));
-    else
-        $frag = '';
-    if ( preg_match('|^https?://|i', $uri, $matches) ) {
-        $protocol = $matches[0];
-        $uri = substr($uri, strlen($protocol));
-    } else {
-        $protocol = '';
+    }
 …
             $query = $parts[1];
+        }
+    } else if ( !empty($protocol) || strstr($uri, '/') ) {
+    }
+    else if ( strstr($uri, '/') ) {
         $base = $uri . '?';
         $query = '';
 …
+        }
+    }
+    $ret = $protocol . $base . $ret . $frag;
+    if ( get_magic_quotes_gpc() )
+        $ret = stripslashes($ret); // parse_str() adds slashes if magicquotes is on.  See: http://php.net/parse_str
+    $ret = $base . $ret;
     return trim($ret, '?');
+}
+/*
+remove_query_arg: Returns a modified querystring by removing
+a single key or an array of keys.
+Omitting oldquery_or_uri uses the $_SERVER value.
+Parameters:
+remove_query_arg(removekey, [oldquery_or_uri]) or
+remove_query_arg(removekeyarray, [oldquery_or_uri])
+*/
+function remove_query_arg($key, $query='') {
+    if ( is_array($key) ) { // removing multiple keys
+        foreach ( (array) $key as $k )
+            $query = add_query_arg($k, '', $query);
+        return $query;
+    }
+function remove_query_arg($key, $query) {
     return add_query_arg($key, '', $query);
+}
+function load_template($file) {
+    global $posts, $post, $wp_did_header, $wp_did_template_redirect, $wp_query,
+        $wp_rewrite, $wpdb;
+    extract($wp_query->query_vars);
+    require_once($file);
+}
 …
 function wp($query_vars = '') {
     global $wp;
     $wp->main($query_vars);
+}
 …
+}
+function cache_javascript_headers() {
+    $expiresOffset = 864000; // 10 days
+    header("Content-type: text/javascript; charset=" . get_bloginfo('charset'));
+    header("Vary: Accept-Encoding"); // Handle proxies
+    header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT");
+function get_usermeta( $user_id, $meta_key = '') {
+    global $wpdb;
+    $user_id = (int) $user_id;
+    if ( !empty($meta_key) ) {
+        $meta_key = preg_replace('|a-z0-9_|i', '', $meta_key);
+        $metas = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
+    } else {
+        $metas = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user_id'");
+    }
+    if ( empty($metas) ) {
+        if ( empty($meta_key) )
+            return array();
+        else
+            return '';
+    }
+    foreach ($metas as $index => $meta) {
+        @ $value = unserialize($meta->meta_value);
+        if ( $value === FALSE )
+            $value = $meta->meta_value;
+        $values[] = $value;
+    }
+    if ( count($values) == 1 )
+        return $values[0];
+    else
+        return $values;
+}
+function update_usermeta( $user_id, $meta_key, $meta_value ) {
+    global $wpdb;
+    if ( !is_numeric( $user_id ) )
+        return false;
+    $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
+    if ( is_array($meta_value) || is_object($meta_value) )
+        $meta_value = serialize($meta_value);
+    $meta_value = trim( $meta_value );
+    if (empty($meta_value)) {
+        delete_usermeta($user_id, $meta_key);
+    }
+    $cur = $wpdb->get_row("SELECT * FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
+    if ( !$cur ) {
+        $wpdb->query("INSERT INTO $wpdb->usermeta ( user_id, meta_key, meta_value )
+        VALUES
+        ( '$user_id', '$meta_key', '$meta_value' )");
+    } else if ( $cur->meta_value != $meta_value ) {
+        $wpdb->query("UPDATE $wpdb->usermeta SET meta_value = '$meta_value' WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
+    } else {
+        return false;
+    }
+    $user = get_userdata($user_id);
+    wp_cache_delete($user_id, 'users');
+    wp_cache_delete($user->user_login, 'userlogins');
+    return true;
+}
+function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
+    global $wpdb;
+    if ( !is_numeric( $user_id ) )
+        return false;
+    $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
+    if ( is_array($meta_value) || is_object($meta_value) )
+        $meta_value = serialize($meta_value);
+    $meta_value = trim( $meta_value );
+    if ( ! empty($meta_value) )
+        $wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key' AND meta_value = '$meta_value'");
+    else
+        $wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
+    $user = get_userdata($user_id);
+    wp_cache_delete($user_id, 'users');
+    wp_cache_delete($user->user_login, 'userlogins');
+    return true;
+}
+function register_activation_hook($file, $function) {
+    $file = plugin_basename($file);
+    add_action('activate_' . $file, $function);
+}
+function register_deactivation_hook($file, $function) {
+    $file = plugin_basename($file);
+    add_action('deactivate_' . $file, $function);
+}
+function plugin_basename($file) {
+    $file = preg_replace('|\\\\+|', '\\\\', $file);
+    $file = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', $file);
+    return $file;
+}
 …
+}
-function bool_from_yn($yn) {
-    if ($yn == 'Y') return 1;
-    return 0;
+}
-function do_feed() {
-    $feed = get_query_var('feed');
-    // Remove the pad, if present.
-    $feed = preg_replace('/^_+/', '', $feed);
-    if ($feed == '' || $feed == 'feed')
-        $feed = 'rss2';
-    $for_comments = false;
-    if ( is_singular() || get_query_var('withcomments') == 1 || $feed == 'comments-rss2' ) {
-        $feed = 'rss2';
-        $for_comments = true;
+    }
-    $hook = 'do_feed_' . $feed;
-    do_action($hook, $for_comments);
+}
-function do_feed_rdf() {
-    load_template(ABSPATH . 'wp-rdf.php');
+}
-function do_feed_rss() {
-    load_template(ABSPATH . 'wp-rss.php');
+}
-function do_feed_rss2($for_comments) {
-    if ( $for_comments ) {
-        load_template(ABSPATH . 'wp-commentsrss2.php');
-    } else {
-        load_template(ABSPATH . 'wp-rss2.php');
+    }
+}
-function do_feed_atom() {
-    load_template(ABSPATH . 'wp-atom.php');
+}
-function do_robots() {
-    do_action('do_robotstxt');
-    if ( '0' == get_option('blog_public') ) {
-        echo "User-agent: *\n";
-        echo "Disallow: /\n";
-    } else {
-        echo "User-agent: *\n";
-        echo "Disallow:\n";
+    }
+}
-function is_blog_installed() {
-    global $wpdb;
-    $wpdb->hide_errors();
-    $installed = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'");
-    $wpdb->show_errors();
-    return $installed;
+}
-function wp_nonce_url($actionurl, $action = -1) {
-    return wp_specialchars(add_query_arg('_wpnonce', wp_create_nonce($action), $actionurl));
+}
-function wp_nonce_field($action = -1) {
-    echo '<input type="hidden" name="_wpnonce" value="' . wp_create_nonce($action) . '" />';
-    wp_referer_field();
+}
-function wp_referer_field() {
-    $ref = wp_specialchars($_SERVER['REQUEST_URI']);
-    echo '<input type="hidden" name="_wp_http_referer" value="'. $ref . '" />';
-    if ( wp_get_original_referer() ) {
-        $original_ref = wp_specialchars(stripslashes(wp_get_original_referer()));
-        echo '<input type="hidden" name="_wp_original_http_referer" value="'. $original_ref . '" />';
+    }
+}
-function wp_original_referer_field() {
-    echo '<input type="hidden" name="_wp_original_http_referer" value="' . wp_specialchars(stripslashes($_SERVER['REQUEST_URI'])) . '" />';
+}
-function wp_get_referer() {
-    foreach ( array($_REQUEST['_wp_http_referer'], $_SERVER['HTTP_REFERER']) as $ref )
-        if ( !empty($ref) )
-            return $ref;
-    return false;
+}
-function wp_get_original_referer() {
-    if ( !empty($_REQUEST['_wp_original_http_referer']) )
-        return $_REQUEST['_wp_original_http_referer'];
-    return false;
+}
-function wp_mkdir_p($target) {
-    // from php.net/mkdir user contributed notes
-    if (file_exists($target)) {
-        if (! @ is_dir($target))
-            return false;
-        else
-            return true;
+    }
-    // Attempting to create the directory may clutter up our display.
-    if (@ mkdir($target)) {
-        $stat = @ stat(dirname($target));
-        $dir_perms = $stat['mode'] & 0007777;  // Get the permission bits.
-        @ chmod($target, $dir_perms);
-        return true;
-    } else {
-        if ( is_dir(dirname($target)) )
-            return false;
+    }
-    // If the above failed, attempt to create the parent node, then try again.
-    if (wp_mkdir_p(dirname($target)))
-        return wp_mkdir_p($target);
-    return false;
+}
-// Returns an array containing the current upload directory's path and url, or an error message.
-function wp_upload_dir() {
-    $siteurl = get_option('siteurl');
-    //prepend ABSPATH to $dir and $siteurl to $url if they're not already there
-    $path = str_replace(ABSPATH, '', trim(get_option('upload_path')));
-    $dir = ABSPATH . $path;
-    $url = trailingslashit($siteurl) . $path;
-    if ( $dir == ABSPATH ) { //the option was empty
-        $dir = ABSPATH . 'wp-content/uploads';
+    }
-    if ( defined('UPLOADS') ) {
-        $dir = ABSPATH . UPLOADS;
-        $url = trailingslashit($siteurl) . UPLOADS;
+    }
-    if ( get_option('uploads_use_yearmonth_folders')) {
-        // Generate the yearly and monthly dirs
-        $time = current_time( 'mysql' );
-        $y = substr( $time, 0, 4 );
-        $m = substr( $time, 5, 2 );
-        $dir = $dir . "/$y/$m";
-        $url = $url . "/$y/$m";
+    }
-    // Make sure we have an uploads dir
-    if ( ! wp_mkdir_p( $dir ) ) {
-        $message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), $dir);
-        return array('error' => $message);
+    }
-    $uploads = array('path' => $dir, 'url' => $url, 'error' => false);
-    return apply_filters('upload_dir', $uploads);
+}
-function wp_upload_bits($name, $type, $bits) {
-    if ( empty($name) )
-        return array('error' => __("Empty filename"));
-    $wp_filetype = wp_check_filetype($name);
-    if ( !$wp_filetype['ext'] )
-        return array('error' => __("Invalid file type"));
-    $upload = wp_upload_dir();
-    if ( $upload['error'] !== false )
-        return $upload;
-    $number = '';
-    $filename = $name;
-    $path_parts = pathinfo($filename);
-    $ext = $path_parts['extension'];
-    if ( empty($ext) )
-        $ext = '';
-    else
-        $ext = ".$ext";
-    while ( file_exists($upload['path'] . "/$filename") ) {
-        if ( '' == "$number$ext" )
-            $filename = $filename . ++$number . $ext;
-        else
-            $filename = str_replace("$number$ext", ++$number . $ext, $filename);
+    }
-    $new_file = $upload['path'] . "/$filename";
-    if ( ! wp_mkdir_p( dirname($new_file) ) ) {
-        $message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), dirname($new_file));
-        return array('error' => $message);
+    }
-    $ifp = @ fopen($new_file, 'wb');
-    if ( ! $ifp )
-        return array('error' => sprintf(__('Could not write file %s'), $new_file));
-    $success = @ fwrite($ifp, $bits);
-    fclose($ifp);
-    // Set correct file permissions
-    $stat = @ stat(dirname($new_file));
-    $perms = $stat['mode'] & 0007777;
-    $perms = $perms & 0000666;
-    @ chmod($new_file, $perms);
-    // Compute the URL
-    $url = $upload['url'] . "/$filename";
-    return array('file' => $new_file, 'url' => $url, 'error' => false);
+}
-function wp_check_filetype($filename, $mimes = null) {
-    // Accepted MIME types are set here as PCRE unless provided.
-    $mimes = is_array($mimes) ? $mimes : apply_filters('upload_mimes', array (
-        'jpg|jpeg|jpe' => 'image/jpeg',
-        'gif' => 'image/gif',
-        'png' => 'image/png',
-        'bmp' => 'image/bmp',
-        'tif|tiff' => 'image/tiff',
-        'ico' => 'image/x-icon',
-        'asf|asx|wax|wmv|wmx' => 'video/asf',
-        'avi' => 'video/avi',
-        'mov|qt' => 'video/quicktime',
-        'mpeg|mpg|mpe' => 'video/mpeg',
-        'txt|c|cc|h' => 'text/plain',
-        'rtx' => 'text/richtext',
-        'css' => 'text/css',
-        'htm|html' => 'text/html',
-        'mp3|mp4' => 'audio/mpeg',
-        'ra|ram' => 'audio/x-realaudio',
-        'wav' => 'audio/wav',
-        'ogg' => 'audio/ogg',
-        'mid|midi' => 'audio/midi',
-        'wma' => 'audio/wma',
-        'rtf' => 'application/rtf',
-        'js' => 'application/javascript',
-        'pdf' => 'application/pdf',
-        'doc' => 'application/msword',
-        'pot|pps|ppt' => 'application/vnd.ms-powerpoint',
-        'wri' => 'application/vnd.ms-write',
-        'xla|xls|xlt|xlw' => 'application/vnd.ms-excel',
-        'mdb' => 'application/vnd.ms-access',
-        'mpp' => 'application/vnd.ms-project',
-        'swf' => 'application/x-shockwave-flash',
-        'class' => 'application/java',
-        'tar' => 'application/x-tar',
-        'zip' => 'application/zip',
-        'gz|gzip' => 'application/x-gzip',
-        'exe' => 'application/x-msdownload'
-    ));
-    $type = false;
-    $ext = false;
-    foreach ($mimes as $ext_preg => $mime_match) {
-        $ext_preg = '!\.(' . $ext_preg . ')$!i';
-        if ( preg_match($ext_preg, $filename, $ext_matches) ) {
-            $type = $mime_match;
-            $ext = $ext_matches[1];
-            break;
+        }
+    }
-    return compact('ext', 'type');
+}
-function wp_explain_nonce($action) {
-    if ( $action !== -1 && preg_match('/([a-z]+)-([a-z]+)(_(.+))?/', $action, $matches) ) {
-        $verb = $matches[1];
-        $noun = $matches[2];
-        $trans = array();
-        $trans['update']['attachment'] = array(__('Are you sure you want to edit this attachment: &quot;%s&quot;?'), 'get_the_title');
-        $trans['add']['category'] = array(__('Are you sure you want to add this category?'), false);
-        $trans['delete']['category'] = array(__('Are you sure you want to delete this category: &quot;%s&quot;?'), 'get_catname');
-        $trans['update']['category'] = array(__('Are you sure you want to edit this category: &quot;%s&quot;?'), 'get_catname');
-        $trans['delete']['comment'] = array(__('Are you sure you want to delete this comment: &quot;%s&quot;?'), 'use_id');
-        $trans['unapprove']['comment'] = array(__('Are you sure you want to unapprove this comment: &quot;%s&quot;?'), 'use_id');
-        $trans['approve']['comment'] = array(__('Are you sure you want to approve this comment: &quot;%s&quot;?'), 'use_id');
-        $trans['update']['comment'] = array(__('Are you sure you want to edit this comment: &quot;%s&quot;?'), 'use_id');
-        $trans['bulk']['comments'] = array(__('Are you sure you want to bulk modify comments?'), false);
-        $trans['moderate']['comments'] = array(__('Are you sure you want to moderate comments?'), false);
-        $trans['add']['bookmark'] = array(__('Are you sure you want to add this bookmark?'), false);
-        $trans['delete']['bookmark'] = array(__('Are you sure you want to delete this bookmark: &quot;%s&quot;?'), 'use_id');
-        $trans['update']['bookmark'] = array(__('Are you sure you want to edit this bookmark: &quot;%s&quot;?'), 'use_id');
-        $trans['bulk']['bookmarks'] = array(__('Are you sure you want to bulk modify bookmarks?'), false);
-        $trans['add']['page'] = array(__('Are you sure you want to add this page?'), false);
-        $trans['delete']['page'] = array(__('Are you sure you want to delete this page: &quot;%s&quot;?'), 'get_the_title');
-        $trans['update']['page'] = array(__('Are you sure you want to edit this page: &quot;%s&quot;?'), 'get_the_title');
-        $trans['edit']['plugin'] = array(__('Are you sure you want to edit this plugin file: &quot;%s&quot;?'), 'use_id');
-        $trans['activate']['plugin'] = array(__('Are you sure you want to activate this plugin: &quot;%s&quot;?'), 'use_id');
-        $trans['deactivate']['plugin'] = array(__('Are you sure you want to deactivate this plugin: &quot;%s&quot;?'), 'use_id');
-        $trans['add']['post'] = array(__('Are you sure you want to add this post?'), false);
-        $trans['delete']['post'] = array(__('Are you sure you want to delete this post: &quot;%s&quot;?'), 'get_the_title');
-        $trans['update']['post'] = array(__('Are you sure you want to edit this post: &quot;%s&quot;?'), 'get_the_title');
-        $trans['add']['user'] = array(__('Are you sure you want to add this user?'), false);
-        $trans['delete']['users'] = array(__('Are you sure you want to delete users?'), false);
-        $trans['bulk']['users'] = array(__('Are you sure you want to bulk modify users?'), false);
-        $trans['update']['user'] = array(__('Are you sure you want to edit this user: &quot;%s&quot;?'), 'get_author_name');
-        $trans['update']['profile'] = array(__('Are you sure you want to modify the profile for: &quot;%s&quot;?'), 'get_author_name');
-        $trans['update']['options'] = array(__('Are you sure you want to edit your settings?'), false);
-        $trans['update']['permalink'] = array(__('Are you sure you want to change your permalink structure to: %s?'), 'use_id');
-        $trans['edit']['file'] = array(__('Are you sure you want to edit this file: &quot;%s&quot;?'), 'use_id');
-        $trans['edit']['theme'] = array(__('Are you sure you want to edit this theme file: &quot;%s&quot;?'), 'use_id');
-        $trans['switch']['theme'] = array(__('Are you sure you want to switch to this theme: &quot;%s&quot;?'), 'use_id');
-        if ( isset($trans[$verb][$noun]) ) {
-            if ( !empty($trans[$verb][$noun][1]) ) {
-                $lookup = $trans[$verb][$noun][1];
-                $object = $matches[4];
-                if ( 'use_id' != $lookup )
-                    $object = call_user_func($lookup, $object);
-                return sprintf($trans[$verb][$noun][0], $object);
-            } else {
-                return $trans[$verb][$noun][0];
+            }
+        }
+    }
-    return apply_filters( 'explain_nonce_' . $verb . '-' . $noun, __('Are you sure you want to do this?'), $matches[4] );
+}
-function wp_nonce_ays($action) {
-    global $pagenow, $menu, $submenu, $parent_file, $submenu_file;
-    $adminurl = get_option('siteurl') . '/wp-admin';
-    if ( wp_get_referer() )
-        $adminurl = wp_get_referer();
-    $title = __('WordPress Confirmation');
-    // Remove extra layer of slashes.
-    $_POST   = stripslashes_deep($_POST  );
-    if ( $_POST ) {
-        $q = http_build_query($_POST);
-        $q = explode( ini_get('arg_separator.output'), $q);
-        $html .= "\t<form method='post' action='$pagenow'>\n";
-        foreach ( (array) $q as $a ) {
-            $v = substr(strstr($a, '='), 1);
-            $k = substr($a, 0, -(strlen($v)+1));
-            $html .= "\t\t<input type='hidden' name='" . wp_specialchars( urldecode($k), 1 ) . "' value='" . wp_specialchars( urldecode($v), 1 ) . "' />\n";
+        }
-        $html .= "\t\t<input type='hidden' name='_wpnonce' value='" . wp_create_nonce($action) . "' />\n";
-        $html .= "\t\t<div id='message' class='confirm fade'>\n\t\t<p>" . wp_explain_nonce($action) . "</p>\n\t\t<p><a href='$adminurl'>" . __('No') . "</a> <input type='submit' value='" . __('Yes') . "' /></p>\n\t\t</div>\n\t</form>\n";
-    } else {
-        $html .= "\t<div id='message' class='confirm fade'>\n\t<p>" . wp_explain_nonce($action) . "</p>\n\t<p><a href='$adminurl'>" . __('No') . "</a> <a href='" . add_query_arg( '_wpnonce', wp_create_nonce($action), $_SERVER['REQUEST_URI'] ) . "'>" . __('Yes') . "</a></p>\n\t</div>\n";
+    }
-    $html .= "</body>\n</html>";
-    wp_die($html, $title);
+}
-function wp_die($message, $title = '') {
-    global $wp_locale;
-    header('Content-Type: text/html; charset=utf-8');
-    if ( empty($title) )
-        $title = __('WordPress &rsaquo; Error');
-    if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
-        $admin_dir = '';
-    else
-        $admin_dir = 'wp-admin/';
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists('language_attributes') ) language_attributes(); ?>>
-<head>
-    <title><?php echo $title ?></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" href="<?php echo $admin_dir; ?>install.css" type="text/css" />
-<?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
-    <link rel="stylesheet" href="<?php echo $admin_dir; ?>install-rtl.css" type="text/css" />
-<?php endif; ?>
-</head>
-<body>
-    <h1 id="logo"><img alt="WordPress" src="<?php echo $admin_dir; ?>images/wordpress-logo.png" /></h1>
-    <p><?php echo $message; ?></p>
-</body>
-</html>
-<?php
-    die();
+}
-function _mce_set_direction() {
-    global $wp_locale;
-    if ('rtl' == $wp_locale->text_direction) {
-        echo 'directionality : "rtl" ,';
-        echo 'theme_advanced_toolbar_align : "right" ,';
+    }
+}
-function _mce_load_rtl_plugin($input) {
-    global $wp_locale;
-    if ('rtl' == $wp_locale->text_direction)
-        $input[] = 'directionality';
-    return $input;
+}
-function _mce_add_direction_buttons($input) {
-    global $wp_locale;
-    if ('rtl' == $wp_locale->text_direction) {
-        $new_buttons = array('separator', 'ltr', 'rtl');
-        $input = array_merge($input, $new_buttons);
+    }
-    return $input;
+}
-?>

trunk/wp-includes/gettext.php

-                      r4431
+                      r3503
    */
   function readint() {
+      $stream = $this->STREAM->read(4);
       if ($this->BYTEORDER == 0) {
         // low endian
+        return array_shift(unpack('V', $this->STREAM->read(4)));
+        $unpacked = unpack('V',$stream);
+        return array_shift($unpacked);
       } else {
         // big endian
+        return array_shift(unpack('N', $this->STREAM->read(4)));
+        $unpacked = unpack('N',$stream);
+        return array_shift($unpacked);
+      }
+    }
 …
   function gettext_reader($Reader, $enable_cache = true) {
     // If there isn't a StreamReader, turn on short circuit mode.
     if (! $Reader || isset($Reader->error) ) {
+    if (! $Reader) {
       $this->short_circuit = true;
       return;
 …
     $this->enable_cache = $enable_cache;
     // $MAGIC1 = (int)0x950412de; //bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
+    // $MAGIC1 = (int)0x950412de; //bug in PHP 5
     $MAGIC1 = (int) - 1794895138;
     // $MAGIC2 = (int)0xde120495; //bug
 …
     $this->STREAM = $Reader;
     $magic = $this->readint();
     if ($magic == ($MAGIC1 & 0xFFFFFFFF)) { // to make sure it works for 64-bit platforms
+    if ($magic == $MAGIC1) {
       $this->BYTEORDER = 0;
     } elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) {
+    } elseif ($magic == $MAGIC2) {
       $this->BYTEORDER = 1;
     } else {
 …
         $header = $this->get_translation_string(0);
+      }
       if (eregi("plural-forms: ([^\n]*)\n", $header, $regs))
+      if (eregi("plural-forms: (.*)\n", $header, $regs))
         $expr = $regs[1];
       else
 …
     eval("$string");
     if ($plural >= $total) $plural = $total - 1;
+    if ($plural >= $total) $plural = 0;
     return $plural;
+  }

trunk/wp-includes/js/colorpicker.js

-                      r4431
+                      r3503
 function AnchorPosition_getWindowOffsetLeft (el) {
     return AnchorPosition_getPageOffsetLeft(el)-document.body.scrollLeft;
+    }
+    }
 function AnchorPosition_getPageOffsetTop (el) {
     var ot=el.offsetTop;
 …
     this.visible = false;
     this.autoHideEnabled = false;
     this.contents = "";
     this.url="";
 …
     this.show(linkname);
+    }
 // This function runs when you move your mouse over a color block, if you have a newer browser
 function ColorPicker_highlightColor(c) {
 …
         var divname = arguments[0];
+        }
     if (divname != "") {
         var cp = new PopupWindow(divname);
 …
     // Object variables
     cp.currentValue = "#FFFFFF";
     // Method Mappings
     cp.writeDiv = ColorPicker_writeDiv;

trunk/wp-includes/js/dbx.js

-                      r4431
+                      r3503
 // DBX2.05 :: Docking Boxes (dbx)
+// DBX2.01 :: Docking Boxes (dbx)
 // *****************************************************
 // DOM scripting by brothercake -- http://www.brothercake.com/
 // GNU Lesser General Public License -- http://www.gnu.org/licenses/lgpl.html
 //******************************************************
 var dbx;function dbxManager(sid){dbx = this;if(!/^[-_a-z0-9]+$/i.test(sid)) { alert('Error from dbxManager:\n"' + sid + '" is an invalid session ID'); return; }this.supported = !(document.getElementsByTagName('*').length == 0 || (navigator.vendor == 'KDE' && typeof window.sidebar == 'undefined'));if(!this.supported) { return; }this.etype = typeof document.addEventListener != 'undefined' ? 'addEventListener' : typeof document.attachEvent != 'undefined' ? 'attachEvent' : 'none';this.eprefix = (this.etype == 'attachEvent' ? 'on' : '');if(typeof window.opera != 'undefined' && parseFloat(navigator.userAgent.toLowerCase().split(/opera[\/ ]/)[1].split(' ')[0], 10) < 7.5){this.etype = 'none';}if(this.etype == 'none') { this.supported = false; return; }this.running = 0;this.sid = sid;this.savedata = {};this.cookiestate = this.getCookieState();};dbxManager.prototype.setCookieState = function(){var now = new Date();now.setTime(now.getTime() + (365*24*60*60*1000));var str = '';for(j in this.savedata){if(typeof this.savedata[j]!='function'){str += j + '=' + this.savedata[j] + '&'}}this.state = str.replace(/^(.+)&$/, '$1');this.cookiestring = this.state.replace(/,/g, '|');this.cookiestring = this.cookiestring.replace(/=/g, ':');if(typeof this.onstatechange == 'undefined' || this.onstatechange()){document.cookie = 'dbx-' + this.sid + '='+ this.cookiestring+ '; expires=' + now.toGMTString()+ '; path=/';}};dbxManager.prototype.getCookieState = function(){this.cookiestate = null;if(document.cookie){if(document.cookie.indexOf('dbx-' + this.sid)!=-1){this.cookie = document.cookie.split('dbx-' + this.sid + '=')[1].split(';')[0].split('&');for(var i in this.cookie){if(typeof this.cookie[i]!='function'){this.cookie[i] = this.cookie[i].replace(/\|/g, ',');this.cookie[i]= this.cookie[i].replace(/:/g, '=');this.cookie[i] = this.cookie[i].split('=');this.cookie[i][1] = this.cookie[i][1].split(',');}}this.cookiestate = {};for(i in this.cookie){if(typeof this.cookie[i]!='function'){this.cookiestate[this.cookie[i][0]] = this.cookie[i][1];}}}}return this.cookiestate;};dbxManager.prototype.addDataMember = function(gid, order){this.savedata[gid] = order;};dbxManager.prototype.createElement = function(tag){return typeof document.createElementNS != 'undefined' ? document.createElementNS('http://www.w3.org/1999/xhtml', tag) : document.createElement(tag);};dbxManager.prototype.getTarget = function(e, pattern, node){if(typeof node != 'undefined'){var target = node;}else{target = typeof e.target != 'undefined' ? e.target : e.srcElement;}var regex = new RegExp(pattern, '');while(!regex.test(target.className)){target = target.parentNode;}return target;};function dbxGroup(gid, dir, thresh, fix, ani, togs, def, open, close, move, toggle, kmove, ktoggle, syntax){if(!/^[-_a-z0-9]+$/i.test(gid)) { alert('Error from dbxGroup:\n"' + gid + '" is an invalid container ID'); return; }this.container = document.getElementById(gid);if(this.container == null || !dbx.supported) { return; }var self = this;this.gid = gid;this.dragok = false;this.box = null;this.vertical = dir == 'vertical';this.threshold = parseInt(thresh, 10);this.restrict = fix == 'yes';this.resolution = parseInt(ani, 10);this.toggles = togs == 'yes';this.defopen = def != 'closed';this.vocab = {'open' : open,'close' : close,'move' : move,'toggle' : toggle,'kmove' : kmove,'ktoggle' : ktoggle,'syntax' : syntax};this.container.style.position = 'relative';this.container.style.display = 'block';if(typeof window.opera != 'undefined'){this.container.style.display = 'run-in';}this.boxes = [];this.buttons = [];this.order = [];this.eles = this.container.getElementsByTagName('*');for(var i=0; i<this.eles.length; i++){if(/dbx\-box/i.test(this.eles[i].className) && !/dbx\-dummy/i.test(this.eles[i].className)){this.eles[i].style.position = 'relative';this.eles[i].style.display = 'block';this.boxes.push(this.eles[i]);this.eles[i].className += ' dbx-box-open';this.eles[i].className += ' dbxid' + this.order.length;this.order.push(this.order.length.toString() + '+');this.eles[i][dbx.etype](dbx.eprefix + 'mousedown', function(e){if(!e) { e = window.event; }self.mousedown(e, dbx.getTarget(e, 'dbx\-box'));}, false);}if(/dbx\-handle/i.test(this.eles[i].className)){this.eles[i].style.position = 'relative';this.eles[i].style.display = 'block';this.eles[i].className += ' dbx-handle-cursor';this.eles[i].setAttribute('title', this.eles[i].getAttribute('title') == null || this.eles[i].title == '' ? this.vocab.move : this.vocab.syntax.replace('%mytitle%', this.eles[i].title).replace('%dbxtitle%', this.vocab.move));if(this.toggles){this.buttons.push(this.addToggleBehavior(this.eles[i]));}else{this.eles[i][dbx.etype](dbx.eprefix + 'key' + (typeof document.uniqueID != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? 'down' : 'press'), function(e){if(!e) { e = window.event; }return self.keypress(e, dbx.getTarget(e, 'dbx\-handle'));}, false);this.eles[i][dbx.etype](dbx.eprefix + 'focus', function(e){if(!e) { e = window.event; }self.createTooltip(null, dbx.getTarget(e, 'dbx\-handle'));}, false);this.eles[i][dbx.etype](dbx.eprefix + 'blur', function(){self.removeTooltip();}, false);}}}dbx.addDataMember(this.gid, this.order.join(','));var dummy = this.container.appendChild(dbx.createElement('span'));dummy.className = 'dbx-box dbx-dummy';dummy.style.display = 'block';dummy.style.width = '0';dummy.style.height = '0';dummy.style.overflow = 'hidden';if(this.vertical) { dummy.className += ' dbx-offdummy'; }this.boxes.push(dummy);if(dbx.cookiestate != null && typeof dbx.cookiestate[this.gid] != 'undefined'){var num = dbx.cookiestate[this.gid].length;if(num == this.boxes.length - 1){for(i=0; i<num; i++){var index = parseInt(dbx.cookiestate[this.gid][i], 10);this.container.insertBefore(this.boxes[index], dummy);if(this.toggles && /\-$/.test(dbx.cookiestate[this.gid][i])){this.toggleBoxState(this.buttons[index], false);}}this.getBoxOrder();}}else if(!this.defopen && this.toggles){var len = this.buttons.length;for(i=0; i<len; i++){this.toggleBoxState(this.buttons[i], true);}}document[dbx.etype](dbx.eprefix + 'mouseout', function(e){if(typeof e.target == 'undefined') { e = window.event; e.relatedTarget = e.toElement; }if(e.relatedTarget == null){self.mouseup(e);}}, false);document[dbx.etype](dbx.eprefix + 'mousemove', function(e){self.mousemove(e);return !self.dragok;}, false);document[dbx.etype](dbx.eprefix + 'mouseup', function(e){self.mouseup(e);}, false);this.keydown = false;document[dbx.etype](dbx.eprefix + 'keydown', function(){self.keydown = true;}, false);document[dbx.etype](dbx.eprefix + 'keyup', function(){self.keydown = false;}, false);};dbxGroup.prototype.addToggleBehavior = function(){var self = this;var button = arguments[0].appendChild(dbx.createElement('a'));button.appendChild(document.createTextNode('\u00a0'));button.style.cursor = 'pointer';button.href = 'javascript:void(null)';button.className = 'dbx-toggle dbx-toggle-open';button.setAttribute('title', this.vocab.toggle.replace('%toggle%', this.vocab.close));button.hasfocus = typeof window.opera != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? null : false;this.tooltip = null;button.onclick = function(){if(this.hasfocus === true || this.hasfocus === null){self.removeTooltip();self.toggleBoxState(this, true);}};button['onkey' + (typeof document.uniqueID != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? 'down' : 'press')] = function(e){if(!e) { e = window.event; }return self.keypress(e, this);};button.onfocus = function(){var len = self.buttons.length;for(var i=0; i<len; i++){self.buttons[i].className = self.buttons[i].className.replace(/[ ](dbx\-toggle\-hilite\-)(open|closed)/, '');}var isopen = (/dbx\-toggle\-open/.test(this.className));this.className += ' dbx-toggle-hilite-' + (isopen ? 'open' : 'closed');self.createTooltip(isopen, this);this.isactive = true;if(this.hasfocus !== null) { this.hasfocus = true; }};button.onblur = function(){this.className = this.className.replace(/[ ](dbx\-toggle\-hilite\-)(open|closed)/, '');self.removeTooltip();if(this.hasfocus !== null) { this.hasfocus = false; }};return button;};dbxGroup.prototype.toggleBoxState = function(button, regen){var isopen = (/dbx\-toggle\-open/.test(button.className));var parent = dbx.getTarget(null, 'dbx\-box', button);dbx.box = parent;dbx.toggle = button;if(typeof dbx.container == 'undefined'){dbx.group = dbx.getTarget(null, 'dbx\-group', parent);}else { dbx.group = dbx.container; }if((!isopen && (typeof dbx.onboxopen == 'undefined' || dbx.onboxopen()))||(isopen && (typeof dbx.onboxclose == 'undefined' || dbx.onboxclose()))){button.className = 'dbx-toggle dbx-toggle-' + (isopen ? 'closed' : 'open');button.title = this.vocab.toggle.replace('%toggle%', isopen ? this.vocab.open : this.vocab.close);if(typeof button.isactive != 'undefined'){button.className += ' dbx-toggle-hilite-' + (isopen ? 'closed' : 'open')}parent.className = parent.className.replace(/[ ](dbx-box-)(open|closed)/, ' $1' + (isopen ? 'closed' : 'open'));if(regen) { this.getBoxOrder(); }}};dbxGroup.prototype.shiftBoxPosition = function(e, anchor, positive){var parent = dbx.getTarget(null, 'dbx\-box', anchor);dbx.group = this.container;dbx.box = parent;dbx.event = e;if(typeof dbx.onboxdrag == 'undefined' || dbx.onboxdrag()){var positions = [];var len = this.boxes.length;for(var i=0; i<len; i++){positions[i] = [i, this.boxes[i][this.vertical ? 'offsetTop' : 'offsetLeft']];if(parent == this.boxes[i]) { this.idref = i; }}positions.sort(this.compare);for(i=0; i<len; i++){if(positions[i][0] == this.idref){if((positive && i < len - 2) || (!positive && i > 0)){var sibling = this.boxes[positions[i + (positive ? 1 : -1)][0]];if(this.resolution > 0){var visipos = { 'x' : parent.offsetLeft, 'y' : parent.offsetTop };var siblingpos = { 'x' : sibling.offsetLeft, 'y' : sibling.offsetTop };}var obj = { 'insert' : (positive ? sibling : parent), 'before' : (positive ? parent : sibling) };this.container.insertBefore(obj.insert, obj.before);if(this.resolution > 0){var animators ={'sibling' : new dbxAnimator(this, sibling, siblingpos, this.resolution, true, anchor),'parent' : new dbxAnimator(this, parent, visipos, this.resolution, true, anchor)};}else{anchor.focus();}break;}}}this.getBoxOrder();}};dbxGroup.prototype.compare = function(a, b){return a[1] - b[1];};dbxGroup.prototype.createTooltip = function(isopen, anchor){if(this.keydown){this.tooltip = this.container.appendChild(dbx.createElement('span'));this.tooltip.style.visibility = 'hidden';this.tooltip.className = 'dbx-tooltip';if(isopen != null){this.tooltip.appendChild(document.createTextNode(this.vocab.kmove + this.vocab.ktoggle.replace('%toggle%', isopen ? this.vocab.close : this.vocab.open)));}else{this.tooltip.appendChild(document.createTextNode(this.vocab.kmove));}var parent = dbx.getTarget(null, 'dbx\-box', anchor);this.tooltip.style.left = parent.offsetLeft + 'px';this.tooltip.style.top = parent.offsetTop + 'px';var tooltip = this.tooltip;window.setTimeout(function(){if(tooltip != null) { tooltip.style.visibility = 'visible'; }}, 500);}};dbxGroup.prototype.removeTooltip = function(){if(this.tooltip != null){this.tooltip.parentNode.removeChild(this.tooltip);this.tooltip = null;}};dbxGroup.prototype.mousedown = function(e, box){var node = typeof e.target != 'undefined' ? e.target : e.srcElement;if(node.nodeName == '#text') { node = node.parentNode; }if(!/dbx\-(toggle|box|group)/i.test(node.className)){while(!/dbx\-(handle|box|group)/i.test(node.className)){node = node.parentNode;}}if(/dbx\-handle/i.test(node.className)){this.removeTooltip();this.released = false;this.initial = { 'x' : e.clientX, 'y' : e.clientY };this.current = { 'x' : 0, 'y' : 0 };this.createCloneBox(box);if(typeof e.preventDefault != 'undefined' ) { e.preventDefault(); }if(typeof document.onselectstart != 'undefined'){document.onselectstart = function() { return false; }}}};dbxGroup.prototype.mousemove = function(e){if(this.dragok && this.box != null){this.positive = this.vertical ? (e.clientY > this.current.y ? true : false) : (e.clientX > this.current.x ? true : false);this.current = { 'x' : e.clientX, 'y' : e.clientY };var overall = { 'x' : this.current.x - this.initial.x, 'y' : this.current.y - this.initial.y };if(((overall.x >= 0 && overall.x <= this.threshold) || (overall.x <= 0 && overall.x >= 0 - this.threshold))&&((overall.y >= 0 && overall.y <= this.threshold) || (overall.y <= 0 && overall.y >= 0 - this.threshold))){this.current.x -= overall.x;this.current.y -= overall.y;}if(this.released || overall.x > this.threshold || overall.x < (0 - this.threshold) || overall.y > this.threshold || overall.y < (0 - this.threshold)){dbx.group = this.container;dbx.box = this.box;dbx.event = e;if(typeof dbx.onboxdrag == 'undefined' || dbx.onboxdrag()){this.released = true;if(!this.restrict || !this.vertical) { this.boxclone.style.left = (this.current.x - this.difference.x) + 'px'; }if(!this.restrict || this.vertical) { this.boxclone.style.top = (this.current.y - this.difference.y) + 'px'; }this.moveOriginalToPosition(this.current.x, this.current.y);if(typeof e.preventDefault != 'undefined' ) { e.preventDefault(); }}}}return true;};dbxGroup.prototype.mouseup = function(e){if(this.box != null){this.moveOriginalToPosition(e.clientX, e.clientY);this.removeCloneBox();this.getBoxOrder();if(typeof document.onselectstart != 'undefined'){document.onselectstart = function() { return true; }}}this.dragok = false;};dbxGroup.prototype.keypress = function(e, anchor){if(/^(3[7-9])|(40)$/.test(e.keyCode)){this.removeTooltip();if((this.vertical && /^(38|40)$/.test(e.keyCode)) || (!this.vertical && /^(37|39)$/.test(e.keyCode))){this.shiftBoxPosition(e, anchor, /^[3][78]$/.test(e.keyCode) ? false : true);if(typeof e.preventDefault != 'undefined') { e.preventDefault(); }else { return false; }typeof e.stopPropagation != 'undefined' ? e.stopPropagation() : e.cancelBubble = true;this.keydown = false;}}return true;};dbxGroup.prototype.getBoxOrder = function(){this.order = [];var len = this.eles.length;for(var j=0; j<len; j++){if(/dbx\-box/i.test(this.eles[j].className) && !/dbx\-(clone|dummy)/i.test(this.eles[j].className)){this.order.push(this.eles[j].className.split('dbxid')[1] + (/dbx\-box\-open/i.test(this.eles[j].className) ? '+' : '-'));}}dbx.savedata[this.gid] = this.order.join(',');dbx.setCookieState();};dbxGroup.prototype.createClone = function(){var clone = this.container.appendChild(arguments[0].cloneNode(true));clone.className += ' dbx-clone';clone.style.position = 'absolute';clone.style.visibility = 'hidden';clone.style.zIndex = arguments[1];clone.style.left = arguments[2].x + 'px';clone.style.top = arguments[2].y + 'px';clone.style.width = arguments[0].offsetWidth + 'px';clone.style.height = arguments[0].offsetHeight + 'px';return clone;};dbxGroup.prototype.createCloneBox = function(box){this.box = box;this.position = { 'x' : this.box.offsetLeft, 'y' : this.box.offsetTop };this.difference = { 'x' : (this.initial.x - this.position.x), 'y' : (this.initial.y - this.position.y) };this.boxclone = this.createClone(this.box, 30000, this.position);this.boxclone.style.cursor = 'move';this.dragok = true;};dbxGroup.prototype.removeCloneBox = function(){this.container.removeChild(this.boxclone);this.box.style.visibility = 'visible';this.box = null;};dbxGroup.prototype.moveOriginalToPosition = function(clientX, clientY){var cloneprops = {'xy' : this.vertical ? clientY - this.difference.y : clientX - this.difference.x,'wh' : this.vertical ? this.boxclone.offsetHeight : this.boxclone.offsetWidth};this.box.style.visibility = 'hidden';this.boxclone.style.visibility = 'visible';var len = this.boxes.length;for(var i=0; i<len; i++){var boxprops = {'xy' : this.vertical ? this.boxes[i].offsetTop : this.boxes[i].offsetLeft,'wh' : this.vertical ? this.boxes[i].offsetHeight : this.boxes[i].offsetWidth};if((this.positive && cloneprops.xy + cloneprops.wh > boxprops.xy && cloneprops.xy < boxprops.xy)||(!this.positive && cloneprops.xy < boxprops.xy && cloneprops.xy + cloneprops.wh > boxprops.xy)){if(this.boxes[i] == this.box) { return; }var sibling = this.box.nextSibling;while(sibling.className == null || !/dbx\-box/.test(sibling.className)){sibling = sibling.nextSibling;}if(this.boxes[i] == sibling) { return; }if(this.resolution > 0){if(this.box[this.vertical ? 'offsetTop' : 'offsetLeft'] < boxprops.xy){var visibox = this.boxes[i].previousSibling;while(visibox.className == null || !/dbx\-box/.test(visibox.className)){visibox = visibox.previousSibling;}}else{visibox = this.boxes[i];}var visipos = { 'x' : visibox.offsetLeft, 'y' : visibox.offsetTop };}var prepos = { 'x' : this.box.offsetLeft, 'y' : this.box.offsetTop };this.container.insertBefore(this.box, this.boxes[i]);this.initial.x += (this.box.offsetLeft - prepos.x);this.initial.y += (this.box.offsetTop - prepos.y);if(this.resolution > 0 && visibox != this.box){var animator = new dbxAnimator(this, visibox, visipos, this.resolution, false, null);}else{}break;}}};function dbxAnimator(caller, box, pos, res, kbd, anchor){this.caller = caller;this.box = box;this.timer = null;var before = pos[this.caller.vertical ? 'y' : 'x'];var after = this.box[this.caller.vertical ? 'offsetTop' : 'offsetLeft'];if(before != after){if(dbx.running > this.caller.boxes.length - 1) { return; }var clone = this.caller.createClone(this.box, 29999, arguments[2]);clone.style.visibility = 'visible';this.box.style.visibility = 'hidden';this.animateClone(clone,before,after > before ? after - before : 0 - (before - after),this.caller.vertical ? 'top' : 'left',res,kbd,anchor);}};dbxAnimator.prototype.animateClone = function(clone, current, change, dir, res, kbd, anchor){var self = this;var count = 0;dbx.running ++;this.timer = window.setInterval(function(){count ++;current += change / res;clone.style[dir] = current + 'px';if(count == res){window.clearTimeout(self.timer);self.timer = null;dbx.running --;self.caller.container.removeChild(clone);self.box.style.visibility = 'visible';if(kbd){if(anchor != null && anchor.parentNode.style.visibility != 'hidden'){anchor.focus();}else if(self.caller.toggles){var button = self.caller.buttons[parseInt(self.box.className.split('dbxid')[1],10)];if(button != null && typeof button.isactive != 'undefined'){button.focus();}}}}}, 20);};if(typeof window.attachEvent != 'undefined'){window.attachEvent('onunload', function(){var ev = ['mousedown', 'mousemove', 'mouseup', 'mouseout', 'click', 'keydown', 'keyup', 'focus', 'blur', 'selectstart', 'statechange', 'boxdrag', 'boxopen', 'boxclose'];var el = ev.length;var dl = document.all.length;for(var i=0; i<dl; i++){for(var j=0; j<el; j++){document.all[i]['on' + ev[j]] = null;}}});}
+var dbx;function dbxManager(sid){dbx = this;if(!/^[-_a-z0-9]+$/i.test(sid)) { alert('Error from dbxManager:\n"' + sid + '" is an invalid session ID'); return; }this.supported = !(document.getElementsByTagName('*').length == 0 || (navigator.vendor == 'KDE' && typeof window.sidebar == 'undefined'));if(!this.supported) { return; }this.etype = typeof document.addEventListener != 'undefined' ? 'addEventListener' : typeof document.attachEvent != 'undefined' ? 'attachEvent' : 'none';this.eprefix = (this.etype == 'attachEvent' ? 'on' : '');if(typeof window.opera != 'undefined' && parseFloat(navigator.userAgent.toLowerCase().split(/opera[\/ ]/)[1].split(' ')[0], 10) < 7.5){this.etype = 'none';}if(this.etype == 'none') { this.supported = false; return; }this.running = 0;this.sid = sid;this.savedata = {};this.cookiestate = this.getCookieState();};dbxManager.prototype.setCookieState = function(){var now = new Date();now.setTime(now.getTime() + (365*24*60*60*1000));var str = '';for(j in this.savedata){if(typeof this.savedata[j]!='function'){str += j + '=' + this.savedata[j] + '&'}}this.state = str.replace(/^(.+)&$/, '$1');if(typeof this.onstatechange == 'undefined' || this.onstatechange()){document.cookie = 'dbx-' + this.sid + '='+ this.state+ '; expires=' + now.toGMTString()+ '; path=/';}};dbxManager.prototype.getCookieState = function(){this.cookiestate = null;if(document.cookie){if(document.cookie.indexOf('dbx-' + this.sid)!=-1){this.cookie = document.cookie.split('dbx-' + this.sid + '=')[1].split('&');for(var i in this.cookie){if(typeof this.cookie[i]!='function'){this.cookie[i] = this.cookie[i].split('=');this.cookie[i][1] = this.cookie[i][1].split(',');}}this.cookiestate = {};for(i in this.cookie){if(typeof this.cookie[i]!='function'){this.cookiestate[this.cookie[i][0]] = this.cookie[i][1];}}}}return this.cookiestate;};dbxManager.prototype.addDataMember = function(gid, order){this.savedata[gid] = order;};dbxManager.prototype.createElement = function(tag){return typeof document.createElementNS != 'undefined' ? document.createElementNS('http://www.w3.org/1999/xhtml', tag) : document.createElement(tag);};dbxManager.prototype.getTarget = function(e, pattern, node){if(typeof node != 'undefined'){var target = node;}else{target = typeof e.target != 'undefined' ? e.target : e.srcElement;}var regex = new RegExp(pattern, '');while(!regex.test(target.className)){target = target.parentNode;}return target;};function dbxGroup(gid, dir, thresh, fix, ani, togs, def, open, close, move, toggle, kmove, ktoggle, syntax){if(!/^[-_a-z0-9]+$/i.test(gid)) { alert('Error from dbxGroup:\n"' + gid + '" is an invalid container ID'); return; }this.container = document.getElementById(gid);if(this.container == null || !dbx.supported) { return; }var self = this;this.gid = gid;this.dragok = false;this.box = null;this.vertical = dir == 'vertical';this.threshold = parseInt(thresh, 10);this.restrict = fix == 'yes';this.resolution = parseInt(ani, 10);this.toggles = togs == 'yes';this.defopen = def != 'closed';this.vocab = {'open' : open,'close' : close,'move' : move,'toggle' : toggle,'kmove' : kmove,'ktoggle' : ktoggle,'syntax' : syntax};this.container.style.position = 'relative';this.container.style.display = 'block';if(typeof window.opera != 'undefined'){this.container.style.display = 'run-in';}this.boxes = [];this.buttons = [];this.order = [];this.eles = this.container.getElementsByTagName('*');for(var i=0; i<this.eles.length; i++){if(/dbx\-box/i.test(this.eles[i].className) && !/dbx\-dummy/i.test(this.eles[i].className)){this.eles[i].style.position = 'relative';this.eles[i].style.display = 'block';this.boxes.push(this.eles[i]);this.eles[i].className += ' dbx-box-open';this.eles[i].className += ' dbxid' + this.order.length;this.order.push(this.order.length.toString() + '+');this.eles[i][dbx.etype](dbx.eprefix + 'mousedown', function(e){if(!e) { e = window.event; }self.mousedown(e, dbx.getTarget(e, 'dbx\-box'));}, false);}if(/dbx\-handle/i.test(this.eles[i].className)){this.eles[i].style.position = 'relative';this.eles[i].style.display = 'block';this.eles[i].className += ' dbx-handle-cursor';this.eles[i].setAttribute('title', this.eles[i].getAttribute('title') == null || this.eles[i].title == '' ? this.vocab.move : this.vocab.syntax.replace('%mytitle%', this.eles[i].title).replace('%dbxtitle%', this.vocab.move));if(this.toggles){this.buttons.push(this.addToggleBehavior(this.eles[i]));}else{this.eles[i][dbx.etype](dbx.eprefix + 'key' + (typeof document.uniqueID != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? 'down' : 'press'), function(e){if(!e) { e = window.event; }return self.keypress(e, dbx.getTarget(e, 'dbx\-handle'));}, false);this.eles[i][dbx.etype](dbx.eprefix + 'focus', function(e){if(!e) { e = window.event; }self.createTooltip(null, dbx.getTarget(e, 'dbx\-handle'));}, false);this.eles[i][dbx.etype](dbx.eprefix + 'blur', function(){self.removeTooltip();}, false);}}}dbx.addDataMember(this.gid, this.order.join(','));var dummy = this.container.appendChild(dbx.createElement('span'));dummy.className = 'dbx-box dbx-dummy';dummy.style.display = 'block';dummy.style.width = '0';dummy.style.height = '0';dummy.style.overflow = 'hidden';if(this.vertical) { dummy.className += ' dbx-offdummy'; }this.boxes.push(dummy);if(dbx.cookiestate != null && typeof dbx.cookiestate[this.gid] != 'undefined'){var num = dbx.cookiestate[this.gid].length;if(num == this.boxes.length - 1){for(i=0; i<num; i++){var index = parseInt(dbx.cookiestate[this.gid][i], 10);this.container.insertBefore(this.boxes[index], dummy);if(this.toggles && dbx.cookiestate[this.gid][i].charAt(1) == '-'){this.toggleBoxState(this.buttons[index], false);}}this.getBoxOrder();}}else if(!this.defopen && this.toggles){var len = this.buttons.length;for(i=0; i<len; i++){this.toggleBoxState(this.buttons[i], true);}}document[dbx.etype](dbx.eprefix + 'mouseout', function(e){if(typeof e.target == 'undefined') { e = window.event; e.relatedTarget = e.toElement; }if(e.relatedTarget == null){self.mouseup(e);}}, false);document[dbx.etype](dbx.eprefix + 'mousemove', function(e){self.mousemove(e);}, false);document[dbx.etype](dbx.eprefix + 'mouseup', function(e){self.mouseup(e);}, false);this.keydown = false;document[dbx.etype](dbx.eprefix + 'keydown', function(){self.keydown = true;}, false);document[dbx.etype](dbx.eprefix + 'keyup', function(){self.keydown = false;}, false);};dbxGroup.prototype.addToggleBehavior = function(){var self = this;var button = arguments[0].appendChild(dbx.createElement('a'));button.appendChild(document.createTextNode('\u00a0'));button.style.cursor = 'pointer';button.href = 'javascript:void(null)';button.className = 'dbx-toggle dbx-toggle-open';button.setAttribute('title', this.vocab.toggle.replace('%toggle%', this.vocab.close));button.hasfocus = typeof window.opera != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? null : false;this.tooltip = null;button.onclick = function(){if(this.hasfocus === true || this.hasfocus === null){self.removeTooltip();self.toggleBoxState(this, true);}};button['onkey' + (typeof document.uniqueID != 'undefined' || navigator.vendor == 'Apple Computer, Inc.' ? 'down' : 'press')] = function(e){if(!e) { e = window.event; }return self.keypress(e, this);};button.onfocus = function(){var len = self.buttons.length;for(var i=0; i<len; i++){self.buttons[i].className = self.buttons[i].className.replace(/[ ](dbx\-toggle\-hilite\-)(open|closed)/, '');}var isopen = (/dbx\-toggle\-open/.test(this.className));this.className += ' dbx-toggle-hilite-' + (isopen ? 'open' : 'closed');self.createTooltip(isopen, this);this.isactive = true;if(this.hasfocus !== null) { this.hasfocus = true; }};button.onblur = function(){this.className = this.className.replace(/[ ](dbx\-toggle\-hilite\-)(open|closed)/, '');self.removeTooltip();if(this.hasfocus !== null) { this.hasfocus = false; }};return button;};dbxGroup.prototype.toggleBoxState = function(button, regen){var isopen = (/dbx\-toggle\-open/.test(button.className));var parent = dbx.getTarget(null, 'dbx\-box', button);dbx.box = parent;dbx.toggle = button;if(typeof dbx.container == 'undefined'){dbx.group = dbx.getTarget(null, 'dbx\-group', parent);}else { dbx.group = dbx.container; }if((!isopen && (typeof dbx.onboxopen == 'undefined' || dbx.onboxopen()))||(isopen && (typeof dbx.onboxclose == 'undefined' || dbx.onboxclose()))){button.className = 'dbx-toggle dbx-toggle-' + (isopen ? 'closed' : 'open');button.title = this.vocab.toggle.replace('%toggle%', isopen ? this.vocab.open : this.vocab.close);if(typeof button.isactive != 'undefined'){button.className += ' dbx-toggle-hilite-' + (isopen ? 'closed' : 'open')}parent.className = parent.className.replace(/[ ](dbx-box-)(open|closed)/, ' $1' + (isopen ? 'closed' : 'open'));if(regen) { this.getBoxOrder(); }}};dbxGroup.prototype.shiftBoxPosition = function(e, anchor, positive){var parent = dbx.getTarget(null, 'dbx\-box', anchor);dbx.group = this.container;dbx.box = parent;dbx.event = e;if(typeof dbx.onboxdrag == 'undefined' || dbx.onboxdrag()){var positions = [];var len = this.boxes.length;for(var i=0; i<len; i++){positions[i] = [i, this.boxes[i][this.vertical ? 'offsetTop' : 'offsetLeft']];if(parent == this.boxes[i]) { this.idref = i; }}positions.sort(this.compare);for(i=0; i<len; i++){if(positions[i][0] == this.idref){if((positive && i < len - 2) || (!positive && i > 0)){var sibling = this.boxes[positions[i + (positive ? 1 : -1)][0]];if(this.resolution > 0){var visipos = { 'x' : parent.offsetLeft, 'y' : parent.offsetTop };var siblingpos = { 'x' : sibling.offsetLeft, 'y' : sibling.offsetTop };}var obj = { 'insert' : (positive ? sibling : parent), 'before' : (positive ? parent : sibling) };this.container.insertBefore(obj.insert, obj.before);if(this.resolution > 0){var animators ={'sibling' : new dbxAnimator(this, sibling, siblingpos, this.resolution, true, anchor),'parent' : new dbxAnimator(this, parent, visipos, this.resolution, true, anchor)};}else{anchor.focus();}break;}}}this.getBoxOrder();}};dbxGroup.prototype.compare = function(a, b){return a[1] - b[1];};dbxGroup.prototype.createTooltip = function(isopen, anchor){if(this.keydown){this.tooltip = this.container.appendChild(dbx.createElement('span'));this.tooltip.style.visibility = 'hidden';this.tooltip.className = 'dbx-tooltip';if(isopen != null){this.tooltip.appendChild(document.createTextNode(this.vocab.kmove + this.vocab.ktoggle.replace('%toggle%', isopen ? this.vocab.close : this.vocab.open)));}else{this.tooltip.appendChild(document.createTextNode(this.vocab.kmove));}var parent = dbx.getTarget(null, 'dbx\-box', anchor);this.tooltip.style.left = parent.offsetLeft + 'px';this.tooltip.style.top = parent.offsetTop + 'px';var tooltip = this.tooltip;window.setTimeout(function(){if(tooltip != null) { tooltip.style.visibility = 'visible'; }}, 500);}};dbxGroup.prototype.removeTooltip = function(){if(this.tooltip != null){this.tooltip.parentNode.removeChild(this.tooltip);this.tooltip = null;}};dbxGroup.prototype.mousedown = function(e, box){var node = typeof e.target != 'undefined' ? e.target : e.srcElement;if(node.nodeName == '#text') { node = node.parentNode; }if(!/dbx\-(toggle|box|group)/i.test(node.className)){while(!/dbx\-(handle|box|group)/i.test(node.className)){node = node.parentNode;}}if(/dbx\-handle/i.test(node.className)){this.removeTooltip();this.released = false;this.initial = { 'x' : e.clientX, 'y' : e.clientY };this.current = { 'x' : 0, 'y' : 0 };this.createCloneBox(box);if(typeof e.preventDefault != 'undefined' ) { e.preventDefault(); }if(typeof document.onselectstart != 'undefined'){document.onselectstart = function() { return false; }}}};dbxGroup.prototype.mousemove = function(e){if(this.dragok && this.box != null){this.positive = this.vertical ? (e.clientY > this.current.y ? true : false) : (e.clientX > this.current.x ? true : false);this.current = { 'x' : e.clientX, 'y' : e.clientY };var overall = { 'x' : this.current.x - this.initial.x, 'y' : this.current.y - this.initial.y };if(((overall.x >= 0 && overall.x <= this.threshold) || (overall.x <= 0 && overall.x >= 0 - this.threshold))&&((overall.y >= 0 && overall.y <= this.threshold) || (overall.y <= 0 && overall.y >= 0 - this.threshold))){this.current.x -= overall.x;this.current.y -= overall.y;}if(this.released || overall.x > this.threshold || overall.x < (0 - this.threshold) || overall.y > this.threshold || overall.y < (0 - this.threshold)){dbx.group = this.container;dbx.box = this.box;dbx.event = e;if(typeof dbx.onboxdrag == 'undefined' || dbx.onboxdrag()){this.released = true;if(!this.restrict || !this.vertical) { this.boxclone.style.left = (this.current.x - this.difference.x) + 'px'; }if(!this.restrict || this.vertical) { this.boxclone.style.top = (this.current.y - this.difference.y) + 'px'; }this.moveOriginalToPosition(this.current.x, this.current.y);if(typeof e.preventDefault != 'undefined' ) { e.preventDefault(); }}}}return true;};dbxGroup.prototype.mouseup = function(e){if(this.box != null){this.moveOriginalToPosition(e.clientX, e.clientY);this.removeCloneBox();this.getBoxOrder();if(typeof document.onselectstart != 'undefined'){document.onselectstart = function() { return true; }}}this.dragok = false;};dbxGroup.prototype.keypress = function(e, anchor){if(/^(3[7-9])|(40)$/.test(e.keyCode)){this.removeTooltip();if((this.vertical && /^(38|40)$/.test(e.keyCode)) || (!this.vertical && /^(37|39)$/.test(e.keyCode))){this.shiftBoxPosition(e, anchor, /^[3][78]$/.test(e.keyCode) ? false : true);if(typeof e.preventDefault != 'undefined') { e.preventDefault(); }else { return false; }typeof e.stopPropagation != 'undefined' ? e.stopPropagation() : e.cancelBubble = true;this.keydown = false;}}return true;};dbxGroup.prototype.getBoxOrder = function(){this.order = [];var len = this.eles.length;for(var j=0; j<len; j++){if(/dbx\-box/i.test(this.eles[j].className) && !/dbx\-(clone|dummy)/i.test(this.eles[j].className)){this.order.push(this.eles[j].className.split('dbxid')[1] + (/dbx\-box\-open/i.test(this.eles[j].className) ? '+' : '-'));}}dbx.savedata[this.gid] = this.order.join(',');dbx.setCookieState();};dbxGroup.prototype.createClone = function(){var clone = this.container.appendChild(arguments[0].cloneNode(true));clone.className += ' dbx-clone';clone.style.position = 'absolute';clone.style.visibility = 'hidden';clone.style.zIndex = arguments[1];clone.style.left = arguments[2].x + 'px';clone.style.top = arguments[2].y + 'px';clone.style.width = arguments[0].offsetWidth + 'px';clone.style.height = arguments[0].offsetHeight + 'px';return clone;};dbxGroup.prototype.createCloneBox = function(box){this.box = box;this.position = { 'x' : this.box.offsetLeft, 'y' : this.box.offsetTop };this.difference = { 'x' : (this.initial.x - this.position.x), 'y' : (this.initial.y - this.position.y) };this.boxclone = this.createClone(this.box, 30000, this.position);this.boxclone.style.cursor = 'move';this.dragok = true;};dbxGroup.prototype.removeCloneBox = function(){this.container.removeChild(this.boxclone);this.box.style.visibility = 'visible';this.box = null;};dbxGroup.prototype.moveOriginalToPosition = function(clientX, clientY){var cloneprops = {'xy' : this.vertical ? clientY - this.difference.y : clientX - this.difference.x,'wh' : this.vertical ? this.boxclone.offsetHeight : this.boxclone.offsetWidth};this.box.style.visibility = 'hidden';this.boxclone.style.visibility = 'visible';var len = this.boxes.length;for(var i=0; i<len; i++){var boxprops = {'xy' : this.vertical ? this.boxes[i].offsetTop : this.boxes[i].offsetLeft,'wh' : this.vertical ? this.boxes[i].offsetHeight : this.boxes[i].offsetWidth};if((this.positive && cloneprops.xy + cloneprops.wh > boxprops.xy && cloneprops.xy < boxprops.xy)||(!this.positive && cloneprops.xy < boxprops.xy && cloneprops.xy + cloneprops.wh > boxprops.xy)){if(this.boxes[i] == this.box) { return; }var sibling = this.box.nextSibling;while(sibling.className == null || !/dbx\-box/.test(sibling.className)){sibling = sibling.nextSibling;}if(this.boxes[i] == sibling) { return; }if(this.resolution > 0){if(this.box[this.vertical ? 'offsetTop' : 'offsetLeft'] < boxprops.xy){var visibox = this.boxes[i].previousSibling;while(visibox.className == null || !/dbx\-box/.test(visibox.className)){visibox = visibox.previousSibling;}}else{visibox = this.boxes[i];}var visipos = { 'x' : visibox.offsetLeft, 'y' : visibox.offsetTop };}var prepos = { 'x' : this.box.offsetLeft, 'y' : this.box.offsetTop };this.container.insertBefore(this.box, this.boxes[i]);this.initial.x += (this.box.offsetLeft - prepos.x);this.initial.y += (this.box.offsetTop - prepos.y);if(this.resolution > 0 && visibox != this.box){var animator = new dbxAnimator(this, visibox, visipos, this.resolution, false, null);}else{}break;}}};function dbxAnimator(caller, box, pos, res, kbd, anchor){this.caller = caller;this.box = box;this.timer = null;var before = pos[this.caller.vertical ? 'y' : 'x'];var after = this.box[this.caller.vertical ? 'offsetTop' : 'offsetLeft'];if(before != after){if(dbx.running > this.caller.boxes.length - 1) { return; }var clone = this.caller.createClone(this.box, 29999, arguments[2]);clone.style.visibility = 'visible';this.box.style.visibility = 'hidden';this.animateClone(clone,before,after > before ? after - before : 0 - (before - after),this.caller.vertical ? 'top' : 'left',res,kbd,anchor);}};dbxAnimator.prototype.animateClone = function(clone, current, change, dir, res, kbd, anchor){var self = this;var count = 0;dbx.running ++;this.timer = window.setInterval(function(){count ++;current += change / res;clone.style[dir] = current + 'px';if(count == res){window.clearTimeout(self.timer);self.timer = null;dbx.running --;self.caller.container.removeChild(clone);self.box.style.visibility = 'visible';if(kbd){if(anchor != null && anchor.parentNode.style.visibility != 'hidden'){anchor.focus();}else if(self.caller.toggles){var button = self.caller.buttons[parseInt(self.box.className.split('dbxid')[1],10)];if(button != null && typeof button.isactive != 'undefined'){button.focus();}}}}}, 20);};if(typeof window.attachEvent != 'undefined'){window.attachEvent('onunload', function(){var ev = ['mousedown', 'mousemove', 'mouseup', 'mouseout', 'click', 'keydown', 'keyup', 'focus', 'blur', 'selectstart', 'statechange', 'boxdrag', 'boxopen', 'boxclose'];var el = ev.length;var dl = document.all.length;for(var i=0; i<dl; i++){for(var j=0; j<el; j++){document.all[i]['on' + ev[j]] = null;}}});}

trunk/wp-includes/js/fat.js

-                      r4431
+                      r3503
         return "#" + r + g + b;
     },
     fade_all : function (dur)
+    fade_all : function ()
+    {
         var a = document.getElementsByTagName("*");
 …
+            {
                 if (!r[1]) r[1] = "";
                 if (o.id) Fat.fade_element(o.id,null,dur,"#"+r[1]);
+                if (o.id) Fat.fade_element(o.id,null,null,"#"+r[1]);
+            }
+        }
 …
         if (!from || from=="#") from = "#FFFF33";
         if (!to) to = this.get_bgcolor(id);
         var frames = Math.round(fps * (duration / 1000));
         var interval = duration / frames;
         var delay = interval;
         var frame = 0;
         if (from.length < 7) from += from.substr(1,3);
         if (to.length < 7) to += to.substr(1,3);
         var rf = parseInt(from.substr(1,2),16);
         var gf = parseInt(from.substr(3,2),16);
 …
         var gt = parseInt(to.substr(3,2),16);
         var bt = parseInt(to.substr(5,2),16);
         var r,g,b,h;
         while (frame < frames)
 …
             b = Math.floor(bf * ((frames-frame)/frames) + bt * (frame/frames));
             h = this.make_hex(r,g,b);
             setTimeout("Fat.set_bgcolor('"+id+"','"+h+"')", delay);

trunk/wp-includes/js/quicktags.js

r4431	r3503
206	206	return false; // tag not found
207	207	}
208		}
	208	}
209	209
210	210	function edCloseAllTags() {

trunk/wp-includes/js/tinymce/langs/en.js

-                      r4431
+                      r3503
 // UK lang variables
+tinyMCE.addToLang('',{
+bold_desc : 'Bold (Ctrl+B)',
+italic_desc : 'Italic (Ctrl+I)',
+underline_desc : 'Underline (Ctrl+U)',
+striketrough_desc : 'Strikethrough',
+justifyleft_desc : 'Align left',
+justifycenter_desc : 'Align center',
+justifyright_desc : 'Align right',
+justifyfull_desc : 'Align full',
+bullist_desc : 'Unordered list',
+numlist_desc : 'Ordered list',
+outdent_desc : 'Outdent',
+indent_desc : 'Indent',
+undo_desc : 'Undo (Ctrl+Z)',
+redo_desc : 'Redo (Ctrl+Y)',
+link_desc : 'Insert/edit link',
+unlink_desc : 'Unlink',
+image_desc : 'Insert/edit image',
+cleanup_desc : 'Cleanup messy code',
+focus_alert : 'A editor instance must be focused before using this command.',
+edit_confirm : 'Do you want to use the WYSIWYG mode for this textarea?',
+insert_link_title : 'Insert/edit link',
+insert : 'Insert',
+update : 'Update',
+cancel : 'Cancel',
+insert_link_url : 'Link URL',
+insert_link_target : 'Target',
+insert_link_target_same : 'Open link in the same window',
+insert_link_target_blank : 'Open link in a new window',
+insert_image_title : 'Insert/edit image',
+insert_image_src : 'Image URL',
+insert_image_alt : 'Image description',
+help_desc : 'Help',
+bold_img : "bold.gif",
+italic_img : "italic.gif",
+underline_img : "underline.gif",
+clipboard_msg : 'Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?',
+popup_blocked : 'Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.'
+});
+tinyMCELang['lang_bold_desc'] = 'Bold (Alt+b)';
+tinyMCELang['lang_italic_desc'] = 'Italic (Alt+i)';
+tinyMCELang['lang_underline_desc'] = 'Underline';
+tinyMCELang['lang_striketrough_desc'] = 'Striketrough (Alt-d)';
+tinyMCELang['lang_justifyleft_desc'] = 'Align left (Alt-f)';
+tinyMCELang['lang_justifycenter_desc'] = 'Align center (Alt-c)';
+tinyMCELang['lang_justifyright_desc'] = 'Align right (Alt-r)';
+tinyMCELang['lang_justifyfull_desc'] = 'Align full';
+tinyMCELang['lang_bullist_desc'] = 'Unordered list (Alt-l)';
+tinyMCELang['lang_numlist_desc'] = 'Ordered list (Alt-o)';
+tinyMCELang['lang_outdent_desc'] = 'Outdent (Alt-w)';
+tinyMCELang['lang_indent_desc'] = 'Indent/Blockquote (Alt-q)';
+tinyMCELang['lang_undo_desc'] = 'Undo (Alt-u)';
+tinyMCELang['lang_redo_desc'] = 'Redo (Alt-y)';
+tinyMCELang['lang_link_desc'] = 'Insert/edit link (Alt-a)';
+tinyMCELang['lang_unlink_desc'] = 'Unlink (Alt-s)';
+tinyMCELang['lang_image_desc'] = 'Insert/edit image (Alt-m)';
+tinyMCELang['lang_cleanup_desc'] = 'Cleanup messy code';
+tinyMCELang['lang_focus_alert'] = 'A editor instance must be focused before using this command.';
+tinyMCELang['lang_edit_confirm'] = 'Do you want to use the WYSIWYG mode for this textarea?';
+tinyMCELang['lang_insert_link_title'] = 'Insert/edit link';
+tinyMCELang['lang_insert'] = 'Insert';
+tinyMCELang['lang_update'] = 'Update';
+tinyMCELang['lang_cancel'] = 'Cancel';
+tinyMCELang['lang_insert_link_url'] = 'Link URL';
+tinyMCELang['lang_insert_link_target'] = 'Target';
+tinyMCELang['lang_insert_link_target_same'] = 'Open link in the same window';
+tinyMCELang['lang_insert_link_target_blank'] = 'Open link in a new window';
+tinyMCELang['lang_insert_image_title'] = 'Insert/edit image';
+tinyMCELang['lang_insert_image_src'] = 'Image URL';
+tinyMCELang['lang_insert_image_alt'] = 'Image description';
+tinyMCELang['lang_help_desc'] = 'Help';
+tinyMCELang['lang_bold_img'] = "bold.gif";
+tinyMCELang['lang_italic_img'] = "italic.gif";
+tinyMCELang['lang_underline_img'] = "underline.gif";
+tinyMCELang['lang_clipboard_msg'] = 'Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?';
+tinyMCELang['lang_popup_blocked'] = 'Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.';

trunk/wp-includes/js/tinymce/plugins/autosave/editor_plugin.js

-                      r4431
+                      r3503
-/**
- * $RCSfile: editor_plugin_src.js,v $
- * $Revision: 1.11 $
- * $Date: 2006/03/22 12:21:21 $
+ *
- * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
- */
 /* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('autosave', 'en,tr,sv,cs,he,nb,hu,de,da,ru,ru_KOI8-R,ru_UTF-8,nn,fi,cy,es,is,pl,pt_br');
+var TinyMCE_AutoSavePlugin = {
+    getInfo : function() {
+        return {
+            longname : 'Auto save',
+            author : 'Moxiecode Systems',
+            authorurl : 'http://tinymce.moxiecode.com',
+            infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_autosave.html',
+            version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+        };
+    },
+    // Private plugin internal methods
+    _beforeUnloadHandler : function() {
+        var n, inst, anyDirty = false, msg = tinyMCE.getLang("lang_autosave_unload_msg");
+        if (tinyMCE.getParam("fullscreen_is_enabled"))
+            return;
+        for (n in tinyMCE.instances) {
+            inst = tinyMCE.instances[n];
+            if (!tinyMCE.isInstance(inst))
+                continue;
+            if (inst.isDirty())
+                return msg;
+        }
+        return;
+    }
+};
+window.onbeforeunload = TinyMCE_AutoSavePlugin._beforeUnloadHandler;
+tinyMCE.addPlugin("autosave", TinyMCE_AutoSavePlugin);
+ tinyMCE.importPluginLanguagePack('autosave','en,sv,cs,he,no,hu,de,da,ru,ru_KOI8-R,ru_UTF-8,fi,cy,es,is,pl');function TinyMCE_autosave_getInfo(){return{longname:'Auto save',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_autosave.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};};function TinyMCE_autosave_beforeUnloadHandler(){var msg=tinyMCE.getLang("lang_autosave_unload_msg");var anyDirty=false;for(var n in tinyMCE.instances){var inst=tinyMCE.instances[n];if(!tinyMCE.isInstance(inst))continue;if(inst.isDirty())return msg;}return;}window.onbeforeunload=TinyMCE_autosave_beforeUnloadHandler;

trunk/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js

-                      r4431
+                      r3503
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.16 $
+ * $Date: 2006/02/10 21:34:28 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('directionality', 'en,sv,fr_ca,zh_cn,cs,da,he,no,de,hu,ru,ru_KOI8-R,ru_UTF-8,es,cy,is,pl');
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('directionality', 'en,tr,sv,fr_ca,zh_cn,cs,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,pl,nl,fr,pt_br');
+var TinyMCE_DirectionalityPlugin = {
+    getInfo : function() {
+        return {
+            longname : 'Directionality',
+            author : 'Moxiecode Systems',
+            authorurl : 'http://tinymce.moxiecode.com',
+            infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_directionality.html',
+            version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+        };
+    },
+    getControlHTML : function(cn) {
+        switch (cn) {
+            case "ltr":
+                return tinyMCE.getButtonHTML(cn, 'lang_directionality_ltr_desc', '{$pluginurl}/images/ltr.gif', 'mceDirectionLTR');
+            case "rtl":
+                return tinyMCE.getButtonHTML(cn, 'lang_directionality_rtl_desc', '{$pluginurl}/images/rtl.gif', 'mceDirectionRTL');
+        }
+        return "";
+    },
+    execCommand : function(editor_id, element, command, user_interface, value) {
+        // Handle commands
+        switch (command) {
+            case "mceDirectionLTR":
+                var inst = tinyMCE.getInstanceById(editor_id);
+                var elm = tinyMCE.getParentElement(inst.getFocusElement(), "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+                if (elm)
+                    elm.setAttribute("dir", "ltr");
+                tinyMCE.triggerNodeChange(false);
+                return true;
+            case "mceDirectionRTL":
+                var inst = tinyMCE.getInstanceById(editor_id);
+                var elm = tinyMCE.getParentElement(inst.getFocusElement(), "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+                if (elm)
+                    elm.setAttribute("dir", "rtl");
+                tinyMCE.triggerNodeChange(false);
+                return true;
+        }
+        // Pass to next handler in chain
+        return false;
+    },
+    handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+        function getAttrib(elm, name) {
+            return elm.getAttribute(name) ? elm.getAttribute(name) : "";
+        }
+        if (node == null)
+            return;
+        var elm = tinyMCE.getParentElement(node, "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+        if (!elm) {
+            tinyMCE.switchClass(editor_id + '_ltr', 'mceButtonDisabled');
+            tinyMCE.switchClass(editor_id + '_rtl', 'mceButtonDisabled');
+            return true;
+        }
+        tinyMCE.switchClass(editor_id + '_ltr', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_rtl', 'mceButtonNormal');
+        var dir = getAttrib(elm, "dir");
+        if (dir == "ltr" || dir == "")
+            tinyMCE.switchClass(editor_id + '_ltr', 'mceButtonSelected');
+        else
+            tinyMCE.switchClass(editor_id + '_rtl', 'mceButtonSelected');
+        return true;
+    }
+function TinyMCE_directionality_getInfo() {
+    return {
+        longname : 'Directionality',
+        author : 'Moxiecode Systems',
+        authorurl : 'http://tinymce.moxiecode.com',
+        infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_directionality.html',
+        version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+    };
 };
+tinyMCE.addPlugin("directionality", TinyMCE_DirectionalityPlugin);
+function TinyMCE_directionality_getControlHTML(control_name) {
+    switch (control_name) {
+        case "ltr":
+            var cmd = 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceDirectionLTR\');return false;';
+            return '<a href="javascript:' + cmd + '" onclick="' + cmd + '" target="_self" onmousedown="return false;"><img id="{$editor_id}_ltr" src="{$pluginurl}/images/ltr.gif" title="{$lang_directionality_ltr_desc}" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>'
+            + '<div class="zerosize"><input type="button" accesskey="." onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceDirectionLTR\',false);" /></div>';
+        case "rtl":
+            var cmd = 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceDirectionRTL\');return false;';
+            return '<a href="javascript:' + cmd + '" onclick="' + cmd + '" target="_self" onmousedown="return false;"><img id="{$editor_id}_rtl" src="{$pluginurl}/images/rtl.gif" title="{$lang_directionality_rtl_desc}" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>'
+            + '<div class="zerosize"><input type="button" accesskey="," onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceDirectionRTL\',false);" /></div>';
+    }
+    return "";
+}
+function TinyMCE_directionality_execCommand(editor_id, element, command, user_interface, value) {
+    // Handle commands
+    switch (command) {
+        case "mceDirectionLTR":
+            var inst = tinyMCE.getInstanceById(editor_id);
+            var elm = tinyMCE.getParentElement(inst.getFocusElement(), "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+            if (elm)
+                elm.setAttribute("dir", "ltr");
+            tinyMCE.triggerNodeChange(false);
+            return true;
+        case "mceDirectionRTL":
+            var inst = tinyMCE.getInstanceById(editor_id);
+            var elm = tinyMCE.getParentElement(inst.getFocusElement(), "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+            if (elm)
+                elm.setAttribute("dir", "rtl");
+            tinyMCE.triggerNodeChange(false);
+            return true;
+    }
+    // Pass to next handler in chain
+    return false;
+}
+function TinyMCE_directionality_handleNodeChange(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+    function getAttrib(elm, name) {
+        return elm.getAttribute(name) ? elm.getAttribute(name) : "";
+    }
+    tinyMCE.switchClassSticky(editor_id + '_ltr', 'mceButtonNormal', false);
+    tinyMCE.switchClassSticky(editor_id + '_rtl', 'mceButtonNormal', false);
+    if (node == null)
+        return;
+    var elm = tinyMCE.getParentElement(node, "p,div,td,h1,h2,h3,h4,h5,h6,pre,address");
+    if (!elm) {
+        tinyMCE.switchClassSticky(editor_id + '_ltr', 'mceButtonDisabled', true);
+        tinyMCE.switchClassSticky(editor_id + '_rtl', 'mceButtonDisabled', true);
+        return;
+    }
+    var dir = getAttrib(elm, "dir");
+    if (dir == "ltr" || dir == "")
+        tinyMCE.switchClassSticky(editor_id + '_ltr', 'mceButtonSelected', false);
+    else
+        tinyMCE.switchClassSticky(editor_id + '_rtl', 'mceButtonSelected', false);
+    return true;
+}

trunk/wp-includes/js/tinymce/plugins/inlinepopups/css/inlinepopup.css

-                      r4431
+                      r3503
-/* Window classes */
-.mceWindow {
-    position: absolute;
-    left: 0;
-    top: 0;
-    border: 1px solid black;
-    background-color: #D4D0C8;
+}
-.mceWindowHead {
-    background-color: #334F8D;
-    width: 100%;
-    height: 18px;
-    cursor: move;
-    overflow: hidden;
+}
-.mceWindowBody {
-    clear: both;
-    background-color: white;
+}
-.mceWindowStatusbar {
-    background-color: #D4D0C8;
-    height: 12px;
-    border-top: 1px solid black;
+}
-.mceWindowTitle {
-    float: left;
-    font-family: "MS Sans Serif";
-    font-size: 9pt;
-    font-weight: bold;
-    line-height: 18px;
-    color: white;
-    margin-left: 2px;
-    overflow: hidden;
+}
-.mceWindowHeadTools {
-    margin-right: 2px;
+}
-.mceWindowClose, .mceWindowMinimize, .mceWindowMaximize {
-    display: block;
-    float: right;
-    overflow: hidden;
-    margin-top: 2px;
+}
-.mceWindowClose {
-    margin-left: 2px;
+}
-.mceWindowMinimize {
+}
-.mceWindowMaximize {
+}
-.mceWindowResize {
-    display: block;
-    float: right;
-    overflow: hidden;
-    cursor: se-resize;
-    width: 12px;
-    height: 12px;
+}

trunk/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js

-                      r4431
+                      r3503
-/**
- * $RCSfile: editor_plugin_src.js,v $
- * $Revision: 1.8 $
- * $Date: 2006/02/06 20:02:38 $
+ *
- * Moxiecode DHTML Windows script.
+ *
- * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
- */
-// Patch openWindow, closeWindow TinyMCE functions
-var TinyMCE_InlinePopupsPlugin = {
-    getInfo : function() {
-        return {
-            longname : 'Inline Popups',
-            author : 'Moxiecode Systems',
-            authorurl : 'http://tinymce.moxiecode.com',
-            infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_inlinepopups.html',
-            version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-        };
+    }
-};
-tinyMCE.addPlugin("inlinepopups", TinyMCE_InlinePopupsPlugin);
-// Patch openWindow, closeWindow TinyMCE functions
-TinyMCE_Engine.prototype.orgOpenWindow = TinyMCE_Engine.prototype.openWindow;
-TinyMCE_Engine.prototype.openWindow = function(template, args) {
-    // Does the caller support inline
-    if (args['inline'] != "yes" || tinyMCE.isOpera || tinyMCE.getParam("plugins").indexOf('inlinepopups') == -1) {
-        mcWindows.selectedWindow = null;
-        args['mce_inside_iframe'] = false;
-        this.orgOpenWindow(template, args);
-        return;
+    }
-    var url, resizable, scrollbars;
-    args['mce_inside_iframe'] = true;
-    tinyMCE.windowArgs = args;
-    if (template['file'].charAt(0) != '/' && template['file'].indexOf('://') == -1)
-        url = tinyMCE.baseURL + "/themes/" + tinyMCE.getParam("theme") + "/" + template['file'];
-    else
-        url = template['file'];
-    if (!(width = parseInt(template['width'])))
-        width = 320;
-    if (!(height = parseInt(template['height'])))
-        height = 200;
-    resizable = (args && args['resizable']) ? args['resizable'] : "no";
-    scrollbars = (args && args['scrollbars']) ? args['scrollbars'] : "no";
-    height += 18;
-    // Replace all args as variables in URL
-    for (var name in args) {
-        if (typeof(args[name]) == 'function')
-            continue;
-        url = tinyMCE.replaceVar(url, name, escape(args[name]));
+    }
-    var elm = document.getElementById(this.selectedInstance.editorId + '_parent');
-    var pos = tinyMCE.getAbsPosition(elm);
-    // Center div in editor area
-    pos.absLeft += Math.round((elm.firstChild.clientWidth / 2) - (width / 2));
-    pos.absTop += Math.round((elm.firstChild.clientHeight / 2) - (height / 2));
-    url += tinyMCE.settings['imp_version'] ? (url.indexOf('?')==-1?'?':'&') + 'ver=' + tinyMCE.settings['imp_version'] : '';
-    mcWindows.open(url, mcWindows.idCounter++, "modal=yes,width=" + width+ ",height=" + height + ",resizable=" + resizable + ",scrollbars=" + scrollbars + ",statusbar=" + resizable + ",left=" + pos.absLeft + ",top=" + pos.absTop);
-};
-TinyMCE_Engine.prototype.orgCloseWindow = TinyMCE_Engine.prototype.closeWindow;
-TinyMCE_Engine.prototype.closeWindow = function(win) {
-    if (mcWindows.selectedWindow != null)
-        mcWindows.selectedWindow.close();
-    else
-        this.orgCloseWindow(win);
-};
-TinyMCE_Engine.prototype.setWindowTitle = function(win_ref, title) {
-    for (var n in mcWindows.windows) {
-        var win = mcWindows.windows[n];
-        if (typeof(win) == 'function')
-            continue;
-        if (win_ref.name == win.id + "_iframe")
-            window.frames[win.id + "_iframe"].document.getElementById(win.id + '_title').innerHTML = title;
+    }
-};
-// * * * * * TinyMCE_Windows classes below
-// Windows handler
-function TinyMCE_Windows() {
-    this.settings = new Array();
-    this.windows = new Array();
-    this.isMSIE = (navigator.appName == "Microsoft Internet Explorer");
-    this.isGecko = navigator.userAgent.indexOf('Gecko') != -1;
-    this.isSafari = navigator.userAgent.indexOf('Safari') != -1;
-    this.isMac = navigator.userAgent.indexOf('Mac') != -1;
-    this.isMSIE5_0 = this.isMSIE && (navigator.userAgent.indexOf('MSIE 5.0') != -1);
-    this.action = "none";
-    this.selectedWindow = null;
-    this.lastSelectedWindow = null;
-    this.zindex = 100;
-    this.mouseDownScreenX = 0;
-    this.mouseDownScreenY = 0;
-    this.mouseDownLayerX = 0;
-    this.mouseDownLayerY = 0;
-    this.mouseDownWidth = 0;
-    this.mouseDownHeight = 0;
-    this.idCounter = 0;
-};
-TinyMCE_Windows.prototype.init = function(settings) {
-    this.settings = settings;
-    if (this.isMSIE)
-        this.addEvent(document, "mousemove", mcWindows.eventDispatcher);
-    else
-        this.addEvent(window, "mousemove", mcWindows.eventDispatcher);
-    this.addEvent(document, "mouseup", mcWindows.eventDispatcher);
-    this.doc = document;
-};
-TinyMCE_Windows.prototype.getParam = function(name, default_value) {
-    var value = null;
-    value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
-    // Fix bool values
-    if (value == "true" || value == "false")
-        return (value == "true");
-    return value;
-};
-TinyMCE_Windows.prototype.eventDispatcher = function(e) {
-    e = typeof(e) == "undefined" ? window.event : e;
-    if (mcWindows.selectedWindow == null)
-        return;
-    // Switch focus
-    if (mcWindows.isGecko && e.type == "mousedown") {
-        var elm = e.currentTarget;
-        for (var n in mcWindows.windows) {
-            var win = mcWindows.windows[n];
-            if (win.headElement == elm || win.resizeElement == elm) {
-                win.focus();
-                break;
+            }
+        }
+    }
-    switch (e.type) {
-        case "mousemove":
-            mcWindows.selectedWindow.onMouseMove(e);
-            break;
-        case "mouseup":
-            mcWindows.selectedWindow.onMouseUp(e);
-            break;
-        case "mousedown":
-            mcWindows.selectedWindow.onMouseDown(e);
-            break;
-        case "focus":
-            mcWindows.selectedWindow.onFocus(e);
-            break;
+    }
-};
-TinyMCE_Windows.prototype.addEvent = function(obj, name, handler) {
-    if (this.isMSIE)
-        obj.attachEvent("on" + name, handler);
-    else
-        obj.addEventListener(name, handler, true);
-};
-TinyMCE_Windows.prototype.cancelEvent = function(e) {
-    if (this.isMSIE) {
-        e.returnValue = false;
-        e.cancelBubble = true;
-    } else
-        e.preventDefault();
-};
-TinyMCE_Windows.prototype.parseFeatures = function(opts) {
-    // Cleanup the options
-    opts = opts.toLowerCase();
-    opts = opts.replace(/;/g, ",");
-    opts = opts.replace(/[^0-9a-z=,]/g, "");
-    var optionChunks = opts.split(',');
-    var options = new Array();
-    options['left'] = "10";
-    options['top'] = "10";
-    options['width'] = "300";
-    options['height'] = "300";
-    options['resizable'] = "yes";
-    options['minimizable'] = "yes";
-    options['maximizable'] = "yes";
-    options['close'] = "yes";
-    options['movable'] = "yes";
-    options['statusbar'] = "yes";
-    options['scrollbars'] = "auto";
-    options['modal'] = "no";
-    if (opts == "")
-        return options;
-    for (var i=0; i<optionChunks.length; i++) {
-        var parts = optionChunks[i].split('=');
-        if (parts.length == 2)
-            options[parts[0]] = parts[1];
+    }
-    options['left'] = parseInt(options['left']);
-    options['top'] = parseInt(options['top']);
-    options['width'] = parseInt(options['width']);
-    options['height'] = parseInt(options['height']);
-    return options;
-};
-TinyMCE_Windows.prototype.open = function(url, name, features) {
-    this.lastSelectedWindow = this.selectedWindow;
-    var win = new TinyMCE_Window();
-    var winDiv, html = "", id;
-    var imgPath = this.getParam("images_path");
-    features = this.parseFeatures(features);
-    // Create div
-    id = "mcWindow_" + name;
-    win.deltaHeight = 18;
-    if (features['statusbar'] == "yes") {
-        win.deltaHeight += 13;
-        if (this.isMSIE)
-            win.deltaHeight += 1;
+    }
-    width = parseInt(features['width']);
-    height = parseInt(features['height'])-win.deltaHeight;
-    if (this.isMSIE)
-        width -= 2;
-    // Setup first part of window
-    win.id = id;
-    win.url = url;
-    win.name = name;
-    win.features = features;
-    this.windows[name] = win;
-    iframeWidth = width;
-    iframeHeight = height;
-    // Create inner content
-    html += '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">';
-    html += '<html>';
-    html += '<head>';
-    html += '<title>Wrapper iframe</title>';
-    html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
-    html += '<link href="' + this.getParam("css_file") + '" rel="stylesheet" type="text/css" />';
-    if ( this.isMac ) html += '<style type="text/css">.mceWindowTitle{float:none;margin:0;text-align:center;}.mceWindowClose{float:none;position:absolute;left:0px;top:0px;}</style>';
-    html += '</head>';
-    html += '<body onload="parent.mcWindows.onLoad(\'' + name + '\');">';
-    html += '<div id="' + id + '_container" class="mceWindow">';
-    html += '<div id="' + id + '_head" class="mceWindowHead" onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();">';
-    html += '  <div id="' + id + '_title" class="mceWindowTitle"';
-    html += '  onselectstart="return false;" unselectable="on" style="-moz-user-select: none !important;"></div>';
-    html += '    <div class="mceWindowHeadTools">';
-    html += '      <a href="javascript:parent.mcWindows.windows[\'' + name + '\'].close();" target="_self" onmousedown="return false;" class="mceWindowClose"><img border="0" src="' + imgPath + '/window_close.gif" /></a>';
-//  html += '      <a href="javascript:mcWindows.windows[\'' + name + '\'].maximize();" target="_self" onmousedown="return false;" class="mceWindowMaximize"></a>';
-//  html += '      <a href="javascript:mcWindows.windows[\'' + name + '\'].minimize();" target="_self" onmousedown="return false;" class="mceWindowMinimize"></a>';
-    html += '    </div>';
-    html += '</div><div id="' + id + '_body" class="mceWindowBody" style="width: ' + width + 'px; height: ' + height + 'px;">';
-    html += '<iframe id="' + id + '_iframe" name="' + id + '_iframe" frameborder="0" width="' + iframeWidth + '" height="' + iframeHeight + '" src="' + url + '" class="mceWindowBodyIframe" scrolling="' + features['scrollbars'] + '"></iframe></div>';
-    if (features['statusbar'] == "yes") {
-        html += '<div id="' + id + '_statusbar" class="mceWindowStatusbar" onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();">';
-        if (features['resizable'] == "yes") {
-            if (this.isGecko)
-                html += '<div id="' + id + '_resize" class="mceWindowResize"><div style="background-image: url(\'' + imgPath + '/window_resize.gif\'); width: 12px; height: 12px;"></div></div>';
-            else
-                html += '<div id="' + id + '_resize" class="mceWindowResize"><img onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();" border="0" src="' + imgPath + '/window_resize.gif" /></div>';
+        }
-        html += '</div>';
+    }
-    html += '</div>';
-    html += '</body>';
-    html += '</html>';
-    // Create iframe
-    this.createFloatingIFrame(id, features['left'], features['top'], features['width'], features['height'], html);
-};
-// Blocks the document events by placing a image over the whole document
-TinyMCE_Windows.prototype.setDocumentLock = function(state) {
-    if (state) {
-        var elm = document.getElementById('mcWindowEventBlocker');
-        if (elm == null) {
-            elm = document.createElement("div");
-            elm.id = "mcWindowEventBlocker";
-            elm.style.position = "absolute";
-            elm.style.left = "0";
-            elm.style.top = "0";
-            document.body.appendChild(elm);
+        }
-        elm.style.display = "none";
-        var imgPath = this.getParam("images_path");
-        var width = document.body.clientWidth;
-        var height = document.body.clientHeight;
-        elm.style.width = width;
-        elm.style.height = height;
-        elm.innerHTML = '<img src="' + imgPath + '/spacer.gif" width="' + width + '" height="' + height + '" />';
-        elm.style.zIndex = mcWindows.zindex-1;
-        elm.style.display = "block";
-    } else {
-        var elm = document.getElementById('mcWindowEventBlocker');
-        if (mcWindows.windows.length == 0)
-            elm.parentNode.removeChild(elm);
-        else
-            elm.style.zIndex = mcWindows.zindex-1;
+    }
-};
-// Gets called when wrapper iframe is initialized
-TinyMCE_Windows.prototype.onLoad = function(name) {
-    var win = mcWindows.windows[name];
-    var id = "mcWindow_" + name;
-    var wrapperIframe = window.frames[id + "_iframe"].frames[0];
-    var wrapperDoc = window.frames[id + "_iframe"].document;
-    var doc = window.frames[id + "_iframe"].document;
-    var winDiv = document.getElementById("mcWindow_" + name + "_div");
-    var realIframe = window.frames[id + "_iframe"].frames[0];
-    // Set window data
-    win.id = "mcWindow_" + name;
-    win.winElement = winDiv;
-    win.bodyElement = doc.getElementById(id + '_body');
-    win.iframeElement = doc.getElementById(id + '_iframe');
-    win.headElement = doc.getElementById(id + '_head');
-    win.titleElement = doc.getElementById(id + '_title');
-    win.resizeElement = doc.getElementById(id + '_resize');
-    win.containerElement = doc.getElementById(id + '_container');
-    win.left = win.features['left'];
-    win.top = win.features['top'];
-    win.frame = window.frames[id + '_iframe'].frames[0];
-    win.wrapperFrame = window.frames[id + '_iframe'];
-    win.wrapperIFrameElement = document.getElementById(id + "_iframe");
-    // Add event handlers
-    mcWindows.addEvent(win.headElement, "mousedown", mcWindows.eventDispatcher);
-    if (win.resizeElement != null)
-        mcWindows.addEvent(win.resizeElement, "mousedown", mcWindows.eventDispatcher);
-    if (mcWindows.isMSIE) {
-        mcWindows.addEvent(realIframe.document, "mousemove", mcWindows.eventDispatcher);
-        mcWindows.addEvent(realIframe.document, "mouseup", mcWindows.eventDispatcher);
-    } else {
-        mcWindows.addEvent(realIframe, "mousemove", mcWindows.eventDispatcher);
-        mcWindows.addEvent(realIframe, "mouseup", mcWindows.eventDispatcher);
-        mcWindows.addEvent(realIframe, "focus", mcWindows.eventDispatcher);
+    }
-    for (var i=0; i<window.frames.length; i++) {
-        if (!window.frames[i]._hasMouseHandlers) {
-            if (mcWindows.isMSIE) {
-                mcWindows.addEvent(window.frames[i].document, "mousemove", mcWindows.eventDispatcher);
-                mcWindows.addEvent(window.frames[i].document, "mouseup", mcWindows.eventDispatcher);
-            } else {
-                mcWindows.addEvent(window.frames[i], "mousemove", mcWindows.eventDispatcher);
-                mcWindows.addEvent(window.frames[i], "mouseup", mcWindows.eventDispatcher);
+            }
-            window.frames[i]._hasMouseHandlers = true;
+        }
+    }
-    if (mcWindows.isMSIE) {
-        mcWindows.addEvent(win.frame.document, "mousemove", mcWindows.eventDispatcher);
-        mcWindows.addEvent(win.frame.document, "mouseup", mcWindows.eventDispatcher);
-    } else {
-        mcWindows.addEvent(win.frame, "mousemove", mcWindows.eventDispatcher);
-        mcWindows.addEvent(win.frame, "mouseup", mcWindows.eventDispatcher);
-        mcWindows.addEvent(win.frame, "focus", mcWindows.eventDispatcher);
+    }
-    // Dispatch open window event
-    var func = this.getParam("on_open_window", "");
-    if (func != "")
-        eval(func + "(win);");
-    win.focus();
-    if (win.features['modal'] == "yes")
-        mcWindows.setDocumentLock(true);
-};
-TinyMCE_Windows.prototype.createFloatingIFrame = function(id_prefix, left, top, width, height, html) {
-    var iframe = document.createElement("iframe");
-    var div = document.createElement("div");
-    width = parseInt(width);
-    height = parseInt(height)+1;
-    // Create wrapper div
-    div.setAttribute("id", id_prefix + "_div");
-    div.setAttribute("width", width);
-    div.setAttribute("height", (height));
-    div.style.position = "absolute";
-    div.style.left = left + "px";
-    div.style.top = top + "px";
-    div.style.width = width + "px";
-    div.style.height = (height) + "px";
-    div.style.backgroundColor = "white";
-    div.style.display = "none";
-    if (this.isGecko) {
-        iframeWidth = width + 2;
-        iframeHeight = height + 2;
-    } else {
-        iframeWidth = width;
-        iframeHeight = height + 1;
+    }
-    // Create iframe
-    iframe.setAttribute("id", id_prefix + "_iframe");
-    iframe.setAttribute("name", id_prefix + "_iframe");
-    iframe.setAttribute("border", "0");
-    iframe.setAttribute("frameBorder", "0");
-    iframe.setAttribute("marginWidth", "0");
-    iframe.setAttribute("marginHeight", "0");
-    iframe.setAttribute("leftMargin", "0");
-    iframe.setAttribute("topMargin", "0");
-    iframe.setAttribute("width", iframeWidth);
-    iframe.setAttribute("height", iframeHeight);
-//  iframe.setAttribute("src", "../jscripts/tiny_mce/blank.htm");
-    // iframe.setAttribute("allowtransparency", "false");
-    iframe.setAttribute("scrolling", "no");
-    iframe.style.width = iframeWidth + "px";
-    iframe.style.height = iframeHeight + "px";
-    iframe.style.backgroundColor = "white";
-    div.appendChild(iframe);
-    document.body.appendChild(div);
-    // Fixed MSIE 5.0 issue
-    div.innerHTML = div.innerHTML;
-    if (this.isSafari) {
-        // Give Safari some time to setup
-        window.setTimeout(function() {
-            doc = window.frames[id_prefix + '_iframe'].document;
-            doc.open();
-            doc.write(html);
-            doc.close();
-        }, 10);
-    } else {
-        doc = window.frames[id_prefix + '_iframe'].window.document;
-        doc.open();
-        doc.write(html);
-        doc.close();
+    }
-    div.style.display = "block";
-    return div;
-};
-// Window instance
-function TinyMCE_Window() {
-};
-TinyMCE_Window.prototype.focus = function() {
-    if (this != mcWindows.selectedWindow) {
-        this.winElement.style.zIndex = ++mcWindows.zindex;
-        mcWindows.lastSelectedWindow = mcWindows.selectedWindow;
-        mcWindows.selectedWindow = this;
+    }
-};
-TinyMCE_Window.prototype.minimize = function() {
-};
-TinyMCE_Window.prototype.maximize = function() {
-};
-TinyMCE_Window.prototype.startResize = function() {
-    mcWindows.action = "resize";
-};
-TinyMCE_Window.prototype.startMove = function(e) {
-    mcWindows.action = "move";
-};
-TinyMCE_Window.prototype.close = function() {
-    if (this.frame && this.frame['tinyMCEPopup'])
-        this.frame['tinyMCEPopup'].restoreSelection();
-    if (mcWindows.lastSelectedWindow != null)
-        mcWindows.lastSelectedWindow.focus();
-    var mcWindowsNew = new Array();
-    for (var n in mcWindows.windows) {
-        var win = mcWindows.windows[n];
-        if (typeof(win) == 'function')
-            continue;
-        if (win.name != this.name)
-            mcWindowsNew[n] = win;
+    }
-    mcWindows.windows = mcWindowsNew;
-//  alert(mcWindows.doc.getElementById(this.id + "_iframe"));
-    var e = mcWindows.doc.getElementById(this.id + "_iframe");
-    e.parentNode.removeChild(e);
-    var e = mcWindows.doc.getElementById(this.id + "_div");
-    e.parentNode.removeChild(e);
-    mcWindows.setDocumentLock(false);
-};
-TinyMCE_Window.prototype.onMouseMove = function(e) {
-    var scrollX = 0;//this.doc.body.scrollLeft;
-    var scrollY = 0;//this.doc.body.scrollTop;
-    // Calculate real X, Y
-    var dx = e.screenX - mcWindows.mouseDownScreenX;
-    var dy = e.screenY - mcWindows.mouseDownScreenY;
-    switch (mcWindows.action) {
-        case "resize":
-            width = mcWindows.mouseDownWidth + (e.screenX - mcWindows.mouseDownScreenX);
-            height = mcWindows.mouseDownHeight + (e.screenY - mcWindows.mouseDownScreenY);
-            width = width < 100 ? 100 : width;
-            height = height < 100 ? 100 : height;
-            this.wrapperIFrameElement.style.width = width+2;
-            this.wrapperIFrameElement.style.height = height+2;
-            this.wrapperIFrameElement.width = width+2;
-            this.wrapperIFrameElement.height = height+2;
-            this.winElement.style.width = width;
-            this.winElement.style.height = height;
-            height = height - this.deltaHeight;
-            this.containerElement.style.width = width;
-            this.iframeElement.style.width = width;
-            this.iframeElement.style.height = height;
-            this.bodyElement.style.width = width;
-            this.bodyElement.style.height = height;
-            this.headElement.style.width = width;
-            //this.statusElement.style.width = width;
-            mcWindows.cancelEvent(e);
-            break;
-        case "move":
-            this.left = mcWindows.mouseDownLayerX + (e.screenX - mcWindows.mouseDownScreenX);
-            this.top = mcWindows.mouseDownLayerY + (e.screenY - mcWindows.mouseDownScreenY);
-            this.winElement.style.left = this.left + "px";
-            this.winElement.style.top = this.top + "px";
-            mcWindows.cancelEvent(e);
-            break;
+    }
-};
-function debug(msg) {
-    document.getElementById('debug').value += msg + "\n";
+}
-TinyMCE_Window.prototype.onMouseUp = function(e) {
-    mcWindows.action = "none";
-};
-TinyMCE_Window.prototype.onFocus = function(e) {
-    // Gecko only handler
-    var winRef = e.currentTarget;
-    for (var n in mcWindows.windows) {
-        var win = mcWindows.windows[n];
-        if (typeof(win) == 'function')
-            continue;
-        if (winRef.name == win.id + "_iframe") {
-            win.focus();
-            return;
+        }
+    }
-};
-TinyMCE_Window.prototype.onMouseDown = function(e) {
-    var elm = mcWindows.isMSIE ? this.wrapperFrame.event.srcElement : e.target;
-    var scrollX = 0;//this.doc.body.scrollLeft;
-    var scrollY = 0;//this.doc.body.scrollTop;
-    mcWindows.mouseDownScreenX = e.screenX;
-    mcWindows.mouseDownScreenY = e.screenY;
-    mcWindows.mouseDownLayerX = this.left;
-    mcWindows.mouseDownLayerY = this.top;
-    mcWindows.mouseDownWidth = parseInt(this.winElement.style.width);
-    mcWindows.mouseDownHeight = parseInt(this.winElement.style.height);
-    if (this.resizeElement != null && elm == this.resizeElement.firstChild)
-        this.startResize(e);
-    else
-        this.startMove(e);
-    mcWindows.cancelEvent(e);
-};
-// Global instance
-var mcWindows = new TinyMCE_Windows();
-// Initialize windows
-mcWindows.init({
-    images_path : tinyMCE.baseURL + "/plugins/inlinepopups/images",
-    css_file : tinyMCE.baseURL + "/plugins/inlinepopups/css/inlinepopup.css"
-});

trunk/wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js

-                      r4431
+                      r3503
-/**
- * $RCSfile: mcwindows.js,v $
- * $Revision: 1.2 $
- * $Date: 2005/10/18 13:59:43 $
+ *
- * Moxiecode DHTML Windows script.
+ *
- * @author Moxiecode
- * @copyright Copyright © 2004, Moxiecode Systems AB, All rights reserved.
- */
-// Windows handler
-function MCWindows() {
-    this.settings = new Array();
-    this.windows = new Array();
-    this.isMSIE = (navigator.appName == "Microsoft Internet Explorer");
-    this.isGecko = navigator.userAgent.indexOf('Gecko') != -1;
-    this.isSafari = navigator.userAgent.indexOf('Safari') != -1;
-    this.isMac = navigator.userAgent.indexOf('Mac') != -1;
-    this.isMSIE5_0 = this.isMSIE && (navigator.userAgent.indexOf('MSIE 5.0') != -1);
-    this.action = "none";
-    this.selectedWindow = null;
-    this.zindex = 100;
-    this.mouseDownScreenX = 0;
-    this.mouseDownScreenY = 0;
-    this.mouseDownLayerX = 0;
-    this.mouseDownLayerY = 0;
-    this.mouseDownWidth = 0;
-    this.mouseDownHeight = 0;
-};
-MCWindows.prototype.init = function(settings) {
-    this.settings = settings;
-    if (this.isMSIE)
-        this.addEvent(document, "mousemove", mcWindows.eventDispatcher);
-    else
-        this.addEvent(window, "mousemove", mcWindows.eventDispatcher);
-    this.addEvent(document, "mouseup", mcWindows.eventDispatcher);
-};
-MCWindows.prototype.getParam = function(name, default_value) {
-    var value = null;
-    value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
-    // Fix bool values
-    if (value == "true" || value == "false")
-        return (value == "true");
-    return value;
-};
-MCWindows.prototype.eventDispatcher = function(e) {
-    e = typeof(e) == "undefined" ? window.event : e;
-    if (mcWindows.selectedWindow == null)
-        return;
-    // Switch focus
-    if (mcWindows.isGecko && e.type == "mousedown") {
-        var elm = e.currentTarget;
-        for (var n in mcWindows.windows) {
-            var win = mcWindows.windows[n];
-            if (typeof(win) == 'function')
-                continue;
-            if (win.headElement == elm || win.resizeElement == elm) {
-                win.focus();
-                break;
+            }
+        }
+    }
-    switch (e.type) {
-        case "mousemove":
-            mcWindows.selectedWindow.onMouseMove(e);
-            break;
-        case "mouseup":
-            mcWindows.selectedWindow.onMouseUp(e);
-            break;
-        case "mousedown":
-            mcWindows.selectedWindow.onMouseDown(e);
-            break;
-        case "focus":
-            mcWindows.selectedWindow.onFocus(e);
-            break;
+    }
+}
-MCWindows.prototype.addEvent = function(obj, name, handler) {
-    if (this.isMSIE)
-        obj.attachEvent("on" + name, handler);
-    else
-        obj.addEventListener(name, handler, true);
-};
-MCWindows.prototype.cancelEvent = function(e) {
-    if (this.isMSIE) {
-        e.returnValue = false;
-        e.cancelBubble = true;
-    } else
-        e.preventDefault();
-};
-MCWindows.prototype.parseFeatures = function(opts) {
-    // Cleanup the options
-    opts = opts.toLowerCase();
-    opts = opts.replace(/;/g, ",");
-    opts = opts.replace(/[^0-9a-z=,]/g, "");
-    var optionChunks = opts.split(',');
-    var options = new Array();
-    options['left'] = 10;
-    options['top'] = 10;
-    options['width'] = 300;
-    options['height'] = 300;
-    options['resizable'] = true;
-    options['minimizable'] = true;
-    options['maximizable'] = true;
-    options['close'] = true;
-    options['movable'] = true;
-    if (opts == "")
-        return options;
-    for (var i=0; i<optionChunks.length; i++) {
-        var parts = optionChunks[i].split('=');
-        if (parts.length == 2)
-            options[parts[0]] = parts[1];
+    }
-    return options;
-};
-MCWindows.prototype.open = function(url, name, features) {
-    var win = new MCWindow();
-    var winDiv, html = "", id;
-    features = this.parseFeatures(features);
-    // Create div
-    id = "mcWindow_" + name;
-    width = parseInt(features['width']);
-    height = parseInt(features['height'])-12-19;
-    if (this.isMSIE)
-        width -= 2;
-    // Setup first part of window
-    win.id = id;
-    win.url = url;
-    win.name = name;
-    win.features = features;
-    this.windows[name] = win;
-    iframeWidth = width;
-    iframeHeight = height;
-    // Create inner content
-    html += '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">';
-    html += '<html>';
-    html += '<head>';
-    html += '<title>Wrapper iframe</title>';
-    html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
-    html += '<link href="../jscripts/tiny_mce/themes/advanced/css/editor_ui.css" rel="stylesheet" type="text/css" />';
-    html += '</head>';
-    html += '<body onload="parent.mcWindows.onLoad(\'' + name + '\');">';
-    html += '<div id="' + id + '_container" class="mceWindow">';
-    html += '<div id="' + id + '_head" class="mceWindowHead" onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();">';
-    html += '  <div id="' + id + '_title" class="mceWindowTitle"';
-    html += '  onselectstart="return false;" unselectable="on" style="-moz-user-select: none !important;">No name window</div>';
-    html += '    <div class="mceWindowHeadTools">';
-    html += '      <a href="javascript:parent.mcWindows.windows[\'' + name + '\'].close();" onmousedown="return false;" class="mceWindowClose"><img border="0" src="../jscripts/tiny_mce/themes/advanced/images/window_close.gif" /></a>';
-//  html += '      <a href="javascript:mcWindows.windows[\'' + name + '\'].maximize();" onmousedown="return false;" class="mceWindowMaximize"></a>';
-//  html += '      <a href="javascript:mcWindows.windows[\'' + name + '\'].minimize();" onmousedown="return false;" class="mceWindowMinimize"></a>';
-    html += '    </div>';
-    html += '</div><div id="' + id + '_body" class="mceWindowBody" style="width: ' + width + 'px; height: ' + height + 'px;">';
-    html += '<iframe id="' + id + '_iframe" name="' + id + '_iframe" onfocus="parent.mcWindows.windows[\'' + name + '\'].focus();" frameborder="0" width="' + iframeWidth + '" height="' + iframeHeight + '" src="' + url + '" class="mceWindowBodyIframe"></iframe></div>';
-    html += '<div id="' + id + '_statusbar" class="mceWindowStatusbar" onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();">';
-    html += '<div id="' + id + '_resize" class="mceWindowResize"><img onmousedown="parent.mcWindows.windows[\'' + name + '\'].focus();" border="0" src="../jscripts/tiny_mce/themes/advanced/images/window_resize.gif" /></div>';
-    html += '</div>';
-    html += '</div>';
-    html += '</body>';
-    html += '</html>';
-    // Create iframe
-    this.createFloatingIFrame(id, features['left'], features['top'], features['width'], features['height'], html);
-};
-// Gets called when wrapper iframe is initialized
-MCWindows.prototype.onLoad = function(name) {
-    var win = mcWindows.windows[name];
-    var id = "mcWindow_" + name;
-    var wrapperIframe = window.frames[id + "_iframe"].frames[0];
-    var wrapperDoc = window.frames[id + "_iframe"].document;
-    var doc = window.frames[id + "_iframe"].document;
-    var winDiv = document.getElementById("mcWindow_" + name + "_div");
-    var realIframe = window.frames[id + "_iframe"].frames[0];
-    // Set window data
-    win.id = "mcWindow_" + name + "_iframe";
-    win.winElement = winDiv;
-    win.bodyElement = doc.getElementById(id + '_body');
-    win.iframeElement = doc.getElementById(id + '_iframe');
-    win.headElement = doc.getElementById(id + '_head');
-    win.titleElement = doc.getElementById(id + '_title');
-    win.resizeElement = doc.getElementById(id + '_resize');
-    win.containerElement = doc.getElementById(id + '_container');
-    win.left = win.features['left'];
-    win.top = win.features['top'];
-    win.frame = window.frames[id + '_iframe'].frames[0];
-    win.wrapperFrame = window.frames[id + '_iframe'];
-    win.wrapperIFrameElement = document.getElementById(id + "_iframe");
-    // Add event handlers
-    mcWindows.addEvent(win.headElement, "mousedown", mcWindows.eventDispatcher);
-    mcWindows.addEvent(win.resizeElement, "mousedown", mcWindows.eventDispatcher);
-    if (mcWindows.isMSIE) {
-        mcWindows.addEvent(realIframe.document, "mousemove", mcWindows.eventDispatcher);
-        mcWindows.addEvent(realIframe.document, "mouseup", mcWindows.eventDispatcher);
-    } else {
-        mcWindows.addEvent(realIframe, "mousemove", mcWindows.eventDispatcher);
-        mcWindows.addEvent(realIframe, "mouseup", mcWindows.eventDispatcher);
-        mcWindows.addEvent(realIframe, "focus", mcWindows.eventDispatcher);
+    }
-    for (var i=0; i<window.frames.length; i++) {
-        if (!window.frames[i]._hasMouseHandlers) {
-            if (mcWindows.isMSIE) {
-                mcWindows.addEvent(window.frames[i].document, "mousemove", mcWindows.eventDispatcher);
-                mcWindows.addEvent(window.frames[i].document, "mouseup", mcWindows.eventDispatcher);
-            } else {
-                mcWindows.addEvent(window.frames[i], "mousemove", mcWindows.eventDispatcher);
-                mcWindows.addEvent(window.frames[i], "mouseup", mcWindows.eventDispatcher);
+            }
-            window.frames[i]._hasMouseHandlers = true;
+        }
+    }
-    if (mcWindows.isMSIE) {
-        mcWindows.addEvent(win.frame.document, "mousemove", mcWindows.eventDispatcher);
-        mcWindows.addEvent(win.frame.document, "mouseup", mcWindows.eventDispatcher);
-    } else {
-        mcWindows.addEvent(win.frame, "mousemove", mcWindows.eventDispatcher);
-        mcWindows.addEvent(win.frame, "mouseup", mcWindows.eventDispatcher);
-        mcWindows.addEvent(win.frame, "focus", mcWindows.eventDispatcher);
+    }
-    this.selectedWindow = win;
-};
-MCWindows.prototype.createFloatingIFrame = function(id_prefix, left, top, width, height, html) {
-    var iframe = document.createElement("iframe");
-    var div = document.createElement("div");
-    width = parseInt(width);
-    height = parseInt(height)+1;
-    // Create wrapper div
-    div.setAttribute("id", id_prefix + "_div");
-    div.setAttribute("width", width);
-    div.setAttribute("height", (height));
-    div.style.position = "absolute";
-    div.style.left = left + "px";
-    div.style.top = top + "px";
-    div.style.width = width + "px";
-    div.style.height = (height) + "px";
-    div.style.backgroundColor = "white";
-    div.style.display = "none";
-    if (this.isGecko) {
-        iframeWidth = width + 2;
-        iframeHeight = height + 2;
-    } else {
-        iframeWidth = width;
-        iframeHeight = height + 1;
+    }
-    // Create iframe
-    iframe.setAttribute("id", id_prefix + "_iframe");
-    iframe.setAttribute("name", id_prefix + "_iframe");
-    iframe.setAttribute("border", "0");
-    iframe.setAttribute("frameBorder", "0");
-    iframe.setAttribute("marginWidth", "0");
-    iframe.setAttribute("marginHeight", "0");
-    iframe.setAttribute("leftMargin", "0");
-    iframe.setAttribute("topMargin", "0");
-    iframe.setAttribute("width", iframeWidth);
-    iframe.setAttribute("height", iframeHeight);
-//  iframe.setAttribute("src", "../jscripts/tiny_mce/blank.htm");
-    // iframe.setAttribute("allowtransparency", "false");
-    iframe.setAttribute("scrolling", "no");
-    iframe.style.width = iframeWidth + "px";
-    iframe.style.height = iframeHeight + "px";
-    iframe.style.backgroundColor = "white";
-    div.appendChild(iframe);
-    document.body.appendChild(div);
-    // Fixed MSIE 5.0 issue
-    div.innerHTML = div.innerHTML;
-    if (this.isSafari) {
-        // Give Safari some time to setup
-        window.setTimeout(function() {
-            doc = window.frames[id_prefix + '_iframe'].document;
-            doc.open();
-            doc.write(html);
-            doc.close();
-        }, 10);
-    } else {
-        doc = window.frames[id_prefix + '_iframe'].window.document
-        doc.open();
-        doc.write(html);
-        doc.close();
+    }
-    div.style.display = "block";
-    return div;
-};
-// Window instance
-function MCWindow() {
-};
-MCWindow.prototype.focus = function() {
-    this.winElement.style.zIndex = mcWindows.zindex++;
-    mcWindows.selectedWindow = this;
-};
-MCWindow.prototype.minimize = function() {
-};
-MCWindow.prototype.maximize = function() {
-};
-MCWindow.prototype.startResize = function() {
-    mcWindows.action = "resize";
-};
-MCWindow.prototype.startMove = function(e) {
-    mcWindows.action = "move";
-};
-MCWindow.prototype.close = function() {
-    document.body.removeChild(this.winElement);
-    mcWindows.windows[this.name] = null;
-};
-MCWindow.prototype.onMouseMove = function(e) {
-    var scrollX = 0;//this.doc.body.scrollLeft;
-    var scrollY = 0;//this.doc.body.scrollTop;
-    // Calculate real X, Y
-    var dx = e.screenX - mcWindows.mouseDownScreenX;
-    var dy = e.screenY - mcWindows.mouseDownScreenY;
-    switch (mcWindows.action) {
-        case "resize":
-            width = mcWindows.mouseDownWidth + (e.screenX - mcWindows.mouseDownScreenX);
-            height = mcWindows.mouseDownHeight + (e.screenY - mcWindows.mouseDownScreenY);
-            width = width < 100 ? 100 : width;
-            height = height < 100 ? 100 : height;
-            this.wrapperIFrameElement.style.width = width+2;
-            this.wrapperIFrameElement.style.height = height+2;
-            this.wrapperIFrameElement.width = width+2;
-            this.wrapperIFrameElement.height = height+2;
-            this.winElement.style.width = width;
-            this.winElement.style.height = height;
-            height = height-12-19;
-            this.containerElement.style.width = width;
-            this.iframeElement.style.width = width;
-            this.iframeElement.style.height = height;
-            this.bodyElement.style.width = width;
-            this.bodyElement.style.height = height;
-            this.headElement.style.width = width;
-            //this.statusElement.style.width = width;
-            mcWindows.cancelEvent(e);
-            break;
-        case "move":
-            this.left = mcWindows.mouseDownLayerX + (e.screenX - mcWindows.mouseDownScreenX);
-            this.top = mcWindows.mouseDownLayerY + (e.screenY - mcWindows.mouseDownScreenY);
-            this.winElement.style.left = this.left + "px";
-            this.winElement.style.top = this.top + "px";
-            mcWindows.cancelEvent(e);
-            break;
+    }
-};
-MCWindow.prototype.onMouseUp = function(e) {
-    mcWindows.action = "none";
-};
-MCWindow.prototype.onFocus = function(e) {
-    // Gecko only handler
-    var winRef = e.currentTarget;
-    for (var n in mcWindows.windows) {
-        var win = mcWindows.windows[n];
-        if (typeof(win) == 'function')
-            continue;
-        if (winRef.name == win.id) {
-            win.focus();
-            return;
+        }
+    }
-};
-MCWindow.prototype.onMouseDown = function(e) {
-    var elm = mcWindows.isMSIE ? this.wrapperFrame.event.srcElement : e.target;
-    var scrollX = 0;//this.doc.body.scrollLeft;
-    var scrollY = 0;//this.doc.body.scrollTop;
-    mcWindows.mouseDownScreenX = e.screenX;
-    mcWindows.mouseDownScreenY = e.screenY;
-    mcWindows.mouseDownLayerX = this.left;
-    mcWindows.mouseDownLayerY = this.top;
-    mcWindows.mouseDownWidth = parseInt(this.winElement.style.width);
-    mcWindows.mouseDownHeight = parseInt(this.winElement.style.height);
-    if (elm == this.resizeElement.firstChild)
-        this.startResize(e);
-    else
-        this.startMove(e);
-    mcWindows.cancelEvent(e);
-};
-// Global instance
-var mcWindows = new MCWindows();

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

-                      r4431
+                      r3503
 /* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('wordpress', 'en');
+var TinyMCE_wordpressPlugin = {
+    getInfo : function() {
+        return {
+            longname : 'WordPress Plugin',
+            author : 'WordPress',
+            authorurl : 'http://wordpress.org',
+            infourl : 'http://wordpress.org',
+            version : '1'
+        };
+    },
+    getControlHTML : function(control_name) {
+        switch (control_name) {
+            case "wp_more":
+                return tinyMCE.getButtonHTML(control_name, 'lang_wordpress_more_button', '{$pluginurl}/images/more.gif', 'wpMore');
+            case "wp_page":
+                return tinyMCE.getButtonHTML(control_name, 'lang_wordpress_page_button', '{$pluginurl}/images/page.gif', 'wpPage');
+            case "wp_help":
+                var buttons = tinyMCE.getButtonHTML(control_name, 'lang_help_button_title', '{$pluginurl}/images/help.gif', 'wpHelp');
+                var hiddenControls = '<div class="zerosize">'
+                + '<input type="button" accesskey="n" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceSpellCheck\',false);" />'
+                + '<input type="button" accesskey="k" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Strikethrough\',false);" />'
+                + '<input type="button" accesskey="l" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'InsertUnorderedList\',false);" />'
+                + '<input type="button" accesskey="o" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'InsertOrderedList\',false);" />'
+                + '<input type="button" accesskey="w" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Outdent\',false);" />'
+                + '<input type="button" accesskey="q" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Indent\',false);" />'
+                + '<input type="button" accesskey="f" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'JustifyLeft\',false);" />'
+                + '<input type="button" accesskey="c" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'JustifyCenter\',false);" />'
+                + '<input type="button" accesskey="r" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'JustifyRight\',false);" />'
+                + '<input type="button" accesskey="j" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'JustifyFull\',false);" />'
+                + '<input type="button" accesskey="a" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceLink\',true);" />'
+                + '<input type="button" accesskey="s" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'unlink\',false);" />'
+                + '<input type="button" accesskey="m" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceImage\',true);" />'
+                + '<input type="button" accesskey="t" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'wpMore\');" />'
+                + '<input type="button" accesskey="g" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'wpPage\');" />'
+                + '<input type="button" accesskey="u" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Undo\',false);" />'
+                + '<input type="button" accesskey="y" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Redo\',false);" />'
+                + '<input type="button" accesskey="h" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'wpHelp\',false);" />'
+                + '<input type="button" accesskey="b" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Bold\',false);" />'
+                + '<input type="button" accesskey="v" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'wpAdv\',false);" />'
+                + '</div>';
+                return buttons+hiddenControls;
+            case "wp_adv":
+                return tinyMCE.getButtonHTML(control_name, 'lang_wordpress_adv_button', '{$pluginurl}/images/toolbars.gif', 'wpAdv');
+            case "wp_adv_start":
+                return '<div id="wpadvbar" style="display:none;"><br />';
+            case "wp_adv_end":
+                return '</div>';
+        }
+        return '';
+    },
+    execCommand : function(editor_id, element, command, user_interface, value) {
+        var inst = tinyMCE.getInstanceById(editor_id);
+        var focusElm = inst.getFocusElement();
+        var doc = inst.getDoc();
+        function getAttrib(elm, name) {
+            return elm.getAttribute(name) ? elm.getAttribute(name) : "";
+        }
+        // Handle commands
+        switch (command) {
+            case "wpMore":
+tinyMCE.importPluginLanguagePack('wordpress', '');
+function TinyMCE_wordpress_initInstance(inst) {
+    if (!tinyMCE.settings['wordpress_skip_plugin_css'])
+        tinyMCE.importCSS(inst.getDoc(), tinyMCE.baseURL + "/plugins/wordpress/wordpress.css");
+}
+function TinyMCE_wordpress_getControlHTML(control_name) {
+    switch (control_name) {
+        case "wordpress":
+            var titleMore = tinyMCE.getLang('lang_wordpress_more_button');
+            var titlePage = tinyMCE.getLang('lang_wordpress_page_button');
+            var titleHelp = tinyMCE.getLang('lang_wordpress_help_button');
+            var buttons = '<a href="javascript:tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mcewordpressmore\')" target="_self" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mcewordpressmore\');return false;"><img id="{$editor_id}_wordpress_more" src="{$pluginurl}/images/more.gif" title="'+titleMore+'" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>';
+            // Add this to the buttons var to put the Page button into the toolbar.
+            // '<a href="javascript:tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mcewordpresspage\')" target="_self" onclick="javascript:tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mcewordpresspage\');return false;"><img id="{$editor_id}_wordpress_page" src="{$pluginurl}/images/page.gif" title="'+titlePage+'" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>';
+            return buttons;
+    }
+    return '';
+}
+function TinyMCE_wordpress_parseAttributes(attribute_string) {
+    var attributeName = "";
+    var attributeValue = "";
+    var withInName;
+    var withInValue;
+    var attributes = new Array();
+    var whiteSpaceRegExp = new RegExp('^[ \n\r\t]+', 'g');
+    var titleText = tinyMCE.getLang('lang_wordpress_more');
+    var titleTextPage = tinyMCE.getLang('lang_wordpress_page');
+    if (attribute_string == null || attribute_string.length < 2)
+        return null;
+    withInName = withInValue = false;
+    for (var i=0; i<attribute_string.length; i++) {
+        var chr = attribute_string.charAt(i);
+        if ((chr == '"' || chr == "'") && !withInValue)
+            withInValue = true;
+        else if ((chr == '"' || chr == "'") && withInValue) {
+            withInValue = false;
+            var pos = attributeName.lastIndexOf(' ');
+            if (pos != -1)
+                attributeName = attributeName.substring(pos+1);
+            attributes[attributeName.toLowerCase()] = attributeValue.substring(1).toLowerCase();
+            attributeName = "";
+            attributeValue = "";
+        } else if (!whiteSpaceRegExp.test(chr) && !withInName && !withInValue)
+            withInName = true;
+        if (chr == '=' && withInName)
+            withInName = false;
+        if (withInName)
+            attributeName += chr;
+        if (withInValue)
+            attributeValue += chr;
+    }
+    return attributes;
+}
+function TinyMCE_wordpress_execCommand(editor_id, element, command, user_interface, value) {
+    var inst = tinyMCE.getInstanceById(editor_id);
+    var focusElm = inst.getFocusElement();
+    var doc = inst.getDoc();
+    function getAttrib(elm, name) {
+        return elm.getAttribute(name) ? elm.getAttribute(name) : "";
+    }
+    // Handle commands
+    switch (command) {
+            case "mcewordpressmore":
                 var flag = "";
                 var template = new Array();
 …
                 if (focusElm != null && focusElm.nodeName.toLowerCase() == "img") {
                     flag = getAttrib(focusElm, 'class');
                     if (flag != 'mce_plugin_wordpress_more') // Not a wordpress
                         return true;
                     action = "update";
+                }
                 html = ''
                     + '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" '
                     + ' width="100%" height="10px" '
                     + 'alt="'+altMore+'" title="'+altMore+'" class="mce_plugin_wordpress_more" name="mce_plugin_wordpress_more" />';
                 tinyMCE.execInstanceCommand(editor_id, 'mceInsertContent', false, html);
+                tinyMCE.execCommand("mceInsertContent",true,html);
                 tinyMCE.selectedInstance.repaint();
                 return true;
+            case "wpPage":
+            case "mcewordpresspage":
                 var flag = "";
                 var template = new Array();
                 var altPage = tinyMCE.getLang('lang_wordpress_more_alt');
                 // Is selection a image
                 if (focusElm != null && focusElm.nodeName.toLowerCase() == "img") {
                     flag = getAttrib(focusElm, 'name');
                     if (flag != 'mce_plugin_wordpress_page') // Not a wordpress
                         return true;
                     action = "update";
+                }
                 html = ''
                     + '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" '
 …
                 tinyMCE.selectedInstance.repaint();
                 return true;
+            case "wpHelp":
+                var template = new Array();
+                template['file']   = tinyMCE.baseURL + '/wp-mce-help.php';
+                template['width']  = 480;
+                template['height'] = 380;
+                args = {
+                    resizable : 'yes',
+                    scrollbars : 'yes'
+                };
+                tinyMCE.openWindow(template, args);
+                return true;
+            case "wpAdv":
+                var adv = document.getElementById('wpadvbar');
+                if ( adv.style.display == 'none' ) {
+                    adv.style.display = 'block';
+                    tinyMCE.switchClass(editor_id + '_wp_adv', 'mceButtonSelected');
+                } else {
+                    adv.style.display = 'none';
+                    tinyMCE.switchClass(editor_id + '_wp_adv', 'mceButtonNormal');
+                }
+                return true;
+        }
+        // Pass to next handler in chain
+        return false;
+    },
+    cleanup : function(type, content) {
+        switch (type) {
+            case "insert_to_editor":
+                var startPos = 0;
+                var altMore = tinyMCE.getLang('lang_wordpress_more_alt');
+                var altPage = tinyMCE.getLang('lang_wordpress_page_alt');
+                // Parse all <!--more--> tags and replace them with images
+                while ((startPos = content.indexOf('<!--more', startPos)) != -1) {
+                    var endPos = content.indexOf('-->', startPos) + 3;
+                    // Insert image
+                    var moreText = content.substring(startPos + 8, endPos - 3);
+                    var contentAfter = content.substring(endPos);
+                    content = content.substring(0, startPos);
+                    content += '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" ';
+                    content += ' width="100%" height="10px" moretext="'+moreText+'" ';
+                    content += 'alt="'+altMore+'" title="'+altMore+'" class="mce_plugin_wordpress_more" name="mce_plugin_wordpress_more" />';
+                    content += contentAfter;
+                    startPos++;
+                }
+                var startPos = 0;
+                // Parse all <!--page--> tags and replace them with images
+                while ((startPos = content.indexOf('<!--nextpage-->', startPos)) != -1) {
+                    // Insert image
+                    var contentAfter = content.substring(startPos + 15);
+                    content = content.substring(0, startPos);
+                    content += '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" ';
+                    content += ' width="100%" height="10px" ';
+                    content += 'alt="'+altPage+'" title="'+altPage+'" class="mce_plugin_wordpress_page" name="mce_plugin_wordpress_page" />';
+                    content += contentAfter;
+                    startPos++;
+                }
+                // Look for \n in <pre>, replace with <br>
+                var startPos = -1;
+                while ((startPos = content.indexOf('<pre', startPos+1)) != -1) {
+                    var endPos = content.indexOf('</pre>', startPos+1);
+                    var innerPos = content.indexOf('>', startPos+1);
+                    var chunkBefore = content.substring(0, innerPos);
+                    var chunkAfter = content.substring(endPos);
+                    var innards = content.substring(innerPos, endPos);
+                    innards = innards.replace(/\n/g, '<br />');
+                    content = chunkBefore + innards + chunkAfter;
+                }
+                break;
+            case "get_from_editor":
+                // Parse all img tags and replace them with <!--more-->
+                var startPos = -1;
+                while ((startPos = content.indexOf('<img', startPos+1)) != -1) {
+                    var endPos = content.indexOf('/>', startPos);
+                    var attribs = this._parseAttributes(content.substring(startPos + 4, endPos));
+                    if (attribs['class'] == "mce_plugin_wordpress_more" || attribs['name'] == "mce_plugin_wordpress_more") {
+                        endPos += 2;
+                        var moreText = attribs['moretext'] ? attribs['moretext'] : '';
+                        var embedHTML = '<!--more'+moreText+'-->';
+                        // Insert embed/object chunk
+                        chunkBefore = content.substring(0, startPos);
+                        chunkAfter = content.substring(endPos);
+                        content = chunkBefore + embedHTML + chunkAfter;
+                    }
+                    if (attribs['class'] == "mce_plugin_wordpress_page" || attribs['name'] == "mce_plugin_wordpress_page") {
+                        endPos += 2;
+                        var embedHTML = '<!--nextpage-->';
+                        // Insert embed/object chunk
+                        chunkBefore = content.substring(0, startPos);
+                        chunkAfter = content.substring(endPos);
+                        content = chunkBefore + embedHTML + chunkAfter;
+                    }
+                }
+                // Remove normal line breaks
+                content = content.replace(/\n|\r/g, ' ');
+                // Look for <br> in <pre>, replace with \n
+                var startPos = -1;
+                while ((startPos = content.indexOf('<pre', startPos+1)) != -1) {
+                    var endPos = content.indexOf('</pre>', startPos+1);
+                    var innerPos = content.indexOf('>', startPos+1);
+                    var chunkBefore = content.substring(0, innerPos);
+                    var chunkAfter = content.substring(endPos);
+                    var innards = content.substring(innerPos, endPos);
+                    innards = innards.replace(new RegExp('<br\\s?/?>', 'g'), '\n');
+                    innards = innards.replace(new RegExp('\\s$', ''), '');
+                    content = chunkBefore + innards + chunkAfter;
+                }
+                // Remove anonymous, empty paragraphs.
+                content = content.replace(new RegExp('<p>(\\s|&nbsp;)*</p>', 'mg'), '');
+                // Handle table badness.
+                content = content.replace(new RegExp('<(table( [^>]*)?)>.*?<((tr|thead)( [^>]*)?)>', 'mg'), '<$1><$3>');
+                content = content.replace(new RegExp('<(tr|thead|tfoot)>.*?<((td|th)( [^>]*)?)>', 'mg'), '<$1><$2>');
+                content = content.replace(new RegExp('</(td|th)>.*?<(td( [^>]*)?|th( [^>]*)?|/tr|/thead|/tfoot)>', 'mg'), '</$1><$2>');
+                content = content.replace(new RegExp('</tr>.*?<(tr|/table)>', 'mg'), '</tr><$1>');
+                content = content.replace(new RegExp('<(/?(table|tbody|tr|th|td)[^>]*)>(\\s*|(<br ?/?>)*)*', 'g'), '<$1>');
+                // Pretty it up for the source editor.
+                var blocklist = 'blockquote|ul|ol|li|table|thead|tr|th|td|div|h\\d|pre|p';
+                content = content.replace(new RegExp('\\s*</('+blocklist+')>\\s*', 'mg'), '</$1>\n');
+                content = content.replace(new RegExp('\\s*<(('+blocklist+')[^>]*)>', 'mg'), '\n<$1>');
+                content = content.replace(new RegExp('<((li|/?tr|/?thead|/?tfoot)( [^>]*)?)>', 'g'), '\t<$1>');
+                content = content.replace(new RegExp('<((td|th)( [^>]*)?)>', 'g'), '\t\t<$1>');
+                content = content.replace(new RegExp('\\s*<br ?/?>\\s*', 'mg'), '<br />\n');
+                content = content.replace(new RegExp('^\\s*', ''), '');
+                content = content.replace(new RegExp('\\s*$', ''), '');
+                break;
+        }
+        // Pass through to next handler in chain
+        return content;
+    },
+    handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+        tinyMCE.switchClass(editor_id + '_wp_more', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_wp_page', 'mceButtonNormal');
+        if (node == null)
+            return;
+        do {
+            if (node.nodeName.toLowerCase() == "img" && tinyMCE.getAttrib(node, 'class').indexOf('mce_plugin_wordpress_more') == 0)
+                tinyMCE.switchClass(editor_id + '_wp_more', 'mceButtonSelected');
+            if (node.nodeName.toLowerCase() == "img" && tinyMCE.getAttrib(node, 'class').indexOf('mce_plugin_wordpress_page') == 0)
+                tinyMCE.switchClass(editor_id + '_wp_page', 'mceButtonSelected');
+        } while ((node = node.parentNode));
+        return true;
+    },
+    saveCallback : function(el, content, body) {
+        // We have a TON of cleanup to do.
+        // Mark </p> if it has any attributes.
+        content = content.replace(new RegExp('(<p[^>]+>.*?)</p>', 'mg'), '$1</p#>');
+        // Decode the ampersands of time.
+        // content = content.replace(new RegExp('&amp;', 'g'), '&');
+        // Get it ready for wpautop.
+        content = content.replace(new RegExp('\\s*<p>', 'mgi'), '');
+        content = content.replace(new RegExp('\\s*</p>\\s*', 'mgi'), '\n\n');
+        content = content.replace(new RegExp('\\n\\s*\\n', 'mgi'), '\n\n');
+        content = content.replace(new RegExp('\\s*<br ?/?>\\s*', 'gi'), '\n');
+        // Fix some block element newline issues
+        var blocklist = 'blockquote|ul|ol|li|table|thead|tr|th|td|div|h\\d|pre';
+        content = content.replace(new RegExp('\\s*<(('+blocklist+') ?[^>]*)\\s*>', 'mg'), '\n<$1>');
+        content = content.replace(new RegExp('\\s*</('+blocklist+')>\\s*', 'mg'), '</$1>\n');
+        content = content.replace(new RegExp('<li>', 'g'), '\t<li>');
+        // Unmark special paragraph closing tags
+        content = content.replace(new RegExp('</p#>', 'g'), '</p>\n');
+        content = content.replace(new RegExp('\\s*(<p[^>]+>.*</p>)', 'mg'), '\n$1');
+        // Trim trailing whitespace
+        content = content.replace(new RegExp('\\s*$', ''), '');
+        // Hope.
+        return content;
+    },
+    _parseAttributes : function(attribute_string) {
+        var attributeName = "";
+        var attributeValue = "";
+        var withInName;
+        var withInValue;
+        var attributes = new Array();
+        var whiteSpaceRegExp = new RegExp('^[ \n\r\t]+', 'g');
+        var titleText = tinyMCE.getLang('lang_wordpress_more');
+        var titleTextPage = tinyMCE.getLang('lang_wordpress_page');
+        if (attribute_string == null || attribute_string.length < 2)
+            return null;
+        withInName = withInValue = false;
+        for (var i=0; i<attribute_string.length; i++) {
+            var chr = attribute_string.charAt(i);
+            if ((chr == '"' || chr == "'") && !withInValue)
+                withInValue = true;
+            else if ((chr == '"' || chr == "'") && withInValue) {
+                withInValue = false;
+                var pos = attributeName.lastIndexOf(' ');
+                if (pos != -1)
+                    attributeName = attributeName.substring(pos+1);
+                attributes[attributeName.toLowerCase()] = attributeValue.substring(1);
+                attributeName = "";
+                attributeValue = "";
+            } else if (!whiteSpaceRegExp.test(chr) && !withInName && !withInValue)
+                withInName = true;
+            if (chr == '=' && withInName)
+                withInName = false;
+            if (withInName)
+                attributeName += chr;
+            if (withInValue)
+                attributeValue += chr;
+        }
+        return attributes;
+    }
+};
+tinyMCE.addPlugin("wordpress", TinyMCE_wordpressPlugin);
+/* This little hack protects our More and Page placeholders from the removeformat command */
+tinyMCE.orgExecCommand = tinyMCE.execCommand;
+tinyMCE.execCommand = function (command, user_interface, value) {
+    re = this.orgExecCommand(command, user_interface, value);
+    if ( command == 'removeformat' ) {
+        var inst = tinyMCE.getInstanceById('mce_editor_0');
+        doc = inst.getDoc();
+        var imgs = doc.getElementsByTagName('img');
+        for (i=0;img=imgs[i];i++)
+            img.className = img.name;
+    }
+    return re;
+};
+wpInstTriggerSave = function (skip_cleanup, skip_callback) {
+    var e, nl = new Array(), i, s;
+    this.switchSettings();
+    s = tinyMCE.settings;
+    // Force hidden tabs visible while serializing
+    if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+        e = this.iframeElement;
+        do {
+            if (e.style && e.style.display == 'none') {
+                e.style.display = 'block';
+                nl[nl.length] = {elm : e, type : 'style'};
+    }
+    // Pass to next handler in chain
+    return false;
+}
+function TinyMCE_wordpress_cleanup(type, content) {
+    switch (type) {
+        case "insert_to_editor":
+            var startPos = 0;
+            var altMore = tinyMCE.getLang('lang_wordpress_more_alt');
+            var altPage = tinyMCE.getLang('lang_wordpress_page_alt');
+            // Parse all <!--more--> tags and replace them with images
+            while ((startPos = content.indexOf('<!--more-->', startPos)) != -1) {
+                // Insert image
+                var contentAfter = content.substring(startPos + 11);
+                content = content.substring(0, startPos);
+                content += '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" ';
+                content += ' width="100%" height="10px" ';
+                content += 'alt="'+altMore+'" title="'+altMore+'" class="mce_plugin_wordpress_more" />';
+                content += contentAfter;
+                startPos++;
+            }
+            if (e.style && s.hidden_tab_class.length > 0 && e.className.indexOf(s.hidden_tab_class) != -1) {
+                e.className = s.display_tab_class;
+                nl[nl.length] = {elm : e, type : 'class'};
+            var startPos = 0;
+            // Parse all <!--page--> tags and replace them with images
+            while ((startPos = content.indexOf('<!--nextpage-->', startPos)) != -1) {
+                // Insert image
+                var contentAfter = content.substring(startPos + 15);
+                content = content.substring(0, startPos);
+                content += '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" ';
+                content += ' width="100%" height="10px" ';
+                content += 'alt="'+altPage+'" title="'+altPage+'" class="mce_plugin_wordpress_page" />';
+                content += contentAfter;
+                startPos++;
+            }
+        } while ((e = e.parentNode) != null)
+    }
+    tinyMCE.settings['preformatted'] = false;
+    // Default to false
+    if (typeof(skip_cleanup) == "undefined")
+        skip_cleanup = false;
+    // Default to false
+    if (typeof(skip_callback) == "undefined")
+        skip_callback = false;
+//  tinyMCE._setHTML(this.getDoc(), this.getBody().innerHTML);
+    // Remove visual aids when cleanup is disabled
+    if (this.settings['cleanup'] == false) {
+        tinyMCE.handleVisualAid(this.getBody(), true, false, this);
+        tinyMCE._setEventsEnabled(this.getBody(), true);
+    }
+    tinyMCE._customCleanup(this, "submit_content_dom", this.contentWindow.document.body);
+    tinyMCE.selectedInstance.getWin().oldfocus=tinyMCE.selectedInstance.getWin().focus;
+    tinyMCE.selectedInstance.getWin().focus=function() {};
+    var htm = tinyMCE._cleanupHTML(this, this.getDoc(), this.settings, this.getBody(), tinyMCE.visualAid, true, true);
+    tinyMCE.selectedInstance.getWin().focus=tinyMCE.selectedInstance.getWin().oldfocus;
+    htm = tinyMCE._customCleanup(this, "submit_content", htm);
+    if (!skip_callback && tinyMCE.settings['save_callback'] != "")
+        var content = eval(tinyMCE.settings['save_callback'] + "(this.formTargetElementId,htm,this.getBody());");
+    // Use callback content if available
+    if ((typeof(content) != "undefined") && content != null)
+        htm = content;
+    // Replace some weird entities (Bug: #1056343)
+    htm = tinyMCE.regexpReplace(htm, "&#40;", "(", "gi");
+    htm = tinyMCE.regexpReplace(htm, "&#41;", ")", "gi");
+    htm = tinyMCE.regexpReplace(htm, "&#59;", ";", "gi");
+    htm = tinyMCE.regexpReplace(htm, "&#34;", "&quot;", "gi");
+    htm = tinyMCE.regexpReplace(htm, "&#94;", "^", "gi");
+    if (this.formElement)
+        this.formElement.value = htm;
+    if (tinyMCE.isSafari && this.formElement)
+        this.formElement.innerText = htm;
+    // Hide them again (tabs in MSIE)
+    for (i=0; i<nl.length; i++) {
+        if (nl[i].type == 'style')
+            nl[i].elm.style.display = 'none';
+        else
+            nl[i].elm.className = s.hidden_tab_class;
+    }
+}
+tinyMCE.wpTriggerSave = function () {
+    var inst, n;
+    for (n in tinyMCE.instances) {
+        inst = tinyMCE.instances[n];
+        if (!tinyMCE.isInstance(inst))
+            continue;
+        inst.wpTriggerSave = wpInstTriggerSave;
+        inst.wpTriggerSave(false, false);
+    }
+}
+function switchEditors(id) {
+    var inst = tinyMCE.getInstanceById(id);
+    var qt = document.getElementById('quicktags');
+    var H = document.getElementById('edButtonHTML');
+    var P = document.getElementById('edButtonPreview');
+    var ta = document.getElementById(id);
+    var pdr = ta.parentNode;
+    if ( inst ) {
+        edToggle(H, P);
+        if ( tinyMCE.isMSIE && !tinyMCE.isOpera ) {
+            // IE rejects the later overflow assignment so we skip this step.
+            // Alternate code might be nice. Until then, IE reflows.
+        } else {
+            // Lock the fieldset's height to prevent reflow/flicker
+            pdr.style.height = pdr.clientHeight + 'px';
+            pdr.style.overflow = 'hidden';
+        }
+        // Save the coords of the bottom right corner of the rich editor
+        var table = document.getElementById(inst.editorId + '_parent').getElementsByTagName('table')[0];
+        var y1 = table.offsetTop + table.offsetHeight;
+        if ( TinyMCE_AdvancedTheme._getCookie("TinyMCE_" + inst.editorId + "_height") == null ) {
+            var expires = new Date();
+            expires.setTime(expires.getTime() + 3600000 * 24 * 30);
+            var offset = tinyMCE.isMSIE ? 1 : 2;
+            TinyMCE_AdvancedTheme._setCookie("TinyMCE_" + inst.editorId + "_height", "" + (table.offsetHeight - offset), expires);
+        }
+        // Unload the rich editor
+        inst.triggerSave(false, false);
+        htm = inst.formElement.value;
+        tinyMCE.removeMCEControl(id);
+        document.getElementById(id).value = htm;
+        --tinyMCE.idCounter;
+        // Reveal Quicktags and textarea
+        qt.style.display = 'block';
+        ta.style.display = 'inline';
+        // Set the textarea height to match the rich editor
+        y2 = ta.offsetTop + ta.offsetHeight;
+        ta.style.height = (ta.clientHeight + y1 - y2) + 'px';
+        // Tweak the widths
+        ta.parentNode.style.paddingRight = '2px';
+        if ( tinyMCE.isMSIE && !tinyMCE.isOpera ) {
+        } else {
+            // Unlock the fieldset's height
+            pdr.style.height = 'auto';
+            pdr.style.overflow = 'display';
+        }
+    } else {
+        edToggle(P, H);
+        edCloseAllTags(); // :-(
+        if ( tinyMCE.isMSIE && !tinyMCE.isOpera ) {
+        } else {
+            // Lock the fieldset's height
+            pdr.style.height = pdr.clientHeight + 'px';
+            pdr.style.overflow = 'hidden';
+        }
+        // Hide Quicktags and textarea
+        qt.style.display = 'none';
+        ta.style.display = 'none';
+        // Tweak the widths
+        ta.parentNode.style.paddingRight = '0px';
+        // Load the rich editor with formatted html
+        if ( tinyMCE.isMSIE ) {
+            ta.value = wpautop(ta.value);
+            tinyMCE.addMCEControl(ta, id);
+        } else {
+            htm = wpautop(ta.value);
+            tinyMCE.addMCEControl(ta, id);
+            tinyMCE.getInstanceById(id).execCommand('mceSetContent', null, htm);
+        }
+        if ( tinyMCE.isMSIE && !tinyMCE.isOpera ) {
+        } else {
+            // Unlock the fieldset's height
+            pdr.style.height = 'auto';
+            pdr.style.overflow = 'display';
+        }
+    }
+}
+function edToggle(A, B) {
+    A.className = 'edButtonFore';
+    B.className = 'edButtonBack';
+    B.onclick = A.onclick;
+    A.onclick = null;
+}
+function wpautop(pee) {
+    pee = pee + "\n\n";
+    pee = pee.replace(new RegExp('<br />\\s*<br />', 'gi'), "\n\n");
+    pee = pee.replace(new RegExp('(<(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)', 'gi'), "\n$1");
+    pee = pee.replace(new RegExp('(</(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])>)', 'gi'), "$1\n\n");
+    pee = pee.replace(new RegExp("\\r\\n|\\r", 'g'), "\n");
+    pee = pee.replace(new RegExp("\\n\\s*\\n+", 'g'), "\n\n");
+    pee = pee.replace(new RegExp('\n*([^\Z]+?)\\n{2}', 'mg'), "<p>$1</p>\n");
+    pee = pee.replace(new RegExp('<p>\\s*?</p>', 'gi'), '');
+    pee = pee.replace(new RegExp('<p>\\s*(</?(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)\\s*</p>', 'gi'), "$1");
+    pee = pee.replace(new RegExp("<p>(<li.+?)</p>", 'gi'), "$1");
+    pee = pee.replace(new RegExp('<p><blockquote([^>]*)>', 'gi'), "<blockquote$1><p>");
+    pee = pee.replace(new RegExp('</blockquote></p>', 'gi'), '</p></blockquote>');
+    pee = pee.replace(new RegExp('<p>\\s*(</?(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)', 'gi'), "$1");
+    pee = pee.replace(new RegExp('(</?(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)\\s*</p>', 'gi'), "$1");
+    pee = pee.replace(new RegExp('\\s*\\n', 'gi'), "<br />\n");
+    pee = pee.replace(new RegExp('(</?(?:table|thead|tfoot|caption|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)\\s*<br />', 'gi'), "$1");
+    pee = pee.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1');
+    pee = pee.replace(new RegExp('^((?:&nbsp;)*)\\s', 'mg'), '$1&nbsp;');
+    //pee = pee.replace(new RegExp('(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  stripslashes(clean_pre('$2'))  . '</pre>' "); // Hmm...
+    return pee;
+}
+            // It's supposed to be WYSIWYG, right?
+            content = content.replace(new RegExp('&', 'g'), '&amp;');
+            break;
+        case "get_from_editor":
+            // Parse all img tags and replace them with <!--more-->
+            var startPos = -1;
+            while ((startPos = content.indexOf('<img', startPos+1)) != -1) {
+                var endPos = content.indexOf('/>', startPos);
+                var attribs = TinyMCE_wordpress_parseAttributes(content.substring(startPos + 4, endPos));
+                if (attribs['class'] == "mce_plugin_wordpress_more") {
+                    endPos += 2;
+                    var embedHTML = '<!--more-->';
+                    // Insert embed/object chunk
+                    chunkBefore = content.substring(0, startPos);
+                    chunkAfter = content.substring(endPos);
+                    content = chunkBefore + embedHTML + chunkAfter;
+                }
+                if (attribs['class'] == "mce_plugin_wordpress_page") {
+                    endPos += 2;
+                    var embedHTML = '<!--nextpage-->';
+                    // Insert embed/object chunk
+                    chunkBefore = content.substring(0, startPos);
+                    chunkAfter = content.substring(endPos);
+                    content = chunkBefore + embedHTML + chunkAfter;
+                }
+            }
+            // If it says & in the WYSIWYG editor, it should say &amp; in the html.
+            content = content.replace(new RegExp('&', 'g'), '&amp;');
+            content = content.replace(new RegExp('&amp;nbsp;', 'g'), '&nbsp;');
+            // Remove anonymous, empty paragraphs.
+            content = content.replace(new RegExp('<p>(\\s|&nbsp;)*</p>', 'mg'), '');
+            // Handle table badness.
+            content = content.replace(new RegExp('<(table( [^>]*)?)>.*?<((tr|thead)( [^>]*)?)>', 'mg'), '<$1><$3>');
+            content = content.replace(new RegExp('<(tr|thead|tfoot)>.*?<((td|th)( [^>]*)?)>', 'mg'), '<$1><$2>');
+            content = content.replace(new RegExp('</(td|th)>.*?<(td( [^>]*)?|th( [^>]*)?|/tr|/thead|/tfoot)>', 'mg'), '</$1><$2>');
+            content = content.replace(new RegExp('</tr>.*?<(tr|/table)>', 'mg'), '</tr><$1>');
+            content = content.replace(new RegExp('<(/?(table|tbody|tr|th|td)[^>]*)>(\\s*|(<br ?/?>)*)*', 'g'), '<$1>');
+            // Pretty it up for the source editor.
+            var blocklist = 'blockquote|ul|ol|li|table|thead|tr|th|td|div|h\\d|pre|p';
+            content = content.replace(new RegExp('\\s*</('+blocklist+')>\\s*', 'mg'), '</$1>\n');
+            content = content.replace(new RegExp('\\s*<(('+blocklist+')[^>]*)>\\s*', 'mg'), '\n<$1>');
+            content = content.replace(new RegExp('<((li|/?tr|/?thead|/?tfoot)( [^>]*)?)>', 'g'), '\t<$1>');
+            content = content.replace(new RegExp('<((td|th)( [^>]*)?)>', 'g'), '\t\t<$1>');
+            content = content.replace(new RegExp('\\s*<br ?/?>\\s*', 'mg'), '<br />\n');
+            content = content.replace(new RegExp('^\\s*', ''), '');
+            content = content.replace(new RegExp('\\s*$', ''), '');
+            break;
+    }
+    // Pass through to next handler in chain
+    return content;
+}
+function TinyMCE_wordpress_handleNodeChange(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+    function getAttrib(elm, name) {
+        return elm.getAttribute(name) ? elm.getAttribute(name) : "";
+    }
+    tinyMCE.switchClassSticky(editor_id + '_wordpress_more', 'mceButtonNormal');
+    tinyMCE.switchClassSticky(editor_id + '_wordpress_page', 'mceButtonNormal');
+    if (node == null)
+        return;
+    do {
+        if (node.nodeName.toLowerCase() == "img" && getAttrib(node, 'class').indexOf('mce_plugin_wordpress_more') == 0)
+            tinyMCE.switchClassSticky(editor_id + '_wordpress_more', 'mceButtonSelected');
+        if (node.nodeName.toLowerCase() == "img" && getAttrib(node, 'class').indexOf('mce_plugin_wordpress_page') == 0)
+            tinyMCE.switchClassSticky(editor_id + '_wordpress_page', 'mceButtonSelected');
+    } while ((node = node.parentNode));
+    return true;
+}
+function wp_save_callback(el, content, body) {
+    // We have a TON of cleanup to do.
+    // Mark </p> if it has any attributes.
+    content = content.replace(new RegExp('(<p[^>]+>.*?)</p>', 'mg'), '$1</p#>');
+    // Decode the ampersands of time.
+    content = content.replace(new RegExp('&amp;', 'g'), '&');
+    // Get it ready for wpautop.
+    content = content.replace(new RegExp('[\\s]*<p>[\\s]*', 'mgi'), '');
+    content = content.replace(new RegExp('[\\s]*</p>[\\s]*', 'mgi'), '\n\n');
+    content = content.replace(new RegExp('\\n\\s*\\n\\s*\\n*', 'mgi'), '\n\n');
+    content = content.replace(new RegExp('\\s*<br ?/?>\\s*', 'gi'), '\n');
+    // Fix some block element newline issues
+    var blocklist = 'blockquote|ul|ol|li|table|thead|tr|th|td|div|h\\d|pre';
+    content = content.replace(new RegExp('\\s*<(('+blocklist+') ?[^>]*)\\s*>', 'mg'), '\n<$1>');
+    content = content.replace(new RegExp('\\s*</('+blocklist+')>\\s*', 'mg'), '</$1>\n');
+    content = content.replace(new RegExp('<li>', 'g'), '\t<li>');
+    // Unmark special paragraph closing tags
+    content = content.replace(new RegExp('</p#>', 'g'), '</p>\n');
+    content = content.replace(new RegExp('\\s*(<p[^>]+>.*</p>)', 'mg'), '\n$1');
+    // Trim any whitespace
+    content = content.replace(new RegExp('^\\s*', ''), '');
+    content = content.replace(new RegExp('\\s*$', ''), '');
+    // Hope.
+    return content;
+}

trunk/wp-includes/js/tinymce/plugins/wordpress/langs/en.js

-                      r4431
+                      r3503
 // EN lang variables
-if (navigator.userAgent.indexOf('Mac OS') != -1) {
-// Mac OS browsers use Ctrl to hit accesskeys
-    var metaKey = 'Ctrl';
+}
-else {
-    var metaKey = 'Alt';
+}
 tinyMCE.addToLang('',{
 wordpress_more_button : 'Split post with More tag (' + metaKey + '+t)',
+wordpress_more_button : 'Split post with More tag (Alt-t)',
 wordpress_page_button : 'Split post with Page tag',
-wordpress_adv_button : 'Show/Hide Advanced Toolbar (' + metaKey + '+b)',
 wordpress_more_alt : 'More...',
+wordpress_page_alt : '...page...',
+help_button_title : 'Help (' + metaKey + '+h)',
+bold_desc : 'Bold (Ctrl+B)',
+italic_desc : 'Italic (Ctrl+I)',
+underline_desc : 'Underline (Ctrl+U)',
+link_desc : 'Insert/edit link (' + metaKey + '+a)',
+unlink_desc : 'Unlink (' + metaKey + '+s)',
+image_desc : 'Insert/edit image (' + metaKey + '+m)',
+striketrough_desc : 'Strikethrough (' + metaKey + '+k)',
+justifyleft_desc : 'Align left (' + metaKey + '+f)',
+justifycenter_desc : 'Align center (' + metaKey + '+c)',
+justifyright_desc : 'Align right (' + metaKey + '+r)',
+justifyfull_desc : 'Align full (' + metaKey + '+j)',
+bullist_desc : 'Unordered list (' + metaKey + '+l)',
+numlist_desc : 'Ordered list (' + metaKey + '+o)',
+outdent_desc : 'Outdent (' + metaKey + '+w)',
+indent_desc : 'Indent List/Blockquote (' + metaKey + '+q)'
+wordpress_page_alt : '...page...'
 });

trunk/wp-includes/js/tinymce/plugins/wordpress/wordpress.css

-                      r4431
+                      r3503
     background-position: right top;
+}
-/* This file contains the CSS data for the editable area(iframe) of TinyMCE */
-/* You can extend this CSS by adding your own CSS file with the the content_css option */
-body {
-    background: #fff;
-    font: 1em/1.3em Georgia, "Times New Roman", Times, serif;
-    padding: .5em;
+}
-td {
-    font-size: 10px;
+}
-pre {
-    font-family: "Courier New", fixed;
-    font-size: 11px;
-    line-height: 13px;
+}
-.mceVisualAid {
-    border: 1px dashed #BBBBBB !important;
+}
-.mceItemAnchor {
-    width: 12px;
-    line-height: 6px;
-    overflow: hidden;
-    padding-left: 12px;
-    background-image: url('../images/anchor_symbol.gif');
-    background-position: bottom;
-    background-repeat: no-repeat;
+}
-/* Important is needed in Gecko browsers inorder to style links */
-/*
-a {
-    color: green !important;
+}
-*/
-/* Style selection range colors in Gecko browsers */
-/*
-::-moz-selection {
-    background-color: red;
-    color: green;
+}
-*/
-/* MSIE specific */
-* html body {
-    scrollbar-3dlight-color: #F0F0EE;
-    scrollbar-arrow-color: #676662;
-    scrollbar-base-color: #F0F0EE;
-    scrollbar-darkshadow-color: #DDDDDD;
-    scrollbar-face-color: #E0E0DD;
-    scrollbar-highlight-color: #F0F0EE;
-    scrollbar-shadow-color: #F0F0EE;
-    scrollbar-track-color: #F5F5F5;
+}

trunk/wp-includes/js/tinymce/themes/advanced/about.htm

-                      r4431
+                      r3503
     <script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
     <script language="javascript" type="text/javascript" src="jscripts/about.js"></script>
     <base target="_self" />
+    <link href="css/dialog_about.css" rel="stylesheet" type="text/css" />
 </head>
 <body id="about" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
 …
                 <p>TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under <a href="../../license.txt" target="_blank">LGPL</a>
                 by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.</p>
                 <p>Copyright &copy; 2003-2006, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>
+                <p>Copyright &copy; 2005, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>
                 <p>For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.</p>

trunk/wp-includes/js/tinymce/themes/advanced/anchor.htm

r4431	r3503
4	4	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
5	5	<script language="javascript" type="text/javascript" src="jscripts/anchor.js"></script>
6		~~<base target="_self" />~~
7	6	</head>
8	7	<body onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">

trunk/wp-includes/js/tinymce/themes/advanced/charmap.htm

-                      r4431
+                      r3503
     <script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
     <script language="javascript" type="text/javascript" src="jscripts/charmap.js"></script>
-    <base target="_self" />
 </head>
 <body onload="tinyMCEPopup.executeOnLoad('init();');document.body.style.display='';document.getElementById('insert').focus();" style="display: none">
+<body onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
 <table align="center" border="0" cellspacing="0" cellpadding="2">
     <tr>

trunk/wp-includes/js/tinymce/themes/advanced/color_picker.htm

-                      r4431
+                      r3503
     <script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
     <script language="javascript" type="text/javascript" src="jscripts/color_picker.js"></script>
-    <base target="_self" />
 </head>
 <body onload="tinyMCEPopup.executeOnLoad('init();');document.body.style.display='';document.getElementById('insert').focus();" style="margin: 3px; display: none">
+<body onload="tinyMCEPopup.executeOnLoad('init();');" marginheight="3" topmargin="3" leftmargin="3" marginwidth="3" style="display: none">
     <div align="center">
        <script language="javascript" type="text/javascript">renderColorMap();</script>

trunk/wp-includes/js/tinymce/themes/advanced/css/editor_content.css

-                      r4431
+                      r3503
 /* You can extend this CSS by adding your own CSS file with the the content_css option */
+body, td, pre {
+body {
+    background-color: #FFFFFF;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 0.9em;
+    line-height: 1.2em;
+    padding: .3em;
+}
+td {
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 10px;
+}
+body {
+    background-color: #FFFFFF;
+pre {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 10px;
+}
 …
+}
 */
-/* MSIE specific */
-* html body {
-    scrollbar-3dlight-color: #F0F0EE;
-    scrollbar-arrow-color: #676662;
-    scrollbar-base-color: #F0F0EE;
-    scrollbar-darkshadow-color: #DDDDDD;
-    scrollbar-face-color: #E0E0DD;
-    scrollbar-highlight-color: #F0F0EE;
-    scrollbar-shadow-color: #F0F0EE;
-    scrollbar-track-color: #F5F5F5;
+}

trunk/wp-includes/js/tinymce/themes/advanced/css/editor_popup.css

-                      r4431
+                      r3503
 .input_noborder {
     border: 0;
+}
 #insert, .updateButton {
+    border: 0px solid #808080;
+}
+#insert {
    font-weight: bold;
    width: 90px;
    height: 21px;
    border: 0;
+   border: 0px;
    background-image: url('../images/insert_button_bg.gif');
    cursor: pointer;
 …
    width: 90px;
    height: 21px;
    border: 0;
+   border: 0px;
    background-image: url('../images/cancel_button_bg.gif');
    cursor: pointer;
 …
 td.charmapOver {
     background-color: #CCCCCC;
     cursor: default;
+    cursor: arrow;
+}
 …
     border-right: 1px solid;
     border-color: #F0F0EE;
     cursor: default;
+    cursor: arrow;
+}
 .mceButtonOver {
     border: 1px solid #0A246A;
     cursor: default;
+    cursor: arrow;
     background-color: #B6BDD2;
+}
 .mceButtonDown {
     cursor: default;
+    cursor: arrow;
     border: 1px solid #0A246A;
     background-color: #8592B5;
 …
     border-right: 1px solid;
     border-color: #F0F0EE;
     cursor: default;
+    cursor: arrow;
+}
 …
 .tabs ul {
     margin: 0;
     padding: 0 0 0;
+    padding: 0px 0px 0;
     list-style: none;
+}
 …
     background: url("../images/xp/tab_bg.gif") no-repeat left top;
     margin: 0;
     margin-left: 0;
+    margin-left: 0px;
     margin-right: 2px;
     padding: 0 0 0 10px;
 …
     display: block;
     background: url("../images/xp/tab_end.gif") no-repeat right top;
     padding: 0px 10px 0 0;
+    padding: 0px 10px 0px 0px;
+}
 …
     font-family: Verdana, Arial;
     font-size: 10px;
     padding: 0;
     margin: 0;
+    padding: 0px;
+    margin: 0px;
     padding: 4px;
+}
 …
 h1, h2, h3, h4 {
     color: #2B6FB6;
     margin: 0;
     padding: 0;
+    margin: 0px;
+    padding: 0px;
     padding-top: 5px;
+}
 …
 h3 {
     font-size: 14px;
+}
-#link .panel_wrapper, #link div.current {
-    height: 125px;
+}
-#image .panel_wrapper, #image div.current {
-    height: 190px;
+}
 …
+}
 */
-/* Below this line is WordPress customizations */
-#insert, #cancel, .submitbutton {
-    font: 11px Verdana, Arial, Helvetica, sans-serif;
-    height: auto;
-    width: auto;
-    background-color: transparent;
-    background-image: url(../../../../../../wp-admin/images/fade-butt.png);
-    background-repeat: repeat;
-    border: 3px double;
-    border-right-color: rgb(153, 153, 153);
-    border-bottom-color: rgb(153, 153, 153);
-    border-left-color: rgb(204, 204, 204);
-    border-top-color: rgb(204, 204, 204);
-    color: rgb(51, 51, 51);
-    padding: 0.1em 0.5em;
+}
-#insert:active, #cancel:active, .submitbutton:active {
-    background: #f4f4f4;
-    border-left-color: #999;
-    border-top-color: #999;
+}
-#styleSelectRow {
-    display: none;
+}

trunk/wp-includes/js/tinymce/themes/advanced/css/editor_ui.css

-                      r4431
+                      r3503
 .mceToolbarTop a, .mceToolbarTop a:visited, .mceToolbarTop a:hover, .mceToolbarBottom a, .mceToolbarBottom a:visited, .mceToolbarBottom a:hover {
+    border: 0; margin: 0; padding: 0; background: transparent;
+    border: 0px; margin: 0px; padding: 0px; background: transparent;
+}
+.mceButtonNormal, .mceButtonOver, .mceButtonDown, .mceSeparator, .mceSeparatorLine, .mceButtonDisabled, .mceButtonSelected {
+    border: 0px; margin: 0px; padding: 0px; background: transparent;
+    margin-top: 1px;
+    margin-left: 1px;
+}
+.mceButtonNormal {
+    border-top: 1px solid;
+    border-left: 1px solid;
+    border-bottom: 1px solid;
+    border-right: 1px solid;
+    border-color: #F0F0EE;
+    cursor: arrow;
+}
+.mceButtonOver {
+    border: 1px solid #0A246A;
+    cursor: arrow;
+    background-color: #B6BDD2;
+}
+.mceButtonDown {
+    cursor: arrow;
+    border: 1px solid #0A246A;
+    background-color: #8592B5;
+}
+.mceButtonSelected {
+    border: 1px solid;
+    border-color: #C0C0BB;
+    cursor: arrow;
+}
+.mceButtonDisabled {
+    filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
+    -moz-opacity:0.3;
+    opacity: 0.3;
+    border-top: 1px solid;
+    border-left: 1px solid;
+    border-bottom: 1px solid;
+    border-right: 1px solid;
+    border-color: #F0F0EE;
+    cursor: arrow;
+}
+.mceSeparator {
+    border-top: 1px solid buttonhighlight;
+    border-left: 1px solid buttonhighlight;
+    border-bottom: 1px solid buttonshadow;
+    border-right: 1px solid buttonshadow;
+    margin-right: 2px;
+    margin-left: 2px;
+}
 .mceSeparatorLine {
+    border: 0;
+    padding: 0;
+    margin:2px;
     margin-left: 4px;
+    margin-right: 2px;
+    background-color: #F0F0EE;
+    border-top: 1px solid buttonshadow;
+    border-left: 1px solid buttonshadow;
+    border-bottom: 1px solid buttonhighlight;
+    border-right: 1px solid buttonhighlight;
+    width: 0px;
+    height: 15px;
+}
 .mceSelectList {
     font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;
     font-size: 7pt !important;
+    font-family: "MS Sans Serif";
+    font-size: 7pt;
     font-weight: normal;
     margin-top: 3px;
     padding: 0;
+    padding: 0px;
     display: inline;
     vertical-align: top;
     background-color: #F0F0EE;
+    background-color: #F0F0EE
+}
 …
     background: #F0F0EE;
     border: 1px solid #cccccc;
     padding: 0;
     margin: 0;
+    padding: 0px;
+    margin: 0px;
+}
 …
     font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;
     background: #FFFFFF;
     padding: 0;
     margin: 0;
+    padding: 0px;
+    margin: 0px;
+}
 …
 .mceToolbarTop {
     border-bottom: 1px solid #cccccc;
-    padding-bottom: 1px;
+}
 …
     display: none;
     border: 1px dotted gray;
     margin: 0;
     padding: 0;
+    margin: 0px;
+    padding: 0px;
+}
-/* Button CSS rules */
-a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {
-    width: 20px;
-    height: 20px;
-    cursor: default;
-    margin-top: 1px;
-    margin-left: 1px;
+}
-a.mceButtonDisabled img {
-    border: 0 !important;
+}
-a.mceButtonNormal img, a.mceButtonSelected img {
-    border: 1px solid #F0F0EE !important;
+}
-a.mceButtonSelected img {
-    border: 1px solid #6779AA !important;
-    background-color: #D4D5D8;
+}
-a.mceButtonNormal img:hover, a.mceButtonSelected img:hover {
-    border: 1px solid #0A246A !important;
-    cursor: default;
-    background-color: #B6BDD2;
+}
-a.mceButtonDisabled img {
-    -moz-opacity:0.3;
-    opacity: 0.3;
-    border: 1px solid #F0F0EE !important;
-    cursor: default;
+}
-a.mceTiledButton img {
-    background-image: url('../images/buttons.gif');
-    background-repeat: no-repeat;
+}
-/* MSIE specific rules */
-* html a.mceButtonNormal img, * html a.mceButtonSelected img, * html a.mceButtonDisabled img {
-    border: 0 !important;
-    margin-top: 2px;
-    margin-bottom: 1px;
+}
-* html a.mceButtonDisabled img {
-    filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
-    border: 0 !important;
+}
-* html a.mceButtonDisabled {
-    border: 1px solid #F0F0EE !important;
+}
-* html a.mceButtonNormal, * html a.mceButtonSelected {
-    border: 1px solid #F0F0EE !important;
-    cursor: default;
+}
-* html a.mceButtonSelected {
-    border: 1px solid #6779AA !important;
-    background-color: #D4D5D8;
+}
-* html a.mceButtonNormal:hover, * html a.mceButtonSelected:hover {
-    border: 1px solid #0A246A !important;
-    cursor: default;
-    background-color: #B6BDD2;
+}
-* html .mceSelectList {
-    margin-top: 2px;
+}
-/* Menu button CSS rules */
-span.mceMenuButton img, span.mceMenuButtonSelected img {
-    border: 1px solid #F0F0EE;
-    margin-left: 1px;
+}
-span.mceMenuButtonSelected img {
-    border: 1px solid #6779AA;
-    background-color: #B6BDD2;
+}
-span.mceMenuButtonSelected img.mceMenuButton {
-    border: 1px solid #F0F0EE;
-    background-color: transparent;
+}
-span.mceMenuButton img.mceMenuButton, span.mceMenuButtonSelected img.mceMenuButton {
-    border-left: 0;
-    margin-left: 0;
+}
-span.mceMenuButton:hover img, span.mceMenuButtonSelected:hover img {
-    border: 1px solid #0A246A;
-    background-color: #B6BDD2;
+}
-span.mceMenuButton:hover img.mceMenuButton, span.mceMenuButtonSelected:hover img.mceMenuButton {
-    border-left: 0;
+}
-span.mceMenuButtonFocus img {
-    border: 1px solid gray;
-    border-right: 0;
-    margin-left: 1px;
-    background-color: #F5F4F2;
+}
-span.mceMenuButtonFocus img.mceMenuButton {
-    border: 1px solid gray;
-    border-left: 1px solid #F5F4F2;
-    margin-left: 0;
+}
-/* Menu button MSIE specific rules */
-* html span.mceMenuButton, * html span.mceMenuButtonFocus {
-    position: relative;
-    left: 0;
-    top: 0;
+}
-* html span.mceMenuButton img, * html span.mceMenuButtonSelected img, * html span.mceMenuButtonFocus img {
-    position: relative;
-    top: 1px;
+}
-* html span.mceMenuHover img {
-    border: 1px solid #0A246A;
-    background-color: #B6BDD2;
+}
-* html span.mceMenuButtonSelected.mceMenuHover img.mceMenuButton {
-    border: 1px solid #0A246A;
-    background-color: #B6BDD2;
-    border-left: 0;
+}
-/* Menu */
-.mceMenu {
-    position: absolute;
-    left: 0;
-    top: 0;
-    display: none;
-    z-index: 100;
-    background-color: white;
-    border: 1px solid gray;
-    font-weight: normal;
+}
-.mceMenu a, .mceMenuTitle, .mceMenuDisabled {
-    display: block;
-    width: 100%;
-    text-decoration: none;
-    background-color: white;
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    font-size: 11px;
-    line-height: 20px;
-    color: black;
+}
-.mceMenu a:hover {
-    background-color: #B6BDD2;
-    color: black;
+}
-.mceMenu span {
-    padding-left: 10px;
-    padding-right: 10px;
-    display: block;
-    line-height: 20px;
+}
-.mceMenuSeparator {
-    border-bottom: 1px solid gray;
-    background-color: gray;
-    height: 1px;
+}
-.mceMenuTitle span {
-    padding-left: 5px;
+}
-.mceMenuTitle {
-    background-color: #DDDDDD;
-    font-weight: bold;
+}
-.mceMenuDisabled {
-    color: gray;
+}
-span.mceMenuSelectedItem {
-    background-image: url('../images/menu_check.gif');
-    background-repeat: no-repeat;
-    background-position: 5px 8px;
-    padding-left: 20px;
+}
-span.mceMenuCheckItem {
-    padding-left: 20px;
+}
-span.mceMenuLine {
-    display: block;
-    position: absolute;
-    left: 0;
-    top: -1px;
-    background-color: #F5F4F2;
-    width: 30px;
-    height: 1px;
-    overflow: hidden;
-    padding-left: 0;
-    padding-right: 0;
+}

trunk/wp-includes/js/tinymce/themes/advanced/editor_template.js

-                      r4431
+                      r3503
-/**
- * $RCSfile: editor_template_src.js,v $
- * $Revision: 1.96 $
- * $Date: 2006/04/18 13:32:52 $
+ *
- * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
- */
 /* Import theme specific language pack */
+tinyMCE.importThemeLanguagePack('advanced');
+var TinyMCE_AdvancedTheme = {
+    // Private theme fields
+    _autoImportCSSClasses : true,
+    _resizer : {},
+    _buttons : [
+        // Control id, button img, button title, command, user_interface, value
+        ['bold', '{$lang_bold_img}', 'lang_bold_desc', 'Bold'],
+        ['italic', '{$lang_italic_img}', 'lang_italic_desc', 'Italic'],
+        ['underline', '{$lang_underline_img}', 'lang_underline_desc', 'Underline'],
+        ['strikethrough', 'strikethrough.gif', 'lang_striketrough_desc', 'Strikethrough'],
+        ['justifyleft', 'justifyleft.gif', 'lang_justifyleft_desc', 'JustifyLeft'],
+        ['justifycenter', 'justifycenter.gif', 'lang_justifycenter_desc', 'JustifyCenter'],
+        ['justifyright', 'justifyright.gif', 'lang_justifyright_desc', 'JustifyRight'],
+        ['justifyfull', 'justifyfull.gif', 'lang_justifyfull_desc', 'JustifyFull'],
+        ['bullist', 'bullist.gif', 'lang_bullist_desc', 'InsertUnorderedList'],
+        ['numlist', 'numlist.gif', 'lang_numlist_desc', 'InsertOrderedList'],
+        ['outdent', 'outdent.gif', 'lang_outdent_desc', 'Outdent'],
+        ['indent', 'indent.gif', 'lang_indent_desc', 'Indent'],
+        ['cut', 'cut.gif', 'lang_cut_desc', 'Cut'],
+        ['copy', 'copy.gif', 'lang_copy_desc', 'Copy'],
+        ['paste', 'paste.gif', 'lang_paste_desc', 'Paste'],
+        ['undo', 'undo.gif', 'lang_undo_desc', 'Undo'],
+        ['redo', 'redo.gif', 'lang_redo_desc', 'Redo'],
+        ['link', 'link.gif', 'lang_link_desc', 'mceLink', true],
+        ['unlink', 'unlink.gif', 'lang_unlink_desc', 'unlink'],
+        ['image', 'image.gif', 'lang_image_desc', 'mceImage', true],
+        ['cleanup', 'cleanup.gif', 'lang_cleanup_desc', 'mceCleanup'],
+        ['help', 'help.gif', 'lang_help_desc', 'mceHelp'],
+        ['code', 'code.gif', 'lang_theme_code_desc', 'mceCodeEditor'],
+        ['hr', 'hr.gif', 'lang_theme_hr_desc', 'inserthorizontalrule'],
+        ['removeformat', 'removeformat.gif', 'lang_theme_removeformat_desc', 'removeformat'],
+        ['sub', 'sub.gif', 'lang_theme_sub_desc', 'subscript'],
+        ['sup', 'sup.gif', 'lang_theme_sup_desc', 'superscript'],
+        ['forecolor', 'forecolor.gif', 'lang_theme_forecolor_desc', 'mceForeColor', true],
+        ['backcolor', 'backcolor.gif', 'lang_theme_backcolor_desc', 'mceBackColor', true],
+        ['charmap', 'charmap.gif', 'lang_theme_charmap_desc', 'mceCharMap'],
+        ['visualaid', 'visualaid.gif', 'lang_theme_visualaid_desc', 'mceToggleVisualAid'],
+        ['anchor', 'anchor.gif', 'lang_theme_anchor_desc', 'mceInsertAnchor'],
+        ['newdocument', 'newdocument.gif', 'lang_newdocument_desc', 'mceNewDocument']
+    ],
+    _buttonMap : 'anchor,backcolor,bold,bullist,charmap,cleanup,code,copy,cut,forecolor,help,hr,image,indent,italic,justifycenter,justifyfull,justifyleft,justifyright,link,newdocument,numlist,outdent,paste,redo,removeformat,strikethrough,sub,sup,underline,undo,unlink,visualaid,advhr,ltr,rtl,emotions,flash,fullpage,fullscreen,iespell,insertdate,inserttime,pastetext,pasteword,selectall,preview,print,save,replace,search,table,cell_props,delete_col,delete_row,col_after,col_before,row_after,row_before,merge_cells,row_props,split_cells',
+    /**
+     * Returns HTML code for the specificed control.
+     */
+    getControlHTML : function(button_name) {
+        var i, x;
+        // Lookup button in button list
+        for (i=0; i<TinyMCE_AdvancedTheme._buttons.length; i++) {
+            var but = TinyMCE_AdvancedTheme._buttons[i];
+            if (but[0] == button_name)
+                return tinyMCE.getButtonHTML(but[0], but[2], '{$themeurl}/images/' + but[1], but[3], (but.length > 4 ? but[4] : false), (but.length > 5 ? but[5] : null));
+        }
+        // Custom controlls other than buttons
+        switch (button_name) {
+            case "formatselect":
+                var html = '<select id="{$editor_id}_formatSelect" name="{$editor_id}_formatSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FormatBlock\',false,this.options[this.selectedIndex].value);" class="mceSelectList">';
+                var formats = tinyMCE.getParam("theme_advanced_blockformats", "p,address,pre,h1,h2,h3,h4,h5,h6", true).split(',');
+                var lookup = [
+                    ['p', '{$lang_theme_paragraph}'],
+                    ['address', '{$lang_theme_address}'],
+                    ['pre', '{$lang_theme_pre}'],
+                    ['h1', '{$lang_theme_h1}'],
+                    ['h2', '{$lang_theme_h2}'],
+                    ['h3', '{$lang_theme_h3}'],
+                    ['h4', '{$lang_theme_h4}'],
+                    ['h5', '{$lang_theme_h5}'],
+                    ['h6', '{$lang_theme_h6}'],
+                    ['div', '{$lang_theme_div}'],
+                    ['blockquote', '{$lang_theme_blockquote}'],
+                    ['code', '{$lang_theme_code}'],
+                    ['dt', '{$lang_theme_dt}'],
+                    ['dd', '{$lang_theme_dd}'],
+                    ['samp', '{$lang_theme_samp}']
+                ];
+                html += '<option value="">{$lang_theme_block}</option>';
+                // Build format select
+                for (var i=0; i<formats.length; i++) {
+                    for (var x=0; x<lookup.length; x++) {
+                        if (formats[i] == lookup[x][0])
+                            html += '<option value="&lt;' + lookup[x][0] + '&gt;">' + lookup[x][1] + '</option>';
+                    }
+                }
+                html += '</select>';
+                return html;
+            case "styleselect":
+                return '<select id="{$editor_id}_styleSelect" onmousedown="tinyMCE.themes.advanced._setupCSSClasses(\'{$editor_id}\');" name="{$editor_id}_styleSelect" onfocus="tinyMCE.addSelectAccessibility(event,this,window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceSetCSSClass\',false,this.options[this.selectedIndex].value);" class="mceSelectList">{$style_select_options}</select>';
+            case "fontselect":
+                var fontHTML = '<select id="{$editor_id}_fontNameSelect" name="{$editor_id}_fontNameSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontName\',false,this.options[this.selectedIndex].value);" class="mceSelectList"><option value="">{$lang_theme_fontdefault}</option>';
+                var iFonts = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';
+                var nFonts = 'Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sand;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats';
+                var fonts = tinyMCE.getParam("theme_advanced_fonts", nFonts).split(';');
+                for (i=0; i<fonts.length; i++) {
+                    if (fonts[i] != '') {
+                        var parts = fonts[i].split('=');
+                        fontHTML += '<option value="' + parts[1] + '">' + parts[0] + '</option>';
+                    }
+                }
+                fontHTML += '</select>';
+                return fontHTML;
+            case "fontsizeselect":
+                return '<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">'+
+                        '<option value="0">{$lang_theme_font_size}</option>'+
+                        '<option value="1">1 (8 pt)</option>'+
+                        '<option value="2">2 (10 pt)</option>'+
+                        '<option value="3">3 (12 pt)</option>'+
+                        '<option value="4">4 (14 pt)</option>'+
+                        '<option value="5">5 (18 pt)</option>'+
+                        '<option value="6">6 (24 pt)</option>'+
+                        '<option value="7">7 (36 pt)</option>'+
+                        '</select>';
+            case "|":
+            case "separator":
+                return '<img src="{$themeurl}/images/separator.gif" width="2" height="20" class="mceSeparatorLine" />';
+            case "spacer":
+                return '<img src="{$themeurl}/images/separator.gif" width="2" height="15" border="0" class="mceSeparatorLine" style="vertical-align: middle" />';
+            case "rowseparator":
+                return '<br />';
+        }
+        return "";
+    },
+    /**
+     * Theme specific execcommand handling.
+     */
+    execCommand : function(editor_id, element, command, user_interface, value) {
+        switch (command) {
+            case "mceLink":
+                var inst = tinyMCE.getInstanceById(editor_id);
+                var doc = inst.getDoc();
+                var selectedText = "";
+                if (tinyMCE.isMSIE) {
+                    var rng = doc.selection.createRange();
+                    selectedText = rng.text;
+                } else
+                    selectedText = inst.getSel().toString();
+                if (!tinyMCE.linkElement) {
+                    if ((tinyMCE.selectedElement.nodeName.toLowerCase() != "img") && (selectedText.length <= 0))
+                        return true;
+                }
+                var href = "", target = "", title = "", onclick = "", action = "insert", style_class = "";
+                if (tinyMCE.selectedElement.nodeName.toLowerCase() == "a")
+                    tinyMCE.linkElement = tinyMCE.selectedElement;
+                // Is anchor not a link
+                if (tinyMCE.linkElement != null && tinyMCE.getAttrib(tinyMCE.linkElement, 'href') == "")
+                    tinyMCE.linkElement = null;
+                if (tinyMCE.linkElement) {
+                    href = tinyMCE.getAttrib(tinyMCE.linkElement, 'href');
+                    target = tinyMCE.getAttrib(tinyMCE.linkElement, 'target');
+                    title = tinyMCE.getAttrib(tinyMCE.linkElement, 'title');
+                    onclick = tinyMCE.getAttrib(tinyMCE.linkElement, 'onclick');
+                    style_class = tinyMCE.getAttrib(tinyMCE.linkElement, 'class');
+                    // Try old onclick to if copy/pasted content
+                    if (onclick == "")
+                        onclick = tinyMCE.getAttrib(tinyMCE.linkElement, 'onclick');
+                    onclick = tinyMCE.cleanupEventStr(onclick);
+                    href = eval(tinyMCE.settings['urlconverter_callback'] + "(href, tinyMCE.linkElement, true);");
+                    // Use mce_href if defined
+                    mceRealHref = tinyMCE.getAttrib(tinyMCE.linkElement, 'mce_href');
+                    if (mceRealHref != "") {
+                        href = mceRealHref;
+                        if (tinyMCE.getParam('convert_urls'))
+                            href = eval(tinyMCE.settings['urlconverter_callback'] + "(href, tinyMCE.linkElement, true);");
+                    }
+                    action = "update";
+                }
+                var template = new Array();
+                template['file'] = 'link.htm';
+                template['width'] = 310;
+                template['height'] = 200;
+                // Language specific width and height addons
+                template['width'] += tinyMCE.getLang('lang_insert_link_delta_width', 0);
+                template['height'] += tinyMCE.getLang('lang_insert_link_delta_height', 0);
+                if (inst.settings['insertlink_callback']) {
+                    var returnVal = eval(inst.settings['insertlink_callback'] + "(href, target, title, onclick, action, style_class);");
+                    if (returnVal && returnVal['href'])
+                        TinyMCE_AdvancedTheme._insertLink(returnVal['href'], returnVal['target'], returnVal['title'], returnVal['onclick'], returnVal['style_class']);
+                } else {
+                    tinyMCE.openWindow(template, {href : href, target : target, title : title, onclick : onclick, action : action, className : style_class, inline : "yes"});
+                }
+                return true;
+            case "mceImage":
+                var src = "", alt = "", border = "", hspace = "", vspace = "", width = "", height = "", align = "";
+                var title = "", onmouseover = "", onmouseout = "", action = "insert";
+                var img = tinyMCE.imgElement;
+                var inst = tinyMCE.getInstanceById(editor_id);
+                if (tinyMCE.selectedElement != null && tinyMCE.selectedElement.nodeName.toLowerCase() == "img") {
+                    img = tinyMCE.selectedElement;
+                    tinyMCE.imgElement = img;
+                }
+                if (img) {
+                    // Is it a internal MCE visual aid image, then skip this one.
+                    if (tinyMCE.getAttrib(img, 'name').indexOf('mce_') == 0)
+                        return true;
+                    src = tinyMCE.getAttrib(img, 'src');
+                    alt = tinyMCE.getAttrib(img, 'alt');
+                    // Try polling out the title
+                    if (alt == "")
+                        alt = tinyMCE.getAttrib(img, 'title');
+                    // Fix width/height attributes if the styles is specified
+                    if (tinyMCE.isGecko) {
+                        var w = img.style.width;
+                        if (w != null && w != "")
+                            img.setAttribute("width", w);
+                        var h = img.style.height;
+                        if (h != null && h != "")
+                            img.setAttribute("height", h);
+                    }
+                    border = tinyMCE.getAttrib(img, 'border');
+                    hspace = tinyMCE.getAttrib(img, 'hspace');
+                    vspace = tinyMCE.getAttrib(img, 'vspace');
+                    width = tinyMCE.getAttrib(img, 'width');
+                    height = tinyMCE.getAttrib(img, 'height');
+                    align = tinyMCE.getAttrib(img, 'align');
+                    onmouseover = tinyMCE.getAttrib(img, 'onmouseover');
+                    onmouseout = tinyMCE.getAttrib(img, 'onmouseout');
+                    title = tinyMCE.getAttrib(img, 'title');
+                    // Is realy specified?
+                    if (tinyMCE.isMSIE) {
+                        width = img.attributes['width'].specified ? width : "";
+                        height = img.attributes['height'].specified ? height : "";
+                    }
+                    //onmouseover = tinyMCE.getImageSrc(tinyMCE.cleanupEventStr(onmouseover));
+                    //onmouseout = tinyMCE.getImageSrc(tinyMCE.cleanupEventStr(onmouseout));
+                    src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, img, true);");
+                    // Use mce_src if defined
+                    mceRealSrc = tinyMCE.getAttrib(img, 'mce_src');
+                    if (mceRealSrc != "") {
+                        src = mceRealSrc;
+                        if (tinyMCE.getParam('convert_urls'))
+                            src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, img, true);");
+                    }
+                    //if (onmouseover != "")
+                    //  onmouseover = eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseover, img, true);");
+                    //if (onmouseout != "")
+                    //  onmouseout = eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseout, img, true);");
+                    action = "update";
+                }
+                var template = new Array();
+                template['file'] = 'image.htm?src={$src}';
+                template['width'] = 355;
+                template['height'] = 265 + (tinyMCE.isMSIE ? 25 : 0);
+                // Language specific width and height addons
+                template['width'] += tinyMCE.getLang('lang_insert_image_delta_width', 0);
+                template['height'] += tinyMCE.getLang('lang_insert_image_delta_height', 0);
+                if (inst.settings['insertimage_callback']) {
+                    var returnVal = eval(inst.settings['insertimage_callback'] + "(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action);");
+                    if (returnVal && returnVal['src'])
+                        TinyMCE_AdvancedTheme._insertImage(returnVal['src'], returnVal['alt'], returnVal['border'], returnVal['hspace'], returnVal['vspace'], returnVal['width'], returnVal['height'], returnVal['align'], returnVal['title'], returnVal['onmouseover'], returnVal['onmouseout']);
+                } else
+                    tinyMCE.openWindow(template, {src : src, alt : alt, border : border, hspace : hspace, vspace : vspace, width : width, height : height, align : align, title : title, onmouseover : onmouseover, onmouseout : onmouseout, action : action, inline : "yes"});
+                return true;
+            case "mceForeColor":
+                var template = new Array();
+                var elm = tinyMCE.selectedInstance.getFocusElement();
+                var inputColor = tinyMCE.getAttrib(elm, "color");
+                if (inputColor == '')
+                    inputColor = elm.style.color;
+                if (!inputColor)
+                    inputColor = "#000000";
+                template['file'] = 'color_picker.htm';
+                template['width'] = 220;
+                template['height'] = 190;
+                tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes", command : "forecolor", input_color : inputColor});
+            return true;
+            case "mceBackColor":
+                var template = new Array();
+                var elm = tinyMCE.selectedInstance.getFocusElement();
+                var inputColor = elm.style.backgroundColor;
+                if (!inputColor)
+                    inputColor = "#000000";
+                template['file'] = 'color_picker.htm';
+                template['width'] = 220;
+                template['height'] = 190;
+                template['width'] += tinyMCE.getLang('lang_theme_advanced_backcolor_delta_width', 0);
+                template['height'] += tinyMCE.getLang('lang_theme_advanced_backcolor_delta_height', 0);
+                tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes", command : "HiliteColor", input_color : inputColor});
+                //mceBackColor
+            return true;
+            case "mceColorPicker":
+                if (user_interface) {
+                    var template = new Array();
+                    var inputColor = value['document'].getElementById(value['element_id']).value;
+                    template['file'] = 'color_picker.htm';
+                    template['width'] = 220;
+                    template['height'] = 190;
+                    template['close_previous'] = "no";
+                    template['width'] += tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_width', 0);
+                    template['height'] += tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_height', 0);
+                    if (typeof(value['store_selection']) == "undefined")
+                        value['store_selection'] = true;
+                    tinyMCE.lastColorPickerValue = value;
+                    tinyMCE.openWindow(template, {editor_id : editor_id, mce_store_selection : value['store_selection'], inline : "yes", command : "mceColorPicker", input_color : inputColor});
+                } else {
+                    var savedVal = tinyMCE.lastColorPickerValue;
+                    var elm = savedVal['document'].getElementById(savedVal['element_id']);
+                    elm.value = value;
+                    if (elm.onchange != null && elm.onchange != '')
+                        eval('elm.onchange();');
+                }
+            return true;
+            case "mceCodeEditor":
+                var template = new Array();
+                template['file'] = 'source_editor.htm';
+                template['width'] = parseInt(tinyMCE.getParam("theme_advanced_source_editor_width", 720));
+                template['height'] = parseInt(tinyMCE.getParam("theme_advanced_source_editor_height", 580));
+                tinyMCE.openWindow(template, {editor_id : editor_id, resizable : "yes", scrollbars : "no", inline : "yes"});
+                return true;
+            case "mceCharMap":
+                var template = new Array();
+                template['file'] = 'charmap.htm';
+                template['width'] = 550 + (tinyMCE.isOpera ? 40 : 0);
+                template['height'] = 250;
+                template['width'] += tinyMCE.getLang('lang_theme_advanced_charmap_delta_width', 0);
+                template['height'] += tinyMCE.getLang('lang_theme_advanced_charmap_delta_height', 0);
+                tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes"});
+                return true;
+            case "mceInsertAnchor":
+                var template = new Array();
+                template['file'] = 'anchor.htm';
+                template['width'] = 320;
+                template['height'] = 90 + (tinyMCE.isNS7 ? 30 : 0);
+                template['width'] += tinyMCE.getLang('lang_theme_advanced_anchor_delta_width', 0);
+                template['height'] += tinyMCE.getLang('lang_theme_advanced_anchor_delta_height', 0);
+                tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes"});
+                return true;
+            case "mceNewDocument":
+                if (confirm(tinyMCE.getLang('lang_newdocument')))
+                    tinyMCE.execInstanceCommand(editor_id, 'mceSetContent', false, ' ');
+                return true;
+        }
+        return false;
+    },
+    /**
+     * Editor instance template function.
+     */
+    getEditorTemplate : function(settings, editorId) {
+        function removeFromArray(in_array, remove_array) {
+            var outArray = new Array();
+            for (var i=0; i<in_array.length; i++) {
+                skip = false;
+                for (var j=0; j<remove_array.length; j++) {
+                    if (in_array[i] == remove_array[j]) {
+                        skip = true;
+                    }
+                }
+                if (!skip) {
+                    outArray[outArray.length] = in_array[i];
+                }
+            }
+            return outArray;
+        }
+        function addToArray(in_array, add_array) {
+            for (var i=0; i<add_array.length; i++) {
+                in_array[in_array.length] = add_array[i];
+            }
+            return in_array;
+        }
+        var template = new Array();
+        var deltaHeight = 0;
+        var resizing = tinyMCE.getParam("theme_advanced_resizing", false);
+        var path = tinyMCE.getParam("theme_advanced_path", true);
+        var statusbarHTML = '<div id="{$editor_id}_path" class="mceStatusbarPathText" style="display: ' + (path ? "block" : "none") + '">&#160;</div><div id="{$editor_id}_resize" class="mceStatusbarResize" style="display: ' + (resizing ? "block" : "none") + '" onmousedown="tinyMCE.themes.advanced._setResizing(event,\'{$editor_id}\',true);"></div><br style="clear: both" />';
+        var layoutManager = tinyMCE.getParam("theme_advanced_layout_manager", "SimpleLayout");
+        // Setup style select options -- MOVED UP FOR EXTERNAL TOOLBAR COMPATABILITY!
+        var styleSelectHTML = '<option value="">{$lang_theme_style_select}</option>';
+        if (settings['theme_advanced_styles']) {
+            var stylesAr = settings['theme_advanced_styles'].split(';');
+            for (var i=0; i<stylesAr.length; i++) {
+                var key, value;
+                key = stylesAr[i].split('=')[0];
+                value = stylesAr[i].split('=')[1];
+                styleSelectHTML += '<option value="' + value + '">' + key + '</option>';
+            }
+            TinyMCE_AdvancedTheme._autoImportCSSClasses = false;
+        }
+        switch(layoutManager) {
+            case "SimpleLayout" : //the default TinyMCE Layout (for backwards compatibility)...
+                var toolbarHTML = "";
+                var toolbarLocation = tinyMCE.getParam("theme_advanced_toolbar_location", "bottom");
+                var toolbarAlign = tinyMCE.getParam("theme_advanced_toolbar_align", "center");
+                var pathLocation = tinyMCE.getParam("theme_advanced_path_location", "none"); // Compatiblity
+                var statusbarLocation = tinyMCE.getParam("theme_advanced_statusbar_location", pathLocation);
+                var defVals = {
+                    theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,styleselect,formatselect",
+                    theme_advanced_buttons2 : "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code",
+                    theme_advanced_buttons3 : "hr,removeformat,visualaid,separator,sub,sup,separator,charmap"
+                };
+                // Add accessibility control
+                toolbarHTML += '<a href="#" accesskey="q" title="' + tinyMCE.getLang("lang_toolbar_focus") + '"';
+                if (!tinyMCE.getParam("accessibility_focus"))
+                    toolbarHTML += ' onfocus="tinyMCE.getInstanceById(\'' + editorId + '\').getWin().focus();"';
+                toolbarHTML += '></a>';
+                // Render rows
+                for (var i=1; i<100; i++) {
+                    var def = defVals["theme_advanced_buttons" + i];
+                    var buttons = tinyMCE.getParam("theme_advanced_buttons" + i, def == null ? '' : def, true, ',');
+                    if (buttons.length == 0)
+                        break;
+                    buttons = removeFromArray(buttons, tinyMCE.getParam("theme_advanced_disable", "", true, ','));
+                    buttons = addToArray(buttons, tinyMCE.getParam("theme_advanced_buttons" + i + "_add", "", true, ','));
+                    buttons = addToArray(tinyMCE.getParam("theme_advanced_buttons" + i + "_add_before", "", true, ','), buttons);
+                    for (var b=0; b<buttons.length; b++)
+                        toolbarHTML += tinyMCE.getControlHTML(buttons[b]);
+                    if (buttons.length > 0) {
+                        toolbarHTML += "<br />";
+                        deltaHeight -= 23;
+                    }
+                }
+                // Add accessibility control
+                toolbarHTML += '<a href="#" accesskey="z" onfocus="tinyMCE.getInstanceById(\'' + editorId + '\').getWin().focus();"></a>';
+                // Setup template html
+                template['html'] = '<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';
+                if (toolbarLocation == "top") {
+                    template['html'] += '<tr><td class="mceToolbarTop" align="' + toolbarAlign + '" height="1" nowrap="nowrap">' + toolbarHTML + '</td></tr>';
+                }
+                if (statusbarLocation == "top") {
+                    template['html'] += '<tr><td class="mceStatusbarTop" height="1">' + statusbarHTML + '</td></tr>';
+                    deltaHeight -= 23;
+                }
+                template['html'] += '<tr><td align="center"><span id="{$editor_id}"></span></td></tr>';
+                if (toolbarLocation == "bottom") {
+                    template['html'] += '<tr><td class="mceToolbarBottom" align="' + toolbarAlign + '" height="1">' + toolbarHTML + '</td></tr>';
+                }
+                // External toolbar changes
+                if (toolbarLocation == "external") {
+                    var bod = document.body;
+                    var elm = document.createElement ("div");
+                    toolbarHTML = tinyMCE.replaceVar(toolbarHTML, 'style_select_options', styleSelectHTML);
+                    toolbarHTML = tinyMCE.applyTemplate(toolbarHTML, {editor_id : editorId});
+                    elm.className = "mceToolbarExternal";
+                    elm.id = editorId+"_toolbar";
+                    elm.innerHTML = '<table width="100%" border="0" align="center"><tr><td align="center">'+toolbarHTML+'</td></tr></table>';
+                    bod.appendChild (elm);
+                    // bod.style.marginTop = elm.offsetHeight + "px";
+                    deltaHeight = 0;
+                    tinyMCE.getInstanceById(editorId).toolbarElement = elm;
+                    //template['html'] = '<div id="mceExternalToolbar" align="center" class="mceToolbarExternal"><table width="100%" border="0" align="center"><tr><td align="center">'+toolbarHTML+'</td></tr></table></div>' + template["html"];
+                } else {
+                    tinyMCE.getInstanceById(editorId).toolbarElement = null;
+                }
+                if (statusbarLocation == "bottom") {
+                    template['html'] += '<tr><td class="mceStatusbarBottom" height="1">' + statusbarHTML + '</td></tr>';
+                    deltaHeight -= 23;
+                }
+                template['html'] += '</tbody></table>';
+                //"SimpleLayout"
+            break;
+            case "RowLayout" : //Container Layout - containers defined in "theme_advanced_containers" are rendered from top to bottom.
+                template['html'] = '<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';
+                var containers = tinyMCE.getParam("theme_advanced_containers", "", true, ",");
+                var defaultContainerCSS = tinyMCE.getParam("theme_advanced_containers_default_class", "container");
+                var defaultContainerAlign = tinyMCE.getParam("theme_advanced_containers_default_align", "center");
+                //Render Containers:
+                for (var i = 0; i < containers.length; i++)
+                {
+                    if (containers[i] == "mceEditor") //Exceptions for mceEditor and ...
+                        template['html'] += '<tr><td align="center" class="mceEditor_border"><span id="{$editor_id}"></span></td></tr>';
+                    else if (containers[i] == "mceElementpath" || containers[i] == "mceStatusbar") // ... mceElementpath:
+                    {
+                        var pathClass = "mceStatusbar";
+                        if (i == containers.length-1)
+                        {
+                            pathClass = "mceStatusbarBottom";
+                        }
+                        else if (i == 0)
+                        {
+                            pathClass = "mceStatusbar";
+                        }
+                        else
+                        {
+                            deltaHeight-=2;
+                        }
+                        template['html'] += '<tr><td class="' + pathClass + '" height="1">' + statusbarHTML + '</td></tr>';
+                        deltaHeight -= 22;
+                    } else { // Render normal Container
+                        var curContainer = tinyMCE.getParam("theme_advanced_container_"+containers[i], "", true, ',');
+                        var curContainerHTML = "";
+                        var curAlign = tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_align", defaultContainerAlign);
+                        var curCSS = tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_class", defaultContainerCSS);
+                        for (var j=0; j<curContainer.length; j++) {
+                            curContainerHTML += tinyMCE.getControlHTML(curContainer[j]);
+                        }
+                        if (curContainer.length > 0) {
+                            curContainerHTML += "<br />";
+                            deltaHeight -= 23;
+                        }
+                        template['html'] += '<tr><td class="' + curCSS + '" align="' + curAlign + '" height="1">' + curContainerHTML + '</td></tr>';
+                    }
+                }
+                template['html'] += '</tbody></table>';
+                //RowLayout
+            break;
+            case "CustomLayout" : //User defined layout callback...
+                var customLayout = tinyMCE.getParam("theme_advanced_custom_layout","");
+                if (customLayout != "" && eval("typeof(" + customLayout + ")") != "undefined") {
+                    template = eval(customLayout + "(template);");
+                }
+            break;
+        }
+        if (resizing)
+            template['html'] += '<span id="{$editor_id}_resize_box" class="mceResizeBox"></span>';
+        template['html'] = tinyMCE.replaceVar(template['html'], 'style_select_options', styleSelectHTML);
+        template['delta_width'] = 0;
+        template['delta_height'] = deltaHeight;
+        return template;
+    },
+    initInstance : function(inst) {
+        if (tinyMCE.getParam("theme_advanced_resizing", false)) {
+            if (tinyMCE.getParam("theme_advanced_resizing_use_cookie", true)) {
+                var w = TinyMCE_AdvancedTheme._getCookie("TinyMCE_" + inst.editorId + "_width");
+                var h = TinyMCE_AdvancedTheme._getCookie("TinyMCE_" + inst.editorId + "_height");
+                TinyMCE_AdvancedTheme._resizeTo(inst, w, h, tinyMCE.getParam("theme_advanced_resize_horizontal", true));
+            }
+        }
+        inst.addShortcut('ctrl', 'k', 'lang_link_desc', 'mceLink');
+    },
+    /**
+     * Node change handler.
+     */
+    handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection, setup_content) {
+        function selectByValue(select_elm, value, first_index) {
+            first_index = typeof(first_index) == "undefined" ? false : true;
+            if (select_elm) {
+                for (var i=0; i<select_elm.options.length; i++) {
+                    var ov = "" + select_elm.options[i].value;
+                    if (first_index && ov.toLowerCase().indexOf(value.toLowerCase()) == 0) {
+                        select_elm.selectedIndex = i;
+                        return true;
+                    }
+                    if (ov == value) {
+                        select_elm.selectedIndex = i;
+                        return true;
+                    }
+                }
+            }
+            return false;
+        };
+        function getAttrib(elm, name) {
+            return elm.getAttribute(name) ? elm.getAttribute(name) : "";
+        };
+        // No node provided
+        if (node == null)
+            return;
+        // Update path
+        var pathElm = document.getElementById(editor_id + "_path");
+        var inst = tinyMCE.getInstanceById(editor_id);
+        var doc = inst.getDoc();
+        if (pathElm) {
+            // Get node path
+            var parentNode = node;
+            var path = new Array();
+            while (parentNode != null) {
+                if (parentNode.nodeName.toUpperCase() == "BODY") {
+                    break;
+                }
+                // Only append element nodes to path
+                if (parentNode.nodeType == 1 && tinyMCE.getAttrib(parentNode, "class").indexOf('mceItemHidden') == -1) {
+                    path[path.length] = parentNode;
+                }
+                parentNode = parentNode.parentNode;
+            }
+            // Setup HTML
+            var html = "";
+            for (var i=path.length-1; i>=0; i--) {
+                var nodeName = path[i].nodeName.toLowerCase();
+                var nodeData = "";
+                if (nodeName == "b") {
+                    nodeName = "strong";
+                }
+                if (nodeName == "i") {
+                    nodeName = "em";
+                }
+                if (nodeName == "span") {
+                    var cn = tinyMCE.getAttrib(path[i], "class");
+                    if (cn != "" && cn.indexOf('mceItem') == -1)
+                        nodeData += "class: " + cn + " ";
+                    var st = tinyMCE.getAttrib(path[i], "style");
+                    if (st != "") {
+                        st = tinyMCE.serializeStyle(tinyMCE.parseStyle(st));
+                        nodeData += "style: " + st + " ";
+                    }
+                }
+                if (nodeName == "font") {
+                    if (tinyMCE.getParam("convert_fonts_to_spans"))
+                        nodeName = "span";
+                    var face = tinyMCE.getAttrib(path[i], "face");
+                    if (face != "")
+                        nodeData += "font: " + face + " ";
+                    var size = tinyMCE.getAttrib(path[i], "size");
+                    if (size != "")
+                        nodeData += "size: " + size + " ";
+                    var color = tinyMCE.getAttrib(path[i], "color");
+                    if (color != "")
+                        nodeData += "color: " + color + " ";
+                }
+                if (getAttrib(path[i], 'id') != "") {
+                    nodeData += "id: " + path[i].getAttribute('id') + " ";
+                }
+                var className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i], "class"), false);
+                if (className != "" && className.indexOf('mceItem') == -1)
+                    nodeData += "class: " + className + " ";
+                if (getAttrib(path[i], 'src') != "") {
+                    var src = tinyMCE.getAttrib(path[i], "mce_src");
+                    if (src == "")
+                         src = tinyMCE.getAttrib(path[i], "src");
+                    nodeData += "src: " + src + " ";
+                }
+                if (getAttrib(path[i], 'href') != "") {
+                    var href = tinyMCE.getAttrib(path[i], "mce_href");
+                    if (href == "")
+                         href = tinyMCE.getAttrib(path[i], "href");
+                    nodeData += "href: " + href + " ";
+                }
+                if (nodeName == "img" && tinyMCE.getAttrib(path[i], "class").indexOf('mceItemFlash') != -1) {
+                    nodeName = "flash";
+                    nodeData = "src: " + path[i].getAttribute('title');
+                }
+                if (nodeName == "a" && (anchor = tinyMCE.getAttrib(path[i], "name")) != "") {
+                    nodeName = "a";
+                    nodeName += "#" + anchor;
+                    nodeData = "";
+                }
+                if (getAttrib(path[i], 'name').indexOf("mce_") != 0) {
+                    var className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i], "class"), false);
+                    if (className != "" && className.indexOf('mceItem') == -1) {
+                        nodeName += "." + className;
+                    }
+                }
+                var cmd = 'tinyMCE.execInstanceCommand(\'' + editor_id + '\',\'mceSelectNodeDepth\',false,\'' + i + '\');';
+                html += '<a title="' + nodeData + '" href="javascript:' + cmd + '" onclick="' + cmd + 'return false;" onmousedown="return false;" target="_self" class="mcePathItem">' + nodeName + '</a>';
+                if (i > 0) {
+                    html += " &raquo; ";
+                }
+            }
+            pathElm.innerHTML = '<a href="#" accesskey="x"></a>' + tinyMCE.getLang('lang_theme_path') + ": " + html + '&#160;';
+        }
+        // Reset old states
+        tinyMCE.switchClass(editor_id + '_justifyleft', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_justifyright', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_justifycenter', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_justifyfull', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_bold', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_italic', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_underline', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_strikethrough', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_bullist', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_numlist', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_sub', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_sup', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_anchor', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_link', 'mceButtonDisabled');
+        tinyMCE.switchClass(editor_id + '_unlink', 'mceButtonDisabled');
+        tinyMCE.switchClass(editor_id + '_outdent', 'mceButtonDisabled');
+        tinyMCE.switchClass(editor_id + '_image', 'mceButtonNormal');
+        tinyMCE.switchClass(editor_id + '_hr', 'mceButtonNormal');
+        if (node.nodeName == "A" && tinyMCE.getAttrib(node, "class").indexOf('mceItemAnchor') != -1)
+            tinyMCE.switchClass(editor_id + '_anchor', 'mceButtonSelected');
+        // Get link
+        var anchorLink = tinyMCE.getParentElement(node, "a", "href");
+        if (anchorLink || any_selection) {
+            tinyMCE.switchClass(editor_id + '_link', anchorLink ? 'mceButtonSelected' : 'mceButtonNormal');
+            tinyMCE.switchClass(editor_id + '_unlink', anchorLink ? 'mceButtonSelected' : 'mceButtonNormal');
+        }
+        // Handle visual aid
+        tinyMCE.switchClass(editor_id + '_visualaid', visual_aid ? 'mceButtonSelected' : 'mceButtonNormal');
+        if (undo_levels != -1) {
+            tinyMCE.switchClass(editor_id + '_undo', 'mceButtonDisabled');
+            tinyMCE.switchClass(editor_id + '_redo', 'mceButtonDisabled');
+        }
+        // Within li, blockquote
+        if (tinyMCE.getParentElement(node, "li,blockquote"))
+            tinyMCE.switchClass(editor_id + '_outdent', 'mceButtonNormal');
+        // Has redo levels
+        if (undo_index != -1 && (undo_index < undo_levels-1 && undo_levels > 0))
+            tinyMCE.switchClass(editor_id + '_redo', 'mceButtonNormal');
+        // Has undo levels
+        if (undo_index != -1 && (undo_index > 0 && undo_levels > 0))
+            tinyMCE.switchClass(editor_id + '_undo', 'mceButtonNormal');
+        // Select class in select box
+        var selectElm = document.getElementById(editor_id + "_styleSelect");
+        if (selectElm) {
+            TinyMCE_AdvancedTheme._setupCSSClasses(editor_id);
+            classNode = node;
+            breakOut = false;
+            var index = 0;
+            do {
+                if (classNode && classNode.className) {
+                    for (var i=0; i<selectElm.options.length; i++) {
+                        if (selectElm.options[i].value == classNode.className) {
+                            index = i;
+                            breakOut = true;
+                            break;
+                        }
+                    }
+                }
+            } while (!breakOut && classNode != null && (classNode = classNode.parentNode) != null);
+            selectElm.selectedIndex = index;
+        }
+        // Select formatblock
+        var selectElm = document.getElementById(editor_id + "_formatSelect");
+        if (selectElm) {
+            var elm = tinyMCE.getParentElement(node, "p,div,h1,h2,h3,h4,h5,h6,pre,address");
+            if (elm)
+                selectByValue(selectElm, "<" + elm.nodeName.toLowerCase() + ">");
+            else
+                selectByValue(selectElm, "");
+        }
+        // Select fontselect
+        var selectElm = document.getElementById(editor_id + "_fontNameSelect");
+        if (selectElm) {
+            if (!tinyMCE.isSafari && !(tinyMCE.isMSIE && !tinyMCE.isOpera)) {
+                var face = inst.queryCommandValue('FontName');
+                face = face == null || face == "" ? "" : face;
+                selectByValue(selectElm, face, face != "");
+            } else {
+                var elm = tinyMCE.getParentElement(node, "font", "face");
+                if (elm) {
+                    var family = tinyMCE.getAttrib(elm, "face");
+                    if (family == '')
+                        family = '' + elm.style.fontFamily;
+                    if (!selectByValue(selectElm, family, family != ""))
+                        selectByValue(selectElm, "");
+                } else
+                    selectByValue(selectElm, "");
+            }
+        }
+        // Select fontsize
+        var selectElm = document.getElementById(editor_id + "_fontSizeSelect");
+        if (selectElm) {
+            if (!tinyMCE.isSafari && !tinyMCE.isOpera) {
+                var size = inst.queryCommandValue('FontSize');
+                selectByValue(selectElm, size == null || size == "" ? "0" : size);
+            } else {
+                var elm = tinyMCE.getParentElement(node, "font", "size");
+                if (elm) {
+                    var size = tinyMCE.getAttrib(elm, "size");
+                    if (size == '') {
+                        var sizes = new Array('', '8px', '10px', '12px', '14px', '18px', '24px', '36px');
+                        size = '' + elm.style.fontSize;
+                        for (var i=0; i<sizes.length; i++) {
+                            if (('' + sizes[i]) == size) {
+                                size = i;
+                                break;
+                            }
+                        }
+                    }
+                    if (!selectByValue(selectElm, size))
+                        selectByValue(selectElm, "");
+                } else
+                    selectByValue(selectElm, "0");
+            }
+        }
+        // Handle align attributes
+        alignNode = node;
+        breakOut = false;
+        do {
+            if (!alignNode.getAttribute || !alignNode.getAttribute('align'))
+                continue;
+            switch (alignNode.getAttribute('align').toLowerCase()) {
+                case "left":
+                    tinyMCE.switchClass(editor_id + '_justifyleft', 'mceButtonSelected');
+                    breakOut = true;
+                break;
+                case "right":
+                    tinyMCE.switchClass(editor_id + '_justifyright', 'mceButtonSelected');
+                    breakOut = true;
+                break;
+                case "middle":
+                case "center":
+                    tinyMCE.switchClass(editor_id + '_justifycenter', 'mceButtonSelected');
+                    breakOut = true;
+                break;
+                case "justify":
+                    tinyMCE.switchClass(editor_id + '_justifyfull', 'mceButtonSelected');
+                    breakOut = true;
+                break;
+            }
+        } while (!breakOut && (alignNode = alignNode.parentNode) != null);
+        // Div justification
+        var div = tinyMCE.getParentElement(node, "div");
+        if (div && div.style.textAlign == "center")
+            tinyMCE.switchClass(editor_id + '_justifycenter', 'mceButtonSelected');
+        // Do special text
+        if (!setup_content) {
+            // , "JustifyLeft", "_justifyleft", "JustifyCenter", "justifycenter", "JustifyRight", "justifyright", "JustifyFull", "justifyfull", "InsertUnorderedList", "bullist", "InsertOrderedList", "numlist", "InsertUnorderedList", "bullist", "Outdent", "outdent", "Indent", "indent", "subscript", "sub"
+            var ar = new Array("Bold", "_bold", "Italic", "_italic", "Strikethrough", "_strikethrough", "superscript", "_sup", "subscript", "_sub");
+            for (var i=0; i<ar.length; i+=2) {
+                if (inst.queryCommandState(ar[i]))
+                    tinyMCE.switchClass(editor_id + ar[i+1], 'mceButtonSelected');
+            }
+            if (inst.queryCommandState("Underline") && (node.parentNode == null || node.parentNode.nodeName != "A"))
+                tinyMCE.switchClass(editor_id + '_underline', 'mceButtonSelected');
+        }
+        // Handle elements
+        do {
+            switch (node.nodeName) {
+                case "UL":
+                    tinyMCE.switchClass(editor_id + '_bullist', 'mceButtonSelected');
+                break;
+                case "OL":
+                    tinyMCE.switchClass(editor_id + '_numlist', 'mceButtonSelected');
+                break;
+                case "HR":
+                     tinyMCE.switchClass(editor_id + '_hr', 'mceButtonSelected');
+                break;
+                case "IMG":
+                if (getAttrib(node, 'name').indexOf('mce_') != 0) {
+                    tinyMCE.switchClass(editor_id + '_image', 'mceButtonSelected');
+                }
+                break;
+            }
+        } while ((node = node.parentNode) != null);
+    },
+    // Private theme internal functions
+    // This function auto imports CSS classes into the class selection droplist
+    _setupCSSClasses : function(editor_id) {
+        var i, selectElm;
+        if (!TinyMCE_AdvancedTheme._autoImportCSSClasses)
+            return;
+        selectElm = document.getElementById(editor_id + '_styleSelect');
+        if (selectElm && selectElm.getAttribute('cssImported') != 'true') {
+            var csses = tinyMCE.getCSSClasses(editor_id);
+            if (csses && selectElm) {
+                for (i=0; i<csses.length; i++)
+                    selectElm.options[selectElm.options.length] = new Option(csses[i], csses[i]);
+            }
+            // Only do this once
+            if (csses != null && csses.length > 0)
+                selectElm.setAttribute('cssImported', 'true');
+        }
+    },
+    _setCookie : function(name, value, expires, path, domain, secure) {
+        var curCookie = name + "=" + escape(value) +
+            ((expires) ? "; expires=" + expires.toGMTString() : "") +
+            ((path) ? "; path=" + escape(path) : "") +
+            ((domain) ? "; domain=" + domain : "") +
+            ((secure) ? "; secure" : "");
+        document.cookie = curCookie;
+    },
+    _getCookie : function(name) {
+        var dc = document.cookie;
+        var prefix = name + "=";
+        var begin = dc.indexOf("; " + prefix);
+        if (begin == -1) {
+            begin = dc.indexOf(prefix);
+            if (begin != 0)
+                return null;
+        } else
+            begin += 2;
+        var end = document.cookie.indexOf(";", begin);
+        if (end == -1)
+            end = dc.length;
+        return unescape(dc.substring(begin + prefix.length, end));
+    },
+    _resizeTo : function(inst, w, h, set_w) {
+        var editorContainer = document.getElementById(inst.editorId + '_parent');
+        var tableElm = editorContainer.firstChild;
+        var iframe = inst.iframeElement;
+        if (w == null || w == "null") {
+            set_w = false;
+            w = 0;
+        }
+        if (h == null || h == "null")
+            return;
+        w = parseInt(w);
+        h = parseInt(h);
+        if (tinyMCE.isGecko) {
+            w += 2;
+            h += 2;
+        }
+        var dx = w - tableElm.clientWidth;
+        var dy = h - tableElm.clientHeight;
+        w = w < 1 ? 30 : w;
+        h = h < 1 ? 30 : h;
+        if (set_w)
+            tableElm.style.width = w + "px";
+        tableElm.style.height = h + "px";
+        iw = iframe.clientWidth + dx;
+        ih = iframe.clientHeight + dy;
+        iw = iw < 1 ? 30 : iw;
+        ih = ih < 1 ? 30 : ih;
+        if (tinyMCE.isGecko) {
+            iw -= 2;
+            ih -= 2;
+        }
+        if (set_w)
+            iframe.style.width = iw + "px";
+        iframe.style.height = ih + "px";
+        // Is it to small, make it bigger again
+        if (set_w) {
+            var tableBodyElm = tableElm.firstChild;
+            var minIframeWidth = tableBodyElm.scrollWidth;
+            if (inst.iframeElement.clientWidth < minIframeWidth) {
+                dx = minIframeWidth - inst.iframeElement.clientWidth;
+                inst.iframeElement.style.width = (iw + dx) + "px";
+            }
+        }
+    },
+    /**
+     * Handles resizing events.
+     */
+    _resizeEventHandler : function(e) {
+        var resizer = TinyMCE_AdvancedTheme._resizer;
+        // Do nothing
+        if (!resizer.resizing)
+            return;
+        e = typeof(e) == "undefined" ? window.event : e;
+        var dx = e.screenX - resizer.downX;
+        var dy = e.screenY - resizer.downY;
+        var resizeBox = resizer.resizeBox;
+        var editorId = resizer.editorId;
+        switch (e.type) {
+            case "mousemove":
+                var w, h;
+                w = resizer.width + dx;
+                h = resizer.height + dy;
+                w = w < 1 ? 1 : w;
+                h = h < 1 ? 1 : h;
+                if (resizer.horizontal)
+                    resizeBox.style.width = w + "px";
+                resizeBox.style.height = h + "px";
+                break;
+            case "mouseup":
+                TinyMCE_AdvancedTheme._setResizing(e, editorId, false);
+                TinyMCE_AdvancedTheme._resizeTo(tinyMCE.getInstanceById(editorId), resizer.width + dx, resizer.height + dy, resizer.horizontal);
+                // Expire in a month
+                if (tinyMCE.getParam("theme_advanced_resizing_use_cookie", true)) {
+                    var expires = new Date();
+                    expires.setTime(expires.getTime() + 3600000 * 24 * 30);
+                    // Set the cookies
+                    TinyMCE_AdvancedTheme._setCookie("TinyMCE_" + editorId + "_width", "" + (resizer.horizontal ? resizer.width + dx : ""), expires);
+                    TinyMCE_AdvancedTheme._setCookie("TinyMCE_" + editorId + "_height", "" + (resizer.height + dy), expires);
+                }
+                break;
+        }
+    },
+    /**
+     * Starts/stops the editor resizing.
+     */
+    _setResizing : function(e, editor_id, state) {
+        e = typeof(e) == "undefined" ? window.event : e;
+        var resizer = TinyMCE_AdvancedTheme._resizer;
+        var editorContainer = document.getElementById(editor_id + '_parent');
+        var editorArea = document.getElementById(editor_id + '_parent').firstChild;
+        var resizeBox = document.getElementById(editor_id + '_resize_box');
+        var inst = tinyMCE.getInstanceById(editor_id);
+        if (state) {
+            // Place box over editor area
+            var width = editorArea.clientWidth;
+            var height = editorArea.clientHeight;
+            resizeBox.style.width = width + "px";
+            resizeBox.style.height = height + "px";
+            resizer.iframeWidth = inst.iframeElement.clientWidth;
+            resizer.iframeHeight = inst.iframeElement.clientHeight;
+            // Hide editor and show resize box
+            editorArea.style.display = "none";
+            resizeBox.style.display = "block";
+            // Add event handlers, only once
+            if (!resizer.eventHandlers) {
+                if (tinyMCE.isMSIE)
+                    tinyMCE.addEvent(document, "mousemove", TinyMCE_AdvancedTheme._resizeEventHandler);
+                else
+                    tinyMCE.addEvent(window, "mousemove", TinyMCE_AdvancedTheme._resizeEventHandler);
+                tinyMCE.addEvent(document, "mouseup", TinyMCE_AdvancedTheme._resizeEventHandler);
+                resizer.eventHandlers = true;
+            }
+            resizer.resizing = true;
+            resizer.downX = e.screenX;
+            resizer.downY = e.screenY;
+            resizer.width = parseInt(resizeBox.style.width);
+            resizer.height = parseInt(resizeBox.style.height);
+            resizer.editorId = editor_id;
+            resizer.resizeBox = resizeBox;
+            resizer.horizontal = tinyMCE.getParam("theme_advanced_resize_horizontal", true);
+        } else {
+            resizer.resizing = false;
+            resizeBox.style.display = "none";
+            editorArea.style.display = tinyMCE.isMSIE && !tinyMCE.isOpera ? "block" : "table";
+            tinyMCE.execCommand('mceResetDesignMode');
+        }
+    },
+    _insertImage : function(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout) {
+        tinyMCE.execCommand('mceBeginUndoLevel');
+        if (src == "")
+            return;
+        if (!tinyMCE.imgElement && tinyMCE.isSafari) {
+            var html = "";
+            html += '<img src="' + src + '" alt="' + alt + '"';
+            html += ' border="' + border + '" hspace="' + hspace + '"';
+            html += ' vspace="' + vspace + '" width="' + width + '"';
+            html += ' height="' + height + '" align="' + align + '" title="' + title + '" onmouseover="' + onmouseover + '" onmouseout="' + onmouseout + '" />';
+            tinyMCE.execCommand("mceInsertContent", false, html);
+        } else {
+            if (!tinyMCE.imgElement && tinyMCE.selectedInstance) {
+                if (tinyMCE.isSafari)
+                    tinyMCE.execCommand("mceInsertContent", false, '<img src="' + tinyMCE.uniqueURL + '" />');
+                else
+                    tinyMCE.selectedInstance.contentDocument.execCommand("insertimage", false, tinyMCE.uniqueURL);
+                tinyMCE.imgElement = tinyMCE.getElementByAttributeValue(tinyMCE.selectedInstance.contentDocument.body, "img", "src", tinyMCE.uniqueURL);
+            }
+        }
+        if (tinyMCE.imgElement) {
+            var needsRepaint = false;
+            var msrc = src;
+            src = eval(tinyMCE.settings['urlconverter_callback'] + "(src, tinyMCE.imgElement);");
+            if (tinyMCE.getParam('convert_urls'))
+                msrc = src;
+            if (onmouseover && onmouseover != "")
+                onmouseover = "this.src='" + eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseover, tinyMCE.imgElement);") + "';";
+            if (onmouseout && onmouseout != "")
+                onmouseout = "this.src='" + eval(tinyMCE.settings['urlconverter_callback'] + "(onmouseout, tinyMCE.imgElement);") + "';";
+            // Use alt as title if it's undefined
+            if (typeof(title) == "undefined")
+                title = alt;
+            if (width != tinyMCE.imgElement.getAttribute("width") || height != tinyMCE.imgElement.getAttribute("height") || align != tinyMCE.imgElement.getAttribute("align"))
+                needsRepaint = true;
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'src', src);
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'mce_src', msrc);
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'alt', alt);
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'title', title);
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'align', align);
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'border', border, true);
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'hspace', hspace, true);
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'vspace', vspace, true);
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'width', width, true);
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'height', height, true);
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'onmouseover', onmouseover);
+            tinyMCE.setAttrib(tinyMCE.imgElement, 'onmouseout', onmouseout);
+            // Fix for bug #989846 - Image resize bug
+            if (width && width != "")
+                tinyMCE.imgElement.style.pixelWidth = width;
+            if (height && height != "")
+                tinyMCE.imgElement.style.pixelHeight = height;
+            if (needsRepaint)
+                tinyMCE.selectedInstance.repaint();
+        }
+        tinyMCE.execCommand('mceEndUndoLevel');
+    },
+    _insertLink : function(href, target, title, onclick, style_class) {
+        tinyMCE.execCommand('mceBeginUndoLevel');
+        if (tinyMCE.selectedInstance && tinyMCE.selectedElement && tinyMCE.selectedElement.nodeName.toLowerCase() == "img") {
+            var doc = tinyMCE.selectedInstance.getDoc();
+            var linkElement = tinyMCE.getParentElement(tinyMCE.selectedElement, "a");
+            var newLink = false;
+            if (!linkElement) {
+                linkElement = doc.createElement("a");
+                newLink = true;
+            }
+            var mhref = href;
+            var thref = eval(tinyMCE.settings['urlconverter_callback'] + "(href, linkElement);");
+            mhref = tinyMCE.getParam('convert_urls') ? href : mhref;
+            tinyMCE.setAttrib(linkElement, 'href', thref);
+            tinyMCE.setAttrib(linkElement, 'mce_href', mhref);
+            tinyMCE.setAttrib(linkElement, 'target', target);
+            tinyMCE.setAttrib(linkElement, 'title', title);
+            tinyMCE.setAttrib(linkElement, 'onclick', onclick);
+            tinyMCE.setAttrib(linkElement, 'class', style_class);
+            if (newLink) {
+                linkElement.appendChild(tinyMCE.selectedElement.cloneNode(true));
+                tinyMCE.selectedElement.parentNode.replaceChild(linkElement, tinyMCE.selectedElement);
+            }
+            return;
+        }
+        if (!tinyMCE.linkElement && tinyMCE.selectedInstance) {
+            if (tinyMCE.isSafari) {
+                tinyMCE.execCommand("mceInsertContent", false, '<a href="' + tinyMCE.uniqueURL + '">' + tinyMCE.selectedInstance.selection.getSelectedHTML() + '</a>');
+            } else
+                tinyMCE.selectedInstance.contentDocument.execCommand("createlink", false, tinyMCE.uniqueURL);
+            tinyMCE.linkElement = tinyMCE.getElementByAttributeValue(tinyMCE.selectedInstance.contentDocument.body, "a", "href", tinyMCE.uniqueURL);
+            var elementArray = tinyMCE.getElementsByAttributeValue(tinyMCE.selectedInstance.contentDocument.body, "a", "href", tinyMCE.uniqueURL);
+            for (var i=0; i<elementArray.length; i++) {
+                var mhref = href;
+                var thref = eval(tinyMCE.settings['urlconverter_callback'] + "(href, elementArray[i]);");
+                mhref = tinyMCE.getParam('convert_urls') ? href : mhref;
+                tinyMCE.setAttrib(elementArray[i], 'href', thref);
+                tinyMCE.setAttrib(elementArray[i], 'mce_href', mhref);
+                tinyMCE.setAttrib(elementArray[i], 'target', target);
+                tinyMCE.setAttrib(elementArray[i], 'title', title);
+                tinyMCE.setAttrib(elementArray[i], 'onclick', onclick);
+                tinyMCE.setAttrib(elementArray[i], 'class', style_class);
+            }
+            tinyMCE.linkElement = elementArray[0];
+        }
+        if (tinyMCE.linkElement) {
+            var mhref = href;
+            href = eval(tinyMCE.settings['urlconverter_callback'] + "(href, tinyMCE.linkElement);");
+            mhref = tinyMCE.getParam('convert_urls') ? href : mhref;
+            tinyMCE.setAttrib(tinyMCE.linkElement, 'href', href);
+            tinyMCE.setAttrib(tinyMCE.linkElement, 'mce_href', mhref);
+            tinyMCE.setAttrib(tinyMCE.linkElement, 'target', target);
+            tinyMCE.setAttrib(tinyMCE.linkElement, 'title', title);
+            tinyMCE.setAttrib(tinyMCE.linkElement, 'onclick', onclick);
+            tinyMCE.setAttrib(tinyMCE.linkElement, 'class', style_class);
+        }
+        tinyMCE.execCommand('mceEndUndoLevel');
+    }
+};
+tinyMCE.addTheme("advanced", TinyMCE_AdvancedTheme);
+// Add default buttons maps for advanced theme and all internal plugins
+tinyMCE.addButtonMap(TinyMCE_AdvancedTheme._buttonMap);
+ tinyMCE.importThemeLanguagePack('advanced');var TinyMCE_advanced_autoImportCSSClasses=true;var TinyMCE_advanced_resizer=new Object();var TinyMCE_advanced_buttons=[['bold','{$lang_bold_img}','{$lang_bold_desc}','Bold'],['italic','{$lang_italic_img}','{$lang_italic_desc}','Italic'],['underline','{$lang_underline_img}','{$lang_underline_desc}','Underline'],['strikethrough','strikethrough.gif','{$lang_striketrough_desc}','Strikethrough'],['justifyleft','left.gif','{$lang_justifyleft_desc}','JustifyLeft'],['justifycenter','center.gif','{$lang_justifycenter_desc}','JustifyCenter'],['justifyright','right.gif','{$lang_justifyright_desc}','JustifyRight'],['justifyfull','full.gif','{$lang_justifyfull_desc}','JustifyFull'],['bullist','bullist.gif','{$lang_bullist_desc}','InsertUnorderedList'],['numlist','numlist.gif','{$lang_numlist_desc}','InsertOrderedList'],['outdent','outdent.gif','{$lang_outdent_desc}','Outdent'],['indent','indent.gif','{$lang_indent_desc}','Indent'],['cut','cut.gif','{$lang_cut_desc}','Cut'],['copy','copy.gif','{$lang_copy_desc}','Copy'],['paste','paste.gif','{$lang_paste_desc}','Paste'],['undo','undo.gif','{$lang_undo_desc}','Undo'],['redo','redo.gif','{$lang_redo_desc}','Redo'],['link','link.gif','{$lang_link_desc}','mceLink',true],['unlink','unlink.gif','{$lang_unlink_desc}','unlink'],['image','image.gif','{$lang_image_desc}','mceImage',true],['cleanup','cleanup.gif','{$lang_cleanup_desc}','mceCleanup'],['help','help.gif','{$lang_help_desc}','mceHelp'],['code','code.gif','{$lang_theme_code_desc}','mceCodeEditor'],['hr','hr.gif','{$lang_theme_hr_desc}','inserthorizontalrule'],['removeformat','removeformat.gif','{$lang_theme_removeformat_desc}','removeformat'],['sub','sub.gif','{$lang_theme_sub_desc}','subscript'],['sup','sup.gif','{$lang_theme_sup_desc}','superscript'],['forecolor','forecolor.gif','{$lang_theme_forecolor_desc}','mceForeColor',true],['backcolor','backcolor.gif','{$lang_theme_backcolor_desc}','mceBackColor',true],['charmap','charmap.gif','{$lang_theme_charmap_desc}','mceCharMap'],['visualaid','visualaid.gif','{$lang_theme_visualaid_desc}','mceToggleVisualAid'],['anchor','anchor.gif','{$lang_theme_anchor_desc}','mceInsertAnchor'],['newdocument','newdocument.gif','{$lang_newdocument_desc}','mceNewDocument']];function TinyMCE_advanced_getControlHTML(button_name){var buttonTileMap=new Array('anchor.gif','backcolor.gif','bullist.gif','center.gif','charmap.gif','cleanup.gif','code.gif','copy.gif','custom_1.gif','cut.gif','forecolor.gif','full.gif','help.gif','hr.gif','image.gif','indent.gif','left.gif','link.gif','numlist.gif','outdent.gif','paste.gif','redo.gif','removeformat.gif','right.gif','strikethrough.gif','sub.gif','sup.gif','undo.gif','unlink.gif','visualaid.gif');for(var i=0;i<TinyMCE_advanced_buttons.length;i++){var but=TinyMCE_advanced_buttons[i];if(but[0]==button_name){if(tinyMCE.settings['button_tile_map']){for(var x=0;!tinyMCE.isMSIE&&x<buttonTileMap.length;x++){if(buttonTileMap[x]==but[1]){var cmd='tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+but[3]+'\','+(but.length>4?but[4]:false)+(but.length>5?',\''+but[5]+'\'':'')+')';return '<a href="javascript:'+cmd+'" onclick="'+cmd+';return false;" onmousedown="return false;" target="_self"><img id="{$editor_id}_'+but[0]+'" src="{$themeurl}/images/spacer.gif" style="background-image:url({$themeurl}/images/buttons.gif); background-position: '+(0-(x*20))+'px 0px" title="'+but[2]+'" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>';}}}var cmd='tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+but[3]+'\','+(but.length>4?but[4]:false)+(but.length>5?',\''+but[5]+'\'':'')+')';return '<a href="javascript:'+cmd+'" onclick="'+cmd+';return false;" onmousedown="return false;" target="_self"><img id="{$editor_id}_'+but[0]+'" src="{$themeurl}/images/'+but[1]+'" title="'+but[2]+'" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>';}}switch(button_name){case "formatselect":var html='<select id="{$editor_id}_formatSelect" name="{$editor_id}_formatSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FormatBlock\',false,this.options[this.selectedIndex].value);" class="mceSelectList">';var formats=tinyMCE.getParam("theme_advanced_blockformats","p,address,pre,h1,h2,h3,h4,h5,h6",true).split(',');var lookup=[['p','{$lang_theme_paragraph}'],['address','{$lang_theme_address}'],['pre','{$lang_theme_pre}'],['h1','{$lang_theme_h1}'],['h2','{$lang_theme_h2}'],['h3','{$lang_theme_h3}'],['h4','{$lang_theme_h4}'],['h5','{$lang_theme_h5}'],['h6','{$lang_theme_h6}']];html+='<option value="">{$lang_theme_block}</option>';for(var i=0;i<formats.length;i++){for(var x=0;x<lookup.length;x++){if(formats[i]==lookup[x][0]){html+='<option value="<'+lookup[x][0]+'>">'+lookup[x][1]+'</option>';}}}html+='</select>';return html;case "styleselect":return '<select id="{$editor_id}_styleSelect" onmousedown="TinyMCE_advanced_setupCSSClasses(\'{$editor_id}\');" name="{$editor_id}_styleSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceSetCSSClass\',false,this.options[this.selectedIndex].value);" class="mceSelectList">{$style_select_options}</select>';case "fontselect":var fontHTML='<select id="{$editor_id}_fontNameSelect" name="{$editor_id}_fontNameSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontName\',false,this.options[this.selectedIndex].value);" class="mceSelectList"><option value="">{$lang_theme_fontdefault}</option>';var iFonts='Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';var nFonts='Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sand;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats';var fonts=tinyMCE.getParam("theme_advanced_fonts",nFonts).split(';');for(var i=0;i<fonts.length;i++){if(fonts[i]!=''){var parts=fonts[i].split('=');fontHTML+='<option value="'+parts[1]+'">'+parts[0]+'</option>';}}fontHTML+='</select>';return fontHTML;case "fontsizeselect":return '<select id="{$editor_id}_fontSizeSelect" name="{$editor_id}_fontSizeSelect" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'FontSize\',false,this.options[this.selectedIndex].value);" class="mceSelectList">\
+        <option value="0">{$lang_theme_font_size}</option>\
+        <option value="1">1 (8 pt)</option>\
+        <option value="2">2 (10 pt)</option>\
+        <option value="3">3 (12 pt)</option>\
+        <option value="4">4 (14 pt)</option>\
+        <option value="5">5 (18 pt)</option>\
+        <option value="6">6 (24 pt)</option>\
+        <option value="7">7 (36 pt)</option>\
+        </select>';case "|":case "separator":return '<img src="{$themeurl}/images/spacer.gif" width="1" height="15" class="mceSeparatorLine">';case "spacer":return '<img src="{$themeurl}/images/spacer.gif" width="1" height="15" border="0" class="mceSeparatorLine" style="vertical-align: middle" />';case "rowseparator":return '<br />';}return "";}function TinyMCE_advanced_execCommand(editor_id,element,command,user_interface,value){switch(command){case "mceForeColor":var template=new Array();var elm=tinyMCE.selectedInstance.getFocusElement();var inputColor=tinyMCE.getAttrib(elm,"color");if(inputColor=='')inputColor=elm.style.color;if(!inputColor)inputColor="#000000";template['file']='color_picker.htm';template['width']=220;template['height']=190;tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes",command:"forecolor",input_color:inputColor});return true;case "mceBackColor":var template=new Array();var elm=tinyMCE.selectedInstance.getFocusElement();var inputColor=elm.style.backgroundColor;if(!inputColor)inputColor="#000000";template['file']='color_picker.htm';template['width']=220;template['height']=190;template['width']+=tinyMCE.getLang('lang_theme_advanced_backcolor_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_backcolor_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes",command:"HiliteColor",input_color:inputColor});return true;case "mceColorPicker":if(user_interface){var template=new Array();var inputColor=value['document'].getElementById(value['element_id']).value;template['file']='color_picker.htm';template['width']=220;template['height']=190;template['close_previous']="no";template['width']+=tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_colorpicker_delta_height',0);if(typeof(value['store_selection'])=="undefined")value['store_selection']=true;tinyMCE.lastColorPickerValue=value;tinyMCE.openWindow(template,{editor_id:editor_id,mce_store_selection:value['store_selection'],inline:"yes",command:"mceColorPicker",input_color:inputColor});}else{var savedVal=tinyMCE.lastColorPickerValue;var elm=savedVal['document'].getElementById(savedVal['element_id']);elm.value=value;eval('elm.onchange();');}return true;case "mceCodeEditor":var template=new Array();template['file']='source_editor.htm';template['width']=parseInt(tinyMCE.getParam("theme_advanced_source_editor_width",500));template['height']=parseInt(tinyMCE.getParam("theme_advanced_source_editor_height",400));tinyMCE.openWindow(template,{editor_id:editor_id,resizable:"yes",scrollbars:"no",inline:"yes"});return true;case "mceCharMap":var template=new Array();template['file']='charmap.htm';template['width']=550+(tinyMCE.isOpera?40:0);template['height']=250;template['width']+=tinyMCE.getLang('lang_theme_advanced_charmap_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_charmap_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true;case "mceInsertAnchor":var template=new Array();template['file']='anchor.htm';template['width']=320;template['height']=90+(tinyMCE.isNS7?30:0);template['width']+=tinyMCE.getLang('lang_theme_advanced_anchor_delta_width',0);template['height']+=tinyMCE.getLang('lang_theme_advanced_anchor_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true;case "mceNewDocument":if(confirm(tinyMCE.getLang('lang_newdocument')))tinyMCE.execInstanceCommand(editor_id,'mceSetContent',false,'');return true;}return false;}function TinyMCE_advanced_getEditorTemplate(settings,editorId){function removeFromArray(in_array,remove_array){var outArray=new Array();for(var i=0;i<in_array.length;i++){skip=false;for(var j=0;j<remove_array.length;j++){if(in_array[i]==remove_array[j]){skip=true;}}if(!skip){outArray[outArray.length]=in_array[i];}}return outArray;}function addToArray(in_array,add_array){for(var i=0;i<add_array.length;i++){in_array[in_array.length]=add_array[i];}return in_array;}var template=new Array();var deltaHeight=0;var resizing=tinyMCE.getParam("theme_advanced_resizing",false);var path=tinyMCE.getParam("theme_advanced_path",true);var statusbarHTML='<div id="{$editor_id}_path" class="mceStatusbarPathText" style="display: '+(path?"block":"none")+'">&nbsp;</div><div id="{$editor_id}_resize" class="mceStatusbarResize" style="display: '+(resizing?"block":"none")+'" onmousedown="TinyMCE_advanced_setResizing(event,\'{$editor_id}\',true);"></div><br style="clear: both" />';var layoutManager=tinyMCE.getParam("theme_advanced_layout_manager","SimpleLayout");var styleSelectHTML='<option value="">{$lang_theme_style_select}</option>';if(settings['theme_advanced_styles']){var stylesAr=settings['theme_advanced_styles'].split(';');for(var i=0;i<stylesAr.length;i++){var key,value;key=stylesAr[i].split('=')[0];value=stylesAr[i].split('=')[1];styleSelectHTML+='<option value="'+value+'">'+key+'</option>';}TinyMCE_advanced_autoImportCSSClasses=false;}switch(layoutManager){case "SimpleLayout":var toolbarHTML="";var toolbarLocation=tinyMCE.getParam("theme_advanced_toolbar_location","bottom");var toolbarAlign=tinyMCE.getParam("theme_advanced_toolbar_align","center");var pathLocation=tinyMCE.getParam("theme_advanced_path_location","none");var statusbarLocation=tinyMCE.getParam("theme_advanced_statusbar_location",pathLocation);var defVals={theme_advanced_buttons1:"bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,separator,sub,sup,separator,charmap"};/*toolbarHTML+='<a href="#" accesskey="q" title="'+tinyMCE.getLang("lang_toolbar_focus")+'"></a>';*/for(var i=1;i<100;i++){var def=defVals["theme_advanced_buttons"+i];var buttons=tinyMCE.getParam("theme_advanced_buttons"+i,def==null?'':def,true,',');if(buttons.length==0)break;buttons=removeFromArray(buttons,tinyMCE.getParam("theme_advanced_disable","",true,','));buttons=addToArray(buttons,tinyMCE.getParam("theme_advanced_buttons"+i+"_add","",true,','));buttons=addToArray(tinyMCE.getParam("theme_advanced_buttons"+i+"_add_before","",true,','),buttons);for(var b=0;b<buttons.length;b++)toolbarHTML+=tinyMCE.getControlHTML(buttons[b]);if(buttons.length>0){toolbarHTML+="<br />";deltaHeight-=23;}}toolbarHTML+='<a href="#" accesskey="z" onfocus="tinyMCE.getInstanceById(\''+editorId+'\').getWin().focus();"></a>';template['html']='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';if(toolbarLocation=="top"){template['html']+='<tr><td class="mceToolbarTop" align="'+toolbarAlign+'" height="1" nowrap="nowrap">'+toolbarHTML+'</td></tr>';}if(statusbarLocation=="top"){template['html']+='<tr><td class="mceStatusbarTop" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=23;}template['html']+='<tr><td align="center"><span id="{$editor_id}"></span></td></tr>';if(toolbarLocation=="bottom"){template['html']+='<tr><td class="mceToolbarBottom" align="'+toolbarAlign+'" height="1">'+toolbarHTML+'</td></tr>';}if(toolbarLocation=="external"){var bod=document.body;var elm=document.createElement("div");toolbarHTML=tinyMCE.replaceVars(toolbarHTML,tinyMCE.settings);toolbarHTML=tinyMCE.replaceVars(toolbarHTML,tinyMCELang);toolbarHTML=tinyMCE.replaceVar(toolbarHTML,'style_select_options',styleSelectHTML);toolbarHTML=tinyMCE.replaceVar(toolbarHTML,"editor_id",editorId);toolbarHTML=tinyMCE.applyTemplate(toolbarHTML);elm.className="mceToolbarExternal";elm.id=editorId+"_toolbar";elm.innerHTML='<table width="100%" border="0" align="center"><tr><td align="center">'+toolbarHTML+'</td></tr></table>';bod.appendChild(elm);deltaHeight=0;tinyMCE.getInstanceById(editorId).toolbarElement=elm;}else{tinyMCE.getInstanceById(editorId).toolbarElement=null;}if(statusbarLocation=="bottom"){template['html']+='<tr><td class="mceStatusbarBottom" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=23;}template['html']+='</tbody></table>';break;case "RowLayout":template['html']='<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width}px;height:{$height}px"><tbody>';var containers=tinyMCE.getParam("theme_advanced_containers","",true,",");var defaultContainerCSS=tinyMCE.getParam("theme_advanced_containers_default_class","container");var defaultContainerAlign=tinyMCE.getParam("theme_advanced_containers_default_align","center");for(var i=0;i<containers.length;i++){if(containers[i]=="mceEditor"){template['html']+='<tr><td align="center" class="mceEditor_border">\
+                                                <span id="{$editor_id}"></span>\
+                                                </td></tr>';}else if(containers[i]=="mceElementpath"||containers[i]=="mceStatusbar"){var pathClass="mceStatusbar";if(i==containers.length-1){pathClass="mceStatusbarBottom";}else if(i==0){pathClass="mceStatusbar";}else{deltaHeight-=2;}template['html']+='<tr><td class="'+pathClass+'" height="1">'+statusbarHTML+'</td></tr>';deltaHeight-=22;}else{var curContainer=tinyMCE.getParam("theme_advanced_container_"+containers[i],"",true,',');var curContainerHTML="";var curAlign=tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_align",defaultContainerAlign);var curCSS=tinyMCE.getParam("theme_advanced_container_"+containers[i]+"_class",defaultContainerCSS);for(var j=0;j<curContainer.length;j++){curContainerHTML+=tinyMCE.getControlHTML(curContainer[j]);}if(curContainer.length>0){curContainerHTML+="<br />";deltaHeight-=23;}template['html']+='<tr><td class="'+curCSS+'" align="'+curAlign+'" height="1">'+curContainerHTML+'</td></tr>';}}template['html']+='</tbody></table>';break;case "BorderLayout":break;case "CustomLayout":var customLayout=tinyMCE.getParam("theme_advanced_custom_layout","");if(customLayout!=""&&eval("typeof("+customLayout+")")!="undefined"){template=eval(customLayout+"(template);");}break;default:alert('UNDEFINED LAYOUT MANAGER! PLEASE CHECK YOUR TINYMCE CONFIG!');break;}template['html']+='<div id="{$editor_id}_resize_box" class="mceResizeBox"></div>';template['html']=tinyMCE.replaceVar(template['html'],'style_select_options',styleSelectHTML);template['delta_width']=0;template['delta_height']=deltaHeight;return template;}function TinyMCE_advanced_setResizing(e,editor_id,state){e=typeof(e)=="undefined"?window.event:e;var resizer=TinyMCE_advanced_resizer;var editorContainer=document.getElementById(editor_id+'_parent');var editorArea=document.getElementById(editor_id+'_parent').firstChild;var resizeBox=document.getElementById(editor_id+'_resize_box');var inst=tinyMCE.getInstanceById(editor_id);if(state){var width=editorArea.clientWidth;var height=editorArea.clientHeight;resizeBox.style.width=width+"px";resizeBox.style.height=height+"px";resizer.iframeWidth=inst.iframeElement.clientWidth;resizer.iframeHeight=inst.iframeElement.clientHeight;editorArea.style.display="none";resizeBox.style.display="block";if(!resizer.eventHandlers){if(tinyMCE.isMSIE)tinyMCE.addEvent(document,"mousemove",TinyMCE_advanced_resizeEventHandler);else tinyMCE.addEvent(window,"mousemove",TinyMCE_advanced_resizeEventHandler);tinyMCE.addEvent(document,"mouseup",TinyMCE_advanced_resizeEventHandler);resizer.eventHandlers=true;}resizer.resizing=true;resizer.downX=e.screenX;resizer.downY=e.screenY;resizer.width=parseInt(resizeBox.style.width);resizer.height=parseInt(resizeBox.style.height);resizer.editorId=editor_id;resizer.resizeBox=resizeBox;resizer.horizontal=tinyMCE.getParam("theme_advanced_resize_horizontal",true);}else{resizer.resizing=false;resizeBox.style.display="none";editorArea.style.display=tinyMCE.isMSIE?"block":"table";tinyMCE.execCommand('mceResetDesignMode');}}function TinyMCE_advanced_initInstance(inst){if(tinyMCE.getParam("theme_advanced_resizing",false)){if(tinyMCE.getParam("theme_advanced_resizing_use_cookie",true)){var w=TinyMCE_advanced_getCookie("TinyMCE_"+inst.editorId+"_width");var h=TinyMCE_advanced_getCookie("TinyMCE_"+inst.editorId+"_height");TinyMCE_advanced_resizeTo(inst,w,h,tinyMCE.getParam("theme_advanced_resize_horizontal",true));}}}function TinyMCE_advanced_setCookie(name,value,expires,path,domain,secure){var curCookie=name+"="+escape(value)+((expires)?"; expires="+expires.toGMTString():"")+((path)?"; path="+escape(path):"")+((domain)?"; domain="+domain:"")+((secure)?"; secure":"");document.cookie=curCookie;}function TinyMCE_advanced_getCookie(name){var dc=document.cookie;var prefix=name+"=";var begin=dc.indexOf("; "+prefix);if(begin==-1){begin=dc.indexOf(prefix);if(begin!=0)return null;}else begin+=2;var end=document.cookie.indexOf(";",begin);if(end==-1)end=dc.length;return unescape(dc.substring(begin+prefix.length,end));}function TinyMCE_advanced_resizeTo(inst,w,h,set_w){var editorContainer=document.getElementById(inst.editorId+'_parent');var tableElm=editorContainer.firstChild;var iframe=inst.iframeElement;if(w==null||w=="null"){set_w=false;w=0;}if(h==null||h=="null")return;w=parseInt(w);h=parseInt(h);if(tinyMCE.isGecko){w+=2;h+=2;}var dx=w-tableElm.clientWidth;var dy=h-tableElm.clientHeight;if(set_w)tableElm.style.width=w+"px";tableElm.style.height=h+"px";iw=iframe.clientWidth+dx;ih=iframe.clientHeight+dy;if(tinyMCE.isGecko){iw-=2;ih-=2;}if(set_w)iframe.style.width=iw+"px";iframe.style.height=ih+"px";if(set_w){var tableBodyElm=tableElm.firstChild;var minIframeWidth=tableBodyElm.scrollWidth;if(inst.iframeElement.clientWidth<minIframeWidth){dx=minIframeWidth-inst.iframeElement.clientWidth;inst.iframeElement.style.width=(iw+dx)+"px";}}}function TinyMCE_advanced_resizeEventHandler(e){var resizer=TinyMCE_advanced_resizer;if(!resizer.resizing)return;e=typeof(e)=="undefined"?window.event:e;var dx=e.screenX-resizer.downX;var dy=e.screenY-resizer.downY;var resizeBox=resizer.resizeBox;var editorId=resizer.editorId;switch(e.type){case "mousemove":if(resizer.horizontal)resizeBox.style.width=(resizer.width+dx)+"px";resizeBox.style.height=(resizer.height+dy)+"px";break;case "mouseup":TinyMCE_advanced_setResizing(e,editorId,false);TinyMCE_advanced_resizeTo(tinyMCE.getInstanceById(editorId),resizer.width+dx,resizer.height+dy,resizer.horizontal);if(tinyMCE.getParam("theme_advanced_resizing_use_cookie",true)){var expires=new Date();expires.setTime(expires.getTime()+3600000*24*30);TinyMCE_advanced_setCookie("TinyMCE_"+editorId+"_width",""+(resizer.horizontal?resizer.width+dx:""),expires);TinyMCE_advanced_setCookie("TinyMCE_"+editorId+"_height",""+(resizer.height+dy),expires);}break;}}function TinyMCE_advanced_getInsertLinkTemplate(){var template=new Array();template['file']='link.htm';template['width']=330;template['height']=160;template['width']+=tinyMCE.getLang('lang_insert_link_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_link_delta_height',0);return template;};function TinyMCE_advanced_getInsertImageTemplate(){var template=new Array();template['file']='image.htm?src={$src}';template['width']=340;template['height']=165;template['width']+=tinyMCE.getLang('lang_insert_image_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_image_delta_height',0);return template;};function TinyMCE_advanced_handleNodeChange(editor_id,node,undo_index,undo_levels,visual_aid,any_selection,setup_content){function selectByValue(select_elm,value,first_index){first_index=typeof(first_index)=="undefined"?false:true;if(select_elm){for(var i=0;i<select_elm.options.length;i++){var ov=""+select_elm.options[i].value;if(first_index&&ov.toLowerCase().indexOf(value.toLowerCase())==0){select_elm.selectedIndex=i;return true;}if(ov==value){select_elm.selectedIndex=i;return true;}}}return false;};function getAttrib(elm,name){return elm.getAttribute(name)?elm.getAttribute(name):"";};if(node==null){return;}var pathElm=document.getElementById(editor_id+"_path");var inst=tinyMCE.getInstanceById(editor_id);var doc=inst.getDoc();if(pathElm){var parentNode=node;var path=new Array();while(parentNode!=null){if(parentNode.nodeName.toUpperCase()=="BODY"){break;}if(parentNode.nodeType==1){path[path.length]=parentNode;}parentNode=parentNode.parentNode;}var html="";for(var i=path.length-1;i>=0;i--){var nodeName=path[i].nodeName.toLowerCase();var nodeData="";if(nodeName=="b"){nodeName="strong";}if(nodeName=="i"){nodeName="em";}if(nodeName=="span"){var cn=tinyMCE.getAttrib(path[i],"class");if(cn!=""&&cn.indexOf('mceItem')==-1)nodeData+="class: "+cn+" ";var st=tinyMCE.getAttrib(path[i],"style");if(st!=""){st=tinyMCE.serializeStyle(tinyMCE.parseStyle(st));nodeData+="style: "+st+" ";}}if(nodeName=="font"){if(tinyMCE.getParam("convert_fonts_to_spans"))nodeName="span";var face=tinyMCE.getAttrib(path[i],"face");if(face!="")nodeData+="font: "+face+" ";var size=tinyMCE.getAttrib(path[i],"size");if(size!="")nodeData+="size: "+size+" ";var color=tinyMCE.getAttrib(path[i],"color");if(color!="")nodeData+="color: "+color+" ";}if(getAttrib(path[i],'id')!=""){nodeData+="id: "+path[i].getAttribute('id')+" ";}var className=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i],"class"),false);if(className!=""&&className.indexOf('mceItem')==-1)nodeData+="class: "+className+" ";if(getAttrib(path[i],'src')!=""){nodeData+="src: "+path[i].getAttribute('src')+" ";}if(getAttrib(path[i],'href')!=""){nodeData+="href: "+path[i].getAttribute('href')+" ";}if(nodeName=="img"&&tinyMCE.getAttrib(path[i],"class").indexOf('mceItemFlash')!=-1){nodeName="flash";nodeData="src: "+path[i].getAttribute('title');}if(nodeName=="a"&&(anchor=tinyMCE.getAttrib(path[i],"name"))!=""){nodeName="a";nodeName+="#"+anchor;nodeData="";}if(getAttrib(path[i],'name').indexOf("mce_")!=0){var className=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i],"class"),false);if(className!=""&&className.indexOf('mceItem')==-1){nodeName+="."+className;}}var cmd='tinyMCE.execInstanceCommand(\''+editor_id+'\',\'mceSelectNodeDepth\',false,\''+i+'\');';html+='<a title="'+nodeData+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" target="_self" class="mcePathItem">'+nodeName+'</a>';if(i>0){html+=" &raquo; ";}}pathElm.innerHTML='<a href="#" accesskey="x"></a>'+tinyMCE.getLang('lang_theme_path')+": "+html+'&nbsp;';}tinyMCE.switchClassSticky(editor_id+'_justifyleft','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_justifyright','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_justifycenter','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_justifyfull','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_bold','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_italic','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_underline','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_strikethrough','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_bullist','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_numlist','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_sub','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_sup','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_anchor','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_link','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_unlink','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_outdent','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_image','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_hr','mceButtonNormal');if(node.nodeName=="A"&&tinyMCE.getAttrib(node,"class").indexOf('mceItemAnchor')!=-1)tinyMCE.switchClassSticky(editor_id+'_anchor','mceButtonSelected');var anchorLink=tinyMCE.getParentElement(node,"a","href");if(anchorLink||any_selection){tinyMCE.switchClassSticky(editor_id+'_link',anchorLink?'mceButtonSelected':'mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_unlink',anchorLink?'mceButtonSelected':'mceButtonNormal',false);}tinyMCE.switchClassSticky(editor_id+'_visualaid',visual_aid?'mceButtonSelected':'mceButtonNormal',false);if(undo_levels!=-1){tinyMCE.switchClassSticky(editor_id+'_undo','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_redo','mceButtonDisabled',true);}if(tinyMCE.getParentElement(node,"li,blockquote")){tinyMCE.switchClassSticky(editor_id+'_outdent','mceButtonNormal',false);}if(undo_index!=-1&&(undo_index<undo_levels-1&&undo_levels>0)){tinyMCE.switchClassSticky(editor_id+'_redo','mceButtonNormal',false);}if(undo_index!=-1&&(undo_index>0&&undo_levels>0)){tinyMCE.switchClassSticky(editor_id+'_undo','mceButtonNormal',false);}var selectElm=document.getElementById(editor_id+"_styleSelect");if(selectElm){TinyMCE_advanced_setupCSSClasses(editor_id);classNode=node;breakOut=false;var index=0;do{if(classNode&&classNode.className){for(var i=0;i<selectElm.options.length;i++){if(selectElm.options[i].value==classNode.className){index=i;breakOut=true;break;}}}}while(!breakOut&&classNode!=null&&(classNode=classNode.parentNode)!=null);selectElm.selectedIndex=index;}var selectElm=document.getElementById(editor_id+"_formatSelect");if(selectElm){var elm=tinyMCE.getParentElement(node,"p,div,h1,h2,h3,h4,h5,h6,pre,address");if(elm){selectByValue(selectElm,"<"+elm.nodeName.toLowerCase()+">");}else{selectByValue(selectElm,"");}}var selectElm=document.getElementById(editor_id+"_fontNameSelect");if(selectElm){if(!tinyMCE.isSafari&&!(tinyMCE.isMSIE&&!tinyMCE.isOpera)){var face=doc.queryCommandValue('FontName');face=face==null||face==""?"":face;selectByValue(selectElm,face,face!="");}else{var elm=tinyMCE.getParentElement(node,"font","face");if(elm){var family=tinyMCE.getAttrib(elm,"face");if(family=='')family=''+elm.style.fontFamily;if(!selectByValue(selectElm,family,family!=""))selectByValue(selectElm,"");}else selectByValue(selectElm,"");}}var selectElm=document.getElementById(editor_id+"_fontSizeSelect");if(selectElm){if(!tinyMCE.isSafari&&!tinyMCE.isOpera){var size=doc.queryCommandValue('FontSize');selectByValue(selectElm,size==null||size==""?"0":size);}else{var elm=tinyMCE.getParentElement(node,"font","size");if(elm){var size=tinyMCE.getAttrib(elm,"size");if(size==''){var sizes=new Array('','8px','10px','12px','14px','18px','24px','36px');size=''+elm.style.fontSize;for(var i=0;i<sizes.length;i++){if((''+sizes[i])==size){size=i;break;}}}if(!selectByValue(selectElm,size))selectByValue(selectElm,"");}else selectByValue(selectElm,"0");}}alignNode=node;breakOut=false;do{if(!alignNode.getAttribute||!alignNode.getAttribute('align')){continue;}switch(alignNode.getAttribute('align').toLowerCase()){case "left":tinyMCE.switchClassSticky(editor_id+'_justifyleft','mceButtonSelected');breakOut=true;break;case "right":tinyMCE.switchClassSticky(editor_id+'_justifyright','mceButtonSelected');breakOut=true;break;case "middle":case "center":tinyMCE.switchClassSticky(editor_id+'_justifycenter','mceButtonSelected');breakOut=true;break;case "justify":tinyMCE.switchClassSticky(editor_id+'_justifyfull','mceButtonSelected');breakOut=true;break;}}while(!breakOut&&(alignNode=alignNode.parentNode)!=null);var div=tinyMCE.getParentElement(node,"div");if(div&&div.style.textAlign=="center")tinyMCE.switchClassSticky(editor_id+'_justifycenter','mceButtonSelected');if(!setup_content){var ar=new Array("Bold","_bold","Italic","_italic","Strikethrough","_strikethrough","superscript","_sup","subscript","_sub");for(var i=0;i<ar.length;i+=2){if(doc.queryCommandState(ar[i]))tinyMCE.switchClassSticky(editor_id+ar[i+1],'mceButtonSelected');}if(doc.queryCommandState("Underline")&&(node.parentNode==null||node.parentNode.nodeName!="A")){tinyMCE.switchClassSticky(editor_id+'_underline','mceButtonSelected');}}do{switch(node.nodeName){case "UL":tinyMCE.switchClassSticky(editor_id+'_bullist','mceButtonSelected');break;case "OL":tinyMCE.switchClassSticky(editor_id+'_numlist','mceButtonSelected');break;case "HR":tinyMCE.switchClassSticky(editor_id+'_hr','mceButtonSelected');break;case "IMG":if(getAttrib(node,'name').indexOf('mce_')!=0){tinyMCE.switchClassSticky(editor_id+'_image','mceButtonSelected');}break;}}while((node=node.parentNode)!=null);};function TinyMCE_advanced_setupCSSClasses(editor_id){if(!TinyMCE_advanced_autoImportCSSClasses){return;}var selectElm=document.getElementById(editor_id+'_styleSelect');if(selectElm&&selectElm.getAttribute('cssImported')!='true'){var csses=tinyMCE.getCSSClasses(editor_id);if(csses&&selectElm){for(var i=0;i<csses.length;i++){selectElm.options[selectElm.length]=new Option(csses[i],csses[i]);}}if(csses!=null&&csses.length>0){selectElm.setAttribute('cssImported','true');}}};

trunk/wp-includes/js/tinymce/themes/advanced/image.htm

-                      r4431
+                      r3503
     <title>{$lang_insert_image_title}</title>
     <script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
-    <script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
     <script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
     <script language="javascript" type="text/javascript" src="jscripts/image.js"></script>
+    <base target="_self" />
+    <style type="text/css">
+        #insert, #cancel {
+            font: 13px Verdana, Arial, Helvetica, sans-serif;
+            height:auto;
+            width: auto;
+            background-color: transparent;
+            background-image: url(../../../../../wp-admin/images/fade-butt.png);
+            background-repeat: repeat;
+            border: 3px double;
+            border-right-color: rgb(153, 153, 153);
+            border-bottom-color: rgb(153, 153, 153);
+            border-left-color: rgb(204, 204, 204);
+            border-top-color: rgb(204, 204, 204);
+            color: rgb(51, 51, 51);
+            padding: 0.25em 1em;
+        }
+        #insert:active, #cancel:active {
+            background: #f4f4f4;
+            border-left-color: #999;
+            border-top-color: #999;
+        }
+    </style>
 </head>
+<body id="image" onload="tinyMCEPopup.executeOnLoad('init();');document.body.style.display='';document.getElementById('src').focus();" style="display: none">
+<form onsubmit="insertImage();return false;" action="#">
+    <div class="tabs">
+        <ul>
+            <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_insert_image_title}</a></span></li>
+        </ul>
+    </div>
+    <div class="panel_wrapper">
+        <div id="general_panel" class="panel current">
+     <table border="0" cellpadding="4" cellspacing="0">
+<body onload="tinyMCEPopup.executeOnLoad('init();');document.getElementById('src').focus();" style="display: none">
+<form onsubmit="insertImage();return false;">
+  <table border="0" cellpadding="0" cellspacing="0" width="200">
+    <tr>
+      <td align="center" valign="middle"><table border="0" cellpadding="4" cellspacing="0">
           <tr>
+            <td nowrap="nowrap"><label for="src">{$lang_insert_image_src}</label></td>
+            <td colspan="2" class="title" nowrap="nowrap">{$lang_insert_image_title}</td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_image_src}:</td>
             <td><table border="0" cellspacing="0" cellpadding="0">
                 <tr>
                   <td><input id="src" name="src" type="text" value="" style="width: 200px" onchange="getImageData();"></td>
+                  <td><input name="src" type="text" id="src" value="" style="width: 200px" onchange="getImageData();"></td>
                   <td id="srcbrowsercontainer">&nbsp;</td>
                 </tr>
 …
                 var html = "";
                 html += '<tr><td><label for="image_list">{$lang_image_list}</label></td>';
                 html += '<td><select id="image_list" name="image_list" style="width: 200px" onchange="this.form.src.value=this.options[this.selectedIndex].value;resetImageData();getImageData();">';
+                html += '<tr><td>{$lang_image_list}:</td>';
+                html += '<td><select name="image_list" style="width: 200px" onchange="this.form.src.value=this.options[this.selectedIndex].value;resetImageData();getImageData();">';
                 html += '<option value="">---</option>';
 …
           <!-- /Image list -->
           <tr>
             <td nowrap="nowrap"><label for="alt">{$lang_insert_image_alt}</label></td>
             <td><input id="alt" name="alt" type="text" value="" style="width: 200px"></td>
+            <td nowrap="nowrap">{$lang_insert_image_alt}:</td>
+            <td><input name="alt" type="text" id="alt" value="" style="width: 200px"></td>
           </tr>
           <tr>
             <td nowrap="nowrap"><label for="align">{$lang_insert_image_align}</label></td>
             <td><select id="align" name="align">
+            <td nowrap="nowrap">{$lang_insert_image_align}:</td>
+            <td><select name="align">
                 <option value="">{$lang_insert_image_align_default}</option>
                 <option value="baseline">{$lang_insert_image_align_baseline}</option>
 …
           </tr>
           <tr>
             <td nowrap="nowrap"><label for="width">{$lang_insert_image_dimensions}</label></td>
             <td><input id="width" name="width" type="text" value="" size="4" maxlength="4">
+            <td nowrap="nowrap"><!--{$lang_insert_image_dimensions}:</td>
+            <td><input name="width" type="text" id="width" value="" size="3" maxlength="3">
+              x
+              <input id="height" name="height" type="text" value="" size="4" maxlength="4"></td>
+              <input name="height" type="text" id="height" value="" size="3" maxlength="3">--></td>
+          </tr>
+<!--          <tr>
+            <td nowrap="nowrap">{$lang_insert_image_border}:</td>
+            <td><input name="border" type="text" id="border" value="" size="3" maxlength="3"></td>
           </tr>
           <tr>
             <td nowrap="nowrap"><label for="border">{$lang_insert_image_border}</label></td>
             <td><input id="border" name="border" type="text" value="" size="4" maxlength="4"></td>
+            <td nowrap="nowrap">{$lang_insert_image_vspace}:</td>
+            <td><input name="vspace" type="text" id="vspace" value="" size="3" maxlength="3"></td>
           </tr>
           <tr>
             <td nowrap="nowrap"><label for="vspace">{$lang_insert_image_vspace}</label></td>
             <td><input id="vspace" name="vspace" type="text" value="" size="4" maxlength="4"></td>
+            <td nowrap="nowrap">{$lang_insert_image_hspace}:</td>
+            <td><input name="hspace" type="text" id="hspace" value="" size="3" maxlength="3"></td>
           </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="hspace">{$lang_insert_image_hspace}</label></td>
+            <td><input id="hspace" name="hspace" type="text" value="" size="4" maxlength="4"></td>
+-->          <tr>
+            <td nowrap="nowrap"><input type="submit" id="insert" name="insert" value="{$lang_insert}" onclick="insertImage();">
+            </td>
+            <td align="right"><input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();"></td>
           </tr>
+        </table>
+        </div>
+    </div>
+    <div class="mceActionPanel">
+        <div style="float: left">
+            <input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+        </div>
+        <div style="float: right">
+            <input type="submit" id="insert" name="insert" value="{$lang_insert}" onclick="insertImage();" />
+        </div>
+    </div>
+        </table></td>
+    </tr>
+  </table>
 </form>
 </body>

trunk/wp-includes/js/tinymce/themes/advanced/jscripts/about.js

-                      r4431
+                      r3503
 function init() {
-    var inst;
     tinyMCEPopup.resizeToInnerSize();
-    inst = tinyMCE.selectedInstance;
     // Give FF some time
 …
     html += '<tbody>';
     for (var i=0; i<inst.plugins.length; i++) {
         var info = getPluginInfo(inst.plugins[i]);
+    for (var i=0; i<plugins.length; i++) {
+        var info = getPluginInfo(plugins[i]);
         html += '<tr>';
 …
 function getPluginInfo(name) {
+    if (tinyMCE.plugins[name].getInfo)
+        return tinyMCE.plugins[name].getInfo();
+    var fn = eval('tinyMCEPopup.windowOpener.TinyMCE_' + name + '_getInfo');
+    if (typeof(fn) != 'undefined')
+        return fn();
     return {

trunk/wp-includes/js/tinymce/themes/advanced/jscripts/anchor.js

-                      r4431
+                      r3503
 function insertAnchor() {
     var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
     var name = document.forms[0].anchorName.value, e;
+    var name = document.forms[0].anchorName.value;
     tinyMCEPopup.execCommand("mceBeginUndoLevel");
 …
         name = name.replace(/\"/g, '&quot;');
         name = name.replace(/</g, '&lt;');
         name = name.replace(/>/g, '&gt;');
+        name = name.replace(/>/g, '&gr;');
+        // Fix for bug #1447335
+        if (tinyMCE.isGecko)
+            html = '<a id="mceNewAnchor" name="' + name + '"></a>';
+        else
+            html = '<a name="' + name + '"></a>';
+        html = '<a name="' + name + '"></a>';
         tinyMCEPopup.execCommand("mceInsertContent", false, html);
-        // Fix for bug #1447335 force cursor after the anchor element
-        if (tinyMCE.isGecko) {
-            e = inst.getDoc().getElementById('mceNewAnchor');
-            if (e) {
-                inst.selection.selectNode(e, true, false, false);
-                e.removeAttribute('id');
+            }
+        }
         tinyMCE.handleVisualAid(inst.getBody(), true, inst.visualAid, inst);
+    }

trunk/wp-includes/js/tinymce/themes/advanced/jscripts/charmap.js

-                      r4431
+                      r3503
     ['&thorn;',   '&#254;',  true, 'thorn'],
     ['&yuml;',    '&#255;',  true, 'y - diaeresis'],
     ['&Alpha;',   '&#913;',  true, 'Alpha'],
+// ['&Alpha;',   '&#913;',  true, 'Alpha'],
     ['&Beta;',    '&#914;',  true, 'Beta'],
     ['&Gamma;',   '&#915;',  true, 'Gamma'],
 …
             html += ''
                 + '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap"'
                 + ' onmouseover="this.className=\'charmapOver\';'
+                + ' onmouseover="tinyMCE.switchClass(this,\'charmapOver\');'
                 + 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');"'
                 + ' onmouseout="this.className=\'charmap\';"'
+                + ' onmouseout="tinyMCE.restoreClass(this,\'charmapOver\');"'
                 + ' nowrap="nowrap" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');"><a style="text-decoration: none;" onfocus="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" href="javascript:insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
                 + charmap[i][1]
 …
 function insertChar(chr) {
     tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';');
+    tinyMCEPopup.execCommand('mceInsertContent', false, '\&#' + chr + ';');
     // Refocus in window
     if (tinyMCEPopup.isWindow)
         window.focus();
-    tinyMCEPopup.close();
+}

trunk/wp-includes/js/tinymce/themes/advanced/jscripts/color_picker.js

-                      r4431
+                      r3503
         + '</td></tr>'
         + '</table>'
+        + '<div style="float: left"><input type="button" id="insert" name="insert" value="{$lang_theme_colorpicker_apply}" style="margin-top:3px" onclick="selectColor();"></div>'
+        + '<div style="float: right"><input type="button" name="cancel" value="{$lang_cancel}" style="margin-top:3px" onclick="tinyMCEPopup.close();" id="cancel" /></div>'
+        + '<input type="button" id="insert" name="insert" value="{$lang_theme_colorpicker_apply}" style="margin-top:3px" onclick="selectColor();">'
         + '</td></tr>'
         + '</table>';

trunk/wp-includes/js/tinymce/themes/advanced/jscripts/image.js

-                      r4431
+                      r3503
 function insertImage() {
+    var src = document.forms[0].src.value;
+    var alt = document.forms[0].alt.value;
+    var border = document.forms[0].border.value;
+    var vspace = document.forms[0].vspace.value;
+    var hspace = document.forms[0].hspace.value;
+    var width = document.forms[0].width.value;
+    var height = document.forms[0].height.value;
+    var align = document.forms[0].align.options[document.forms[0].align.selectedIndex].value;
+    if (window.opener) {
+        var src = document.forms[0].src.value;
+        var alt = document.forms[0].alt.value;
+        var border = '';//document.forms[0].border.value;
+        var vspace = '';//document.forms[0].vspace.value;
+        var hspace = '';//document.forms[0].hspace.value;
+        var width = '';//document.forms[0].width.value;
+        var height = '';//document.forms[0].height.value;
+        var align = document.forms[0].align.options[document.forms[0].align.selectedIndex].value;
     tinyMCEPopup.restoreSelection();
     tinyMCE.themes['advanced']._insertImage(src, alt, border, hspace, vspace, width, height, align);
     tinyMCEPopup.close();
+        window.opener.tinyMCE.insertImage(src, alt, border, hspace, vspace, width, height, align);
+        top.close();
+    }
+}
 …
     formObj.src.value = tinyMCE.getWindowArg('src');
     formObj.alt.value = tinyMCE.getWindowArg('alt');
     formObj.border.value = tinyMCE.getWindowArg('border');
     formObj.vspace.value = tinyMCE.getWindowArg('vspace');
     formObj.hspace.value = tinyMCE.getWindowArg('hspace');
     formObj.width.value = tinyMCE.getWindowArg('width');
     formObj.height.value = tinyMCE.getWindowArg('height');
+//  formObj.border.value = tinyMCE.getWindowArg('border');
+//  formObj.vspace.value = tinyMCE.getWindowArg('vspace');
+//  formObj.hspace.value = tinyMCE.getWindowArg('hspace');
+//  formObj.width.value = tinyMCE.getWindowArg('width');
+//  formObj.height.value = tinyMCE.getWindowArg('height');
     formObj.insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true);
 …
     var formObj = document.forms[0];
     if (formObj.width.value == "")
         formObj.width.value = preloadImg.width;
+//  if (formObj.width.value == "")
+//      formObj.width.value = preloadImg.width;
     if (formObj.height.value == "")
         formObj.height.value = preloadImg.height;
+//  if (formObj.height.value == "")
+//      formObj.height.value = preloadImg.height;
+}

trunk/wp-includes/js/tinymce/themes/advanced/jscripts/link.js

-                      r4431
+                      r3503
     tinyMCEPopup.resizeToInnerSize();
+    document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','theme_advanced_link');
+    // Handle file browser
+    if (isVisible('hrefbrowser'))
+        document.getElementById('href').style.width = '180px';
+//  document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','theme_advanced_link');
     var formObj = document.forms[0];
 …
     document.forms[0].insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true);
     addClassesToList('styleSelect', 'theme_advanced_link_styles');
     selectByValue(formObj, 'styleSelect', tinyMCE.getWindowArg('className'), true);
+//  addClassesToList('styleSelect', 'theme_advanced_link_styles');
+//  selectByValue(formObj, 'styleSelect', tinyMCE.getWindowArg('className'), true);
+    // Hide css select row if no CSS classes
+    if (formObj.styleSelect && formObj.styleSelect.options.length <= 1) {
+        var sr = document.getElementById('styleSelectRow');
+        sr.style.display = 'none';
+        sr.parentNode.removeChild(sr);
+    }
+    // Handle file browser
+    if (isVisible('hrefbrowser'))
+        document.getElementById('href').style.width = '180px';
     // Auto select link in list
 …
 function insertLink() {
+    var href = document.forms[0].href.value;
+    var target = document.forms[0].target.options[document.forms[0].target.selectedIndex].value;
+    var title = document.forms[0].linktitle.value;
+    var style_class = document.forms[0].styleSelect ? document.forms[0].styleSelect.value : "";
+    var dummy;
+    if (window.opener) {
+        var href = document.forms[0].href.value;
+        var target = document.forms[0].target.options[document.forms[0].target.selectedIndex].value;
+        var title = document.forms[0].linktitle.value;
+        var style_class = '';//document.forms[0].styleSelect.value;
+        var dummy;
     // Make anchors absolute
     if (href.charAt(0) == '#')
         href = tinyMCE.settings['document_base_url'] + href;
+        // Make anchors absolute
+        if (href.charAt(0) == '#')
+            href = tinyMCE.settings['document_base_url'] + href;
     if (target == '_self')
         target = '';
+        if (target == '_self')
+            target = '';
     tinyMCEPopup.restoreSelection();
     tinyMCE.themes['advanced']._insertLink(href, target, title, dummy, style_class);
     tinyMCEPopup.close();
+        window.opener.tinyMCE.insertLink(href, target, title, dummy, style_class);
+        tinyMCEPopup.close();
+    }
+}

trunk/wp-includes/js/tinymce/themes/advanced/jscripts/source_editor.js

-                      r4431
+                      r3503
 // Fixes some charcode issues
 function fixContent(html) {
+/*  html = html.replace(new RegExp('<(p|hr|table|tr|td|ol|ul|object|embed|li|blockquote)', 'gi'),'\n<$1');
+    // WP
+    return html;
+    html = html.replace(new RegExp('<(p|hr|table|tr|td|ol|ul|object|embed|li|blockquote)', 'gi'),'\n<$1');
     html = html.replace(new RegExp('<\/(p|ol|ul|li|table|tr|td|blockquote|object)>', 'gi'),'</$1>\n');
     html = tinyMCE.regexpReplace(html, '<br />','<br />\n','gi');
     html = tinyMCE.regexpReplace(html, '\n\n','\n','gi');*/
+    html = tinyMCE.regexpReplace(html, '\n\n','\n','gi');
     return html;
+}
 …
     document.forms[0].htmlSource.value = fixContent(tinyMCE.getContent(tinyMCE.getWindowArg('editor_id')));
     resizeInputs();
+    setWrap('off');
+}
 function setWrap(val) {
+    var s = document.forms[0].htmlSource;
+    s.wrap = val;
+    if (tinyMCE.isGecko) {
+        var v = s.value;
+        var n = s.cloneNode(false);
+        n.setAttribute("wrap", val);
+        s.parentNode.replaceChild(n, s);
+        n.value = v;
+    }
+    // hard soft off
+    document.forms[0].htmlSource.wrap = val;
+}
 …
 function renderWordWrap() {
     if (tinyMCE.isMSIE || tinyMCE.isGecko)
+    if (tinyMCE.isMSIE)
         document.write('<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{$lang_theme_code_wordwrap}</label>');
+}

trunk/wp-includes/js/tinymce/themes/advanced/langs/en.js

r4431	r3503
3	3	tinyMCE.addToLang('',{
4	4	theme_style_select : '-- Styles --',
5		theme_code_desc : 'Edit HTML Source',
	5	theme_code_desc : 'Edit HTML Source (Alt+e)',
6	6	theme_code_title : 'HTML Source Editor',
7	7	theme_code_wordwrap : 'Word wrap',

trunk/wp-includes/js/tinymce/themes/advanced/link.htm

-                      r4431
+                      r3503
     <title>{$lang_insert_link_title}</title>
     <script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
-    <script language="javascript" type="text/javascript" src="../../utils/mctabs.js"></script>
     <script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
     <script language="javascript" type="text/javascript" src="jscripts/link.js"></script>
+    <base target="_self" />
+    <style type="text/css">
+        #insert, #cancel {
+            font: 13px Verdana, Arial, Helvetica, sans-serif;
+            height: auto;
+            width: auto;
+            background-color: transparent;
+            background-image: url(../../../../../wp-admin/images/fade-butt.png);
+            background-repeat: repeat;
+            border: 3px double;
+            border-right-color: rgb(153, 153, 153);
+            border-bottom-color: rgb(153, 153, 153);
+            border-left-color: rgb(204, 204, 204);
+            border-top-color: rgb(204, 204, 204);
+            color: rgb(51, 51, 51);
+            padding: 0.25em 0.75em;
+        }
+        #insert:active, #cancel:active {
+            background: #f4f4f4;
+            border-left-color: #999;
+            border-top-color: #999;
+        }
+    </style>
 </head>
+<body id="link" onload="tinyMCEPopup.executeOnLoad('init();');document.body.style.display='';document.getElementById('href').focus();" style="display: none">
+<form onsubmit="insertLink();return false;" action="#">
+    <div class="tabs">
+        <ul>
+            <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{$lang_insert_link_title}</a></span></li>
+        </ul>
+    </div>
+    <div class="panel_wrapper">
+        <div id="general_panel" class="panel current">
+        <table border="0" cellpadding="4" cellspacing="0">
+<body onload="tinyMCEPopup.executeOnLoad('init();');document.getElementById('href').focus();" style="display: none">
+<form onsubmit="insertLink();return false;">
+  <table border="0" cellpadding="0" cellspacing="0" width="100">
+    <tr>
+      <td align="center" valign="middle"><table border="0" cellpadding="4" cellspacing="0">
           <tr>
+            <td nowrap="nowrap"><label for="href">{$lang_insert_link_url}</label></td>
+            <td><table border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td><input id="href" name="href" type="text" value="" style="width: 200px" /></td>
+                    <td id="hrefbrowsercontainer">&nbsp;</td>
+                  </tr>
+                </table></td>
+            <td colspan="2" class="title" nowrap="nowrap">{$lang_insert_link_title}</td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap">{$lang_insert_link_url}:</td>
+            <td>              <table border="0" cellspacing="0" cellpadding="0">
+                <tr>
+                  <td><input name="href" type="text" id="href" value="" style="width: 200px"></td>
+                  <td id="hrefbrowsercontainer">&nbsp;</td>
+                </tr>
+              </table></td>
           </tr>
           <!-- Link list -->
 …
                 var html = "";
                 html += '<tr><td><label for="link_list">{$lang_link_list}</label></td>';
                 html += '<td><select id="link_list" name="link_list" style="width: 200px" onchange="this.form.href.value=this.options[this.selectedIndex].value;">';
+                html += '<tr><td>{$lang_link_list}:</td>';
+                html += '<td><select name="link_list" style="width: 200px" onchange="this.form.href.value=this.options[this.selectedIndex].value;">';
                 html += '<option value="">---</option>';
 …
           <!-- /Link list -->
           <tr>
             <td nowrap="nowrap"><label for="target">{$lang_insert_link_target}</label></td>
             <td><select id="target" name="target" style="width: 200px">
+            <td nowrap="nowrap">{$lang_insert_link_target}:</td>
+            <td><select name="target" style="width: 200px">
                 <option value="_self">{$lang_insert_link_target_same}</option>
                 <option value="_blank">{$lang_insert_link_target_blank}</option>
 …
           </tr>
           <tr>
             <td nowrap="nowrap"><label for="linktitle">{$lang_theme_insert_link_titlefield}</label></td>
             <td><input id="linktitle" name="linktitle" type="text" value="" style="width: 200px"></td>
+            <td nowrap="nowrap">{$lang_theme_insert_link_titlefield}:</td>
+            <td><input name="linktitle" type="text" id="linktitle" value="" style="width: 200px"></td>
           </tr>
           <tr id="styleSelectRow">
             <td><label for="styleSelect">{$lang_class_name}</label></td>
+            <td><!--{$lang_class_name}:</td>
             <td>
              <select id="styleSelect" name="styleSelect">
                 <option value="" selected>{$lang_theme_style_select}</option>
              </select></td>
+            <td align="right">&nbsp;</td>
+            <td align="right">&nbsp;--></td>
           </tr>
+        </table>
+        </div>
+    </div>
+    <div class="mceActionPanel">
+        <div style="float: left">
+            <input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" />
+        </div>
+        <div style="float: right">
+            <input type="submit" id="insert" name="insert" value="{$lang_insert}" onclick="insertLink();" />
+        </div>
+    </div>
+          <tr>
+            <td><input type="submit" id="insert" name="insert" value="{$lang_insert}" onclick="insertLink();">
+            </td>
+            <td align="right"><input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();"></td>
+          </tr>
+        </table></td>
+    </tr>
+  </table>
 </form>
 </body>

trunk/wp-includes/js/tinymce/themes/advanced/source_editor.htm

-                      r4431
+                      r3503
     <script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
     <script language="javascript" type="text/javascript" src="jscripts/source_editor.js"></script>
+    <base target="_self" />
+    <style type="text/css">
+        #insert, #cancel {
+            font: 13px Verdana, Arial, Helvetica, sans-serif;
+            height: auto;
+            width: auto;
+            background-color: transparent;
+            background-image: url(../../../../../wp-admin/images/fade-butt.png);
+            background-repeat: repeat;
+            border: 3px double;
+            border-right-color: rgb(153, 153, 153);
+            border-bottom-color: rgb(153, 153, 153);
+            border-left-color: rgb(204, 204, 204);
+            border-top-color: rgb(204, 204, 204);
+            color: rgb(51, 51, 51);
+            padding: 0.25em 0.75em;
+        }
+        #insert:active, #cancel:active {
+            background: #f4f4f4;
+            border-left-color: #999;
+            border-top-color: #999;
+        }
+    </style>
 </head>
 <body onload="tinyMCEPopup.executeOnLoad('onLoadInit();');document.body.style.display='';document.getElementById('htmlSource').focus();" onresize="resizeInputs();" style="display: none">
+<body onload="tinyMCEPopup.executeOnLoad('onLoadInit();');document.getElementById('htmlSource').focus();" onresize="resizeInputs();" style="display: none">
     <form name="source" onsubmit="saveContent();" action="#">
         <div style="float: left" class="title">{$lang_theme_code_title}</div>
 …
         </div>
         <textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px" dir="ltr" wrap="off"></textarea>
+        <textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px;" dir="ltr" wrap="soft"></textarea>
         <div class="mceActionPanel">
             <div style="float: left">
                 <input type="button" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
+                <input type="button" name="insert" value="{$lang_update}" onclick="saveContent();" id="insert" />
             </div>
             <div style="float: right">
                 <input type="submit" name="insert" value="{$lang_update}" onclick="saveContent();" id="insert" />
+                <input type="button" name="cancel" value="{$lang_cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
             </div>
         </div>

trunk/wp-includes/js/tinymce/tiny_mce.js

-                      r4431
+                      r3503
+/* file:jscripts/tiny_mce/classes/TinyMCE_Engine.class.js */
+function TinyMCE_Engine() {
+/**
+ * $RCSfile: tiny_mce_src.js,v $
+ * $Revision: 1.281 $
+ * $Date: 2005/12/02 08:12:07 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004, Moxiecode Systems AB, All rights reserved.
+ */
+function TinyMCE() {
     this.majorVersion = "2";
     this.minorVersion = "0.6.1";
     this.releaseDate = "2006-05-04";
+    this.minorVersion = "0";
+    this.releaseDate = "2005-12-01";
     this.instances = new Array();
     this.switchClassCache = new Array();
+    this.stickyClassesLookup = new Array();
     this.windowArgs = new Array();
     this.loadedFiles = new Array();
-    this.pendingFiles = new Array();
-    this.loadingIndex = 0;
     this.configs = new Array();
     this.currentConfig = 0;
 …
     this.isNS71 = ua.indexOf('Netscape/7.1') != -1;
     this.dialogCounter = 0;
-    this.plugins = new Array();
-    this.themes = new Array();
-    this.menus = new Array();
-    this.loadedPlugins = new Array();
-    this.buttonMap = new Array();
-    this.isLoaded = false;
     // Fake MSIE on Opera and if Opera fakes IE, Gecko or Safari cancel those
 …
 };
+TinyMCE_Engine.prototype = {
+    init : function(settings) {
+        var theme;
+        this.settings = settings;
+        // Check if valid browser has execcommand support
+        if (typeof(document.execCommand) == 'undefined')
+            return;
+        // Get script base path
+        if (!tinyMCE.baseURL) {
+            var elements = document.getElementsByTagName('script');
+            for (var i=0; i<elements.length; i++) {
+                if (elements[i].src && (elements[i].src.indexOf("tiny_mce.js") != -1 || elements[i].src.indexOf("tiny_mce_dev.js") != -1 || elements[i].src.indexOf("tiny_mce_src.js") != -1 || elements[i].src.indexOf("tiny_mce_gzip") != -1)) {
+                    var src = elements[i].src;
+                    tinyMCE.srcMode = (src.indexOf('_src') != -1 || src.indexOf('_dev') != -1) ? '_src' : '';
+                    tinyMCE.gzipMode = src.indexOf('_gzip') != -1;
+                    src = src.substring(0, src.lastIndexOf('/'));
+                    if (settings.exec_mode == "src" || settings.exec_mode == "normal")
+                        tinyMCE.srcMode = settings.exec_mode == "src" ? '_src' : '';
+                    tinyMCE.baseURL = src;
+                    break;
+                }
+            }
+        }
+        // Get document base path
+        this.documentBasePath = document.location.href;
+        if (this.documentBasePath.indexOf('?') != -1)
+            this.documentBasePath = this.documentBasePath.substring(0, this.documentBasePath.indexOf('?'));
+        this.documentURL = this.documentBasePath;
+        this.documentBasePath = this.documentBasePath.substring(0, this.documentBasePath.lastIndexOf('/'));
+        // If not HTTP absolute
+        if (tinyMCE.baseURL.indexOf('://') == -1 && tinyMCE.baseURL.charAt(0) != '/') {
+            // If site absolute
+            tinyMCE.baseURL = this.documentBasePath + "/" + tinyMCE.baseURL;
+        }
+        // Set default values on settings
+        this._def("mode", "none");
+        this._def("theme", "advanced");
+        this._def("plugins", "", true);
+        this._def("language", "en");
+        this._def("docs_language", this.settings['language']);
+        this._def("elements", "");
+        this._def("textarea_trigger", "mce_editable");
+        this._def("editor_selector", "");
+        this._def("editor_deselector", "mceNoEditor");
+        this._def("valid_elements", "+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|style],-ul[class|style],-li[class|style],br,img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align],-sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[style|class|align],-pre[class|align|style],address[class|align|style],-h1[id|style|dir|class|align],-h2[id|style|dir|class|align],-h3[id|style|dir|class|align],-h4[id|style|dir|class|align],-h5[id|style|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],-font[face|size|style|id|class|dir|color],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang]");
+        this._def("extended_valid_elements", "");
+        this._def("invalid_elements", "");
+        this._def("encoding", "");
+        this._def("urlconverter_callback", tinyMCE.getParam("urlconvertor_callback", "TinyMCE_Engine.prototype.convertURL"));
+        this._def("save_callback", "");
+        this._def("debug", false);
+        this._def("force_br_newlines", false);
+        this._def("force_p_newlines", true);
+        this._def("add_form_submit_trigger", true);
+        this._def("relative_urls", true);
+        this._def("remove_script_host", true);
+        this._def("focus_alert", true);
+        this._def("document_base_url", this.documentURL);
+        this._def("visual", true);
+        this._def("visual_table_class", "mceVisualAid");
+        this._def("setupcontent_callback", "");
+        this._def("fix_content_duplication", true);
+        this._def("custom_undo_redo", true);
+        this._def("custom_undo_redo_levels", -1);
+        this._def("custom_undo_redo_keyboard_shortcuts", true);
+        this._def("custom_undo_redo_restore_selection", true);
+        this._def("verify_html", true);
+        this._def("apply_source_formatting", false);
+        this._def("directionality", "ltr");
+        this._def("cleanup_on_startup", false);
+        this._def("inline_styles", false);
+        this._def("convert_newlines_to_brs", false);
+        this._def("auto_reset_designmode", true);
+        this._def("entities", "39,#39,160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,34,quot,38,amp,60,lt,62,gt,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro", true);
+        this._def("entity_encoding", "named");
+        this._def("cleanup_callback", "");
+        this._def("add_unload_trigger", true);
+        this._def("ask", false);
+        this._def("nowrap", false);
+        this._def("auto_resize", false);
+        this._def("auto_focus", false);
+        this._def("cleanup", true);
+        this._def("remove_linebreaks", true);
+        this._def("button_tile_map", false);
+        this._def("submit_patch", true);
+        this._def("browsers", "msie,safari,gecko,opera", true);
+        this._def("dialog_type", "window");
+        this._def("accessibility_warnings", true);
+        this._def("accessibility_focus", true);
+        this._def("merge_styles_invalid_parents", "");
+        this._def("force_hex_style_colors", true);
+        this._def("trim_span_elements", true);
+        this._def("convert_fonts_to_spans", false);
+        this._def("doctype", '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">');
+        this._def("font_size_classes", '');
+        this._def("font_size_style_values", 'xx-small,x-small,small,medium,large,x-large,xx-large', true);
+        this._def("event_elements", 'a,img', true);
+        this._def("convert_urls", true);
+        this._def("table_inline_editing", false);
+        this._def("object_resizing", true);
+        this._def("custom_shortcuts", true);
+        this._def("convert_on_click", false);
+        this._def("content_css", '');
+        this._def("fix_list_elements", false);
+        this._def("fix_table_elements", false);
+        this._def("strict_loading_mode", document.contentType == 'application/xhtml+xml');
+        this._def("hidden_tab_class", '');
+        this._def("display_tab_class", '');
+        // Force strict loading mode to false on non Gecko browsers
+        if (this.isMSIE && !this.isOpera)
+            this.settings.strict_loading_mode = false;
+        // Browser check IE
+        if (this.isMSIE && this.settings['browsers'].indexOf('msie') == -1)
+            return;
+        // Browser check Gecko
+        if (this.isGecko && this.settings['browsers'].indexOf('gecko') == -1)
+            return;
+        // Browser check Safari
+        if (this.isSafari && this.settings['browsers'].indexOf('safari') == -1)
+            return;
+        // Browser check Opera
+        if (this.isOpera && this.settings['browsers'].indexOf('opera') == -1)
+            return;
+        // If not super absolute make it so
+        var baseHREF = tinyMCE.settings['document_base_url'];
+        var h = document.location.href;
+        var p = h.indexOf('://');
+        if (p > 0 && document.location.protocol != "file:") {
+            p = h.indexOf('/', p + 3);
+            h = h.substring(0, p);
+            if (baseHREF.indexOf('://') == -1)
+                baseHREF = h + baseHREF;
+            tinyMCE.settings['document_base_url'] = baseHREF;
+            tinyMCE.settings['document_base_prefix'] = h;
+        }
+        // Trim away query part
+        if (baseHREF.indexOf('?') != -1)
+            baseHREF = baseHREF.substring(0, baseHREF.indexOf('?'));
+        this.settings['base_href'] = baseHREF.substring(0, baseHREF.lastIndexOf('/')) + "/";
+        theme = this.settings['theme'];
+        this.blockRegExp = new RegExp("^(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|blockquote|center|dl|dt|dd|dir|fieldset|form|noscript|noframes|menu|isindex|samp)$", "i");
+        this.posKeyCodes = new Array(13,45,36,35,33,34,37,38,39,40);
+        this.uniqueURL = 'javascript:TINYMCE_UNIQUEURL();'; // Make unique URL non real URL
+        this.uniqueTag = '<div id="mceTMPElement" style="display: none">TMP</div>';
+        this.callbacks = new Array('onInit', 'getInfo', 'getEditorTemplate', 'setupContent', 'onChange', 'onPageLoad', 'handleNodeChange', 'initInstance', 'execCommand', 'getControlHTML', 'handleEvent', 'cleanup');
+        // Theme url
+        this.settings['theme_href'] = tinyMCE.baseURL + "/themes/" + theme;
+        if (!tinyMCE.isMSIE)
+            this.settings['force_br_newlines'] = false;
+        if (tinyMCE.getParam("popups_css", false)) {
+            var cssPath = tinyMCE.getParam("popups_css", "");
+            // Is relative
+            if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/')
+                this.settings['popups_css'] = this.documentBasePath + "/" + cssPath;
+            else
+                this.settings['popups_css'] = cssPath;
+        } else
+            this.settings['popups_css'] = tinyMCE.baseURL + "/themes/" + theme + "/css/editor_popup.css";
+        if (tinyMCE.getParam("editor_css", false)) {
+            var cssPath = tinyMCE.getParam("editor_css", "");
+            // Is relative
+            if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/')
+                this.settings['editor_css'] = this.documentBasePath + "/" + cssPath;
+            else
+                this.settings['editor_css'] = cssPath;
+        } else
+            this.settings['editor_css'] = tinyMCE.baseURL + "/themes/" + theme + "/css/editor_ui.css";
+        if (tinyMCE.settings['debug']) {
+            var msg = "Debug: \n";
+            msg += "baseURL: " + this.baseURL + "\n";
+            msg += "documentBasePath: " + this.documentBasePath + "\n";
+            msg += "content_css: " + this.settings['content_css'] + "\n";
+            msg += "popups_css: " + this.settings['popups_css'] + "\n";
+            msg += "editor_css: " + this.settings['editor_css'] + "\n";
+            alert(msg);
+        }
+        // Only do this once
+        if (this.configs.length == 0) {
+            // Is Safari enabled
+            if (this.isSafari && this.getParam('safari_warning', false))
+                alert("Safari support is very limited and should be considered experimental.\nSo there is no need to even submit bugreports on this early version.\nYou can disable this message by setting: safari_warning option to false");
+            if (typeof(TinyMCECompressed) == "undefined") {
+                tinyMCE.addEvent(window, "DOMContentLoaded", TinyMCE_Engine.prototype.onLoad);
+                if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+                    if (document.body)
+                        tinyMCE.addEvent(document.body, "readystatechange", TinyMCE_Engine.prototype.onLoad);
+                    else
+                        tinyMCE.addEvent(document, "readystatechange", TinyMCE_Engine.prototype.onLoad);
+                }
+                tinyMCE.addEvent(window, "load", TinyMCE_Engine.prototype.onLoad);
+                tinyMCE._addUnloadEvents();
+            }
+        }
+        this.loadScript(tinyMCE.baseURL + '/themes/' + this.settings['theme'] + '/editor_template' + tinyMCE.srcMode + '.js');
+        this.loadScript(tinyMCE.baseURL + '/langs/' + this.settings['language'] +  '.js');
+        this.loadCSS(this.settings['editor_css']);
+        // Add plugins
+        var p = tinyMCE.getParam('plugins', '', true, ',');
+        if (p.length > 0) {
+            for (var i=0; i<p.length; i++) {
+                if (p[i].charAt(0) != '-')
+                    this.loadScript(tinyMCE.baseURL + '/plugins/' + p[i] + '/editor_plugin' + tinyMCE.srcMode + '.js');
+            }
+        }
+        // Setup entities
+        settings['cleanup_entities'] = new Array();
+        var entities = tinyMCE.getParam('entities', '', true, ',');
+        for (var i=0; i<entities.length; i+=2)
+            settings['cleanup_entities']['c' + entities[i]] = entities[i+1];
+        // Save away this config
+        settings['index'] = this.configs.length;
+        this.configs[this.configs.length] = settings;
+        // Start loading first one in chain
+        this.loadNextScript();
+    },
+    _addUnloadEvents : function() {
+TinyMCE.prototype.defParam = function(key, def_val) {
+    this.settings[key] = tinyMCE.getParam(key, def_val);
+};
+TinyMCE.prototype.init = function(settings) {
+    var theme;
+    this.settings = settings;
+    // Check if valid browser has execcommand support
+    if (typeof(document.execCommand) == 'undefined')
+        return;
+    // Get script base path
+    if (!tinyMCE.baseURL) {
+        var elements = document.getElementsByTagName('script');
+        for (var i=0; i<elements.length; i++) {
+            if (elements[i].src && (elements[i].src.indexOf("tiny_mce.js") != -1 || elements[i].src.indexOf("tiny_mce_src.js") != -1 || elements[i].src.indexOf("tiny_mce_gzip") != -1)) {
+                var src = elements[i].src;
+                tinyMCE.srcMode = (src.indexOf('_src') != -1) ? '_src' : '';
+                src = src.substring(0, src.lastIndexOf('/'));
+                tinyMCE.baseURL = src;
+                break;
+            }
+        }
+    }
+    // Get document base path
+    this.documentBasePath = document.location.href;
+    if (this.documentBasePath.indexOf('?') != -1)
+        this.documentBasePath = this.documentBasePath.substring(0, this.documentBasePath.indexOf('?'));
+    this.documentURL = this.documentBasePath;
+    this.documentBasePath = this.documentBasePath.substring(0, this.documentBasePath.lastIndexOf('/'));
+    // If not HTTP absolute
+    if (tinyMCE.baseURL.indexOf('://') == -1 && tinyMCE.baseURL.charAt(0) != '/') {
+        // If site absolute
+        tinyMCE.baseURL = this.documentBasePath + "/" + tinyMCE.baseURL;
+    }
+    // Set default values on settings
+    this.defParam("mode", "none");
+    this.defParam("theme", "advanced");
+    this.defParam("plugins", "", true);
+    this.defParam("language", "en");
+    this.defParam("docs_language", this.settings['language']);
+    this.defParam("elements", "");
+    this.defParam("textarea_trigger", "mce_editable");
+    this.defParam("editor_selector", "");
+    this.defParam("editor_deselector", "mceNoEditor");
+    this.defParam("valid_elements", "+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/b[class|style],-em/i[class|style],-strike[class|style],-u[class|style],+p[style|dir|class|align],-ol[class|style],-ul[class|style],-li[class|style],br,img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border=0|alt|title|hspace|vspace|width|height|align],-sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[style|class|align],-pre[class|align|style],address[class|align|style],-h1[style|dir|class|align],-h2[style|dir|class|align],-h3[style|dir|class|align],-h4[style|dir|class|align],-h5[style|dir|class|align],-h6[style|dir|class|align],hr[class|style],font[face|size|style|id|class|dir|color]");
+    this.defParam("extended_valid_elements", "");
+    this.defParam("invalid_elements", "");
+    this.defParam("encoding", "");
+    this.defParam("urlconverter_callback", tinyMCE.getParam("urlconvertor_callback", "TinyMCE.prototype.convertURL"));
+    this.defParam("save_callback", "");
+    this.defParam("debug", false);
+    this.defParam("force_br_newlines", false);
+    this.defParam("force_p_newlines", true);
+    this.defParam("add_form_submit_trigger", true);
+    this.defParam("relative_urls", true);
+    this.defParam("remove_script_host", true);
+    this.defParam("focus_alert", true);
+    this.defParam("document_base_url", this.documentURL);
+    this.defParam("visual", true);
+    this.defParam("visual_table_class", "mceVisualAid");
+    this.defParam("setupcontent_callback", "");
+    this.defParam("fix_content_duplication", true);
+    this.defParam("custom_undo_redo", true);
+    this.defParam("custom_undo_redo_levels", -1);
+    this.defParam("custom_undo_redo_keyboard_shortcuts", true);
+    this.defParam("verify_css_classes", false);
+    this.defParam("verify_html", true);
+    this.defParam("apply_source_formatting", false);
+    this.defParam("directionality", "ltr");
+    this.defParam("cleanup_on_startup", false);
+    this.defParam("inline_styles", false);
+    this.defParam("convert_newlines_to_brs", false);
+    this.defParam("auto_reset_designmode", true);
+    this.defParam("entities", "160,nbsp,38,amp,34,quot,162,cent,8364,euro,163,pound,165,yen,169,copy,174,reg,8482,trade,8240,permil,181,micro,183,middot,8226,bull,8230,hellip,8242,prime,8243,Prime,167,sect,182,para,223,szlig,8249,lsaquo,8250,rsaquo,171,laquo,187,raquo,8216,lsquo,8217,rsquo,8220,ldquo,8221,rdquo,8218,sbquo,8222,bdquo,60,lt,62,gt,8804,le,8805,ge,8211,ndash,8212,mdash,175,macr,8254,oline,164,curren,166,brvbar,168,uml,161,iexcl,191,iquest,710,circ,732,tilde,176,deg,8722,minus,177,plusmn,247,divide,8260,frasl,215,times,185,sup1,178,sup2,179,sup3,188,frac14,189,frac12,190,frac34,402,fnof,8747,int,8721,sum,8734,infin,8730,radic,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8712,isin,8713,notin,8715,ni,8719,prod,8743,and,8744,or,172,not,8745,cap,8746,cup,8706,part,8704,forall,8707,exist,8709,empty,8711,nabla,8727,lowast,8733,prop,8736,ang,180,acute,184,cedil,170,ordf,186,ordm,8224,dagger,8225,Dagger,192,Agrave,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,202,Ecirc,203,Euml,204,Igrave,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,212,Ocirc,213,Otilde,214,Ouml,216,Oslash,338,OElig,217,Ugrave,219,Ucirc,220,Uuml,376,Yuml,222,THORN,224,agrave,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,234,ecirc,235,euml,236,igrave,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,244,ocirc,245,otilde,246,ouml,248,oslash,339,oelig,249,ugrave,251,ucirc,252,uuml,254,thorn,255,yuml,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,8501,alefsym,982,piv,8476,real,977,thetasym,978,upsih,8472,weierp,8465,image,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8756,there4,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,173,shy,233,eacute,237,iacute,243,oacute,250,uacute,193,Aacute,225,aacute,201,Eacute,205,Iacute,211,Oacute,218,Uacute,221,Yacute,253,yacute");
+    this.defParam("entity_encoding", "named");
+    this.defParam("cleanup_callback", "");
+    this.defParam("add_unload_trigger", true);
+    this.defParam("ask", false);
+    this.defParam("nowrap", false);
+    this.defParam("auto_resize", false);
+    this.defParam("auto_focus", false);
+    this.defParam("cleanup", true);
+    this.defParam("remove_linebreaks", true);
+    this.defParam("button_tile_map", false);
+    this.defParam("submit_patch", true);
+    this.defParam("browsers", "msie,safari,gecko,opera");
+    this.defParam("dialog_type", "window");
+    this.defParam("accessibility_warnings", true);
+    this.defParam("merge_styles_invalid_parents", "");
+    this.defParam("force_hex_style_colors", true);
+    this.defParam("trim_span_elements", true);
+    this.defParam("convert_fonts_to_spans", false);
+    this.defParam("doctype", '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">');
+    this.defParam("font_size_classes", '');
+    this.defParam("font_size_style_values", 'xx-small,x-small,small,medium,large,x-large,xx-large');
+    this.defParam("event_elements", 'a,img');
+    this.defParam("convert_urls", true);
+    this.defParam("table_inline_editing", false);
+    this.defParam("object_resizing", true);
+    // Browser check IE
+    if (this.isMSIE && this.settings['browsers'].indexOf('msie') == -1)
+        return;
+    // Browser check Gecko
+    if (this.isGecko && this.settings['browsers'].indexOf('gecko') == -1)
+        return;
+    // Browser check Safari
+    if (this.isSafari && this.settings['browsers'].indexOf('safari') == -1)
+        return;
+    // Browser check Opera
+    if (this.isOpera && this.settings['browsers'].indexOf('opera') == -1)
+        return;
+    // If not super absolute make it so
+    var baseHREF = tinyMCE.settings['document_base_url'];
+    var h = document.location.href;
+    var p = h.indexOf('://');
+    if (p > 0 && document.location.protocol != "file:") {
+        p = h.indexOf('/', p + 3);
+        h = h.substring(0, p);
+        if (baseHREF.indexOf('://') == -1)
+            baseHREF = h + baseHREF;
+        tinyMCE.settings['document_base_url'] = baseHREF;
+        tinyMCE.settings['document_base_prefix'] = h;
+    }
+    // Trim away query part
+    if (baseHREF.indexOf('?') != -1)
+        baseHREF = baseHREF.substring(0, baseHREF.indexOf('?'));
+    this.settings['base_href'] = baseHREF.substring(0, baseHREF.lastIndexOf('/')) + "/";
+    theme = this.settings['theme'];
+    this.blockRegExp = new RegExp("^(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|blockquote|center|dl|dir|fieldset|form|noscript|noframes|menu|isindex)$", "i");
+    this.posKeyCodes = new Array(13,45,36,35,33,34,37,38,39,40);
+    this.uniqueURL = 'http://tinymce.moxiecode.cp/mce_temp_url'; // Make unique URL non real URL
+    this.uniqueTag = '<div id="mceTMPElement" style="display: none">TMP</div>';
+    // Theme url
+    this.settings['theme_href'] = tinyMCE.baseURL + "/themes/" + theme;
+    if (!tinyMCE.isMSIE)
+        this.settings['force_br_newlines'] = false;
+    if (tinyMCE.getParam("content_css", false)) {
+        var cssPath = tinyMCE.getParam("content_css", "");
+        // Is relative
+        if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/')
+            this.settings['content_css'] = this.documentBasePath + "/" + cssPath;
+        else
+            this.settings['content_css'] = cssPath;
+    } else
+        this.settings['content_css'] = '';
+    if (tinyMCE.getParam("popups_css", false)) {
+        var cssPath = tinyMCE.getParam("popups_css", "");
+        // Is relative
+        if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/')
+            this.settings['popups_css'] = this.documentBasePath + "/" + cssPath;
+        else
+            this.settings['popups_css'] = cssPath;
+    } else
+        this.settings['popups_css'] = tinyMCE.baseURL + "/themes/" + theme + "/css/editor_popup.css";
+    if (tinyMCE.getParam("editor_css", false)) {
+        var cssPath = tinyMCE.getParam("editor_css", "");
+        // Is relative
+        if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/')
+            this.settings['editor_css'] = this.documentBasePath + "/" + cssPath;
+        else
+            this.settings['editor_css'] = cssPath;
+    } else
+        this.settings['editor_css'] = tinyMCE.baseURL + "/themes/" + theme + "/css/editor_ui.css";
+    if (tinyMCE.settings['debug']) {
+        var msg = "Debug: \n";
+        msg += "baseURL: " + this.baseURL + "\n";
+        msg += "documentBasePath: " + this.documentBasePath + "\n";
+        msg += "content_css: " + this.settings['content_css'] + "\n";
+        msg += "popups_css: " + this.settings['popups_css'] + "\n";
+        msg += "editor_css: " + this.settings['editor_css'] + "\n";
+        alert(msg);
+    }
+    // Init HTML cleanup
+    this._initCleanup();
+    // Only do this once
+    if (this.configs.length == 0) {
+        // Is Safari enabled
+        if (this.isSafari && this.getParam('safari_warning', true))
+            alert("Safari support is very limited and should be considered experimental.\nSo there is no need to even submit bugreports on this early version.\nYou can disable this message by setting: safari_warning option to false");
+        tinyMCE.addEvent(window, "load", TinyMCE.prototype.onLoad);
         if (tinyMCE.isMSIE) {
             if (tinyMCE.settings['add_unload_trigger']) {
                 tinyMCE.addEvent(window, "unload", TinyMCE_Engine.prototype.unloadHandler);
                 tinyMCE.addEvent(window.document, "beforeunload", TinyMCE_Engine.prototype.unloadHandler);
+                tinyMCE.addEvent(window, "unload", TinyMCE.prototype.unloadHandler);
+                tinyMCE.addEvent(window.document, "beforeunload", TinyMCE.prototype.unloadHandler);
+            }
         } else {
 …
                 tinyMCE.addEvent(window, "unload", function () {tinyMCE.triggerSave(true, true);});
+        }
+    },
+    _def : function(key, def_val, t) {
+        var v = tinyMCE.getParam(key, def_val);
+        v = t ? v.replace(/\s+/g,"") : v;
+        this.settings[key] = v;
+    },
+    hasPlugin : function(n) {
+        return typeof(this.plugins[n]) != "undefined" && this.plugins[n] != null;
+    },
+    addPlugin : function(n, p) {
+        var op = this.plugins[n];
+        // Use the previous plugin object base URL used when loading external plugins
+        p.baseURL = op ? op.baseURL : tinyMCE.baseURL + "/plugins/" + n;
+        this.plugins[n] = p;
+        this.loadNextScript();
+    },
+    setPluginBaseURL : function(n, u) {
+        var op = this.plugins[n];
+        if (op)
+            op.baseURL = u;
+        else
+            this.plugins[n] = {baseURL : u};
+    },
+    loadPlugin : function(n, u) {
+        u = u.indexOf('.js') != -1 ? u.substring(0, u.lastIndexOf('/')) : u;
+        u = u.charAt(u.length-1) == '/' ? u.substring(0, u.length-1) : u;
+        this.plugins[n] = {baseURL : u};
+        this.loadScript(u + "/editor_plugin" + (tinyMCE.srcMode ? '_src' : '') + ".js");
+    },
+    hasTheme : function(n) {
+        return typeof(this.themes[n]) != "undefined" && this.themes[n] != null;
+    },
+    addTheme : function(n, t) {
+        this.themes[n] = t;
+        this.loadNextScript();
+    },
+    addMenu : function(n, m) {
+        this.menus[n] = m;
+    },
+    hasMenu : function(n) {
+        return typeof(this.plugins[n]) != "undefined" && this.plugins[n] != null;
+    },
+    loadScript : function(url) {
+        var i;
+        for (i=0; i<this.loadedFiles.length; i++) {
+            if (this.loadedFiles[i] == url)
+                return;
+        }
+        if (tinyMCE.settings.strict_loading_mode)
+            this.pendingFiles[this.pendingFiles.length] = url;
+        else
+            document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></script>');
+        this.loadedFiles[this.loadedFiles.length] = url;
+    },
+    loadNextScript : function() {
+        var d = document, se;
+        if (!tinyMCE.settings.strict_loading_mode)
+    }
+    this.loadScript(tinyMCE.baseURL + '/themes/' + this.settings['theme'] + '/editor_template' + tinyMCE.srcMode + '.js');
+    this.loadScript(tinyMCE.baseURL + '/langs/' + this.settings['language'] +  '.js');
+    this.loadCSS(this.settings['editor_css']);
+    // Add plugins
+    var themePlugins = tinyMCE.getParam('plugins', '', true, ',');
+    if (this.settings['plugins'] != '') {
+        for (var i=0; i<themePlugins.length; i++)
+            this.loadScript(tinyMCE.baseURL + '/plugins/' + themePlugins[i] + '/editor_plugin' + tinyMCE.srcMode + '.js');
+    }
+    // Setup entities
+    settings['cleanup_entities'] = new Array();
+    var entities = tinyMCE.getParam('entities', '', true, ',');
+    for (var i=0; i<entities.length; i+=2)
+        settings['cleanup_entities']['c' + entities[i]] = entities[i+1];
+    // Save away this config
+    settings['index'] = this.configs.length;
+    this.configs[this.configs.length] = settings;
+};
+TinyMCE.prototype.loadScript = function(url) {
+    for (var i=0; i<this.loadedFiles.length; i++) {
+        if (this.loadedFiles[i] == url)
             return;
+        if (this.loadingIndex < this.pendingFiles.length) {
+            se = d.createElementNS('http://www.w3.org/1999/xhtml', 'script');
+            se.setAttribute('language', 'javascript');
+            se.setAttribute('type', 'text/javascript');
+            se.setAttribute('src', this.pendingFiles[this.loadingIndex++]);
+            d.getElementsByTagName("head")[0].appendChild(se);
+        } else
+            this.loadingIndex = -1; // Done with loading
+    },
+    loadCSS : function(url) {
+        var ar = url.replace(/\s+/, '').split(',');
+        var lflen = 0, csslen = 0;
+        var skip = false;
+        var x = 0, i = 0, nl, le;
+        for (x = 0,csslen = ar.length; x<csslen; x++) {
+            ignore_css = false;
+            if (ar[x] != null && ar[x] != 'null' && ar[x].length > 0) {
+                /* Make sure it doesn't exist. */
+                for (i=0, lflen=this.loadedFiles.length; i<lflen; i++) {
+                    if (this.loadedFiles[i] == ar[x]) {
+                        skip = true;
+                        break;
+                    }
+                }
+                if (!skip) {
+                    if (tinyMCE.settings.strict_loading_mode) {
+                        nl = document.getElementsByTagName("head");
+                        le = document.createElement('link');
+                        le.setAttribute('href', ar[x]);
+                        le.setAttribute('rel', 'stylesheet');
+                        le.setAttribute('type', 'text/css');
+                        nl[0].appendChild(le);
+                    } else
+                        document.write('<link href="' + ar[x] + '" rel="stylesheet" type="text/css" />');
+                    this.loadedFiles[this.loadedFiles.length] = ar[x];
+                }
+            }
+        }
+    },
+    importCSS : function(doc, css) {
+        var css_ary = css.replace(/\s+/, '').split(',');
+        var csslen, elm, headArr, x, css_file;
+        for (x = 0, csslen = css_ary.length; x<csslen; x++) {
+            css_file = css_ary[x];
+            if (css_file != null && css_file != 'null' && css_file.length > 0) {
+                // Is relative, make absolute
+                if (css_file.indexOf('://') == -1 && css_file.charAt(0) != '/')
+                    css_file = this.documentBasePath + "/" + css_file;
+                if (typeof(doc.createStyleSheet) == "undefined") {
+                    elm = doc.createElement("link");
+                    elm.rel = "stylesheet";
+                    elm.href = css_file;
+                    if ((headArr = doc.getElementsByTagName("head")) != null && headArr.length > 0)
+                        headArr[0].appendChild(elm);
+                } else
+                    doc.createStyleSheet(css_file);
+            }
+        }
+    },
+    confirmAdd : function(e, settings) {
+        var elm = tinyMCE.isMSIE ? event.srcElement : e.target;
+        var elementId = elm.name ? elm.name : elm.id;
+        tinyMCE.settings = settings;
+        if (tinyMCE.settings['convert_on_click'] || (!elm.getAttribute('mce_noask') && confirm(tinyMCELang['lang_edit_confirm'])))
+            tinyMCE.addMCEControl(elm, elementId);
+        elm.setAttribute('mce_noask', 'true');
+    },
+    updateContent : function(form_element_name) {
+        // Find MCE instance linked to given form element and copy it's value
+        var formElement = document.getElementById(form_element_name);
+        for (var n in tinyMCE.instances) {
+            var inst = tinyMCE.instances[n];
+            if (!tinyMCE.isInstance(inst))
+                continue;
+            inst.switchSettings();
+            if (inst.formElement == formElement) {
+                var doc = inst.getDoc();
+                tinyMCE._setHTML(doc, inst.formElement.value);
+                if (!tinyMCE.isMSIE)
+                    doc.body.innerHTML = tinyMCE._cleanupHTML(inst, doc, this.settings, doc.body, inst.visualAid);
+            }
+        }
+    },
+    addMCEControl : function(replace_element, form_element_name, target_document) {
+        var id = "mce_editor_" + tinyMCE.idCounter++;
+        var inst = new TinyMCE_Control(tinyMCE.settings);
+        inst.editorId = id;
+        this.instances[id] = inst;
+        inst._onAdd(replace_element, form_element_name, target_document);
+    },
+    removeMCEControl : function(editor_id) {
+        var inst = tinyMCE.getInstanceById(editor_id);
+        if (inst) {
+            inst.switchSettings();
+            editor_id = inst.editorId;
+            var html = tinyMCE.getContent(editor_id);
+            // Remove editor instance from instances array
+            var tmpInstances = new Array();
+            for (var instanceName in tinyMCE.instances) {
+                var instance = tinyMCE.instances[instanceName];
+                if (!tinyMCE.isInstance(instance))
+                    continue;
+                if (instanceName != editor_id)
+                        tmpInstances[instanceName] = instance;
+            }
+            tinyMCE.instances = tmpInstances;
+            tinyMCE.selectedElement = null;
+            tinyMCE.selectedInstance = null;
+            // Remove element
+            var replaceElement = document.getElementById(editor_id + "_parent");
+            var oldTargetElement = inst.oldTargetElement;
+            var targetName = oldTargetElement.nodeName.toLowerCase();
+            if (targetName == "textarea" || targetName == "input") {
+                // Just show the old text area
+                replaceElement.parentNode.removeChild(replaceElement);
+                oldTargetElement.style.display = "inline";
+                oldTargetElement.value = html;
+            } else {
+                oldTargetElement.innerHTML = html;
+                oldTargetElement.style.display = 'block';
+                replaceElement.parentNode.insertBefore(oldTargetElement, replaceElement);
+                replaceElement.parentNode.removeChild(replaceElement);
+            }
+        }
+    },
+    triggerSave : function(skip_cleanup, skip_callback) {
+        var inst, n;
+    }
+    document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></script>');
+    this.loadedFiles[this.loadedFiles.length] = url;
+};
+TinyMCE.prototype.loadCSS = function(url) {
+    for (var i=0; i<this.loadedFiles.length; i++) {
+        if (this.loadedFiles[i] == url)
+            return;
+    }
+    document.write('<link href="' + url + '" rel="stylesheet" type="text/css" />');
+    this.loadedFiles[this.loadedFiles.length] = url;
+};
+TinyMCE.prototype.importCSS = function(doc, css_file) {
+    if (css_file == '')
+        return;
+    if (typeof(doc.createStyleSheet) == "undefined") {
+        var elm = doc.createElement("link");
+        elm.rel = "stylesheet";
+        elm.href = css_file;
+        if ((headArr = doc.getElementsByTagName("head")) != null && headArr.length > 0)
+            headArr[0].appendChild(elm);
+    } else
+        var styleSheet = doc.createStyleSheet(css_file);
+};
+TinyMCE.prototype.confirmAdd = function(e, settings) {
+    var elm = tinyMCE.isMSIE ? event.srcElement : e.target;
+    var elementId = elm.name ? elm.name : elm.id;
+    tinyMCE.settings = settings;
+    if (!elm.getAttribute('mce_noask') && confirm(tinyMCELang['lang_edit_confirm']))
+        tinyMCE.addMCEControl(elm, elementId);
+    elm.setAttribute('mce_noask', 'true');
+};
+TinyMCE.prototype.updateContent = function(form_element_name) {
+    // Find MCE instance linked to given form element and copy it's value
+    var formElement = document.getElementById(form_element_name);
+    for (var n in tinyMCE.instances) {
+        var inst = tinyMCE.instances[n];
+        if (!tinyMCE.isInstance(inst))
+            continue;
+        inst.switchSettings();
+        if (inst.formElement == formElement) {
+            var doc = inst.getDoc();
+            tinyMCE._setHTML(doc, inst.formElement.value);
+            if (!tinyMCE.isMSIE)
+                doc.body.innerHTML = tinyMCE._cleanupHTML(inst, doc, this.settings, doc.body, inst.visualAid);
+        }
+    }
+};
+TinyMCE.prototype.addMCEControl = function(replace_element, form_element_name, target_document) {
+    var id = "mce_editor_" + tinyMCE.idCounter++;
+    var inst = new TinyMCEControl(tinyMCE.settings);
+    inst.editorId = id;
+    this.instances[id] = inst;
+    inst.onAdd(replace_element, form_element_name, target_document);
+};
+TinyMCE.prototype.triggerSave = function(skip_cleanup, skip_callback) {
+    // Cleanup and set all form fields
+    for (var n in tinyMCE.instances) {
+        var inst = tinyMCE.instances[n];
+        if (!tinyMCE.isInstance(inst))
+            continue;
+        inst.switchSettings();
+        tinyMCE.settings['preformatted'] = false;
         // Default to false
 …
             skip_callback = false;
+        // Cleanup and set all form fields
+        for (n in tinyMCE.instances) {
+            inst = tinyMCE.instances[n];
+            if (!tinyMCE.isInstance(inst))
+                continue;
+            inst.triggerSave(skip_cleanup, skip_callback);
+        }
+    },
+    resetForm : function(form_index) {
+        var i, inst, n, formObj = document.forms[form_index];
+        for (n in tinyMCE.instances) {
+            inst = tinyMCE.instances[n];
+            if (!tinyMCE.isInstance(inst))
+                continue;
+            inst.switchSettings();
+            for (i=0; i<formObj.elements.length; i++) {
+                if (inst.formTargetElementId == formObj.elements[i].name)
+                    inst.getBody().innerHTML = inst.startContent;
+            }
+        }
+    },
+    execInstanceCommand : function(editor_id, command, user_interface, value, focus) {
+        var inst = tinyMCE.getInstanceById(editor_id);
+        if (inst) {
+            if (typeof(focus) == "undefined")
+                focus = true;
+            if (focus)
+                inst.contentWindow.focus();
+            // Reset design mode if lost
+            inst.autoResetDesignMode();
+            this.selectedElement = inst.getFocusElement();
+            this.selectedInstance = inst;
+            tinyMCE.execCommand(command, user_interface, value);
+            // Cancel event so it doesn't call onbeforeonunlaod
+            if (tinyMCE.isMSIE && window.event != null)
+                tinyMCE.cancelEvent(window.event);
+        }
+    },
+    execCommand : function(command, user_interface, value) {
+        // Default input
+        user_interface = user_interface ? user_interface : false;
+        value = value ? value : null;
+        if (tinyMCE.selectedInstance)
+            tinyMCE.selectedInstance.switchSettings();
+        switch (command) {
+            case 'mceHelp':
+                tinyMCE.openWindow({
+                    file : 'about.htm',
+                    width : 480,
+                    height : 380
+                }, {
+                    tinymce_version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion,
+                    tinymce_releasedate : tinyMCE.releaseDate,
+                    inline : "yes"
+                });
+            return;
+            case 'mceFocus':
+                var inst = tinyMCE.getInstanceById(value);
+                if (inst)
+                    inst.contentWindow.focus();
+            return;
+            case "mceAddControl":
+            case "mceAddEditor":
+                tinyMCE.addMCEControl(tinyMCE._getElementById(value), value);
+                return;
+            case "mceAddFrameControl":
+                tinyMCE.addMCEControl(tinyMCE._getElementById(value['element'], value['document']), value['element'], value['document']);
+                return;
+            case "mceRemoveControl":
+            case "mceRemoveEditor":
+                tinyMCE.removeMCEControl(value);
+                return;
+            case "mceResetDesignMode":
+                // Resets the designmode state of the editors in Gecko
+                if (!tinyMCE.isMSIE) {
+                    for (var n in tinyMCE.instances) {
+                        if (!tinyMCE.isInstance(tinyMCE.instances[n]))
+                            continue;
+                        try {
+                            tinyMCE.instances[n].getDoc().designMode = "on";
+                        } catch (e) {
+                            // Ignore any errors
+                        }
+                    }
+                }
+                return;
+        }
+        if (this.selectedInstance) {
+            this.selectedInstance.execCommand(command, user_interface, value);
+        } else if (tinyMCE.settings['focus_alert'])
+            alert(tinyMCELang['lang_focus_alert']);
+    },
+    _createIFrame : function(replace_element, doc, win) {
+        var iframe, id = replace_element.getAttribute("id");
+        var aw, ah;
+        if (typeof(doc) == "undefined")
+            doc = document;
+        if (typeof(win) == "undefined")
+            win = window;
+        iframe = doc.createElement("iframe");
+        aw = "" + tinyMCE.settings['area_width'];
+        ah = "" + tinyMCE.settings['area_height'];
+        if (aw.indexOf('%') == -1) {
+            aw = parseInt(aw);
+            aw = aw < 0 ? 300 : aw;
+            aw = aw + "px";
+        }
+        if (ah.indexOf('%') == -1) {
+            ah = parseInt(ah);
+            ah = ah < 0 ? 240 : ah;
+            ah = ah + "px";
+        }
+        iframe.setAttribute("id", id);
+        iframe.setAttribute("class", "mceEditorIframe");
+        iframe.setAttribute("border", "0");
+        iframe.setAttribute("frameBorder", "0");
+        iframe.setAttribute("marginWidth", "0");
+        iframe.setAttribute("marginHeight", "0");
+        iframe.setAttribute("leftMargin", "0");
+        iframe.setAttribute("topMargin", "0");
+        iframe.setAttribute("width", aw);
+        iframe.setAttribute("height", ah);
+        iframe.setAttribute("allowtransparency", "true");
+        iframe.className = 'mceEditorIframe';
+        if (tinyMCE.settings["auto_resize"])
+            iframe.setAttribute("scrolling", "no");
+        // Must have a src element in MSIE HTTPs breaks aswell as absoute URLs
+        if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+            iframe.setAttribute("src", this.settings['default_document']);
+        iframe.style.width = aw;
+        iframe.style.height = ah;
+        // Ugly hack for Gecko problem in strict mode
+        if (tinyMCE.settings.strict_loading_mode)
+            iframe.style.marginBottom = '-5px';
+        // MSIE 5.0 issue
+        if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+            replace_element.outerHTML = iframe.outerHTML;
+        else
+            replace_element.parentNode.replaceChild(iframe, replace_element);
+        if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+            return win.frames[id];
+        else
+            return iframe;
+    },
+    setupContent : function(editor_id) {
+        var inst = tinyMCE.instances[editor_id];
+        var doc = inst.getDoc();
+        var head = doc.getElementsByTagName('head').item(0);
+        var content = inst.startContent;
+        // HTML values get XML encoded in strict mode
+        if (tinyMCE.settings.strict_loading_mode) {
+            content = content.replace(/&lt;/g, '<');
+            content = content.replace(/&gt;/g, '>');
+            content = content.replace(/&quot;/g, '"');
+            content = content.replace(/&amp;/g, '&');
+        }
+        inst.switchSettings();
+        // Not loaded correctly hit it again, Mozilla bug #997860
+        if (!tinyMCE.isMSIE && tinyMCE.getParam("setupcontent_reload", false) && doc.title != "blank_page") {
+            // This part will remove the designMode status
+            // Failes first time in Firefox 1.5b2 on Mac
+            try {doc.location.href = tinyMCE.baseURL + "/blank.htm";} catch (ex) {}
+            window.setTimeout("tinyMCE.setupContent('" + editor_id + "');", 1000);
+            return;
+        }
+        if (!head) {
+            window.setTimeout("tinyMCE.setupContent('" + editor_id + "');", 10);
+            return;
+        }
+        // Import theme specific content CSS the user specific
+        tinyMCE.importCSS(inst.getDoc(), tinyMCE.baseURL + "/themes/" + inst.settings['theme'] + "/css/editor_content.css");
+        tinyMCE.importCSS(inst.getDoc(), inst.settings['content_css']);
+        tinyMCE.dispatchCallback(inst, 'init_instance_callback', 'initInstance', inst);
+        // Setup keyboard shortcuts
+        if (tinyMCE.getParam('custom_undo_redo_keyboard_shortcuts')) {
+            inst.addShortcut('ctrl', 'z', 'lang_undo_desc', 'Undo');
+            inst.addShortcut('ctrl', 'y', 'lang_redo_desc', 'Redo');
+        }
+        // Add default shortcuts for gecko
+        if (tinyMCE.isGecko) {
+            inst.addShortcut('ctrl', 'b', 'lang_bold_desc', 'Bold');
+            inst.addShortcut('ctrl', 'i', 'lang_italic_desc', 'Italic');
+            inst.addShortcut('ctrl', 'u', 'lang_underline_desc', 'Underline');
+        }
+        // Setup span styles
+        if (tinyMCE.getParam("convert_fonts_to_spans"))
+            inst.getDoc().body.setAttribute('id', 'mceSpanFonts');
+        if (tinyMCE.settings['nowrap'])
+            doc.body.style.whiteSpace = "nowrap";
+        doc.body.dir = this.settings['directionality'];
+        doc.editorId = editor_id;
+        // Add on document element in Mozilla
+        if (!tinyMCE.isMSIE)
+            doc.documentElement.editorId = editor_id;
+        inst.setBaseHREF(tinyMCE.settings['base_href']);
+        // Replace new line characters to BRs
+        if (tinyMCE.settings['convert_newlines_to_brs']) {
+            content = tinyMCE.regexpReplace(content, "\r\n", "<br />", "gi");
+            content = tinyMCE.regexpReplace(content, "\r", "<br />", "gi");
+            content = tinyMCE.regexpReplace(content, "\n", "<br />", "gi");
+        }
+        // Open closed anchors
+    //  content = content.replace(new RegExp('<a(.*?)/>', 'gi'), '<a$1></a>');
+        // Call custom cleanup code
+        content = tinyMCE.storeAwayURLs(content);
+        content = tinyMCE._customCleanup(inst, "insert_to_editor", content);
+        if (tinyMCE.isMSIE) {
+            // Ugly!!!
+            window.setInterval('try{tinyMCE.getCSSClasses(tinyMCE.instances["' + editor_id + '"].getDoc(), "' + editor_id + '");}catch(e){}', 500);
+            if (tinyMCE.settings["force_br_newlines"])
+                doc.styleSheets[0].addRule("p", "margin: 0;");
+            var body = inst.getBody();
+            body.editorId = editor_id;
+        }
+        content = tinyMCE.cleanupHTMLCode(content);
+        // Fix for bug #958637
+        if (!tinyMCE.isMSIE) {
+            var contentElement = inst.getDoc().createElement("body");
+            var doc = inst.getDoc();
+            contentElement.innerHTML = content;
+            // Remove weridness!
+            if (tinyMCE.isGecko && tinyMCE.settings['remove_lt_gt'])
+                content = content.replace(new RegExp('&lt;&gt;', 'g'), "");
+            if (tinyMCE.settings['cleanup_on_startup'])
+                tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, doc, this.settings, contentElement));
+            else {
+                // Convert all strong/em to b/i
+                content = tinyMCE.regexpReplace(content, "<strong", "<b", "gi");
+                content = tinyMCE.regexpReplace(content, "<em(/?)>", "<i$1>", "gi");
+                content = tinyMCE.regexpReplace(content, "<em ", "<i ", "gi");
+                content = tinyMCE.regexpReplace(content, "</strong>", "</b>", "gi");
+                content = tinyMCE.regexpReplace(content, "</em>", "</i>", "gi");
+                tinyMCE.setInnerHTML(inst.getBody(), content);
+            }
+            tinyMCE.convertAllRelativeURLs(inst.getBody());
+        } else {
+            if (tinyMCE.settings['cleanup_on_startup']) {
+                tinyMCE._setHTML(inst.getDoc(), content);
+                // Produces permission denied error in MSIE 5.5
+                eval('try {tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, inst.contentDocument, this.settings, inst.getBody()));} catch(e) {}');
+            } else
+                tinyMCE._setHTML(inst.getDoc(), content);
+        }
+        // Fix for bug #957681
+        //inst.getDoc().designMode = inst.getDoc().designMode;
+        // Setup element references
+        var parentElm = inst.targetDoc.getElementById(inst.editorId + '_parent');
+        inst.formElement = tinyMCE.isGecko ? parentElm.previousSibling : parentElm.nextSibling;
+        tinyMCE.handleVisualAid(inst.getBody(), true, tinyMCE.settings['visual'], inst);
+        tinyMCE.dispatchCallback(inst, 'setupcontent_callback', 'setupContent', editor_id, inst.getBody(), inst.getDoc());
+        // Re-add design mode on mozilla
+        if (!tinyMCE.isMSIE)
+            tinyMCE.addEventHandlers(inst);
+        // Add blur handler
+        if (tinyMCE.isMSIE) {
+            tinyMCE.addEvent(inst.getBody(), "blur", TinyMCE_Engine.prototype._eventPatch);
+            tinyMCE.addEvent(inst.getBody(), "beforedeactivate", TinyMCE_Engine.prototype._eventPatch); // Bug #1439953
+            // Workaround for drag drop/copy paste base href bug
+            if (!tinyMCE.isOpera) {
+                tinyMCE.addEvent(doc.body, "mousemove", TinyMCE_Engine.prototype.onMouseMove);
+                tinyMCE.addEvent(doc.body, "beforepaste", TinyMCE_Engine.prototype._eventPatch);
+                tinyMCE.addEvent(doc.body, "drop", TinyMCE_Engine.prototype._eventPatch);
+            }
+        }
+        // Trigger node change, this call locks buttons for tables and so forth
+        tinyMCE.selectedInstance = inst;
+        tinyMCE.selectedElement = inst.contentWindow.document.body;
+        // Call custom DOM cleanup
+        tinyMCE._customCleanup(inst, "insert_to_editor_dom", inst.getBody());
+        tinyMCE._customCleanup(inst, "setup_content_dom", inst.getBody());
+        tinyMCE._setEventsEnabled(inst.getBody(), false);
+        tinyMCE.cleanupAnchors(inst.getDoc());
+        if (tinyMCE.getParam("convert_fonts_to_spans"))
+            tinyMCE.convertSpansToFonts(inst.getDoc());
+        inst.startContent = tinyMCE.trim(inst.getBody().innerHTML);
+        inst.undoRedo.add({ content : inst.startContent });
+        // Cleanup any mess left from storyAwayURLs
+        if (tinyMCE.isGecko) {
+            // Remove mce_src from textnodes and comments
+            tinyMCE.selectNodes(inst.getBody(), function(n) {
+                if (n.nodeType == 3 || n.nodeType == 8) {
+                    n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"', 'gi'), "");
+                    n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"', 'gi'), "");
+                }
+                return false;
+            });
+        }
+        // Cleanup any mess left from storyAwayURLs
+        tinyMCE._removeInternal(inst.getBody());
+        tinyMCE.selectedInstance = inst;
+        tinyMCE.triggerNodeChange(false, true);
+    },
+    storeAwayURLs : function(s) {
+        // Remove all mce_src, mce_href and replace them with new ones
+    //  s = s.replace(new RegExp('mce_src\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
+    //  s = s.replace(new RegExp('mce_href\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
+        if (!s.match(/(mce_src|mce_href)/gi, s)) {
+            s = s.replace(new RegExp('src\\s*=\\s*\"([^ >\"]*)\"', 'gi'), 'src="$1" mce_src="$1"');
+            s = s.replace(new RegExp('href\\s*=\\s*\"([^ >\"]*)\"', 'gi'), 'href="$1" mce_href="$1"');
+        }
+        return s;
+    },
+    _removeInternal : function(n) {
+        if (tinyMCE.isGecko) {
+            // Remove mce_src from textnodes and comments
+            tinyMCE.selectNodes(n, function(n) {
+                if (n.nodeType == 3 || n.nodeType == 8) {
+                    n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_src=\"[^\"]*\"', 'gi'), "");
+                    n.nodeValue = n.nodeValue.replace(new RegExp('\\smce_href=\"[^\"]*\"', 'gi'), "");
+                }
+                return false;
+            });
+        }
+    },
+    removeTinyMCEFormElements : function(form_obj) {
+        // Check if form is valid
+        if (typeof(form_obj) == "undefined" || form_obj == null)
+            return;
+        // If not a form, find the form
+        if (form_obj.nodeName != "FORM") {
+            if (form_obj.form)
+                form_obj = form_obj.form;
+            else
+                form_obj = tinyMCE.getParentElement(form_obj, "form");
+        }
+        // Still nothing
+        if (form_obj == null)
+            return;
+        // Disable all UI form elements that TinyMCE created
+        for (var i=0; i<form_obj.elements.length; i++) {
+            var elementId = form_obj.elements[i].name ? form_obj.elements[i].name : form_obj.elements[i].id;
+            if (elementId.indexOf('mce_editor_') == 0)
+                form_obj.elements[i].disabled = true;
+        }
+    },
+    handleEvent : function(e) {
+        var inst = tinyMCE.selectedInstance;
+        // Remove odd, error
+        if (typeof(tinyMCE) == "undefined")
+            return true;
+        //tinyMCE.debug(e.type + " " + e.target.nodeName + " " + (e.relatedTarget ? e.relatedTarget.nodeName : ""));
+        if (tinyMCE.executeCallback(tinyMCE.selectedInstance, 'handle_event_callback', 'handleEvent', e))
+            return false;
+        switch (e.type) {
+            case "beforedeactivate": // Was added due to bug #1439953
+            case "blur":
+                if (tinyMCE.selectedInstance)
+                    tinyMCE.selectedInstance.execCommand('mceEndTyping');
+                tinyMCE.hideMenus();
+                return;
+            // Workaround for drag drop/copy paste base href bug
+            case "drop":
+            case "beforepaste":
+                if (tinyMCE.selectedInstance)
+                    tinyMCE.selectedInstance.setBaseHREF(null);
+                // Fixes odd MSIE bug where drag/droping elements in a iframe with height 100% breaks
+                // This logic forces the width/height to be in pixels while the user is drag/dropping
+                if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+                    var ife = tinyMCE.selectedInstance.iframeElement;
+                    /*if (ife.style.width.indexOf('%') != -1) {
+                        ife._oldWidth = ife.width.height;
+                        ife.style.width = ife.clientWidth;
+                    }*/
+                    if (ife.style.height.indexOf('%') != -1) {
+                        ife._oldHeight = ife.style.height;
+                        ife.style.height = ife.clientHeight;
+                    }
+                }
+                window.setTimeout("tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings['base_href']);tinyMCE._resetIframeHeight();", 1);
+                return;
+            case "submit":
+                tinyMCE.removeTinyMCEFormElements(tinyMCE.isMSIE ? window.event.srcElement : e.target);
+                tinyMCE.triggerSave();
+                tinyMCE.isNotDirty = true;
+                return;
+            case "reset":
+                var formObj = tinyMCE.isMSIE ? window.event.srcElement : e.target;
+                for (var i=0; i<document.forms.length; i++) {
+                    if (document.forms[i] == formObj)
+                        window.setTimeout('tinyMCE.resetForm(' + i + ');', 10);
+                }
+                return;
+            case "keypress":
+                if (inst && inst.handleShortcut(e))
+                    return false;
+                if (e.target.editorId) {
+                    tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+                } else {
+                    if (e.target.ownerDocument.editorId)
+                        tinyMCE.selectedInstance = tinyMCE.instances[e.target.ownerDocument.editorId];
+                }
+                if (tinyMCE.selectedInstance)
+                    tinyMCE.selectedInstance.switchSettings();
+                // Insert P element
+                if (tinyMCE.isGecko && tinyMCE.settings['force_p_newlines'] && e.keyCode == 13 && !e.shiftKey) {
+                    // Insert P element instead of BR
+                    if (TinyMCE_ForceParagraphs._insertPara(tinyMCE.selectedInstance, e)) {
+                        // Cancel event
+                        tinyMCE.execCommand("mceAddUndoLevel");
+                        tinyMCE.cancelEvent(e);
+                        return false;
+                    }
+                }
+                // Handle backspace
+                if (tinyMCE.isGecko && tinyMCE.settings['force_p_newlines'] && (e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey) {
+                    // Insert P element instead of BR
+                    if (TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance, e.type)) {
+                        // Cancel event
+                        tinyMCE.execCommand("mceAddUndoLevel");
+                        tinyMCE.cancelEvent(e);
+                        return false;
+                    }
+                }
+                // Return key pressed
+                if (tinyMCE.isMSIE && tinyMCE.settings['force_br_newlines'] && e.keyCode == 13) {
+                    if (e.target.editorId)
+                        tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+                    if (tinyMCE.selectedInstance) {
+                        var sel = tinyMCE.selectedInstance.getDoc().selection;
+                        var rng = sel.createRange();
+                        if (tinyMCE.getParentElement(rng.parentElement(), "li") != null)
+                            return false;
+                        // Cancel event
+                        e.returnValue = false;
+                        e.cancelBubble = true;
+                        // Insert BR element
+                        rng.pasteHTML("<br />");
+                        rng.collapse(false);
+                        rng.select();
+                        tinyMCE.execCommand("mceAddUndoLevel");
+                        tinyMCE.triggerNodeChange(false);
+                        return false;
+                    }
+                }
+                // Backspace or delete
+                if (e.keyCode == 8 || e.keyCode == 46) {
+                    tinyMCE.selectedElement = e.target;
+                    tinyMCE.linkElement = tinyMCE.getParentElement(e.target, "a");
+                    tinyMCE.imgElement = tinyMCE.getParentElement(e.target, "img");
+                    tinyMCE.triggerNodeChange(false);
+                }
+                return false;
+            break;
+            case "keyup":
+            case "keydown":
+                tinyMCE.hideMenus();
+                tinyMCE.hasMouseMoved = false;
+                if (inst && inst.handleShortcut(e))
+                    return false;
+                if (e.target.editorId)
+                    tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+                else
+                    return;
+                if (tinyMCE.selectedInstance)
+                    tinyMCE.selectedInstance.switchSettings();
+                var inst = tinyMCE.selectedInstance;
+                // Handle backspace
+                if (tinyMCE.isGecko && tinyMCE.settings['force_p_newlines'] && (e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey) {
+                    // Insert P element instead of BR
+                    if (TinyMCE_ForceParagraphs._handleBackSpace(tinyMCE.selectedInstance, e.type)) {
+                        // Cancel event
+                        tinyMCE.execCommand("mceAddUndoLevel");
+                        e.preventDefault();
+                        return false;
+                    }
+                }
+                tinyMCE.selectedElement = null;
+                tinyMCE.selectedNode = null;
+                var elm = tinyMCE.selectedInstance.getFocusElement();
+                tinyMCE.linkElement = tinyMCE.getParentElement(elm, "a");
+                tinyMCE.imgElement = tinyMCE.getParentElement(elm, "img");
+                tinyMCE.selectedElement = elm;
+                // Update visualaids on tabs
+                if (tinyMCE.isGecko && e.type == "keyup" && e.keyCode == 9)
+                    tinyMCE.handleVisualAid(tinyMCE.selectedInstance.getBody(), true, tinyMCE.settings['visual'], tinyMCE.selectedInstance);
+                // Fix empty elements on return/enter, check where enter occured
+                if (tinyMCE.isMSIE && e.type == "keydown" && e.keyCode == 13)
+                    tinyMCE.enterKeyElement = tinyMCE.selectedInstance.getFocusElement();
+                // Fix empty elements on return/enter
+                if (tinyMCE.isMSIE && e.type == "keyup" && e.keyCode == 13) {
+                    var elm = tinyMCE.enterKeyElement;
+                    if (elm) {
+                        var re = new RegExp('^HR|IMG|BR$','g'); // Skip these
+                        var dre = new RegExp('^H[1-6]$','g'); // Add double on these
+                        if (!elm.hasChildNodes() && !re.test(elm.nodeName)) {
+                            if (dre.test(elm.nodeName))
+                                elm.innerHTML = "&nbsp;&nbsp;";
+                            else
+                                elm.innerHTML = "&nbsp;";
+                        }
+                    }
+                }
+                // Check if it's a position key
+                var keys = tinyMCE.posKeyCodes;
+                var posKey = false;
+                for (var i=0; i<keys.length; i++) {
+                    if (keys[i] == e.keyCode) {
+                        posKey = true;
+                        break;
+                    }
+                }
+                // MSIE custom key handling
+                if (tinyMCE.isMSIE && tinyMCE.settings['custom_undo_redo']) {
+                    var keys = new Array(8,46); // Backspace,Delete
+                    for (var i=0; i<keys.length; i++) {
+                        if (keys[i] == e.keyCode) {
+                            if (e.type == "keyup")
+                                tinyMCE.triggerNodeChange(false);
+                        }
+                    }
+                }
+                // If Ctrl key
+                if (e.keyCode == 17)
+                    return true;
+                // Handle Undo/Redo when typing content
+                // Start typing (non position key)
+                if (!posKey && e.type == "keyup")
+                    tinyMCE.execCommand("mceStartTyping");
+                // Store undo bookmark
+                if (e.type == "keydown" && (posKey || e.ctrlKey) && inst)
+                    inst.undoBookmark = inst.selection.getBookmark();
+                // End typing (position key) or some Ctrl event
+                if (e.type == "keyup" && (posKey || e.ctrlKey))
+                    tinyMCE.execCommand("mceEndTyping");
+                if (posKey && e.type == "keyup")
+                    tinyMCE.triggerNodeChange(false);
+                if (tinyMCE.isMSIE && e.ctrlKey)
+                    window.setTimeout('tinyMCE.triggerNodeChange(false);', 1);
+            break;
+            case "mousedown":
+            case "mouseup":
+            case "click":
+            case "focus":
+                tinyMCE.hideMenus();
+                if (tinyMCE.selectedInstance) {
+                    tinyMCE.selectedInstance.switchSettings();
+                    tinyMCE.selectedInstance.isFocused = true;
+                }
+                // Check instance event trigged on
+                var targetBody = tinyMCE.getParentElement(e.target, "body");
+                for (var instanceName in tinyMCE.instances) {
+                    if (!tinyMCE.isInstance(tinyMCE.instances[instanceName]))
+                        continue;
+                    var inst = tinyMCE.instances[instanceName];
+                    // Reset design mode if lost (on everything just in case)
+                    inst.autoResetDesignMode();
+                    if (inst.getBody() == targetBody) {
+                        tinyMCE.selectedInstance = inst;
+                        tinyMCE.selectedElement = e.target;
+                        tinyMCE.linkElement = tinyMCE.getParentElement(tinyMCE.selectedElement, "a");
+                        tinyMCE.imgElement = tinyMCE.getParentElement(tinyMCE.selectedElement, "img");
+                        break;
+                    }
+                }
+                // Add first bookmark location
+                if (!tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark)
+                    tinyMCE.selectedInstance.undoRedo.undoLevels[0].bookmark = tinyMCE.selectedInstance.selection.getBookmark();
+                if (tinyMCE.isSafari) {
+                    tinyMCE.selectedInstance.lastSafariSelection = tinyMCE.selectedInstance.selection.getBookmark();
+                    tinyMCE.selectedInstance.lastSafariSelectedElement = tinyMCE.selectedElement;
+                    var lnk = tinyMCE.getParentElement(tinyMCE.selectedElement, "a");
+                    // Patch the darned link
+                    if (lnk && e.type == "mousedown") {
+                        lnk.setAttribute("mce_real_href", lnk.getAttribute("href"));
+                        lnk.setAttribute("href", "javascript:void(0);");
+                    }
+                    // Patch back
+                    if (lnk && e.type == "click") {
+                        window.setTimeout(function() {
+                            lnk.setAttribute("href", lnk.getAttribute("mce_real_href"));
+                            lnk.removeAttribute("mce_real_href");
+                        }, 10);
+                    }
+                }
+                // Reset selected node
+                if (e.type != "focus")
+                    tinyMCE.selectedNode = null;
+                tinyMCE.triggerNodeChange(false);
+                tinyMCE.execCommand("mceEndTyping");
+                if (e.type == "mouseup")
+                    tinyMCE.execCommand("mceAddUndoLevel");
+                // Just in case
+                if (!tinyMCE.selectedInstance && e.target.editorId)
+                    tinyMCE.selectedInstance = tinyMCE.instances[e.target.editorId];
+                return false;
+            break;
+        }
+    },
+    getButtonHTML : function(id, lang, img, cmd, ui, val) {
+        var h = '', m, x;
+        cmd = 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + cmd + '\'';
+        if (typeof(ui) != "undefined" && ui != null)
+            cmd += ',' + ui;
+        if (typeof(val) != "undefined" && val != null)
+            cmd += ",'" + val + "'";
+        cmd += ');';
+        // Use tilemaps when enabled and found and never in MSIE since it loads the tile each time from cache if cahce is disabled
+        if (tinyMCE.getParam('button_tile_map') && (!tinyMCE.isMSIE || tinyMCE.isOpera) && (m = this.buttonMap[id]) != null && (tinyMCE.getParam("language") == "en" || img.indexOf('$lang') == -1)) {
+            // Tiled button
+            x = 0 - (m * 20) == 0 ? '0' : 0 - (m * 20);
+            h += '<a id="{$editor_id}_' + id + '" href="javascript:' + cmd + '" onclick="' + cmd + 'return false;" onmousedown="return false;" class="mceTiledButton mceButtonNormal" target="_self">';
+            h += '<img src="{$themeurl}/images/spacer.gif" style="background-position: ' + x + 'px 0" title="{$' + lang + '}" />';
+            h += '</a>';
+        } else {
+            // Normal button
+            h += '<a id="{$editor_id}_' + id + '" href="javascript:' + cmd + '" onclick="' + cmd + 'return false;" onmousedown="return false;" class="mceButtonNormal" target="_self">';
+            h += '<img src="' + img + '" title="{$' + lang + '}" />';
+            h += '</a>';
+        }
+        return h;
+    },
+    addButtonMap : function(m) {
+        var i, a = m.replace(/\s+/, '').split(',');
+        for (i=0; i<a.length; i++)
+            this.buttonMap[a[i]] = i;
+    },
+    submitPatch : function() {
+        tinyMCE.removeTinyMCEFormElements(this);
+        tinyMCE.triggerSave();
+        this.mceOldSubmit();
+        tinyMCE.isNotDirty = true;
+    },
+    onLoad : function() {
+        // Wait for everything to be loaded first
+        if (tinyMCE.settings.strict_loading_mode && this.loadingIndex != -1) {
+            window.setTimeout('tinyMCE.onLoad();', 1);
+            return;
+        }
+        if (tinyMCE.isMSIE && !tinyMCE.isOpera && window.event.type == "readystatechange" && document.readyState != "complete")
+            return true;
+        if (tinyMCE.isLoaded)
+            return true;
+        tinyMCE.isLoaded = true;
+        tinyMCE.dispatchCallback(null, 'onpageload', 'onPageLoad');
+        for (var c=0; c<tinyMCE.configs.length; c++) {
+            tinyMCE.settings = tinyMCE.configs[c];
+            var selector = tinyMCE.getParam("editor_selector");
+            var deselector = tinyMCE.getParam("editor_deselector");
+            var elementRefAr = new Array();
+            // Add submit triggers
+            if (document.forms && tinyMCE.settings['add_form_submit_trigger'] && !tinyMCE.submitTriggers) {
+                for (var i=0; i<document.forms.length; i++) {
+                    var form = document.forms[i];
+                    tinyMCE.addEvent(form, "submit", TinyMCE_Engine.prototype.handleEvent);
+                    tinyMCE.addEvent(form, "reset", TinyMCE_Engine.prototype.handleEvent);
+                    tinyMCE.submitTriggers = true; // Do it only once
+                    // Patch the form.submit function
+                    if (tinyMCE.settings['submit_patch']) {
+                        try {
+                            form.mceOldSubmit = form.submit;
+                            form.submit = TinyMCE_Engine.prototype.submitPatch;
+                        } catch (e) {
+                            // Do nothing
+                        }
+                    }
+                }
+            }
+            // Add editor instances based on mode
+            var mode = tinyMCE.settings['mode'];
+            switch (mode) {
+                case "exact":
+                    var elements = tinyMCE.getParam('elements', '', true, ',');

Context Navigation

Changes in trunk [4431:3503]

Legend: