From 600b71019494e1c29898a620e58c0d2602f37b74 Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 24 Nov 2006 16:16:44 +0000 Subject: WP Merge to 4524 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@810 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- index.php | 4 +- wp-admin/admin-ajax.php | 2 +- wp-admin/admin-db.php | 50 +- wp-admin/admin-functions.php | 1610 +++++++-------- wp-admin/admin-header.php | 2 +- wp-admin/bookmarklet.php | 20 +- wp-admin/categories.php | 25 +- wp-admin/comment.php | 2 +- wp-admin/custom-fields.js | 4 +- wp-admin/dbx-admin-key-js.php | 2 +- wp-admin/edit-category-form.php | 1 + wp-admin/edit-comments.php | 94 +- wp-admin/edit-form-advanced.php | 13 +- wp-admin/edit-form-comment.php | 4 +- wp-admin/edit-form.php | 12 +- wp-admin/edit-link-form.php | 6 +- wp-admin/edit-page-form.php | 14 +- wp-admin/edit-pages.php | 16 +- wp-admin/edit.php | 66 +- wp-admin/export.php | 55 +- wp-admin/import/blogger.php | 2 +- wp-admin/import/blogware.php | 16 +- wp-admin/import/dotclear.php | 137 +- wp-admin/import/greymatter.php | 14 +- wp-admin/import/mt.php | 2 +- wp-admin/import/textpattern.php | 192 +- wp-admin/import/wordpress.php | 2 +- wp-admin/index-extra.php | 67 + wp-admin/install-helper.php | 172 +- wp-admin/link-add.php | 8 +- wp-admin/link-import.php | 10 +- wp-admin/link-manager.php | 23 +- wp-admin/link-parse-opml.php | 44 +- wp-admin/link.php | 10 +- wp-admin/menu-header.php | 17 +- wp-admin/menu.php | 11 +- wp-admin/moderation.php | 36 +- wp-admin/options-misc.php | 10 +- wp-admin/options-permalink.php | 2 +- wp-admin/options-reading.php | 8 +- wp-admin/options-writing.php | 8 +- wp-admin/plugin-editor.php | 46 +- wp-admin/plugins.php | 15 +- wp-admin/post.php | 4 +- wp-admin/profile.php | 19 +- wp-admin/setup-config.php | 152 +- wp-admin/sidebar.php | 16 +- wp-admin/templates.php | 50 +- wp-admin/theme-editor.php | 34 +- wp-admin/themes.php | 8 +- wp-admin/update-links.php | 6 +- wp-admin/upgrade-functions.php | 168 +- wp-admin/upgrade-schema.php | 2 +- wp-admin/upgrade.php | 2 +- wp-admin/upload-functions.php | 19 +- wp-admin/upload-js.php | 35 +- wp-admin/upload-rtl.css | 14 +- wp-admin/upload.css | 47 +- wp-admin/upload.php | 8 +- wp-admin/user-edit.php | 26 +- wp-admin/users.php | 25 +- wp-admin/wp-admin.css | 15 +- wp-admin/xfn.js | 8 +- wp-atom.php | 18 +- wp-commentsrss2.php | 15 +- wp-content/themes/classic/comments-popup.php | 8 +- wp-content/themes/classic/comments.php | 4 +- wp-content/themes/classic/header.php | 2 +- wp-content/themes/classic/sidebar.php | 6 +- wp-content/themes/default/archives.php | 12 +- wp-content/themes/default/comments-popup.php | 8 +- wp-content/themes/default/comments.php | 24 +- wp-content/themes/default/header.php | 6 +- wp-content/themes/default/page.php | 4 +- wp-content/themes/default/sidebar.php | 4 +- wp-content/themes/default/single.php | 6 +- wp-cron.php | 10 +- wp-feed.php | 4 +- wp-includes/author-template.php | 2 +- wp-includes/bookmark-template.php | 12 +- wp-includes/bookmark.php | 16 + wp-includes/cache.php | 10 +- wp-includes/capabilities.php | 43 +- wp-includes/category-template.php | 8 +- wp-includes/category.php | 31 +- wp-includes/classes.php | 115 +- wp-includes/comment-template.php | 45 +- wp-includes/comment.php | 42 +- wp-includes/compat.php | 66 +- wp-includes/deprecated.php | 142 +- wp-includes/feed.php | 4 +- wp-includes/formatting.php | 165 +- wp-includes/functions.php | 60 +- wp-includes/general-template.php | 71 +- wp-includes/js/autosave.js.php | 12 +- wp-includes/js/list-manipulation-js.php | 18 +- wp-includes/js/tinymce/license.txt | 255 ++- .../js/tinymce/plugins/autosave/editor_plugin.js | 8 +- .../plugins/directionality/editor_plugin.js | 8 +- .../tinymce/plugins/inlinepopups/editor_plugin.js | 10 +- .../plugins/inlinepopups/jscripts/mcwindows.js | 4 +- .../js/tinymce/plugins/paste/editor_plugin.js | 387 +++- .../js/tinymce/plugins/paste/jscripts/pastetext.js | 4 + .../js/tinymce/plugins/paste/jscripts/pasteword.js | 6 + .../js/tinymce/plugins/wordpress/editor_plugin.js | 2 +- wp-includes/js/tinymce/themes/advanced/charmap.htm | 2 +- .../js/tinymce/themes/advanced/color_picker.htm | 2 +- .../tinymce/themes/advanced/css/editor_content.css | 5 + .../tinymce/themes/advanced/css/editor_popup.css | 4 + .../js/tinymce/themes/advanced/css/editor_ui.css | 423 +--- .../js/tinymce/themes/advanced/editor_template.js | 211 +- .../tinymce/themes/advanced/editor_template_src.js | 0 .../tinymce/themes/advanced/images/backcolor.gif | Bin 174 -> 359 bytes .../js/tinymce/themes/advanced/images/buttons.gif | Bin 8399 -> 5662 bytes .../tinymce/themes/advanced/images/forecolor.gif | Bin 272 -> 342 bytes .../themes/advanced/jscripts/source_editor.js | 30 +- wp-includes/js/tinymce/themes/advanced/langs/en.js | 8 +- wp-includes/js/tinymce/tiny_mce.js | 2093 +++++++++++++------- wp-includes/js/tinymce/tiny_mce_popup.js | 446 +++-- wp-includes/js/tinymce/utils/form_utils.js | 29 +- wp-includes/js/tinymce/utils/mclayer.js | 6 +- wp-includes/js/tinymce/utils/mctabs.js | 4 +- wp-includes/js/tinymce/utils/validate.js | 235 ++- wp-includes/js/wp-ajax-js.php | 5 +- wp-includes/l10n.php | 2 +- wp-includes/link-template.php | 72 +- wp-includes/pluggable.php | 23 +- wp-includes/post.php | 160 +- wp-includes/query.php | 87 +- wp-includes/registration.php | 4 +- wp-includes/rewrite.php | 72 +- wp-includes/script-loader.php | 21 +- wp-includes/theme.php | 149 +- wp-includes/user.php | 2 +- wp-includes/wp-db.php | 2 +- wp-includes/wpmu-functions.php | 15 + wp-links-opml.php | 12 +- wp-login.php | 2 +- wp-rss.php | 4 +- wp-rss2.php | 6 +- wp-settings.php | 13 +- wp-trackback.php | 4 +- xmlrpc.php | 619 +++--- 143 files changed, 5726 insertions(+), 4235 deletions(-) create mode 100644 wp-admin/index-extra.php delete mode 100644 wp-includes/js/tinymce/themes/advanced/editor_template_src.js diff --git a/index.php b/index.php index 3e3db40..e5076a8 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ - \ No newline at end of file +?> diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index 4e27900..cc93b16 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -128,7 +128,7 @@ case 'add-category' : // On the Fly break; case 'add-cat' : // From Manage->Categories if ( !current_user_can( 'manage_categories' ) ) - die('-1'); + die('-1'); if ( !$cat = wp_insert_category( $_POST ) ) die('0'); if ( !$cat = get_category( $cat ) ) diff --git a/wp-admin/admin-db.php b/wp-admin/admin-db.php index b41891f..ea6e60d 100644 --- a/wp-admin/admin-db.php +++ b/wp-admin/admin-db.php @@ -48,7 +48,7 @@ function get_editable_user_ids( $user_id, $exclude_zeros = true ) { if ( ! $user->has_cap('edit_others_posts') ) { if ( $user->has_cap('edit_posts') || $exclude_zeros == false ) return array($user->id); - else + else return false; } @@ -157,6 +157,9 @@ function wp_update_category($catarr) { $cat_ID = (int) $catarr['cat_ID']; + if( $cat_ID == $catarr['category_parent'] ) + return false; + // First, get all of the original fields $category = get_category($cat_ID, ARRAY_A); @@ -201,7 +204,7 @@ function wp_delete_category($cat_ID) { $cats = array($default_cat); else $cats = array_diff($cats, array($cat_ID)); - wp_set_post_categories($post_id, $cats); + wp_set_post_categories($post_id, $cats); } $default_link_cat = get_option('default_link_category'); @@ -212,9 +215,9 @@ function wp_delete_category($cat_ID) { $cats = array($default_link_cat); else $cats = array_diff($cats, array($cat_ID)); - wp_set_link_cats($link_id, $cats); + wp_set_link_cats($link_id, $cats); } - + wp_cache_delete($cat_ID, 'category'); wp_cache_delete('all_category_ids', 'category'); @@ -287,9 +290,9 @@ function wp_delete_user($id, $reassign = 'novalue') { function wp_revoke_user($id) { $id = (int) $id; - + $user = new WP_User($id); - $user->remove_all_caps(); + $user->remove_all_caps(); } function wp_insert_link($linkdata) { @@ -387,15 +390,15 @@ function wp_update_link($linkdata) { $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']) + 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']; + $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; + $linkdata['link_category'] = $link_cats; return wp_insert_link($linkdata); } @@ -404,7 +407,7 @@ function wp_delete_link($link_id) { global $wpdb; do_action('delete_link', $link_id); - + $categories = wp_get_link_cats($link_id); if( is_array( $categories ) ) { foreach ( $categories as $category ) { @@ -420,9 +423,9 @@ function wp_delete_link($link_id) { function wp_get_link_cats($link_ID = 0) { global $wpdb; - $sql = "SELECT category_id - FROM $wpdb->link2cat - WHERE link_id = $link_ID + $sql = "SELECT category_id + FROM $wpdb->link2cat + WHERE link_id = $link_ID ORDER BY category_id"; $result = $wpdb->get_col($sql); @@ -443,8 +446,8 @@ function wp_set_link_cats($link_ID = 0, $link_categories = array()) { // First the old categories $old_categories = $wpdb->get_col(" - SELECT category_id - FROM $wpdb->link2cat + SELECT category_id + FROM $wpdb->link2cat WHERE link_id = $link_ID"); if (!$old_categories) { @@ -459,9 +462,9 @@ function wp_set_link_cats($link_ID = 0, $link_categories = array()) { if ($delete_cats) { foreach ($delete_cats as $del) { $wpdb->query(" - DELETE FROM $wpdb->link2cat - WHERE category_id = $del - AND link_id = $link_ID + DELETE FROM $wpdb->link2cat + WHERE category_id = $del + AND link_id = $link_ID "); } } @@ -472,18 +475,21 @@ function wp_set_link_cats($link_ID = 0, $link_categories = array()) { if ($add_cats) { foreach ($add_cats as $new_cat) { $wpdb->query(" - INSERT INTO $wpdb->link2cat (link_id, category_id) + 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'); + do_action('edit_category', $cat_id); } + + do_action('edit_link', $link_ID); } // wp_set_link_cats() function post_exists($title, $content = '', $post_date = '') { diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 0f80efd..8da7ff0 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -2,7 +2,7 @@ function write_post() { $result = wp_write_post(); - if( is_wp_error($result) ) + if( is_wp_error( $result ) ) wp_die( $result->get_error_message() ); else return $result; @@ -13,11 +13,11 @@ 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.')); + 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' ) ) + return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this blog.' ) ); } // Rename. @@ -26,10 +26,10 @@ function wp_write_post() { $_POST['post_parent'] = $_POST['parent_id']; $_POST['to_ping'] = $_POST['trackback_url']; - if (!empty ($_POST['post_author_override'])) { + if (!empty ( $_POST['post_author_override'] ) ) { $_POST['post_author'] = (int) $_POST['post_author_override']; } else { - if (!empty ($_POST['post_author'])) { + if (!empty ( $_POST['post_author'] ) ) { $_POST['post_author'] = (int) $_POST['post_author']; } else { $_POST['post_author'] = (int) $_POST['user_ID']; @@ -37,118 +37,118 @@ function wp_write_post() { } - if ($_POST['post_author'] != $_POST['user_ID']) { + 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.')); + 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 ( !current_user_can( 'edit_others_posts' ) ) + return new WP_Error( 'edit_others_posts', __( 'You cannot post as this user.' ) ); } } // What to do based on which button they pressed - if ('' != $_POST['saveasdraft']) + if ('' != $_POST['saveasdraft'] ) $_POST['post_status'] = 'draft'; - if ('' != $_POST['saveasprivate']) + if ('' != $_POST['saveasprivate'] ) $_POST['post_status'] = 'private'; - if ('' != $_POST['publish']) + if ('' != $_POST['publish'] ) $_POST['post_status'] = 'publish'; - if ('' != $_POST['advanced']) + if ('' != $_POST['advanced'] ) $_POST['post_status'] = 'draft'; if ( 'page' == $_POST['post_type'] ) { - if ('publish' == $_POST['post_status'] && !current_user_can('publish_pages')) + 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')) + if ('publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) ) $_POST['post_status'] = 'draft'; } - if (!isset ($_POST['comment_status'])) + if (!isset( $_POST['comment_status'] )) $_POST['comment_status'] = 'closed'; - if (!isset ($_POST['ping_status'])) + if (!isset( $_POST['ping_status'] )) $_POST['ping_status'] = 'closed'; - if (!empty ($_POST['edit_date'])) { + if (!empty ( $_POST['edit_date'] ) ) { $aa = $_POST['aa']; $mm = $_POST['mm']; $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']); + $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); + $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); + 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); + fix_attachment_links( $post_ID ); return $post_ID; } // Move child posts to a new parent -function relocate_children($old_ID, $new_ID) { +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"); + 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) { +function fix_attachment_links( $post_ID ) { global $wp_rewrite; - $post = & get_post($post_ID, ARRAY_A); + $post = & get_post( $post_ID, ARRAY_A ); - $search = "#]+rel=('|\")[^'\"]*attachment[^>]*>#ie"; + $search = "#]+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) ) + 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"; + $search = "#[\s]+rel=(\"|' )(.*? )wp-att-(\d+ )\\1#i"; foreach ( $anchor_matches[0] as $anchor ) { - if ( 0 == preg_match($search, $anchor, $id_matches) ) + 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 = & 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); + $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); + $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']); + $post['post_content'] = str_replace( $post_search, $post_replace, $post['post_content'] ); // Escape data pulled from DB. - $post = add_magic_quotes($post); + $post = add_magic_quotes( $post); - return wp_update_post($post); + return wp_update_post( $post); } // Update an existing post with values provided in $_POST. @@ -158,11 +158,11 @@ function edit_post() { $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.')); + 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.')); + if ( !current_user_can( 'edit_post', $post_ID ) ) + wp_die( __('You are not allowed to edit this post.' )); } // Rename. @@ -172,82 +172,82 @@ function edit_post() { $_POST['post_parent'] = $_POST['parent_id']; $_POST['to_ping'] = $_POST['trackback_url']; - if (!empty ($_POST['post_author_override'])) { + if (!empty ( $_POST['post_author_override'] ) ) { $_POST['post_author'] = (int) $_POST['post_author_override']; } else - if (!empty ($_POST['post_author'])) { + 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 ( $_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.')); + 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.')); + 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['saveasdraft'] ) $_POST['post_status'] = 'draft'; - if ('' != $_POST['saveasprivate']) + if ('' != $_POST['saveasprivate'] ) $_POST['post_status'] = 'private'; - if ('' != $_POST['publish']) + if ('' != $_POST['publish'] ) $_POST['post_status'] = 'publish'; - if ('' != $_POST['advanced']) + if ('' != $_POST['advanced'] ) $_POST['post_status'] = 'draft'; if ( 'page' == $_POST['post_type'] ) { - if ('publish' == $_POST['post_status'] && !current_user_can('edit_published_pages')) + 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')) + if ('publish' == $_POST['post_status'] && !current_user_can( 'edit_published_posts' )) $_POST['post_status'] = 'draft'; } - if (!isset ($_POST['comment_status'])) + if (!isset( $_POST['comment_status'] )) $_POST['comment_status'] = 'closed'; - if (!isset ($_POST['ping_status'])) + if (!isset( $_POST['ping_status'] )) $_POST['ping_status'] = 'closed'; - if (!empty ($_POST['edit_date'])) { + if (!empty ( $_POST['edit_date'] ) ) { $aa = $_POST['aa']; $mm = $_POST['mm']; $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; + $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"); + $_POST['post_date_gmt'] = get_gmt_from_date( "$aa-$mm-$jj $hh:$mn:$ss" ); } // Meta Stuff - if ($_POST['meta']) { - foreach ($_POST['meta'] as $key => $value) - update_meta($key, $value['key'], $value['value']); + if ( $_POST['meta'] ) { + foreach ( $_POST['meta'] as $key => $value ) + update_meta( $key, $value['key'], $value['value'] ); } - if ($_POST['deletemeta']) { - foreach ($_POST['deletemeta'] as $key => $value) - delete_meta($key); + if ( $_POST['deletemeta'] ) { + foreach ( $_POST['deletemeta'] as $key => $value ) + delete_meta( $key ); } - add_meta($post_ID); + add_meta( $post_ID ); - wp_update_post($_POST); + wp_update_post( $_POST); // Now that we have an ID we can fix any attachment anchor hrefs - fix_attachment_links($post_ID); + fix_attachment_links( $post_ID ); return $post_ID; } @@ -258,8 +258,8 @@ function edit_comment() { $comment_ID = (int) $_POST['comment_ID']; $comment_post_ID = (int) $_POST['comment_post_ID']; - 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.')); + 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.' )); $_POST['comment_author'] = $_POST['newcomment_author']; $_POST['comment_author_email'] = $_POST['newcomment_author_email']; @@ -268,78 +268,78 @@ function edit_comment() { $_POST['comment_content'] = $_POST['content']; $_POST['comment_ID'] = (int) $_POST['comment_ID']; - if (!empty ($_POST['edit_date'])) { + if (!empty ( $_POST['edit_date'] ) ) { $aa = $_POST['aa']; $mm = $_POST['mm']; $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; + $jj = ($jj > 31 ) ? 31 : $jj; + $hh = ($hh > 23 ) ? $hh -24 : $hh; + $mn = ($mn > 59 ) ? $mn -60 : $mn; + $ss = ($ss > 59 ) ? $ss -60 : $ss; $_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss"; } - wp_update_comment($_POST); + wp_update_comment( $_POST); } // Get an existing post and format it for editing. -function get_post_to_edit($id) { +function get_post_to_edit( $id ) { - $post = get_post($id); + $post = get_post( $id ); - $post->post_content = format_to_edit($post->post_content, user_can_richedit()); - $post->post_content = apply_filters('content_edit_pre', $post->post_content); + $post->post_content = format_to_edit( $post->post_content, user_can_richedit() ); + $post->post_content = apply_filters( 'content_edit_pre', $post->post_content); - $post->post_excerpt = format_to_edit($post->post_excerpt); - $post->post_excerpt = apply_filters('excerpt_edit_pre', $post->post_excerpt); + $post->post_excerpt = format_to_edit( $post->post_excerpt); + $post->post_excerpt = apply_filters( 'excerpt_edit_pre', $post->post_excerpt); - $post->post_title = format_to_edit($post->post_title); - $post->post_title = apply_filters('title_edit_pre', $post->post_title); + $post->post_title = format_to_edit( $post->post_title ); + $post->post_title = apply_filters( 'title_edit_pre', $post->post_title ); - $post->post_password = format_to_edit($post->post_password); + $post->post_password = format_to_edit( $post->post_password ); - if ($post->post_type == 'page') - $post->page_template = get_post_meta($id, '_wp_page_template', true); + if ( $post->post_type == 'page' ) + $post->page_template = get_post_meta( $id, '_wp_page_template', true ); return $post; } // Default post information to use when populating the "Write Post" form. function get_default_post_to_edit() { - if ( !empty($_REQUEST['post_title']) ) - $post_title = wp_specialchars(stripslashes($_REQUEST['post_title'])); - else if ( !empty($_REQUEST['popuptitle']) ) { - $post_title = wp_specialchars(stripslashes($_REQUEST['popuptitle'])); - $post_title = funky_javascript_fix($post_title); + if ( !empty( $_REQUEST['post_title'] ) ) + $post_title = wp_specialchars( stripslashes( $_REQUEST['post_title'] )); + else if ( !empty( $_REQUEST['popuptitle'] ) ) { + $post_title = wp_specialchars( stripslashes( $_REQUEST['popuptitle'] )); + $post_title = funky_javascript_fix( $post_title ); } else { $post_title = ''; } - if ( !empty($_REQUEST['content']) ) - $post_content = wp_specialchars(stripslashes($_REQUEST['content'])); - else if ( !empty($post_title) ) { - $text = wp_specialchars(stripslashes(urldecode($_REQUEST['text']))); - $text = funky_javascript_fix($text); - $popupurl = wp_specialchars($_REQUEST['popupurl']); + if ( !empty( $_REQUEST['content'] ) ) + $post_content = wp_specialchars( stripslashes( $_REQUEST['content'] )); + else if ( !empty( $post_title ) ) { + $text = wp_specialchars( stripslashes( urldecode( $_REQUEST['text'] ) ) ); + $text = funky_javascript_fix( $text); + $popupurl = wp_specialchars( $_REQUEST['popupurl'] ); $post_content = ''.$post_title.''."\n$text"; } - if ( !empty($_REQUEST['excerpt']) ) - $post_excerpt = wp_specialchars(stripslashes($_REQUEST['excerpt'])); + if ( !empty( $_REQUEST['excerpt'] ) ) + $post_excerpt = wp_specialchars( stripslashes( $_REQUEST['excerpt'] )); else $post_excerpt = ''; $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->post_content = apply_filters('default_content', $post_content); - $post->post_title = apply_filters('default_title', $post_title); - $post->post_excerpt = apply_filters('default_excerpt', $post_excerpt); + $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->post_content = apply_filters( 'default_content', $post_content); + $post->post_title = apply_filters( 'default_title', $post_title ); + $post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt); $post->page_template = 'default'; $post->post_parent = 0; $post->menu_order = 0; @@ -347,21 +347,21 @@ function get_default_post_to_edit() { return $post; } -function get_comment_to_edit($id) { - $comment = get_comment($id); +function get_comment_to_edit( $id ) { + $comment = get_comment( $id ); - $comment->comment_content = format_to_edit($comment->comment_content, user_can_richedit()); - $comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content); + $comment->comment_content = format_to_edit( $comment->comment_content, user_can_richedit() ); + $comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content); - $comment->comment_author = format_to_edit($comment->comment_author); - $comment->comment_author_email = format_to_edit($comment->comment_author_email); - $comment->comment_author_url = format_to_edit($comment->comment_author_url); + $comment->comment_author = format_to_edit( $comment->comment_author ); + $comment->comment_author_email = format_to_edit( $comment->comment_author_email ); + $comment->comment_author_url = format_to_edit( $comment->comment_author_url ); return $comment; } -function get_category_to_edit($id) { - $category = get_category($id); +function get_category_to_edit( $id ) { + $category = get_category( $id ); return $category; } @@ -369,7 +369,7 @@ function get_category_to_edit($id) { function wp_dropdown_roles( $default = false ) { global $wp_roles; $r = ''; - foreach($wp_roles->role_names as $role => $name) + foreach( $wp_roles->role_names as $role => $name ) if ( $default == $role ) // Make default first in list $p = "\n\t"; else @@ -378,19 +378,19 @@ function wp_dropdown_roles( $default = false ) { } -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); +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; } @@ -400,147 +400,147 @@ function get_user_to_edit($user_id) { 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); + $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']); + 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 + add_action( 'user_register', 'add_user' ); // See above return edit_user(); } } -function edit_user($user_id = 0) { +function edit_user( $user_id = 0 ) { global $current_user, $wp_roles, $wpdb; - if ($user_id != 0) { + if ( $user_id != 0 ) { $update = true; $user->ID = $user_id; - $userdata = get_userdata($user_id); - $user->user_login = $wpdb->escape($userdata->user_login); + $userdata = get_userdata( $user_id ); + $user->user_login = $wpdb->escape( $userdata->user_login ); } else { $update = false; $user = ''; } - if (isset ($_POST['user_login'])) - $user->user_login = wp_specialchars(trim($_POST['user_login'])); + if ( isset( $_POST['user_login'] )) + $user->user_login = wp_specialchars( trim( $_POST['user_login'] )); $pass1 = $pass2 = ''; - if (isset ($_POST['pass1'])) + if ( isset( $_POST['pass1'] )) $pass1 = $_POST['pass1']; - if (isset ($_POST['pass2'])) + if ( isset( $_POST['pass2'] )) $pass2 = $_POST['pass2']; - if (isset ($_POST['role']) && current_user_can('edit_users')) { - if($user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap('edit_users')) + if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) { + if( $user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap( 'edit_users' )) $user->role = $_POST['role']; } - if (isset ($_POST['email'])) - $user->user_email = wp_specialchars(trim($_POST['email'])); - if (isset ($_POST['url'])) { - $user->user_url = wp_specialchars(trim($_POST['url'])); - $user->user_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url; - } - if (isset ($_POST['first_name'])) - $user->first_name = wp_specialchars(trim($_POST['first_name'])); - if (isset ($_POST['last_name'])) - $user->last_name = wp_specialchars(trim($_POST['last_name'])); - if (isset ($_POST['nickname'])) - $user->nickname = wp_specialchars(trim($_POST['nickname'])); - if (isset ($_POST['display_name'])) - $user->display_name = wp_specialchars(trim($_POST['display_name'])); - if (isset ($_POST['description'])) - $user->description = trim($_POST['description']); - if (isset ($_POST['jabber'])) - $user->jabber = wp_specialchars(trim($_POST['jabber'])); - if (isset ($_POST['aim'])) - $user->aim = wp_specialchars(trim($_POST['aim'])); - if (isset ($_POST['yim'])) - $user->yim = wp_specialchars(trim($_POST['yim'])); + if ( isset( $_POST['email'] )) + $user->user_email = wp_specialchars( trim( $_POST['email'] )); + if ( isset( $_POST['url'] ) ) { + $user->user_url = wp_specialchars( trim( $_POST['url'] )); + $user->user_url = preg_match( '/^(https?|ftps?|mailto|news|gopher):/is', $user->user_url ) ? $user->user_url : 'http://'.$user->user_url; + } + if ( isset( $_POST['first_name'] )) + $user->first_name = wp_specialchars( trim( $_POST['first_name'] )); + if ( isset( $_POST['last_name'] )) + $user->last_name = wp_specialchars( trim( $_POST['last_name'] )); + if ( isset( $_POST['nickname'] )) + $user->nickname = wp_specialchars( trim( $_POST['nickname'] )); + if ( isset( $_POST['display_name'] )) + $user->display_name = wp_specialchars( trim( $_POST['display_name'] )); + if ( isset( $_POST['description'] )) + $user->description = trim( $_POST['description'] ); + if ( isset( $_POST['jabber'] )) + $user->jabber = wp_specialchars( trim( $_POST['jabber'] )); + if ( isset( $_POST['aim'] )) + $user->aim = wp_specialchars( trim( $_POST['aim'] )); + if ( isset( $_POST['yim'] )) + $user->yim = wp_specialchars( trim( $_POST['yim'] )); $errors = new WP_Error(); /* checking that username has been typed */ - if ($user->user_login == '') - $errors->add('user_login', __('ERROR: Please enter a username.')); + if ( $user->user_login == '' ) + $errors->add( 'user_login', __( 'ERROR: 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_ref_array( 'check_passwords', array ( $user->user_login, & $pass1, & $pass2 )); - if (!$update) { - if ($pass1 == '' || $pass2 == '') - $errors->add('pass', __('ERROR: Please enter your password twice.')); + if (!$update ) { + if ( $pass1 == '' || $pass2 == '' ) + $errors->add( 'pass', __( 'ERROR: Please enter your password twice.' )); } else { - if ((empty ($pass1) && !empty ($pass2)) || (empty ($pass2) && !empty ($pass1))) - $errors->add('pass', __("ERROR: you typed your new password only once.")); + if ((empty ( $pass1 ) && !empty ( $pass2 ) ) || (empty ( $pass2 ) && !empty ( $pass1 ) ) ) + $errors->add( 'pass', __( "ERROR: you typed your new password only once." )); } /* Check for "\" in password */ if( strpos( " ".$pass1, "\\" ) ) - $errors->add('pass', __('ERROR: Passwords may not contain the character "\\".')); + $errors->add( 'pass', __( 'ERROR: Passwords may not contain the character "\\".' )); /* checking the password has been typed twice the same */ - if ($pass1 != $pass2) - $errors->add('pass', __('ERROR: Please type the same password in the two password fields.')); + if ( $pass1 != $pass2 ) + $errors->add( 'pass', __( 'ERROR: Please type the same password in the two password fields.' )); - if (!empty ($pass1)) + if (!empty ( $pass1 )) $user->user_pass = $pass1; - if ( !validate_username($user->user_login) ) - $errors->add('user_login', __('ERROR: This username is invalid. Please enter a valid username.')); + if ( !validate_username( $user->user_login ) ) + $errors->add( 'user_login', __( 'ERROR: This username is invalid. Please enter a valid username.' )); - if (!$update && username_exists($user->user_login)) - $errors->add('user_login', __('ERROR: This username is already registered, please choose another one.')); + if (!$update && username_exists( $user->user_login )) + $errors->add( 'user_login', __( 'ERROR: This username is already registered, please choose another one.' )); /* checking e-mail address */ - if (empty ($user->user_email)) { - $errors->add('user_email', __("ERROR: please type an e-mail address")); + if ( empty ( $user->user_email ) ) { + $errors->add( 'user_email', __( "ERROR: please type an e-mail address" )); } else - if (!is_email($user->user_email)) { - $errors->add('user_email', __("ERROR: the email address isn't correct")); + if (!is_email( $user->user_email ) ) { + $errors->add( 'user_email', __( "ERROR: the email address isn't correct" )); } if ( $errors->get_error_codes() ) return $errors; - if ($update) { - $user_id = wp_update_user(get_object_vars($user)); + if ( $update ) { + $user_id = wp_update_user( get_object_vars( $user )); } else { - $user_id = wp_insert_user(get_object_vars($user)); - wp_new_user_notification($user_id); + $user_id = wp_insert_user( get_object_vars( $user )); + wp_new_user_notification( $user_id ); } return $user_id; } -function get_link_to_edit($link_id) { - $link = get_link($link_id); +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_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->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_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; return $link; } function get_default_link_to_edit() { - if ( isset($_GET['linkurl']) ) - $link->link_url = wp_specialchars($_GET['linkurl'], 1); + if ( isset( $_GET['linkurl'] ) ) + $link->link_url = wp_specialchars( $_GET['linkurl'], 1 ); else $link->link_url = ''; - if ( isset($_GET['name']) ) - $link->link_name = wp_specialchars($_GET['name'], 1); + if ( isset( $_GET['name'] ) ) + $link->link_name = wp_specialchars( $_GET['name'], 1 ); else $link->link_name = ''; @@ -553,76 +553,76 @@ function add_link() { return edit_link(); } -function edit_link($link_id = '') { - if (!current_user_can('manage_links')) - wp_die(__("Cheatin' uh ?")); +function edit_link( $link_id = '' ) { + if (!current_user_can( 'manage_links' )) + wp_die( __("Cheatin' uh ?" )); - $_POST['link_url'] = wp_specialchars($_POST['link_url']); - $_POST['link_url'] = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $_POST['link_url']) ? $_POST['link_url'] : 'http://' . $_POST['link_url']; - $_POST['link_name'] = wp_specialchars($_POST['link_name']); - $_POST['link_image'] = wp_specialchars($_POST['link_image']); - $_POST['link_rss'] = wp_specialchars($_POST['link_rss']); + $_POST['link_url'] = wp_specialchars( $_POST['link_url'] ); + $_POST['link_url'] = preg_match( '/^(https?|ftps?|mailto|news|gopher):/is', $_POST['link_url'] ) ? $_POST['link_url'] : 'http://' . $_POST['link_url']; + $_POST['link_name'] = wp_specialchars( $_POST['link_name'] ); + $_POST['link_image'] = wp_specialchars( $_POST['link_image'] ); + $_POST['link_rss'] = wp_specialchars( $_POST['link_rss'] ); $_POST['link_category'] = $_POST['post_category']; - if ( !empty($link_id) ) { + if ( !empty( $link_id ) ) { $_POST['link_id'] = $link_id; - return wp_update_link($_POST); + return wp_update_link( $_POST); } else { - return wp_insert_link($_POST); + return wp_insert_link( $_POST); } } -function url_shorten($url) { - $short_url = str_replace('http://', '', stripslashes($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).'...'; +function url_shorten( $url ) { + $short_url = str_replace( 'http://', '', stripslashes( $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 ).'...'; return $short_url; } -function selected($selected, $current) { - if ($selected == $current) +function selected( $selected, $current) { + if ( $selected == $current) echo ' selected="selected"'; } -function checked($checked, $current) { - if ($checked == $current) +function checked( $checked, $current) { + if ( $checked == $current) echo ' checked="checked"'; } -function return_categories_list($parent = 0) { +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" ); } -function sort_cats($cat1, $cat2) { - return strcasecmp($cat1['cat_name'], $cat2['cat_name']); +function sort_cats( $cat1, $cat2 ) { + return strcasecmp( $cat1['cat_name'], $cat2['cat_name'] ); } -function get_nested_categories($default = 0, $parent = 0) { +function get_nested_categories( $default = 0, $parent = 0 ) { global $post_ID, $link_id, $mode, $wpdb; - if ($post_ID) { - $checked_categories = $wpdb->get_col(" + if ( $post_ID ) { + $checked_categories = $wpdb->get_col( " SELECT category_id FROM $wpdb->categories, $wpdb->post2cat WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID' - "); + " ); - if (count($checked_categories) == 0) { + if ( count( $checked_categories ) == 0 ) { // No selected categories, strange $checked_categories[] = $default; } - } else if ($link_id) { - $checked_categories = $wpdb->get_col(" + } 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) { + if ( count( $checked_categories ) == 0 ) { // No selected categories, strange $checked_categories[] = $default; } @@ -630,59 +630,59 @@ function get_nested_categories($default = 0, $parent = 0) { $checked_categories[] = $default; } - $cats = return_categories_list($parent); + $cats = return_categories_list( $parent); $result = array (); - if (is_array($cats)) { - foreach ($cats as $cat) { + if ( is_array( $cats ) ) { + foreach ( $cats as $cat) { if ( $cat == 0 ) { // HACK, added 2006-05-13 $wpdb->query("DELETE FROM $wpdb->categories WHERE cat_ID = 0"); continue; } - $result[$cat]['children'] = get_nested_categories($default, $cat); + $result[$cat]['children'] = get_nested_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); + $result[$cat]['checked'] = in_array( $cat, $checked_categories ); + $result[$cat]['cat_name'] = get_the_category_by_ID( $cat); } } - usort($result, 'sort_cats'); + usort( $result, 'sort_cats' ); return $result; } -function write_nested_categories($categories) { - foreach ($categories as $category) { - echo '
    • \n"; +function write_nested_categories( $categories ) { + foreach ( $categories as $category ) { + echo '
    • "; if ( $category['children'] ) { echo "
      \n"; - write_nested_categories($category['children']); + write_nested_categories( $category['children'] ); echo "
    \n"; } } } -function dropdown_categories($default = 0) { - write_nested_categories(get_nested_categories($default)); +function dropdown_categories( $default = 0 ) { + write_nested_categories( get_nested_categories( $default) ); } -function return_link_categories_list($parent = 0) { +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"); + 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(" + 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) { + if ( count( $checked_categories ) == 0 ) { // No selected categories, strange $checked_categories[] = $default; } @@ -690,43 +690,43 @@ function get_nested_link_categories( $default = 0, $parent = 0 ) { $checked_categories[] = $default; } - $cats = return_link_categories_list($parent); + $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); + 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); + $result[$cat]['checked'] = in_array( $cat, $checked_categories ); + $result[$cat]['cat_name'] = get_the_category_by_ID( $cat); } } - usort($result, 'sort_cats'); + usort( $result, 'sort_cats' ); return $result; } -function dropdown_link_categories($default = 0) { - write_nested_categories(get_nested_link_categories($default)); +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) { +function cat_rows( $parent = 0, $level = 0, $categories = 0 ) { global $wpdb, $class; - if (!$categories) - $categories = get_categories('hide_empty=0'); + if (!$categories ) + $categories = get_categories( 'hide_empty=0' ); - if ($categories) { - foreach ($categories as $category) { + if ( $categories ) { + foreach ( $categories as $category ) { if ( $category->cat_ID == 0 ) { // HACK, added 2006-05-13 $wpdb->query("DELETE FROM $wpdb->categories WHERE cat_ID = 0"); continue; } - if ($category->category_parent == $parent) { + if ( $category->category_parent == $parent) { echo "\t" . _cat_row( $category, $level ); - cat_rows($category->cat_ID, $level +1, $categories); + cat_rows( $category->cat_ID, $level +1, $categories ); } } } else { @@ -737,20 +737,20 @@ function cat_rows($parent = 0, $level = 0, $categories = 0) { function _cat_row( $category, $level, $name_override = false ) { global $class; - $pad = str_repeat('— ', $level); - if ( current_user_can('manage_categories') ) { - $edit = "".__('Edit').""; - $default_cat_id = get_option('default_category'); - $default_link_cat_id = get_option('default_link_category'); + $pad = str_repeat( '— ', $level ); + if ( current_user_can( 'manage_categories' ) ) { + $edit = "".__( 'Edit' ).""; + $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 .= "cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf(__("You are about to delete the category "%s".\\nAll of its posts will go into the default category of "%s"\\nAll of its bookmarks will go into the default category of "%s".\\n"OK" to delete, "Cancel" 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').""; + if ( ($category->cat_ID != $default_cat_id ) && ($category->cat_ID != $default_link_cat_id ) ) + $edit .= "cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf( __("You are about to delete the category "%s".\\nAll of its posts will go into the default category of "%s"\\nAll of its bookmarks will go into the default category of "%s".\\n"OK" to delete, "Cancel" 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' ).""; else - $edit .= "".__("Default"); + $edit .= "".__( "Default" ); } else $edit = ''; - $class = ( ( defined('DOING_AJAX') && DOING_AJAX ) || " class='alternate'" == $class ) ? '' : " class='alternate'"; + $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 ); @@ -763,91 +763,90 @@ function _cat_row( $category, $level, $name_override = false ) { $edit\n\t\n"; } -function page_rows($parent = 0, $level = 0, $pages = 0, $hierarchy = true) { +function page_rows( $parent = 0, $level = 0, $pages = 0, $hierarchy = true ) { global $wpdb, $class, $post; - if (!$pages) - $pages = get_pages('sort_column=menu_order'); + if (!$pages ) + $pages = get_pages( 'sort_column=menu_order' ); - if (! $pages) + if (! $pages ) return false; - foreach ($pages as $post) { - setup_postdata($post); + 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('— ', $level); + $post->post_title = wp_specialchars( $post->post_title ); + $pad = str_repeat( '— ', $level ); $id = $post->ID; - $class = ('alternate' == $class) ? '' : 'alternate'; + $class = ('alternate' == $class ) ? '' : 'alternate'; ?> ID; ?> - post_status) _e(' - Private'); ?> - post_modified); ?> - - " . __('Edit') . ""; } ?> - " . __('Delete') . ""; } ?> + post_modified ) _e('Unpublished'); else echo mysql2date( 'Y-m-d g:i a', $post->post_modified ); ?> + + " . __( 'Edit' ) . ""; } ?> + " . __( 'Delete' ) . ""; } ?> 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); + $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 = " - $email + $email $short_url"; $r .= "\n\t\t"; - if ($numposts > 0) { - $r .= ""; - $r .= sprintf(__('View %1$s %2$s'), $numposts, __ngettext('post', 'posts', $numposts)); + if ( $numposts > 0 ) { + $r .= ""; + $r .= sprintf( __('View %1$s %2$s' ), $numposts, __ngettext( 'post', 'posts', $numposts )); } $r .= "\n\t\t"; - $edit_link = add_query_arg('wp_http_referer', wp_specialchars(urlencode(stripslashes($_SERVER['REQUEST_URI']))), "user-edit.php?user_id=$user_object->ID"); + $edit_link = add_query_arg( 'wp_http_referer', wp_specialchars( urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ); if ( ( is_site_admin() || $current_user->ID == $user_object->ID ) && current_user_can('edit_user', $user_object->ID) ) - $r .= "".__('Edit').""; + $r .= "".__( 'Edit' ).""; $r .= "\n\t"; return $r; } -function wp_dropdown_cats($currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0) { +function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) { global $wpdb; - if (!$categories) - $categories = get_categories('hide_empty=0'); - - if ($categories) { - foreach ($categories as $category) { - if ($currentcat != $category->cat_ID && $parent == $category->category_parent) { - $pad = str_repeat('– ', $level); - $category->cat_name = wp_specialchars($category->cat_name); + if (!$categories ) + $categories = get_categories( 'hide_empty=0' ); + + if ( $categories ) { + foreach ( $categories as $category ) { + if ( $currentcat != $category->cat_ID && $parent == $category->category_parent) { + $pad = str_repeat( '– ', $level ); + $category->cat_name = wp_specialchars( $category->cat_name ); echo "\n\t"; - wp_dropdown_cats($currentcat, $currentparent, $category->cat_ID, $level +1, $categories); + wp_dropdown_cats( $currentcat, $currentparent, $category->cat_ID, $level +1, $categories ); } } } else { @@ -855,45 +854,45 @@ function wp_dropdown_cats($currentcat = 0, $currentparent = 0, $parent = 0, $lev } } -function wp_create_thumbnail($file, $max_side, $effect = '') { +function wp_create_thumbnail( $file, $max_side, $effect = '' ) { // 1 = GIF, 2 = JPEG, 3 = PNG - if (file_exists($file)) { - $type = getimagesize($file); + if ( file_exists( $file ) ) { + $type = getimagesize( $file ); // if the associated function doesn't exist - then it's not // handle. duh. i hope. - if (!function_exists('imagegif') && $type[2] == 1) { - $error = __('Filetype not supported. Thumbnail not created.'); + if (!function_exists( 'imagegif' ) && $type[2] == 1 ) { + $error = __( 'Filetype not supported. Thumbnail not created.' ); } - elseif (!function_exists('imagejpeg') && $type[2] == 2) { - $error = __('Filetype not supported. Thumbnail not created.'); + elseif (!function_exists( 'imagejpeg' ) && $type[2] == 2 ) { + $error = __( 'Filetype not supported. Thumbnail not created.' ); } - elseif (!function_exists('imagepng') && $type[2] == 3) { - $error = __('Filetype not supported. Thumbnail not created.'); + elseif (!function_exists( 'imagepng' ) && $type[2] == 3 ) { + $error = __( 'Filetype not supported. Thumbnail not created.' ); } else { // create the initial copy from the original file - if ($type[2] == 1) { - $image = imagecreatefromgif($file); + if ( $type[2] == 1 ) { + $image = imagecreatefromgif( $file ); } - elseif ($type[2] == 2) { - $image = imagecreatefromjpeg($file); + elseif ( $type[2] == 2 ) { + $image = imagecreatefromjpeg( $file ); } - elseif ($type[2] == 3) { - $image = imagecreatefrompng($file); + elseif ( $type[2] == 3 ) { + $image = imagecreatefrompng( $file ); } - if (function_exists('imageantialias')) - imageantialias($image, TRUE); + if ( function_exists( 'imageantialias' )) + imageantialias( $image, TRUE ); - $image_attr = getimagesize($file); + $image_attr = getimagesize( $file ); // figure out the longest side - if ($image_attr[0] > $image_attr[1]) { + if ( $image_attr[0] > $image_attr[1] ) { $image_width = $image_attr[0]; $image_height = $image_attr[1]; $image_new_width = $max_side; @@ -911,38 +910,38 @@ function wp_create_thumbnail($file, $max_side, $effect = '') { //height > width } - $thumbnail = imagecreatetruecolor($image_new_width, $image_new_height); - @ imagecopyresampled($thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1]); + $thumbnail = imagecreatetruecolor( $image_new_width, $image_new_height); + @ imagecopyresampled( $thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1] ); // If no filters change the filename, we'll do a default transformation. - if ( basename($file) == $thumb = apply_filters('thumbnail_filename', basename($file)) ) - $thumb = preg_replace('!(\.[^.]+)?$!', __('.thumbnail').'$1', basename($file), 1); + if ( basename( $file ) == $thumb = apply_filters( 'thumbnail_filename', basename( $file ) ) ) + $thumb = preg_replace( '!(\.[^.]+)?$!', __( '.thumbnail' ).'$1', basename( $file ), 1 ); - $thumbpath = str_replace(basename($file), $thumb, $file); + $thumbpath = str_replace( basename( $file ), $thumb, $file ); // move the thumbnail to it's final destination - if ($type[2] == 1) { - if (!imagegif($thumbnail, $thumbpath)) { - $error = __("Thumbnail path invalid"); + if ( $type[2] == 1 ) { + if (!imagegif( $thumbnail, $thumbpath ) ) { + $error = __( "Thumbnail path invalid" ); } } - elseif ($type[2] == 2) { - if (!imagejpeg($thumbnail, $thumbpath)) { - $error = __("Thumbnail path invalid"); + elseif ( $type[2] == 2 ) { + if (!imagejpeg( $thumbnail, $thumbpath ) ) { + $error = __( "Thumbnail path invalid" ); } } - elseif ($type[2] == 3) { - if (!imagepng($thumbnail, $thumbpath)) { - $error = __("Thumbnail path invalid"); + elseif ( $type[2] == 3 ) { + if (!imagepng( $thumbnail, $thumbpath ) ) { + $error = __( "Thumbnail path invalid" ); } } } } else { - $error = __('File not found'); + $error = __( 'File not found' ); } - if (!empty ($error)) { + if (!empty ( $error ) ) { return $error; } else { apply_filters( 'wp_create_thumbnail', $thumbpath ); @@ -951,21 +950,21 @@ function wp_create_thumbnail($file, $max_side, $effect = '') { } // Some postmeta stuff -function has_meta($postid) { +function has_meta( $postid ) { global $wpdb; - return $wpdb->get_results(" + return $wpdb->get_results( " SELECT meta_key, meta_value, meta_id, post_id FROM $wpdb->postmeta WHERE post_id = '$postid' - ORDER BY meta_key,meta_id", ARRAY_A); + ORDER BY meta_key,meta_id", ARRAY_A ); } -function list_meta($meta) { +function list_meta( $meta ) { global $post_ID; // Exit if no meta - if (!$meta) { + if (!$meta ) { echo ' '; //TBODY needed for list-manipulation JS return; } @@ -973,26 +972,26 @@ function list_meta($meta) { ?> - - - + + + "; - foreach ($meta as $entry) { + foreach ( $meta as $entry ) { ++ $count; - if ($count % 2) + if ( $count % 2 ) $style = 'alternate'; else $style = ''; - if ('_' == $entry['meta_key'] { 0 }) + if ('_' == $entry['meta_key'] { 0 } ) $style .= ' hidden'; - if ( is_serialized($entry['meta_value']) ) { - if ( is_serialized_string($entry['meta_value']) ) { + 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']); + $entry['meta_value'] = maybe_unserialize( $entry['meta_value'] ); } else { // this is a serialized array/object so we should NOT display it --$count; @@ -1000,16 +999,16 @@ function list_meta($meta) { } } - $key_js = js_escape($entry['meta_key']); + $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"; $r .= "\n\t\t"; $r .= "\n\t\t"; - $r .= "\n\t\t
    "; + $r .= "\n\t\t
    "; $r .= "\n\t\t"; + $r .= sprintf( __("You are about to delete the "%s" custom field on this post.\\n"OK" to delete, "Cancel" to stop." ), $key_js ); + $r .= "' );\" class='deletemeta' tabindex='6' value='".__( 'Delete' )."' />"; $r .= "\n\t"; } echo $r; @@ -1020,45 +1019,45 @@ function list_meta($meta) { function get_meta_keys() { global $wpdb; - $keys = $wpdb->get_col(" + $keys = $wpdb->get_col( " SELECT meta_key FROM $wpdb->postmeta GROUP BY meta_key - ORDER BY meta_key"); + ORDER BY meta_key" ); return $keys; } function meta_form() { global $wpdb; - $limit = (int) apply_filters('postmeta_form_limit', 30); - $keys = $wpdb->get_col(" + $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); + LIMIT $limit" ); + natcasesort( $keys ); ?> -

    +

    - - + + @@ -1066,101 +1065,101 @@ function meta_form() {
    +
    -

    +

    escape(stripslashes(trim($_POST['metakeyselect']))); - $metakeyinput = $wpdb->escape(stripslashes(trim($_POST['metakeyinput']))); - $metavalue = maybe_serialize(stripslashes((trim($_POST['metavalue'])))); - $metavalue = $wpdb->escape($metavalue); + $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 ); - if ( ('0' === $metavalue || !empty ($metavalue)) && ((('#NONE#' != $metakeyselect) && !empty ($metakeyselect)) || !empty ($metakeyinput)) ) { + if ( ('0' === $metavalue || !empty ( $metavalue ) ) && ((('#NONE#' != $metakeyselect) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput) ) ) { // We have a key/value pair. If both the select and the // input for the key have data, the input takes precedence: if ('#NONE#' != $metakeyselect) $metakey = $metakeyselect; - if ($metakeyinput) + if ( $metakeyinput) $metakey = $metakeyinput; // default - $result = $wpdb->query(" + $result = $wpdb->query( " INSERT INTO $wpdb->postmeta - (post_id,meta_key,meta_value) - VALUES ('$post_ID','$metakey','$metavalue') - "); + (post_id,meta_key,meta_value ) + VALUES ('$post_ID','$metakey','$metavalue' ) + " ); return $wpdb->insert_id; } return false; } // add_meta -function delete_meta($mid) { +function delete_meta( $mid ) { global $wpdb; $mid = (int) $mid; - return $wpdb->query("DELETE FROM $wpdb->postmeta WHERE meta_id = '$mid'"); + return $wpdb->query( "DELETE FROM $wpdb->postmeta WHERE meta_id = '$mid'" ); } -function update_meta($mid, $mkey, $mvalue) { +function update_meta( $mid, $mkey, $mvalue ) { global $wpdb; - $mvalue = maybe_serialize(stripslashes($mvalue)); - $mvalue = $wpdb->escape($mvalue); + $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'"); + return $wpdb->query( "UPDATE $wpdb->postmeta SET meta_key = '$mkey', meta_value = '$mvalue' WHERE meta_id = '$mid'" ); } -function get_post_meta_by_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); + $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) { +function touch_time( $edit = 1, $for_post = 1 ) { global $wp_locale, $post, $comment; if ( $for_post ) - $edit = ( ('draft' == $post->post_status) && (!$post->post_date || '0000-00-00 00:00:00' == $post->post_date) ) ? false : true; + $edit = ( ('draft' == $post->post_status ) && (!$post->post_date || '0000-00-00 00:00:00' == $post->post_date ) ) ? false : true; - echo '
    '; + echo '
    '; - $time_adj = time() + (get_option('gmt_offset') * 3600); + $time_adj = time() + (get_option( 'gmt_offset' ) * 3600 ); $post_date = ($for_post) ? $post->post_date : $comment->comment_date; - $jj = ($edit) ? mysql2date('d', $post_date) : gmdate('d', $time_adj); - $mm = ($edit) ? mysql2date('m', $post_date) : gmdate('m', $time_adj); - $aa = ($edit) ? mysql2date('Y', $post_date) : gmdate('Y', $time_adj); - $hh = ($edit) ? mysql2date('H', $post_date) : gmdate('H', $time_adj); - $mn = ($edit) ? mysql2date('i', $post_date) : gmdate('i', $time_adj); - $ss = ($edit) ? mysql2date('s', $post_date) : gmdate('s', $time_adj); + $jj = ($edit) ? mysql2date( 'd', $post_date ) : gmdate( 'd', $time_adj ); + $mm = ($edit) ? mysql2date( 'm', $post_date ) : gmdate( 'm', $time_adj ); + $aa = ($edit) ? mysql2date( 'Y', $post_date ) : gmdate( 'Y', $time_adj ); + $hh = ($edit) ? mysql2date( 'H', $post_date ) : gmdate( 'H', $time_adj ); + $mn = ($edit) ? mysql2date( 'i', $post_date ) : gmdate( 'i', $time_adj ); + $ss = ($edit) ? mysql2date( 's', $post_date ) : gmdate( 's', $time_adj ); echo " - @ - : - - + @ + : + + 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); + _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 ); } ?>
    @@ -1169,50 +1168,50 @@ function touch_time($edit = 1, $for_post = 1) { } // insert_with_markers: Owen Winkler, fixed by Eric Anderson -// Inserts an array of strings into a file (.htaccess), placing it between +// Inserts an array of strings into a file (.htaccess ), placing it between // BEGIN and END markers. Replaces existing marked info. Retains surrounding // data. Creates file if none exists. // Returns true on write success, false on failure. -function insert_with_markers($filename, $marker, $insertion) { +function insert_with_markers( $filename, $marker, $insertion ) { return true; - if (!file_exists($filename) || is_writeable($filename)) { - if (!file_exists($filename)) { + if (!file_exists( $filename ) || is_writeable( $filename ) ) { + if (!file_exists( $filename ) ) { $markerdata = ''; } else { - $markerdata = explode("\n", implode('', file($filename))); + $markerdata = explode( "\n", implode( '', file( $filename ) ) ); } - $f = fopen($filename, 'w'); + $f = fopen( $filename, 'w' ); $foundit = false; - if ($markerdata) { + if ( $markerdata ) { $state = true; - foreach ($markerdata as $n => $markerline) { - if (strstr($markerline, "# BEGIN {$marker}")) + foreach ( $markerdata as $n => $markerline ) { + if ( strstr( $markerline, "# BEGIN {$marker}" )) $state = false; - if ($state) { - if ( $n + 1 < count($markerdata) ) - fwrite($f, "{$markerline}\n"); + if ( $state ) { + if ( $n + 1 < count( $markerdata ) ) + fwrite( $f, "{$markerline}\n" ); else - fwrite($f, "{$markerline}"); + fwrite( $f, "{$markerline}" ); } - if (strstr($markerline, "# END {$marker}")) { - fwrite($f, "# BEGIN {$marker}\n"); - if (is_array($insertion)) - foreach ($insertion as $insertline) - fwrite($f, "{$insertline}\n"); - fwrite($f, "# END {$marker}\n"); + if ( strstr( $markerline, "# END {$marker}" ) ) { + fwrite( $f, "# BEGIN {$marker}\n" ); + if ( is_array( $insertion )) + foreach ( $insertion as $insertline ) + fwrite( $f, "{$insertline}\n" ); + fwrite( $f, "# END {$marker}\n" ); $state = true; $foundit = true; } } } if (!$foundit) { - fwrite($f, "# BEGIN {$marker}\n"); - foreach ($insertion as $insertline) - fwrite($f, "{$insertline}\n"); - fwrite($f, "# END {$marker}\n"); + fwrite( $f, "# BEGIN {$marker}\n" ); + foreach ( $insertion as $insertline ) + fwrite( $f, "{$insertline}\n" ); + fwrite( $f, "# END {$marker}\n" ); } - fclose($f); + fclose( $f ); return true; } else { return false; @@ -1220,24 +1219,24 @@ function insert_with_markers($filename, $marker, $insertion) { } // extract_from_markers: Owen Winkler -// Returns an array of strings from a file (.htaccess) from between BEGIN +// Returns an array of strings from a file (.htaccess ) from between BEGIN // and END markers. -function extract_from_markers($filename, $marker) { +function extract_from_markers( $filename, $marker ) { $result = array (); - if (!file_exists($filename)) { + if (!file_exists( $filename ) ) { return $result; } - if ($markerdata = explode("\n", implode('', file($filename)))); + if ( $markerdata = explode( "\n", implode( '', file( $filename ) ) )); { $state = false; - foreach ($markerdata as $markerline) { - if (strstr($markerline, "# END {$marker}")) + foreach ( $markerdata as $markerline ) { + if ( strstr( $markerline, "# END {$marker}" )) $state = false; - if ($state) + if ( $state ) $result[] = $markerline; - if (strstr($markerline, "# BEGIN {$marker}")) + if ( strstr( $markerline, "# BEGIN {$marker}" )) $state = true; } } @@ -1252,8 +1251,8 @@ function got_mod_rewrite() { if ( !$is_apache ) return false; - if ( function_exists('apache_get_modules') ) { - if ( !in_array('mod_rewrite', apache_get_modules()) ) + if ( function_exists( 'apache_get_modules' ) ) { + if ( !in_array( 'mod_rewrite', apache_get_modules() ) ) return false; } @@ -1264,17 +1263,17 @@ function save_mod_rewrite_rules() { global $is_apache, $wp_rewrite; $home_path = get_home_path(); - if (!$wp_rewrite->using_mod_rewrite_permalinks()) + if (!$wp_rewrite->using_mod_rewrite_permalinks() ) return; - if (!((!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess'))) + if (!((!file_exists( $home_path.'.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path.'.htaccess' ) ) ) return; - if (! got_mod_rewrite()) + if (! got_mod_rewrite() ) return; - $rules = explode("\n", $wp_rewrite->mod_rewrite_rules()); - insert_with_markers($home_path.'.htaccess', 'WordPress', $rules); + $rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() ); + insert_with_markers( $home_path.'.htaccess', 'WordPress', $rules ); } function get_broken_themes() { @@ -1290,17 +1289,17 @@ function get_page_templates() { $templates = $themes[$theme]['Template Files']; $page_templates = array (); - if (is_array($templates)) { - foreach ($templates as $template) { - $template_data = implode('', file(ABSPATH.$template)); - preg_match("|Template Name:(.*)|i", $template_data, $name); - preg_match("|Description:(.*)|i", $template_data, $description); + if ( is_array( $templates ) ) { + foreach ( $templates as $template ) { + $template_data = implode( '', file( ABSPATH.$template )); + preg_match( "|Template Name:(.* )|i", $template_data, $name ); + preg_match( "|Description:(.* )|i", $template_data, $description ); $name = $name[1]; $description = $description[1]; - if (!empty ($name)) { - $page_templates[trim($name)] = basename($template); + if (!empty ( $name ) ) { + $page_templates[trim( $name )] = basename( $template ); } } } @@ -1308,10 +1307,10 @@ function get_page_templates() { return $page_templates; } -function page_template_dropdown($default = '') { +function page_template_dropdown( $default = '' ) { $templates = get_page_templates(); - foreach (array_keys($templates) as $template) - : if ($default == $templates[$template]) + foreach (array_keys( $templates ) as $template ) + : if ( $default == $templates[$template] ) $selected = " selected='selected'"; else $selected = ''; @@ -1319,26 +1318,26 @@ function page_template_dropdown($default = '') { endforeach; } -function parent_dropdown($default = 0, $parent = 0, $level = 0) { +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_type = 'page' ORDER BY menu_order" ); - if ($items) { - foreach ($items as $item) { + if ( $items ) { + foreach ( $items as $item ) { // A page cannot be it's own parent. - if (!empty ($post_ID)) { - if ($item->ID == $post_ID) { + if (!empty ( $post_ID ) ) { + if ( $item->ID == $post_ID ) { continue; } } - $pad = str_repeat(' ', $level * 3); - if ($item->ID == $default) + $pad = str_repeat( ' ', $level * 3 ); + if ( $item->ID == $default) $current = ' selected="selected"'; else $current = ''; echo "\n\t"; - parent_dropdown($default, $item->ID, $level +1); + parent_dropdown( $default, $item->ID, $level +1 ); } } else { return false; @@ -1354,37 +1353,38 @@ function user_can_access_admin_page() { global $plugin_page; $parent = get_admin_page_parent(); - /*echo "pa: $parent pn: $pagenow pp: $plugin_page
    "; - echo "
    ";
-	print_r($_wp_menu_nopriv);
-	print_r($_wp_submenu_nopriv);
-	echo "
    ";*/ - if ( isset($_wp_submenu_nopriv[$parent][$pagenow]) ) + + if ( isset( $_wp_submenu_nopriv[$parent][$pagenow] ) ) return false; - if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$parent][$plugin_page]) ) + if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) ) return false; - if ( empty($parent) ) { - if ( isset($_wp_menu_nopriv[$pagenow]) ) + if ( empty( $parent) ) { + if ( isset( $_wp_menu_nopriv[$pagenow] ) ) return false; - if ( isset($_wp_submenu_nopriv[$pagenow][$pagenow]) ) + if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) ) return false; - if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page]) ) + 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 (array_keys( $_wp_submenu_nopriv ) as $key ) { + if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) ) return false; - if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$key][$plugin_page]) ) + if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) ) return false; } return true; } - if (isset ($submenu[$parent])) { - foreach ($submenu[$parent] as $submenu_array) { - if ($submenu_array[2] == $pagenow) { - if (current_user_can($submenu_array[1])) + if ( isset( $submenu[$parent] ) ) { + foreach ( $submenu[$parent] as $submenu_array ) { + if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) { + if ( current_user_can( $submenu_array[1] )) + return true; + else + return false; + } else if ( $submenu_array[2] == $pagenow ) { + if ( current_user_can( $submenu_array[1] )) return true; else return false; @@ -1392,15 +1392,15 @@ function user_can_access_admin_page() { } } - foreach ($menu as $menu_array) { - if ($menu_array[2] == $parent) { - if (current_user_can($menu_array[1])) + foreach ( $menu as $menu_array ) { + if ( $menu_array[2] == $parent) { + if ( current_user_can( $menu_array[1] )) return true; else return false; } } - + return true; } @@ -1411,44 +1411,55 @@ function get_admin_page_title() { global $pagenow; global $plugin_page; - if (isset ($title) && !empty ($title)) { + if ( isset( $title ) && !empty ( $title ) ) { return $title; } - $hook = get_plugin_page_hook($plugin_page, $pagenow); + $hook = get_plugin_page_hook( $plugin_page, $pagenow ); $parent = $parent1 = get_admin_page_parent(); - if (empty ($parent)) { - foreach ($menu as $menu_array) { - if (isset ($menu_array[3])) { - if ($menu_array[2] == $pagenow) { + if ( empty ( $parent) ) { + foreach ( $menu as $menu_array ) { + if ( isset( $menu_array[3] ) ) { + if ( $menu_array[2] == $pagenow ) { $title = $menu_array[3]; return $menu_array[3]; } else - if (isset ($plugin_page) && ($plugin_page == $menu_array[2]) && ($hook == $menu_array[3])) { + if ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) { $title = $menu_array[3]; return $menu_array[3]; } + } else { + $title = $menu_array[0]; + return $title; } } } else { - foreach (array_keys($submenu) as $parent) { - foreach ($submenu[$parent] as $submenu_array) { - if (isset ($submenu_array[3])) { - if ($submenu_array[2] == $pagenow) { + foreach (array_keys( $submenu ) as $parent) { + foreach ( $submenu[$parent] as $submenu_array ) { + if ( isset( $plugin_page ) && + ($plugin_page == $submenu_array[2] ) && + (($parent == $pagenow ) || ($parent == $plugin_page ) || ($plugin_page == $hook ) || (($pagenow == 'admin.php' ) && ($parent1 != $submenu_array[2] ) ) ) + ) { $title = $submenu_array[3]; return $submenu_array[3]; - } else - if (isset ($plugin_page) && ($plugin_page == $submenu_array[2]) && (($parent == $pagenow) || ($parent == $plugin_page) || ($plugin_page == $hook) || (($pagenow == 'admin.php') && ($parent1 != $submenu_array[2])))) { - $title = $submenu_array[3]; - return $submenu_array[3]; - } + } + + if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) // not the current page + continue; + + if ( isset( $submenu_array[3] ) ) { + $title = $submenu_array[3]; + return $submenu_array[3]; + } else { + $title = $submenu_array[0]; + return $title; } } } } - return ''; + return $title; } function get_admin_page_parent() { @@ -1461,46 +1472,46 @@ function get_admin_page_parent() { global $_wp_menu_nopriv; global $_wp_submenu_nopriv; - if ( !empty ($parent_file) ) { - if ( isset($_wp_real_parent_file[$parent_file]) ) + if ( !empty ( $parent_file ) ) { + if ( isset( $_wp_real_parent_file[$parent_file] ) ) $parent_file = $_wp_real_parent_file[$parent_file]; return $parent_file; } - if ($pagenow == 'admin.php' && isset ($plugin_page)) { - foreach ($menu as $parent_menu) { - if ($parent_menu[2] == $plugin_page) { + if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) { + foreach ( $menu as $parent_menu ) { + if ( $parent_menu[2] == $plugin_page ) { $parent_file = $plugin_page; - if ( isset($_wp_real_parent_file[$parent_file]) ) + 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]) ) { + if ( isset( $_wp_menu_nopriv[$plugin_page] ) ) { $parent_file = $plugin_page; - if ( isset($_wp_real_parent_file[$parent_file]) ) + 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]) ) { + if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) { $parent_file = $pagenow; - if ( isset($_wp_real_parent_file[$parent_file]) ) + if ( isset( $_wp_real_parent_file[$parent_file] ) ) $parent_file = $_wp_real_parent_file[$parent_file]; return $parent_file; } - foreach (array_keys($submenu) as $parent) { - foreach ($submenu[$parent] as $submenu_array) { - if ( isset($_wp_real_parent_file[$parent]) ) + 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) { + if ( $submenu_array[2] == $pagenow ) { $parent_file = $parent; return $parent; } else - if (isset ($plugin_page) && ($plugin_page == $submenu_array[2])) { + if ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) { $parent_file = $parent; return $parent; } @@ -1511,36 +1522,36 @@ function get_admin_page_parent() { return ''; } -function add_menu_page($page_title, $menu_title, $access_level, $file, $function = '') { +function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { global $menu, $admin_page_hooks; - $file = plugin_basename($file); + $file = plugin_basename( $file ); - $menu[] = array ($menu_title, $access_level, $file, $page_title); + $menu[] = array ( $menu_title, $access_level, $file, $page_title ); - $admin_page_hooks[$file] = sanitize_title($menu_title); + $admin_page_hooks[$file] = sanitize_title( $menu_title ); - $hookname = get_plugin_page_hookname($file, ''); - if (!empty ($function) && !empty ($hookname)) - add_action($hookname, $function); + $hookname = get_plugin_page_hookname( $file, '' ); + if (!empty ( $function ) && !empty ( $hookname )) + add_action( $hookname, $function ); return $hookname; } -function add_submenu_page($parent, $page_title, $menu_title, $access_level, $file, $function = '') { +function add_submenu_page( $parent, $page_title, $menu_title, $access_level, $file, $function = '' ) { global $submenu; global $menu; global $_wp_real_parent_file; global $_wp_submenu_nopriv; global $_wp_menu_nopriv; - $file = plugin_basename($file); + $file = plugin_basename( $file ); - $parent = plugin_basename($parent); - if ( isset($_wp_real_parent_file[$parent]) ) + $parent = plugin_basename( $parent); + if ( isset( $_wp_real_parent_file[$parent] ) ) $parent = $_wp_real_parent_file[$parent]; - if ( !current_user_can($access_level) ) { + if ( !current_user_can( $access_level ) ) { $_wp_submenu_nopriv[$parent][$file] = true; return false; } @@ -1549,75 +1560,74 @@ function add_submenu_page($parent, $page_title, $menu_title, $access_level, $fil // as the first item in the submenu. If the submenu file is the same as the // 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 ) { - foreach ($menu as $parent_menu) { - if ( $parent_menu[2] == $parent && current_user_can($parent_menu[1]) ) { + if (!isset( $submenu[$parent] ) && $file != $parent ) { + foreach ( $menu as $parent_menu ) { + if ( $parent_menu[2] == $parent && current_user_can( $parent_menu[1] ) ) $submenu[$parent][] = $parent_menu; - } } } - $submenu[$parent][] = array ($menu_title, $access_level, $file, $page_title); + $submenu[$parent][] = array ( $menu_title, $access_level, $file, $page_title ); - $hookname = get_plugin_page_hookname($file, $parent); - if (!empty ($function) && !empty ($hookname)) - add_action($hookname, $function); + $hookname = get_plugin_page_hookname( $file, $parent); + if (!empty ( $function ) && !empty ( $hookname )) + add_action( $hookname, $function ); return $hookname; } -function add_options_page($page_title, $menu_title, $access_level, $file, $function = '') { - return add_submenu_page('options-general.php', $page_title, $menu_title, $access_level, $file, $function); +function add_options_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { + return add_submenu_page( 'options-general.php', $page_title, $menu_title, $access_level, $file, $function ); } -function add_management_page($page_title, $menu_title, $access_level, $file, $function = '') { - return add_submenu_page('edit.php', $page_title, $menu_title, $access_level, $file, $function); +function add_management_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { + return add_submenu_page( 'edit.php', $page_title, $menu_title, $access_level, $file, $function ); } -function add_theme_page($page_title, $menu_title, $access_level, $file, $function = '') { - return add_submenu_page('themes.php', $page_title, $menu_title, $access_level, $file, $function); +function add_theme_page( $page_title, $menu_title, $access_level, $file, $function = '' ) { + return add_submenu_page( 'themes.php', $page_title, $menu_title, $access_level, $file, $function ); } -function validate_file($file, $allowed_files = '') { - if (false !== strpos($file, './')) +function validate_file( $file, $allowed_files = '' ) { + if ( false !== strpos( $file, './' )) return 1; - if (':' == substr($file, 1, 1)) + if (':' == substr( $file, 1, 1 )) return 2; - if (!empty ($allowed_files) && (!in_array($file, $allowed_files))) + if (!empty ( $allowed_files ) && (!in_array( $file, $allowed_files ) ) ) return 3; return 0; } -function validate_file_to_edit($file, $allowed_files = '') { - $file = stripslashes($file); +function validate_file_to_edit( $file, $allowed_files = '' ) { + $file = stripslashes( $file ); - $code = validate_file($file, $allowed_files); + $code = validate_file( $file, $allowed_files ); - if (!$code) + if (!$code ) return $file; - switch ($code) { + switch ( $code ) { case 1 : - wp_die(__('Sorry, can’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.')); + wp_die( __('Sorry, can’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’t call files with their real path.')); + wp_die( __('Sorry, can’t call files with their real path.' )); case 3 : - wp_die(__('Sorry, that file cannot be edited.')); + wp_die( __('Sorry, that file cannot be edited.' )); } } function get_home_path() { - $home = get_option('home'); - if ($home != '' && $home != get_option('siteurl')) { - $home_path = parse_url($home); + $home = get_option( 'home' ); + if ( $home != '' && $home != get_option( 'siteurl' ) ) { + $home_path = parse_url( $home ); $home_path = $home_path['path']; - $root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"]); - $home_path = trailingslashit($root.$home_path); + $root = str_replace( $_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"] ); + $home_path = trailingslashit( $root.$home_path ); } else { $home_path = ABSPATH; } @@ -1625,8 +1635,8 @@ function get_home_path() { return $home_path; } -function get_real_file_to_edit($file) { - if ('index.php' == $file || '.htaccess' == $file) { +function get_real_file_to_edit( $file ) { + if ('index.php' == $file || '.htaccess' == $file ) { $real_file = get_home_path().$file; } else { $real_file = ABSPATH.$file; @@ -1635,74 +1645,74 @@ function get_real_file_to_edit($file) { return $real_file; } -$wp_file_descriptions = array ('index.php' => __('Main Index Template'), 'style.css' => __('Stylesheet'), 'comments.php' => __('Comments'), 'comments-popup.php' => __('Popup Comments'), 'footer.php' => __('Footer'), 'header.php' => __('Header'), 'sidebar.php' => __('Sidebar'), 'archive.php' => __('Archives'), 'category.php' => __('Category Template'), 'page.php' => __('Page Template'), 'search.php' => __('Search Results'), 'single.php' => __('Single Post'), '404.php' => __('404 Template'), 'my-hacks.php' => __('my-hacks.php (legacy hacks support)'), '.htaccess' => __('.htaccess (for rewrite rules)'), +$wp_file_descriptions = array ('index.php' => __( 'Main Index Template' ), 'style.css' => __( 'Stylesheet' ), 'comments.php' => __( 'Comments' ), 'comments-popup.php' => __( 'Popup Comments' ), 'footer.php' => __( 'Footer' ), 'header.php' => __( 'Header' ), 'sidebar.php' => __( 'Sidebar' ), 'archive.php' => __( 'Archives' ), 'category.php' => __( 'Category Template' ), 'page.php' => __( 'Page Template' ), 'search.php' => __( 'Search Results' ), 'single.php' => __( 'Single Post' ), '404.php' => __( '404 Template' ), 'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ), '.htaccess' => __( '.htaccess (for rewrite rules )' ), // Deprecated files - 'wp-layout.css' => __('Stylesheet'), 'wp-comments.php' => __('Comments Template'), 'wp-comments-popup.php' => __('Popup Comments Template')); + 'wp-layout.css' => __( 'Stylesheet' ), 'wp-comments.php' => __( 'Comments Template' ), 'wp-comments-popup.php' => __( 'Popup Comments Template' )); -function get_file_description($file) { +function get_file_description( $file ) { global $wp_file_descriptions; - if (isset ($wp_file_descriptions[basename($file)])) { - return $wp_file_descriptions[basename($file)]; + if ( isset( $wp_file_descriptions[basename( $file )] ) ) { + return $wp_file_descriptions[basename( $file )]; } elseif ( file_exists( ABSPATH . $file ) && is_file( ABSPATH . $file ) ) { - $template_data = implode('', file( ABSPATH . $file )); - if (preg_match("|Template Name:(.*)|i", $template_data, $name)) + $template_data = implode( '', file( ABSPATH . $file ) ); + if ( preg_match( "|Template Name:(.* )|i", $template_data, $name )) return $name[1]; } - return basename($file); + return basename( $file ); } -function update_recently_edited($file) { - $oldfiles = (array) get_option('recently_edited'); - if ($oldfiles) { - $oldfiles = array_reverse($oldfiles); +function update_recently_edited( $file ) { + $oldfiles = (array ) get_option( 'recently_edited' ); + if ( $oldfiles ) { + $oldfiles = array_reverse( $oldfiles ); $oldfiles[] = $file; - $oldfiles = array_reverse($oldfiles); - $oldfiles = array_unique($oldfiles); - if (5 < count($oldfiles)) - array_pop($oldfiles); + $oldfiles = array_reverse( $oldfiles ); + $oldfiles = array_unique( $oldfiles ); + if ( 5 < count( $oldfiles )) + array_pop( $oldfiles ); } else { $oldfiles[] = $file; } - update_option('recently_edited', $oldfiles); + update_option( 'recently_edited', $oldfiles ); } -function get_plugin_data($plugin_file) { - $plugin_data = implode('', file($plugin_file)); - preg_match("|Plugin Name:(.*)|i", $plugin_data, $plugin_name); - preg_match("|Plugin URI:(.*)|i", $plugin_data, $plugin_uri); - preg_match("|Description:(.*)|i", $plugin_data, $description); - preg_match("|Author:(.*)|i", $plugin_data, $author_name); - preg_match("|Author URI:(.*)|i", $plugin_data, $author_uri); - if (preg_match("|Version:(.*)|i", $plugin_data, $version)) - $version = trim($version[1]); +function get_plugin_data( $plugin_file ) { + $plugin_data = implode( '', file( $plugin_file )); + preg_match( "|Plugin Name:(.*)|i", $plugin_data, $plugin_name ); + preg_match( "|Plugin URI:(.*)|i", $plugin_data, $plugin_uri ); + preg_match( "|Description:(.*)|i", $plugin_data, $description ); + preg_match( "|Author:(.*)|i", $plugin_data, $author_name ); + preg_match( "|Author URI:(.*)|i", $plugin_data, $author_uri ); + if ( preg_match( "|Version:(.*)|i", $plugin_data, $version )) + $version = trim( $version[1] ); else $version = ''; - $description = wptexturize(trim($description[1])); + $description = wptexturize( trim( $description[1] )); $name = $plugin_name[1]; - $name = trim($name); + $name = trim( $name ); $plugin = $name; - if ('' != $plugin_uri[1] && '' != $name) { - $plugin = ''.$plugin.''; + if ('' != $plugin_uri[1] && '' != $name ) { + $plugin = ''.$plugin.''; } - if ('' == $author_uri[1]) { - $author = trim($author_name[1]); + if ('' == $author_uri[1] ) { + $author = trim( $author_name[1] ); } else { - $author = '' . trim($author_name[1]) . ''; + $author = '' . trim( $author_name[1] ) . ''; } - return array ('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1]); + return array ('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1] ); } function get_plugins() { global $wp_plugins; - if (isset ($wp_plugins)) { + if ( isset( $wp_plugins ) ) { return $wp_plugins; } @@ -1710,23 +1720,23 @@ function get_plugins() { $plugin_root = ABSPATH . PLUGINDIR; // Files in wp-content/plugins directory - $plugins_dir = @ dir($plugin_root); - if ($plugins_dir) { - while (($file = $plugins_dir->read()) !== false) { - if (preg_match('|^\.+$|', $file)) + $plugins_dir = @ dir( $plugin_root); + if ( $plugins_dir ) { + while (($file = $plugins_dir->read() ) !== false ) { + if ( preg_match( '|^\.+$|', $file )) continue; - if (is_dir($plugin_root.'/'.$file)) { - $plugins_subdir = @ dir($plugin_root.'/'.$file); - if ($plugins_subdir) { - while (($subfile = $plugins_subdir->read()) !== false) { - if (preg_match('|^\.+$|', $subfile)) + if ( is_dir( $plugin_root.'/'.$file ) ) { + $plugins_subdir = @ dir( $plugin_root.'/'.$file ); + if ( $plugins_subdir ) { + while (($subfile = $plugins_subdir->read() ) !== false ) { + if ( preg_match( '|^\.+$|', $subfile )) continue; - if (preg_match('|\.php$|', $subfile)) + if ( preg_match( '|\.php$|', $subfile )) $plugin_files[] = "$file/$subfile"; } } } else { - if (preg_match('|\.php$|', $file)) + if ( preg_match( '|\.php$|', $file )) $plugin_files[] = $file; } } @@ -1736,72 +1746,72 @@ function get_plugins() { return $wp_plugins; foreach ( $plugin_files as $plugin_file ) { - if ( !is_readable("$plugin_root/$plugin_file") ) + if ( !is_readable( "$plugin_root/$plugin_file" ) ) continue; - $plugin_data = get_plugin_data("$plugin_root/$plugin_file"); + $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; + $wp_plugins[plugin_basename( $plugin_file )] = $plugin_data; } - uasort($wp_plugins, create_function('$a, $b', 'return strnatcasecmp($a["Name"], $b["Name"]);')); + uasort( $wp_plugins, create_function( '$a, $b', 'return strnatcasecmp( $a["Name"], $b["Name"] );' )); return $wp_plugins; } -function get_plugin_page_hookname($plugin_page, $parent_page) { +function get_plugin_page_hookname( $plugin_page, $parent_page ) { global $admin_page_hooks; $parent = get_admin_page_parent(); - if (empty ($parent_page) || 'admin.php' == $parent_page) { - if (isset ($admin_page_hooks[$plugin_page])) + if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) { + if ( isset( $admin_page_hooks[$plugin_page] )) $page_type = 'toplevel'; else - if (isset ($admin_page_hooks[$parent])) + if ( isset( $admin_page_hooks[$parent] )) $page_type = $admin_page_hooks[$parent]; } else - if (isset ($admin_page_hooks[$parent_page])) { + if ( isset( $admin_page_hooks[$parent_page] ) ) { $page_type = $admin_page_hooks[$parent_page]; } else { $page_type = 'admin'; } - $plugin_name = preg_replace('!\.php!', '', $plugin_page); + $plugin_name = preg_replace( '!\.php!', '', $plugin_page ); return $page_type.'_page_'.$plugin_name; } -function get_plugin_page_hook($plugin_page, $parent_page) { +function get_plugin_page_hook( $plugin_page, $parent_page ) { global $wp_filter; - $hook = get_plugin_page_hookname($plugin_page, $parent_page); - if (isset ($wp_filter[$hook])) + $hook = get_plugin_page_hookname( $plugin_page, $parent_page ); + if ( isset( $wp_filter[$hook] )) return $hook; else return ''; } function browse_happy() { - $getit = __('WordPress recommends a better browser'); + $getit = __( 'WordPress recommends a better browser' ); echo '

    Browse Happy

    '; } -if (strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE')) - add_action('admin_footer', 'browse_happy'); +if ( strstr( $_SERVER['HTTP_USER_AGENT'], 'MSIE' )) + add_action( 'admin_footer', 'browse_happy' ); -function documentation_link($for) { +function documentation_link( $for ) { return; } -function register_importer($id, $name, $description, $callback) { +function register_importer( $id, $name, $description, $callback ) { global $wp_importers; - $wp_importers[$id] = array ($name, $description, $callback); + $wp_importers[$id] = array ( $name, $description, $callback ); } function get_importers() { @@ -1830,14 +1840,14 @@ function current_theme_info() { // array wp_handle_upload ( array &file [, array overrides] ) // file: reference to a single element of $_FILES. Call the function once for each uploaded file. -// overrides: an associative array of names=>values to override default variables with extract($overrides, EXTR_OVERWRITE). +// overrides: an associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ). // On success, returns an associative array of file attributes. -// On failure, returns $overrides['upload_error_handler'](&$file, $message) or array('error'=>$message). -function wp_handle_upload(&$file, $overrides = false) { +// On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ). +function wp_handle_upload( &$file, $overrides = false ) { // The default error handler. - if (! function_exists('wp_handle_upload_error') ) { - function wp_handle_upload_error(&$file, $message) { - return array('error'=>$message); + if (! function_exists( 'wp_handle_upload_error' ) ) { + function wp_handle_upload_error( &$file, $message ) { + return array( 'error'=>$message ); } } @@ -1848,13 +1858,13 @@ function wp_handle_upload(&$file, $overrides = false) { $action = 'wp_handle_upload'; // Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error']. - $upload_error_strings = array(false, - __("The uploaded file exceeds the upload_max_filesize directive in php.ini."), - __("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form."), - __("The uploaded file was only partially uploaded."), - __("No file was uploaded."), - __("Missing a temporary folder."), - __("Failed to write file to disk.")); + $upload_error_strings = array( false, + __( "The uploaded file exceeds the upload_max_filesize directive in php.ini." ), + __( "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form." ), + __( "The uploaded file was only partially uploaded." ), + __( "No file was uploaded." ), + __( "Missing a temporary folder." ), + __( "Failed to write file to disk." )); // All tests are on by default. Most can be turned off by $override[{test_name}] = false; $test_form = true; @@ -1864,93 +1874,93 @@ function wp_handle_upload(&$file, $overrides = false) { $test_type = true; // Install user overrides. Did we mention that this voids your warranty? - if ( is_array($overrides) ) - extract($overrides, EXTR_OVERWRITE); + if ( is_array( $overrides ) ) + extract( $overrides, EXTR_OVERWRITE ); // A correct form post will pass this test. - if ( $test_form && (!isset($_POST['action']) || ($_POST['action'] != $action)) ) - return $upload_error_handler($file, __('Invalid form submission.')); + if ( $test_form && (!isset( $_POST['action'] ) || ($_POST['action'] != $action ) ) ) + return $upload_error_handler( $file, __( 'Invalid form submission.' )); // A successful upload will pass this test. It makes no sense to override this one. if ( $file['error'] > 0 ) - return $upload_error_handler($file, $upload_error_strings[$file['error']]); + return $upload_error_handler( $file, $upload_error_strings[$file['error']] ); // A non-empty file will pass this test. - if ( $test_size && !($file['size'] > 0) ) - return $upload_error_handler($file, __('File is empty. Please upload something more substantial.')); + if ( $test_size && !($file['size'] > 0 ) ) + return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial.' )); // A properly uploaded file will pass this test. There should be no reason to override this one. - if (! @ is_uploaded_file($file['tmp_name']) ) - return $upload_error_handler($file, __('Specified file failed upload test.')); + if (! @ is_uploaded_file( $file['tmp_name'] ) ) + 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. if ( $test_type ) { - $wp_filetype = wp_check_filetype($file['name'], $mimes); + $wp_filetype = wp_check_filetype( $file['name'], $mimes ); - extract($wp_filetype); + extract( $wp_filetype ); if ( !$type || !$ext ) - return $upload_error_handler($file, __('File type does not meet security guidelines. Try another.')); + return $upload_error_handler( $file, __( 'File type does not meet security guidelines. Try another.' )); } - // A writable uploads dir will pass this test. Override with $uploads = array('path'=>$path, 'url'=>$url); - if ( ( empty( $uploads['path'] ) || empty( $uploads['url'] ) ) && ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) ) - return $upload_error_handler($file, $uploads['error']); + // A writable uploads dir will pass this test. Again, there's no point overriding this one. + if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) ) + return $upload_error_handler( $file, $uploads['error'] ); // Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied. - if ( isset($unique_filename_callback) && function_exists($unique_filename_callback) ) { - $filename = $unique_filename_callback($uploads['path'], $file['name']); + if ( isset( $unique_filename_callback ) && function_exists( $unique_filename_callback ) ) { + $filename = $unique_filename_callback( $uploads['path'], $file['name'] ); } else { $number = ''; - $filename = str_replace('#', '_', $file['name']); - $filename = str_replace(array('\\', "'"), '', $filename); - if ( empty($ext) ) + $filename = str_replace( '#', '_', $file['name'] ); + $filename = str_replace( array( '\\', "'" ), '', $filename ); + if ( empty( $ext) ) $ext = ''; else $ext = ".$ext"; - while ( file_exists($uploads['path'] . "/$filename") ) { + while ( file_exists( $uploads['path'] . "/$filename" ) ) { if ( '' == "$number$ext" ) $filename = $filename . ++$number . $ext; else - $filename = str_replace("$number$ext", ++$number . $ext, $filename); + $filename = str_replace( "$number$ext", ++$number . $ext, $filename ); } - $filename = str_replace($ext, '', $filename); - $filename = sanitize_title_with_dashes($filename) . $ext; + $filename = str_replace( $ext, '', $filename ); + $filename = sanitize_title_with_dashes( $filename ) . $ext; } // Move the file to the uploads dir $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'])); + if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) ) + wp_die( printf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] )); // Set correct file permissions - $stat = stat(dirname($new_file)); + $stat = stat( dirname( $new_file )); $perms = $stat['mode'] & 0000666; - @ chmod($new_file, $perms); + @ chmod( $new_file, $perms ); // Compute the URL $url = $uploads['url'] . "/$filename"; - $return = apply_filters( 'wp_handle_upload', array('file' => $new_file, 'url' => $url, 'type' => $type) ); + $return = apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $type ) ); return $return; } -function wp_shrink_dimensions($width, $height, $wmax = 128, $hmax = 96) { +function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) { if ( $height <= $hmax && $width <= $wmax ) - return array($width, $height); + return array( $width, $height); elseif ( $width / $height > $wmax / $hmax ) - return array($wmax, (int) ($height / $width * $wmax)); + return array( $wmax, (int) ($height / $width * $wmax )); else - return array((int) ($width / $height * $hmax), $hmax); + return array( (int) ($width / $height * $hmax ), $hmax ); } -function wp_import_cleanup($id) { - wp_delete_attachment($id); +function wp_import_cleanup( $id ) { + wp_delete_attachment( $id ); } -function wp_import_upload_form($action) { - $size = strtolower( ini_get('upload_max_filesize') ); +function wp_import_upload_form( $action ) { + $size = strtolower( ini_get( 'upload_max_filesize' ) ); $bytes = 0; if ( strstr( $size, 'k' ) ) $bytes = $size * 1024; @@ -1961,79 +1971,78 @@ function wp_import_upload_form($action) { ?>

    - () + ( )

    - +

    false, 'test_type' => false); - $file = wp_handle_upload($_FILES['import'], $overrides); + $overrides = array( 'test_form' => false, 'test_type' => false ); + $file = wp_handle_upload( $_FILES['import'], $overrides ); - if ( isset($file['error']) ) + if ( isset( $file['error'] ) ) return $file; $url = $file['url']; $file = addslashes( $file['file'] ); - $filename = basename($file); + $filename = basename( $file ); // Construct the object array - $object = array( - 'post_title' => $filename, + $object = array( 'post_title' => $filename, 'post_content' => $url, 'post_mime_type' => 'import', 'guid' => $url ); // Save the data - $id = wp_insert_attachment($object, $file); + $id = wp_insert_attachment( $object, $file ); - return array('file' => $file, 'id' => $id); + return array( 'file' => $file, 'id' => $id ); } -function the_attachment_links($id = false) { +function the_attachment_links( $id = false ) { $id = (int) $id; - $post = & get_post($id); + $post = & get_post( $id ); if ( $post->post_type != 'attachment' ) return false; - $icon = get_attachment_icon($post->ID); + $icon = get_attachment_icon( $post->ID ); $attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true ); - $thumb = isset($attachment_data['thumb']); + $thumb = isset( $attachment_data['thumb'] ); ?>
    @@ -213,7 +212,7 @@ if (current_user_can('upload_files')) {
    : () - @@ -232,7 +231,7 @@ if ( ! empty($pings) )
    diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index 893e3f7..ac20ed7 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -54,8 +54,8 @@ addLoadEvent(focusit); :
    -
    - +
    + diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php index 2d1cef6..d907a62 100644 --- a/wp-admin/edit-form.php +++ b/wp-admin/edit-form.php @@ -54,17 +54,17 @@ edCanvas = document.getElementById('content');

    (Separate multiple URLs with spaces.)
    '), 'http://wordpress.org/docs/reference/post/#trackback') ?>

    -

    - +

    + - + '; - } ?> - + echo ''; + } ?> +

    diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index ac9c831..4c0a714 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -30,7 +30,7 @@ function xfn_check($class, $value = '', $type = 'check') { } ?> -
    +

    @@ -53,7 +53,7 @@ function xfn_check($class, $value = '', $type = 'check') {
    -

    +

    -

    +

    @@ -168,9 +168,9 @@ if (current_user_can('upload_files')) {

    -
    @@ -186,7 +186,7 @@ list_meta($metadata);
    ID) ) ?> post_title) ) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> /> diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index 721d5df..ca496ab 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -10,12 +10,12 @@ require_once('admin-header.php');

    - -
    - - - -
    + +
    + + + +

    +?>

    - + diff --git a/wp-admin/edit.php b/wp-admin/edit.php index e96b6d0..395bc6b 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -12,11 +12,11 @@ $drafts = get_users_drafts( $user_ID ); $other_drafts = get_others_drafts( $user_ID); if ($drafts || $other_drafts) { -?> +?>
    -

    - + ID' title='" . __('Edit this draft') . "'>$draft->post_title"; ++$i; } - ?> - .

    + ?> + .

    - -

    - +

    + ID' title='" . __('Edit this draft') . "'>$draft->post_title"; ++$i; } - ?> - .

    + ?> + .

    @@ -88,7 +88,7 @@ if ( count($arc_result) ) { ?>
    - yyear == 0 ) @@ -127,12 +127,12 @@ if ( count($arc_result) ) { ?> 'display name' $posts_columns = array( - 'id' => __('ID'), - 'date' => __('When'), - 'title' => __('Title'), - 'categories' => __('Categories'), - 'comments' => __('Comments'), - 'author' => __('Author') + 'id' => __('ID'), + 'date' => __('When'), + 'title' => __('Title'), + 'categories' => __('Categories'), + 'comments' => __('Comments'), + 'author' => __('Author') ); $posts_columns = apply_filters('manage_posts_columns', $posts_columns); @@ -143,7 +143,7 @@ $posts_columns['control_delete'] = ''; ?> - +
    @@ -157,10 +157,10 @@ $posts_columns['control_delete'] = ''; +?> $column_display_name) { case 'date': ?> - + $column_display_name) { case 'comments': ?> - + $column_display_name) { ?> @@ -259,9 +259,9 @@ if ( 1 == count($posts) ) { $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date"); if ($comments) { - ?> -

    -
      + ?> +

      +
        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) + if ('unapproved' == $comment_status) $class .= ' unapproved'; if ($i % 2) $class .= ' alternate'; @@ -299,8 +299,8 @@ if ( current_user_can('edit_post', $comment->comment_post_ID) ) { echo '
      '; }//end if comments ?> - - - + + +?> diff --git a/wp-admin/export.php b/wp-admin/export.php index f50b8e0..8f740fc 100644 --- a/wp-admin/export.php +++ b/wp-admin/export.php @@ -15,6 +15,25 @@ require_once ('admin-header.php');

      +

      + +
    g:i:s a'); ?>post_modified ) _e('Unpublished'); else the_time('Y-m-d \<\b\r \/\> g:i:s a'); ?> - - + +
    + + + + +
    + +

    @@ -26,17 +45,35 @@ require_once ('admin-header.php'); get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt ASC"); +header('Content-type: text/wxr+xml; charset=' . get_option('blog_charset'), true); + +$where = ''; +if ( isset( $_GET['author'] ) && $_GET['author'] != 'all' ) { + $author_id = (int) $_GET['author']; + $where = " WHERE post_author = '$author_id' "; +} + +$posts = $wpdb->get_results("SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC"); ?> + + + + + + + + + + -get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt A post_content ?>]]> +ID; ?> post_date; ?> post_date_gmt; ?> comment_status; ?> @@ -71,7 +109,7 @@ $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt A post_parent; ?> post_type; ?> get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID"); +$postmeta = $wpdb->get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID"); if ( $postmeta ) { ?> @@ -82,9 +120,10 @@ if ( $postmeta ) { get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $post->ID"); +$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $post->ID"); if ( $comments ) { foreach ( $comments as $c ) { ?> +comment_ID; ?> comment_author; ?> comment_author_email; ?> comment_author_url; ?> diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index c7c41d3..d7df5ad 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -525,7 +525,7 @@ class Blogger_Import { $did_one = true; } $output.= "

    $archivename $status

    \n"; - } + } if ( ! $did_one ) $this->set_next_step(7); die( $this->refresher(1000) . $output ); diff --git a/wp-admin/import/blogware.php b/wp-admin/import/blogware.php index 780e45d..2cbf75f 100644 --- a/wp-admin/import/blogware.php +++ b/wp-admin/import/blogware.php @@ -20,7 +20,7 @@ class BW_Import { $trans_tbl = array_flip($trans_tbl); return strtr($string, $trans_tbl); } - + function greet() { echo '
    '; echo '

    '.__('Howdy! This importer allows you to extract posts from Blogware XML export file into your blog. Pick a Blogware file to upload and click Import.').'

    '; @@ -30,7 +30,7 @@ class BW_Import { function import_posts() { global $wpdb, $current_user; - + set_magic_quotes_runtime(0); $importdata = file($this->file); // Read the file into an array $importdata = implode('', $importdata); // squish it @@ -39,7 +39,7 @@ class BW_Import { preg_match_all('|(]+>(.*?))|is', $importdata, $posts); $posts = $posts[1]; unset($importdata); - echo '
      '; + echo '
        '; foreach ($posts as $post) { flush(); preg_match('||is', $post, $post_type); @@ -102,7 +102,7 @@ class BW_Import { preg_match_all('|(.*?)|is', $post, $comments); $comments = $comments[1]; - + if ( $comments ) { $comment_post_ID = $post_id; $num_comments = 0; @@ -157,7 +157,7 @@ class BW_Import { $this->file = $file['file']; $this->import_posts(); wp_import_cleanup($file['id']); - + echo '

        '; printf(__('All done. Have fun!'), get_option('home')); echo '

        '; @@ -170,7 +170,7 @@ class BW_Import { $step = (int) $_GET['step']; $this->header(); - + switch ($step) { case 0 : $this->greet(); @@ -179,12 +179,12 @@ class BW_Import { $this->import(); break; } - + $this->footer(); } function BW_Import() { - // Nothing. + // Nothing. } } diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php index 026d871..02c030f 100644 --- a/wp-admin/import/dotclear.php +++ b/wp-admin/import/dotclear.php @@ -9,7 +9,7 @@ **/ if(!function_exists('get_catbynicename')) { - function get_catbynicename($category_nicename) + function get_catbynicename($category_nicename) { global $wpdb; @@ -60,57 +60,58 @@ if(!function_exists('link_exists')) // // This cries out for a C-implementation to be included in PHP core // - function valid_1byte($char) { - if(!is_int($char)) return false; - return ($char & 0x80) == 0x00; - } - - function valid_2byte($char) { - if(!is_int($char)) return false; - return ($char & 0xE0) == 0xC0; - } - - function valid_3byte($char) { - if(!is_int($char)) return false; - return ($char & 0xF0) == 0xE0; - } - - function valid_4byte($char) { - if(!is_int($char)) return false; - return ($char & 0xF8) == 0xF0; - } - - function valid_nextbyte($char) { - if(!is_int($char)) return false; - return ($char & 0xC0) == 0x80; - } - - function valid_utf8($string) { - $len = strlen($string); - $i = 0; - while( $i < $len ) { - $char = ord(substr($string, $i++, 1)); - if(valid_1byte($char)) { // continue - continue; - } else if(valid_2byte($char)) { // check 1 byte - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - } else if(valid_3byte($char)) { // check 2 bytes - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - } else if(valid_4byte($char)) { // check 3 bytes - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - } // goto next char - } - return true; // done - } + +function valid_1byte($char) { + if(!is_int($char)) return false; + return ($char & 0x80) == 0x00; +} + +function valid_2byte($char) { + if(!is_int($char)) return false; + return ($char & 0xE0) == 0xC0; +} + +function valid_3byte($char) { + if(!is_int($char)) return false; + return ($char & 0xF0) == 0xE0; +} + +function valid_4byte($char) { + if(!is_int($char)) return false; + return ($char & 0xF8) == 0xF0; +} + +function valid_nextbyte($char) { + if(!is_int($char)) return false; + return ($char & 0xC0) == 0x80; +} + +function valid_utf8($string) { + $len = strlen($string); + $i = 0; + while( $i < $len ) { + $char = ord(substr($string, $i++, 1)); + if(valid_1byte($char)) { // continue + continue; + } else if(valid_2byte($char)) { // check 1 byte + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + } else if(valid_3byte($char)) { // check 2 bytes + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + } else if(valid_4byte($char)) { // check 3 bytes + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + if(!valid_nextbyte(ord(substr($string, $i++, 1)))) + return false; + } // goto next char + } + return true; // done +} function csc ($s) { if (valid_utf8 ($s)) { @@ -151,7 +152,7 @@ class Dotclear_Import { echo '
    '; } - function get_dc_cats() + function get_dc_cats() { global $wpdb; // General Housekeeping @@ -186,7 +187,7 @@ class Dotclear_Import { // 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); + ON '.$dbprefix.'post.cat_id = '.$dbprefix.'categorie.cat_id', ARRAY_A); } function get_dc_comments() @@ -211,7 +212,7 @@ class Dotclear_Import { return $dcdb->get_results('SELECT * FROM '.$dbprefix.'link ORDER BY position', ARRAY_A); } - function cat2wp($categories='') + function cat2wp($categories='') { // General Housekeeping global $wpdb; @@ -221,7 +222,7 @@ class Dotclear_Import { if(is_array($categories)) { echo '

    '.__('Importing Categories...').'

    '; - foreach ($categories as $category) + foreach ($categories as $category) { $count++; extract($category); @@ -283,7 +284,7 @@ class Dotclear_Import { 'display_name' => $Realname) ); } - else + else { $ret_id = wp_insert_user(array( 'user_login' => $user_id, @@ -384,7 +385,7 @@ class Dotclear_Import { 'comment_count' => $post_nb_comment + $post_nb_trackback) ); } - else + else { $ret_id = wp_insert_post(array( 'post_author' => $authorid, @@ -460,7 +461,7 @@ class Dotclear_Import { 'comment_approved' => $comment_approved) ); } - else + else { // Insert comments $ret_id = wp_insert_comment(array( @@ -547,7 +548,7 @@ class Dotclear_Import { return false; } - function import_categories() + function import_categories() { // Category Import $cats = $this->get_dc_cats(); @@ -565,7 +566,7 @@ class Dotclear_Import { function import_users() { // User Import - $users = $this->get_dc_users(); + $users = $this->get_dc_users(); $this->users2wp($users); echo '
    '; @@ -655,7 +656,7 @@ class Dotclear_Import { echo ''; } - function dispatch() + function dispatch() { if (empty ($_GET['step'])) @@ -664,7 +665,7 @@ class Dotclear_Import { $step = (int) $_GET['step']; $this->header(); - if ( $step > 0 ) + if ( $step > 0 ) { if($_POST['dbuser']) { @@ -689,25 +690,25 @@ class Dotclear_Import { { if(get_option('dchost')) delete_option('dchost'); - add_option('dchost',$_POST['dbhost']); + add_option('dchost',$_POST['dbhost']); } if($_POST['dccharset']) { if(get_option('dccharset')) delete_option('dccharset'); - add_option('dccharset',$_POST['dccharset']); + add_option('dccharset',$_POST['dccharset']); } if($_POST['dbprefix']) { if(get_option('dcdbprefix')) delete_option('dcdbprefix'); - add_option('dcdbprefix',$_POST['dbprefix']); + add_option('dcdbprefix',$_POST['dbprefix']); } } - switch ($step) + switch ($step) { default: case 0 : @@ -736,7 +737,7 @@ class Dotclear_Import { $this->footer(); } - function Dotclear_Import() + function Dotclear_Import() { // Nothing. } diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php index 5494197..ea05ff2 100644 --- a/wp-admin/import/greymatter.php +++ b/wp-admin/import/greymatter.php @@ -66,10 +66,10 @@ class GM_Import { $string = str_replace("|*|","
    \n",$string); return($string); } - + function import() { global $wpdb; - + $wpvarstoreset = array('gmpath', 'archivespath', 'lastentry'); for ($i=0; $i
      id = (int) $_GET['id']; - + $this->file = get_attached_file($this->id); $this->get_authors_from_post(); $this->get_entries(); diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php index e1a0339..435a588 100644 --- a/wp-admin/import/textpattern.php +++ b/wp-admin/import/textpattern.php @@ -4,7 +4,7 @@ **/ if(!function_exists('get_catbynicename')) { - function get_catbynicename($category_nicename) + function get_catbynicename($category_nicename) { global $wpdb; @@ -70,13 +70,13 @@ class Textpattern_Import { $prefix = get_option('tpre'); // Get Categories - return $txpdb->get_results('SELECT - id, - name, - title - FROM '.$prefix.'txp_category - WHERE type = "article"', - ARRAY_A); + return $txpdb->get_results('SELECT + id, + name, + title + FROM '.$prefix.'txp_category + WHERE type = "article"', + ARRAY_A); } function get_txp_users() @@ -90,12 +90,12 @@ class Textpattern_Import { // Get Users return $txpdb->get_results('SELECT - user_id, - name, - RealName, - email, - privs - FROM '.$prefix.'txp_users', ARRAY_A); + user_id, + name, + RealName, + email, + privs + FROM '.$prefix.'txp_users', ARRAY_A); } function get_txp_posts() @@ -106,22 +106,22 @@ class Textpattern_Import { $prefix = get_option('tpre'); // Get Posts - return $txpdb->get_results('SELECT - ID, - Posted, - AuthorID, - LastMod, - Title, - Body, - Excerpt, - Category1, - Category2, - Status, - Keywords, - url_title, - comments_count - FROM '.$prefix.'textpattern - ', ARRAY_A); + return $txpdb->get_results('SELECT + ID, + Posted, + AuthorID, + LastMod, + Title, + Body, + Excerpt, + Category1, + Category2, + Status, + Keywords, + url_title, + comments_count + FROM '.$prefix.'textpattern + ', ARRAY_A); } function get_txp_comments() @@ -143,18 +143,18 @@ class Textpattern_Import { set_magic_quotes_runtime(0); $prefix = get_option('tpre'); - return $txpdb->get_results('SELECT - id, - date, - category, - url, - linkname, - description - FROM '.$prefix.'txp_link', - ARRAY_A); + return $txpdb->get_results('SELECT + id, + date, + category, + url, + linkname, + description + FROM '.$prefix.'txp_link', + ARRAY_A); } - function cat2wp($categories='') + function cat2wp($categories='') { // General Housekeeping global $wpdb; @@ -164,7 +164,7 @@ class Textpattern_Import { if(is_array($categories)) { echo '

      '.__('Importing Categories...').'

      '; - foreach ($categories as $category) + foreach ($categories as $category) { $count++; extract($category); @@ -226,7 +226,7 @@ class Textpattern_Import { 'display_name' => $name) ); } - else + else { $ret_id = wp_insert_user(array( 'user_login' => $name, @@ -302,35 +302,35 @@ class Textpattern_Import { if($pinfo = post_exists($Title,$Body)) { $ret_id = wp_insert_post(array( - 'ID' => $pinfo, - 'post_date' => $Posted, - 'post_date_gmt' => $post_date_gmt, - 'post_author' => $authorid, - 'post_modified' => $LastMod, - 'post_modified_gmt' => $post_modified_gmt, - 'post_title' => $Title, - 'post_content' => $Body, - 'post_excerpt' => $Excerpt, - 'post_status' => $post_status, - 'post_name' => $url_title, - 'comment_count' => $comments_count) - ); + 'ID' => $pinfo, + 'post_date' => $Posted, + 'post_date_gmt' => $post_date_gmt, + 'post_author' => $authorid, + 'post_modified' => $LastMod, + 'post_modified_gmt' => $post_modified_gmt, + 'post_title' => $Title, + 'post_content' => $Body, + 'post_excerpt' => $Excerpt, + 'post_status' => $post_status, + 'post_name' => $url_title, + 'comment_count' => $comments_count) + ); } - else + else { $ret_id = wp_insert_post(array( - 'post_date' => $Posted, - 'post_date_gmt' => $post_date_gmt, - 'post_author' => $authorid, - 'post_modified' => $LastMod, - 'post_modified_gmt' => $post_modified_gmt, - 'post_title' => $Title, - 'post_content' => $Body, - 'post_excerpt' => $Excerpt, - 'post_status' => $post_status, - 'post_name' => $url_title, - 'comment_count' => $comments_count) - ); + 'post_date' => $Posted, + 'post_date_gmt' => $post_date_gmt, + 'post_author' => $authorid, + 'post_modified' => $LastMod, + 'post_modified_gmt' => $post_modified_gmt, + 'post_title' => $Title, + 'post_content' => $Body, + 'post_excerpt' => $Excerpt, + 'post_status' => $post_status, + 'post_name' => $url_title, + 'comment_count' => $comments_count) + ); } $txpposts2wpposts[$ID] = $ret_id; @@ -379,29 +379,29 @@ class Textpattern_Import { { // Update comments $ret_id = wp_update_comment(array( - 'comment_ID' => $cinfo, - 'comment_post_ID' => $comment_post_ID, - 'comment_author' => $name, - 'comment_author_email' => $email, - 'comment_author_url' => $web, - 'comment_date' => $posted, - 'comment_content' => $message, - 'comment_approved' => $comment_approved) - ); + 'comment_ID' => $cinfo, + 'comment_post_ID' => $comment_post_ID, + 'comment_author' => $name, + 'comment_author_email' => $email, + 'comment_author_url' => $web, + 'comment_date' => $posted, + 'comment_content' => $message, + 'comment_approved' => $comment_approved) + ); } - else + else { // Insert comments $ret_id = wp_insert_comment(array( - 'comment_post_ID' => $comment_post_ID, - 'comment_author' => $name, - 'comment_author_email' => $email, - 'comment_author_url' => $web, - 'comment_author_IP' => $ip, - 'comment_date' => $posted, - 'comment_content' => $message, - 'comment_approved' => $comment_approved) - ); + 'comment_post_ID' => $comment_post_ID, + 'comment_author' => $name, + 'comment_author_email' => $email, + 'comment_author_url' => $web, + 'comment_author_IP' => $ip, + 'comment_date' => $posted, + 'comment_content' => $message, + 'comment_approved' => $comment_approved) + ); } $txpcm2wpcm[$comment_ID] = $ret_id; } @@ -450,7 +450,7 @@ class Textpattern_Import { 'link_updated' => $date) ); } - else + else { $ret_id = wp_insert_link(array( 'link_url' => $url, @@ -472,7 +472,7 @@ class Textpattern_Import { return false; } - function import_categories() + function import_categories() { // Category Import $cats = $this->get_txp_cats(); @@ -490,7 +490,7 @@ class Textpattern_Import { function import_users() { // User Import - $users = $this->get_txp_users(); + $users = $this->get_txp_users(); $this->users2wp($users); echo ''; @@ -578,7 +578,7 @@ class Textpattern_Import { echo ''; } - function dispatch() + function dispatch() { if (empty ($_GET['step'])) @@ -587,7 +587,7 @@ class Textpattern_Import { $step = (int) $_GET['step']; $this->header(); - if ( $step > 0 ) + if ( $step > 0 ) { if($_POST['dbuser']) { @@ -612,19 +612,19 @@ class Textpattern_Import { { if(get_option('txphost')) delete_option('txphost'); - add_option('txphost',$_POST['dbhost']); + add_option('txphost',$_POST['dbhost']); } if($_POST['dbprefix']) { if(get_option('tpre')) delete_option('tpre'); - add_option('tpre',$_POST['dbprefix']); + add_option('tpre',$_POST['dbprefix']); } } - switch ($step) + switch ($step) { default: case 0 : @@ -653,7 +653,7 @@ class Textpattern_Import { $this->footer(); } - function Textpattern_Import() + function Textpattern_Import() { // Nothing. } diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php index b850382..ac965b8 100644 --- a/wp-admin/import/wordpress.php +++ b/wp-admin/import/wordpress.php @@ -256,7 +256,7 @@ class WP_Import { function import() { $this->id = (int) $_GET['id']; - + $this->file = get_attached_file($this->id); $this->get_authors_from_post(); $this->get_entries(); diff --git a/wp-admin/index-extra.php b/wp-admin/index-extra.php new file mode 100644 index 0000000..782e0a7 --- /dev/null +++ b/wp-admin/index-extra.php @@ -0,0 +1,67 @@ +items) && 1 < count($rss->items) ) { // Technorati returns a 1-item feed when it has no results +?> +

      +
        +items = array_slice($rss->items, 0, 10); +foreach ($rss->items as $item ) { +?> +
        • + +
      +items) && 0 != count($rss->items) ) { +?> +

      +items = array_slice($rss->items, 0, 3); +foreach ($rss->items as $item ) { +?> +

      '> —

      +

      + + +items) && 0 != count($rss->items) ) { +?> +

      +
        +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'] ); +?> +
      • '>
        • + +
      +

      »

      + \ No newline at end of file diff --git a/wp-admin/install-helper.php b/wp-admin/install-helper.php index 86138db..b441c34 100644 --- a/wp-admin/install-helper.php +++ b/wp-admin/install-helper.php @@ -9,21 +9,21 @@ $debug = 0; ** false on error */ function maybe_create_table($table_name, $create_ddl) { - global $wpdb; - foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) { - if ($table == $table_name) { - return true; - } - } - //didn't find it try to create it. - $q = $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! - foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) { - if ($table == $table_name) { - return true; - } - } - return false; + global $wpdb; + foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) { + if ($table == $table_name) { + return true; + } + } + //didn't find it try to create it. + $q = $wpdb->query($create_ddl); + // we cannot directly tell that whether this succeeded! + foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) { + if ($table == $table_name) { + return true; + } + } + return false; } /** @@ -33,22 +33,22 @@ function maybe_create_table($table_name, $create_ddl) { ** false on error */ function maybe_add_column($table_name, $column_name, $create_ddl) { - global $wpdb, $debug; - foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { - if ($debug) echo("checking $column == $column_name
      "); - if ($column == $column_name) { - return true; - } - } - //didn't find it try to create it. - $q = $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! - foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { - if ($column == $column_name) { - return true; - } - } - return false; + global $wpdb, $debug; + foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { + if ($debug) echo("checking $column == $column_name
      "); + if ($column == $column_name) { + return true; + } + } + //didn't find it try to create it. + $q = $wpdb->query($create_ddl); + // we cannot directly tell that whether this succeeded! + foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { + if ($column == $column_name) { + return true; + } + } + return false; } @@ -59,21 +59,21 @@ function maybe_add_column($table_name, $column_name, $create_ddl) { ** false on error */ function maybe_drop_column($table_name, $column_name, $drop_ddl) { - global $wpdb; - foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { - if ($column == $column_name) { - //found it try to drop it. - $q = $wpdb->query($drop_ddl); - // we cannot directly tell that whether this succeeded! - foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { - if ($column == $column_name) { - return false; - } - } - } - } - // else didn't find it - return true; + global $wpdb; + foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { + if ($column == $column_name) { + //found it try to drop it. + $q = $wpdb->query($drop_ddl); + // we cannot directly tell that whether this succeeded! + foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { + if ($column == $column_name) { + return false; + } + } + } + } + // else didn't find it + return true; } @@ -92,45 +92,45 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) { ** Extra */ function check_column($table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null) { - global $wpdb, $debug; - $diffs = 0; - $results = $wpdb->get_results("DESC $table_name"); - - foreach ($results as $row ) { - if ($debug > 1) print_r($row); - if ($row->Field == $col_name) { - // got our column, check the params - if ($debug) echo ("checking $row->Type against $col_type\n"); - if (($col_type != null) && ($row->Type != $col_type)) { - ++$diffs; - } - if (($is_null != null) && ($row->Null != $is_null)) { - ++$diffs; - } - if (($key != null) && ($row->Key != $key)) { - ++$diffs; - } - if (($default != null) && ($row->Default != $default)) { - ++$diffs; - } - if (($extra != null) && ($row->Extra != $extra)) { - ++$diffs; - } - if ($diffs > 0) { - if ($debug) echo ("diffs = $diffs returning false\n"); - return false; - } - return true; - } // end if found our column - } - return false; + global $wpdb, $debug; + $diffs = 0; + $results = $wpdb->get_results("DESC $table_name"); + + foreach ($results as $row ) { + if ($debug > 1) print_r($row); + if ($row->Field == $col_name) { + // got our column, check the params + if ($debug) echo ("checking $row->Type against $col_type\n"); + if (($col_type != null) && ($row->Type != $col_type)) { + ++$diffs; + } + if (($is_null != null) && ($row->Null != $is_null)) { + ++$diffs; + } + if (($key != null) && ($row->Key != $key)) { + ++$diffs; + } + if (($default != null) && ($row->Default != $default)) { + ++$diffs; + } + if (($extra != null) && ($row->Extra != $extra)) { + ++$diffs; + } + if ($diffs > 0) { + if ($debug) echo ("diffs = $diffs returning false\n"); + return false; + } + return true; + } // end if found our column + } + return false; } - + /* echo "

      testing

      "; echo "
      ";
 
-//check_column('wp_links', 'link_description', 'mediumtext'); 
+//check_column('wp_links', 'link_description', 'mediumtext');
 //if (check_column($wpdb->comments, 'comment_author', 'tinytext'))
 //    echo "ok\n";
 $error_count = 0;
@@ -138,15 +138,15 @@ $tablename = $wpdb->links;
 // check the column
 if (!check_column($wpdb->links, 'link_description', 'varchar(255)'))
 {
-    $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
-    $q = $wpdb->query($ddl);
+	$ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
+	$q = $wpdb->query($ddl);
 }
 if (check_column($wpdb->links, 'link_description', 'varchar(255)')) {
-    $res .= $tablename . ' - ok 
      ';
+	$res .= $tablename . ' - ok 
      ';
 } else {
-    $res .= 'There was a problem with ' . $tablename . '
      ';
-    ++$error_count;
+	$res .= 'There was a problem with ' . $tablename . '
      ';
+	++$error_count;
 }
 echo "
      "; */ -?> \ No newline at end of file +?> diff --git a/wp-admin/link-add.php b/wp-admin/link-add.php index 22dcc64..2f66e44 100644 --- a/wp-admin/link-add.php +++ b/wp-admin/link-add.php @@ -1,15 +1,15 @@ @@ -26,7 +26,7 @@ switch ($step) { -

      +

      @@ -43,7 +43,7 @@ switch ($step) {
      -


      +


      \n"; $select_order = "\n"; @@ -143,8 +142,8 @@ if ($links) echo $link->link_description . ""; echo "link_url\" title=\"".sprintf(__('Visit %s'), $link->link_name)."\">$short_url"; ?> - - + link_category as $category) { @@ -157,12 +156,12 @@ if ($links) echo implode(', ', $cat_names); ?> - link_rel; ?> - + link_rel; ?> + '.__('Edit').''; - echo 'link_id , '".sprintf(__("You are about to delete the "%s" bookmark to %s.\\n"Cancel" to stop, "OK" to delete."), js_escape($link->link_name), js_escape($link->link_url)).'\' );" class="delete">'.__('Delete').''; + echo 'link_id , '".sprintf(__("You are about to delete the "%s" link to %s.\\n"Cancel" to stop, "OK" to delete."), js_escape($link->link_name), js_escape($link->link_url)).'\' );" class="delete">'.__('Delete').''; echo ''; echo "\n \n"; } @@ -172,7 +171,7 @@ if ($links)

      -

      ')" />

      +

      ')" />

    diff --git a/wp-admin/link-parse-opml.php b/wp-admin/link-parse-opml.php index 196f3cb..0e5edf0 100644 --- a/wp-admin/link-parse-opml.php +++ b/wp-admin/link-parse-opml.php @@ -4,12 +4,12 @@ require_once('../wp-config.php'); // columns we wish to find are: link_url, link_name, link_target, link_description // we need to map XML attribute names to our columns $opml_map = array('URL' => 'link_url', - 'HTMLURL' => 'link_url', - 'TEXT' => 'link_name', - 'TITLE' => 'link_name', - 'TARGET' => 'link_target', - 'DESCRIPTION' => 'link_description', - 'XMLURL' => 'link_rss' + 'HTMLURL' => 'link_url', + 'TEXT' => 'link_name', + 'TITLE' => 'link_name', + 'TARGET' => 'link_target', + 'DESCRIPTION' => 'link_description', + 'XMLURL' => 'link_rss' ); $map = $opml_map; @@ -20,24 +20,24 @@ $map = $opml_map; **/ function startElement($parser, $tagName, $attrs) { global $updated_timestamp, $all_links, $map; - global $names, $urls, $targets, $descriptions, $feeds; + global $names, $urls, $targets, $descriptions, $feeds; if ($tagName == 'OUTLINE') { - foreach (array_keys($map) as $key) { - if (isset($attrs[$key])) { - $$map[$key] = $attrs[$key]; - } - } + foreach (array_keys($map) as $key) { + if (isset($attrs[$key])) { + $$map[$key] = $attrs[$key]; + } + } - //echo("got data: link_url = [$link_url], link_name = [$link_name], link_target = [$link_target], link_description = [$link_description]
    \n"); + //echo("got data: link_url = [$link_url], link_name = [$link_name], link_target = [$link_target], link_description = [$link_description]
    \n"); - // save the data away. - $names[] = $link_name; - $urls[] = $link_url; - $targets[] = $link_target; + // save the data away. + $names[] = $link_name; + $urls[] = $link_url; + $targets[] = $link_target; $feeds[] = $link_rss; - $descriptions[] = $link_description; - } // end if outline + $descriptions[] = $link_description; + } // end if outline } /** @@ -55,9 +55,9 @@ $xml_parser = xml_parser_create(); xml_set_element_handler($xml_parser, "startElement", "endElement"); if (!xml_parse($xml_parser, $opml, true)) { - echo(sprintf(__('XML error: %1$s at line %2$s'), - xml_error_string(xml_get_error_code($xml_parser)), - xml_get_current_line_number($xml_parser))); + echo(sprintf(__('XML error: %1$s at line %2$s'), + xml_error_string(xml_get_error_code($xml_parser)), + xml_get_current_line_number($xml_parser))); } // Free up memory used by the XML parser diff --git a/wp-admin/link.php b/wp-admin/link.php index 0590f16..425e912 100644 --- a/wp-admin/link.php +++ b/wp-admin/link.php @@ -29,12 +29,13 @@ switch ($action) { $deleted = 0; foreach ($linkcheck as $link_id) { $link_id = (int) $link_id; - + if ( wp_delete_link($link_id) ) $deleted++; } wp_redirect("$this_file?deleted=$deleted"); + exit; break; case 'move' : @@ -54,6 +55,7 @@ switch ($action) { //$q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)"); wp_redirect($this_file); + exit; break; case 'add' : @@ -62,6 +64,7 @@ switch ($action) { add_link(); wp_redirect(wp_get_referer().'?added=true'); + exit; break; case 'save' : @@ -84,6 +87,7 @@ switch ($action) { wp_delete_link($link_id); wp_redirect($this_file); + exit; break; case 'edit' : @@ -92,10 +96,10 @@ switch ($action) { wp_enqueue_script( 'ajaxcat' ); $parent_file = 'link-manager.php'; $submenu_file = 'link-manager.php'; - $title = __('Edit Bookmark'); + $title = __('Edit Link'); 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.')); + wp_die(__('You do not have sufficient permissions to edit the links for this blog.')); $link_id = (int) $_GET['link_id']; diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index d113276..046590e 100644 --- a/wp-admin/menu-header.php +++ b/wp-admin/menu-header.php @@ -10,8 +10,15 @@ foreach ($menu as $item) { // 0 = name, 1 = capability, 2 = file 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 ( !empty($submenu[$item[2]]) ) { + $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. + $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]); + if ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook)) + echo "\n\t
  • {$item[0]}
    • "; + else + echo "\n\t
  • {$item[0]}
    • "; + } else if ( current_user_can($item[1]) ) { if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") ) echo "\n\t
  • {$item[0]}
    • "; else @@ -27,8 +34,8 @@ foreach ($menu as $item) { if ( isset($submenu["$parent_file"]) ) : ?>