Merge lp:~quam-plures-core/quam-plures/shared_plugin_fields_1 into lp:quam-plures

[EdB]

shared plugin fields step 1

See http://forums.quamplures.net/viewtopic.php?f=9&t=271 for details, but basically this gets rid of the remaining tidbits from the "experimental user fields" including the two tables, gets rid of the never-used bits in a user's profile (aim, yim, so forth), and creates 2 new tables that will (hopefully!) allow plugins to share fields instead of making each blogger enter in the same info twice.

[Yabs (yabs)]

Looks good to me.

Can I leave it to you to merge in as I've had a looooong day digging footings and I'm off for a beer ;)

¥

review: Approve

[EdB (edb)]

Have a shot on my behalf :)

I'll get it merged today (local time day) unless someone else code reviews and finds an issue ... other than it doesn't actually do anything yet.

=== modified file 'htsrv/profile_update.php'
--- htsrv/profile_update.php	2010-01-02 08:34:34 +0000
+++ htsrv/profile_update.php	2010-03-11 16:10:29 +0000
@@ -48,10 +48,6 @@
 param( 'newuser_nickname', 'string', '' );
 param( 'newuser_idmode', 'string', '' );
 param( 'newuser_locale', 'string', $default_locale );
-param( 'newuser_icq', 'string', '' );
-param( 'newuser_aim', 'string', '' );
-param( 'newuser_msn', 'string', '' );
-param( 'newuser_yim', 'string', '' );
 param( 'newuser_url', 'string', '' );
 param( 'newuser_email', 'string', '' );
 param( 'newuser_allow_msgform', 'integer', 0 ); // checkbox
@@ -114,12 +110,8 @@
 $current_User->set( 'firstname', $newuser_firstname );
 $current_User->set( 'lastname', $newuser_lastname );
 $current_User->set( 'nickname', $newuser_nickname );
-$current_User->set( 'icq', $newuser_icq );
 $current_User->set_email( $newuser_email );
 $current_User->set( 'url', $newuser_url );
-$current_User->set( 'aim', $newuser_aim );
-$current_User->set( 'msn', $newuser_msn );
-$current_User->set( 'yim', $newuser_yim );
 $current_User->set( 'idmode', $newuser_idmode );
 $current_User->set( 'locale', $newuser_locale );
 $current_User->set( 'allow_msgform', $newuser_allow_msgform );

=== modified file 'inc/_core/__core.init.php'
--- inc/_core/__core.init.php	2010-03-06 16:19:45 +0000
+++ inc/_core/__core.init.php	2010-03-11 16:10:29 +0000
@@ -64,12 +64,12 @@
 		'T_pluginusersettings'  => $tableprefix.'pluginusersettings',
 		'T_postcats'            => $tableprefix.'postcats',
 		'T_settings'            => $tableprefix.'settings',
-		'T_templates__container'    => $tableprefix.'templates__container',
-		'T_templates__template'         => $tableprefix.'templates__template',
+		'T_templates__container' => $tableprefix.'templates__container',
+		'T_templates__template' => $tableprefix.'templates__template',
 		'T_subscriptions'       => $tableprefix.'subscriptions',
 		'T_users'               => $tableprefix.'users',
-		'T_users__fielddefs'    => $tableprefix.'users__fielddefs',
-		'T_users__fields'       => $tableprefix.'users__fields',
+		'T_plugin_sharedfields' => $tableprefix.'plugin_sharedfields',
+		'T_plugin_sharedvalues' => $tableprefix.'plugin_sharedvalues',
 		'T_usersettings'        => $tableprefix.'usersettings',
 		'T_widget'              => $tableprefix.'widget',
 	);

=== modified file 'inc/_core/model/__core.install.php'
--- inc/_core/model/__core.install.php	2010-01-02 08:34:34 +0000
+++ inc/_core/model/__core.install.php	2010-03-11 16:10:29 +0000
@@ -90,7 +90,6 @@
 			user_firstname varchar(50) NULL,
 			user_lastname varchar(50) NULL,
 			user_nickname varchar(50) NULL,
-			user_icq int(11) unsigned NULL,
 			user_email varchar(255) NOT NULL,
 			user_url varchar(255) NULL,
 			user_ip varchar(15) NULL,
@@ -98,9 +97,6 @@
 			user_browser varchar(200) NULL,
 			dateYMDhour datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
 			user_level int unsigned DEFAULT 0 NOT NULL,
-			user_aim varchar(50) NULL,
-			user_msn varchar(100) NULL,
-			user_yim varchar(50) NULL,
 			user_locale varchar(20) DEFAULT 'en-EU' NOT NULL,
 			user_idmode varchar(20) NOT NULL DEFAULT 'login',
 			user_allow_msgform TINYINT NOT NULL DEFAULT '1',
