banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply changes of installer script to trunk

Browse Source
release-0.6
thomascube 16 years ago
parent 2fd6c217a3
commit 7d7f67dde1
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File

4
installer/config.php
Unescape Escape View File

@ -30,10 +30,10 @@ if (!empty($_POST['submit'])) {
$textbox = new html_textarea(array('rows' => 16, 'cols' => 60, 'class' => "configfile"));
echo '<div><em>main.inc.php (<a href="index.php?_getfile=main">download</a>)</em></div>';
echo $textbox->show($RCI->create_config('main'));
echo $textbox->show(($_SESSION['main.inc.php'] = $RCI->create_config('main')));
echo '<div style="margin-top:1em"><em>db.inc.php (<a href="index.php?_getfile=db">download</a>)</em></div>';
echo $textbox->show($RCI->create_config('db'));
echo $textbox->show($_SESSION['db.inc.php'] = $RCI->create_config('db'));
echo '<p class="hint">Of course there are more options to configure.
Have a look at the config files or visit <a href="http://trac.roundcube.net/wiki/Howto_Config">Howto_Config</a> to find out.</p>';

14
installer/index.php
Unescape Escape View File

@ -31,13 +31,19 @@ function __autoload($classname)
$RCI = rcube_install::get_instance();
$RCI->load_config();
if (isset($_GET['_getfile']) && in_array($_GET['_getfile'], array('main', 'db')))
{
if (isset($_GET['_getfile']) && in_array($_GET['_getfile'], array('main', 'db'))) {
$filename = $_GET['_getfile'] . '.inc.php';
if (!empty($_SESSION[$filename])) {
header('Content-type: text/plain');
header('Content-Disposition: attachment; filename="'.$_GET['_getfile'].'.inc.php"');
echo $RCI->create_config($_GET['_getfile']);
header('Content-Disposition: attachment; filename="'.$filename.'"');
echo $_SESSION[$filename];
exit;
}
else {
header('HTTP/1.0 404 Not found');
die("The requested configuration was not found. Please run the installer from the beginning.");
}
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

5
installer/rcube_install.php
Unescape Escape View File

@ -129,7 +129,7 @@ class rcube_install
// convert some form data
if ($prop == 'debug_level') {
$val = 0;
if (isset($value))
if (is_array($value))
foreach ($value as $dbgval)
$val += intval($dbgval);
$value = $val;
@ -139,8 +139,7 @@ class rcube_install
$value = sprintf('%s://%s?mode=0646', $_POST['_dbtype'], $_POST['_dbname']{0} == '/' ? '/' . $_POST['_dbname'] : $_POST['_dbname']);
else
$value = sprintf('%s://%s:%s@%s/%s', $_POST['_dbtype'],
rawurlencode($_POST['_dbuser']), rawurlencode($_POST['_dbpass']),
$_POST['_dbhost'], $_POST['_dbname']);
rawurlencode($_POST['_dbuser']), rawurlencode($_POST['_dbpass']), $_POST['_dbhost'], $_POST['_dbname']);
}
else if ($prop == 'smtp_auth_type' && $value == '0') {
$value = '';

Write Preview
Loading…
Cancel
Save