archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 1255: add pwg_select_db function.

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@5230 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2010-03-21 21:15:54 +00:00
parent 62ce6a7f15
commit 54c9ceb0f4
8 changed files with 47 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/common.inc.php
View file

@ -105,8 +105,8 @@ include( PHPWG_ROOT_PATH .'include/template.class.php');
// Database connection
$pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
$conf['db_password'], $conf['db_base'])
or my_error('pwg_db_connect', true);
$conf['db_password'], $conf['db_base']);
pwg_select_db($conf['db_base'], $pwg_db_link);
pwg_db_check_charset();

10
include/dblayer/functions_mysql.inc.php
View file

@ -32,14 +32,18 @@ define('DB_RANDOM_FUNCTION', 'RAND');
*
*/
function pwg_db_connect($host, $user, $password, $database)
function pwg_db_connect($host, $user, $password, $database=null, $die=true)
{
$link = mysql_connect($host, $user, $password) or my_error('mysql_connect', false);
mysql_select_db($database, $link) or my_error('mysql_select_db', false);
$link = @mysql_connect($host, $user, $password) or my_error('mysql_connect', $die);
return $link;
}
function pwg_select_db($database, $link, $die=true)
{
return @mysql_select_db($database, $link) or my_error('mysql_select_db', $die);
}
function pwg_db_check_charset()
{
defined('PWG_CHARSET') and defined('DB_CHARSET')

9
include/dblayer/functions_pdo-sqlite.inc.php
View file

@ -33,7 +33,7 @@ define('DB_RANDOM_FUNCTION', 'RANDOM');
*
*/
function pwg_db_connect($host, $user, $password, $database)
function pwg_db_connect($host, $user, $password, $database, $die=true)
{
global $conf;
@ -42,7 +42,7 @@ function pwg_db_connect($host, $user, $password, $database)
try {
$link = new PDO($db_file);
} catch (Exception $e) {
my_error('sqlite::open', true);
my_error('sqlite::open', $die);
}
$link->sqliteCreateFunction('now', 'pwg_now', 0);
@ -56,6 +56,11 @@ function pwg_db_connect($host, $user, $password, $database)
return $link;
}
function pwg_select_db($database=null, $link=null, $die=null)
{
return true;
}
function pwg_db_check_charset()
{
return true;

9
include/dblayer/functions_pgsql.inc.php
View file

@ -33,7 +33,7 @@ define('DB_RANDOM_FUNCTION', 'RANDOM');
*
*/
function pwg_db_connect($host, $user, $password, $database)
function pwg_db_connect($host, $user, $password, $database, $die=true)
{
$connection_string = '';
if (strpos($host,':') !== false)
@ -49,11 +49,16 @@ function pwg_db_connect($host, $user, $password, $database)
$user,
$password,
$database);
$link = pg_connect($connection_string) or my_error('pg_connect', false);
$link = pg_connect($connection_string) or my_error('pg_connect', $die);
return $link;
}
function pwg_select_db($database=null, $link=null, $die=null)
{
return true;
}
function pwg_db_check_charset()
{
return true;

9
include/dblayer/functions_sqlite.inc.php
View file

@ -33,7 +33,7 @@ define('DB_RANDOM_FUNCTION', 'RANDOM');
*
*/
function pwg_db_connect($host, $user, $password, $database)
function pwg_db_connect($host, $user, $password, $database, $die=true)
{
global $conf;
@ -50,7 +50,7 @@ function pwg_db_connect($host, $user, $password, $database)
try {
$link = new SQLite3($db_file, $sqlite_open_mode);
} catch (Exception $e) {
my_error('sqlite::open', true);
my_error('sqlite::open', $die);
}
$link->createFunction('now', 'pwg_now', 0);
@ -64,6 +64,11 @@ function pwg_db_connect($host, $user, $password, $database)
return $link;
}
function pwg_select_db($database=null, $link=null, $die=null)
{
return true;
}
function pwg_db_check_charset()
{
return true;

17
install.php
View file

@ -227,11 +227,20 @@ if (!isset($step))
//---------------------------------------------------------------- form analyze
if ( isset( $_POST['install'] ))
{
ob_start();
if (($pwg_db_link = pwg_db_connect($_POST['dbhost'], $_POST['dbuser'],
$_POST['dbpasswd'], $_POST['dbname']))!==false)
$_POST['dbpasswd'], $_POST['dbname'], false))!==false)
{
array_push( $infos, l10n('Parameters are correct') );
if (pwg_select_db($_POST['dbname'], $pwg_db_link, false)!==false)
{
array_push( $infos, l10n('Parameters are correct') );
}
else
{
array_push( $errors,
l10n('Connection to server succeed, but it was impossible to connect to database') );
}
ob_end_clean();
$required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION');
if ( version_compare(pwg_get_db_version(), $required_version, '>=') )
@ -261,8 +270,8 @@ if ( isset( $_POST['install'] ))
else
{
array_push( $errors, l10n('Can\'t connect to server') );
ob_end_clean();
}
$webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name ));
if ( empty($webmaster))
array_push( $errors, l10n('enter a login for webmaster') );

4
upgrade.php
View file

@ -52,8 +52,8 @@ define('PREFIX_TABLE', $prefixeTable);
// Database connection
$pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
$conf['db_password'], $conf['db_base'])
or my_error('pwg_db_connect', true);
$conf['db_password'], $conf['db_base']);
pwg_select_db($conf['db_base'], $pwg_db_link);
pwg_db_check_charset();

4
upgrade_feed.php
View file

@ -56,8 +56,8 @@ define('UPGRADES_PATH', PHPWG_ROOT_PATH.'install/db');
// +-----------------------------------------------------------------------+
$pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
$conf['db_password'], $conf['db_base'])
or my_error('pwg_db_connect', true);
$conf['db_password'], $conf['db_base']);
pwg_select_db($conf['db_base'], $pwg_db_link);
pwg_db_check_charset();