Moved everything in wp-inst down a directory.

Uses's Ryan Boren's htaccess rules and mods
If you're upgrading, try this on a test server first!


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@591 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 0 insertions, 479 deletions

diff --git a/wp-inst/wp-includes/deprecated.php b/wp-inst/wp-includes/deprecated.php
deleted file mode 100644
index 0794b59..0000000
--- a/wp-inst/wp-includes/deprecated.php
+++ /dev/null
@@ -1,479 +0,0 @@
-<?php

-/*

- * Deprecated functios come here to die.

- */

-

-// Deprecated.  Use get_post().

-function get_postdata($postid) {

-	$post = &get_post($postid);

-

-	$postdata = array (

-		'ID' => $post->ID,

-		'Author_ID' => $post->post_author,

-		'Date' => $post->post_date,

-		'Content' => $post->post_content,

-		'Excerpt' => $post->post_excerpt,

-		'Title' => $post->post_title,

-		'Category' => $post->post_category,

-		'post_status' => $post->post_status,

-		'comment_status' => $post->comment_status,

-		'ping_status' => $post->ping_status,

-		'post_password' => $post->post_password,

-		'to_ping' => $post->to_ping,

-		'pinged' => $post->pinged,

-		'post_type' => $post->post_type,

-		'post_name' => $post->post_name

-	);

-

-	return $postdata;

-}

-

-// Deprecated.  Use the new post loop.

-function start_wp() {

-	global $wp_query, $post;

-

-	// Since the old style loop is being used, advance the query iterator here.

-	$wp_query->next_post();

-

-	setup_postdata($post);

-}

-

-// Deprecated.

-function the_category_ID($echo = true) {

-	// Grab the first cat in the list.

-	$categories = get_the_category();

-	$cat = $categories[0]->cat_ID;

-

-	if ( $echo )

-		echo $cat;

-

-	return $cat;

-}

-

-// Deprecated.

-function the_category_head($before='', $after='') {

-	global $currentcat, $previouscat;

-	// Grab the first cat in the list.

-	$categories = get_the_category();

-	$currentcat = $categories[0]->category_id;

-	if ( $currentcat != $previouscat ) {

-		echo $before;

-		echo get_the_category_by_ID($currentcat);

-		echo $after;

-		$previouscat = $currentcat;

-	}

-}

-

-// Deprecated.	Use previous_post_link().

-function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {

-

-	if ( empty($in_same_cat) || 'no' == $in_same_cat )

-		$in_same_cat = false;

-	else

-		$in_same_cat = true;

-

-	$post = get_previous_post($in_same_cat, $excluded_categories);

-

-	if ( !$post )

-		return;

-

-	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;

-	if ( 'yes' == $title )

-		$string .= apply_filters('the_title', $post->post_title, $post);

-	$string .= '</a>';

-	$format = str_replace('%', $string, $format);

-	echo $format;

-}

-

-// Deprecated.	Use next_post_link().

-function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {

-

-	if ( empty($in_same_cat) || 'no' == $in_same_cat )

-		$in_same_cat = false;

-	else

-		$in_same_cat = true;

-

-	$post = get_next_post($in_same_cat, $excluded_categories);

-

-	if ( !$post	)

-		return;

-

-	$string = '<a href="'.get_permalink($post->ID).'">'.$next;

-	if ( 'yes' == $title )

-		$string .= apply_filters('the_title', $post->post_title, $nextpost);

-	$string .= '</a>';

-	$format = str_replace('%', $string, $format);

-	echo $format;

-}

-

-//

-// These are deprecated.  Use current_user_can().

-//

-

-/* returns true if $user_id can create a new post */

-function user_can_create_post($user_id, $blog_id = 1, $category_id = 'None') {

-	$author_data = get_userdata($user_id);

-	return ($author_data->user_level > 1);

-}

-

-/* returns true if $user_id can create a new post */

-function user_can_create_draft($user_id, $blog_id = 1, $category_id = 'None') {

-	$author_data = get_userdata($user_id);

-	return ($author_data->user_level >= 1);

-}

-

-/* returns true if $user_id can edit $post_id */

-function user_can_edit_post($user_id, $post_id, $blog_id = 1) {

-	$author_data = get_userdata($user_id);

-	$post = get_post($post_id);

-	$post_author_data = get_userdata($post->post_author);

-

-	if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' &&  $author_data->user_level < 2))

-	     || ($author_data->user_level > $post_author_data->user_level)

-	     || ($author_data->user_level >= 10) ) {

-		return true;

-	} else {

-		return false;

-	}

