<!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] [1681] trunk:
Re-added stripslashes filter to xprofile edit values and moved syncing function from filters file
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1681</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-08-22 19:21:36 +0000 (Sat, 22 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Re-added stripslashes filter to xprofile edit values and moved syncing function from filters file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofilefiltersphp">trunk/bp-xprofile/bp-xprofile-filters.php</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofilefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-filters.php (1680 => 1681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-filters.php 2009-08-17 14:11:06 UTC (rev 1680)
+++ trunk/bp-xprofile/bp-xprofile-filters.php 2009-08-22 19:21:36 UTC (rev 1681)
</span><span class="lines">@@ -17,9 +17,12 @@
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_value', 'convert_chars' );
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_value', 'wpautop' );
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_value', 'make_clickable' );
</span><ins>+
</ins><span class="cx"> add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_format_field_value', 1, 2 );
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_link_profile_data', 2, 2 );
</span><span class="cx">
</span><ins>+add_filter( 'bp_get_the_profile_field_edit_value', 'stripslashes' );
+
</ins><span class="cx"> /* Custom BuddyPress filters */
</span><span class="cx">
</span><span class="cx"> function xprofile_filter_format_field_value( $field_value, $field_type = '' ) {
</span><span class="lines">@@ -65,31 +68,5 @@
</span><span class="cx"> return $values;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function xprofile_sync_wp_profile() {
- global $bp, $wpdb;
-
- if ( (int)get_site_option( 'bp-disable-profile-sync' ) )
- return true;
-
- $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $bp->loggedin_user->id );
- $space = strpos( $fullname, ' ' );
-
- if ( false === $space ) {
- $firstname = $fullname;
- $lastname = '';
- } else {
- $firstname = substr( $fullname, 0, $space );
- $lastname = trim( substr( $fullname, $space, strlen($fullname) ) );
- }
-
- update_usermeta( $bp->loggedin_user->id, 'nickname', $fullname );
- update_usermeta( $bp->loggedin_user->id, 'first_name', $firstname );
- update_usermeta( $bp->loggedin_user->id, 'last_name', $lastname );
</del><span class="cx">
</span><del>- $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET display_name = %s WHERE ID = %d", $fullname, $bp->loggedin_user->id ) );
- $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET user_url = %s WHERE ID = %d", bp_core_get_user_domain( $bp->loggedin_user->id ), $bp->loggedin_user->id ) );
-}
-add_action( 'xprofile_updated_profile', 'xprofile_sync_wp_profile' );
-
-
</del><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (1680 => 1681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2009-08-17 14:11:06 UTC (rev 1680)
+++ trunk/bp-xprofile.php 2009-08-22 19:21:36 UTC (rev 1681)
</span><span class="lines">@@ -978,11 +978,24 @@
</span><span class="cx"> return stripslashes( stripslashes( $field_value ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * xprofile_avatar_upload_dir()
+ *
+ * Setup the avatar upload directory for a user.
+ *
+ * @package BuddyPress Core
+ * @param $directory The root directory name
+ * @param $user_id The user ID.
+ * @return array() containing the path and URL plus some other settings.
+ */
</ins><span class="cx"> function xprofile_avatar_upload_dir( $directory = false, $user_id = false ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->displayed_user->id;
</span><ins>+
+ if ( !$directory )
+ $directory = 'avatars';
</ins><span class="cx">
</span><span class="cx"> $path = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
</span><span class="cx"> $newdir = path_join( ABSPATH, $path );
</span><span class="lines">@@ -993,14 +1006,47 @@
</span><span class="cx"> if ( !file_exists( $newdir ) )
</span><span class="cx"> @wp_mkdir_p( $newdir );
</span><span class="cx">
</span><del>- $newurl = WP_CONTENT_URL . '/blogs.dir/' . BP_ROOT_BLOG . '/files/avatars/' . $user_id;
</del><ins>+ $newurl = WP_CONTENT_URL . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $directory . '/' . $user_id;
</ins><span class="cx"> $newburl = $newurl;
</span><span class="cx"> $newsubdir = '/avatars/' . $user_id;
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'xprofile_avatar_upload_dir', array( 'path' => $newdir, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * xprofile_sync_wp_profile()
+ *
+ * Syncs Xprofile data to the standard built in WordPress profile data.
+ *
+ * @package BuddyPress Core
+ */
+function xprofile_sync_wp_profile() {
+ global $bp, $wpdb;
+
+ if ( (int)get_site_option( 'bp-disable-profile-sync' ) )
+ return true;
+
+ $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $bp->loggedin_user->id );
+ $space = strpos( $fullname, ' ' );
+
+ if ( false === $space ) {
+ $firstname = $fullname;
+ $lastname = '';
+ } else {
+ $firstname = substr( $fullname, 0, $space );
+ $lastname = trim( substr( $fullname, $space, strlen($fullname) ) );
+ }
+
+ update_usermeta( $bp->loggedin_user->id, 'nickname', $fullname );
+ update_usermeta( $bp->loggedin_user->id, 'first_name', $firstname );
+ update_usermeta( $bp->loggedin_user->id, 'last_name', $lastname );
</ins><span class="cx">
</span><ins>+ $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET display_name = %s WHERE ID = %d", $fullname, $bp->loggedin_user->id ) );
+ $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET user_url = %s WHERE ID = %d", bp_core_get_user_domain( $bp->loggedin_user->id ), $bp->loggedin_user->id ) );
+}
+add_action( 'xprofile_updated_profile', 'xprofile_sync_wp_profile' );
+
+
</ins><span class="cx"> /**
</span><span class="cx"> * xprofile_remove_screen_notifications()
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>