Changeset 4280 for trunk/include

Timestamp:

Nov 16, 2009, 8:17:01 PM (14 years ago)

Author:

nikrou

Message:

Feature 928 resolved.
Replace include/mysql.inc.php by include/config_database.inc.php to be independant of database engine
Rename database configurations variables by ones in $conf array.

Location:

trunk/include

Files:

• common.inc.php (modified) (2 diffs)
• config_default.inc.php (modified) (1 diff)
• constants.php (modified) (1 diff)

trunk/include/common.inc.php

@@ -71 +71 @@
 $filter = array();
 
-@include(PHPWG_ROOT_PATH .'include/mysql.inc.php');
+@include(PHPWG_ROOT_PATH .'include/config_database.inc.php');
 if (!defined('PHPWG_INSTALLED'))
 {
@@ -105 +105 @@
 
 // Database connection
-@mysql_connect( $cfgHote, $cfgUser, $cfgPassword ) or my_error( 'mysql_connect', true );
-@mysql_select_db( $cfgBase ) or my_error( 'mysql_select_db', true );
+@mysql_connect( $conf['db_host'], $conf['db_user'], $conf['db_password'] ) or my_error( 'mysql_connect', true );
+@mysql_select_db( $conf['db_base'] ) or my_error( 'mysql_select_db', true );
 
 defined('PWG_CHARSET') and defined('DB_CHARSET')

trunk/include/config_default.inc.php

@@ -495 +495 @@
 // All informations contained in these tables and column are related to
 // piwigo_users table.
-$conf['users_table'] = $prefixeTable.'users';
+//
+// You can use a different table for users, if you define associated constant
+// default configuration :
+// define('USERS_TABLE', $prefixeTable.'users');
 
 // Other tables can be changed, if you define associated constants

trunk/include/constants.php

@@ -69 +69 @@
   define('USER_GROUP_TABLE', $prefixeTable.'user_group');
 if (!defined('USERS_TABLE'))
-  define('USERS_TABLE', $conf['users_table']);
+  define('USERS_TABLE', $prefixeTable.'users');
 if (!defined('USER_INFOS_TABLE'))
   define('USER_INFOS_TABLE', $prefixeTable.'user_infos');