Changeset 865

Timestamp:

01/24/07 12:40:34 (2 years ago)

Author:

donncha

Message:

WP Merge to revision 4793

Files:

• trunk/app.php (added)
• trunk/wp-admin/admin-functions.php (modified) (3 diffs)
• trunk/wp-admin/edit-form-advanced.php (modified) (2 diffs)
• trunk/wp-admin/edit-page-form.php (modified) (1 diff)
• trunk/wp-admin/users.php (modified) (1 diff)
• trunk/wp-admin/wp-admin.css (modified) (24 diffs)
• trunk/wp-includes/category-template.php (modified) (5 diffs)
• trunk/wp-includes/deprecated.php (modified) (15 diffs)
• trunk/wp-includes/version.php (modified) (1 diff)
• trunk/xmlrpc.php (modified) (6 diffs)

trunk/wp-admin/admin-functions.php

@@ -1283 +1283 @@
-        if ( $items ) {
-                foreach ( $items as $item ) {
-'
+
-                        if (!empty ( $post_ID ) ) {
-                                if ( $item->ID == $post_ID ) {
@@ -2204 +2204 @@
-                        $thumbpath = str_replace( basename( $file ), $thumb, $file );
-
-'
+
-                        if ( $type[2] == 1 ) {
-                                if (!imagegif( $thumbnail, $thumbpath ) ) {
@@ -2229 +2229 @@
-                return $error;
-        } else {
-
-
+
-        }
-}

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

@@ -108 +108 @@
-<?php if ( current_user_can('edit_posts') ) : ?>
-<fieldset id="posttimestampdiv" class="dbx-box">
-:
+
-<div class="dbx-content"><?php touch_time(($action == 'edit')); ?></div>
-</fieldset>
@@ -118 +118 @@
-?>
-<fieldset id="authordiv" class="dbx-box">
-:
+
-<div class="dbx-content">
-<select name="post_author_override" id="post_author_override">

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

@@ -99 +99 @@
-<?php if ( $authors = get_editable_authors( $current_user->id ) ) : // TODO: ROLE SYSTEM ?>
-<fieldset id="authordiv" class="dbx-box">
-:
+
-<div class="dbx-content">
-<select name="post_author_override" id="post_author_override">

trunk/wp-admin/users.php

@@ -469 +469 @@
-
-        <form action="" method="get" name="search" id="search">
- u
+U
-        </form>
-

trunk/wp-admin/wp-admin.css

@@ -202 +202 @@
-        border: 1px solid #b2b2b2;
-        color: #000;
- 
+
-        margin: 1px;
-        padding: 3px;
@@ -209 +209 @@
-#uploading {
-        border-style: none;
-px
+
-        margin-bottom: 16px;
-        height: 18em;
@@ -460 +460 @@
-}
-
-
-#adminmenu .current, #submenu .current {
-        font-weight: bold;
@@ -530 +529 @@
-}
-
-
-#categorydiv input, #poststatusdiv input, #commentstatusdiv input, #pingstatusdiv input {
-        border: none;
@@ -537 +535 @@
-#postdiv, #titlediv, #guiddiv {
-        margin: 0 8px 0 0;
-px
+
-}
-
-#postdivrich {
-px
-px
+
+
-}
-
-#content {
- 0 0 0
+
-        width: 100%;
-}
@@ -556 +554 @@
-
-#titlediv input, #guiddiv input {
-px
+
-        width: 100%;
-}
@@ -580 +578 @@
-#postdivrich #quicktags {
-        background: #f0f0ee;
-px
+
-        border: 1px solid #ccc;
-        border-bottom: none;
@@ -594 +592 @@
-
-#quicktags #ed_toolbar {
-px
+
-}
-
-#ed_toolbar input {
-px
+
-        margin: 3px 2px 2px;
-}
@@ -644 +642 @@
-
-#excerpt, .attachmentlinks {
-px
+
-        height: 4em;
-        width: 100%;
@@ -815 +813 @@
-#postcustom table {
-        border: 1px solid #ccc;
-px
+
-        width: 100%;
-}
@@ -836 +834 @@
-
-* html #template div {
-px
+
-}
-
@@ -968 +966 @@
-set display:none; */
-.zerosize {
-px
-px
-px
-px
-px
+
+
+
+
+
-        overflow: hidden;
-        position: absolute;
@@ -979 +977 @@
-/* Box stuff */
-.dbx-clone {
-
-
+ 
+ 
-}
-.dbx-clone, .dbx-clone .dbx-handle-cursor {
-
+ 
-}
-.dbx-dummy {
-
-
-
-
+ 
+ 
+ 
+ 
-}
-.dbx-group, .dbx-box, .dbx-handle {
-
-
+ 
+ 
-}
-
@@ -1001 +999 @@
-
-* html #themeselect {
-px
+
-        height: 22px;
-}
@@ -1011 +1009 @@
-*****************************************************************/
-.dbx-box {
-
-
-
+ 
+ 
+ 
-}
-
@@ -1021 +1019 @@
-}
-#moremeta fieldset div {
-px
+
-        padding: 7px;
-}
@@ -1084 +1082 @@
-}
-
- 
+
-        width: 100%;
-        font-size: 20px;
@@ -1123 +1121 @@
-/* handles */
-
- 
+
-        background: #2685af;
-        padding: 6px 1em 2px;
@@ -1158 +1156 @@
-        margin-left: 8px;
-        background: url(images/box-bg-right.gif) repeat-y right;
-px
+
-}
-
@@ -1191 +1189 @@
-}
-
-
-/* handle cursors */
-.dbx-handle-cursor {
@@ -1199 +1196 @@
-/* toggle images */
-a.dbx-toggle, a.dbx-toggle:visited {
-
+ 
-        overflow: hidden;
-        background-image: url( images/toggle.gif );
-        position: absolute;
-px
-px
+
+
-        background-repeat: no-repeat;
-px
-px
-px
+
+
+
-}
-
@@ -1214 +1211 @@
-        height: 25px;
-        width: 27px;
-px
+
-}
-
@@ -1297 +1294 @@
-
-#edButtons input, #edButtons input:active {
-px
+
-}
-
@@ -1306 +1303 @@
-
-#edButtons input.edButtonBack, #edButtons input.edButtonBack:active {
-px
+
-        border-bottom: 1px solid #ccc;
-}

