Changeset 3985

Timestamp:

07/05/06 22:00:03 (2 years ago)

Author:

ryan

Message:

Use wp_die(). Props filosofo. fixes #2914

Files:

• trunk/wp-admin/admin-functions.php (modified) (8 diffs)
• trunk/wp-admin/admin.php (modified) (2 diffs)
• trunk/wp-admin/categories.php (modified) (1 diff)
• trunk/wp-admin/comment.php (modified) (5 diffs)
• trunk/wp-admin/import/blogger.php (modified) (6 diffs)
• trunk/wp-admin/import/greymatter.php (modified) (1 diff)
• trunk/wp-admin/inline-uploading.php (modified) (4 diffs)
• trunk/wp-admin/install.php (modified) (1 diff)
• trunk/wp-admin/link-import.php (modified) (1 diff)
• trunk/wp-admin/link-manager.php (modified) (1 diff)
• trunk/wp-admin/link.php (modified) (4 diffs)
• trunk/wp-admin/menu.php (modified) (1 diff)
• trunk/wp-admin/moderation.php (modified) (1 diff)
• trunk/wp-admin/page.php (modified) (1 diff)
• trunk/wp-admin/plugin-editor.php (modified) (2 diffs)
• trunk/wp-admin/post.php (modified) (1 diff)
• trunk/wp-admin/profile-update.php (modified) (1 diff)
• trunk/wp-admin/templates.php (modified) (2 diffs)
• trunk/wp-admin/theme-editor.php (modified) (3 diffs)
• trunk/wp-admin/update-links.php (modified) (1 diff)
• trunk/wp-admin/users.php (modified) (5 diffs)
• trunk/wp-includes/comment.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php (modified) (1 diff)
• trunk/wp-login.php (modified) (2 diffs)
• trunk/wp-mail.php (modified) (1 diff)
• trunk/wp-settings.php (modified) (3 diffs)

trunk/wp-admin/admin-functions.php

@@ -7 +7 @@
-    if ( 'page' == $_POST['post_type'] ) {
-        if ( !current_user_can('edit_pages') )
-
+wp_
-    } else {
-        if ( !current_user_can('edit_posts') )
-
+wp_
-    }
-
@@ -33 +33 @@
-        if ( 'page' == $_POST['post_type'] ) {
-            if ( !current_user_can('edit_others_pages') )
-
+wp_
-        } else {
-            if ( !current_user_can('edit_others_posts') )
-
+wp_
-
-        }
@@ -152 +152 @@
-    if ( 'page' == $_POST['post_type'] ) {
-        if ( !current_user_can('edit_page', $post_ID) )
-
+wp_
-    } else {
-        if ( !current_user_can('edit_post', $post_ID) )
-
+wp_
-    }
-
@@ -177 +177 @@
-        if ( 'page' == $_POST['post_type'] ) {
-            if ( !current_user_can('edit_others_pages') )
-
+wp_
-        } else {
-            if ( !current_user_can('edit_others_posts') )
-
+wp_
-
-        }
@@ -252 +252 @@
-
-    if (!current_user_can('edit_post', $comment_post_ID))
-
+wp_
-
-    $_POST['comment_author'] = $_POST['newcomment_author'];
@@ -531 +531 @@
-function edit_link($link_id = '') {
-    if (!current_user_can('manage_links'))
-
+wp_
-
-    $_POST['link_url'] = wp_specialchars($_POST['link_url']);
@@ -1522 +1522 @@
-    switch ($code) {
-        case 1 :
-
+wp_
-
-        case 2 :
-
+wp_
-
-        case 3 :
-
+wp_
-    }
-}
@@ -1845 +1845 @@
-    $new_file = $uploads['path'] . "/$filename";
-    if ( false === @ move_uploaded_file($file['tmp_name'], $new_file) )
-
+wp_
-
-    // Set correct file permissions

trunk/wp-admin/admin.php