-}

-

-/* returns true if $user_id can delete $post_id */

-function user_can_delete_post($user_id, $post_id, $blog_id = 1) {

-	// right now if one can edit, one can delete

-	return user_can_edit_post($user_id, $post_id, $blog_id);

-}

-

-/* returns true if $user_id can set new posts' dates on $blog_id */

-function user_can_set_post_date($user_id, $blog_id = 1, $category_id = 'None') {

-	$author_data = get_userdata($user_id);

-	return (($author_data->user_level > 4) && user_can_create_post($user_id, $blog_id, $category_id));

-}

-

-/* returns true if $user_id can edit $post_id's date */

-function user_can_edit_post_date($user_id, $post_id, $blog_id = 1) {

-	$author_data = get_userdata($user_id);

-	return (($author_data->user_level > 4) && user_can_edit_post($user_id, $post_id, $blog_id));

-}

-

-/* returns true if $user_id can edit $post_id's comments */

-function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {

-	// right now if one can edit a post, one can edit comments made on it

-	return user_can_edit_post($user_id, $post_id, $blog_id);

-}

-

-/* returns true if $user_id can delete $post_id's comments */

-function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {

-	// right now if one can edit comments, one can delete comments

-	return user_can_edit_post_comments($user_id, $post_id, $blog_id);

-}

-

-function user_can_edit_user($user_id, $other_user) {

-	$user  = get_userdata($user_id);

-	$other = get_userdata($other_user);

-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )

-		return true;

-	else

-		return false;

-}

-

-/** function get_linksbyname()

- ** Gets the links associated with category 'cat_name'.

- ** Parameters:

- **   cat_name (default 'noname')  - The category name to use. If no

- **     match is found uses all

- **   before (default '')  - the html to output before the link

- **   after (default '<br />')  - the html to output after the link

- **   between (default ' ')  - the html to output between the link/image

- **     and it's description. Not used if no image or show_images == true

- **   show_images (default true) - whether to show images (if defined).

- **   orderby (default 'id') - the order to output the links. E.g. 'id', 'name',

- **     'url', 'description' or 'rating'. Or maybe owner. If you start the

- **     name with an underscore the order will be reversed.

- **     You can also specify 'rand' as the order which will return links in a

- **     random order.

- **   show_description (default true) - whether to show the description if

- **     show_images=false/not defined

- **   show_rating (default false) - show rating stars/chars

- **   limit (default -1) - Limit to X entries. If not specified, all entries

- **     are shown.

- **   show_updated (default 0) - whether to show last updated timestamp

- */

-function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />',

-                         $between = " ", $show_images = true, $orderby = 'id',

-                         $show_description = true, $show_rating = false,

-                         $limit = -1, $show_updated = 0) {

-    global $wpdb;

-    $cat_id = -1;

-    $results = $wpdb->get_results("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$cat_name'");

-    if ($results) {

-        foreach ($results as $result) {

-            $cat_id = $result->cat_ID;

-        }

-    }

-    get_links($cat_id, $before, $after, $between, $show_images, $orderby,

-              $show_description, $show_rating, $limit, $show_updated);

-}

-

-/** function wp_get_linksbyname()

- ** Gets the links associated with the named category.

- ** Parameters:

- **   category (no default)  - The category to use.

- **/

-function wp_get_linksbyname($category, $args = '') {

-	global $wpdb;

-

-	$cat_id = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$category' LIMIT 1");

-

-	if (! $cat_id)

-		return;

-

-	$args = add_query_arg('category', $cat_id, $args);

-	wp_get_links($args);

-} // end wp_get_linksbyname

-

-/** function get_linkobjectsbyname()

- ** Gets an array of link objects associated with category 'cat_name'.

- ** Parameters:

- **   cat_name (default 'noname')  - The category name to use. If no

- **     match is found uses all

- **   orderby (default 'id') - the order to output the links. E.g. 'id', 'name',

- **     'url', 'description', or 'rating'. Or maybe owner. If you start the

- **     name with an underscore the order will be reversed.

- **     You can also specify 'rand' as the order which will return links in a

- **     random order.

- **   limit (default -1) - Limit to X entries. If not specified, all entries

- **     are shown.

- **

- ** Use this like:

- ** $links = get_linkobjectsbyname('fred');

- ** foreach ($links as $link) {

- **   echo '<li>'.$link->link_name.'</li>';

- ** }

- **/

