some bugfixes

git-svn-id: file:///svn/phpbb/trunk@6104 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/acp/acp_board.php

@@ -40,9 +40,9 @@ class acp_board
 						'board_disable_msg'		=> false,
 						'default_lang'			=> array('lang' => 'DEFAULT_LANGUAGE',		'type' => 'select', 'function' => 'language_select', 'params' => array('{CONFIG_VALUE}'), 'explain' => false),
 						'default_dateformat'	=> array('lang' => 'DEFAULT_DATE_FORMAT',	'type' => 'custom', 'method' => 'dateformat_select', 'explain' => true),
-						'board_timezone'		=> array('lang' => 'SYSTEM_TIMEZONE',		'type' => 'select', 'function' => 'tz_select', 'params' => array('{CONFIG_VALUE}'), 'explain' => false),
+						'board_timezone'		=> array('lang' => 'SYSTEM_TIMEZONE',		'type' => 'select', 'function' => 'tz_select', 'params' => array('{CONFIG_VALUE}', 1), 'explain' => false),
 						'board_dst'				=> array('lang' => 'SYSTEM_DST',			'type' => 'radio:yes_no', 'explain' => false),
-						'default_style'			=> array('lang' => 'DEFAULT_STYLE',			'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', true), 'explain' => false),
+						'default_style'			=> array('lang' => 'DEFAULT_STYLE',			'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', 1), 'explain' => false),
 						'override_user_style'	=> array('lang' => 'OVERRIDE_STYLE',		'type' => 'radio:yes_no', 'explain' => true),
 
 						'legend2'				=> 'WARNINGS',
@@ -104,7 +104,7 @@ class acp_board
 						'pm_max_boxes'			=> array('lang' => 'BOXES_MAX',				'type' => 'text:4:4', 'explain' => true),
 						'pm_max_msgs'			=> array('lang' => 'BOXES_LIMIT',			'type' => 'text:4:4', 'explain' => true),
 						'full_folder_action'	=> array('lang' => 'FULL_FOLDER_ACTION',	'type' => 'select', 'method' => 'full_folder_select', 'explain' => true),
-						'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
 						
 						'legend2'				=> 'GENERAL_OPTIONS',
 						'allow_mass_pm'			=> array('lang' => 'ALLOW_MASS_PM',			'type' => 'radio:yes_no', 'explain' => false),
@@ -137,7 +137,7 @@ class acp_board
 
 						'legend2'				=> 'POSTING',
 						'bump_type'				=> false,
-						'edit_time'				=> array('lang' => 'EDIT_TIME',				'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'edit_time'				=> array('lang' => 'EDIT_TIME',				'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
 						'display_last_edited'	=> array('lang' => 'DISPLAY_LAST_EDITED',	'type' => 'radio:yes_no', 'explain' => true),
 						'flood_interval'		=> array('lang' => 'FLOOD_INTERVAL',		'type' => 'text:3:4', 'explain' => true),
 						'bump_interval'			=> array('lang' => 'BUMP_INTERVAL',			'type' => 'custom', 'method' => 'bump_interval', 'explain' => true),

phpBB/includes/acp/acp_email.php

@@ -85,10 +85,10 @@ class acp_email
 				}
 				$result = $db->sql_query($sql);
 				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
 
 				if (!$row)
 				{
+					$db->sql_freeresult($result);
 					trigger_error($user->lang['NO_USER'] . adm_back_link($this->u_action));
 				}
 	
@@ -121,7 +121,7 @@ class acp_email
 						$email_list[$j][$i]['jabber']	= $row['user_jabber'];
 						$i++;
 					}
-				} 
+				}
 				while ($row = $db->sql_fetchrow($result));
 				$db->sql_freeresult($result);
 

phpBB/includes/functions.php

@@ -429,13 +429,18 @@ function style_select($default = '', $all = false)
 /**
 * Pick a timezone
 */
