Changeset 3937

Show
Ignore:
Timestamp:
06/27/06 23:10:02 (2 years ago)
Author:
ryan
Message:

Use wp_redirect().

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/2.0/wp-admin/categories.php

    r3806 r3937  
    3333    wp_insert_category($_POST); 
    3434 
    35     header('Location: categories.php?message=1#addcat'); 
     35    wp_redirect('categories.php?message=1#addcat'); 
    3636break; 
    3737 
     
    5050    wp_delete_category($cat_ID); 
    5151 
    52     header('Location: categories.php?message=2'); 
     52    wp_redirect('categories.php?message=2'); 
    5353 
    5454break; 
     
    105105    wp_update_category($_POST); 
    106106 
    107     header('Location: categories.php?message=3'); 
     107    wp_redirect('categories.php?message=3'); 
    108108break; 
    109109 
  • branches/2.0/wp-admin/import/blogger.php

    r3609 r3937  
    2626    function restart() { 
    2727        delete_option('import-blogger'); 
    28         header("Location: admin.php?import=blogger"); 
     28        wp_redirect("admin.php?import=blogger"); 
    2929        die(); 
    3030    } 
     
    214214    // Redirects to next step 
    215215    function do_next_step() { 
    216         header("Location: admin.php?import=blogger&noheader=true&blog={$_GET['blog']}"); 
     216        wp_redirect("admin.php?import=blogger&noheader=true&blog={$_GET['blog']}"); 
    217217        die(); 
    218218    } 
     
    274274            } 
    275275            update_option('import-blogger', $this->import); 
    276             header("Location: admin.php?import=blogger&noheader=true&step=1"); 
     276            wp_redirect("admin.php?import=blogger&noheader=true&step=1"); 
    277277        } 
    278278        die(); 
  • branches/2.0/wp-admin/inline-uploading.php

    r3771 r3937  
    4242wp_delete_attachment($attachment); 
    4343 
    44 header("Location: " . basename(__FILE__) ."?post=$post&all=$all&action=view&start=$start"); 
     44wp_redirect(basename(__FILE__) ."?post=$post&all=$all&action=view&start=$start"); 
    4545die; 
    4646 
     
    103103} 
    104104 
    105 header("Location: " . basename(__FILE__) . "?post=$post&all=$all&action=view&start=0"); 
     105wp_redirect(basename(__FILE__) . "?post=$post&all=$all&action=view&start=0"); 
    106106die(); 
    107107 
     
    142142 
    143143if ( count($attachments) == 0 ) { 
    144     header("Location: " . basename(__FILE__) ."?post=$post&action=upload" ); 
     144    wp_redirect( basename(__FILE__) ."?post=$post&action=upload" ); 
    145145    die; 
    146146} elseif ( count($attachments) > $num ) { 
  • branches/2.0/wp-admin/link-categories.php

    r3906 r3937  
    7878             " '$text_after_all', $list_limit)"); 
    7979 
    80       header('Location: link-categories.php'); 
     80      wp_redirect('link-categories.php'); 
    8181    break; 
    8282  } // end addcat 
     
    9797    $wpdb->query("UPDATE $wpdb->links SET link_category=1 WHERE link_category='$cat_id'"); 
    9898 
    99     header('Location: link-categories.php'); 
     99    wp_redirect('link-categories.php'); 
    100100    break; 
    101101  } // end delete 
     
    272272 
    273273 
    274     header("Location: link-categories.php"); 
     274    wp_redirect("link-categories.php"); 
    275275    break; 
    276276  } // end editcat 
  • branches/2.0/wp-admin/link-manager.php

    r3923 r3937  
    5050 
    5151    if (count($linkcheck) == 0) { 
    52         header('Location: ' . $this_file); 
     52        wp_redirect($this_file); 
    5353        exit; 
    5454    } 
     
    6363    $q = $wpdb->query("update $wpdb->links SET link_owner='$newowner' WHERE link_id IN ($all_links)"); 
    6464 
    65     header('Location: ' . $this_file); 
     65    wp_redirect($this_file); 
    6666    break; 
    6767  } 
     
    7676    //for each link id (in $linkcheck[]): toggle the visibility 
    7777    if (count($linkcheck) == 0) { 
    78         header('Location: ' . $this_file); 
     78        wp_redirect($this_file); 
    7979        exit; 
    8080    } 
     
    100100    } 
    101101 
    102     header('Location: ' . $this_file); 
     102    wp_redirect($this_file); 
    103103    break; 
    104104  } 
     
    113113    //for each link id (in $linkcheck[]) change category to selected value 
    114114    if (count($linkcheck) == 0) { 
    115         header('Location: ' . $this_file); 
     115        wp_redirect($this_file); 
    116116        exit; 
    117117    } 
     
    120120    $q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)"); 
    121121 
    122     header('Location: ' . $this_file); 
     122    wp_redirect($this_file); 
    123123    break; 
    124124  } 
     
    130130    add_link(); 
    131131     
    132     header('Location: ' . wp_get_referer() . '?added=true'); 
     132    wp_redirect(wp_get_referer() . '?added=true'); 
    133133    break; 
    134134  } // end Add 
  • branches/2.0/wp-admin/moderation.php

    r3808 r3937  
    7171 
    7272    $file = basename(__FILE__); 
    73     header("Location: $file?ignored=$item_ignored&deleted=$item_deleted&approved=$item_approved&spam=$item_spam"); 
     73    wp_redirect("$file?ignored=$item_ignored&deleted=$item_deleted&approved=$item_approved&spam=$item_spam"); 
    7474    exit(); 
    7575 
  • branches/2.0/wp-admin/plugin-editor.php

    r3805 r3937  
    4545        fwrite($f, $newcontent); 
    4646        fclose($f); 
    47         header("Location: plugin-editor.php?file=$file&a=te"); 
     47        wp_redirect("plugin-editor.php?file=$file&a=te"); 
    4848    } else { 
    49         header("Location: plugin-editor.php?file=$file"); 
     49        wp_redirect("plugin-editor.php?file=$file"); 
    5050    } 
    5151 
  • branches/2.0/wp-admin/plugins.php

    r3805 r3937  
    1313            do_action('activate_' . trim( $_GET['plugin'] )); 
    1414        } 
    15         header('Location: plugins.php?activate=true'); 
     15        wp_redirect('plugins.php?activate=true'); 
    1616    } else if ('deactivate' == $_GET['action']) { 
    1717        check_admin_referer('deactivate-plugin_' . $_GET['plugin']); 
     
    2020        update_option('active_plugins', $current); 
    2121        do_action('deactivate_' . trim( $_GET['plugin'] )); 
    22         header('Location: plugins.php?deactivate=true'); 
     22        wp_redirect('plugins.php?deactivate=true'); 
    2323    } 
    2424    exit; 
  • branches/2.0/wp-admin/post.php

    r3923 r3937  
    5858        $location = "post.php?action=edit&post=$post_ID"; 
    5959 
    60     header("Location: $location"); 
     60    wp_redirect($location); 
    6161    exit(); 
    6262    break; 
     
    127127    } 
    128128 
    129     header ('Location: ' . $location); // Send user on their way while we keep working 
     129    wp_redirect($location); // Send user on their way while we keep working 
    130130 
    131131    exit(); 
     
    153153    elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php'; 
    154154    $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); 
    155     header ('Location: ' . $sendback); 
     155    wp_redirect($sendback); 
    156156    break; 
    157157 
     
    237237 
    238238    if ((wp_get_referer() != "") && (false == $noredir)) { 
    239         header('Location: ' . wp_get_referer()); 
    240     } else { 
    241         header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments'); 
     239        wp_redirect(wp_get_referer()); 
     240    } else { 
     241        wp_redirect(get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments'); 
    242242    } 
    243243 
     
    264264 
    265265    if ((wp_get_referer() != "") && (false == $noredir)) { 
    266         header('Location: ' . wp_get_referer()); 
    267     } else { 
    268         header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments'); 
     266        wp_redirect(wp_get_referer()); 
     267    } else { 
     268        wp_redirect(get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments'); 
    269269    } 
    270270 
     
    287287    } 
    288288 
    289     header('Location: ' . get_option('siteurl') . '/wp-admin/moderation.php?approved=1'); 
     289    wp_redirect(get_option('siteurl') . '/wp-admin/moderation.php?approved=1'); 
    290290 
    291291    break; 
     
    315315 
    316316    if ((wp_get_referer() != "") && (false == $noredir)) { 
    317         header('Location: ' . wp_get_referer()); 
    318     } else { 
    319         header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments'); 
     317        wp_redirect(wp_get_referer()); 
     318    } else { 
     319        wp_redirect(get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments'); 
    320320    } 
    321321 
     
    333333    $referredby = $_POST['referredby']; 
    334334    if (!empty($referredby)) { 
    335         header('Location: ' . $referredby); 
    336     } else { 
    337         header ("Location: edit.php?p=$comment_post_ID&c=1#comments"); 
     335        wp_redirect($referredby); 
     336    } else { 
     337        wp_redirect("edit.php?p=$comment_post_ID&c=1#comments"); 
    338338    } 
    339339 
  • branches/2.0/wp-admin/templates.php

    r3805 r3937  
    4848            fwrite($f, $newcontent); 
    4949            fclose($f); 
    50             header("Location: templates.php?file=$file&a=te"); 
     50            wp_redirect("templates.php?file=$file&a=te"); 
    5151        } else { 
    52             header("Location: templates.php?file=$file&a=err"); 
     52            wp_redirect("templates.php?file=$file&a=err"); 
    5353        } 
    5454    } else { 
    55         header("Location: templates.php?file=$file&a=err"); 
     55        wp_redirect("templates.php?file=$file&a=err"); 
    5656    } 
    5757 
  • branches/2.0/wp-admin/theme-editor.php

    r3805 r3937  
    5959        fwrite($f, $newcontent); 
    6060        fclose($f); 
    61         header("Location: theme-editor.php?file=$file&theme=$theme&a=te"); 
     61        wp_redirect("theme-editor.php?file=$file&theme=$theme&a=te"); 
    6262    } else { 
    63         header("Location: theme-editor.php?file=$file&theme=$theme"); 
     63        wp_redirect("theme-editor.php?file=$file&theme=$theme"); 
    6464    } 
    6565 
  • branches/2.0/wp-admin/themes.php

    r3805 r3937  
    1414        do_action('switch_theme', get_current_theme()); 
    1515         
    16         header('Location: themes.php?activated=true'); 
     16        wp_redirect('themes.php?activated=true'); 
    1717        exit; 
    1818    } 
  • branches/2.0/wp-admin/user-edit.php

    r3838 r3937  
    4343 
    4444if(count($errors) == 0) { 
    45     header("Location: user-edit.php?user_id=$user_id&updated=true"); 
     45    wp_redirect("user-edit.php?user_id=$user_id&updated=true"); 
    4646    exit; 
    4747} 
  • branches/2.0/wp-admin/users.php

    r3771 r3937  
    1515 
    1616    if (empty($_POST['users'])) { 
    17         header('Location: users.php'); 
     17        wp_redirect('users.php'); 
    1818    } 
    1919 
     
    3434    } 
    3535         
    36     header('Location: users.php?update=' . $update); 
     36    wp_redirect('users.php?update=' . $update); 
    3737 
    3838break; 
     
    4343 
    4444    if ( empty($_POST['users']) ) { 
    45         header('Location: users.php'); 
     45        wp_redirect('users.php'); 
    4646    } 
    4747 
     
    6767    } 
    6868 
    69     header('Location: users.php?update=' . $update); 
     69    wp_redirect('users.php?update=' . $update); 
    7070 
    7171break; 
     
    7575    check_admin_referer('bulk-users'); 
    7676 
    77     if (empty($_POST['users'])) { 
    78         header('Location: users.php'); 
    79     } 
     77    if ( empty($_POST['users']) ) 
     78        wp_redirect('users.php'); 
    8079 
    8180    if ( !current_user_can('edit_users') ) 
     
    138137     
    139138    if(count($errors) == 0) { 
    140         header('Location: users.php?update=add'); 
     139        wp_redirect('users.php?update=add'); 
    141140        die(); 
    142141    } 
  • branches/2.0/wp-content/themes/default/functions.php

    r3925 r3937  
    124124            } 
    125125            //print_r($_REQUEST); 
    126             header("Location: themes.php?page=functions.php&saved=true"); 
     126            wp_redirect("themes.php?page=functions.php&saved=true"); 
    127127            die; 
    128128        } 
  • branches/2.0/wp-includes/pluggable-functions.php

    r3936 r3937  
    222222        nocache_headers(); 
    223223     
    224         header('Location: ' . get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI'])); 
     224        wp_redirect(get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI'])); 
    225225        exit(); 
    226226    } 
  • branches/2.0/wp-login.php

    r3771 r3937  
    2828    $redirect_to = 'wp-login.php'; 
    2929    if ( isset($_REQUEST['redirect_to']) ) 
    30         $redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_REQUEST['redirect_to'])
     30        $redirect_to = $_REQUEST['redirect_to']
    3131             
    3232    wp_redirect($redirect_to); 
     
    171171    else 
    172172        $redirect_to = $_REQUEST['redirect_to']; 
    173     $redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $redirect_to); 
    174173 
    175174    if( $_POST ) { 
     
    238237<p class="submit"> 
    239238    <input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> &raquo;" tabindex="4" /> 
    240     <input type="hidden" name="redirect_to" value="<?php echo $redirect_to; ?>" /> 
     239    <input type="hidden" name="redirect_to" value="<?php echo wp_specialchars($redirect_to); ?>" /> 
    241240</p> 
    242241</form> 
  • branches/2.0/wp-trackback.php

    r3369 r3937  
    5656if (empty($title) && empty($tb_url) && empty($blog_name)) { 
    5757    // If it doesn't look like a trackback at all... 
    58     header('Location: ' . get_permalink($tb_id)); 
     58    wp_redirect(get_permalink($tb_id)); 
    5959    exit; 
    6060}