diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-08-11 21:45:50 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-08-11 21:45:50 +0000 |
| commit | 57c17e44eca4dfbd7ea2367e7b53101c9b0d0976 (patch) | |
| tree | 33e0269a5204803d2ea717adf7ccd0cb0b85a5e3 /phpBB/install/install.php | |
| parent | 27d86a2e3254d1bba611c449d767baa61939737e (diff) | |
| download | forums-57c17e44eca4dfbd7ea2367e7b53101c9b0d0976.tar forums-57c17e44eca4dfbd7ea2367e7b53101c9b0d0976.tar.gz forums-57c17e44eca4dfbd7ea2367e7b53101c9b0d0976.tar.bz2 forums-57c17e44eca4dfbd7ea2367e7b53101c9b0d0976.tar.xz forums-57c17e44eca4dfbd7ea2367e7b53101c9b0d0976.zip | |
Taken out the $db var from acm classes for consistency with other classes
git-svn-id: file:///svn/phpbb/trunk@4379 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install.php')
| -rw-r--r-- | phpBB/install/install.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/install/install.php b/phpBB/install/install.php index 1376210c07..c10554eccf 100644 --- a/phpBB/install/install.php +++ b/phpBB/install/install.php @@ -67,7 +67,7 @@ if (@file_exists($phpbb_root_path . 'config.'.$phpEx)) $stage = (isset($_POST['stage'])) ? intval($_POST['stage']) : 0; // These are all strings so we'll just traverse an array -$var_ary = array('language', 'dbms', 'dbhost', 'dbport', 'dbuser', 'dbpasswd', 'dbname', 'table_prefix', 'admin_name', 'admin_pass1', 'admin_pass2', 'board_email1', 'board_email2', 'server_name', 'server_port', 'script_path', 'img_imagick', 'ftp_path', 'ftp_user', 'ftp_pass'); +$var_ary = array('language', 'dbms', 'dbhost', 'dbport', 'dbuser', 'dbpasswd', 'dbname', 'table_prefix', 'admin_name', 'admin_pass1', 'admin_pass2', 'board_email1', 'board_email2', 'server_name', 'server_port', 'script_path', 'acm_type', 'img_imagick', 'ftp_path', 'ftp_user', 'ftp_pass'); foreach ($var_ary as $var) { @@ -767,6 +767,8 @@ if ($stage == 1) <td class="row1" width="50%"><b><?php echo $lang['SCRIPT_PATH']; ?>: </b></td> <td class="row2"><input class="post" type="text" name="script_path" value="<?php echo $script_path; ?>" /></td> </tr> + <td class="row1" width="50%"><b><?php echo $lang['CACHE_STORE']; ?>: </b><br /><span class="gensmall"><?php echo $lang['CACHE_STORE_EXPLAIN']; ?></span></td> + <td class="row2"><input type="radio" name="acm_type" value="db" <?php echo ($acm_type == 'db') ? 'checked="checked" ' : ''; ?>/> <?php echo $lang['STORE_DATABASE']; ?> <input type="radio" name="acm_type" value="file" <?php echo (!$acm_type || $acm_type == 'file') ? 'checked="checked" ' : ''; ?>/> <?php echo $lang['STORE_FILESYSTEM']; ?></td> <tr> <td class="cat" colspan="2" align="center"><?php echo $s_hidden_fields; ?><input class="btnmain" name="install" type="submit" value="<?php echo $lang['INSTALL_START']; ?>" /></td> </tr> @@ -814,7 +816,7 @@ if ($stage == 2) $config_data .= "\$dbuser = '$dbuser';\n"; $config_data .= "\$dbpasswd = '$dbpasswd';\n\n"; $config_data .= "\$table_prefix = '$table_prefix';\n"; - $config_data .= "\$acm_type = 'file';\n"; + $config_data .= "\$acm_type = '" . ((!$acm_typefile) ? 'db' : '') . "';\n"; $config_data .= "\$load_extensions = '$load_extensions';\n\n"; $config_data .= "define('PHPBB_INSTALLED', true);\n"; $config_data .= "define('DEBUG', true);\n"; // Comment out when final @@ -1375,7 +1377,7 @@ function inst_language_select($default = '') function can_load_dll($dll) { global $suffix; - +return false; return ((@ini_get('enable_dl') || strtolower(@ini_get('enable_dl')) == 'on') && (!@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'off') && @dl($dll . ".$suffix")) ? true : false; } |