adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-05 01:12:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove useless check of mysql.inc.php

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@5983 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2010-04-28 15:36:29 +00:00
parent 73db66afa5
commit b83bd09729
1 changed files with 27 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.php
+27 -92
View File
@@ -146,31 +146,8 @@ $admin_mail = (!empty($_POST['admin_mail'])) ? $_POST['admin_mail'] : '';
$infos = array();
$errors = array();
// database config file migration : mysql.inc.php et database.inc.php
$old_config_file = PHPWG_ROOT_PATH . 'include/mysql.inc.php';
$config_file = PHPWG_ROOT_PATH . 'local/config/database.inc.php';
if (!file_exists($config_file) && file_exists($old_config_file))
{
$step = 3;
include $old_config_file;
$file_content = '<?php
$conf[\'dblayer\'] = \'mysql\';
$conf[\'db_base\'] = \''.$cfgBase.'\';
$conf[\'db_user\'] = \''.$cfgUser.'\';
$conf[\'db_password\'] = \''.$cfgPassword.'\';
$conf[\'db_host\'] = \''.$cfgHote.'\';
$prefixeTable = \''.$prefixeTable.'\';
define(\'PHPWG_INSTALLED\', true);
define(\'PWG_CHARSET\', \''.PWG_CHARSET.'\');
define(\'DB_CHARSET\', \''.DB_CHARSET.'\');
define(\'DB_COLLATE\', \''.DB_COLLATE.'\');
?'.'>';
}
// Open config.php ... if it exists
elseif (@file_exists($config_file))
if (@file_exists($config_file))
{
include($config_file);
// Is Piwigo already installed ?
@@ -234,12 +211,10 @@ else {
}
define('PHPWG_URL', 'http://'.PHPWG_DOMAIN);
if (empty($step) || ($step != 3))
{
load_language('common.lang', '', array('language' => $language, 'target_charset'=>'utf-8'));
load_language('admin.lang', '', array('language' => $language, 'target_charset'=>'utf-8'));
load_language('install.lang', '', array('language' => $language, 'target_charset'=>'utf-8'));
}
load_language('common.lang', '', array('language' => $language, 'target_charset'=>'utf-8'));
load_language('admin.lang', '', array('language' => $language, 'target_charset'=>'utf-8'));
load_language('install.lang', '', array('language' => $language, 'target_charset'=>'utf-8'));
header('Content-Type: text/html; charset=UTF-8');
//------------------------------------------------- check php version
if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<'))
@@ -407,79 +382,39 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment)
}
//------------------------------------------------------ start template output
if ($step == 3)
$dbengines = available_engines();
foreach ($languages->fs_languages as $language_code => $language_name)
{
@umask(0111);
// writing the new configuration file
if ( !($fp = @fopen( $config_file, 'w' )))
if ($language == $language_code)
{
$html_content = htmlentities( $file_content, ENT_QUOTES );
$html_content = nl2br( $html_content );
$error_copy = l10n('An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)');
$error_copy .= '<br><br>';
$error_copy .= '<textarea rows="15" cols="70">'.$html_content.'</textarea>';
}
else
{
@fputs($fp, $file_content, strlen($file_content));
@fclose($fp);
@unlink($old_config_file);
header("Location: index.php");
exit();
$template->assign('language_selection', $language_code);
}
$template->assign(
array(
'T_CONTENT_ENCODING' => 'utf-8',
'migration' => true
)
);
$languages_options[$language_code] = $language_name;
}
else
{
$dbengines = available_engines();
$template->assign('language_options', $languages_options);
foreach ($languages->fs_languages as $language_code => $language_name)
{
if ($language == $language_code)
{
$template->assign('language_selection', $language_code);
}
$languages_options[$language_code] = $language_name;
}
$template->assign('language_options', $languages_options);
$template->assign(
array(
'T_CONTENT_ENCODING' => 'utf-8',
'RELEASE' => PHPWG_VERSION,
'F_ACTION' => 'install.php?language=' . $language,
'F_DB_ENGINES' => $dbengines,
'F_DB_LAYER' => $dblayer,
'F_DB_HOST' => $dbhost,
'F_DB_USER' => $dbuser,
'F_DB_NAME' => $dbname,
'F_DB_PREFIX' => $prefixeTable,
'F_ADMIN' => $admin_name,
'F_ADMIN_EMAIL' => $admin_mail,
'L_INSTALL_HELP' => sprintf(l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'), PHPWG_URL.'/forum'),
));
}
$template->assign(
array(
'T_CONTENT_ENCODING' => 'utf-8',
'RELEASE' => PHPWG_VERSION,
'F_ACTION' => 'install.php?language=' . $language,
'F_DB_ENGINES' => $dbengines,
'F_DB_LAYER' => $dblayer,
'F_DB_HOST' => $dbhost,
'F_DB_USER' => $dbuser,
'F_DB_NAME' => $dbname,
'F_DB_PREFIX' => $prefixeTable,
'F_ADMIN' => $admin_name,
'F_ADMIN_EMAIL' => $admin_mail,
'L_INSTALL_HELP' => sprintf(l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'), PHPWG_URL.'/forum'),
));
//------------------------------------------------------ errors & infos display
if ($step == 1)
{
$template->assign('install', true);
}
elseif ($step == 3)
{
if (isset($error_copy))
{
array_push($errors, $error_copy);
}
}
else
{
array_push(