From 34354aa6a950ee92a1b7b3928bcfa766065dfef9 Mon Sep 17 00:00:00 2001 From: plegall Date: Sat, 8 Jan 2005 23:32:25 +0000 Subject: - replacement of variable names in include/mysql.inc.php (for upgrades) : dbname => cfgBase dbuser => cfgUser dbpasswd => cfgPassword dbhost => cfgHote table_prefix => prefixeTable git-svn-id: http://piwigo.org/svn/trunk@681 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/common.inc.php | 4 ++-- include/constants.php | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'include') diff --git a/include/common.inc.php b/include/common.inc.php index d921a280d..68c4e6434 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -126,9 +126,9 @@ include(PHPWG_ROOT_PATH . 'include/functions.inc.php'); include(PHPWG_ROOT_PATH . 'include/template.php'); // Database connection -mysql_connect( $dbhost, $dbuser, $dbpasswd ) +mysql_connect( $cfgHote, $cfgUser, $cfgPassword ) or die ( "Could not connect to database server" ); -mysql_select_db( $dbname ) +mysql_select_db( $cfgBase ) or die ( "Could not connect to database" ); // diff --git a/include/constants.php b/include/constants.php index 449401a7d..1b450f65e 100644 --- a/include/constants.php +++ b/include/constants.php @@ -40,22 +40,22 @@ define('CRITICAL_MESSAGE', 203); define('CRITICAL_ERROR', 204); // Table names -define('CATEGORIES_TABLE', $table_prefix.'categories'); -define('COMMENTS_TABLE', $table_prefix.'comments'); -define('CONFIG_TABLE', $table_prefix.'config'); -define('FAVORITES_TABLE', $table_prefix.'favorites'); -define('GROUP_ACCESS_TABLE', $table_prefix.'group_access'); -define('GROUPS_TABLE', $table_prefix.'groups'); -define('HISTORY_TABLE', $table_prefix.'history'); -define('IMAGE_CATEGORY_TABLE', $table_prefix.'image_category'); -define('IMAGES_TABLE', $table_prefix.'images'); -define('SESSIONS_TABLE', $table_prefix.'sessions'); -define('SITES_TABLE', $table_prefix.'sites'); -define('USER_ACCESS_TABLE', $table_prefix.'user_access'); -define('USER_GROUP_TABLE', $table_prefix.'user_group'); -define('USERS_TABLE', $table_prefix.'users'); -define('WAITING_TABLE', $table_prefix.'waiting'); -define('IMAGE_METADATA_TABLE', $table_prefix.'image_metadata'); -define('RATE_TABLE', $table_prefix.'rate'); -define('USER_FORBIDDEN_TABLE', $table_prefix.'user_forbidden'); +define('CATEGORIES_TABLE', $prefixeTable.'categories'); +define('COMMENTS_TABLE', $prefixeTable.'comments'); +define('CONFIG_TABLE', $prefixeTable.'config'); +define('FAVORITES_TABLE', $prefixeTable.'favorites'); +define('GROUP_ACCESS_TABLE', $prefixeTable.'group_access'); +define('GROUPS_TABLE', $prefixeTable.'groups'); +define('HISTORY_TABLE', $prefixeTable.'history'); +define('IMAGE_CATEGORY_TABLE', $prefixeTable.'image_category'); +define('IMAGES_TABLE', $prefixeTable.'images'); +define('SESSIONS_TABLE', $prefixeTable.'sessions'); +define('SITES_TABLE', $prefixeTable.'sites'); +define('USER_ACCESS_TABLE', $prefixeTable.'user_access'); +define('USER_GROUP_TABLE', $prefixeTable.'user_group'); +define('USERS_TABLE', $prefixeTable.'users'); +define('WAITING_TABLE', $prefixeTable.'waiting'); +define('IMAGE_METADATA_TABLE', $prefixeTable.'image_metadata'); +define('RATE_TABLE', $prefixeTable.'rate'); +define('USER_FORBIDDEN_TABLE', $prefixeTable.'user_forbidden'); ?> -- cgit v1.2.3