@@ -46 +46 @@
-    } else {
-        if ( validate_file($plugin_page) ) {
-
+wp_
-        }
-
-        if (! file_exists(ABSPATH . "wp-content/plugins/$plugin_page"))
-
+wp_
-
-        if (! isset($_GET['noheader']))
@@ -66 +66 @@
-
-    if ( validate_file($importer) ) {
-
+wp_
-    }
-
-    if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
-
+wp_
-
-    include(ABSPATH . "wp-admin/import/$importer.php");

trunk/wp-admin/categories.php

@@ -32 +32 @@
-    // Don't delete the default cats.
-    if ( $cat_ID == get_option('default_category') )
-
+wp_
-
-    if ( $cat_ID == get_option('default_link_category') )
-
+wp_
-
-    wp_delete_category($cat_ID);

trunk/wp-admin/comment.php

@@ -20 +20 @@
-
-    if ( ! $comment = get_comment($comment) )
-
+wp_
-
-    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-
+wp_
-
-    $comment = get_comment_to_edit($comment);
@@ -43 +43 @@
-
-    if ( ! $comment = get_comment($comment) )
-
+wp_
-
-    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-
+wp_
-
-    echo "<div class='wrap'>\n";
@@ -91 +91 @@
-
-    $postdata = get_post($p) or 
-
+wp_
-
-    if ( ! $comment = get_comment($comment) )
-
+wp_
-
-    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-
+wp_
-
-    if ( 'spam' == $_REQUEST['delete_type'] )
@@ -124 +124 @@
-
-    if ( ! $comment = get_comment($comment) )
-
+wp_
-
-    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-
+wp_
-
-    wp_set_comment_status($comment->comment_ID, "hold");
@@ -151 +151 @@
-
-    if ( ! $comment = get_comment($comment) )
-
+wp_
-
-    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-
+wp_
-
-    wp_set_comment_status($comment->comment_ID, "approve");

trunk/wp-admin/import/blogger.php

@@ -242 +242 @@
-            preg_match_all('#posts\.g\?blogID=(\d+)">([^<]+)</a>#U', $response['body'], $blogsary);
-            if ( ! count( $blogsary[1] < 1 ) )
-
+wp_
-            $this->import['blogs'] = array();
-            $template = '<MainPage><br /><br /><br /><p>'.__('Are you looking for %title%? It is temporarily out of service. Please try again in a few minutes. Meanwhile, discover <a href="http://wordpress.org/">a better blogging tool</a>.').'</p><BloggerArchives><a class="archive" href="<$BlogArchiveURL$>"><$BlogArchiveName$></a><br /></BloggerArchives></MainPage><ArchivePage><Blogger><wordpresspost><$BlogItemDateTime$>|W|P|<$BlogItemAuthorNickname$>|W|P|<$BlogItemBody$>|W|P|<$BlogItemNumber$>|W|P|<$BlogItemTitle$>|W|P|<$BlogItemAuthorEmail$><BlogItemCommentsEnabled><BlogItemComments><wordpresscomment><$BlogCommentDateTime$>|W|P|<$BlogCommentAuthor$>|W|P|<$BlogCommentBody$></BlogItemComments></BlogItemCommentsEnabled></Blogger></ArchivePage>';
@@ -307 +307 @@
-                            $response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode=0", $headers);
-                            if ( $response['code'] >= 400 )
-
+wp_
-                            $this->import['blogs'][$_GET['blog']]['url'] = 'http://' . $optary['modify']['subdomain'] . '.blogspot.com/';
-                            sleep(2);
@@ -322 +322 @@
-                    $response = $this->post_blogger($posturl, $headers, $paramary);
-                    if ( $response['code'] >= 400 || strstr($response['body'], 'There are errors on this form') )
-
+wp_
-                }
-                $output .= "<del><p>$blog_opt</p></del>\n";
@@ -365 +365 @@
-        $bloghtml = $this->get_blogger($this->import['blogs'][$_GET['blog']]['url']);
-        if (! strstr($bloghtml['body'], '<a class="archive"') )
-
+wp_
-        preg_match_all('#<a class="archive" href="([^"]*)"#', $bloghtml['body'], $archives);
-        foreach ($archives[1] as $archive) {
@@ -547 +547 @@
-                        sleep(2);
-                        if ( $response['code'] >= 400 )
-
+wp_
-                    }
-                }
@@ -616 +616 @@
-            }
-//echo "Step $step.";
-
+wp_
-            switch ($step) {
-                case 0 :

trunk/wp-admin/import/greymatter.php

@@ -88 +88 @@
-
-        if (!chdir($archivespath))
-
+wp_
-
-        if (!chdir($gmpath))
-
+wp_
-            
-        $this->header();

trunk/wp-admin/inline-uploading.php

@@ -6 +6 @@
-
-if (!current_user_can('upload_files'))
-
+wp_
-
-wp_reset_vars(array('action', 'post', 'all', 'last', 'link', 'sort', 'start', 'imgtitle', 'descr', 'attachment'));
@@ -23 +23 @@
-
-if ( !current_user_can('edit_post', (int) $attachment) )
-
+wp_
-
-wp_delete_attachment($attachment);
@@ -39 +39 @@
-
-if ( isset($file['error']) )
-
+wp_
-
-$url = $file['url'];
@@ -277 +277 @@
-
-default:
-
+wp_
-}
-

