Menu
▾
▴
[phpBT-dev] CVS: phpbt install.php,1.6,1.7
|
From: Benjamin C. <bc...@us...> - 2001-12-04 14:27:26
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv20627
Modified Files:
install.php
Log Message:
Code cleanup
Index: install.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/install.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- install.php 2001/11/30 06:06:35 1.6
+++ install.php 2001/12/04 14:27:23 1.7
@@ -31,41 +31,43 @@
$_gv =& $HTTP_GET_VARS;
$_pv =& $HTTP_POST_VARS;
-$tables = array(
- '/^#.*/' => '',
- '/^--.*/' => '',
- '/TBL_ACTIVE_SESSIONS/' => $_pv['tbl_prefix'].'active_sessions',
- '/TBL_DB_SEQUENCE/' => $_pv['tbl_prefix'].'db_sequence',
- '/TBL_ATTACHMENT/' => $_pv['tbl_prefix'].'attachment',
- '/TBL_AUTH_GROUP/' => $_pv['tbl_prefix'].'auth_group',
- '/TBL_AUTH_PERM/' => $_pv['tbl_prefix'].'auth_perm',
- '/TBL_AUTH_USER/' => $_pv['tbl_prefix'].'auth_user',
- '/TBL_BUG_CC/' => $_pv['tbl_prefix'].'bug_cc',
- '/TBL_BUG_GROUP/' => $_pv['tbl_prefix'].'bug_group',
- '/TBL_BUG_HISTORY/' => $_pv['tbl_prefix'].'bug_history',
- '/TBL_BUG/' => $_pv['tbl_prefix'].'bug',
- '/TBL_COMMENT/' => $_pv['tbl_prefix'].'comment',
- '/TBL_COMPONENT/' => $_pv['tbl_prefix'].'component',
- '/TBL_CONFIGURATION/' => $_pv['tbl_prefix'].'configuration',
- '/TBL_GROUP_PERM/' => $_pv['tbl_prefix'].'group_perm',
- '/TBL_OS/' => $_pv['tbl_prefix'].'os',
- '/TBL_PROJECT/' => $_pv['tbl_prefix'].'project',
- '/TBL_RESOLUTION/' => $_pv['tbl_prefix'].'resolution',
- '/TBL_SAVED_QUERY/' => $_pv['tbl_prefix'].'saved_query',
- '/TBL_SEVERITY/' => $_pv['tbl_prefix'].'severity',
- '/TBL_STATUS/' => $_pv['tbl_prefix'].'status',
- '/TBL_USER_GROUP/' => $_pv['tbl_prefix'].'user_group',
- '/TBL_USER_PERM/' => $_pv['tbl_prefix'].'user_perm',
- '/TBL_VERSION/' => $_pv['tbl_prefix'].'version',
- '/TBL_PROJECT_GROUP/' => $_pv['tbl_prefix'].'project_group',
- '/OPTION_ADMIN_EMAIL/' => $_pv['admin_login'],
- '/OPTION_ADMIN_PASS/' => $_pv['encrypt_pass'] ? md5($_pv['admin_pass'])
- : $_pv['admin_pass'],
- '/OPTION_PHPBT_EMAIL/' => $_pv['phpbt_email'],
- '/OPTION_ENCRYPT_PASS/' => $_pv['encrypt_pass'],
- '/OPTION_INSTALL_URL/' => 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].
- dirname($HTTP_SERVER_VARS['SCRIPT_NAME']),
- );
+if (!empty($_pv)) {
+ $tables = array(
+ '/^#.*/' => '',
+ '/^--.*/' => '',
+ '/TBL_ACTIVE_SESSIONS/' => $_pv['tbl_prefix'].'active_sessions',
+ '/TBL_DB_SEQUENCE/' => $_pv['tbl_prefix'].'db_sequence',
+ '/TBL_ATTACHMENT/' => $_pv['tbl_prefix'].'attachment',
+ '/TBL_AUTH_GROUP/' => $_pv['tbl_prefix'].'auth_group',
+ '/TBL_AUTH_PERM/' => $_pv['tbl_prefix'].'auth_perm',
+ '/TBL_AUTH_USER/' => $_pv['tbl_prefix'].'auth_user',
+ '/TBL_BUG_CC/' => $_pv['tbl_prefix'].'bug_cc',
+ '/TBL_BUG_GROUP/' => $_pv['tbl_prefix'].'bug_group',
+ '/TBL_BUG_HISTORY/' => $_pv['tbl_prefix'].'bug_history',
+ '/TBL_BUG/' => $_pv['tbl_prefix'].'bug',
+ '/TBL_COMMENT/' => $_pv['tbl_prefix'].'comment',
+ '/TBL_COMPONENT/' => $_pv['tbl_prefix'].'component',
+ '/TBL_CONFIGURATION/' => $_pv['tbl_prefix'].'configuration',
+ '/TBL_GROUP_PERM/' => $_pv['tbl_prefix'].'group_perm',
+ '/TBL_OS/' => $_pv['tbl_prefix'].'os',
+ '/TBL_PROJECT/' => $_pv['tbl_prefix'].'project',
+ '/TBL_RESOLUTION/' => $_pv['tbl_prefix'].'resolution',
+ '/TBL_SAVED_QUERY/' => $_pv['tbl_prefix'].'saved_query',
+ '/TBL_SEVERITY/' => $_pv['tbl_prefix'].'severity',
+ '/TBL_STATUS/' => $_pv['tbl_prefix'].'status',
+ '/TBL_USER_GROUP/' => $_pv['tbl_prefix'].'user_group',
+ '/TBL_USER_PERM/' => $_pv['tbl_prefix'].'user_perm',
+ '/TBL_VERSION/' => $_pv['tbl_prefix'].'version',
+ '/TBL_PROJECT_GROUP/' => $_pv['tbl_prefix'].'project_group',
+ '/OPTION_ADMIN_EMAIL/' => $_pv['admin_login'],
+ '/OPTION_ADMIN_PASS/' => $_pv['encrypt_pass'] ? md5($_pv['admin_pass'])
+ : $_pv['admin_pass'],
+ '/OPTION_PHPBT_EMAIL/' => $_pv['phpbt_email'],
+ '/OPTION_ENCRYPT_PASS/' => $_pv['encrypt_pass'],
+ '/OPTION_INSTALL_URL/' => 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].
+ dirname($HTTP_SERVER_VARS['SCRIPT_NAME']),
+ );
+}
@include_once('config.php');
if (defined('DB_HOST')) { // Already configured
@@ -73,6 +75,7 @@
}
function build_select($box, $value = '', $ary) {
+ $text = '';
foreach ($ary as $val => $item) {
if ($value == $val and $value != '') $sel = ' selected';
else $sel = '';
@@ -111,10 +114,11 @@
$q_temp_ary = file('schemas/'.$_pv['db_type'].'.in');
$queries = preg_replace(array_keys($tables), array_values($tables),
$q_temp_ary);
+ $do_query = '';
foreach ($queries as $query) {
// First, collect multi-line queries into one line, then run the query
$do_query .= chop($query);
- if (substr($do_query, -1) != ';') continue;
+ if (empty($do_query) or substr($do_query, -1) != ';') continue;
$db->query($do_query);
$do_query = '';
}
@@ -123,6 +127,7 @@
function check_vars() {
global $_pv;
+ $error = '';
if (!$_pv['db_host'] = trim($_pv['db_host'])) {
$error = 'Please enter the host name for your database server';
} elseif (!$_pv['db_database'] = trim($_pv['db_database'])) {
@@ -143,7 +148,7 @@
$error = 'The admin passwords don\'t match';
}
- if ($error) {
+ if (!empty($error)) {
show_front($error);
return false;
} else {
@@ -206,15 +211,15 @@
$t->set_block('content', 'writeableblock', 'writeable');
$t->set_block('content', 'unwriteableblock', 'unwriteable');
$t->set_var(array(
- 'error' => $error ? "<div class=\"error\">$error</div>" : '',
- 'db_type' => build_select('db', $db_type, &$db_types),
- 'db_host' => $db_host ? $db_host : 'localhost',
- 'db_database' => $db_database ? $db_database : 'bug_tracker',
- 'db_user' => $db_user ? $db_user : 'root',
+ 'error' => !empty($error) ? "<div class=\"error\">$error</div>" : '',
+ 'db_type' => build_select('db', (isset($db_type) ? $db_type : ''), &$db_types),
+ 'db_host' => !empty($db_host) ? $db_host : 'localhost',
+ 'db_database' => !empty($db_database) ? $db_database : 'bug_tracker',
+ 'db_user' => !empty($db_user) ? $db_user : 'root',
'db_pass' => '',
- 'tbl_prefix' => $tbl_prefix ? $tbl_prefix : 'phpbt_',
- 'admin_login' => $admin_login,
- 'phpbt_email' => $phpbt_email ? $phpbt_email :
+ 'tbl_prefix' => !empty($tbl_prefix) ? $tbl_prefix : 'phpbt_',
+ 'admin_login' => !empty($admin_login) ? $admin_login : '',
+ 'phpbt_email' => !empty($phpbt_email) ? $phpbt_email :
'phpbt@'.$HTTP_SERVER_VARS['SERVER_NAME']
));
@@ -231,8 +236,8 @@
print $t->finish($t->parse('main', 'content'));
}
-if ($op = $_gv['op'] ? $_gv['op'] : $_pv['op']) {
- switch ($op) {
+if (isset($_pv['op'])) {
+ switch ($_pv['op']) {
case 'save_config_file' : save_config_file(); break;
case 'dump_config_file' : dump_config_file(); break;
}
|