@@ -108,31 +104,11 @@
 			user_showonline tinyint(1) NOT NULL default 1,
 			user_grp_ID int(4) NOT NULL default 1,
 			user_validated tinyint(1) NOT NULL DEFAULT 0,
-			user_avatar_file_ID int(10) unsigned default NULL,
 			PRIMARY KEY user_ID (user_ID),
 			UNIQUE user_login (user_login),
 			KEY user_grp_ID (user_grp_ID)
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_users__fielddefs' => array(
-		'Creating table for User field definitions',
-		"CREATE TABLE T_users__fielddefs (
-			ufdf_ID int(10) unsigned NOT NULL,
-			ufdf_type char(8) NOT NULL,
-			ufdf_name varchar(255) NOT NULL,
-			PRIMARY KEY (ufdf_ID)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_users__fields' => array(
-		'Creating table for User fields',
-		"CREATE TABLE T_users__fields (
-		  uf_ID      int(10) unsigned NOT NULL auto_increment,
-		  uf_user_ID int(10) unsigned NOT NULL,
-		  uf_ufdf_ID int(10) unsigned NOT NULL,
-		  uf_varchar varchar(255) NOT NULL,
-		  PRIMARY KEY (uf_ID)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
 	'T_templates__template' => array(
 		'Creating table for installed templates',
 		"CREATE TABLE T_templates__template (
@@ -524,6 +500,15 @@
 			INDEX plug_status( plug_status )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
+	'T_pluginevents' => array(
+		'Creating plugin events table',
+		"CREATE TABLE T_pluginevents(
+			pevt_plug_ID INT(11) UNSIGNED NOT NULL,
+			pevt_event VARCHAR(40) NOT NULL,
+			pevt_enabled TINYINT NOT NULL DEFAULT 1,
+			PRIMARY KEY( pevt_plug_ID, pevt_event )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
 	'T_pluginsettings' => array(
 		'Creating plugin settings table',
 		"CREATE TABLE T_pluginsettings (
@@ -533,6 +518,38 @@
 			PRIMARY KEY ( pset_plug_ID, pset_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
+	/**
+	 * This table holds info about fields a plugin might want to access and 
+	 * use.  The only time it gets called is on a plugin's settings page 
+	 * for the various bits that make a plugin field be a plugin field
+	 */
+	'T_plugin_sharedfields' => array(
+		'Creating table for User field definitions',
+		"CREATE TABLE T_plugin_sharedfields (
+			psf_fieldname VARCHAR(16) NOT NULL,
+			psf_label VARCHAR(255) NOT NULL,
+			psf_type VARCHAR(255) NOT NULL, /* probably only 'text', maybe 'checkbox', 'select' is crazy talk! */
+			psf_note VARCHAR(255) NOT NULL,
+			psf_validate VARCHAR(255) NOT NULL, /* make sure a url is a url ... for example */
+			PRIMARY KEY (psf_fieldname)
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	/**
+	 * This table holds user-specific info for any shared plugin field. When on a 
+	 * plugin's settings page it gets accessed to find then store info about a 
+	 * user.  The plugin then stores the fact that some info about the user 
+	 * is stored in this table for the rest of QP to do it's thing with.
+	 */
+	'T_plugin_sharedvalues' => array(
+		'Creating table for User fields',
+		"CREATE TABLE T_plugin_sharedvalues (
+		  psv_ID int(10) unsigned NOT NULL auto_increment,
+		  psv_user_ID int(10) unsigned NOT NULL,
+		  psv_psf_fieldname VARCHAR(32) NOT NULL,
+		  psv_userfieldvalue VARCHAR(255) NOT NULL,
+		  PRIMARY KEY (psv_ID)
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
 	'T_pluginusersettings' => array(
 		'Creating plugin user settings table',
 		"CREATE TABLE T_pluginusersettings (
@@ -543,15 +560,6 @@
 			PRIMARY KEY ( puset_plug_ID, puset_user_ID, puset_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_pluginevents' => array(
-		'Creating plugin events table',
-		"CREATE TABLE T_pluginevents(
-			pevt_plug_ID INT(11) UNSIGNED NOT NULL,
-			pevt_event VARCHAR(40) NOT NULL,
-			pevt_enabled TINYINT NOT NULL DEFAULT 1,
-			PRIMARY KEY( pevt_plug_ID, pevt_event )
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
 	'T_cron__task' => array(
 		'Creating cron tasks table',
 		"CREATE TABLE T_cron__task(

=== modified file 'inc/users/model/_user.class.php'
--- inc/users/model/_user.class.php	2010-02-21 05:04:49 +0000
+++ inc/users/model/_user.class.php	2010-03-11 16:10:29 +0000
@@ -50,78 +50,21 @@
 	var $locale;
 	var $email;
 	var $url;
-	var $icq;
-	var $aim;
-	var $msn;
-	var $yim;
 	var $ip;
 	var $domain;
 	var $browser;
 	var $datecreated;
 	var $level;
-	var $avatar_file_ID;
-
-	/**
-	 * Does the user accept emails through a message form?
-	 * @var boolean
-	 */
 	var $allow_msgform;
 	var $notify;
 	var $showonline;
-
-	/**
-	 * Has the user been validated (by email)?
-	 * @var boolean
-	 */
 	var $validated;
-
-	/**
-	 * Number of posts by this user. Use get_num_posts() to access this (lazy filled).
-	 * @var integer
-	 * @access protected
-	 */
 	var $_num_posts;
-
-	/**
-	 * The ID of the (primary, currently only) group of the user.
-	 * @var integer
-	 */
 	var $group_ID;
-
-	/**
-	 * Reference to group
-	 * @see User::get_Group()
-	 * @var Group
-	 * @access protected
-	 */
 	var $Group;
-
-	/**
-	 * Blog posts statuses permissions
-	 */
 	var $blog_post_statuses = array();
-
-	/**
-	 * Cache for perms.
-	 * @access protected
-	 * @var array
-	 */
 	var $cache_perms = array();
 
-
-	/**
-	 * User fields
-	 */
-	var $userfields = array();
-	var $userfields_by_type = array();
-	var $updated_fields = array();
-	var $new_fields = array();
-
-	/**
-	 * Userfield defs
-	 */
-	var $userfield_defs;
-
 	/**
 	 * Constructor
 	 *
@@ -196,10 +139,6 @@
 			$this->locale = $db_row->user_locale;
 			$this->email = $db_row->user_email;
 			$this->url = $db_row->user_url;
-			$this->icq = $db_row->user_icq;
-			$this->aim = $db_row->user_aim;
-			$this->msn = $db_row->user_msn;
-			$this->yim = $db_row->user_yim;
 			$this->ip = $db_row->user_ip;
 			$this->domain = $db_row->user_domain;
 			$this->browser = $db_row->user_browser;
@@ -209,7 +148,6 @@
 			$this->validated = $db_row->user_validated;
 			$this->notify = $db_row->user_notify;
 			$this->showonline = $db_row->user_showonline;
-			$this->avatar_file_ID = $db_row->user_avatar_file_ID;
 
 			// Group for this user:
 			$this->group_ID = $db_row->user_grp_ID;
@@ -985,15 +923,6 @@
 
 		if( $result = parent::dbinsert() )
 		{ // We could insert the user object..
-
-			// Add new fields:
-			if( !empty($this->new_fields) )
-			{
-				$sql = 'INSERT INTO T_users__fields( uf_user_ID, uf_ufdf_ID, uf_varchar )
-								VALUES ('.$this->ID.', '.implode( '), ('.$this->ID.', ', $this->new_fields ).' )';
-				$DB->query( $sql, 'Insert new fields' );
-			}
-
 			// Notify plugins:
 			// A user could be created also in another DB (to synchronize it with QP)
 			$Plugins->trigger_event( 'AfterUserInsert', $params = array( 'User' => & $this ) );
@@ -1018,33 +947,6 @@
 
 		parent::dbupdate();
 
-		// Update existing fields:
-		if( !empty($this->updated_fields) )
-		{
-			foreach( $this->updated_fields as $uf_ID=>$uf_val )
-			{
-				if( empty( $uf_val ) )
-				{	// Delete field:
-					$DB->query( 'DELETE FROM T_users__fields
-														 WHERE uf_ID = '.$uf_ID );
-				}
-				else
-				{	// Update field:
-					$DB->query( 'UPDATE T_users__fields
-													SET uf_varchar = '.$DB->quote($uf_val).'
-												WHERE uf_ID = '.$uf_ID );
-				}
-			}
-		}
-
-		// Add new fields:
-		if( !empty($this->new_fields) )
-		{
-			$sql = 'INSERT INTO T_users__fields( uf_user_ID, uf_ufdf_ID, uf_varchar )
-							VALUES ('.$this->ID.', '.implode( '), ('.$this->ID.', ', $this->new_fields ).' )';
-			$DB->query( $sql, 'Insert new fields' );
-		}
-
 		// Notify plugins:
 		// Example: An authentication plugin could synchronize/update the password of the user.
 		$Plugins->trigger_event( 'AfterUserUpdate', $params = array( 'User' => & $this ) );
@@ -1227,8 +1129,6 @@
 	}
 
 
-	// Template functions {{{
-
 	/**
 	 * Template function: display user's level
 	 */
@@ -1385,128 +1285,6 @@
 	}
 
 
-	/**
-	 * Template function: display ICQ of the user
-	 */
-	function icq( $format = 'htmlbody' )
-	{
-		$this->disp( 'icq', $format );
-	}
-
-
-	/**
-	 * Template function: display AIM of the user.
-	 *
-	 * NOTE: Replaces spaces with '+' ?!?
-	 */
-	function aim( $format = 'htmlbody' )
-	{
-		echo format_to_output( str_replace(' ', '+', $this->get('aim') ), $format );
-	}
-
-
-	/**
-	 * Template function: display Yahoo IM of the user
-	 */
-	function yim( $format = 'htmlbody' )
-	{
-		$this->disp( 'yim', $format );
-	}
-
-
-	/**
-	 * Template function: display MSN of the user
-	 */
-	function msn( $format = 'htmlbody' )
-	{
-		$this->disp( 'msn', $format );
-	}
-
-	// }}}
-
-
-	/**
-	 * Add a user field
-	 */
-	function userfield_add( $type, $val )
-	{
-		global $DB;
-		$this->new_fields[] = $type.', '.$DB->quote($val);
-	}
-
-
-	/**
-	 * Update an user field. Empty fields will be deleted on dbupdate.
-	 */
-	function userfield_update( $uf_ID, $val )
-	{
-		global $DB;
-		$this->updated_fields[$uf_ID] = $val;
-		// pre_dump( $uf_ID, $val);
-	}
-
-
-	/**
-	 * Load userfields
-	 */
-	function userfields_load()
-	{
-		global $DB;
-
-		$userfields = $DB->get_results( '
-			SELECT uf_ID, uf_ufdf_ID, uf_varchar
-				FROM T_users__fields
-			 WHERE uf_user_ID = '.$this->ID );
-
-		foreach( $userfields as $userfield )
-		{
-			// Save all data for this field:
-			$this->userfields[$userfield->uf_ID] = array( $userfield->uf_ufdf_ID, $userfield->uf_varchar);
-			// Save index
-			$this->userfields_by_type[$userfield->uf_ufdf_ID][] = $userfield->uf_ID;
-		}
-
-		// Also make sure the definitions are loaded
-		$this->userfield_defs_load();
-	}
-
-
-	/**
-	 * Load userfields defs
-	 */
-	function userfield_defs_load()
-	{
-		global $DB;
-
-		if( !isset($this->userfield_defs) )
-		{
-			$userfield_defs = $DB->get_results( '
-				SELECT ufdf_ID, ufdf_type, ufdf_name
-					FROM T_users__fielddefs' );
-
-			foreach( $userfield_defs as $userfield_def )
-			{
-				$this->userfield_defs[$userfield_def->ufdf_ID] = array( $userfield_def->ufdf_type, $userfield_def->ufdf_name );
-			}
-		}
-	}
-
-	/**
-	* Get first field for a specific type
-	*
-	* @return string or NULL
-	*/
-	function userfieldget_first_for_type( $type_ID )
-	{
-		if( !isset($this->userfields_by_type[$type_ID]) )
-		{
-			return NULL;
-		}
-
-		$idx = $this->userfields_by_type[$type_ID][0];
-
-		return $this->userfields[$idx][1];
-	}
 }
 
 ?>

=== modified file 'inc/users/users.ctrl.php'
--- inc/users/users.ctrl.php	2010-02-22 14:41:25 +0000
+++ inc/users/users.ctrl.php	2010-03-11 16:10:29 +0000
@@ -287,15 +287,6 @@
 			param( 'edited_user_url', 'string', true );
 			param_check_url( 'edited_user_url', 'commenting' );
 
-			param( 'edited_user_icq', 'string', true );
-			param_check_number( 'edited_user_icq', T_('The ICQ UIN can only be a number, no letters allowed.') );
-
-			param( 'edited_user_aim', 'string', true );
-
-			param( 'edited_user_msn', 'string', true );
-			param_check_email( 'edited_user_msn', false );
-
-			param( 'edited_user_yim', 'string', true );
 			param( 'edited_user_allow_msgform', 'integer', 0 );
 			param( 'edited_user_notify', 'integer', 0 );
 			param( 'edited_user_showonline', 'integer', 0 );
@@ -320,10 +311,6 @@
 			}
 			$edited_User->set( 'email', $edited_user_email );
 			$edited_User->set( 'url', $edited_user_url );
-			$edited_User->set( 'icq', $edited_user_icq );
-			$edited_User->set( 'aim', $edited_user_aim );
-			$edited_User->set( 'msn', $edited_user_msn );
-			$edited_User->set( 'yim', $edited_user_yim );
 			$edited_User->set( 'allow_msgform', $edited_user_allow_msgform );
 			$edited_User->set( 'notify', $edited_user_notify );
 			$edited_User->set( 'showonline', $edited_user_showonline );
@@ -337,49 +324,11 @@
 			param( 'edited_user_focusonfirst', 'integer', 0 );
 			param( 'edited_user_results_per_page', 'integer', null );
 
-
-			// EXPERIMENTAL user fields:
-
-			// EXISTING fields:
-			// Get indices of existing userfields:
-			$userfield_IDs = $DB->get_col( '
-						SELECT uf_ID
-							FROM T_users__fields
-						 WHERE uf_user_ID = '.$edited_User->ID );
-			foreach( $userfield_IDs as $userfield_ID )
-			{
-				$uf_val = param( 'uf_'.$userfield_ID, 'string', '' );
-
-				// TODO: type checking
-
-				$edited_User->userfield_update( $userfield_ID, $uf_val );
-			}
-
-			// NEW fields:
-			for( $i=1; $i<=3; $i++ )
-			{	// new fields:
-				$new_uf_type = param( 'new_uf_type_'.$i, 'integer', '' );
-				$new_uf_val = param( 'new_uf_val_'.$i, 'string', '' );
-				if( empty($new_uf_type) && empty($new_uf_val) )
-				{
-					continue;
-				}
-
-				if( empty($new_uf_type) )
-				{
-					param_error( 'new_uf_val_'.$i, T_('Please select a field type.') );
-				}
-				if( empty($new_uf_val) )
-				{
-					param_error( 'new_uf_val_'.$i, T_('Please enter a value.') );
-				}
-
-				// echo $new_uf_type.':'.$new_uf_val;
-
-				// TODO: type checking
-
-				$edited_User->userfield_add( $new_uf_type, $new_uf_val );
-			}
+			/**
+			 * @todo EdB: probably don't need the messages->count(error) bit
+			 * but it doesn't hurt and can be removed later by someone smart.
+			 * A bunch of "experimental user field" stuff used to be here ...
+			 */
 
 			if( $Messages->count( 'error' ) )
 			{	// We have found validation errors:

=== modified file 'inc/users/views/_user.form.php'
--- inc/users/views/_user.form.php	2010-02-27 17:48:16 +0000
+++ inc/users/views/_user.form.php	2010-03-11 16:10:29 +0000
@@ -335,36 +335,13 @@
 	else
 		$url_fieldnote = '';
 
-	if( $edited_User->get('icq') != 0 )
-		$icq_fieldnote = '<a href="http://wwp.icq.com/scripts/search.dll?to='.$edited_User->get('icq').'" target="_blank">'.get_icon( 'play', 'imgtag', array('title'=>T_('Search on ICQ.com')) ).'</a>';
-	else
-		$icq_fieldnote = '';
-
-	if( $edited_User->get('aim') != '' )
-		$aim_fieldnote = '<a href="aim:goim?screenname='.$edited_User->get('aim').'&amp;message=Hello">'.get_icon( 'play', 'imgtag', array('title'=>T_('Instant Message to user')) ).'</a>';
-	else
-		$aim_fieldnote = '';
-
-
   if( $action != 'view_user' )
 	{ // We can edit the values:
-
 		$Form->text_input( 'edited_user_url', $edited_User->url, 30, T_('URL'), $url_fieldnote, array( 'maxlength' => 100 ) );
-		$Form->text_input( 'edited_user_icq', $edited_User->icq, 30, T_('ICQ'), $icq_fieldnote, array( 'maxlength' => 10 ) );
-		$Form->text_input( 'edited_user_aim', $edited_User->aim, 30, T_('AIM'), $aim_fieldnote, array( 'maxlength' => 50 ) );
-		$Form->text_input( 'edited_user_msn', $edited_User->msn, 30, T_('MSN IM'), '', array( 'maxlength' => 100 ) );
-		$Form->text_input( 'edited_user_yim', $edited_User->yim, 30, T_('YahooIM'), '', array( 'maxlength' => 50 ) );
-
 	}
 	else
 	{ // display only
-
 		$Form->info( T_('URL'), $edited_User->get('url'), $url_fieldnote );
-		$Form->info( T_('ICQ'), $edited_User->get('icq', 'formvalue'), $icq_fieldnote );
-		$Form->info( T_('AIM'), $edited_User->get('aim'), $aim_fieldnote );
-		$Form->info( T_('MSN IM'), $edited_User->get('msn') );
-		$Form->info( T_('YahooIM'), $edited_User->get('yim') );
-
   }
 
 $Form->end_fieldset();

=== modified file 'install/_functions_create.php'
--- install/_functions_create.php	2010-02-22 14:41:25 +0000
+++ install/_functions_create.php	2010-03-11 16:10:29 +0000
@@ -141,36 +141,36 @@
 	echo "OK.<br />\n";
 
 	echo 'Creating user field definitions... ';
-	// fp> Anyone, please add anything you can think of. It's better to start with a large list that update it progressively.
 	$DB->query( "
-    INSERT INTO T_users__fielddefs (ufdf_ID, ufdf_type, ufdf_name)
-		 VALUES ( 10000, 'email',    'MSN/Live IM'),
-						( 10100, 'word',     'Yahoo IM'),
-						( 10200, 'word',     'AOL AIM'),
-						( 10300, 'number',   'ICQ ID'),
-						( 40000, 'phone',    'Skype'),
-						( 50000, 'phone',    'Main phone'),
-						( 50100, 'phone',    'Cell phone'),
-						( 50200, 'phone',    'Office phone'),
-						( 50300, 'phone',    'Home phone'),
-						( 60000, 'phone',    'Office FAX'),
-						( 60100, 'phone',    'Home FAX'),
-						(100000, 'url',      'Website'),
-						(100100, 'url',      'Blog'),
-						(110000, 'url',      'Linkedin'),
-						(120000, 'url',      'Twitter'),
-						(130100, 'url',      'Facebook'),
-						(130200, 'url',      'Myspace'),
-						(140000, 'url',      'Flickr'),
-						(150000, 'url',      'YouTube'),
-						(160000, 'url',      'Digg'),
-						(160100, 'url',      'StumbleUpon'),
-						(200000, 'text',     'Role'),
-						(200100, 'text',     'Organization'),
-						(200200, 'text',     'Division'),
-						(211000, 'text',     'VAT ID'),
-						(300000, 'text',     'Main address'),
-						(300300, 'text',     'Home address');" );
+		INSERT INTO T_plugin_sharedfields (psf_fieldname, psf_label, psf_type, psf_note, psf_validate)
+		 VALUES ( 'address_1', 'Address 1', 'text', 'note', 'none' ),
+						( 'address_2', 'Address 2', 'text', 'note', 'none' ),
+						( 'city', 'City',  'text', 'note', 'none' ),
+						( 'county', 'County', 'text', 'note', 'none' ),
+						( 'state', 'State', 'text', 'note', 'none' ),
+						( 'province', 'Province', 'text', 'note', 'none' ),
+						( 'postal_code', 'Postal Code', 'text', 'note', 'none' ),
+						( 'nation', 'Nation', 'text', 'note', 'none' ),
+						( 'home_phone', 'Home Phone', 'text', 'note', 'phone' ),
+						( 'cell_phone', 'Cell Phone', 'text', 'note', 'phone' ),
+						( 'home_fax', 'Home FAX', 'text', 'note', 'phone' ),
+						( 'birthday', 'Birthday', 'text', 'note', 'none' ),
+						( 'gender', 'Gender', 'text', 'note', 'none' ),
+						( 'avatar_ID', 'Avatar File #', 'text', 'note', 'number' ),
+						( 'digg_url', 'Digg',  'text', 'note', 'url' ),
+						( 'facebook', 'Facebook', 'text', 'note', 'url' ),
+						( 'flickr', 'Flickr', 'text', 'note', 'url' ),
+						( 'linkdin', 'LinkedIn', 'text', 'note', 'url' ),
+						( 'myspace', 'Myspace', 'text', 'note', 'url' ),
+						( 'stumble', 'StumbleUpon', 'text', 'note', 'url' ),
+						( 'twitter', 'Twitter', 'text', 'note', 'url' ),
+						( 'youtube', 'YouTube', 'text', 'note', 'url' ),
+						( 'aol_aim', 'AOL AIM', 'text', 'note', 'none' ),
+						( 'icq_id', 'ICQ ID', 'text', 'note', 'none' ),
+						( 'jabber', 'Jabber', 'text', 'note', 'none' ),
+						( 'msn_im', 'MSN IM', 'text', 'note', 'none' ),
+						( 'skype', 'Skype ID', 'text', 'note', 'none' ),
+						( 'yahoo_im', 'Yahoo IM', 'text', 'note', 'none' );" );
 	echo "OK.<br />\n";
 
 

=== modified file 'install/_functions_evoupgrade.php'
--- install/_functions_evoupgrade.php	2010-02-19 10:50:37 +0000
+++ install/_functions_evoupgrade.php	2010-03-11 16:10:29 +0000
@@ -400,59 +400,69 @@
 						 ( 1600, 'Intro-All' ) " );
 		task_end();
 
-		task_begin( 'Updating User table' );
-		$DB->query( "ALTER TABLE T_users
-									ADD COLUMN user_avatar_file_ID int(10) unsigned default NULL AFTER user_validated" );
-		task_end();
-
 		task_begin( 'Creating table for User field definitions' );
-		$DB->query( "CREATE TABLE T_users__fielddefs (
-				ufdf_ID int(10) unsigned NOT NULL,
-				ufdf_type char(8) NOT NULL,
-				ufdf_name varchar(255) collate latin1_general_ci NOT NULL,
-				PRIMARY KEY  (ufdf_ID)
+		$DB->query( "CREATE TABLE T_plugin_sharedfields (
+				psf_ID int(10) unsigned NOT NULL,
+				psf_type char(8) NOT NULL,
+				psf_name varchar(255) collate latin1_general_ci NOT NULL,
+				PRIMARY KEY  (psf_ID)
 			)" );
 		task_end();
 
+
+
+	'T_plugin_sharedfields' => array(
+		'Creating table for User field definitions',
+		"CREATE TABLE T_plugin_sharedfields (
+			psf_fieldname VARCHAR(32) NOT NULL,
+			psf_label VARCHAR(255) NOT NULL,
+			psf_type VARCHAR(255) NOT NULL, // probably only 'text', maybe 'checkbox', 'select' is crazy talk!
+			psf_validate VARCHAR(255) NOT NULL, // might be needed for some fields, but probably not
+			psf_note VARCHAR(255) NOT NULL,
+			PRIMARY KEY (psf_fieldname)
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+
 		task_begin( 'Creating default field definitions...' );
 		$DB->query( "
-	    INSERT INTO T_users__fielddefs (ufdf_ID, ufdf_type, ufdf_name)
-			 VALUES ( 10000, 'email',    'MSN/Live IM'),
-							( 10100, 'word',     'Yahoo IM'),
-							( 10200, 'word',     'AOL AIM'),
-							( 10300, 'number',   'ICQ ID'),
-							( 40000, 'phone',    'Skype'),
-							( 50000, 'phone',    'Main phone'),
-							( 50100, 'phone',    'Cell phone'),
-							( 50200, 'phone',    'Office phone'),
-							( 50300, 'phone',    'Home phone'),
-							( 60000, 'phone',    'Office FAX'),
-							( 60100, 'phone',    'Home FAX'),
-							(100000, 'url',      'Website'),
-							(100100, 'url',      'Blog'),
-							(110000, 'url',      'Linkedin'),
-							(120000, 'url',      'Twitter'),
-							(130100, 'url',      'Facebook'),
-							(130200, 'url',      'Myspace'),
-							(140000, 'url',      'Flickr'),
-							(150000, 'url',      'YouTube'),
-							(160000, 'url',      'Digg'),
-							(160100, 'url',      'StumbleUpon'),
-							(200000, 'text',     'Role'),
-							(200100, 'text',     'Company/Org.'),
-							(200200, 'text',     'Division'),
-							(211000, 'text',     'VAT ID'),
-							(300000, 'text',     'Main address'),
-							(300300, 'text',     'Home address');" );
+			INSERT INTO T_plugin_sharedfields (psf_fieldname, psf_label, psf_type, psf_note, psf_validate)
+			 VALUES ( 'address_1', 'Address 1', 'text', '', 'none' ),
+							( 'address_2', 'Address 2', 'text', '', 'none' ),
+							( 'city', 'City', 'text', '', 'none' ),
+							( 'county', 'County', 'text', '', 'none' ),
+							( 'state', 'State', 'text', '', 'none' ),
+							( 'province', 'Province', 'text', '', 'none' ),
+							( 'postal_code', 'Postal Code', 'text', '', 'none' ),
+							( 'nation', 'Nation', 'text', '', 'none' ),
+							( 'home_phone', 'Home Phone', 'text', '', 'phone' ),
+							( 'cell_phone', 'Cell Phone', 'text', '', 'phone' ),
+							( 'home_fax', 'Home FAX', 'text', '', 'phone' ),
+							( 'birthday', 'Birthday', 'text', '', 'none' ),
+							( 'gender', 'Gender', 'text', '', 'none' ),
+							( 'avatar_ID', 'Avatar File #', 'text', '', 'number' ),
+							( 'digg_url', 'Digg', 'text', '', 'url' ),
+							( 'facebook', 'Facebook', 'text', '', 'url' ),
+							( 'flickr', 'Flickr', 'text', '', 'url' ),
+							( 'linkdin', 'LinkedIn', 'text', '', 'url' ),
+							( 'myspace', 'Myspace', 'text', '', 'url' ),
+							( 'stumble', 'StumbleUpon', 'text', '', 'url' ),
+							( 'twitter', 'Twitter', 'text', '', 'url' ),
+							( 'youtube', 'YouTube', 'text', '', 'url' ),
+							( 'aol_aim', 'AOL AIM', 'text', '', 'none' ),
+							( 'icq_id', 'ICQ ID', 'text', '', 'none' ),
+							( 'jabber', 'Jabber', 'text', '', 'none' ),
+							( 'msn_im', 'MSN IM', 'text', '', 'none' ),
+							( 'skype', 'Skype ID', 'text', '', 'none' ),
+							( 'yahoo_im', 'Yahoo IM', 'text', '', 'none' );" );
 		task_end();
 
 		task_begin( 'Creating table for User fields...' );
-		$DB->query( "CREATE TABLE T_users__fields (
-				uf_ID      int(10) unsigned NOT NULL auto_increment,
-			  uf_user_ID int(10) unsigned NOT NULL,
-			  uf_ufdf_ID int(10) unsigned NOT NULL,
-			  uf_varchar varchar(255) NOT NULL,
-			  PRIMARY KEY (uf_ID)
+		$DB->query( "CREATE TABLE T_plugin_sharedvalues (
+			  psv_ID int(10) unsigned NOT NULL auto_increment,
+			  psv_user_ID int(10) unsigned NOT NULL,
+			  psv_psf_fieldname VARCHAR(32) NOT NULL,
+			  psv_userfieldvalue VARCHAR(255) NOT NULL,
+			  PRIMARY KEY (psv_ID)
 			)" );
 		task_end();
 
@@ -571,7 +581,7 @@
 		$DB->save_error_state();
 		$DB->halt_on_error = false;
 		$DB->show_errors = false;
-		$DB->query( "ALTER TABLE {$tableprefix}users_fields RENAME TO T_users__fields" );
+		$DB->query( "ALTER TABLE {$tableprefix}users_fields RENAME TO T_plugin_sharedvalues" );
 		$DB->restore_error_state();
 		echo "OK.<br />\n";
 

=== modified file 'templates/_profile.disp.php'
--- templates/_profile.disp.php	2010-02-22 14:41:25 +0000
+++ templates/_profile.disp.php	2010-03-11 16:10:29 +0000
@@ -77,10 +77,6 @@
 $ProfileForm->info( T_('Level'), $current_User->get('level') );
 $ProfileForm->info( T_('Posts'), $current_User->get('num_posts') );
 $ProfileForm->text_input( 'newuser_url', $current_User->get( 'url' ), 40, T_('URL'), '', array( 'maxlength' => 100, 'class' => 'bComment' ) );
-$ProfileForm->text_input( 'newuser_icq', $current_User->get( 'icq' ), 40, T_('ICQ'), '', array( 'maxlength' => 10, 'class' => 'bComment' ) );
-$ProfileForm->text_input( 'newuser_aim', $current_User->get( 'aim' ), 40, T_('AOL I.M.'), '', array( 'maxlength' => 50, 'class' => 'bComment' ) );
-$ProfileForm->text_input( 'newuser_msn', $current_User->get( 'msn' ), 40, T_('MSN I.M.'), '', array( 'maxlength' => 100, 'class' => 'bComment' ) );
-$ProfileForm->text_input( 'newuser_yim', $current_User->get( 'yim' ), 40, T_('Yahoo I.M.'), '', array( 'maxlength' => 50, 'class' => 'bComment' ) );
 $ProfileForm->end_fieldset();
 
 $ProfileForm->buttons( array( 

=== modified file 'templates/_user.disp.php'
--- templates/_user.disp.php	2010-02-22 14:41:25 +0000
+++ templates/_user.disp.php	2010-03-11 16:10:29 +0000
@@ -57,18 +57,6 @@
 }
 $ProfileForm->end_fieldset();
 
-$ProfileForm->begin_fieldset( T_('Additional info') );
-// Load the user fields:
-$User->userfields_load();
-/**
- * @todo (legacy): fp> have some clean iteration support
- */
-foreach( $User->userfields as $uf_ID=>$uf_array )
-{
-	$ProfileForm->info( $User->userfield_defs[$uf_array[0]][1], $uf_array[1] );
-}
-$ProfileForm->end_fieldset();
-
 $ProfileForm->begin_fieldset( T_('Miscellaneous') );
 $ProfileForm->info( T_('Locale'), $User->get( 'locale' ) );
 $ProfileForm->info( T_('Level'), $User->get('level') );