From d20997f5bcd72581d1a6a03709529ff11503ee23 Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Thu, 20 Jul 2006 20:27:23 +0000 Subject: [PATCH] * Missing image in imageset editing * Sort the list of images * Enforce default username limits on install git-svn-id: file:///svn/phpbb/trunk@6196 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_styles.php | 6 +++++- phpBB/install/install_install.php | 13 ++++++++++++- phpBB/language/en/acp/styles.php | 1 + phpBB/language/en/install.php | 4 ++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 2d123c5597..92bd515f98 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -1279,7 +1279,7 @@ pagination_sep = \'{PAGINATION_SEP}\' 'forums' => array( 'forum', 'forum_new', 'forum_locked', 'forum_link', 'sub_forum', 'sub_forum_new',), 'folders' => array( - 'folder', 'folder_posted', 'folder_new', 'folder_new_posted', 'folder_hot', 'folder_hot_posted', 'folder_hot_new', 'folder_hot_new_posted', 'folder_locked', 'folder_locked_posted', 'folder_locked_new', 'folder_locked_new_posted', 'folder_locked_announce', 'folder_locked_announce_new', 'folder_locked_announce_posted', 'folder_locked_announce_new_posted', 'folder_locked_global', 'folder_locked_global_new', 'folder_locked_global_posted', 'folder_locked_global_new_posted', 'folder_locked_sticky', 'folder_locked_sticky_new', 'folder_locked_sticky_posted', 'folder_locked_sticky_new_posted', 'folder_sticky', 'folder_sticky_posted', 'folder_sticky_new', 'folder_sticky_new_posted', 'folder_announce', 'folder_announce_posted', 'folder_announce_new', 'folder_announce_new_posted', 'folder_global', 'folder_global_posted', 'folder_global_new', 'folder_global_new_posted',), + 'folder', 'folder_moved', 'folder_posted', 'folder_new', 'folder_new_posted', 'folder_hot', 'folder_hot_posted', 'folder_hot_new', 'folder_hot_new_posted', 'folder_locked', 'folder_locked_posted', 'folder_locked_new', 'folder_locked_new_posted', 'folder_locked_announce', 'folder_locked_announce_new', 'folder_locked_announce_posted', 'folder_locked_announce_new_posted', 'folder_locked_global', 'folder_locked_global_new', 'folder_locked_global_posted', 'folder_locked_global_new_posted', 'folder_locked_sticky', 'folder_locked_sticky_new', 'folder_locked_sticky_posted', 'folder_locked_sticky_new_posted', 'folder_sticky', 'folder_sticky_posted', 'folder_sticky_new', 'folder_sticky_new_posted', 'folder_announce', 'folder_announce_posted', 'folder_announce_new', 'folder_announce_new_posted', 'folder_global', 'folder_global_posted', 'folder_global_new', 'folder_global_new_posted',), 'polls' => array( 'poll_left', 'poll_center', 'poll_right',), ); @@ -1372,6 +1372,10 @@ pagination_sep = \'{PAGINATION_SEP}\' } closedir($dp); + // Make sure the list of possible images is sorted alphabetically + sort($imagesetlist['nolang']); + sort($imagesetlist['lang']); + $imagesetlist_options = ''; foreach ($imagesetlist as $type => $img_ary) { diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 4b5de1238a..22a7bffa21 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -558,6 +558,17 @@ class install_install extends module $error[] = $lang['INST_ERR_PASSWORD_MISMATCH']; } + // Test against the default username rules + if ($admin_name != '' && strlen($admin_name) < 3) + { + $error[] = $lang['INST_ERR_USER_TOO_SHORT']; + } + + if ($admin_name != '' && strlen($admin_name) > 20) + { + $error[] = $lang['INST_ERR_USER_TOO_LONG']; + } + // Test against the default password rules if ($admin_pass1 != '' && strlen($admin_pass1) < 6) { @@ -1812,7 +1823,7 @@ class install_install extends module var $admin_config_options = array( 'legend1' => 'ADMIN_CONFIG', 'language' => array('lang' => 'DEFAULT_LANG', 'type' => 'select', 'options' => '$this->module->inst_language_select(\'{VALUE}\')', 'explain' => false), - 'admin_name' => array('lang' => 'ADMIN_USERNAME', 'type' => 'text:25:100', 'explain' => false), + 'admin_name' => array('lang' => 'ADMIN_USERNAME', 'type' => 'text:25:100', 'explain' => true), 'admin_pass1' => array('lang' => 'ADMIN_PASSWORD', 'type' => 'password:25:100', 'explain' => true), 'admin_pass2' => array('lang' => 'ADMIN_PASSWORD_CONFIRM', 'type' => 'password:25:100', 'explain' => false), 'board_email1' => array('lang' => 'CONTACT_EMAIL', 'type' => 'text:25:100', 'explain' => false), diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 1e6c84a354..9e9a44a703 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -198,6 +198,7 @@ $lang = array_merge($lang, array( 'IMG_FOLDER_LOCKED_STICKY_POSTED' => 'Sticky topic locked posted to', 'IMG_FOLDER_LOCKED_STICKY_NEW' => 'Sticky topic locked new posts', 'IMG_FOLDER_LOCKED_STICKY_NEW_POSTED' => 'Sticky topic locked posted to new', + 'IMG_FOLDER_MOVED' => 'Topic moved', 'IMG_FOLDER_NEW' => 'Topic new posts', 'IMG_FOLDER_NEW_POSTED' => 'Topic posted to new', 'IMG_FOLDER_POSTED' => 'Topic posted to', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 62e258fd7b..cf7b33b8b1 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -35,6 +35,7 @@ $lang = array_merge($lang, array( 'ADMIN_PASSWORD_EXPLAIN' => '(Please enter a password between 6 and 30 characters is length)', 'ADMIN_TEST' => 'Check administrator settings', 'ADMIN_USERNAME' => 'Administrator username', + 'ADMIN_USERNAME_EXPLAIN' => '(Please enter a password between 3 and 20 characters is length)', 'APP_MAGICK' => 'Imagemagick support [ Attachments ]', 'AUTHOR_NOTES' => 'Author Notes
» %s', 'AVAILABLE' => 'Available', @@ -168,6 +169,9 @@ $lang = array_merge($lang, array( 'INST_ERR_PASSWORD_TOO_LONG' => 'The password you entered is too long. The maximum length is 30 characters.', 'INST_ERR_PASSWORD_TOO_SHORT' => 'The password you entered is too short. The minimum length is 6 characters.', 'INST_ERR_PREFIX' => 'Tables with the specified prefix already exist, please choose an alternative.', + 'INST_ERR_PREFIX_TOO_LONG' => 'The table prefix you have specified is too long. The maximum length is %d characters.', + 'INST_ERR_USER_TOO_LONG' => 'The username you entered is too long. The maximum length is 20 characters.', + 'INST_ERR_USER_TOO_SHORT' => 'The username you entered is too short. The minimum length is 3 characters.', 'INVALID_PRIMARY_KEY' => 'Invalid primary key : %s', 'MAKE_FOLDER_WRITABLE' => 'Please make sure that this folder exists and is writable by the webserver then try again:
»%s',