makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a rather silly bug in the module install code.

Browse source 
Quick access works now :)


git-svn-id: file:///svn/phpbb/trunk@5964 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames 2006-05-24 18:49:39 +00:00
parent 28a306ae00
commit a59f59de21
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/install/install_install.php
View file

@ -1207,7 +1207,7 @@ class install_install extends module
AND module_id = {$module_data['parent_id']}";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$row2 = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
@ -1216,13 +1216,13 @@ class install_install extends module
$sql = 'UPDATE ' . MODULES_TABLE . "
SET left_id = left_id + 2, right_id = right_id + 2
WHERE module_class = '" . $module_class . "'
AND left_id > {$row['right_id']}";
AND left_id > {$row2['right_id']}";
$db->sql_query($sql);
$sql = 'UPDATE ' . MODULES_TABLE . "
SET right_id = right_id + 2
WHERE module_class = '" . $module_class . "'
AND {$row['left_id']} BETWEEN left_id AND right_id";
AND {$row2['left_id']} BETWEEN left_id AND right_id";
$db->sql_query($sql);
}
else
@ -1230,11 +1230,11 @@ class install_install extends module
$sql = 'UPDATE ' . MODULES_TABLE . "
SET left_id = left_id + 3, right_id = right_id + 3
WHERE module_class = '" . $module_class . "'
AND left_id > {$row['left_id']}";
AND left_id > {$row2['left_id']}";
$db->sql_query($sql);
}
$module_data['left_id'] = ($categories[$cat_name]['parent_id']) ? $row['right_id'] : $row['left_id'] + 1;
$module_data['right_id'] = ($categories[$cat_name]['parent_id']) ? $row['right_id'] + 1 : $row['left_id'] + 2;
$module_data['left_id'] = ($categories[$cat_name]['parent_id']) ? $row2['right_id'] : $row2['left_id'] + 1;
$module_data['right_id'] = ($categories[$cat_name]['parent_id']) ? $row2['right_id'] + 1 : $row2['left_id'] + 2;
$sql = 'INSERT INTO ' . MODULES_TABLE . ' ' . $db->sql_build_array('INSERT', $module_data);
$db->sql_query($sql);

15
phpBB/language/en/install.php
View file

@ -36,6 +36,7 @@ $lang = array_merge($lang, array(
'ADMIN_TEST' => 'Check administrator settings',
'ADMIN_USERNAME' => 'Administrator username',
'APP_MAGICK' => 'Imagemagick support [ Attachments ]',
'AUTHOR_NOTES' => 'Author Notes<br />&#187; %s',
'AVAILABLE' => 'Available',
'AVAILABLE_CONVERTORS' => 'Available Convertors',
@ -47,11 +48,15 @@ $lang = array_merge($lang, array(
'CAT_CONVERT' => 'Convert',
'CAT_INSTALL' => 'Install',
'CAT_OVERVIEW' => 'Overview',
'CHECK_TABLE_PREFIX' => 'Please check your table prefix and try again.',
'CLEAN_VERIFY' => 'Cleaning up and verifying the final structure',
'CONFIG_CONVERT' => 'Converting the configuration',
'CONFIG_FILE_UNABLE_WRITE' => 'It was not possible to write the configuration file. Alternative methods for this file to be created are presented below',
'CONFIG_FILE_WRITTEN' => 'The configuration file has been written, you may now proceed to the next step of the installation',
'CONFIG_RETRY' => 'Retry',
'CONTACT_EMAIL_CONFIRM' => 'Confirm contact email',
'CONTINUE_CONVERT' => 'Continue conversion',
'CONTINUE_LAST' => 'Continue last statements',
'CONVERT' => 'Convert',
'CONVERT_COMPLETE' => 'Conversion completed',
'CONVERT_INTRO' => 'Welcome to the phpBB Unified Convertor Framework',
@ -97,6 +102,8 @@ $lang = array_merge($lang, array(
'FILES_OPTIONAL_EXPLAIN' => '<b>Optional</b> - These files, directories or permissions are not required. The installation routines will attempt to use various techniques to complete if they do not exist or cannot be written to. However, the presence of these files, directories or permissions will speed installation.',
'FILES_REQUIRED' => 'Files and Directories',
'FILES_REQUIRED_EXPLAIN' => '<b>Required</b> - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see "Not Found" you need to create the relevant file or directory. If you see "Unwriteable" you need to change the permissions on the file or directory to allow phpBB to write to it.',
'FILLING_TABLE' => 'Filling table <b>%s</b>',
'FILLING_TABLES' => 'Filling Tables',
'FORUM_ADDRESS' => 'Forum address',
'FORUM_ADDRESS_EXPLAIN' => 'This is the http address of your former forum',
'FORUM_PATH' => 'Forum path',
@ -146,11 +153,15 @@ $lang = array_merge($lang, array(
'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.',
'MAKE_FOLDER_WRITABLE' => 'Please make sure that this folder exists and is writable by the webserver then try again:<br />&#187;<b>%s</b>',
'MAKE_FOLDERS_WRITABLE' => 'Please make sure that these folders exist and are writable by the webserver then try again:<br />&#187;<b>%s</b>',
'NEXT_STEP' => 'Proceed to next step',
'NOT_FOUND' => 'Cannot find',
'NO_CONVERTORS' => 'No convertors are available for use',
'NO_CONVERT_SPECIFIED' => 'No convertor specified',
'NO_LOCATION' => 'Cannot determine location',
'NO_TABLES_FOUND' => 'No tables found.',
// TODO: Write some explanatory introduction text
'OVERVIEW_BODY' => '<p>Some brief explanatory text about phpBB will go here.</p><p>This installation system will guide you through the process of installing phpBB, converting from a different software package or updating to the latest version of phpBB. For more information on each option, select it from the menu above</p>',
@ -165,6 +176,8 @@ $lang = array_merge($lang, array(
'PHP_SETTINGS_EXPLAIN' => '<b>Required</b> - You must be running at least version 4.3.3 of PHP in order to install phpBB. If "safe mode" is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
'PHP_VERSION_REQD' => 'PHP version >= 4.3.3',
'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using <b>%s</b> as table prefix.',
'PREPROCESS_STEP' => 'Executing pre-processing functions/queries',
'PRE_CONVERT_COMPLETE' => 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process.',
// 'REQUIRED' => 'Required',
'REQUIREMENTS_TITLE' => 'Installation Compatibility',
@ -187,6 +200,7 @@ $lang = array_merge($lang, array(
'STAGE_IN_PROGRESS' => 'Conversion in progress',
'STAGE_REQUIREMENTS' => 'Requirements',
'STAGE_SETTINGS' => 'Settings',
'STARTING_CONVERT' => 'Starting Conversion Process',
'SUB_INTRO' => 'Introduction',
'SUB_LICENSE' => 'License',
'SUB_SUPPORT' => 'Support',
@ -196,6 +210,7 @@ $lang = array_merge($lang, array(
'SYNC_FORUMS' => 'Starting to sync forums',
'SYNC_TOPICS' => 'Starting to sync topics',
'TABLES_MISSING' => 'Could not find these tables<br />&#187; <b>%s</b>.',
'TABLE_PREFIX' => 'Prefix for tables in database',
'TABLE_PREFIX_SAME' => 'The table prefix needs to be the one used by the software you are converting from.<br />&#187; Specified table prefix was %s',
'TESTS_PASSED' => 'Tests passed',