mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
some very tiny adjustements.
git-svn-id: file:///svn/phpbb/trunk@6939 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
3f53551fa8
commit
538ffb5bfb
6 changed files with 16 additions and 15 deletions
|
@ -8,17 +8,14 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/**
|
||||||
* @todo Make all spellings consistant with those in the main code (eg smilie, etc) as there are several used
|
* Default avatar width/height
|
||||||
|
* @ignore
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Default avatar width/height
|
|
||||||
define('DEFAULT_AVATAR_X', 80);
|
define('DEFAULT_AVATAR_X', 80);
|
||||||
define('DEFAULT_AVATAR_Y', 80);
|
define('DEFAULT_AVATAR_Y', 80);
|
||||||
|
|
||||||
/**
|
// Global functions - all functions can be used by convertors
|
||||||
* Global functions - all functions can be used by convertors
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine whether we are approaching the maximum execution time
|
* Determine whether we are approaching the maximum execution time
|
||||||
|
@ -1055,10 +1052,9 @@ function add_user_group($group_id, $user_id, $group_leader=false)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add users to the pre-defined "special" groups
|
* Add users to the pre-defined "special" groups
|
||||||
|
*
|
||||||
* @param string $group The name of the special group to add to
|
* @param string $group The name of the special group to add to
|
||||||
* @param string $select_query An SQL query to retrieve the user(s) to add to the group
|
* @param string $select_query An SQL query to retrieve the user(s) to add to the group
|
||||||
*
|
|
||||||
* @todo Is this perhaps misnamed? It doesn't appear to directly have anything to do with auth
|
|
||||||
*/
|
*/
|
||||||
function user_group_auth($group, $select_query)
|
function user_group_auth($group, $select_query)
|
||||||
{
|
{
|
||||||
|
|
|
@ -6,9 +6,6 @@
|
||||||
* @copyright (c) 2006 phpBB Group
|
* @copyright (c) 2006 phpBB Group
|
||||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||||
*
|
*
|
||||||
* @todo make sure the replacements are called correctly
|
|
||||||
* already done: strtolower, strtoupper, ucfirst, str_split, strrpos, strlen (hopefully!), strpos, substr, htmlspecialchars
|
|
||||||
* remaining: strspn, chr, ord
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -143,7 +143,7 @@ if (!$get_info)
|
||||||
{
|
{
|
||||||
// Test to see if the birthday MOD is installed on the source forum
|
// Test to see if the birthday MOD is installed on the source forum
|
||||||
// Niels' birthday mod
|
// Niels' birthday mod
|
||||||
if (get_config_value('birthday_required') !== false)
|
if (get_config_value('birthday_required') !== false || get_config_value('bday_required') !== false)
|
||||||
{
|
{
|
||||||
define('MOD_BIRTHDAY', true);
|
define('MOD_BIRTHDAY', true);
|
||||||
}
|
}
|
||||||
|
@ -151,7 +151,6 @@ if (!$get_info)
|
||||||
// TerraFrost's validated birthday mod
|
// TerraFrost's validated birthday mod
|
||||||
if (get_config_value('bday_required') !== false)
|
if (get_config_value('bday_required') !== false)
|
||||||
{
|
{
|
||||||
define('MOD_BIRTHDAY', true);
|
|
||||||
define('MOD_BIRTHDAY_TERRA', true);
|
define('MOD_BIRTHDAY_TERRA', true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1289,6 +1289,7 @@ function sql_column_change($dbms, $table_name, $column_name, $column_data)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add search robots to the database
|
* Add search robots to the database
|
||||||
|
* @ignore
|
||||||
*/
|
*/
|
||||||
function add_bots()
|
function add_bots()
|
||||||
{
|
{
|
||||||
|
|
|
@ -30,6 +30,10 @@ if (!empty($setmodules))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class holding all convertor-specific details.
|
||||||
|
* @package install
|
||||||
|
*/
|
||||||
class convert
|
class convert
|
||||||
{
|
{
|
||||||
var $options = array();
|
var $options = array();
|
||||||
|
@ -63,6 +67,10 @@ class convert
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert class for conversions
|
||||||
|
* @package install
|
||||||
|
*/
|
||||||
class install_convert extends module
|
class install_convert extends module
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -203,7 +203,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.B5-dev');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.B5');
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue