- removing karma

git-svn-id: file:///svn/phpbb/trunk@4958 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2004-08-04 19:18:00 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2004-08-04 19:18:00 +0000
commit: 07bc2e02316e40ec4004635ba760cab0553ea10c (patch)
tree: 3eefa6324967469d95dd3b4604b63347cc42c9bb
parent: 5dcc0a85f845a214712d015199b11ebddff14437 (diff)
download: forums-07bc2e02316e40ec4004635ba760cab0553ea10c.tar
forums-07bc2e02316e40ec4004635ba760cab0553ea10c.tar.gz
forums-07bc2e02316e40ec4004635ba760cab0553ea10c.tar.bz2
forums-07bc2e02316e40ec4004635ba760cab0553ea10c.tar.xz
forums-07bc2e02316e40ec4004635ba760cab0553ea10c.zip
7 files changed, 4 insertions, 31 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index ec846c778f..7a95c9dfff 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -252,7 +252,6 @@ class ucp_main extends module
 
 				$template->assign_vars(array(
 					'USER_COLOR'		=> (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', 
-					'KARMA'				=> ($config['enable_karma']) ? $user->lang['KARMA'][$user->data['user_karma']] : '', 
 					'JOINED'			=> $user->format_date($user->data['user_regdate'], $user->lang['DATE_FORMAT']),
 					'VISITED'			=> (empty($last_visit)) ? ' - ' : $user->format_date($last_visit, $user->lang['DATE_FORMAT']),
 					'POSTS'				=> ($user->data['user_posts']) ? $user->data['user_posts'] : 0,
@@ -268,10 +267,6 @@ class ucp_main extends module
 					'OCCUPATION'	=> (!empty($row['user_occ'])) ? $row['user_occ'] : '',
 					'INTERESTS'		=> (!empty($row['user_interests'])) ? $row['user_interests'] : '',
 
-					'KARMA_IMG'			=> ($config['enable_karma']) ? $user->img('karma_center', $user->lang['KARMA'][$user->data['user_karma']], false, (int) $user->data['user_karma']) : '', 
-					'KARMA_LEFT_IMG'	=> $user->img('karma_left', ''),
-					'KARMA_RIGHT_IMG'	=> $user->img('karma_right', ''),
-
 //					'S_GROUP_OPTIONS'	=> $group_options, 
 
 					'U_SEARCH_USER'		=> ($auth->acl_get('u_search')) ? "search.$phpEx$SID&amp;search_author=" . urlencode($user->data['username']) . "&amp;show_results=posts" : '',  
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 1275d39eaf..5d2eaf5e05 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -157,7 +157,6 @@ class ucp_prefs extends module
 						'sk'		=> (string) 't', 
 						'sd'		=> (string) 'd', 
 						'st'		=> 0,
-						'minkarma'	=> (int) -5, 
 
 						'images'	=> true, 
 						'flash'		=> false, 
@@ -198,7 +197,6 @@ class ucp_prefs extends module
 							'user_sortby_type'	=> $sk,
 							'user_sortby_dir'	=> $sd,
 							'user_show_days'	=> $st, 
-							'user_min_karma'	=> $minkarma, 
 						);
 
 						$sql = 'UPDATE ' . USERS_TABLE . ' 
@@ -225,14 +223,6 @@ class ucp_prefs extends module
 				$s_limit_days = $s_sort_key = $s_sort_dir = '';
 				gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, &$s_limit_days, &$s_sort_key, &$s_sort_dir);
 
-				$s_min_karma_options = '';
-				$minkarma = (isset($minkarma)) ? $minkarma : $user->data['user_min_karma'];
-				for ($i = -5; $i < 6; $i++)
-				{
-					$selected = ($i == $minkarma) ? ' selected="selected"' : '';
-					$s_min_karma_options .= "<option value=\"$i\"$selected>$i</option>";
-				}
-
 				$images = (isset($images)) ? $images : $user->optionget('viewimg');
 				$images_yes = ($images) ? ' checked="checked"' : '';
 				$images_no = (!$images) ? ' checked="checked"' : '';
@@ -268,7 +258,6 @@ class ucp_prefs extends module
 					'DISABLE_CENSORS_YES'	=> $wordcensor_yes, 
 					'DISABLE_CENSORS_NO'	=> $wordcensor_no,
 
-					'S_MIN_KARMA_OPTIONS'	=> $s_min_karma_options, 
 					'S_CHANGE_CENSORS'		=> ($auth->acl_get('u_chgcensors')) ? true : false, 
 					'S_SELECT_SORT_DAYS'	=> $s_limit_days,
 					'S_SELECT_SORT_KEY'		=> $s_sort_key, 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index afa9acf81c..9d35112544 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -427,16 +427,14 @@ class ucp_profile extends module
 					$signature_preview = smilie_text($signature_preview, !$enable_smilies);
 
 					// Replace naughty words such as farty pants
-/*					if (sizeof($censors))
-					{
-						$signature_preview = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$censors['match'], \$censors['replace'], '\\0')", '>' . $signature_preview . '<'), 1, -1));
-					}*/
 					$signature_preview = str_replace("\n", '<br />', censor_text($signature_preview));
 				}
 
 				$html_status = ($config['allow_html']) ? true : false; 
 				$bbcode_status = ($config['allow_bbcode']) ? true : false; 
 				$smilies_status = ($config['allow_smilies']) ? true : false; 
+
+				// NOTE: allow_img and allow_flash do not exist in config table
 				$img_status = ($config['allow_img']) ? true : false; 
 				$flash_status = ($config['allow_flash']) ? true : false; 
 
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index aeccc7e816..59c8a1f3a8 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -274,7 +274,7 @@ class ucp_register extends module
 
 					$messenger->assign_vars(array(
 						'SITENAME'		=> $config['sitename'],
-						'WELCOME_MSG'	=> sprintf($user->lang['Welcome_subject'], $config['sitename']),
+						'WELCOME_MSG'	=> sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']),
 						'USERNAME'		=> $username,
 						'PASSWORD'		=> $password_confirm,
 						'EMAIL_SIG'		=> str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 5ec49c30d9..17efc5757e 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -228,7 +228,7 @@ switch ($mode)
 		}
 
 		// We left join on the session table to see if the user is currently online
-		$sql = 'SELECT username, user_id, user_colour, user_permissions, user_karma, user_sig, user_sig_bbcode_uid, user_sig_bbcode_bitfield, user_allow_viewemail, user_posts, user_regdate, user_rank, user_from, user_occ, user_interests, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_avatar, user_avatar_width, user_avatar_height, user_avatar_type, user_lastvisit   
+		$sql = 'SELECT username, user_id, user_colour, user_permissions, user_sig, user_sig_bbcode_uid, user_sig_bbcode_bitfield, user_allow_viewemail, user_posts, user_regdate, user_rank, user_from, user_occ, user_interests, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_avatar, user_avatar_width, user_avatar_height, user_avatar_type, user_lastvisit   
 			FROM ' . USERS_TABLE . " 
 			WHERE user_id = $user_id";
 		$result = $db->sql_query($sql);
@@ -904,12 +904,10 @@ function show_profile($data)
 		'USERNAME'		=> $username, 
 		'USER_COLOR'	=> (!empty($data['user_colour'])) ? $data['user_colour'] : '', 
 		'RANK_TITLE'	=> $rank_title, 
-		'KARMA'			=> ($config['enable_karma']) ? $user->lang['KARMA'][$data['user_karma']] : '',  
 		'JOINED'		=> $user->format_date($data['user_regdate'], $user->lang['DATE_FORMAT']),
 		'VISITED'		=> (empty($last_visit)) ? ' - ' : $user->format_date($last_visit, $user->lang['DATE_FORMAT']),
 		'POSTS'			=> ($data['user_posts']) ? $data['user_posts'] : 0,
 
-		'KARMA_IMG'		=>($config['enable_karma']) ? $user->img('karma_center', $user->lang['KARMA'][$data['user_karma']], false, (int) $data['user_karma']) : '',  
 		'ONLINE_IMG'	=> (intval($data['session_time']) >= time() - ($config['load_online_time'] * 60)) ? $user->img('btn_online', $user->lang['USER_ONLINE']) : $user->img('btn_offline', $user->lang['USER_ONLINE']), 
 		'RANK_IMG'		=> $rank_img,
 		'ICQ_STATUS_IMG'=> (!empty($data['user_icq'])) ? '<img src="http://web.icq.com/whitepages/online?icq=' . $data['user_icq'] . '&img=5" width="18" height="18" border="0" />' : '',
diff --git a/phpBB/styles/subSilver/template/memberlist_view.html b/phpBB/styles/subSilver/template/memberlist_view.html
index ddb2c1d5a8..68ee2c703b 100644
--- a/phpBB/styles/subSilver/template/memberlist_view.html
+++ b/phpBB/styles/subSilver/template/memberlist_view.html
@@ -17,9 +17,6 @@
 					<tr>
 						<td class="gen" align="center"><!-- IF USER_COLOR --><b style="color: #{USER_COLOR}"><!-- ELSE --><b><!-- ENDIF -->{USERNAME}</b></td>
 					</tr>
-					<tr>
-						<td align="center">{KARMA_IMG}</td>
-					</tr>
 					<!-- IF RANK -->
 					<tr>
 						<td class="postdetails" align="center">{RANK}</td>
diff --git a/phpBB/styles/subSilver/template/ucp_prefs_view.html b/phpBB/styles/subSilver/template/ucp_prefs_view.html
index 8d3d07215d..52d6513691 100644
--- a/phpBB/styles/subSilver/template/ucp_prefs_view.html
+++ b/phpBB/styles/subSilver/template/ucp_prefs_view.html
@@ -37,10 +37,6 @@
 		<td class="row2"><input type="radio" name="wordcensor" value="1"{DISABLE_CENSORS_YES} /><span class="gen">{L_YES}</span>&nbsp; &nbsp;<input type="radio" name="wordcensor" value="0"{DISABLE_CENSORS_NO} /><span class="gen">{L_NO}</span></td>
 	</tr>
 	<!-- ENDIF -->
-	<tr>
-		<td class="row1" width="50%"><b class="genmed">{L_MINIMUM_KARMA}:</b><br /><span class="gensmall">{L_MINIMUM_KARMA_EXPLAIN}</span></td>
-		<td class="row2"><select name="minkarma">{S_MIN_KARMA_OPTIONS}</select></td>
-
 	<tr> 
 		<td class="row1" width="50%"><b class="genmed">{L_VIEW_TOPICS_DAYS}:</b></td>
 		<td class="row2">{S_SELECT_SORT_DAYS}</td>
author	Meik Sievertsen <acydburn@phpbb.com>	2004-08-04 19:18:00 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2004-08-04 19:18:00 +0000
commit	07bc2e02316e40ec4004635ba760cab0553ea10c (patch)
tree	3eefa6324967469d95dd3b4604b63347cc42c9bb
parent	5dcc0a85f845a214712d015199b11ebddff14437 (diff)
download	forums-07bc2e02316e40ec4004635ba760cab0553ea10c.tar forums-07bc2e02316e40ec4004635ba760cab0553ea10c.tar.gz forums-07bc2e02316e40ec4004635ba760cab0553ea10c.tar.bz2 forums-07bc2e02316e40ec4004635ba760cab0553ea10c.tar.xz forums-07bc2e02316e40ec4004635ba760cab0553ea10c.zip