iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
plegall
2005-01-08 23:32:25 +00:00
parent 971d0c5a95
commit 34354aa6a9
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/common.inc.php
View File

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

36
include/constants.php
View File

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

10
install.php
View File

@@ -251,12 +251,12 @@ if ( isset( $_POST['install'] ))
{
$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);";
$file_content.= "\n?".">";

6
upgrade.php
View File

@@ -33,14 +33,14 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
include(PHPWG_ROOT_PATH.'include/template.php');
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" );
// +-----------------------------------------------------------------------+
// | tricky output |