http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90547
Revision: 90547 Author: zhenya Date: 2011-06-21 20:45:57 +0000 (Tue, 21 Jun 2011) Log Message: ----------- some mistakes are removed Modified Paths: -------------- trunk/extensions/SocialProfile/SocialProfile.php trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php trunk/extensions/SocialProfile/UserStatus/UserStatus.js trunk/extensions/SocialProfile/UserStatus/UserStatusClass.php trunk/extensions/SocialProfile/UserStatus/UserStatus_AjaxFunctions.php trunk/extensions/SocialProfile/UserStatus/userstatus.sql Modified: trunk/extensions/SocialProfile/SocialProfile.php =================================================================== --- trunk/extensions/SocialProfile/SocialProfile.php 2011-06-21 20:39:02 UTC (rev 90546) +++ trunk/extensions/SocialProfile/SocialProfile.php 2011-06-21 20:45:57 UTC (rev 90547) @@ -93,6 +93,9 @@ // Whether to enable friending or not -- this doesn't do very much actually, so don't rely on it $wgFriendingEnabled = true; +// Should we enable UserStatus feature (currently is under development) +$wgEnableUserStatus = false; + // Extension credits that show up on Special:Version $wgExtensionCredits['other'][] = array( 'path' => __FILE__, Modified: trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php =================================================================== --- trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php 2011-06-21 20:39:02 UTC (rev 90546) +++ trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php 2011-06-21 20:45:57 UTC (rev 90547) @@ -493,7 +493,7 @@ */ function getProfileTop( $user_id, $user_name ) { global $wgTitle, $wgUser, $wgUploadPath, $wgLang; - global $wgUserLevels; + global $wgUserLevels, $wgEnableUserStatus; $stats = new UserStats( $user_id, $user_name ); $stats_data = $stats->getUserStats(); @@ -506,8 +506,7 @@ } $profile_data = $this->profile_data; - // Variables and other crap - $user_status = $this->getStatus($this->user_id); + // Variables and other crap $page_title = $wgTitle->getText(); $title_parts = explode( '/', $page_title ); $user = $title_parts[0]; @@ -560,7 +559,10 @@ <div id="profile-title">' . $user_name . '</div>'; - $output .='<div id="user-status-block">'.$user_status.'</div>'; + if ( $wgEnableUserStatus ) { + $user_status = $this->getStatus($this->user_id); + $output .='<div id="user-status-block">'.$user_status.'</div>'; + } if ( $wgUserLevels ) { $output .= '<div id="points-level"> <a href="' . $level_link->escapeFullURL() . '">' . Modified: trunk/extensions/SocialProfile/UserStatus/UserStatus.js =================================================================== --- trunk/extensions/SocialProfile/UserStatus/UserStatus.js 2011-06-21 20:39:02 UTC (rev 90546) +++ trunk/extensions/SocialProfile/UserStatus/UserStatus.js 2011-06-21 20:45:57 UTC (rev 90547) @@ -5,18 +5,18 @@ function toEditMode(status,id) { var editbar = '<input id="user-status-input" type="text" value="'+status+'">'; - editbar += ' <a href="javascript:save('+id+');">Save</a>'; + editbar += ' <a href="javascript:saveStatus('+id+');">Save</a>'; editbar += ' <a href="javascript:toShowMode(\''+status+'\','+id+');">Cancel</a>'; - editbar += ' <a href="javascript:showHistory;">History</a>'; + editbar += ' <a href="javascript:showStatusHistory;">History</a>'; document.getElementById('user-status-block').innerHTML = editbar; } -function save(id) { +function saveStatus(id) { var div = document.getElementById('user-status-block'); var ustext = document.getElementById('user-status-input').value; sajax_do_call( 'wfSaveStatus', [id,ustext], div ); } -function showHistory(){ +function showStatusHistory(){ //A history script } \ No newline at end of file Modified: trunk/extensions/SocialProfile/UserStatus/UserStatusClass.php =================================================================== --- trunk/extensions/SocialProfile/UserStatus/UserStatusClass.php 2011-06-21 20:39:02 UTC (rev 90546) +++ trunk/extensions/SocialProfile/UserStatus/UserStatusClass.php 2011-06-21 20:45:57 UTC (rev 90547) @@ -4,7 +4,7 @@ /* private */ function __construct($u_id) { global $wgOut, $wgScriptPath; - $wgOut->addScriptFile($wgScriptPath.'/extensions/SocialProfile/UserStatus/UserStatus.js' ); //Does not work + $wgOut->addScriptFile($wgScriptPath.'/extensions/SocialProfile/UserStatus/UserStatus.js' ); } public function getStatus($u_id) { @@ -79,19 +79,19 @@ } if ($mode=='select') return $history; if ($mode=='insert'){ - $currentStuts = $this->getStatus($u_id); + $currentStatus = $this->getStatus($u_id); if ($i < 4) { $dbw->insert( 'user_status_history', /* SET */ array( 'ush_user_id' => $u_id, - 'ush_status' => $currentStuts['us_status']), __METHOD__ + 'ush_status' => $currentStatus['us_status']), __METHOD__ ); } else { $dbw->update( 'user_status_history', - /* SET */ array('ush_status' => $currentStuts['us_status']), + /* SET */ array('ush_status' => $currentStatus['us_status']), /*WHERE*/ array('ush_user_id' => $u_id, 'ush_timestamp' => $history[0]['ush_timestamp']), __METHOD__); @@ -99,6 +99,4 @@ return; } } -} - -?> \ No newline at end of file +} \ No newline at end of file Modified: trunk/extensions/SocialProfile/UserStatus/UserStatus_AjaxFunctions.php =================================================================== --- trunk/extensions/SocialProfile/UserStatus/UserStatus_AjaxFunctions.php 2011-06-21 20:39:02 UTC (rev 90546) +++ trunk/extensions/SocialProfile/UserStatus/UserStatus_AjaxFunctions.php 2011-06-21 20:45:57 UTC (rev 90547) @@ -5,8 +5,7 @@ $us_class->setStatus($u_id, $status); $user_status_array = $us_class->getStatus($u_id); $buf=$user_status_array['us_status']; - $us ="$buf"; + $us =$buf; $us.=" <a href=\"javascript:toEditMode('$buf','$u_id');\">Edit</a>"; return $us; -} -?> +} \ No newline at end of file Modified: trunk/extensions/SocialProfile/UserStatus/userstatus.sql =================================================================== --- trunk/extensions/SocialProfile/UserStatus/userstatus.sql 2011-06-21 20:39:02 UTC (rev 90546) +++ trunk/extensions/SocialProfile/UserStatus/userstatus.sql 2011-06-21 20:45:57 UTC (rev 90547) @@ -11,7 +11,7 @@ `us_status` varchar(140) NOT NULL default '' )/*$wgDBTableOptions*/; -CREATE TABLE /*_*/`user_status_history` ( +CREATE TABLE /*_*/user_status_history ( `ush_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, `ush_user_id` int(11) NOT NULL default '0', `ush_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs