Changeset 681 for trunk

Timestamp:

Jan 9, 2005, 12:32:25 AM (20 years ago)

Author:

plg

Message:

• replacement of variable names in include/mysql.inc.php (for upgrades) :

dbname => cfgBase
dbuser => cfgUser
dbpasswd => cfgPassword
dbhost => cfgHote
table_prefix => prefixeTable

Location:

trunk

Files:

• include/common.inc.php (modified) (1 diff)
• include/constants.php (modified) (1 diff)
• install.php (modified) (1 diff)
• upgrade.php (modified) (1 diff)

trunk/include/common.inc.php

@@ -127 +127 @@
 
 // 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" );
         

trunk/include/constants.php

@@ -41 +41 @@
 
 // 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');
 ?>

trunk/install.php

@@ -252 +252 @@
     $step = 2;
     $file_content = "<?php";
-    $file_content.= "\n\$dbname = '".     $dbname."';";
-    $file_content.= "\n\$dbuser = '".     $dbuser."';";
-    $file_content.= "\n\$dbpasswd = '". $dbpasswd."';";
-    $file_content.= "\n\$dbhost = '".     $dbhost."';";
+    $file_content.= "\n\$cfgBase = '".     $dbname."';";
+    $file_content.= "\n\$cfgUser = '".     $dbuser."';";
+    $file_content.= "\n\$cfgPassword = '". $dbpasswd."';";
+    $file_content.= "\n\$cfgHote = '".     $dbhost."';";
     $file_content.= "\n";
-    $file_content.= "\n\$table_prefix = '".$table_prefix."';";
+    $file_content.= "\n\$prefixeTable = '".$table_prefix."';";
     $file_content.= "\n";
     $file_content.= "\ndefine('PHPWG_INSTALLED', true);";

trunk/upgrade.php

@@ -34 +34 @@
 include(PHPWG_ROOT_PATH.'include/mysql.inc.php');
 include_once(PHPWG_ROOT_PATH.'include/constants.php');
-define('PREFIX_TABLE', $table_prefix);
+define('PREFIX_TABLE', $prefixeTable);
 
 $conf['show_queries'] = false;
 
 // 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" );
 // +-----------------------------------------------------------------------+