trunk/wp-admin/install.php

@@ -75 +75 @@
-<?php
-// Let's check to make sure WP isn't already installed.
-
+wp_
-
-switch($step) {

trunk/wp-admin/link-import.php

@@ -90 +90 @@
-
-                    if ( isset($file['error']) )
-
+wp_
-
-                    $url = $file['url'];

trunk/wp-admin/link-manager.php

@@ -23 +23 @@
-
-if (!current_user_can('manage_links'))
-
+wp_
-
-switch ($order_by) {

trunk/wp-admin/link.php

@@ -19 +19 @@
-        // check the current user's level first.
-        if (!current_user_can('manage_links'))
-
+wp_
-
-        //for each link id (in $linkcheck[]) change category to selected value
@@ -43 +43 @@
-        // check the current user's level first.
-        if (!current_user_can('manage_links'))
-
+wp_
-
-        //for each link id (in $linkcheck[]) change category to selected value
@@ -80 +80 @@
-
-        if (!current_user_can('manage_links'))
-
+wp_
-
-        wp_delete_link($link_id);
@@ -96 +96 @@
-        include_once ('admin-header.php');
-        if (!current_user_can('manage_links'))
-
+wp_
-
-        $link_id = (int) $_GET['link_id'];
-
-        if (!$link = get_link_to_edit($link_id))
-
+wp_
-
-        include ('edit-link-form.php');

trunk/wp-admin/menu.php

@@ -119 +119 @@
-
-if (! user_can_access_admin_page()) {
-
+wp_
-}
-

trunk/wp-admin/moderation.php

@@ -22 +22 @@
-
-    if ( ! current_user_can('moderate_comments') )
-
+wp_
-
-    $item_ignored = 0;

trunk/wp-admin/page.php

@@ -111 +111 @@
-
-    if ( !current_user_can('delete_page', $page_id) )
-
+wp_
-
-    if ( $page->post_type == 'attachment' ) {
-        if ( ! wp_delete_attachment($page_id) )
-
+wp_
-    } else {
-        if ( !wp_delete_post($page_id) ) 
-
+wp_
-    }
-

trunk/wp-admin/plugin-editor.php

@@ -24 +24 @@
-
-    if ( !current_user_can('edit_plugins') )
-
+wp_
-
-    $newcontent = stripslashes($_POST['newcontent']);
@@ -44 +44 @@
-    require_once('admin-header.php');
-    if ( !current_user_can('edit_plugins') )
-
+wp_
-
-    update_recently_edited("wp-content/plugins/$file");

trunk/wp-admin/post.php

@@ -118 +118 @@
-
-    if ( !current_user_can('delete_post', $post_id) )
-
+wp_
-
-    if ( $post->post_type == 'attachment' ) {
-        if ( ! wp_delete_attachment($post_id) )
-
+wp_
-    } else {
-        if ( !wp_delete_post($post_id) ) 
-
+wp_
-    }
-

trunk/wp-admin/profile-update.php

@@ -8 +8 @@
-
-if ( !$_POST )
-
+wp_
-
-$errors = edit_user($user_ID);

trunk/wp-admin/templates.php

@@ -26 +26 @@
-
-    if ( ! current_user_can('edit_files') )
-
+wp_
-
-    $newcontent = stripslashes($_POST['newcontent']);
@@ -51 +51 @@
-
-    if ( ! current_user_can('edit_files') )
-
+wp_
-
-    if ( strstr( $file, 'wp-config.php' ) )
-
+wp_
-
-    update_recently_edited($file);

trunk/wp-admin/theme-editor.php

@@ -17 +17 @@
-
-if ( ! isset($themes[$theme]) )
-
+wp_
-
-$allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files']);
@@ -37 +37 @@
-
-    if ( !current_user_can('edit_themes') )
-
+wp_
-
-    $newcontent = stripslashes($_POST['newcontent']);
@@ -58 +58 @@
-    require_once('admin-header.php');
-    if ( !current_user_can('edit_themes') )
-
+wp_
-
-    update_recently_edited($file);

trunk/wp-admin/update-links.php

@@ -4 +4 @@
-
-if ( !get_option('use_linksupdate') )
-
+wp_
-
-$link_uris = $wpdb->get_col("SELECT link_url FROM $wpdb->links");
-
-if ( !$link_uris )
-
+wp_
-
-$link_uris = urlencode( join( $link_uris, "\n" ) );

trunk/wp-admin/users.php

@@ -129 +129 @@
-
-    if ( !current_user_can('edit_users') )
-
+wp_
-
-    $userids = $_POST['users'];
@@ -135 +135 @@
-    foreach($userids as $id) {
-        if ( ! current_user_can('edit_user', $id) )
-
+wp_
-        // The new role of the current user must also have edit_users caps
-        if($id == $current_user->id && !$wp_roles->role_objects[$_POST['new_role']]->has_cap('edit_users')) {
@@ -159 +159 @@
-
-    if ( !current_user_can('delete_users') )
-
+wp_
-
-    $userids = $_POST['users'];
@@ -167 +167 @@
-    foreach ( (array) $userids as $id) {
-        if ( ! current_user_can('delete_user', $id) )
-
+wp_
-
-        if($id == $current_user->id) {
@@ -253 +253 @@
-
-    if ( ! current_user_can('create_users') )
-
+wp_
-
-    $user_id = add_user();

trunk/wp-includes/comment.php

@@ -182 +182 @@
-    $dupe .= ") AND comment_content = '$comment_content' LIMIT 1";
-    if ( $wpdb->get_var($dupe) )
-
+wp_
-
-    // Simple flood-protection
@@ -190 +190 @@
-        if ( ($time_newcomment - $time_lastcomment) < 15 ) {
-            do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
-
+wp_
-        }
-    }

trunk/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php

@@ -72 +72 @@
-            fclose($fh);
-        } else
-
+wp_
-
-        $data = shell_exec($this->cmd);

trunk/wp-login.php

@@ -99 +99 @@
-
-    if (!$user_email || $user_email != $_POST['email'])
-
+wp_
-
-do_action('retreive_password', $user_login);  // Misspelled and deprecated.
@@ -133 +133 @@
-    $key = preg_replace('/a-z0-9/i', '', $_GET['key']);
-    if ( empty($key) )
-
+wp_
-    $user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'");
-    if ( !$user )
-
+wp_
-
-    do_action('password_reset');

trunk/wp-mail.php

@@ -18 +18 @@
-
-$count = $pop3->login(get_settings('mailserver_login'), get_settings('mailserver_pass'));
-
+wp_
-
-

trunk/wp-settings.php

@@ -6 +6 @@
-
-    if ( isset($_REQUEST['GLOBALS']) )
-
+wp_
-
-    // Variables that shouldn't be unset
@@ -48 +48 @@
-
-if ( !(phpversion() >= '4.1') )
-
+wp_
-
-if ( !extension_loaded('mysql') )
-
+wp_
-
-function timer_start() {
@@ -112 +112 @@
-    else
-        $link = 'wp-admin/install.php';
-
+wp_
-}
-