-function tz_select($default = '')
+function tz_select($default = '', $truncate = false)
 {
 	global $sys_timezone, $user;
 
 	$tz_select = '';
 	foreach ($user->lang['tz_zones'] as $offset => $zone)
 	{
+		if ($truncate)
+		{
+			$zone = (strlen($zone) > 70) ? substr($zone, 0, 70) . '...' : $zone;
+		}
+
 		if (is_numeric($offset))
 		{
 			$selected = ($offset == $default) ? ' selected="selected"' : '';

phpBB/includes/functions_privmsgs.php

@@ -1477,19 +1477,18 @@ function pm_notification($mode, $author, $recipients, $subject, $message)
 
 	$subject = censor_text($subject);
 
+	unset($recipients[ANONYMOUS], $recipients[$user->data['user_id']]);
+
 	// Get banned User ID's
 	$sql = 'SELECT ban_userid 
-		FROM ' . BANLIST_TABLE;
+		FROM ' . BANLIST_TABLE . '
+		WHERE ban_userid IN (' . implode(', ', array_map('intval', array_keys($recipients))) . ')
+			AND ban_exclude = 0';
 	$result = $db->sql_query($sql);
 
-	unset($recipients[ANONYMOUS], $recipients[$user->data['user_id']]);
-	
 	while ($row = $db->sql_fetchrow($result))
 	{
-		if (isset($row['ban_userid']))
-		{
-			unset($recipients[$row['ban_userid']]);
-		}
+		unset($recipients[$row['ban_userid']]);
 	}
 	$db->sql_freeresult($result);
 
@@ -1498,7 +1497,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message)
 		return;
 	}
 
-	$recipient_list = implode(', ', array_keys($recipients));
+	$recipient_list = implode(', ', array_map('intval', array_keys($recipients)));
 
 	$sql = 'SELECT user_id, username, user_email, user_lang, user_notify_pm, user_notify_type, user_jabber 
 		FROM ' . USERS_TABLE . "

phpBB/includes/functions_user.php

@@ -472,6 +472,23 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 		$ban_end = 0;
 	}
 
+	$founder = array();
+
+	if (!$ban_exclude)
+	{
+		// Create a list of founder...
+		$sql = 'SELECT user_id, user_email
+			FROM ' . USERS_TABLE . '
+			WHERE user_type = ' . USER_FOUNDER;
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$founder[$row['user_id']] = $row['user_email'];
+		}
+		$db->sql_freeresult($result);
+	}
+
 	$banlist_ary = array();
 
 	switch ($mode)
@@ -502,6 +519,12 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 				$sql = 'SELECT user_id
 					FROM ' . USERS_TABLE . '
 					WHERE username IN (' . $sql_usernames . ')';
+
+				if (sizeof($founder))
+				{
+					$sql .= ' AND user_id NOT IN (' . implode(', ', array_keys($founder)) . ')';
+				}
+
 				$result = $db->sql_query($sql);
 
 				if ($row = $db->sql_fetchrow($result))
@@ -618,9 +641,14 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 
 			foreach ($ban_list as $ban_item)
 			{
-				if (preg_match('#^.*?@*|(([a-z0-9\-]+\.)+([a-z]{2,3}))$#i', trim($ban_item)))
+				$ban_item = trim($ban_item);
+
+				if (preg_match('#^.*?@*|(([a-z0-9\-]+\.)+([a-z]{2,3}))$#i', $ban_item))
 				{
-					$banlist_ary[] = trim($ban_item);
+					if (!sizeof($founder) || !in_array($ban_item, $founder))
+					{
+						$banlist_ary[] = $ban_item;
+					}
 				}
 			}
 
@@ -764,6 +792,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 		// Update log
 		$log_entry = ($ban_exclude) ? 'LOG_BAN_EXCLUDE_' : 'LOG_BAN_';
 		add_log('admin', $log_entry . strtoupper($mode), $ban_reason, $ban_list_log);
+
 		return true;
 	}
 

phpBB/includes/session.php

@@ -82,7 +82,7 @@ class session
 		}
 
 		// Current page from phpBB root (for example: adm/index.php?i=10&b=2)