trunk/wp-includes/category-template.php

@@ -89 +89 @@
-
-function get_the_category_list($separator = '', $parents='') {
+        global $wp_rewrite;
-        $categories = get_the_category();
-        if (empty($categories))
-                return apply_filters('the_category', __('Uncategorized'), $separator, $parents);
+
+        $rel = ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) ? 'rel="category tag"' : 'rel="category"';
-
-        $thelist = '';
@@ -102 +105 @@
-                                        if ($category->category_parent)
-                                                $thelist .= get_category_parents($category->category_parent, TRUE);
-rel="category tag">'.
+' . $rel . '>' . 
-                                        break;
-                                case 'single':
- rel="category tag"
+" ' . $rel . '
-                                        if ($category->category_parent)
-                                                $thelist .= get_category_parents($category->category_parent, FALSE);
@@ -112 +115 @@
-                                case '':
-                                default:
-rel="category tag">'.
+' . $rel . '>' . 
-                        }
-                }
@@ -125 +128 @@
-                                        if ( $category->category_parent )
-                                                $thelist .= get_category_parents($category->category_parent, TRUE);
-rel="category tag">'.
+' . $rel . '>' . 
-                                        break;
-                                case 'single':
-rel="category tag"
+' . $rel . '
-                                        if ( $category->category_parent )
-                                                $thelist .= get_category_parents($category->category_parent, FALSE);
@@ -135 +138 @@
-                                case '':
-                                default:
-rel="category tag">'.
+' . $rel . '>' . 
-                        }
-                        ++$i;

trunk/wp-includes/deprecated.php

