mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-29 04:39:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix php5 apache configuration with upgrade.

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@5387 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2010-03-26 16:49:23 +00:00
parent b9978b0ad3
commit 7b25308e73
4 changed files with 36 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/include/functions_install.inc.php
View file

@ -139,7 +139,7 @@ function activate_all_themes()
}
}
function try_db_connection(&$infos, &$errors)
function install_db_connect(&$infos, &$errors)
{
try
{

17
admin/include/functions_upgrade.php
View file

@ -66,6 +66,8 @@ function prepare_conf_upgrade()
define('IMAGE_TAG_TABLE', $prefixeTable.'image_tag');
define('PLUGINS_TABLE', $prefixeTable.'plugins');
define('OLD_PERMALINKS_TABLE', $prefixeTable.'old_permalinks');
define('THEMES_TABLE', $prefixeTable.'themes');
define('LANGUAGES_TABLE', $prefixeTable.'languages');
}
// Deactivate all non-standard plugins
@ -213,4 +215,19 @@ SELECT id
return (count(array_diff($existing, $applied)) > 0);
}
function upgrade_db_connect()
{
global $conf;
try
{
$pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
$conf['db_password'], $conf['db_base']);
}
catch (Exception $e)
{
my_error(l10n($e->getMessage()), true);
}
}
?>

4
install.php
View file

@ -183,7 +183,6 @@ elseif (@file_exists($config_file))
include(PHPWG_ROOT_PATH . 'include/constants.php');
include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
include(PHPWG_ROOT_PATH . 'admin/include/functions.php');
include(PHPWG_ROOT_PATH . 'admin/include/functions_upgrade.php');
include(PHPWG_ROOT_PATH . 'admin/include/languages.class.php');
$languages = new languages('utf-8');
@ -259,10 +258,11 @@ if (!isset($step))
//---------------------------------------------------------------- form analyze
include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$dblayer.'.inc.php');
include(PHPWG_ROOT_PATH . 'admin/include/functions_install.inc.php');
include(PHPWG_ROOT_PATH . 'admin/include/functions_upgrade.php');
if ( isset( $_POST['install'] ))
{
if (try_db_connection($infos, $errors))
if (install_db_connect($infos, $errors))
{
$required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION');
if ( version_compare(pwg_get_db_version(), $required_version, '>=') )

34
upgrade.php
View file

@ -38,31 +38,16 @@ if ($php_end_tag === false)
include_once(PHPWG_ROOT_PATH.'include/functions.inc.php');
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php');
include(PHPWG_ROOT_PATH.'local/config/database.inc.php');
include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
prepare_conf_upgrade();
// $conf is not used for users tables - define cannot be re-defined
define('USERS_TABLE', $prefixeTable.'users');
include_once(PHPWG_ROOT_PATH.'include/constants.php');
define('PREFIX_TABLE', $prefixeTable);
// Database connection
try
{
$pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
$conf['db_password'], $conf['db_base']);
}
catch (Exception $e)
{
my_error(l10n($e->getMessage(), true));
}
pwg_db_check_charset();
// +-----------------------------------------------------------------------+
// | functions |
// +-----------------------------------------------------------------------+
@ -148,6 +133,9 @@ function print_time($message)
// +-----------------------------------------------------------------------+
// | language |
// +-----------------------------------------------------------------------+
include(PHPWG_ROOT_PATH . 'admin/include/languages.class.php');
$languages = new languages('utf-8');
if (isset($_GET['language']))
{
$language = strip_tags($_GET['language']);
@ -156,7 +144,7 @@ else
{
$language = 'en_UK';
// Try to get browser language
foreach (get_languages('utf-8') as $language_code => $language_name)
foreach ($languages->fs_languages as $language_code => $language_name)
{
if (substr($language_code,0,2) == @substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2))
{
@ -206,6 +194,16 @@ if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<'))
include(PHPWG_ROOT_PATH.'install/php5_apache_configuration.php');
}
// +-----------------------------------------------------------------------+
// | database connection |
// +-----------------------------------------------------------------------+
include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php');
include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
upgrade_db_connect();
pwg_db_check_charset();
// +-----------------------------------------------------------------------+
// | template initialization |
// +-----------------------------------------------------------------------+