From cbda30058c0f61ae2afbd9085afcf841f32751a5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 Jan 2009 11:50:52 -0500
Subject: [PATCH] Fixed: FS#431 - jailkit users cannot login
---
install/update.php | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/install/update.php b/install/update.php
index 8af1097..caca060 100644
--- a/install/update.php
+++ b/install/update.php
@@ -101,6 +101,7 @@
$conf['ispconfig_log_priority'] = $conf_old["log_priority"];
$inst = new installer();
+$inst->is_update = true;
//** Detect the installed applications
$inst->find_installed_apps();
@@ -215,7 +216,12 @@
}
$new_ini = array_to_ini($tpl_ini_array);
-$inst->db->query("UPDATE sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
+$tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM sys_ini WHERE 1');
+if($tmp['number'] == 0) {
+ $inst->db->query("INSERT INTO sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
+} else {
+ $inst->db->query("UPDATE sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
+}
unset($old_ini_array);
unset($tpl_ini_array);
unset($new_ini);
@@ -228,9 +234,10 @@
if($conf['services']['mail']) {
//** Configure postfix
+ swriteln('Configuring Postfix');
$inst->configure_postfix('dont-create-certs');
- //* Configure postfix
+ //* Configure Jailkit
swriteln('Configuring Jailkit');
$inst->configure_jailkit();
--
Gitblit v1.9.1