From be331a38660a37861bd115e7fc543364e8dbb622 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 17 Oct 2012 08:49:55 -0400
Subject: [PATCH] Fixed: FS#2484 - sql error on mysql user selection
---
server/plugins-available/shelluser_jailkit_plugin.inc.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index 322b1ba..d0487d1 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -227,12 +227,12 @@
$tpl->setVar('home_dir',$this->_get_home_dir(""));
$bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc';
- if(@is_file($bashrc)) unlink($bashrc);
+ if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc);
file_put_contents($bashrc,$tpl->grab());
unset($tpl);
- $this->app->log("Added bashrc scrpt : ".$bashrc,LOGLEVEL_DEBUG);
+ $this->app->log("Added bashrc script : ".$bashrc,LOGLEVEL_DEBUG);
$tpl = new tpl();
$tpl->newTemplate("motd.master");
@@ -240,7 +240,7 @@
$tpl->setVar('domain',$web['domain']);
$motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd';
- if(@is_file($motd)) unlink($motd);
+ if(@is_file($motd) || @is_link($motd)) unlink($motd);
file_put_contents($motd,$tpl->grab());
--
Gitblit v1.9.1