From 5518df67f0408f489bcd208503cf1d3bfeeb8a98 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Mar 2009 06:41:36 -0500
Subject: [PATCH] Fixed installer errors:
---
interface/web/sites/shell_user_edit.php | 89 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php
index 17e55a9..d288baa 100644
--- a/interface/web/sites/shell_user_edit.php
+++ b/interface/web/sites/shell_user_edit.php
@@ -40,6 +40,7 @@
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
+require_once('tools.inc.php');
//* Check permissions for module
$app->auth->check_module_permissions('sites');
@@ -71,6 +72,30 @@
parent::onShowNew();
}
+
+ function onShowEnd() {
+ global $app, $conf, $interfaceConf;
+ /*
+ * If the names are restricted -> remove the restriction, so that the
+ * data can be edited
+ */
+
+ $app->uses('getconf');
+ $global_config = $app->getconf->get_global_config('sites');
+ $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
+
+ if ($this->dataRecord['username'] != ""){
+ /* REMOVE the restriction */
+ $app->tpl->setVar("username", str_replace($shelluser_prefix , '', $this->dataRecord['username']));
+ }
+ if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ $app->tpl->setVar("username_prefix", $global_config['shelluser_prefix']);
+ } else {
+ $app->tpl->setVar("username_prefix", $shelluser_prefix);
+ }
+
+ parent::onShowEnd();
+ }
function onSubmit() {
global $app, $conf;
@@ -85,14 +110,30 @@
}
function onBeforeInsert() {
- global $app, $conf;
-
+ global $app, $conf, $interfaceConf;
+
// check if the username is not blacklisted
$blacklist = file(ISPC_LIB_PATH.'/shelluser_blacklist');
foreach($blacklist as $line) {
- if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))) $app->tform->errorMessage .= 'The username is not allowed.';
+ if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))){
+ $app->tform->errorMessage .= 'The username is not allowed.';
+ }
}
unset($blacklist);
+
+ /*
+ * If the names should be restricted -> do it!
+ */
+ if ($app->tform->errorMessage == ''){
+
+ $app->uses('getconf');
+ $global_config = $app->getconf->get_global_config('sites');
+ $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
+
+ /* restrict the names */
+ $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
+ }
+ parent::onBeforeInsert();
}
function onAfterInsert() {
@@ -113,14 +154,31 @@
}
function onBeforeUpdate() {
- global $app, $conf;
+ global $app, $conf, $interfaceConf;
// check if the username is not blacklisted
$blacklist = file(ISPC_LIB_PATH.'/shelluser_blacklist');
foreach($blacklist as $line) {
- if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))) $app->tform->errorMessage .= 'The username is not allowed.';
+ if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))){
+ $app->tform->errorMessage .= 'The username is not allowed.';
+ }
}
unset($blacklist);
+
+ /*
+ * If the names should be restricted -> do it!
+ */
+ if ($app->tform->errorMessage == '') {
+ /*
+ * If the names should be restricted -> do it!
+ */
+ $app->uses('getconf');
+ $global_config = $app->getconf->get_global_config('sites');
+ $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
+
+ /* restrict the names */
+ $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
+ }
}
function onAfterUpdate() {
@@ -129,6 +187,27 @@
}
+ function getClientName() {
+ global $app, $conf;
+
+ if($_SESSION["s"]["user"]["typ"] != 'admin') {
+ // Get the group-id of the user
+ $client_group_id = $_SESSION["s"]["user"]["default_group"];
+ } else {
+ // Get the group-id from the data itself
+ $web = $app->db->queryOneRecord("SELECT sys_groupid FROM web_domain WHERE domain_id = ".intval($this->dataRecord['parent_domain_id']));
+ $client_group_id = $web['sys_groupid'];
+ }
+ /* get the name of the client */
+ $tmp = $app->db->queryOneRecord("SELECT name FROM sys_group WHERE groupid = " . $client_group_id);
+ $clientName = $tmp['name'];
+ if ($clientName == "") $clientName = 'default';
+ $clientName = convertClientName($clientName);
+
+ return $clientName;
+
+ }
+
}
$page = new page_action;
--
Gitblit v1.9.1