From 4cb79a5c6473d9d30fdf9b33e1e3c6b0280cc84a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 06 Jul 2008 09:22:35 -0400
Subject: [PATCH] Fixed a bug in the lanhuage editor.
---
install/lib/installer_base.lib.php | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 279e444..3fc9787 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -34,6 +34,7 @@
var $language = 'en';
var $db;
public $conf;
+ public $install_ispconfig_interface = true;
public function __construct()
@@ -148,9 +149,15 @@
global $conf;
$cf = $conf['mysql']; // make $conf['mysql'] more accessible
+ if($cf['host'] == 'localhost') {
+ $from_host = 'localhost';
+ } else {
+ $from_host = $this->conf['hostname'];
+ }
+
//* Create the ISPConfig database user
$query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON '.$cf['database'].".* "
- ."TO '".$cf['ispconfig_user']."'@'".$cf['host']."' "
+ ."TO '".$cf['ispconfig_user']."'@'".$from_host."' "
."IDENTIFIED BY '".$cf['ispconfig_password']."';";
if(!$this->db->query($query)) {
$this->error('Unable to create database user: '.$cf['ispconfig_user']);
@@ -165,7 +172,7 @@
$server_ini_content = rf("tpl/server.ini.master");
$server_ini_content = addslashes($server_ini_content);
- $sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 'riud', 'riud', 'r', 'Server', 1, 1, 1, 1, 1, 1, '$server_ini_content', 0, 1);";
+ $sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 'riud', 'riud', 'r', '".$this->conf['hostname']."', 1, 1, 1, 1, 1, 1, '$server_ini_content', 0, 1);";
$this->db->query($sql);
$conf['server_id'] = $this->db->insertID();
$this->conf['server_id'] = $conf['server_id'];
@@ -724,13 +731,15 @@
// Dont just copy over the virtualhost template but add some custom settings
$content = rf("tpl/apache_ispconfig.vhost.master");
- $content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content);
+ $content = str_replace('{vhost_port}', $this->conf['apache']['vhost_port'], $content);
wf("$vhost_conf_dir/ispconfig.vhost", $content);
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
//* and create the symlink
- if(!is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) {
- exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/ispconfig.vhost");
+ if($this->install_ispconfig_interface == true) {
+ if(!is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) {
+ exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/ispconfig.vhost");
+ }
}
// Make the Clamav log files readable by ISPConfig
--
Gitblit v1.9.1