-		$page = (($page_dir) ? $page_dir . '/' : '') . $page_name . (($query_string) ? "?$query_string" : '');
+		$page = (($page_dir) ? urlencode($page_dir) . '/' : '') . urlencode($page_name) . (($query_string) ? "?$query_string" : '');
 
 		// The script path from the webroot to the current directory (for example: /phpBB2/adm/) : always prefixed with / and ends in /
 		$script_path = trim(str_replace('\\', '/', dirname($script_name)));
@@ -102,12 +102,12 @@ class session
 		$root_script_path .= (substr($root_script_path, -1, 1) == '/') ? '' : '/';
 
 		$page_array += array(
-			'page_name'			=> $page_name,
-			'page_dir'			=> $page_dir,
+			'page_name'			=> urlencode($page_name),
+			'page_dir'			=> urlencode($page_dir),
 
 			'query_string'		=> $query_string,
-			'script_path'		=> htmlspecialchars($script_path),
-			'root_script_path'	=> htmlspecialchars($root_script_path),
+			'script_path'		=> urlencode(htmlspecialchars($script_path)),
+			'root_script_path'	=> urlencode(htmlspecialchars($root_script_path)),
 
 			'page'				=> $page
 		);
@@ -763,8 +763,11 @@ class session
 
 		$sql = 'SELECT ban_ip, ban_userid, ban_email, ban_exclude, ban_give_reason, ban_end
 			FROM ' . BANLIST_TABLE . '
-			WHERE ban_end >= ' . time() . '
-				OR ban_end = 0';
+			WHERE (ban_end >= ' . time() . " OR ban_end = 0)
+				AND (
+					ban_ip <> '' OR ban_email <> '' OR 
+					(ban_userid <> 0 AND ban_userid = " . $user_id . ')
+				)';
 		$result = $db->sql_query($sql);
 
 		while ($row = $db->sql_fetchrow($result))

phpBB/includes/ucp/ucp_pm.php

@@ -148,6 +148,7 @@ class ucp_pm
 				include($phpbb_root_path . 'includes/ucp/ucp_main.' . $phpEx);
 
 				$module = new ucp_main($this);
+				$module->u_action = $this->u_action;
 				$module->main($id, $mode);
 				$this->tpl_name = $module->tpl_name;
 

phpBB/includes/ucp/ucp_pm_compose.php

@@ -243,7 +243,7 @@ function compose_pm($id, $mode, $action)
 
 	if ($action == 'edit' && !$refresh && !$preview && !$submit)
 	{
-		if (!($message_time > time() - $config['pm_edit_time'] || !$config['pm_edit_time']))
+		if (!($message_time > time() - ($config['pm_edit_time'] * 60) || !$config['pm_edit_time']))
 		{
 			trigger_error('CANNOT_EDIT_MESSAGE_TIME');
 		}

phpBB/includes/ucp/ucp_pm_viewmessage.php

@@ -194,7 +194,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'U_AUTHOR_PROFILE'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $author_id),
 		'U_EMAIL'			=> $user_info['email'],
 		'U_QUOTE'			=> ($auth->acl_get('u_sendpm')) ? "$url&mode=compose&action=quote&f=$folder_id&p=" . $message_row['msg_id'] : '',
-		'U_EDIT'			=> (($message_row['message_time'] > time() - $config['pm_edit_time'] || !$config['pm_edit_time']) && $folder_id == PRIVMSGS_OUTBOX && $auth->acl_get('u_pm_edit')) ? "$url&mode=compose&action=edit&f=$folder_id&p=" . $message_row['msg_id'] : '',
+		'U_EDIT'			=> (($message_row['message_time'] > time() - ($config['pm_edit_time'] * 60) || !$config['pm_edit_time']) && $folder_id == PRIVMSGS_OUTBOX && $auth->acl_get('u_pm_edit')) ? "$url&mode=compose&action=edit&f=$folder_id&p=" . $message_row['msg_id'] : '',
 		'U_POST_REPLY_PM'	=> ($auth->acl_get('u_sendpm')) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $message_row['msg_id'] : '',
 		'U_PREVIOUS_PM'		=> "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=previous",
 		'U_NEXT_PM'			=> "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=next",

phpBB/includes/ucp/ucp_profile.php

@@ -49,10 +49,10 @@ class ucp_profile
 						$data[$var] = request_var($var, $default);
 					}
 
+					// Do not check cur_password, it is the old one.
 					$var_ary = array(
 						'password_confirm'	=> array('string', true, $config['min_pass_chars'], $config['max_pass_chars']),
 						'new_password'		=> array('string', true, $config['min_pass_chars'], $config['max_pass_chars']),
-						'cur_password'		=> array('string', true, $config['min_pass_chars'], $config['max_pass_chars']),
 						'email'				=> array(
 							array('string', false, 6, 60),
 							array('email', $data['email'])),

phpBB/language/en/mcp.php

@@ -93,8 +93,6 @@ $lang = array_merge($lang, array(
 
 	'IP_INFO'				=> 'IP Information',
 
-	'JUMP_TO'					=> 'Moderate forum',		// Overwriting the jump to language variable for the mcp jumpbox
-	
 	'LATEST_LOGS'				=> 'Latest 5 logged actions',
 	'LATEST_REPORTED'			=> 'Latest 5 reports',
 	'LATEST_UNAPPROVED'			=> 'Latest 5 posts awaiting for approval',
@@ -188,6 +186,7 @@ $lang = array_merge($lang, array(
 	'MERGE_POSTS_CONFIRM'	=> 'Are you sure you want to merge the selected posts?',
 	'MERGE_TOPIC_EXPLAIN'	=> 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on the "Select" button to search for one',
 	'MERGE_TOPIC_ID'		=> 'Destination topic id',
+	'MODERATE_FORUM'		=> 'Moderate forum',
 	'MOD_OPTIONS'			=> 'Moderator options',
 	'MORE_INFO'				=> 'Further information',
 	'MOST_WARNINGS'			=> 'Users with most warnings',

phpBB/language/en/ucp.php

@@ -157,6 +157,7 @@ $lang = array_merge($lang, array(
 	'DRAFT_UPDATED'				=> 'Draft successfully updated.',
 
 	'EDIT_DRAFT_EXPLAIN'		=> 'Here you are able to edit your draft. Drafts do not contain attachment and poll informations.',
+	'EMAIL_BANNED_EMAIL'		=> 'The email address you entered is not allowed to be used.',
 	'EMAIL_INVALID_EMAIL'		=> 'The email address you entered is invalid.',
 	'EMAIL_REMIND'				=> 'This must be the email address you supplied when registering.',
 	'EMAIL_TAKEN_EMAIL'			=> 'The entered email address is already in use',
@@ -414,7 +415,7 @@ $lang = array_merge($lang, array(
 	'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.',
 	'USERNAME_CHARS_ANY_EXPLAIN'	=> 'Length must be between %1$d and %2$d characters.',
 	'USERNAME_TAKEN_USERNAME'		=> 'The username you entered is already in use, please select an alternative.',
-	'USERNAME_USERNAME_DISALLOWED'	=> 'The username you entered has been banned.',
+	'USERNAME_DISALLOWED_USERNAME'	=> 'The username you entered has been banned.',
 	'USER_NOT_FOUND_OR_INACTIVE'	=> 'The usernames you specified could either not be found or are not activated users.',
 
 	'VIEW_AVATARS'				=> 'Display avatars',

phpBB/mcp.php

@@ -25,6 +25,9 @@ $user->setup('mcp');
 
 $module = new p_master();
 
+// Setting a variable to let the style designer know where he is...
+$template->assign_var('S_IN_MCP', true);
+
 // Basic parameter data
 $id = request_var('i', '');
 

phpBB/memberlist.php

@@ -183,7 +183,7 @@ switch ($mode)
 
 				'U_GROUP'		=> $u_group,
 				'U_VIEWPROFILE'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['user_id']),
-				'U_PM'			=> ($auth->acl_get('u_sendpm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $row['user_id']) : '')
+				'U_PM'			=> ($config['allow_privmsg'] && $auth->acl_get('u_sendpm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $row['user_id']) : '')
 			);
 		}
 		$db->sql_freeresult($result);
@@ -921,7 +921,7 @@ switch ($mode)
 				'RANK_IMG'		=> $rank_img,
 				'RANK_IMG_SRC'	=> $rank_img_src,
 
-				'U_PM'			=> ($auth->acl_get('u_sendpm') && $group_row['group_receive_pm'] && $config['allow_mass_pm']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&g=' . $group_id) : '',)
+				'U_PM'			=> ($auth->acl_get('u_sendpm') && $group_row['group_receive_pm'] && $config['allow_privmsg'] && $config['allow_mass_pm']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&g=' . $group_id) : '',)
 			);
 
 			$sql_select = ', ug.group_leader';
@@ -1235,7 +1235,7 @@ function show_profile($data)
 		'U_SEARCH_USER'	=> ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$user_id&sr=posts") : '',
 		'U_NOTES'		=> $auth->acl_getf_global('m_') ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $user_id, true, $user->session_id) : '',
 		'U_WARN'		=> $auth->acl_getf_global('m_warn') ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $user_id, true, $user->session_id) : '',
-		'U_PM'			=> ($auth->acl_get('u_sendpm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $user_id) : '',
+		'U_PM'			=> ($config['allow_privmsg'] && $auth->acl_get('u_sendpm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $user_id) : '',
 		'U_EMAIL'		=> $email,
 		'U_WWW'			=> (!empty($data['user_website'])) ? $data['user_website'] : '',
 		'U_ICQ'			=> ($data['user_icq']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=icq&u=' . $user_id) : '',

phpBB/posting.php

@@ -199,7 +199,7 @@ if ($mode == 'edit' && !$auth->acl_get('m_edit', $forum_id))
 		trigger_error('USER_CANNOT_EDIT');
 	}
 
-	if (!($post_data['post_time'] > time() - $config['edit_time'] || !$config['edit_time']))
+	if (!($post_data['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time']))
 	{
 		trigger_error('CANNOT_EDIT_TIME');
 	}

phpBB/styles/subSilver/template/index_body.html

@@ -146,7 +146,7 @@
 		<td class="cat"><h4><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></h4></td>
 	</tr>
 	<tr>
-		<td class="row1" align="center"><span class="genmed">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" />&nbsp; <span class="genmed">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" />&nbsp; <span class="gensmall">{L_LOG_ME_IN}</span> <input class="text" type="checkbox" class="radio" name="autologin" />&nbsp; <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>
+		<td class="row1" align="center"><span class="genmed">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" />&nbsp; <span class="genmed">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" />&nbsp; <span class="gensmall">{L_LOG_ME_IN}</span> <input type="checkbox" class="radio" name="autologin" />&nbsp; <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>
 	</tr>
 	</table>
 	

phpBB/styles/subSilver/template/jumpbox.html

@@ -4,7 +4,7 @@
 
 	<table cellspacing="0" cellpadding="0" border="0">
 	<tr>
-		<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:</span>&nbsp;<select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ forms['jumpbox'].submit() }">
+		<td nowrap="nowrap"><span class="gensmall"><!-- IF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->:</span>&nbsp;<select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ forms['jumpbox'].submit() }">
 
 		<!-- BEGIN jumpbox_forums -->
 			<!-- IF jumpbox_forums.S_FORUM_COUNT eq 2 --><option value="-1">------------------</option><!-- ENDIF -->

phpBB/styles/subSilver/template/memberlist_view.html

@@ -93,27 +93,29 @@
 				<td class="gen" align="right" nowrap="nowrap">{L_EMAIL_ADDRESS}: </td>
 				<td class="row1" width="100%"><!-- IF U_EMAIL --><a href="{U_EMAIL}">{EMAIL_IMG}</a><!-- ENDIF --></td>
 			</tr>
-			<tr> 
-				<td class="gen" nowrap="nowrap" align="right">{L_PM}: </td>
-				<td><!-- IF U_PM --><a href="{U_PM}">{PM_IMG}</a><!-- ENDIF --></td>
-			</tr>
-			<tr> 
+			<!-- IF U_PM -->
+				<tr>
+					<td class="gen" nowrap="nowrap" align="right">{L_PM}: </td>
+					<td><a href="{U_PM}">{PM_IMG}</a></td>
+				</tr>
+			<!-- ENDIF -->
+			<tr>
 				<td class="gen" nowrap="nowrap" align="right">{L_MSNM}: </td>
 				<td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup('{U_MSN}', 550, 320); return false">{MSN_IMG}</a><!-- ENDIF --></td>
 			</tr>
-			<tr> 
+			<tr>
 				<td class="gen" nowrap="nowrap" align="right">{L_YIM}: </td>
 				<td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup('{U_YIM}', 780, 550); return false">{YIM_IMG}</a><!-- ENDIF --></td>
 			</tr>
-			<tr> 
+			<tr>
 				<td class="gen" nowrap="nowrap" align="right">{L_AIM}: </td>
 				<td><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup('{U_AIM}', 550, 320); return false">{AIM_IMG}</a><!-- ENDIF --></td>
 			</tr>
-			<tr> 
+			<tr>
 				<td class="gen" nowrap="nowrap" align="right">{L_ICQ}: </td>
 				<td><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup('{U_ICQ}', 550, 320); return false">{ICQ_IMG}</a><!-- ENDIF --></td>
 			</tr>
-			<tr> 
+			<tr>
 				<td class="gen" nowrap="nowrap" align="right">{L_JABBER}: </td>
 				<td><!-- IF U_JABBER and S_JABBER_ENABLED --><a href="{U_JABBER}" onclick="popup('{U_JABBER}', 550, 320); return false">{JABBER_IMG}</a><!-- ELSEIF U_JABBER -->{JABBER_IMG}<!-- ENDIF --></td>
 			</tr>

phpBB/ucp.php

@@ -32,6 +32,9 @@ $user->session_begin();
 $auth->acl($user->data);
 $user->setup('ucp');
 
+// Setting a variable to let the style designer know where he is...
+$template->assign_var('S_IN_UCP', true);
+
 $module = new p_master();
 
 // Basic "global" modes

phpBB/viewtopic.php

@@ -1337,14 +1337,14 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'ONLINE_IMG'			=> ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('btn_online', 'ONLINE') : $user->img('btn_offline', 'OFFLINE')),
 		'S_ONLINE'				=> ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? false : (($user_cache[$poster_id]['online']) ? true : false),
 
-		'U_EDIT'			=> (($user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id) && ($row['post_time'] > time() - $config['edit_time'] || !$config['edit_time'])) || $auth->acl_get('m_edit', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
+		'U_EDIT'			=> (($user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id) && ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_edit', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
 		'U_QUOTE'			=> ($auth->acl_get('f_reply', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=quote&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
 		'U_INFO'			=> ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&amp;mode=post_details&amp;f=$forum_id&amp;p=" . $row['post_id'], true, $user->session_id) : '',
-		'U_DELETE'			=> (($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id'] && ($row['post_time'] > time() - $config['edit_time'] || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
+		'U_DELETE'			=> (($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id'] && ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
 
 		'U_PROFILE'		=> $user_cache[$poster_id]['profile'],
 		'U_SEARCH'		=> $user_cache[$poster_id]['search'],
-		'U_PM'			=> ($poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;action=quotepost&amp;p=' . $row['post_id']) : '',
+		'U_PM'			=> ($poster_id != ANONYMOUS && $config['allow_privmsg'] && $auth->acl_get('u_sendpm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;action=quotepost&amp;p=' . $row['post_id']) : '',
 		'U_EMAIL'		=> $user_cache[$poster_id]['email'],
 		'U_WWW'			=> $user_cache[$poster_id]['www'],
 		'U_ICQ'			=> $user_cache[$poster_id]['icq'],