To all people having their bug status set to fixed: SF pserver CVS access is currently down, therefore the snapshots are still out of date.

- fix a bunch of bugs
- <!-- $Id$ --> is no longer allowed in template (.html) files
- changed layout of private message screens (folders are menu items)
- removed unread mode for private messages
- added new feature to template engine - "jump out of loop" or "loop another loop within my loop" :D (will be documented within the coding guidelines)
- added autologin field to sessions
- check session length checks
- added add_log statement to sessions to track session valid to invalid changes if ip/browser change depending on config settings (only debug)
- added multibyte support for various variables (exception at the moment is usernames which needs some discussion)
- hopefully not broke something. :/


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

phpBB/language/en/acp/permissions_phpbb.php

@@ -122,7 +122,6 @@ $lang = array_merge($lang, array(
 	'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
 	'acl_f_sticky'		=> array('lang' => 'Can post stickies', 'cat' => 'post'),
 	'acl_f_reply'		=> array('lang' => 'Can reply to posts', 'cat' => 'post'),
-	'acl_f_quote'		=> array('lang' => 'Can quote posts', 'cat' => 'post'),
 	'acl_f_icons'		=> array('lang' => 'Can use post icons', 'cat' => 'post'),
 
 	'acl_f_poll'		=> array('lang' => 'Can create polls', 'cat' => 'polls'),
@@ -141,7 +140,6 @@ $lang = array_merge($lang, array(
 	'acl_f_delete'		=> array('lang' => 'Can delete own posts', 'cat' => 'actions'),
 	'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
 	'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
-	'acl_f_rate'		=> array('lang' => 'Can rate posts', 'cat' => 'actions'),
 	'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
 	'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
 	'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),

phpBB/language/en/common.php

@@ -71,6 +71,7 @@ $lang = array_merge($lang, array(
 	'AVATAR_PHP_SIZE_NA'			=> 'The avatar is too huge in filesize.<br />Could not determine the maximum size defined by PHP in php.ini.',
 	'AVATAR_PHP_SIZE_OVERRUN'		=> 'The avatar is too huge in filesize, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
 	'AVATAR_URL_INVALID'			=> 'The URL you specified is invalid.',
+	'AVATAR_URL_NOT_FOUND'			=> 'The file specified could not be found.',
 	'AVATAR_WRONG_FILESIZE'			=> 'The avatar must be between 0 and %1d %2s.',
 	'AVATAR_WRONG_SIZE'				=> 'The avatar must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high.',
 
@@ -251,6 +252,8 @@ $lang = array_merge($lang, array(
 	'LOG_USER_WARNING'		=> '<b>Added user warning</b><br />&#187;%s',
 	'LOG_USER_WARNING_BODY'	=> '<b>The following warning was issued to this user</b><br />&#187;%s',
 
+	'LOG_IP_BROWSER_CHECK'	=> '<b>Session IP/Browser check failed</b><br />&#187;User IP "<i>%s</i>" checked against session IP "<i>%s</i>" and user browser string "<i>%s</i>" checked against session browser string "<i>%s</i>".',
+
 	'MARK'				=> 'Mark',
 	'MARK_ALL'			=> 'Mark all',
 	'MARK_FORUMS_READ'	=> 'Mark Forums Read',
@@ -260,6 +263,7 @@ $lang = array_merge($lang, array(
 	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
 	'MERGE_TOPIC'		=> 'Merge Topic',
 	'MESSAGE'			=> 'Message',
+	'MESSAGES'			=> 'Messages',
 	'MESSAGE_BODY'		=> 'Message body',
 	'MINUTES'			=> 'Minutes',
 	'MODERATE'			=> 'Moderate',
@@ -469,6 +473,7 @@ $lang = array_merge($lang, array(
 	'USERGROUPS'			=> 'Groups',
 	'USERNAME'				=> 'Username',
 	'USERNAMES'				=> 'Usernames',
+	'USER_CANNOT_READ'		=> 'You cannot read posts in this forum',
 	'USER_POST'				=> '%d Post',
 	'USER_POSTS'			=> '%d Posts',
 	'USERS'					=> 'Users',

phpBB/language/en/posting.php

@@ -181,10 +181,10 @@ $lang = array_merge($lang, array(
 	'UNGLOBALISE_EXPLAIN'		=> 'To switch this topic back from being global to a normal topic, you need to select the forum you whish this topic to be displayed',
 	'UPDATE_COMMENT'			=> 'Update comment',
 	'URL_INVALID'				=> 'The URL you specified is invalid.',
+	'URL_NOT_FOUND'				=> 'The file specified could not be found.',
 	'USER_CANNOT_BUMP'			=> 'You cannot bump topics in this forum',
 	'USER_CANNOT_DELETE'		=> 'You cannot delete posts in this forum',
 	'USER_CANNOT_EDIT'			=> 'You cannot edit posts in this forum',
-	'USER_CANNOT_QUOTE'			=> 'You cannot quote posts in this forum',
 	'USER_CANNOT_REPLY'			=> 'You cannot reply in this forum',
 	'USERNAME_DISALLOWED'		=> 'The username you entered has been banned.',
 	'USERNAME_TAKEN'			=> 'The username you entered is already in use, please select an alternative.',

phpBB/language/en/ucp.php

@@ -126,6 +126,7 @@ $lang = array_merge($lang, array(
 	'DEFAULT_NOTIFY'			=> 'Notify me upon replies by default',
 	'DEFAULT_SMILIES'			=> 'Enable smilies by default',
 	'DEFINED_RULES'				=> 'Defined Rules',
+	'DELETED_TOPIC'				=> 'Topic has been removed',
 	'DELETE_ALL'				=> 'Delete all',
 	'DELETE_ATTACHMENT'			=> 'Delete Attachment',
 	'DELETE_ATTACHMENTS'		=> 'Delete Attachments',
@@ -223,6 +224,7 @@ $lang = array_merge($lang, array(
 	'MESSAGES_DELETED'			=> 'Messages successfully deleted',
 	'MOVE_DELETED_MESSAGES_TO'	=> 'Move messages from removed folder to',
 	'MOVE_DOWN'					=> 'Move down',
+	'MOVE_MARKED_TO_FOLDER'		=> 'Move marked to %s',
 	'MOVE_PM_ERROR'				=> 'An error occurred while moving the messages to the new folder, only %1d from %2d messages were moved.',
 	'MOVE_TO_FOLDER'			=> 'Move to Folder',
 	'MOVE_UP'					=> 'Move up',