<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2178] trunk: Removing root bp-wire.php and bp-status.
php as they were not removed correctly in r2168</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2178</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-12-15 12:44:02 +0000 (Tue, 15 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removing root bp-wire.php and bp-status.php as they were not removed correctly in r2168</pre>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkbpstatusphp">trunk/bp-status.php</a></li>
<li><a href="#trunkbpwirephp">trunk/bp-wire.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpstatusphp"></a>
<div class="delfile"><h4>Deleted: trunk/bp-status.php (2177 => 2178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-status.php 2009-12-15 08:24:11 UTC (rev 2177)
+++ trunk/bp-status.php 2009-12-15 12:44:02 UTC (rev 2178)
</span><span class="lines">@@ -1,169 +0,0 @@
</span><del>-<?php
-if ( !defined( 'BP_STATUS_SLUG' ) )
- define ( 'BP_STATUS_SLUG', 'status' );
-
-require ( BP_PLUGIN_DIR . '/bp-status/bp-status-templatetags.php' );
-require ( BP_PLUGIN_DIR . '/bp-status/bp-status-filters.php' );
-
-function bp_status_setup_globals() {
- global $bp, $wpdb;
-
- /* For internal identification */
- $bp->status->id = 'status';
- $bp->status->slug = BP_STATUS_SLUG;
-
- /* Register this in the active components array */
- $bp->active_components[$bp->status->slug] = $bp->status->id;
-
- do_action( 'bp_status_setup_globals' );
-}
-add_action( 'plugins_loaded', 'bp_status_setup_globals', 5 );
-add_action( 'admin_menu', 'bp_status_setup_globals', 2 );
-
-
-/********************************************************************************
- * Activity & Notification Functions
- *
- * These functions handle the recording, deleting and formatting of activity and
- * notifications for the user and for this specific component.
- */
-
-function bp_status_register_activity_actions() {
- global $bp;
-
- if ( !function_exists( 'bp_activity_set_action' ) )
- return false;
-
- /* Register the activity stream actions for this component */
- bp_activity_set_action( $bp->status->id, 'new_status', __( 'New status update', 'buddypress' ) );
-
- do_action( 'bp_status_register_activity_actions' );
-}
-add_action( 'plugins_loaded', 'bp_status_register_activity_actions' );
-
-function bp_status_record_activity( $user_id, $content, $primary_link, $component_action = 'new_status' ) {
- global $bp;
-
- if ( !function_exists( 'bp_activity_add' ) )
- return false;
-
- return bp_activity_add( array(
- 'user_id' => $user_id,
- 'content' => $content,
- 'primary_link' => $primary_link,
- 'component_name' => $bp->status->id,
- 'component_action' => $component_action
- ) );
-}
-
-function bp_status_delete_activity( $user_id, $content ) {
- if ( !function_exists( 'bp_activity_delete_by_content' ) )
- return false;
-
- return bp_activity_delete_by_content( $user_id, $content, 'status', 'new_status' );
-}
-
-function bp_status_register_activity_action( $key, $value ) {
- global $bp;
-
- if ( !function_exists( 'bp_activity_set_action' ) )
- return false;
-
- return apply_filters( 'bp_status_register_activity_action', bp_activity_set_action( $bp->status->id, $key, $value ), $key, $value );
-}
-
-
-/********************************************************************************
- * Action Functions
- *
- * Action functions are exactly the same as screen functions, however they do not
- * have a template screen associated with them. Usually they will send the user
- * back to the default screen after execution.
- */
-
-function bp_status_action_add() {
- global $bp;
-
- if ( $bp->current_component != BP_STATUS_SLUG || 'add' != $bp->current_action )
- return false;
-
- if ( !check_admin_referer( 'bp_status_add_status', '_wpnonce_add_status' ) )
- return false;
-
- if ( bp_status_add_status( $bp->loggedin_user->id, $_POST['status-update-input'] ) )
- bp_core_add_message( __( 'Your status was updated successfully!', 'buddypress' ) );
- else
- bp_core_add_message( __( 'There was a problem updating your status. Please try again.', 'buddypress' ), 'error' );
-
- bp_core_redirect( $bp->loggedin_user->domain );
-}
-add_action( 'init', 'bp_status_action_add' );
-
-
-/********************************************************************************
- * Business Functions
- *
- * Business functions are where all the magic happens in BuddyPress. They will
- * handle the actual saving or manipulation of information. Usually they will
- * hand off to a database class for data access, then return
- * true or false on success or failure.
- */
-
-function bp_status_add_status( $user_id, $content, $recorded_time = false ) {
- global $bp;
-
- $content = apply_filters( 'bp_status_content_before_save', $content );
-
- if ( !$recorded_time )
- $recorded_time = time();
-
- if ( !$content || empty($content) )
- return false;
-
- bp_status_clear_existing_activity( $user_id );
-
- /* Store the status in usermeta for easy access. */
- update_usermeta( $user_id, 'bp_status', array( 'content' => $content, 'recorded_time' => $recorded_time ) );
-
- /* Recored in activity streams */
- $user_link = bp_core_get_userlink( $user_id );
- $activity_content = sprintf( __( '%s posted a new status update:', 'buddypress' ), $user_link );
- $activity_content .= "<blockquote>$content</blockquote>";
-
- bp_status_record_activity( $user_id, apply_filters( 'bp_status_activity_new', $activity_content, $content, $user_link ), apply_filters( 'bp_status_activity_new_primary_link', $user_link, $user_id ) );
-
- do_action( 'bp_status_add_status', $user_id, $content );
-
- return true;
-}
-
-function bp_status_clear_status( $user_id = false ) {
- global $bp;
-
- if ( !$user_id )
- $user_id = $bp->loggedin_user->id;
-
- bp_status_clear_existing_activity( $user_id );
-
- return delete_usermeta( $user_id, 'bp_status' );
-}
-
-function bp_status_clear_existing_activity( $user_id ) {
- /* Fetch existing status update if there is one. */
- $existing_status = get_usermeta( $user_id, 'bp_status' );
-
- if ( '' != $existing_status ) {
- if ( strtotime( '+5 minutes', $existing_status['recorded_time'] ) >= time() ) {
- /***
- * The last status was updated less than 5 minutes ago, so lets delete the activity stream item for that
- * status update, to prevent flooding and allow users to change their mind about recording a status.
- */
- $activity_content = sprintf( __( '%s posted a new status update:', 'buddypress' ), bp_core_get_userlink( $user_id ) );
- $activity_content .= "<blockquote>{$existing_status['content']}</blockquote>";
-
- bp_status_delete_activity( $user_id, $activity_content );
- }
- }
-}
-
-?>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpwirephp"></a>
<div class="delfile"><h4>Deleted: trunk/bp-wire.php (2177 => 2178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-wire.php 2009-12-15 08:24:11 UTC (rev 2177)
+++ trunk/bp-wire.php 2009-12-15 12:44:02 UTC (rev 2178)
</span><span class="lines">@@ -1,141 +0,0 @@
</span><del>-<?php
-
-/* Define the slug for the component */
-if ( !defined( 'BP_WIRE_SLUG' ) )
- define ( 'BP_WIRE_SLUG', 'wire' );
-
-require ( BP_PLUGIN_DIR . '/bp-wire/bp-wire-classes.php' );
-require ( BP_PLUGIN_DIR . '/bp-wire/bp-wire-templatetags.php' );
-require ( BP_PLUGIN_DIR . '/bp-wire/bp-wire-filters.php' );
-
-/* Include deprecated functions if settings allow */
-if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
- require ( BP_PLUGIN_DIR . '/bp-wire/deprecated/bp-wire-deprecated.php' );
-
-function bp_wire_install() {
- // Tables are installed on a per component basis, where needed.
-}
-
-function bp_wire_setup_globals() {
- global $bp, $wpdb;
-
- /* For internal identification */
- $bp->wire->id = 'wire';
-
- $bp->wire->slug = BP_WIRE_SLUG;
-
- /* Register this in the active components array */
- $bp->active_components[$bp->wire->slug] = $bp->wire->id;
-
- do_action( 'bp_wire_setup_globals' );
-}
-add_action( 'plugins_loaded', 'bp_wire_setup_globals', 5 );
-add_action( 'admin_menu', 'bp_wire_setup_globals', 2 );
-
-function bp_wire_setup_nav() {
- global $bp;
-
- /* Profile wire's will only work if xprofile is enabled */
- if ( !function_exists( 'xprofile_install' ) )
- return false;
-
- /* Add 'Wire' to the main navigation */
- bp_core_new_nav_item( array( 'name' => __('Wire', 'buddypress'), 'slug' => $bp->wire->slug, 'position' => 40, 'screen_function' => 'bp_wire_screen_latest', 'default_subnav_slug' => 'all-posts', 'item_css_id' => $bp->wire->id ) );
-
- $wire_link = $bp->loggedin_user->domain . $bp->wire->slug . '/';
-
- /* Add the subnav items to the wire nav */
- bp_core_new_subnav_item( array( 'name' => __( 'All Posts', 'buddypress' ), 'slug' => 'all-posts', 'parent_url' => $wire_link, 'parent_slug' => $bp->wire->slug, 'screen_function' => 'bp_wire_screen_latest', 'position' => 10 ) );
-
- if ( $bp->current_component == $bp->wire->slug ) {
- if ( bp_is_home() ) {
- $bp->bp_options_title = __('My Wire', 'buddypress');
- } else {
- $bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
- $bp->bp_options_title = $bp->displayed_user->fullname;
- }
- }
-
- do_action( 'bp_wire_setup_nav' );
-}
-add_action( 'plugins_loaded', 'bp_wire_setup_nav' );
-add_action( 'admin_menu', 'bp_wire_setup_nav' );
-
-
-/********************************************************************************
- * Screen Functions
- *
- * Screen functions are the controllers of BuddyPress. They will execute when their
- * specific URL is caught. They will first save or manipulate data using business
- * functions, then pass on the user to a template file.
- */
-
-function bp_wire_screen_latest() {
- do_action( 'bp_wire_screen_latest' );
- bp_core_load_template( apply_filters( 'bp_wire_template_latest', 'wire/latest' ) );
-}
-
-
-/********************************************************************************
- * Business Functions
- *
- * Business functions are where all the magic happens in BuddyPress. They will
- * handle the actual saving or manipulation of information. Usually they will
- * hand off to a database class for data access, then return
- * true or false on success or failure.
- */
-
-function bp_wire_new_post( $item_id, $message, $component_name, $deprecated = false, $table_name = null ) {
- global $bp;
-
- if ( empty($message) || !is_user_logged_in() )
- return false;
-
- if ( !$table_name )
- $table_name = $bp->{$component_name}->table_name_wire;
-
- $wire_post = new BP_Wire_Post( $table_name );
- $wire_post->item_id = $item_id;
- $wire_post->user_id = $bp->loggedin_user->id;
- $wire_post->date_posted = time();
- $wire_post->content = $message;
-
- if ( !$wire_post->save() )
- return false;
-
- do_action( 'bp_wire_post_posted', $wire_post->id, $wire_post->item_id, $wire_post->user_id );
-
- return $wire_post;
-}
-
-function bp_wire_delete_post( $wire_post_id, $component_name, $table_name = null ) {
- global $bp;
-
- if ( !is_user_logged_in() )
- return false;
-
- if ( !$table_name )
- $table_name = $bp->{$component_name}->table_name_wire;
-
- $wire_post = new BP_Wire_Post( $table_name, $wire_post_id );
-
- if ( !is_site_admin() ) {
- if ( !$bp->is_item_admin ) {
- if ( $wire_post->user_id != $bp->loggedin_user->id )
- return false;
- }
- }
-
- if ( !$wire_post->delete() )
- return false;
-
- do_action( 'bp_wire_post_deleted', $wire_post->id, $wire_post->item_id, $wire_post->user_id, $component_name );
-
- return true;
-}
-
-// List actions to clear super cached pages on, if super cache is installed
-add_action( 'bp_wire_post_deleted', 'bp_core_clear_cache' );
-add_action( 'bp_wire_post_posted', 'bp_core_clear_cache' );
-
-?>
</del><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>