-// Deprecate in favor of get_linkz().

-function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {

-    global $wpdb;

-    $cat_id = -1;

-    //$results = $wpdb->get_results("SELECT cat_id FROM $wpdb->linkcategories WHERE cat_name='$cat_name'");

-    // TODO: Fix me.

-    if ($results) {

-        foreach ($results as $result) {

-            $cat_id = $result->cat_id;

-        }

-    }

-    return get_linkobjects($cat_id, $orderby, $limit);

-}

-

-/** function get_linkobjects()

- ** Gets an array of link objects associated with category n.

- ** Parameters:

- **   category (default -1)  - The category to use. If no category supplied

- **      uses all

- **   orderby (default 'id') - the order to output the links. E.g. 'id', 'name',

- **     'url', 'description', or 'rating'. Or maybe owner. If you start the

- **     name with an underscore the order will be reversed.

- **     You can also specify 'rand' as the order which will return links in a

- **     random order.

- **   limit (default -1) - Limit to X entries. If not specified, all entries

- **     are shown.

- **

- ** Use this like:

- ** $links = get_linkobjects(1);

- ** if ($links) {

- **   foreach ($links as $link) {

- **     echo '<li>'.$link->link_name.'<br />'.$link->link_description.'</li>';

- **   }

- ** }

- ** Fields are:

- ** link_id

- ** link_url

- ** link_name

- ** link_image

- ** link_target

- ** link_category

- ** link_description

- ** link_visible

- ** link_owner

- ** link_rating

- ** link_updated

- ** link_rel

- ** link_notes

- **/

-// Deprecate in favor of get_linkz().

-function get_linkobjects($category = -1, $orderby = 'name', $limit = -1) {

-    global $wpdb;

-

-    $sql = "SELECT * FROM $wpdb->links WHERE link_visible = 'Y'";

-    if ($category != -1) {

-        $sql .= " AND link_category = $category ";

-    }

-    if ($orderby == '')

-        $orderby = 'id';

-    if (substr($orderby,0,1) == '_') {

-        $direction = ' DESC';

-        $orderby = substr($orderby,1);

-    }

-    if (strcasecmp('rand',$orderby) == 0) {

-        $orderby = 'rand()';

-    } else {

-        $orderby = " link_" . $orderby;

-    }

-    $sql .= ' ORDER BY ' . $orderby;

-    $sql .= $direction;

-    /* The next 2 lines implement LIMIT TO processing */

-    if ($limit != -1)

-        $sql .= " LIMIT $limit";

-

-    $results = $wpdb->get_results($sql);

-    if ($results) {

-        foreach ($results as $result) {

-            $result->link_url         = $result->link_url;

-            $result->link_name        = $result->link_name;

-            $result->link_description = $result->link_description;

-            $result->link_notes       = $result->link_notes;

-            $newresults[] = $result;

-        }

-    }

-    return $newresults;

-}

-

-/** function get_linksbyname_withrating()

- ** Gets the links associated with category 'cat_name' and display rating stars/chars.

- ** Parameters:

- **   cat_name (default 'noname')  - The category name to use. If no

- **     match is found uses all

- **   before (default '')  - the html to output before the link

- **   after (default '<br />')  - the html to output after the link

- **   between (default ' ')  - the html to output between the link/image

- **     and it's description. Not used if no image or show_images == true

- **   show_images (default true) - whether to show images (if defined).

- **   orderby (default 'id') - the order to output the links. E.g. 'id', 'name',

- **     'url' or 'description'. Or maybe owner. If you start the

- **     name with an underscore the order will be reversed.

- **     You can also specify 'rand' as the order which will return links in a

- **     random order.

- **   show_description (default true) - whether to show the description if

- **     show_images=false/not defined

- **   limit (default -1) - Limit to X entries. If not specified, all entries

- **     are shown.

- **   show_updated (default 0) - whether to show last updated timestamp

- */

-function get_linksbyname_withrating($cat_name = "noname", $before = '',

-                                    $after = '<br />', $between = " ",

-                                    $show_images = true, $orderby = 'id',

-                                    $show_description = true, $limit = -1, $show_updated = 0) {

-

-    get_linksbyname($cat_name, $before, $after, $between, $show_images,

-                    $orderby, $show_description, true, $limit, $show_updated);

-}