@@ -2 +2 @@
-
-/*
- 
+
- */
-
+
-$tableposts = $wpdb->posts;
-$tableusers = $wpdb->users;
@@ -16 +16 @@
-
-/*
-
+n
- */
-
-Deprecated.  
+
-function get_postdata($postid) {
-        $post = &get_post($postid);
@@ -44 +44 @@
-}
-
-Deprecated.  
+
-function start_wp() {
-        global $wp_query, $post;
@@ -54 +54 @@
-}
-
-// Deprecated.
-function the_category_ID($echo = true) {
-        // Grab the first cat in the list.
@@ -66 +65 @@
-}
-
-// Deprecated.
-function the_category_head($before='', $after='') {
-        global $currentcat, $previouscat;
@@ -80 +78 @@
-}
-
-Deprecated. 
+
-function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
-
@@ -101 +99 @@
-}
-
-Deprecated. 
+
-function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
-
@@ -123 +121 @@
-
-//
-These are deprecated.  Use current_user_can()
+Use current_user_can() for these
-//
-
@@ -245 +243 @@
-        $args = add_query_arg('category', $cat_id, $args);
-        wp_get_links($args);
- // end wp_get_linksbyname
+
-
-/** function get_linkobjectsbyname()
@@ -422 +420 @@
-}
-
+// Use wp_list_cats().
-function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=FALSE, $child_of=0, $categories=0, $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=FALSE) {
-        $query = compact('optionall', 'all', 'sort_column', 'sort_order', 'file', 'list', 'optiondates', 'optioncount', 'hide_empty', 'use_desc_for_title', 'children',
@@ -470 +469 @@
-}
-
-Deprecated.  Use wp_print_scripts() or WP_Scripts instead
+Use wp_print_scripts() or WP_Scripts
-function tinymce_include() {
- 'wp_tiny_mce' 
+'wp_tiny_mce'
-}
-
@@ -488 +487 @@
-}
-
+// Use wp_get_archives().
-function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
-        $args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');
@@ -493 +493 @@
-}
-
-Deprecated. 
+
-function get_author_link($echo = false, $author_id, $author_nicename = '') {
-        $link = get_author_posts_url($author_id, $author_nicename);
@@ -502 +502 @@
-}
-
+// Use wp_link_pages().
-function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', $pagelink='%', $more_file='') {
-        $args = compact('before', 'after', 'next_or_number', 'nextpagelink', 'previouspagelink', 'pagelink', 'more_file');
@@ -507 +508 @@
-}
-
+// Use get_option().
-function get_settings($option) {
-        return get_option($option);

trunk/wp-includes/version.php

@@ -3 +3 @@
-// This holds the version number in a separate file so we can bump it without cluttering the SVN
-
-0
+2
-$wp_db_version = 4772;
-

trunk/xmlrpc.php

@@ -68 +68 @@
-        function wp_xmlrpc_server() {
-                $this->methods = array(
+                        // WordPress API
+                        'wp.getPage'                    => 'this:wp_getPage',
+                        'wp.getPages'                   => 'this:wp_getPages',
+                        'wp.newPage'                    => 'this:wp_newPage',
+                        'wp.deletePage'                 => 'this:wp_deletePage',
+                        'wp.editPage'                   => 'this:wp_editPage',
+                        'wp.getPageList'                => 'this:wp_getPageList',
+                        'wp.getAuthors'                 => 'this:wp_getAuthors',
+                        'wp.getCategories'              => 'this:mw_getCategories',             // Alias
+                        'wp.newCategory'                => 'this:wp_newCategory',
+                        'wp.suggestCategories'  => 'this:wp_suggestCategories',
+
-                        // Blogger API
-                        'blogger.getUsersBlogs' => 'this:blogger_getUsersBlogs',
@@ -147 +159 @@
-        }
-
+        /**
+         * WordPress XML-RPC API
+         * wp_getPage
+         */
+        function wp_getPage($args) {
+                $this->escape($args);
+
+                $blog_id        = $args[0];
+                $page_id        = $args[1];
+                $username       = $args[2];
+                $password       = $args[3];
+
+                if(!$this->login_pass_ok($username, $password)) {
+                        return($this->error);
+                }
+
+                // Lookup page info.
+                $page = get_page($page_id);
+
+                // If we found the page then format the data.
+                if($page->ID && ($page->post_type == "page")) {
+                        // Get all of the page content and link.
+                        $full_page = get_extended($page->post_content);
+                        $link = post_permalink($page->ID);
+
+                        // Determine comment and ping settings.
+                        $allow_comments = ("open" == $page->comment_status) ? 1 : 0;
+                        $allow_pings = ("open" == $page->ping_status) ? 1 : 0;
+
+                        // Format page date.
+                        $page_date = mysql2date("Ymd\TH:i:s", $page->post_date);
+
+                        // Pull the categories info together.
+                        $categories = array();
+                        foreach(wp_get_post_categories($page->ID) as $cat_id) {
+                                $categories[] = get_cat_name($cat_id);
+                        }
+
+                        // Get the users nicename.
+                        $nicename = get_profile("user_nicename", $username);
+
+                        $page_struct = array(
+                                "dateCreated"           => new IXR_Date($page_date),
+                                "userid"                        => $page->post_author,
+                                "page_id"                       => $page->ID,
+                                "description"           => $full_page["main"],
+                                "title"                         => $page->post_title,
+                                "link"                          => $link,
+                                "permaLink"                     => $link,
+                                "categories"            => $categories,
+                                "excerpt"                       => $page->post_excerpt,
+                                "text_more"                     => $full_page["extended"],
+                                "mt_allow_comments"     => $allow_comments,
+                                "mt_allow_pings"        => $allow_pings,
+                                "wp_slug"                       => $page->post_name,
+                                "wp_password"           => $page->post_password,
+                                "wp_author"                     => $nicename,
+                                "wp_page_parent_id"     => $page->post_parent,
+                                "wp_page_order"         => $page->menu_order
+                        );
+
+                        return($page_struct);
+                }
+                // If the page doesn't exist indicate that.
+                else {
+                        return(new IXR_Error(404, "Sorry, no such page."));
+                }
+        }
+
+        /**
+         * WordPress XML-RPC API
+         * wp_getPages
+         */
+        function wp_getPages($args) {
+                $this->escape($args);
+
+                $blog_id        = $args[0];
+                $username       = $args[1];
+                $password       = $args[2];
+
+                if(!$this->login_pass_ok($username, $password)) {
+                        return($this->error);
+                }
+
+                // Lookup info on pages.
+                $pages = array();
+                $pages = get_pages();
+                $num_pages = count($pages);
+
+                // If we have pages, put together their info.
+                if($num_pages >= 1) {
+                        $pages_struct = array();
+
+                        for($i = 0; $i < $num_pages; $i++) {
+                                $page = wp_xmlrpc_server::wp_getPage(array(
+                                        $blog_id, $pages[$i]->ID, $username, $password
+                                ));
+                                $pages_struct[] = $page;
+                        }
+
+                        return($pages_struct);
+                }
+                // If no pages were found return an error.
+                else {
+                        return(new IXR_Error(404, "Sorry, no pages were found."));
+                }
+        }
+
+        /**
+         * WordPress XML-RPC API
+         * wp_newPage
+         */
+        function wp_newPage($args) {
+                $this->escape($args);
+
+                $blog_id        = $args[0];
+                $username       = $args[1];
+                $password       = $args[2];
+                $page           = $args[3];
+                $publish        = $args[4];
+
+                if(!$this->login_pass_ok($username, $password)) {
+                        return($this->error);
+                }
+
+                // Set the user context and check if they are allowed
+                // to add new pages.
+                $user = set_current_user(0, $username);
+                if(!current_user_can("publish_pages")) {
+                        return(new IXR_Error(401, "Sorry, you can not add new pages."));
+                }
+
+                // Mark this as content for a page.
+                $args[3]["post_type"] = "page";
+
+                // Let mw_newPost do all of the heavy lifting.
+                return($this->mw_newPost($args));
+        }
+
+        /**
+         * WordPress XML-RPC API
+         * wp_deletePage
+         */
+        function wp_deletePage($args) {
+                $this->escape($args);
+
+                $blog_id        = $args[0];
+                $username       = $args[1];
+                $password       = $args[2];
+                $page_id        = $args[3];
+
+                if(!$this->login_pass_ok($username, $password)) {
+                        return($this->error);
+                }
+
+                // Get the current page based on the page_id and
+                // make sure it is a page and not a post.
+                $actual_page = wp_get_single_post($page_id, ARRAY_A);
+                if(
+                        !$actual_page
+                        || ($actual_page["post_type"] != "page")
+                ) {
+                        return(new IXR_Error(404, "Sorry, no such page."));
+                }
+
+                // Set the user context and make sure they can delete pages.
+                set_current_user(0, $username);
+                if(!current_user_can("delete_page", $page_id)) {
+                        return(new IXR_Error(401, "Sorry, you do not have the right to delete this page."));
+                }
+
+                // Attempt to delete the page.
+                $result = wp_delete_post($page_id);
+                if(!$result) {
+                        return(new IXR_Error(500, "Failed to delete the page."));
+                }
+
+                return(true);
+        }
+
+        /**
+         * WordPress XML-RPC API
+         * wp_editPage
+         */
+        function wp_editPage($args) {
+                $this->escape($args);
+
+                $blog_id        = $args[0];
+                $page_id        = $args[1];
+                $username       = $args[2];
+                $password       = $args[3];
+                $content        = $args[4];
+                $publish        = $args[5];
+
+                if(!$this->login_pass_ok($username, $password)) {
+                        return($this->error);
+                }
+
+                // Get the page data and make sure it is a page.
+                $actual_page = wp_get_single_post($page_id, ARRAY_A);
+                if(
+                        !$actual_page
+                        || ($actual_page["post_type"] != "page")
+                ) {
+                        return(new IXR_Error(404, "Sorry, no such page."));
+                }
+
+                // Set the user context and make sure they are allowed to edit pages.
+                set_current_user(0, $username);
+                if(!current_user_can("edit_page", $page_id)) {
+                        return(new IXR_Error(401, "Sorry, you do not have the right to edit this page."));
+                }
+
+                // Mark this as content for a page.
+                $content["post_type"] = "page";
+
+                // Arrange args in the way mw_editPost understands.
+                $args = array(
+                        $page_id,
+                        $username,
+                        $password,
+                        $content,
+                        $publish
+                );
+
+                // Let mw_editPost do all of the heavy lifting.
+                return($this->mw_editPost($args));
+        }
+
+        /**
+         * WordPress XML-RPC API
+         * wp_getPageList
+         */
+        function wp_getPageList($args) {
+                global $wpdb;
+
+                $this->escape($args);
+
+                $blog_id                                = $args[0];
+                $username                               = $args[1];
+                $password                               = $args[2];
+
+                if(!$this->login_pass_ok($username, $password)) {
+                        return($this->error);
+                }
+
+                // Get list of pages ids and titles
+                $page_list = $wpdb->get_results("
+                        SELECT ID page_id,
+                                post_title page_title
+                        FROM {$wpdb->posts}
+                        WHERE post_type = 'page'
+                        ORDER BY ID
+                ");
+
+                return($page_list);
+        }
+
+        /**
+         * WordPress XML-RPC API
+         * wp_getAuthors
+         */
+        function wp_getAuthors($args) {
+                global $wpdb;
+
+                $this->escape($args);
+
+                $blog_id        = $args[0];
+                $username       = $args[1];
+                $password       = $args[2];
+
+                if(!$this->login_pass_ok($username, $password)) {
+                        return($this->error);
+                }
+
+                // Get basic info on all users.
+                $all_users = $wpdb->get_results("
+                        SELECT u.ID id,
+                                u.user_login username
+                        FROM {$wpdb->users} u
+                        ORDER BY u.user_login
+                ");
+
+                return($all_users);
+        }
+
+        /**
+         * WordPress XML-RPC API
+         * wp_newCategory
+         */
+        function wp_newCategory($args) {
+                $this->escape($args);
+
+                $blog_id                                = $args[0];
+                $username                               = $args[1];
+                $password                               = $args[2];
+                $category                               = $args[3];
+
+                if(!$this->login_pass_ok($username, $password)) {
+                        return($this->error);
+                }
+
+                // Set the user context and make sure they are
+                // allowed to add a category.
+                set_current_user(0, $username);
+                if(!current_user_can("manage_categories", $page_id)) {
+                        return(new IXR_Error(401, "Sorry, you do not have the right to add a category."));
+                }
+
+                // We need this to make use of the wp_insert_category()
+                // funciton.
+                require_once(ABSPATH . "wp-admin/admin-db.php");
+
+                // If no slug was provided make it empty so that
+                // WordPress will generate one.
+                if(empty($category["slug"])) {
+                        $category["slug"] = "";
+                }
+
+                // If no parent_id was provided make it empty
+                // so that it will be a top level page (no parent).
+                if(empty($category["parent_id"])) {
+                        $category["parent_id"] = "";
+                }
+
+                // If no description was provided make it empty.
+                if(empty($category["description"])) {
+                        $category["description"] = "";
+                }
+                
+                $new_category = array(
+                        "cat_name"                              => $category["name"],
+                        "category_nicename"             => $category["slug"],
+                        "category_parent"               => $category["parent_id"],
+                        "category_description"  => $category["description"]
+                );
+
+                $cat_id = wp_insert_category($new_category);
+                if(!$cat_id) {
+                        return(new IXR_Error(500, "Sorry, the new category failed."));
+                }
+
+                return($cat_id);
+        }
+
+        /**
+         * WordPress XML-RPC API
+         * wp_suggestCategories
+         */
+        function wp_suggestCategories($args) {
+                global $wpdb;
+
+