some fixes...

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

phpBB/includes/functions_admin.php

@@ -2370,7 +2370,16 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 			if (isset($user->lang[$row['log_operation']]))
 			{
 				$log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary);
-				$log[$i]['action'] = str_replace("\n", '<br />', censor_text($log[$i]['action']));
+
+				// If within the admin panel we do not censor text out
+				if (defined('IN_ADMIN'))
+				{
+					$log[$i]['action'] = str_replace("\n", '<br />', $log[$i]['action']);
+				}
+				else
+				{
+					$log[$i]['action'] = str_replace("\n", '<br />', censor_text($log[$i]['action']));
+				}
 			}
 			else
 			{

phpBB/includes/functions_display.php

@@ -296,8 +296,9 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 				if ($subforum_row['display'] && $subforum_row['name'])
 				{
 					$subforums_list[] = array(
-						'link'	=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $subforum_id),
+						'link'		=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $subforum_id),
-						'name'	=> $subforum_row['name']
+						'name'		=> $subforum_row['name'],
+						'unread'	=> $forum_unread,
 					);
 				}
 				else
@@ -360,7 +361,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		$s_subforums_list = array();
 		foreach ($subforums_list as $subforum)
 		{
-			$s_subforums_list[] = '<a href="' . $subforum['link'] . '">' . $subforum['name'] . '</a>';
+			$s_subforums_list[] = '<a href="' . $subforum['link'] . '"' . (($subforum['unread']) ? ' class="subforum-unread"' : '') . '>' . $subforum['name'] . '</a>';
 		}
 		$s_subforums_list = (string) implode(', ', $s_subforums_list);
 
@@ -402,7 +403,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		{
 			$template->assign_block_vars('forumrow.subforum', array(
 				'U_SUBFORUM'	=> $subforum['link'],
-				'SUBFORUM_NAME'	=> $subforum['name'])
+				'SUBFORUM_NAME'	=> $subforum['name'],
+				'S_UNREAD'		=> $subforum['unread'])
 			);
 		}
 	}

phpBB/includes/functions_upload.php

@@ -406,7 +406,7 @@ class fileerror extends filespec
 
 /**
 * File upload class
-* Init class (all parameters optional and able to be set/overwritten seperatly) - scope is global and valid for all uploads
+* Init class (all parameters optional and able to be set/overwritten separately) - scope is global and valid for all uploads
 *
 * @package phpBB3
 */

phpBB/includes/session.php

@@ -1409,7 +1409,7 @@ class user extends session
 
 		// Does the user need to change their password? If so, redirect to the
 		// ucp profile reg_details page ... of course do not redirect if we're already in the ucp
-		if (!defined('IN_ADMIN') && !defined('ADMIN_START') && $config['chg_passforce'] && $this->data['is_registered'] && $this->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400))
+		if (!defined('IN_ADMIN') && !defined('ADMIN_START') && $config['chg_passforce'] && $this->data['is_registered'] && $auth->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400))
 		{
 			if (strpos($this->page['query_string'], 'mode=reg_details') === false && $this->page['page_name'] != "ucp.$phpEx")
 			{

phpBB/includes/ucp/ucp_profile.php

@@ -243,7 +243,7 @@ class ucp_profile
 					'L_USERNAME_EXPLAIN'		=> sprintf($user->lang[$user_char_ary[str_replace('\\\\', '\\', $config['allow_name_chars'])] . '_EXPLAIN'], $config['min_name_chars'], $config['max_name_chars']),
 					'L_CHANGE_PASSWORD_EXPLAIN'	=> sprintf($user->lang[$config['pass_complex'] . '_EXPLAIN'], $config['min_pass_chars'], $config['max_pass_chars']),
 
-					'S_FORCE_PASSWORD'	=> ($config['chg_passforce'] && $user->data['user_passchg'] < time() - $config['chg_passforce']) ? true : false,
+					'S_FORCE_PASSWORD'	=> ($auth->acl_get('u_chgpasswd') && $config['chg_passforce'] && $user->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400)) ? true : false,
 					'S_CHANGE_USERNAME' => ($config['allow_namechange'] && $auth->acl_get('u_chgname')) ? true : false,
 					'S_CHANGE_EMAIL'	=> ($auth->acl_get('u_chgemail')) ? true : false,
 					'S_CHANGE_PASSWORD'	=> ($auth->acl_get('u_chgpasswd')) ? true : false)

phpBB/install/install_update.php