-

-/** function get_links_withrating()

- ** Gets the links associated with category n and display rating stars/chars.

- ** Parameters:

- **   category (default -1)  - The category to use. If no category supplied

- **      uses all

- **   before (default '')  - the html to output before the link

- **   after (default '<br />')  - the html to output after the link

- **   between (default ' ')  - the html to output between the link/image

- **     and it's description. Not used if no image or show_images == true

- **   show_images (default true) - whether to show images (if defined).

- **   orderby (default 'id') - the order to output the links. E.g. 'id', 'name',

- **     'url' or 'description'. Or maybe owner. If you start the

- **     name with an underscore the order will be reversed.

- **     You can also specify 'rand' as the order which will return links in a

- **     random order.

- **   show_description (default true) - whether to show the description if

- **    show_images=false/not defined .

- **   limit (default -1) - Limit to X entries. If not specified, all entries

- **     are shown.

- **   show_updated (default 0) - whether to show last updated timestamp

- */

-function get_links_withrating($category = -1, $before = '', $after = '<br />',

-                              $between = " ", $show_images = true,

-                              $orderby = 'id', $show_description = true,

-                              $limit = -1, $show_updated = 0) {

-

-    get_links($category, $before, $after, $between, $show_images, $orderby,

-              $show_description, true, $limit, $show_updated);

-}

-

-/** function get_get_autotoggle()

- ** Gets the auto_toggle setting of category n.

- ** Parameters: id (default 0)  - The category to get. If no category supplied

- **                uses 0

- */

-function get_autotoggle($id = 0) {

-	return 0;  

-}

-

-function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=FALSE, $child_of=0, $categories=0, $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=FALSE) {

-	$query = "optionall=$optionall&all=$all&sort_column=$sort_column&sort_order=$sort_order&list=$list&optiondates=$optiondates&optioncount=$optioncount&hide_empty=$hide_empty&use_desc_for_title=$use_desc_for_title&child_of=$child_of&feed=$feed&feed_image=$feed_image&exclude=$exclude&hierarchical=$hierarchical";

-	return wp_list_cats($query);

-}

-

-function wp_list_cats($args = '') {

-	if ( is_array($args) )

-		$r = &$args;

-	else

-		parse_str($args, $r);

-

-	// Map to new names.

-	if ( isset($r['optionall']) && isset($r['all']))

-		$r['show_option_all'] = $r['all'];

-	if ( isset($r['sort_column']) )

-		$r['orderby'] = $r['sort_column'];

-	if ( isset($r['sort_order']) )

-		$r['order'] = $r['sort_order'];

-	if ( isset($r['optiondates']) )

-		$r['show_last_update'] = $r['optiondates'];

-	if ( isset($r['optioncount']) )

-		$r['show_count'] = $r['optioncount'];

-	if ( !empty($r['list']) )

-		$r['style'] = 'break';

-	$r['title_li'] = '';

-

-	return wp_list_categories($r);	

-}

-

-function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = 'asc',

-		$show_last_update = 0, $show_count = 0, $hide_empty = 1, $optionnone = FALSE,

-		$selected = 0, $exclude = 0) {

-

-	$show_option_all = '';

-	if ( $optionall )

-		$show_option_all = $all;

-

-	$show_option_none = '';

-	if ( $optionnone )

-		$show_option_none = __('None');

-

-	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',

-					'show_last_update', 'show_count', 'hide_empty', 'selected', 'exclude');

-	$query = add_query_arg($vars, '');

-	return wp_dropdown_categories($query);

-}

-

-// Deprecated.  Use wp_print_scripts() or WP_Scripts instead.

-function tinymce_include() {

-	wp_print_script( 'wp_tiny_mce' );

-}

-

-function list_authors($optioncount = false, $exclude_admin = true, $show_fullname = false, $hide_empty = true, $feed = '', $feed_image = '') {

-	$args = compact('optioncount', 'exclude_admin', 'show_fullname', 'hide_empty', 'feed', 'feed_image');

-	return wp_list_authors($args);

-}

-

-function wp_get_post_cats($blogid = '1', $post_ID = 0) {

-	return wp_get_post_categories($post_ID);

-}

-

-function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) {

-	return wp_set_post_categories($post_ID, $post_categories);

-}

-

-function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {

-	$args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');

-	return wp_get_archives($args);

-}

-

-?>