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

Misc installation bugs

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6095 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames 2006-06-18 11:55:45 +00:00
parent 6cf4180bb7
commit f9f10be464
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/install/index.php
View file

@ -332,7 +332,7 @@ class module
*/ */
function page_footer() function page_footer()
{ {
global $template; global $db, $template;
$template->display('body'); $template->display('body');
@ -545,9 +545,7 @@ class module
'MESSAGE_TEXT' => '<p>' . basename($file) . ' [ ' . $line . ' ]</p><p>SQL : ' . $sql . '</p><p><b>' . $error . '</b></p>', 'MESSAGE_TEXT' => '<p>' . basename($file) . ' [ ' . $line . ' ]</p><p>SQL : ' . $sql . '</p><p><b>' . $error . '</b></p>',
)); ));
$db->sql_close();
$this->page_footer(); $this->page_footer();
exit;
} }
/** /**
@ -573,7 +571,7 @@ class module
$rows = (int) $tpl_type[1]; $rows = (int) $tpl_type[1];
$cols = (int) $tpl_type[2]; $cols = (int) $tpl_type[2];
$tpl = '<textarea id="' . $key . '" name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '">' . $value . '</textarea>'; $tpl = '<textarea id="' . $name . '" name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '">' . $value . '</textarea>';
break; break;
case 'radio': case 'radio':

9
phpBB/install/install_install.php
View file

@ -836,8 +836,8 @@ class install_install extends module
$server_name = ($server_name !== '') ? $server_name : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME')); $server_name = ($server_name !== '') ? $server_name : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
$server_port = ($server_port !== '') ? $server_port : ((!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT')); $server_port = ($server_port !== '') ? $server_port : ((!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT'));
$server_protocol = ($server_protocol !== '') ? $server_protocol : (isset($_SERVER['HTTPS']) ? 'https://' : 'http://'); $server_protocol = ($server_protocol !== '') ? $server_protocol : (isset($_SERVER['HTTPS'] && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://');
$cookie_secure = ($cookie_secure !== '') ? $cookie_secure : (isset($_SERVER['HTTPS']) ? true : false); $cookie_secure = ($cookie_secure !== '') ? $cookie_secure : (isset($_SERVER['HTTPS'] && $_SERVER['HTTPS'] == 'on') ? true : false);
foreach ($this->advanced_config_options as $config_key => $vars) foreach ($this->advanced_config_options as $config_key => $vars)
@ -1315,9 +1315,8 @@ class install_install extends module
$sql = 'SELECT * FROM ' . MODULES_TABLE . " $sql = 'SELECT * FROM ' . MODULES_TABLE . "
WHERE module_langname = '$mod_name' WHERE module_langname = '$mod_name'
AND module_class = '$module_class' AND module_class = '$module_class'
AND module_name <> '' AND module_name <> ''";
LIMIT 1"; $result = $db->sql_query_limit($sql, 1);
$result = $db->sql_query($sql);
$module_data = $db->sql_fetchrow($result); $module_data = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);