@@ -929,7 +929,7 @@ class install_update extends module
 				}
 
 				// If the file exists within the old directory the file got removed and we will write it back
-				// not a biggie, but we might want to state this circumstance seperatly later.
+				// not a biggie, but we might want to state this circumstance separately later.
 				//	if (file_exists($this->old_location . $file))
 				//	{
 				//		$update_list['removed'][] = $file;

phpBB/language/en/acp/profile.php

@@ -129,7 +129,7 @@ $lang = array_merge($lang, array(
 	'STEP_1_EXPLAIN_EDIT'			=> 'Here you can change the basic parameters of your profile field. The relevant options are re-calculated within the second step, where you are able to preview and test the changed settings.',
 	'STEP_1_TITLE_CREATE'			=> 'Add profile field',
 	'STEP_1_TITLE_EDIT'				=> 'Edit profile field',
-	'STEP_2_EXPLAIN_CREATE'			=> 'Here you are able to define some common options. Further you are able to preview the field you generated, as the user will see it. Play around with it until you are satisfied as how the field behaves.',
+	'STEP_2_EXPLAIN_CREATE'			=> 'Here you are able to define some common options you may want to adjust.',
 	'STEP_2_EXPLAIN_EDIT'			=> 'Here you are able to change some common options. Further you are able to preview the changed field, as the user will see it. Play around with it until you are satisfied as how the field behaves.<br /><strong>Please note that changes to profile fields will not affect existing profile fields entered by your users.</strong>',
 	'STEP_2_TITLE_CREATE'			=> 'Profile type specific options',
 	'STEP_2_TITLE_EDIT'				=> 'Profile type specific options',

phpBB/language/en/common.php

@@ -109,7 +109,7 @@ $lang = array_merge($lang, array(
 	'CLICK_VIEW_PRIVMSG'	=> '%sGo to your inbox%s',
 	'CLOSE_WINDOW'			=> 'Close window',
 	'COLOUR_SWATCH'			=> 'Colour swatch',
-	'COMMA_SEPARATOR'		=> ', ',	// Used in pagination and secret yet-to-be-release style, use localised comma if appropiate, eg: Ideographic or Arabic
+	'COMMA_SEPARATOR'		=> ', ',	// Used in pagination and secret yet-to-be-release style, use localised comma if appropriate, eg: Ideographic or Arabic
 	'CONFIRM'				=> 'Confirm',
 	'CONFIRM_CODE'			=> 'Confirmation code',
 	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as you see it in the image, it is case insensitive. Please note that a zero does not exist.',

phpBB/language/en/install.php

@@ -415,7 +415,7 @@ $lang = array_merge($lang, array(
 	'OLD_UPDATE_FILES'		=> 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
 
 	'PERFORM_DATABASE_UPDATE'			=> 'Perform database update',
-	'PERFORM_DATABASE_UPDATE_EXPLAIN'	=> 'Below you will find a link to the database update script. This script needs to be run seperatly because updating the database might result in unexpected behaviour if you are logged in. The database update can take a while, so please do not stop the execution if it seems to hang. After you performed the database update, close the database update window and continue the update process.',
+	'PERFORM_DATABASE_UPDATE_EXPLAIN'	=> 'Below you will find a link to the database update script. This script needs to be run separately because updating the database might result in unexpected behaviour if you are logged in. The database update can take a while, so please do not stop the execution if it seems to hang. After you performed the database update, close the database update window and continue the update process.',
 	'PREVIOUS_VERSION'					=> 'Previous version',
 	'PROGRESS'							=> 'Progress',
 

phpBB/language/en/ucp.php

@@ -334,7 +334,7 @@ $lang = array_merge($lang, array(
 	'POST_REPLY_PM'				=> 'Reply to message',
 	'PRINT_PM'					=> 'Print view',
 	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
-	'PROFILE_INFO_NOTICE'		=> 'Please note that this information will be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
+	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
 	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
 
 	'RECIPIENT'							=> 'Recipient',

phpBB/styles/subsilver2/template/ucp_header.html

@@ -60,7 +60,7 @@
 
 			<!-- IF S_PRIVMSGS -->
 
-				<!-- the ! at the beginning of the loop name forces the loop to be not a nested one of l_block1 (it gets parsed seperatly) -->
+				<!-- the ! at the beginning of the loop name forces the loop to be not a nested one of l_block1 (it gets parsed separately) -->
 				<!-- BEGIN !folder -->
 					<!-- IF folder.S_FIRST_ROW -->
 						<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">