diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-09-19 12:43:44 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-09-19 12:43:44 +0000 |
| commit | 0b9d1b3be4a25d07c214c174916fcdc81e5ca15d (patch) | |
| tree | f927250c89e0fd7b9088a12540cfe1e2b48c79d8 | |
| parent | 93053f4309be3c418840659e287852cd66f05748 (diff) | |
| download | wordpress-mu-0b9d1b3be4a25d07c214c174916fcdc81e5ca15d.tar.gz wordpress-mu-0b9d1b3be4a25d07c214c174916fcdc81e5ca15d.tar.xz wordpress-mu-0b9d1b3be4a25d07c214c174916fcdc81e5ca15d.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@341 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | wp-inst/wp-admin/admin-functions.php | 1165 | ||||
| -rw-r--r-- | wp-inst/wp-admin/link-add.php | 233 | ||||
| -rw-r--r-- | wp-inst/wp-admin/link-manager.php | 368 | ||||
| -rw-r--r-- | wp-inst/wp-admin/profile-update.php | 2 | ||||
| -rw-r--r-- | wp-inst/wp-admin/user-edit.php | 2 | ||||
| -rw-r--r-- | wp-inst/wp-includes/classes.php | 3 | ||||
| -rw-r--r-- | wp-inst/wp-includes/functions-post.php | 2 | ||||
| -rw-r--r-- | wp-inst/wp-includes/functions.php | 4 | ||||
| -rw-r--r-- | wp-inst/wp-includes/wp-l10n.php | 6 |
9 files changed, 718 insertions, 1067 deletions
diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php index 5db2579..0b0659b 100644 --- a/wp-inst/wp-admin/admin-functions.php +++ b/wp-inst/wp-admin/admin-functions.php @@ -1,40 +1,47 @@ <?php + // Creates a new post from the "Write Post" form using $_POST information. function write_post() { global $user_ID; - if ( ! current_user_can('edit_posts') ) - die( __('You are not allowed to create posts or drafts on this blog.') ); + if (!current_user_can('edit_posts')) + die(__('You are not allowed to create posts or drafts on this blog.')); // Rename. - $_POST['post_content'] = $_POST['content']; - $_POST['post_excerpt'] = $_POST['excerpt']; + $_POST['post_content'] = $_POST['content']; + $_POST['post_excerpt'] = $_POST['excerpt']; $_POST['post_parent'] = $_POST['parent_id']; $_POST['to_ping'] = $_POST['trackback_url']; - if (! empty($_POST['post_author_override'])) { + if (!empty ($_POST['post_author_override'])) { $_POST['$post_author'] = (int) $_POST['post_author_override']; - } else if (! empty($_POST['post_author'])) { - $_POST['post_author'] = (int) $_POST['post_author']; - } else { - $_POST['post_author'] = (int) $_POST['user_ID']; - } + } else + if (!empty ($_POST['post_author'])) { + $_POST['post_author'] = (int) $_POST['post_author']; + } else { + $_POST['post_author'] = (int) $_POST['user_ID']; + } + + if (($_POST['post_author'] != $_POST['user_ID']) && !current_user_can('edit_others_posts')) + die(__('You cannot post as this user.')); - if ( ($_POST['post_author'] != $_POST['user_ID']) && ! current_user_can('edit_others_posts') ) - die( __('You cannot post as this user.') ); - // What to do based on which button they pressed - if ('' != $_POST['saveasdraft']) $_POST['post_status'] = 'draft'; - if ('' != $_POST['saveasprivate']) $_POST['post_status'] = 'private'; - if ('' != $_POST['publish']) $_POST['post_status'] = 'publish'; - if ('' != $_POST['advanced']) $_POST['post_status'] = 'draft'; - if ('' != $_POST['savepage']) $_POST['post_status'] = 'static'; + if ('' != $_POST['saveasdraft']) + $_POST['post_status'] = 'draft'; + if ('' != $_POST['saveasprivate']) + $_POST['post_status'] = 'private'; + if ('' != $_POST['publish']) + $_POST['post_status'] = 'publish'; + if ('' != $_POST['advanced']) + $_POST['post_status'] = 'draft'; + if ('' != $_POST['savepage']) + $_POST['post_status'] = 'static'; - if ( 'publish' == $_POST['post_status'] && ! current_user_can('publish_posts') ) + if ('publish' == $_POST['post_status'] && !current_user_can('publish_posts')) $_POST['post_status'] = 'draft'; - if ( !empty($_POST['edit_date']) ) { + if (!empty ($_POST['edit_date'])) { $aa = $_POST['aa']; $mm = $_POST['mm']; $jj = $_POST['jj']; @@ -42,12 +49,12 @@ function write_post() { $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; + $hh = ($hh > 23) ? $hh -24 : $hh; + $mn = ($mn > 59) ? $mn -60 : $mn; + $ss = ($ss > 59) ? $ss -60 : $ss; $_POST['post_date'] = "$aa-$mm-$jj $hh:$mn:$ss"; $_POST['post_date_gmt'] = get_gmt_from_date("$aa-$mm-$jj $hh:$mn:$ss"); - } + } // Create the post. $post_ID = wp_insert_post($_POST); @@ -62,44 +69,50 @@ function edit_post() { $post_ID = (int) $_POST['post_ID']; - if ( ! current_user_can('edit_post', $post_ID) ) - die( __('You are not allowed to edit this post.') ); + if (!current_user_can('edit_post', $post_ID)) + die(__('You are not allowed to edit this post.')); // Rename. $_POST['ID'] = (int) $_POST['post_ID']; - $_POST['post_content'] = $_POST['content']; - $_POST['post_excerpt'] = $_POST['excerpt']; + $_POST['post_content'] = $_POST['content']; + $_POST['post_excerpt'] = $_POST['excerpt']; $_POST['post_parent'] = $_POST['parent_id']; $_POST['to_ping'] = $_POST['trackback_url']; - if (! empty($_POST['post_author_override'])) { + if (!empty ($_POST['post_author_override'])) { $_POST['$post_author'] = (int) $_POST['post_author_override']; - } else if (! empty($_POST['post_author'])) { - $_POST['post_author'] = (int) $_POST['post_author']; - } else { - $_POST['post_author'] = (int) $_POST['user_ID']; - } + } else + if (!empty ($_POST['post_author'])) { + $_POST['post_author'] = (int) $_POST['post_author']; + } else { + $_POST['post_author'] = (int) $_POST['user_ID']; + } - if ( ($_POST['post_author'] != $_POST['user_ID']) && ! current_user_can('edit_others_posts') ) - die( __('You cannot post as this user.') ); + if (($_POST['post_author'] != $_POST['user_ID']) && !current_user_can('edit_others_posts')) + die(__('You cannot post as this user.')); // What to do based on which button they pressed - if ('' != $_POST['saveasdraft']) $_POST['post_status'] = 'draft'; - if ('' != $_POST['saveasprivate']) $_POST['post_status'] = 'private'; - if ('' != $_POST['publish']) $_POST['post_status'] = 'publish'; - if ('' != $_POST['advanced']) $_POST['post_status'] = 'draft'; - if ('' != $_POST['savepage']) $_POST['post_status'] = 'static'; + if ('' != $_POST['saveasdraft']) + $_POST['post_status'] = 'draft'; + if ('' != $_POST['saveasprivate']) + $_POST['post_status'] = 'private'; + if ('' != $_POST['publish']) + $_POST['post_status'] = 'publish'; + if ('' != $_POST['advanced']) + $_POST['post_status'] = 'draft'; + if ('' != $_POST['savepage']) + $_POST['post_status'] = 'static'; - if ( 'publish' == $_POST['post_status'] && ! current_user_can('publish_posts') ) + if ('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']; @@ -107,30 +120,30 @@ function edit_post() { $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; + $hh = ($hh > 23) ? $hh -24 : $hh; + $mn = ($mn > 59) ? $mn -60 : $mn; + $ss = ($ss > 59) ? $ss -60 : $ss; $_POST['post_date'] = "$aa-$mm-$jj $hh:$mn:$ss"; $_POST['post_date_gmt'] = get_gmt_from_date("$aa-$mm-$jj $hh:$mn:$ss"); - } + } wp_update_post($_POST); // Meta Stuff - if ($_POST['meta']) : - foreach ($_POST['meta'] as $key => $value) : - update_meta($key, $value['key'], $value['value']); - endforeach; + if ($_POST['meta']) + : foreach ($_POST['meta'] as $key => $value) + : update_meta($key, $value['key'], $value['value']); + endforeach; endif; - if ($_POST['deletemeta']) : - foreach ($_POST['deletemeta'] as $key => $value) : - delete_meta($key); - endforeach; + if ($_POST['deletemeta']) + : foreach ($_POST['deletemeta'] as $key => $value) + : delete_meta($key); + endforeach; endif; add_meta($post_ID); - + return $post_ID; } @@ -140,17 +153,17 @@ 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) ) - die( __('You are not allowed to edit comments on this post, so you cannot edit this comment.') ); + if (!current_user_can('edit_post', $comment_post_ID)) + die(__('You are not allowed to edit comments on this post, so you cannot edit this comment.')); $_POST['comment_author'] = $_POST['newcomment_author']; - $_POST['comment_author_email'] = $_POST['newcomment_author_email']; + $_POST['comment_author_email'] = $_POST['newcomment_author_email']; $_POST['comment_author_url'] = $_POST['newcomment_author_url']; $_POST['comment_approved'] = $_POST['comment_status']; $_POST['comment_content'] = $_POST['content']; $_POST['comment_ID'] = (int) $_POST['comment_ID']; - - if ( !empty($_POST['edit_date']) ) { + + if (!empty ($_POST['edit_date'])) { $aa = $_POST['aa']; $mm = $_POST['mm']; $jj = $_POST['jj']; @@ -158,9 +171,9 @@ function edit_comment() { $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; + $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"; } @@ -181,7 +194,7 @@ function get_post_to_edit($id) { $post->post_title = apply_filters('title_edit_pre', $post->post_title); if ($post->post_status == 'static') - $post->page_template = get_post_meta($id, '_wp_page_template', true); + $post->page_template = get_post_meta($id, '_wp_page_template', true); return $post; } @@ -233,7 +246,7 @@ function wp_insert_category($catarr) { $cat_ID = (int) $cat_ID; // Are we updating or creating? - if ( !empty($cat_ID) ) { + if (!empty ($cat_ID)) { $update = true; } else { $update = false; @@ -243,25 +256,25 @@ function wp_insert_category($catarr) { $cat_name = wp_specialchars($cat_name); - if ( empty($category_nicename) ) + if (empty ($category_nicename)) $category_nicename = sanitize_title($cat_name, $cat_ID); else $category_nicename = sanitize_title($category_nicename, $cat_ID); - if ( empty($category_description) ) + if (empty ($category_description)) $category_description = ''; - if ( empty($category_parent) ) + if (empty ($category_parent)) $category_parent = 0; - if ( !$update) + if (!$update) $query = "INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_description, category_parent) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$cat')"; else $query = "UPDATE $wpdb->categories SET cat_name = '$cat_name', category_nicename = '$category_nicename', category_description = '$category_description', category_parent = '$category_parent' WHERE cat_ID = '$cat_ID'"; $result = $wpdb->query($query); - if ( $update ) { + if ($update) { do_action('edit_category', $cat_ID); } else { do_action('create_category', $rval); @@ -277,9 +290,9 @@ function wp_update_category($catarr) { global $wpdb; $cat_ID = (int) $catarr['cat_ID']; - + // First, get all of the original fields - $category = get_category($cat_ID, ARRAY_A); + $category = get_category($cat_ID, ARRAY_A); // Escape data pulled from DB. $category = add_magic_quotes($category); @@ -296,7 +309,7 @@ function wp_delete_category($cat_ID) { $cat_ID = (int) $cat_ID; // Don't delete the default cat. - if ( 1 == $cat_ID ) + if (1 == $cat_ID) return 0; $category = get_category($cat_ID); @@ -322,39 +335,39 @@ function wp_create_category($cat_name) { return wp_insert_category($cat_array); } - function wp_create_categories($categories, $post_id = '') { - $cat_ids = array(); + $cat_ids = array (); foreach ($categories as $category) { - if ( $id = category_exists($category) ) + if ($id = category_exists($category)) $cat_ids[] = $id; - else if ( $id = wp_create_category($category) ) - $cat_ids[] = $id; + else + if ($id = wp_create_category($category)) + $cat_ids[] = $id; } - - if ( $post_id ) + + if ($post_id) wp_set_post_cats('', $post_id, $cat_ids); - + return $cat_ids; } function category_exists($cat_name) { global $wpdb; - if ( !$category_nicename = sanitize_title($cat_name) ) + if (!$category_nicename = sanitize_title($cat_name)) return 0; - + return $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename'"); } // Creates a new user from the "Users" form using $_POST information. function add_user() { - return update_user(); + return edit_user(); } -function update_user($user_id = 0) { - - if ( $user_id != 0 ) { +function edit_user($user_id = 0) { + + if ($user_id != 0) { $update = true; $user->ID = $user_id; $userdata = get_userdata($user_id); @@ -363,83 +376,84 @@ function update_user($user_id = 0) { $update = false; $user = ''; } - - if ( isset($_POST['user_login']) ) + + if (isset ($_POST['user_login'])) $user->user_login = wp_specialchars(trim($_POST['user_login'])); $pass1 = $pass2 = ''; - if ( isset($_POST['pass1']) ) + if (isset ($_POST['pass1'])) $pass1 = $_POST['pass1']; - if ( isset($_POST['pass2']) ) + if (isset ($_POST['pass2'])) $pass2 = $_POST['pass2']; - if ( isset($_POST['email']) ) + if (isset ($_POST['email'])) $user->user_email = wp_specialchars(trim($_POST['email'])); - if ( isset($_POST['url']) ) { + if (isset ($_POST['url'])) { $user->user_url = wp_specialchars(trim($_POST['url'])); - $user->user_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $user->user_url) ? $user->user_url : 'http://' . $user->user_url; + $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']) ) + if (isset ($_POST['first_name'])) $user->first_name = wp_specialchars(trim($_POST['first_name'])); - if ( isset($_POST['last_name']) ) + if (isset ($_POST['last_name'])) $user->last_name = wp_specialchars(trim($_POST['last_name'])); - if ( isset($_POST['nickname']) ) + if (isset ($_POST['nickname'])) $user->nickname = wp_specialchars(trim($_POST['nickname'])); - if ( isset($_POST['display_name']) ) + if (isset ($_POST['display_name'])) $user->display_name = wp_specialchars(trim($_POST['display_name'])); - if ( isset($_POST['description']) ) + if (isset ($_POST['description'])) $user->description = wp_specialchars(trim($_POST['description'])); - if ( isset($_POST['jabber']) ) + if (isset ($_POST['jabber'])) $user->jabber = wp_specialchars(trim($_POST['jabber'])); - if ( isset($_POST['aim']) ) + if (isset ($_POST['aim'])) $user->aim = wp_specialchars(trim($_POST['aim'])); - if ( isset($_POST['yim']) ) + if (isset ($_POST['yim'])) $user->yim = wp_specialchars(trim($_POST['yim'])); - $errors = array(); - + $errors = array (); + /* checking that username has been typed */ if ($user->user_login == '') $errors['user_login'] = __('<strong>ERROR</strong>: Please enter a username.'); /* checking the password has been typed twice */ - do_action('check_passwords', array($user->user_login, &$pass1, &$pass2)); - - if ( !$update ) { - if ( $pass1 == '' || $pass2 == '' ) + do_action('check_passwords', array ($user->user_login, & $pass1, & $pass2)); + + if (!$update) { + if ($pass1 == '' || $pass2 == '') $errors['pass'] = __('<strong>ERROR</strong>: Please enter your password twice.'); } else { - if ( ( empty($pass1) && !empty($pass2) ) || ( empty($pass2) && !empty($pass1) ) ) + if ((empty ($pass1) && !empty ($pass2)) || (empty ($pass2) && !empty ($pass1))) $errors['pass'] = __("<strong>ERROR</strong>: you typed your new password only once."); } - + /* checking the password has been typed twice the same */ if ($pass1 != $pass2) $errors['pass'] = __('<strong>ERROR</strong>: Please type the same password in the two password fields.'); - if ( !empty($pass1) ) + if (!empty ($pass1)) $user->user_pass = $pass1; - - if ( !$update && username_exists( $user_login ) ) + + if (!$update && username_exists($user_login)) $errors['user_login'] = __('<strong>ERROR</strong>: This username is already registered, please choose another one.'); /* checking e-mail address */ - if (empty($user->user_email)) { + if (empty ($user->user_email)) { $errors['user_email'] = __("<strong>ERROR</strong>: please type an e-mail address"); - } else if (!is_email($user->user_email)) { - $errors['user_email'] = __("<strong>ERROR</strong>: the email address isn't correct"); - } + } else + if (!is_email($user->user_email)) { + $errors['user_email'] = __("<strong>ERROR</strong>: the email address isn't correct"); + } - if ( count($errors) != 0 ) + if (count($errors) != 0) return $errors; - - if ( $update ) { + + 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); } - + return $errors; } @@ -447,13 +461,13 @@ function wp_delete_user($id, $reassign = 'novalue') { global $wpdb; $id = (int) $id; - - if($reassign == 'novalue') { + + if ($reassign == 'novalue') { $post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_author = $id"); - + if ($post_ids) { $post_ids = implode(',', $post_ids); - + // Delete comments, *backs $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_post_ID IN ($post_ids)"); // Clean cats @@ -463,11 +477,11 @@ function wp_delete_user($id, $reassign = 'novalue') { // Delete posts $wpdb->query("DELETE FROM $wpdb->posts WHERE post_author = $id"); } - + // Clean links $wpdb->query("DELETE FROM $wpdb->links WHERE link_owner = $id"); } else { - $reassign = (int)$reassign; + $reassign = (int) $reassign; $wpdb->query("UPDATE $wpdb->posts SET post_author = {$reassign} WHERE post_author = {$id}"); $wpdb->query("UPDATE $wpdb->links SET link_owner = {$reassign} WHERE link_owner = {$id}"); } @@ -480,16 +494,150 @@ function wp_delete_user($id, $reassign = 'novalue') { return true; } -function post_exists($title, $content = '', $post_date = '') { +function get_link($link_id, $output = OBJECT) { + global $wpdb; + + $link = $wpdb->get_row("SELECT * FROM $wpdb->links WHERE link_id = '$link_id'"); + + if ( $output == OBJECT ) { + return $link; + } elseif ( $output == ARRAY_A ) { + return get_object_vars($link); + } elseif ( $output == ARRAY_N ) { + return array_values(get_object_vars($link)); + } else { + return $link; + } +} + +function get_link_to_edit($link_id) { + $link = get_link($link_id); + + $link->link_url = wp_specialchars($link->link_url, 1); + $link->link_name = wp_specialchars($link->link_name, 1); + $link->link_description = wp_specialchars($link->link_description); + $link->link_notes = wp_specialchars($link->link_notes); + $link->link_rss = wp_specialchars($link->link_rss); + + return $link; +} + +function get_default_link_to_edit() { + 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); + else + $link->link_name = ''; + + return $link; +} + +function add_link() { + return edit_link(); +} + +function edit_link($link_id = '') { + if (!current_user_can('manage_links')) + die(__("Cheatin' uh ?")); + + $_POST['link_url'] = wp_specialchars($_POST['link_url']); + //$link_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $link_url) ? $link_url : 'http://'.$link_url; + $_POST['link_name'] = wp_specialchars($_POST['link_name']); + $_POST['link_image'] = wp_specialchars($_POST['link_image']); + $_POST['link_rss'] = wp_specialchars($_POST['link_rss']); + $auto_toggle = get_autotoggle($_POST['link_category']); + + // if we are in an auto toggle category and this one is visible then we + // need to make the others invisible before we add this new one. + // FIXME Add category toggle func. + //if (($auto_toggle == 'Y') && ($link_visible == 'Y')) { + // $wpdb->query("UPDATE $wpdb->links set link_visible = 'N' WHERE link_category = $link_category"); + //} + + if ( !empty($link_id) ) { + $_POST['link_id'] = $link_id; + return wp_update_link($_POST); + } else { + return wp_insert_link($_POST); + } +} + +function wp_insert_link($linkdata) { + global $wpdb; + + extract($linkdata); + + $update = false; + if ( !empty($link_id) ) + $update = true; + + if ( empty($link_rating) ) + $link_rating = 0; + + if ( empty($link_target) ) + $link_target = ''; + + if ( empty($link_visible) ) + $link_visible = 'Y'; + + if ( $update ) { + $wpdb->query("UPDATE $wpdb->links SET link_url='$link_url', + link_name='$link_name', link_image='$link_image', + link_target='$link_target', link_category='$link_category', + link_visible='$link_visible', link_description='$link_description', + link_rating='$link_rating', link_rel='$link_rel', + link_notes='$link_notes', link_rss = '$link_rss' + WHERE link_id='$link_id'"); + } else { + $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_category, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES('$link_url','$link_name', '$link_image', '$link_target', '$link_category', '$link_description', '$link_visible', '$link_owner', '$link_rating', '$link_rel', '$link_notes', '$link_rss')"); + $link_id = $wpdb->insert_id; + } + + if ( $update ) + do_action('edit_link', $link_id); + else + do_action('add_link', $link_id); + + return $link_id; +} + +function wp_update_link($linkdata) { global $wpdb; + + $link_id = (int) $linkdata['link_id']; - if ( !empty($post_date) ) + $link = get_link($link_id, ARRAY_A); + + // Escape data pulled from DB. + $link = add_magic_quotes($link); + + // Merge old and new fields with new fields overwriting old ones. + $linkdata = array_merge($link, $linkdata); + + return wp_insert_link($linkdata); +} + +function wp_delete_link($link_id) { + global $wpdb; + + return $wpdb->query("DELETE FROM $wpdb->links WHERE link_id = '$link_id'"); +} + +function post_exists($title, $content = '', $post_date = '') { + global $wpdb; + + if (!empty ($post_date)) $post_date = "AND post_date = '$post_date'"; - if ( ! empty($title) ) + if (!empty ($title)) return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' $post_date"); - else if ( ! empty($content) ) - return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_content = '$content' $post_date"); + else + if (!empty ($content)) + return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_content = '$content' $post_date"); return 0; } @@ -498,57 +646,58 @@ function comment_exists($comment_author, $comment_date) { global $wpdb; return $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments - WHERE comment_author = '$comment_author' AND comment_date = '$comment_date'"); + WHERE comment_author = '$comment_author' AND comment_date = '$comment_date'"); } -function url_shorten ($url) { +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).'...'; + $short_url = substr($short_url, 0, 32).'...'; return $short_url; } function selected($selected, $current) { - if ($selected == $current) echo ' selected="selected"'; + if ($selected == $current) + echo ' selected="selected"'; } function checked($checked, $current) { - if ($checked == $current) echo ' checked="checked"'; + 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"); } function get_nested_categories($default = 0, $parent = 0) { - global $post_ID, $mode, $wpdb; - - if ($post_ID) { - $checked_categories = $wpdb->get_col(" - SELECT category_id - FROM $wpdb->categories, $wpdb->post2cat - WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID' - "); - - if(count($checked_categories) == 0) - { - // No selected categories, strange - $checked_categories[] = $default; - } - - } else { - $checked_categories[] = $default; - } - - $cats = return_categories_list($parent); - $result = array(); - - if ( is_array( $cats ) ) { - foreach($cats as $cat) { + global $post_ID, $mode, $wpdb; + + if ($post_ID) { + $checked_categories = $wpdb->get_col(" + SELECT category_id + FROM $wpdb->categories, $wpdb->post2cat + WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID' + "); + + if (count($checked_categories) == 0) { + // No selected categories, strange + $checked_categories[] = $default; + } + + } else { + $checked_categories[] = $default; + } + + $cats = return_categories_list($parent); + $result = array (); + + if (is_array($cats)) { + foreach ($cats as $cat) { $result[$cat]['children'] = get_nested_categories($default, $cat); $result[$cat]['cat_ID'] = $cat; $result[$cat]['checked'] = in_array($cat, $checked_categories); @@ -560,28 +709,26 @@ function get_nested_categories($default = 0, $parent = 0) { } function write_nested_categories($categories) { - foreach($categories as $category) { - echo '<label for="category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], - '" type="checkbox" name="post_category[]" id="category-', $category['cat_ID'], '"', - ($category['checked'] ? ' checked="checked"' : ""), '/> ', wp_specialchars($category['cat_name']), "</label>\n"; + foreach ($categories as $category) { + echo '<label for="category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : ""), '/> ', wp_specialchars($category['cat_name']), "</label>\n"; - if(isset($category['children'])) { - echo "\n<span class='cat-nest'>\n"; - write_nested_categories($category['children']); - echo "</span>\n"; - } - } + if (isset ($category['children'])) { + echo "\n<span class='cat-nest'>\n"; + write_nested_categories($category['children']); + echo "</span>\n"; + } + } } function dropdown_categories($default = 0) { - write_nested_categories(get_nested_categories($default)); -} + write_nested_categories(get_nested_categories($default)); +} // Dandy new recursive multiple category stuff. function cat_rows($parent = 0, $level = 0, $categories = 0) { global $wpdb, $class; - if ( !$categories ) + if (!$categories) $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_name"); if ($categories) { @@ -590,18 +737,18 @@ function cat_rows($parent = 0, $level = 0, $categories = 0) { $category->cat_name = wp_specialchars($category->cat_name); $count = $wpdb->get_var("SELECT COUNT(post_id) FROM $wpdb->post2cat WHERE category_id = $category->cat_ID"); $pad = str_repeat('— ', $level); - if ( current_user_can('manage_categories') ) - $edit = "<a href='categories.php?action=edit&cat_ID=$category->cat_ID' class='edit'>" . __('Edit') . "</a></td><td><a href='categories.php?action=delete&cat_ID=$category->cat_ID' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf(__("You are about to delete the category "%s". All of its posts will go to the default category.\\n"OK" to delete, "Cancel" to stop."), wp_specialchars($category->cat_name, 1)) . "' );\" class='delete'>" . __('Delete') . "</a>"; + if (current_user_can('manage_categories')) + $edit = "<a href='categories.php?action=edit&cat_ID=$category->cat_ID' class='edit'>".__('Edit')."</a></td><td><a href='categories.php?action=delete&cat_ID=$category->cat_ID' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '".sprintf(__("You are about to delete the category "%s". All of its posts will go to the default category.\\n"OK" to delete, "Cancel" to stop."), wp_specialchars($category->cat_name, 1))."' );\" class='delete'>".__('Delete')."</a>"; else $edit = ''; - + $class = ('alternate' == $class) ? '' : 'alternate'; echo "<tr id='cat-$category->cat_ID' class='$class'><th scope='row'>$category->cat_ID</th><td>$pad $category->cat_name</td> - <td>$category->category_description</td> - <td>$count</td> - <td>$edit</td> - </tr>"; - cat_rows($category->cat_ID, $level + 1, $categories); + <td>$category->category_description</td> + <td>$count</td> + <td>$edit</td> + </tr>"; + cat_rows($category->cat_ID, $level +1, $categories); } } } else { @@ -609,13 +756,14 @@ function cat_rows($parent = 0, $level = 0, $categories = 0) { } } -function page_rows( $parent = 0, $level = 0, $pages = 0 ) { +function page_rows($parent = 0, $level = 0, $pages = 0) { global $wpdb, $class, $post; if (!$pages) $pages = $wpdb->get_results("SELECT * FROM $wpdb->posts WHERE post_status = 'static' ORDER BY menu_order"); if ($pages) { - foreach ($pages as $post) { start_wp(); + foreach ($pages as $post) { + start_wp(); if ($post->post_parent == $parent) { $post->post_title = wp_specialchars($post->post_title); $pad = str_repeat('— ', $level); @@ -635,7 +783,8 @@ function page_rows( $parent = 0, $level = 0, $pages = 0 ) { </tr> <?php - page_rows($id, $level + 1, $pages); + + page_rows($id, $level +1, $pages); } } } else { @@ -649,106 +798,128 @@ function wp_dropdown_cats($currentcat = 0, $currentparent = 0, $parent = 0, $lev $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_name"); } if ($categories) { - foreach ($categories as $category) { if ($currentcat != $category->cat_ID && $parent == $category->category_parent) { - $count = $wpdb->get_var("SELECT COUNT(post_id) FROM $wpdb->post2cat WHERE category_id = $category->cat_ID"); - $pad = str_repeat('– ', $level); - $category->cat_name = wp_specialchars($category->cat_name); - echo "\n\t<option value='$category->cat_ID'"; - if ($currentparent == $category->cat_ID) - echo " selected='selected'"; - echo ">$pad$category->cat_name</option>"; - wp_dropdown_cats($currentcat, $currentparent, $category->cat_ID, $level + 1, $categories); - } } + foreach ($categories as $category) { + if ($currentcat != $category->cat_ID && $parent == $category->category_parent) { + $count = $wpdb->get_var("SELECT COUNT(post_id) FROM $wpdb->post2cat WHERE category_id = $category->cat_ID"); + $pad = str_repeat('– ', $level); + $category->cat_name = wp_specialchars($category->cat_name); + echo "\n\t<option value='$category->cat_ID'"; + if ($currentparent == $category->cat_ID) + echo " selected='selected'"; + echo ">$pad$category->cat_name</option>"; + wp_dropdown_cats($currentcat, $currentparent, $category->cat_ID, $level +1, $categories); + } + } } else { return false; } } +function link_category_dropdown($fieldname, $selected = 0) { + global $wpdb; + + $results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $wpdb->linkcategories ORDER BY cat_id"); + echo "\n<select name='$fieldname' size='1'>\n"; + foreach ($results as $row) { + echo "\n\t<option value='$row->cat_id'"; + if ($row->cat_id == $selected) + echo " selected='selected'"; + echo ">$row->cat_id : " . wp_specialchars($row->cat_name); + if ($row->auto_toggle == 'Y') + echo ' (auto toggle)'; + echo "</option>"; + } + echo "\n</select>\n"; +} + function wp_create_thumbnail($file, $max_side, $effect = '') { - // 1 = GIF, 2 = JPEG, 3 = PNG - - if(file_exists($file)) { - $type = getimagesize($file); - - // if the associated function doesn't exist - then it's not - // handle. duh. i hope. - - if(!function_exists('imagegif') && $type[2] == 1) { - $error = __('Filetype not supported. Thumbnail not created.'); - }elseif(!function_exists('imagejpeg') && $type[2] == 2) { - $error = __('Filetype not supported. Thumbnail not created.'); - }elseif(!function_exists('imagepng') && $type[2] == 3) { - $error = __('Filetype not supported. Thumbnail not created.'); - } else { - - // create the initial copy from the original file - if($type[2] == 1) { - $image = imagecreatefromgif($file); - } elseif($type[2] == 2) { - $image = imagecreatefromjpeg($file); - } elseif($type[2] == 3) { - $image = imagecreatefrompng($file); - } - + // 1 = GIF, 2 = JPEG, 3 = PNG + + if (file_exists($file)) { + $type = getimagesize($file); + + // if the associated function doesn't exist - then it's not + // handle. duh. i hope. + + if (!function_exists('imagegif') && $type[2] == 1) { + $error = __('Filetype not supported. Thumbnail not created.'); + } + elseif (!function_exists('imagejpeg') && $type[2] == 2) { + $error = __('Filetype not supported. Thumbnail not created.'); + } + elseif (!function_exists('imagepng') && $type[2] == 3) { + $error = __('Filetype not supported. Thumbnail not created.'); + } else { + + // create the initial copy from the original file + if ($type[2] == 1) { + $image = imagecreatefromgif($file); + } + elseif ($type[2] == 2) { + $image = imagecreatefromjpeg($file); + } + elseif ($type[2] == 3) { + $image = imagecreatefrompng($file); + } + if (function_exists('imageantialias')) - imageantialias($image, TRUE); - - $image_attr = getimagesize($file); - - // figure out the longest side - - if($image_attr[0] > $image_attr[1]) { - $image_width = $image_attr[0]; - $image_height = $image_attr[1]; - $image_new_width = $max_side; - - $image_ratio = $image_width/$image_new_width; - $image_new_height = $image_height/$image_ratio; - //width is > height - } else { - $image_width = $image_attr[0]; - $image_height = $image_attr[1]; - $image_new_height = $max_side; - - $image_ratio = $image_height/$image_new_height; - $image_new_width = $image_width/$image_ratio; - //height > width - } - - $thumbnail = imagecreatetruecolor($image_new_width, $image_new_height); - @imagecopyresampled($thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1]); - - // move the thumbnail to it's final destination - - $path = explode('/', $file); - $thumbpath = substr($file, 0, strrpos($file, '/')) . '/thumb-' . $path[count($path)-1]; - - if($type[2] == 1) { - if(!imagegif($thumbnail, $thumbpath)) { - $error = __("Thumbnail path invalid"); - } - } elseif($type[2] == 2) { - if(!imagejpeg($thumbnail, $thumbpath)) { - $error = __("Thumbnail path invalid"); - } - } elseif($type[2] == 3) { - if(!imagepng($thumbnail, $thumbpath)) { - $error = __("Thumbnail path invalid"); - } - } - - } - } - - if(!empty($error)) - { - return $error; - } - else - { - return 1; - } + imageantialias($image, TRUE); + + $image_attr = getimagesize($file); + + // figure out the longest side + + if ($image_attr[0] > $image_attr[1]) { + $image_width = $image_attr[0]; + $image_height = $image_attr[1]; + $image_new_width = $max_side; + + $image_ratio = $image_width / $image_new_width; + $image_new_height = $image_height / $image_ratio; + //width is > height + } else { + $image_width = $image_attr[0]; + $image_height = $image_attr[1]; + $image_new_height = $max_side; + + $image_ratio = $image_height / $image_new_height; + $image_new_width = $image_width / $image_ratio; + //height > width + } + + $thumbnail = imagecreatetruecolor($image_new_width, $image_new_height); + @ imagecopyresampled($thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1]); + + // move the thumbnail to it's final destination + + $path = explode('/', $file); + $thumbpath = substr($file, 0, strrpos($file, '/')).'/thumb-'.$path[count($path) - 1]; + + if ($type[2] == 1) { + if (!imagegif($thumbnail, $thumbpath)) { + $error = __("Thumbnail path invalid"); + } + } + elseif ($type[2] == 2) { + if (!imagejpeg($thumbnail, $thumbpath)) { + $error = __("Thumbnail path invalid"); + } + } + elseif ($type[2] == 3) { + if (!imagepng($thumbnail, $thumbpath)) { + $error = __("Thumbnail path invalid"); + } + } + + } + } + + if (!empty ($error)) { + return $error; + } else { + return 1; + } } // Some postmeta stuff @@ -756,17 +927,18 @@ function has_meta($postid) { global $wpdb; return $wpdb->get_results(" - SELECT meta_key, meta_value, meta_id, post_id - FROM $wpdb->postmeta - WHERE post_id = '$postid' - ORDER BY meta_key,meta_id",ARRAY_A); + SELECT meta_key, meta_value, meta_id, post_id + FROM $wpdb->postmeta + WHERE post_id = '$postid' + ORDER BY meta_key,meta_id", ARRAY_A); } function list_meta($meta) { - global $post_ID; + global $post_ID; // Exit if no meta - if (!$meta) return; + if (!$meta) + return; $count = 0; ?> <table id='meta-list' cellpadding="3"> @@ -776,47 +948,51 @@ function list_meta($meta) { <th colspan='2'><?php _e('Action') ?></th> </tr> <?php - + + foreach ($meta as $entry) { - ++$count; - if ( $count % 2 ) $style = 'alternate'; - else $style = ''; - if ( '_' == $entry['meta_key']{0} ) $style .= ' hidden'; + ++ $count; + if ($count % 2) + $style = 'alternate'; + else + $style = ''; + if ('_' == $entry['meta_key'] { 0 }) + $style .= ' hidden'; echo " - <tr class='$style'> - <td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td> - <td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td> - <td align='center' width='10%'><input name='updatemeta' type='submit' class='updatemeta' tabindex='6' value='" . __('Update') ."' /></td> - <td align='center' width='10%'><input name='deletemeta[{$entry['meta_id']}]' type='submit' class='deletemeta' tabindex='6' value='" . __('Delete') ."' /></td> - </tr> -"; + <tr class='$style'> + <td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td> + <td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td> + <td align='center' width='10%'><input name='updatemeta' type='submit' class='updatemeta' tabindex='6' value='".__('Update')."' /></td> + <td align='center' width='10%'><input name='deletemeta[{$entry['meta_id']}]' type='submit' class='deletemeta' tabindex='6' value='".__('Delete')."' /></td> + </tr> + "; } echo " - </table> -"; + </table> + "; } // Get a list of previously defined keys function get_meta_keys() { global $wpdb; - + $keys = $wpdb->get_col(" - SELECT meta_key - FROM $wpdb->postmeta - GROUP BY meta_key - ORDER BY meta_key"); - + SELECT meta_key + FROM $wpdb->postmeta + GROUP BY meta_key + ORDER BY meta_key"); + return $keys; } function meta_form() { global $wpdb; $keys = $wpdb->get_col(" - SELECT meta_key - FROM $wpdb->postmeta - GROUP BY meta_key - ORDER BY meta_id DESC - LIMIT 10"); + SELECT meta_key + FROM $wpdb->postmeta + GROUP BY meta_key + ORDER BY meta_id DESC + LIMIT 10"); ?> <h3><?php _e('Add a new custom field:') ?></h3> <table cellspacing="3" cellpadding="3"> @@ -830,7 +1006,8 @@ function meta_form() { <select id="metakeyselect" name="metakeyselect" tabindex="7"> <option value="#NONE#"><?php _e('- Select -'); ?></option> <?php - foreach($keys as $key) { + + foreach ($keys as $key) { echo "\n\t<option value='$key'>$key</option>"; } ?> @@ -844,30 +1021,31 @@ function meta_form() { </table> <p class="submit"><input type="submit" name="updatemeta" tabindex="9" value="<?php _e('Add Custom Field »') ?>" /></p> <?php + } function add_meta($post_ID) { global $wpdb; - - $metakeyselect = $wpdb->escape( stripslashes( trim($_POST['metakeyselect']) ) ); - $metakeyinput = $wpdb->escape( stripslashes( trim($_POST['metakeyinput']) ) ); - $metavalue = $wpdb->escape( stripslashes( trim($_POST['metavalue']) ) ); - if (!empty($metavalue) && ((('#NONE#' != $metakeyselect) && !empty($metakeyselect)) || !empty($metakeyinput))) { + $metakeyselect = $wpdb->escape(stripslashes(trim($_POST['metakeyselect']))); + $metakeyinput = $wpdb->escape(stripslashes(trim($_POST['metakeyinput']))); + $metavalue = $wpdb->escape(stripslashes(trim($_POST['metavalue']))); + + if (!empty ($metavalue) && ((('#NONE#' != $metakeyselect) && !empty ($metakeyselect)) || !empty ($metakeyinput))) { // We have a key/value pair. If both the select and the // input for the key have data, the input takes precedence: if ('#NONE#' != $metakeyselect) $metakey = $metakeyselect; - + if ($metakeyinput) $metakey = $metakeyinput; // default $result = $wpdb->query(" - INSERT INTO $wpdb->postmeta - (post_id,meta_key,meta_value) - VALUES ('$post_ID','$metakey','$metavalue') - "); + INSERT INTO $wpdb->postmeta + (post_id,meta_key,meta_value) + VALUES ('$post_ID','$metakey','$metavalue') + "); } } // add_meta @@ -885,15 +1063,15 @@ function update_meta($mid, $mkey, $mvalue) { function touch_time($edit = 1, $for_post = 1) { global $month, $post, $comment; - if ( $for_post && ('draft' == $post->post_status) ) { + if ($for_post && ('draft' == $post->post_status)) { $checked = 'checked="checked" '; $edit = false; } else { $checked = ' '; } - echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" '.$checked.'/> <label for="timestamp">' . __('Edit timestamp') . '</label></legend>'; - + echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" '.$checked.'/> <label for="timestamp">'.__('Edit timestamp').'</label></legend>'; + $time_adj = time() + (get_settings('gmt_offset') * 3600); $post_date = ($for_post) ? $post->post_date : $comment->comment_date; $jj = ($edit) ? mysql2date('d', $post_date) : gmdate('d', $time_adj); @@ -904,18 +1082,17 @@ function touch_time($edit = 1, $for_post = 1) { $ss = ($edit) ? mysql2date('s', $post_date) : gmdate('s', $time_adj); echo "<select name=\"mm\">\n"; - for ($i=1; $i < 13; $i=$i+1) { + for ($i = 1; $i < 13; $i = $i +1) { echo "\t\t\t<option value=\"$i\""; if ($i == $mm) - echo " selected='selected'"; + echo " selected='selected'"; if ($i < 10) { $ii = "0".$i; } else { $ii = "$i"; } echo ">".$month["$ii"]."</option>\n"; - } - + } ?> </select> <input type="text" name="jj" value="<?php echo $jj; ?>" size="2" maxlength="2" /> @@ -925,24 +1102,27 @@ function touch_time($edit = 1, $for_post = 1) { <input type="hidden" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" /> <?php _e('Existing timestamp'); ?>: <?php - // We might need to readjust to display proper existing timestamp - if ( $for_post && ('draft' == $post->post_status) ) { - $jj = mysql2date('d', $post_date); - $mm = mysql2date('m', $post_date); - $aa = mysql2date('Y', $post_date); - $hh = mysql2date('H', $post_date); - $mn = mysql2date('i', $post_date); - $ss = mysql2date('s', $post_date); - } - echo "{$month[$mm]} $jj, $aa @ $hh:$mn"; ?> + + // We might need to readjust to display proper existing timestamp + if ($for_post && ('draft' == $post->post_status)) { + $jj = mysql2date('d', $post_date); + $mm = mysql2date('m', $post_date); + $aa = mysql2date('Y', $post_date); + $hh = mysql2date('H', $post_date); + $mn = mysql2date('i', $post_date); + $ss = mysql2date('s', $post_date); + } + echo "{$month[$mm]} $jj, $aa @ $hh:$mn"; +?> </fieldset> <?php + } function check_admin_referer() { - $adminurl = strtolower( get_settings('siteurl') ) . '/wp-admin'; - $referer = strtolower( $_SERVER['HTTP_REFERER'] ); - if ( !strstr($referer, $adminurl) ) + $adminurl = strtolower(get_settings('siteurl')).'/wp-admin'; + $referer = strtolower($_SERVER['HTTP_REFERER']); + if (!strstr($referer, $adminurl)) die(__('Sorry, you need to <a href="http://codex.wordpress.org/Enable_Sending_Referrers">enable sending referrers</a> for this feature to work.')); do_action('check_admin_referer'); } @@ -964,12 +1144,16 @@ function insert_with_markers($filename, $marker, $insertion) { $foundit = false; if ($markerdata) { $state = true; - foreach($markerdata as $markerline) { - if (strstr($markerline, "# BEGIN {$marker}")) $state = false; - if ($state) fwrite($f, "{$markerline}\n"); + foreach ($markerdata as $markerline) { + if (strstr($markerline, "# BEGIN {$marker}")) + $state = false; + if ($state) + fwrite($f, "{$markerline}\n"); if (strstr($markerline, "# END {$marker}")) { fwrite($f, "# BEGIN {$marker}\n"); - if(is_array($insertion)) foreach($insertion as $insertline) fwrite($f, "{$insertline}\n"); + if (is_array($insertion)) + foreach ($insertion as $insertline) + fwrite($f, "{$insertline}\n"); fwrite($f, "# END {$marker}\n"); $state = true; $foundit = true; @@ -978,7 +1162,8 @@ function insert_with_markers($filename, $marker, $insertion) { } if (!$foundit) { fwrite($f, "# BEGIN {$marker}\n"); - foreach($insertion as $insertline) fwrite($f, "{$insertline}\n"); + foreach ($insertion as $insertline) + fwrite($f, "{$insertline}\n"); fwrite($f, "# END {$marker}\n"); } fclose($f); @@ -992,19 +1177,22 @@ function insert_with_markers($filename, $marker, $insertion) { // Returns an array of strings from a file (.htaccess) from between BEGIN // and END markers. function extract_from_markers($filename, $marker) { - $result = array(); + $result = array (); 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}")) $state = false; - if($state) $result[] = $markerline; - if(strstr($markerline, "# BEGIN {$marker}")) $state = true; + foreach ($markerdata as $markerline) { + if (strstr($markerline, "# END {$marker}")) + $state = false; + if ($state) + $result[] = $markerline; + if (strstr($markerline, "# BEGIN {$marker}")) + $state = true; } } @@ -1015,46 +1203,46 @@ 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 (! $is_apache) + if (!$is_apache) return; $rules = explode("\n", $wp_rewrite->mod_rewrite_rules()); insert_with_markers($home_path.'.htaccess', 'WordPress', $rules); } -function the_quicktags () { -// Browser detection sucks, but until Safari supports the JS needed for this to work people just assume it's a bug in WP -if ( !strstr($_SERVER['HTTP_USER_AGENT'], 'Safari') ) : - echo ' - <div id="quicktags"> - <script src="../wp-includes/js/quicktags.js" type="text/javascript"></script> - <script type="text/javascript">edToolbar();</script> -'; +function the_quicktags() { + // Browser detection sucks, but until Safari supports the JS needed for this to work people just assume it's a bug in WP + if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Safari')) + : echo ' + <div id="quicktags"> + <script src="../wp-includes/js/quicktags.js" type="text/javascript"></script> + <script type="text/javascript">edToolbar();</script> + '; echo '</div>'; -endif; + endif; } function validate_current_theme() { $theme_loc = 'wp-content/themes'; - $theme_root = ABSPATH . $theme_loc; + $theme_root = ABSPATH.$theme_loc; $template = get_settings('template'); $stylesheet = get_settings('stylesheet'); - if (($template != 'default') && (! file_exists("$theme_root/$template/index.php"))) { + if (($template != 'default') && (!file_exists("$theme_root/$template/index.php"))) { update_option('template', 'default'); update_option('stylesheet', 'default'); do_action('switch_theme', 'Default'); return false; } - if (($stylesheet != 'default') && (! file_exists("$theme_root/$stylesheet/style.css"))) { + if (($stylesheet != 'default') && (!file_exists("$theme_root/$stylesheet/style.css"))) { update_option('template', 'default'); update_option('stylesheet', 'default'); do_action('switch_theme', 'Default'); @@ -1075,18 +1263,18 @@ function get_page_templates() { $themes = get_themes(); $theme = get_current_theme(); $templates = $themes[$theme]['Template Files']; - $page_templates = array(); + $page_templates = array (); - if( is_array( $templates ) ) { + if (is_array($templates)) { foreach ($templates as $template) { - $template_data = implode('', file(ABSPATH . $template)); + $template_data = implode('', file(ABSPATH.$template)); preg_match("|Template Name:(.*)|i", $template_data, $name); preg_match("|Description:(.*)|i", $template_data, $description); $name = $name[1]; $description = $description[1]; - if (! empty($name)) { + if (!empty ($name)) { $page_templates[trim($name)] = basename($template); } } @@ -1097,11 +1285,13 @@ function get_page_templates() { function page_template_dropdown($default = '') { $templates = get_page_templates(); - foreach (array_keys($templates) as $template) : - if ($default == $templates[$template]) $selected = " selected='selected'"; - else $selected = ''; - echo "\n\t<option value='" . $templates[$template] . "' $selected>$template</option>"; - endforeach; + foreach (array_keys($templates) as $template) + : if ($default == $templates[$template]) + $selected = " selected='selected'"; + else + $selected = ''; + echo "\n\t<option value='".$templates[$template]."' $selected>$template</option>"; + endforeach; } function parent_dropdown($default = 0, $parent = 0, $level = 0) { @@ -1111,7 +1301,7 @@ function parent_dropdown($default = 0, $parent = 0, $level = 0) { if ($items) { foreach ($items as $item) { // A page cannot be it's own parent. - if (!empty($post_ID)) { + if (!empty ($post_ID)) { if ($item->ID == $post_ID) { continue; } @@ -1123,7 +1313,7 @@ function parent_dropdown($default = 0, $parent = 0, $level = 0) { $current = ''; echo "\n\t<option value='$item->ID'$current>$pad $item->post_title</option>"; - parent_dropdown($default, $item->ID, $level + 1); + parent_dropdown($default, $item->ID, $level +1); } } else { return false; @@ -1140,7 +1330,7 @@ function user_can_access_admin_page() { foreach ($menu as $menu_array) { //echo "parent array: " . $menu_array[2]; if ($menu_array[2] == $parent) { - if ( !current_user_can($menu_array[1]) ) { + if (!current_user_can($menu_array[1])) { return false; } else { break; @@ -1148,10 +1338,10 @@ function user_can_access_admin_page() { } } - if (isset($submenu[$parent])) { + if (isset ($submenu[$parent])) { foreach ($submenu[$parent] as $submenu_array) { if ($submenu_array[2] == $pagenow) { - if ( !current_user_can($submenu_array[1]) ) { + if (!current_user_can($submenu_array[1])) { return false; } else { return true; @@ -1159,7 +1349,7 @@ function user_can_access_admin_page() { } } } - + return true; } @@ -1170,34 +1360,36 @@ function get_admin_page_title() { global $pagenow; global $plugin_page; - if (isset($title) && ! empty($title)) { + if (isset ($title) && !empty ($title)) { return $title; } $parent = get_admin_page_parent(); - if (empty($parent)) { + if (empty ($parent)) { foreach ($menu as $menu_array) { - if (isset($menu_array[3])) { + if (isset ($menu_array[3])) { if ($menu_array[2] == $pagenow) { $title = $menu_array[3]; return $menu_array[3]; - } else if (isset($plugin_page) && ($plugin_page == $menu_array[2])) { - $title = $menu_array[3]; - return $menu_array[3]; - } + } else + if (isset ($plugin_page) && ($plugin_page == $menu_array[2])) { + $title = $menu_array[3]; + return $menu_array[3]; + } } } } else { foreach (array_keys($submenu) as $parent) { foreach ($submenu[$parent] as $submenu_array) { - if (isset($submenu_array[3])) { + if (isset ($submenu_array[3])) { if ($submenu_array[2] == $pagenow) { $title = $submenu_array[3]; return $submenu_array[3]; - } else if (isset($plugin_page) && ($plugin_page == $submenu_array[2])) { - $title = $submenu_array[3]; - return $submenu_array[3]; - } + } else + if (isset ($plugin_page) && ($plugin_page == $submenu_array[2])) { + $title = $submenu_array[3]; + return $submenu_array[3]; + } } } } @@ -1213,11 +1405,11 @@ function get_admin_page_parent() { global $pagenow; global $plugin_page; - if (isset($parent_file) && ! empty($parent_file)) { + if (isset ($parent_file) && !empty ($parent_file)) { return $parent_file; } - if ($pagenow == 'admin.php' && isset($plugin_page)) { + if ($pagenow == 'admin.php' && isset ($plugin_page)) { foreach ($menu as $parent_menu) { if ($parent_menu[2] == $plugin_page) { $parent_file = $plugin_page; @@ -1225,16 +1417,17 @@ function get_admin_page_parent() { } } } - + foreach (array_keys($submenu) as $parent) { foreach ($submenu[$parent] as $submenu_array) { if ($submenu_array[2] == $pagenow) { $parent_file = $parent; return $parent; - } else if (isset($plugin_page) && ($plugin_page == $submenu_array[2])) { - $parent_file = $parent; - return $parent; - } + } else + if (isset ($plugin_page) && ($plugin_page == $submenu_array[2])) { + $parent_file = $parent; + return $parent; + } } } @@ -1247,12 +1440,12 @@ function add_menu_page($page_title, $menu_title, $access_level, $file, $function $file = plugin_basename($file); - $menu[] = array($menu_title, $access_level, $file, $page_title); + $menu[] = array ($menu_title, $access_level, $file, $page_title); $admin_page_hooks[$file] = sanitize_title($menu_title); $hookname = get_plugin_page_hookname($file, ''); - if ( !empty($function) && !empty($hookname) ) + if (!empty ($function) && !empty ($hookname)) add_action($hookname, $function); return $hookname; @@ -1269,18 +1462,18 @@ 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) { + if (!isset ($submenu[$parent]) && $file != $parent) { foreach ($menu as $parent_menu) { if ($parent_menu[2] == $parent) { $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) ) + if (!empty ($function) && !empty ($hookname)) add_action($hookname, $function); return $hookname; @@ -1295,18 +1488,17 @@ function add_management_page($page_title, $menu_title, $access_level, $file, $fu } function add_theme_page($page_title, $menu_title, $access_level, $file, $function = '') { - return add_submenu_page('themes.php', $page_title, $menu_title, $access_level, $file, $function); + return add_submenu_page('themes.php', $page_title, $menu_title, $access_level, $file, $function); } - function validate_file($file, $allowed_files = '') { - if ( false !== strpos($file, './')) + if (false !== strpos($file, './')) return 1; - - if (':' == substr($file,1,1)) + + if (':' == substr($file, 1, 1)) return 2; - if ( !empty($allowed_files) && (! in_array($file, $allowed_files)) ) + if (!empty ($allowed_files) && (!in_array($file, $allowed_files))) return 3; return 0; @@ -1317,28 +1509,28 @@ function validate_file_to_edit($file, $allowed_files = '') { $code = validate_file($file, $allowed_files); - if (! $code) + if (!$code) return $file; switch ($code) { - case 1: - 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: - die (__('Sorry, can’t call files with their real path.')); + case 1 : + 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 : + die(__('Sorry, can’t call files with their real path.')); - case 3: - die (__('Sorry, that file cannot be edited.')); + case 3 : + die(__('Sorry, that file cannot be edited.')); } } function get_home_path() { $home = get_settings('home'); - if ( $home != '' && $home != get_settings('siteurl') ) { + if ($home != '' && $home != get_settings('siteurl')) { $home_path = parse_url($home); $home_path = $home_path['path']; $root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"]); - $home_path = trailingslashit($root . $home_path); + $home_path = trailingslashit($root.$home_path); } else { $home_path = ABSPATH; } @@ -1347,51 +1539,32 @@ function get_home_path() { } function get_real_file_to_edit($file) { - if ('index.php' == $file || - '.htaccess' == $file) { - $real_file = get_home_path() . $file; + if ('index.php' == $file || '.htaccess' == $file) { + $real_file = get_home_path().$file; } else { - $real_file = ABSPATH . $file; + $real_file = ABSPATH.$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) { global $wp_file_descriptions; - if ( isset($wp_file_descriptions[basename($file)] ) ) { + if (isset ($wp_file_descriptions[basename($file)])) { return $wp_file_descriptions[basename($file)]; - } elseif ( file_exists( ABSPATH . $file ) ) { - $template_data = implode('', file(ABSPATH . $file)); - if ( preg_match("|Template Name:(.*)|i", $template_data, $name) ) + } + elseif (file_exists(ABSPATH.$file)) { + $template_data = implode('', file(ABSPATH.$file)); + if (preg_match("|Template Name:(.*)|i", $template_data, $name)) return $name[1]; } - return basename( $file ); + return basename($file); } function update_recently_edited($file) { @@ -1401,7 +1574,7 @@ function update_recently_edited($file) { $oldfiles[] = $file; $oldfiles = array_reverse($oldfiles); $oldfiles = array_unique($oldfiles); - if ( 5 < count($oldfiles) ) + if (5 < count($oldfiles)) array_pop($oldfiles); } else { $oldfiles[] = $file; @@ -1416,10 +1589,10 @@ function get_plugin_data($plugin_file) { 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) ) + if (preg_match("|Version:(.*)|i", $plugin_data, $version)) $version = $version[1]; else - $version =''; + $version = ''; $description = wptexturize($description[1]); @@ -1427,47 +1600,47 @@ function get_plugin_data($plugin_file) { $name = trim($name); $plugin = $name; if ('' != $plugin_uri[1] && '' != $name) { - $plugin = '<a href="' . $plugin_uri[1] . '" title="' . __('Visit plugin homepage') . '">' . $plugin . '</a>'; + $plugin = '<a href="'.$plugin_uri[1].'" title="'.__('Visit plugin homepage').'">'.$plugin.'</a>'; } if ('' == $author_uri[1]) { $author = $author_name[1]; } else { - $author = '<a href="' . $author_uri[1] . '" title="' . __('Visit author homepage') . '">' . $author_name[1] . '</a>'; + $author = '<a href="'.$author_uri[1].'" title="'.__('Visit author homepage').'">'.$author_name[1].'</a>'; } - return array('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1]); + 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; } - $wp_plugins = array(); + $wp_plugins = array (); $plugin_loc = 'wp-content/plugins'; - $plugin_root = ABSPATH . $plugin_loc; + $plugin_root = ABSPATH.$plugin_loc; // Files in wp-content/plugins directory $plugins_dir = @ dir($plugin_root); if ($plugins_dir) { - while(($file = $plugins_dir->read()) !== false) { - if ( preg_match('|^\.+$|', $file) ) + while (($file = $plugins_dir->read()) !== false) { + if (preg_match('|^\.+$|', $file)) continue; - if (is_dir($plugin_root . '/' . $file)) { - $plugins_subdir = @ dir($plugin_root . '/' . $file); + if (is_dir($plugin_root.'/'.$file)) { + $plugins_subdir = @ dir($plugin_root.'/'.$file); if ($plugins_subdir) { - while(($subfile = $plugins_subdir->read()) !== false) { - if ( preg_match('|^\.+$|', $subfile) ) + while (($subfile = $plugins_subdir->read()) !== false) { + if (preg_match('|^\.+$|', $subfile)) continue; - if ( preg_match('|\.php$|', $subfile) ) + if (preg_match('|\.php$|', $subfile)) $plugin_files[] = "$file/$subfile"; } } } else { - if ( preg_match('|\.php$|', $file) ) + if (preg_match('|\.php$|', $file)) $plugin_files[] = $file; } } @@ -1479,10 +1652,10 @@ function get_plugins() { sort($plugin_files); - foreach($plugin_files as $plugin_file) { + foreach ($plugin_files as $plugin_file) { $plugin_data = get_plugin_data("$plugin_root/$plugin_file"); - - if (empty($plugin_data['Name'])) { + + if (empty ($plugin_data['Name'])) { continue; } @@ -1497,27 +1670,29 @@ function get_plugin_page_hookname($plugin_page, $parent_page) { $parent = get_admin_page_parent(); - if ( empty($parent_page) || 'admin.php' == $parent_page ) { - if ( isset($admin_page_hooks[$plugin_page]) ) + if (empty ($parent_page) || 'admin.php' == $parent_page) { + if (isset ($admin_page_hooks[$plugin_page])) $page_type = 'toplevel'; - else if ( isset($admin_page_hooks[$parent]) ) - $page_type = $admin_page_hooks[$parent]; - } else if ( isset($admin_page_hooks[$parent_page]) ) { - $page_type = $admin_page_hooks[$parent_page]; - } else { - $page_type = 'admin'; - } + else + if (isset ($admin_page_hooks[$parent])) + $page_type = $admin_page_hooks[$parent]; + } else + if (isset ($admin_page_hooks[$parent_page])) { + $page_type = $admin_page_hooks[$parent_page]; + } else { + $page_type = 'admin'; + } $plugin_name = preg_replace('!\.php!', '', $plugin_page); - return $page_type . '_page_' . $plugin_name; + return $page_type.'_page_'.$plugin_name; } function get_plugin_page_hook($plugin_page, $parent_page) { global $wp_filter; - + $hook = get_plugin_page_hookname($plugin_page, $parent_page); - if ( isset($wp_filter[$hook]) ) + if (isset ($wp_filter[$hook])) return $hook; else return ''; @@ -1526,20 +1701,20 @@ function get_plugin_page_hook($plugin_page, $parent_page) { function browse_happy() { $getit = __('WordPress recommends a better browser'); echo ' - <p id="bh" style="text-align: center;"><a href="http://browsehappy.com/" title="' . $getit . '"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></p> - '; + <p id="bh" style="text-align: center;"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></p> + '; } -if ( strstr( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) ) +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) { global $wp_importers; - - $wp_importers[$id] = array($name, $description, $callback); + + $wp_importers[$id] = array ($name, $description, $callback); } function get_importers() { diff --git a/wp-inst/wp-admin/link-add.php b/wp-inst/wp-admin/link-add.php index 3709983..d5b609c 100644 --- a/wp-inst/wp-admin/link-add.php +++ b/wp-inst/wp-admin/link-add.php @@ -5,38 +5,6 @@ $title = __('Add Link'); $this_file = 'link-manager.php'; $parent_file = 'link-manager.php'; -function category_dropdown($fieldname, $selected = 0) { - global $wpdb; - - $results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $wpdb->linkcategories ORDER BY cat_id"); - echo "\n<select name='$fieldname' size='1'>\n"; - foreach ($results as $row) { - echo "\n\t<option value='$row->cat_id'"; - if ($row->cat_id == $selected) - echo " selected='selected'"; - echo ">$row->cat_id : " . wp_specialchars($row->cat_name); - if ($row->auto_toggle == 'Y') - echo ' (auto toggle)'; - echo "</option>"; - } - echo "\n</select>\n"; -} - -function xfn_check($class, $value = '', $type = 'check') { - global $link_rel; - $rels = preg_split('/\s+/', $link_rel); - - if ('' != $value && in_array($value, $rels) ) { - echo ' checked="checked"'; - } - - if ('' == $value) { - if ('family' == $class && !strstr($link_rel, 'child') && !strstr($link_rel, 'parent') && !strstr($link_rel, 'sibling') && !strstr($link_rel, 'spouse') && !strstr($link_rel, 'kin')) echo ' checked="checked"'; - if ('friendship' == $class && !strstr($link_rel, 'friend') && !strstr($link_rel, 'acquaintance') && !strstr($link_rel, 'contact') ) echo ' checked="checked"'; - if ('geographical' == $class && !strstr($link_rel, 'co-resident') && !strstr($link_rel, 'neighbor') ) echo ' checked="checked"'; - if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"'; - } -} $wpvarstoreset = array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', @@ -56,9 +24,6 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) { } } } -$link_url = stripslashes($_GET['linkurl']); -$link_name = htmlentities(stripslashes(urldecode($_GET['name']))); - $xfn = true; require('admin-header.php'); @@ -67,201 +32,11 @@ require('admin-header.php'); <?php if ($_GET['added']) : ?> <div id="message" class="updated fade"><p><?php _e('Link added.'); ?></p></div> <?php endif; ?> -<div class="wrap"> -<h2><?php _e('<strong>Add</strong> a link:') ?></h2> - <form name="addlink" method="post" action="link-manager.php"> -<fieldset class="options"> - <legend><?php _e('Basics') ?></legend> - <table class="editform" width="100%" cellspacing="2" cellpadding="5"> - <tr> - <th width="33%" scope="row"><?php _e('URI:') ?></th> - <td width="67%"><input type="text" name="linkurl" value="<?php echo wp_specialchars($_GET['linkurl'], 1); ?>" style="width: 95%;" /></td> - </tr> - <tr> - <th scope="row"><?php _e('Link Name:') ?></th> - <td><input type="text" name="name" value="<?php echo wp_specialchars( urldecode($_GET['name']), 1 ); ?>" style="width: 95%" /></td> - </tr> - <tr> - <th scope="row"><?php _e('Short description:') ?></th> - <td><input type="text" name="description" value="" style="width: 95%" /></td> - </tr> - <tr> - <th scope="row"><?php _e('Category:') ?></th> - <td><?php category_dropdown('category'); ?></td> - </tr> -</table> -</fieldset> - <p class="submit"> - <input type="submit" name="submit" value="<?php _e('Add Link »') ?>" /> - </p> - <fieldset class="options"> - <legend><?php _e('Link Relationship (XFN)') ?></legend> - <table class="editform" width="100%" cellspacing="2" cellpadding="5"> - <tr> - <th width="33%" scope="row"><?php _e('rel:') ?></th> - <td width="67%"><input type="text" name="rel" id="rel" size="50" value="<?php echo $link_rel; ?>" /></td> - </tr> - <tr> - <th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th> - <td> - <table cellpadding="3" cellspacing="5"> - <tr> - <th scope="row"> <?php _e('identity') ?> </th> - <td> - <label for="me"> - <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> /> - <?php _e('another web address of mine') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('friendship') ?> </th> - <td> - <label for="contact"> - <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label> - <label for="acquaintance"> - <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> /> <?php _e('acquaintance') ?></label> - <label id="friend"> - <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label> - <label for="friendship"> - <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('physical') ?> </th> - <td> - <label for="met"> - <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> /> - <?php _e('met') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('professional') ?> </th> - <td> - <label for="co-worker"> - <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> /> - <?php _e('co-worker') ?></label> - <label for="colleague"> - <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> /> - <?php _e('colleague') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('geographical') ?> </th> - <td> - <label for="co-resident"> - <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> /> - <?php _e('co-resident') ?></label> - <label for="neighbor"> - <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> /> - <?php _e('neighbor') ?></label> - <label for="geographical"> - <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> /> - <?php _e('none') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('family'); ?> </th> - <td> - <label for="child"> - <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?> /> - <?php _e('child') ?></label> - <label for="kin"> - <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin', 'radio'); ?> /> - <?php _e('kin') ?></label> - <label for="parent"> - <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent', 'radio'); ?> /> - <?php _e('parent') ?></label> - <label for="sibling"> - <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling', 'radio'); ?> /> - <?php _e('sibling') ?></label> - <label for="spouse"> - <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse', 'radio'); ?> /> - <?php _e('spouse') ?></label> - <label for="family"> - <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> /> - <?php _e('none') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('romantic') ?> </th> - <td> - <label for="muse"> - <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> /> - <?php _e('muse') ?></label> - <label for="crush"> - <input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> /> - <?php _e('crush') ?></label> - <label for="date"> - <input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> /> - <?php _e('date') ?></label> - <label for="romantic"> - <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> /> - <?php _e('sweetheart') ?></label> - </td> - </tr> - </table> - </td> - </tr> -</table> -</fieldset> - <p class="submit"> - <input type="submit" name="submit" value="<?php _e('Add Link »') ?>" /> - </p> -<fieldset class="options"> - <legend><?php _e('Advanced') ?></legend> - <table class="editform" width="100%" cellspacing="2" cellpadding="5"> - <tr> - <th width="33%" scope="row"><?php _e('Image URI:') ?></th> - <td width="67%"><input type="text" name="image" size="50" value="" style="width: 95%" /></td> - </tr> -<tr> - <th scope="row"><?php _e('RSS URI:') ?> </th> - <td><input name="rss_uri" type="text" id="rss_uri" value="" size="50" style="width: 95%" /></td> - </tr> - <tr> - <th scope="row"><?php _e('Notes:') ?></th> - <td><textarea name="notes" cols="50" rows="10" style="width: 95%"></textarea></td> - </tr> - <tr> - <th scope="row"><?php _e('Rating:') ?></th> - <td><select name="rating" size="1"> - <?php - for ($r = 0; $r < 10; $r++) { - echo(' <option value="'.$r.'">'.$r.'</option>'); - } -?> - </select> - <?php _e('(Leave at 0 for no rating.)') ?> </td> - </tr> - <tr> - <th scope="row"><?php _e('Target') ?></th> - <td><label> - <input type="radio" name="target" value="_blank" /> - <code>_blank</code></label> -<br /> -<label><input type="radio" name="target" value="_top" /> -<code>_top</code></label> -<br /> -<label><input type="radio" name="target" value="" checked="checked" /> -<?php _e('none') ?></label> -<?php _e('(Note that the <code>target</code> attribute is illegal in XHTML 1.1 and 1.0 Strict.)') ?></td> - </tr> - <tr> - <th scope="row"><?php _e('Visible:') ?></th> - <td><label> - <input type="radio" name="visible" checked="checked" value="Y" /> -<?php _e('Yes') ?></label><br /> -<label><input type="radio" name="visible" value="N" /> <input type="hidden" name="action" value="Add" /> -<?php _e('No') ?></label></td> - </tr> -</table> -</fieldset> - <p class="submit"> - <input type="submit" name="submit" value="<?php _e('Add Link »') ?>" /> - </p> - </form> -</div> +<?php + $link = get_default_link_to_edit(); + include('edit-link-form.php'); +?> <div class="wrap"> <?php printf(__('<p>You can drag <a href="%s" title="Link add bookmarklet">Link This</a> to your toolbar and when you click it a window will pop up that will allow you to add whatever site you’re on to your links! Right now this only works on Mozilla or Netscape, but we’re working on it.</p>'), "javascript:void(linkmanpopup=window.open('" . get_settings('siteurl') . "/wp-admin/link-add.php?action=popup&linkurl='+escape(location.href)+'&name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?> diff --git a/wp-inst/wp-admin/link-manager.php b/wp-inst/wp-admin/link-manager.php index 2df3fb4..5f0e6d9 100644 --- a/wp-inst/wp-admin/link-manager.php +++ b/wp-inst/wp-admin/link-manager.php @@ -7,39 +7,6 @@ require_once('admin.php'); $title = __('Manage Links'); $this_file = $parent_file = 'link-manager.php'; -function xfn_check($class, $value = '', $type = 'check') { - global $link_rel; - $rels = preg_split('/\s+/', $link_rel); - - if ('' != $value && in_array($value, $rels) ) { - echo ' checked="checked"'; - } - - if ('' == $value) { - if ('family' == $class && !strstr($link_rel, 'child') && !strstr($link_rel, 'parent') && !strstr($link_rel, 'sibling') && !strstr($link_rel, 'spouse') && !strstr($link_rel, 'kin')) echo ' checked="checked"'; - if ('friendship' == $class && !strstr($link_rel, 'friend') && !strstr($link_rel, 'acquaintance') && !strstr($link_rel, 'contact') ) echo ' checked="checked"'; - if ('geographical' == $class && !strstr($link_rel, 'co-resident') && !strstr($link_rel, 'neighbor') ) echo ' checked="checked"'; - if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"'; - } -} - -function category_dropdown($fieldname, $selected = 0) { - global $wpdb; - - $results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $wpdb->linkcategories ORDER BY cat_id"); - echo "\n<select name='$fieldname' size='1'>"; - foreach ($results as $row) { - echo "\n\t<option value='$row->cat_id'"; - if ($row->cat_id == $selected) - echo " selected='selected'"; - echo ">$row->cat_id: ".wp_specialchars($row->cat_name); - if ('Y' == $row->auto_toggle) - echo ' (auto toggle)'; - echo "</option>\n"; - } - echo "\n</select>\n"; -} - $wpvarstoreset = array('action','cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', @@ -159,87 +126,29 @@ switch ($action) { { check_admin_referer(); - $link_url = wp_specialchars($_POST['linkurl']); - $link_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $link_url) ? $link_url : 'http://' . $link_url; - $link_name = wp_specialchars($_POST['name']); - $link_image = wp_specialchars($_POST['image']); - $link_target = $_POST['target']; - $link_category = $_POST['category']; - $link_description = $_POST['description']; - $link_visible = $_POST['visible']; - $link_rating = $_POST['rating']; - $link_rel = $_POST['rel']; - $link_notes = $_POST['notes']; - $link_rss_uri = wp_specialchars($_POST['rss_uri']); - $auto_toggle = get_autotoggle($link_category); - - if ( !current_user_can('manage_links') ) - die (__("Cheatin' uh ?")); - - // if we are in an auto toggle category and this one is visible then we - // need to make the others invisible before we add this new one. - if (($auto_toggle == 'Y') && ($link_visible == 'Y')) { - $wpdb->query("UPDATE $wpdb->links set link_visible = 'N' WHERE link_category = $link_category"); - } - $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_category, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) " . - " VALUES('" . $link_url . "','" - . $link_name . "', '" - . $link_image . "', '$link_target', $link_category, '" - . $link_description . "', '$link_visible', $user_ID, $link_rating, '" . $link_rel . "', '" . $link_notes . "', '$link_rss_uri')"); - + add_link(); + header('Location: ' . $_SERVER['HTTP_REFERER'] . '?added=true'); break; } // end Add case 'editlink': { - if (isset($submit)) { - - if (isset($links_show_cat_id) && ($links_show_cat_id != '')) - $cat_id = $links_show_cat_id; + + check_admin_referer(); + + if (isset($links_show_cat_id) && ($links_show_cat_id != '')) + $cat_id = $links_show_cat_id; + + if (!isset($cat_id) || ($cat_id == '')) { + if (!isset($links_show_cat_id) || ($links_show_cat_id == '')) + $cat_id = 'All'; + } + $links_show_cat_id = $cat_id; - if (!isset($cat_id) || ($cat_id == '')) { - if (!isset($links_show_cat_id) || ($links_show_cat_id == '')) - $cat_id = 'All'; - } - $links_show_cat_id = $cat_id; - - check_admin_referer(); - - $link_id = (int) $_POST['link_id']; - $link_url = wp_specialchars($_POST['linkurl']); - $link_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $link_url) ? $link_url : 'http://' . $link_url; - $link_name = wp_specialchars($_POST['name']); - $link_image = wp_specialchars($_POST['image']); - $link_target = wp_specialchars($_POST['target']); - $link_category = $_POST['category']; - $link_description = $_POST['description']; - $link_visible = $_POST['visible']; - $link_rating = $_POST['rating']; - $link_rel = $_POST['rel']; - $link_notes = $_POST['notes']; - $link_rss_uri = $_POST['rss_uri']; - $auto_toggle = get_autotoggle($link_category); - - if ( !current_user_can('manage_links') ) - die (__("Cheatin' uh ?")); - - // if we are in an auto toggle category and this one is visible then we - // need to make the others invisible before we update this one. - if (($auto_toggle == 'Y') && ($link_visible == 'Y')) { - $wpdb->query("UPDATE $wpdb->links set link_visible = 'N' WHERE link_category = $link_category"); - } - - $wpdb->query("UPDATE $wpdb->links SET link_url='" . $link_url . "', - link_name='" . $link_name . "',\n link_image='" . $link_image . "', - link_target='$link_target',\n link_category=$link_category, - link_visible='$link_visible',\n link_description='" . $link_description . "', - link_rating=$link_rating, - link_rel='" . $link_rel . "', - link_notes='" . $link_notes . "', - link_rss = '$link_rss_uri' - WHERE link_id=$link_id"); - } // end if save + $link_id = (int) $_POST['link_id']; + edit_link($link_id); + setcookie('links_show_cat_id_' . COOKIEHASH, $links_show_cat_id, time()+600); wp_redirect($this_file); break; @@ -249,13 +158,13 @@ switch ($action) { { check_admin_referer(); - $link_id = (int) $_GET['link_id']; - if ( !current_user_can('manage_links') ) die (__("Cheatin' uh ?")); - $wpdb->query("DELETE FROM $wpdb->links WHERE link_id = $link_id"); + $link_id = (int) $_GET['link_id']; + wp_delete_link($link_id); + if (isset($links_show_cat_id) && ($links_show_cat_id != '')) $cat_id = $links_show_cat_id; @@ -276,226 +185,11 @@ switch ($action) { die(__('You do not have sufficient permissions to edit the links for this blog.')); $link_id = (int) $_GET['link_id']; - $row = $wpdb->get_row("SELECT * FROM $wpdb->links WHERE link_id = $link_id"); - - if ($row) { - $link_url = wp_specialchars($row->link_url, 1); - $link_name = wp_specialchars($row->link_name, 1); - $link_image = $row->link_image; - $link_target = $row->link_target; - $link_category = $row->link_category; - $link_description = wp_specialchars($row->link_description); - $link_visible = $row->link_visible; - $link_rating = $row->link_rating; - $link_rel = $row->link_rel; - $link_notes = wp_specialchars($row->link_notes); - $link_rss_uri = wp_specialchars($row->link_rss); - } else { - die( __('Link not found.') ); - } - -?> - -<div class="wrap"> - <form action="" method="post" name="editlink" id="editlink"> - <h2><?php _e('Edit a link:') ?></h2> -<fieldset class="options"> - <legend><?php _e('Basics') ?></legend> - <table class="editform" width="100%" cellspacing="2" cellpadding="5"> - <tr> - <th width="33%" scope="row"><?php _e('URI:') ?></th> - <td width="67%"><input type="text" name="linkurl" value="<?php echo $link_url; ?>" style="width: 95%;" /></td> - </tr> - <tr> - <th scope="row"><?php _e('Link Name:') ?></th> - <td><input type="text" name="name" value="<?php echo $link_name; ?>" style="width: 95%" /></td> - </tr> - <tr> - <th scope="row"><?php _e('Short description:') ?></th> - <td><input type="text" name="description" value="<?php echo $link_description; ?>" style="width: 95%" /></td> - </tr> - <tr> - <th scope="row"><?php _e('Category:') ?></th> - <td><?php category_dropdown('category', $link_category); ?></td> - </tr> -</table> -</fieldset> - <p class="submit"> - <input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" /> - </p> - <fieldset class="options"> - <legend><?php _e('Link Relationship (XFN)') ?></legend> - <table class="editform" width="100%" cellspacing="2" cellpadding="5"> - <tr> - <th width="33%" scope="row"><?php _e('rel:') ?></th> - <td width="67%"><input type="text" name="rel" id="rel" size="50" value="<?php echo $link_rel; ?>" /></td> - </tr> - <tr> - <th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th> - <td> - <table cellpadding="3" cellspacing="5"> - <tr> - <th scope="row"> <?php _e('identity') ?> </th> - <td> - <label for="me"> - <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> /> - <?php _e('another web address of mine') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('friendship') ?> </th> - <td> - <label for="contact"> - <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label> - <label for="acquaintance"> - <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> /> <?php _e('acquaintance') ?></label> - <label id="friend"> - <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label> - <label for="friendship"> - <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('physical') ?> </th> - <td> - <label for="met"> - <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> /> - <?php _e('met') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('professional') ?> </th> - <td> - <label for="co-worker"> - <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> /> - <?php _e('co-worker') ?></label> - <label for="colleague"> - <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> /> - <?php _e('colleague') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('geographical') ?> </th> - <td> - <label for="co-resident"> - <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> /> - <?php _e('co-resident') ?></label> - <label for="neighbor"> - <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> /> - <?php _e('neighbor') ?></label> - <label for="geographical"> - <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> /> - <?php _e('none') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('family') ?> </th> - <td> - <label for="child"> - <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?> /> - <?php _e('child') ?></label> - <label for="kin"> - <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin', 'radio'); ?> /> - <?php _e('kin') ?></label> - <label for="parent"> - <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent', 'radio'); ?> /> - <?php _e('parent') ?></label> - <label for="sibling"> - <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling', 'radio'); ?> /> - <?php _e('sibling') ?></label> - <label for="spouse"> - <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse', 'radio'); ?> /> - <?php _e('spouse') ?></label> - <label for="family"> - <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> /> - <?php _e('none') ?></label> - </td> - </tr> - <tr> - <th scope="row"> <?php _e('romantic') ?> </th> - <td> - <label for="muse"> - <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> /> - <?php _e('muse') ?></label> - <label for="crush"> - <input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> /> - <?php _e('crush') ?></label> - <label for="date"> - <input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> /> - <?php _e('date') ?></label> - <label for="romantic"> - <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> /> - <?php _e('sweetheart') ?></label> - </td> - </tr> - </table> - </td> - </tr> -</table> -</fieldset> - <p class="submit"> - <input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" /> - </p> -<fieldset class="options"> - <legend><?php _e('Advanced') ?></legend> - <table class="editform" width="100%" cellspacing="2" cellpadding="5"> - <tr> - <th width="33%" scope="row"><?php _e('Image URI:') ?></th> - <td width="67%"><input type="text" name="image" size="50" value="<?php echo $link_image; ?>" style="width: 95%" /></td> - </tr> -<tr> - <th scope="row"><?php _e('RSS URI:') ?> </th> - <td><input name="rss_uri" type="text" id="rss_uri" value="<?php echo $link_rss_uri; ?>" size="50" style="width: 95%" /></td> - </tr> - <tr> - <th scope="row"><?php _e('Notes:') ?></th> - <td><textarea name="notes" cols="50" rows="10" style="width: 95%"><?php echo $link_notes; ?></textarea></td> - </tr> - <tr> - <th scope="row"><?php _e('Rating:') ?></th> - <td><select name="rating" size="1"> -<?php - for ($r = 0; $r < 10; $r++) { - echo(' <option value="'.$r.'" '); - if ($link_rating == $r) - echo 'selected="selected"'; - echo('>'.$r.'</option>'); - } -?> - </select> - <?php _e('(Leave at 0 for no rating.)') ?> </td> - </tr> - <tr> - <th scope="row"><?php _e('Target') ?></th> - <td><label> - <input type="radio" name="target" value="_blank" <?php echo(($link_target == '_blank') ? 'checked="checked"' : ''); ?> /> - <code>_blank</code></label><br /> -<label> -<input type="radio" name="target" value="_top" <?php echo(($link_target == '_top') ? 'checked="checked"' : ''); ?> /> -<code>_top</code></label><br /> -<label> -<input type="radio" name="target" value="" <?php echo(($link_target == '') ? 'checked="checked"' : ''); ?> /> -<?php _e('none') ?></label><br /> -<?php _e('(Note that the <code>target</code> attribute is illegal in XHTML 1.1 and 1.0 Strict.)') ?></td> - </tr> - <tr> - <th scope="row"><?php _e('Visible:') ?></th> - <td><label> - <input type="radio" name="visible" <?php if ($link_visible == 'Y') echo "checked='checked'"; ?> value="Y" /> -<?php _e('Yes') ?></label><br /><label> -<input type="radio" name="visible" <?php if ($link_visible == 'N') echo "checked='checked'"; ?> value="N" /> -<?php _e('No') ?></label></td> - </tr> -</table> -</fieldset> -<p class="submit"><input type="submit" name="submit" value="<?php _e('Save Changes »') ?>" /> - <input type="hidden" name="action" value="editlink" /> - <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" /> - <input type="hidden" name="order_by" value="<?php echo wp_specialchars($order_by, 1); ?>" /> - <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" /></p> - </form> -</div> -<?php + + if ( !$link = get_link_to_edit($link_id) ) + die( __('Link not found.') ); + + include('edit-link-form.php'); break; } // end linkedit case __("Show"): @@ -629,7 +323,7 @@ function checkAll(form) <input type="hidden" name="action" value="" /> <input type="hidden" name="order_by" value="<?php echo wp_specialchars($order_by, 1); ?>" /> <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" /> - <table width="100%" cellpadding="3" cellspacing="3"> + <table id="the-list-x" width="100%" cellpadding="3" cellspacing="3"> <tr> <th width="15%"><?php _e('Name') ?></th> <th><?php _e('URI') ?></th> @@ -673,9 +367,9 @@ function checkAll(form) $image = ($link->link_image != null) ? __('Yes') : __('No'); $visible = ($link->link_visible == 'Y') ? __('Yes') : __('No'); ++$i; - $style = ($i % 2) ? ' class="alternate"' : ''; + $style = ($i % 2) ? '' : ' class="alternate"'; ?> - <tr valign="middle" <?php echo $style; ?>> + <tr id="link-<?php echo $link->link_id; ?>" valign="middle" <?php echo $style; ?>> <td><strong><?php echo $link->link_name; ?></strong><br /> <?php echo sprintf(__('Description: %s'), $link->link_description) . "</td>"; @@ -690,17 +384,19 @@ LINKS; if ($show_buttons) { echo '<td><a href="link-manager.php?link_id=' . $link->link_id . '&action=linkedit" class="edit">' . __('Edit') . '</a></td>'; - echo '<td><a href="link-manager.php?link_id=' . $link->link_id . '&action=Delete"' . " onclick=\"return confirm('" . __("You are about to delete this link.\\n \'Cancel\' to stop, \'OK\' to delete.") . "');" . '" class="delete">' . __('Delete') . '</a></td>'; + echo '<td><a href="link-manager.php?link_id=' . $link->link_id . '&action=Delete"' . " onclick=\"return deleteSomething( 'link', $link->link_id , '" . sprintf(__("You are about to delete the "%s" link to %s.\\n"Cancel" to stop, "OK" to delete."), wp_specialchars($link->link_name,1), wp_specialchars($link->link_url)) . '\' );" class="delete">' . __('Delete') . '</a></td>'; echo '<td><input type="checkbox" name="linkcheck[]" value="' . $link->link_id . '" /></td>'; } else { echo "<td> </td><td> </td><td> </td>\n"; } - echo "\n\t</tr>"; + echo "\n </tr>\n"; } } ?> </table> +<div id="ajax-response"></div> + </div> <div class="wrap"> @@ -726,7 +422,7 @@ LINKS; <input name="visibility" type="submit" id="visibility" value="<?php _e('Toggle Visibility') ?>" /> </td> <td> - <?php _e('Move to category:'); category_dropdown('category'); ?> <input name="move" type="submit" id="move" value="<?php _e('Go') ?>" /> + <?php _e('Move to category:'); link_category_dropdown('category'); ?> <input name="move" type="submit" id="move" value="<?php _e('Go') ?>" /> </td> <td align="right"> <a href="#" onclick="checkAll(document.getElementById('links')); return false; "><?php _e('Toggle Checkboxes') ?></a> diff --git a/wp-inst/wp-admin/profile-update.php b/wp-inst/wp-admin/profile-update.php index a59877b..1b5f412 100644 --- a/wp-inst/wp-admin/profile-update.php +++ b/wp-inst/wp-admin/profile-update.php @@ -4,7 +4,7 @@ require_once('admin.php'); check_admin_referer(); -$errors = update_user($user_ID); +$errors = edit_user($user_ID); if (count($errors) != 0) { foreach ($errors as $id => $error) { diff --git a/wp-inst/wp-admin/user-edit.php b/wp-inst/wp-admin/user-edit.php index fe04926..ad20eda 100644 --- a/wp-inst/wp-admin/user-edit.php +++ b/wp-inst/wp-admin/user-edit.php @@ -43,7 +43,7 @@ $errors = array(); if (!current_user_can('edit_users')) $errors['head'] = __('You do not have permission to edit this user.'); else - $errors = update_user($user_id); + $errors = edit_user($user_id); if(count($errors) == 0) { if( is_site_admin() ) diff --git a/wp-inst/wp-includes/classes.php b/wp-inst/wp-includes/classes.php index b8991ff..8e73317 100644 --- a/wp-inst/wp-includes/classes.php +++ b/wp-inst/wp-includes/classes.php @@ -724,10 +724,11 @@ class retrospam_mgr { foreach( $this->comment_list as $comment ) { if( $comment->approved == 1 ) { foreach( $this->spam_words as $word ) { + $word = trim($word); if ( empty( $word ) ) continue; $fulltext = strtolower($comment->email.' '.$comment->url.' '.$comment->ip.' '.$comment->text); - if( strpos( $fulltext, strtolower(trim($word)) ) != FALSE ) { + if( strpos( $fulltext, strtolower($word) ) != FALSE ) { $this->found_comments[] = $comment->ID; break; } diff --git a/wp-inst/wp-includes/functions-post.php b/wp-inst/wp-includes/functions-post.php index 8681a85..d5f7b61 100644 --- a/wp-inst/wp-includes/functions-post.php +++ b/wp-inst/wp-includes/functions-post.php @@ -180,6 +180,8 @@ function wp_insert_post($postarr = array()) { add_post_meta($post_ID, '_wp_page_template', $page_template, true); } + do_action('wp_insert_post', $post_ID); + return $post_ID; } diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php index bb24d22..b2362e0 100644 --- a/wp-inst/wp-includes/functions.php +++ b/wp-inst/wp-includes/functions.php @@ -2052,7 +2052,7 @@ function update_usermeta( $user_id, $meta_key, $meta_value ) { $meta_value = serialize($meta_value); $cur = $wpdb->get_row("SELECT * FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'"); - if ( !$cur ) { + if ( !$cur && !empty( $meta_value ) ) { $wpdb->query("INSERT INTO $wpdb->usermeta ( user_id, meta_key, meta_value ) VALUES ( '$user_id', '$meta_key', '$meta_value' )"); @@ -2060,6 +2060,8 @@ function update_usermeta( $user_id, $meta_key, $meta_value ) { } if ( $cur->meta_value != $meta_value ) $wpdb->query("UPDATE $wpdb->usermeta SET meta_value = '$meta_value' WHERE user_id = '$user_id' AND meta_key = '$meta_key'"); + if ( empty( $meta_value ) ) + $wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'"); } function register_activation_hook($file, $function) { diff --git a/wp-inst/wp-includes/wp-l10n.php b/wp-inst/wp-includes/wp-l10n.php index c051fda..609e194 100644 --- a/wp-inst/wp-includes/wp-l10n.php +++ b/wp-inst/wp-includes/wp-l10n.php @@ -86,10 +86,10 @@ function load_default_textdomain() { load_textdomain('default', $mofile); } -function load_plugin_textdomain($domain) { +function load_plugin_textdomain($domain, $path = 'wp-content/plugins') { $locale = get_locale(); - $mofile = ABSPATH . "wp-content/plugins/$domain-$locale.mo"; + $mofile = ABSPATH . "$path/$domain-$locale.mo"; load_textdomain($domain, $mofile); } @@ -100,4 +100,4 @@ function load_theme_textdomain($domain) { load_textdomain($domain, $mofile); } -?>
\ No newline at end of file +?> |