From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 14 Nov 2013 09:01:22 -0500 Subject: [PATCH] Cleaning up code to match coding guidelines --- interface/web/sites/shell_user_edit.php | 85 +++++++++++++++++++++--------------------- 1 files changed, 43 insertions(+), 42 deletions(-) diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php index a18dd8e..24ef093 100644 --- a/interface/web/sites/shell_user_edit.php +++ b/interface/web/sites/shell_user_edit.php @@ -38,8 +38,8 @@ * End Form configuration ******************************************/ -require_once('../../lib/config.inc.php'); -require_once('../../lib/app.inc.php'); +require_once '../../lib/config.inc.php'; +require_once '../../lib/app.inc.php'; //* Check permissions for module $app->auth->check_module_permissions('sites'); @@ -49,10 +49,10 @@ $app->load('tform_actions'); class page_action extends tform_actions { - + function onShowNew() { global $app, $conf; - + // we will check only users, not admins if($_SESSION["s"]["user"]["typ"] == 'user') { if(!$app->tform->checkClientLimit('limit_shell_user')) { @@ -62,7 +62,7 @@ $app->error('Reseller: '.$app->tform->wordbook["limit_shell_user_txt"]); } } - + parent::onShowNew(); } @@ -72,18 +72,18 @@ * If the names are restricted -> remove the restriction, so that the * data can be edited */ - + $app->uses('getconf,tools_sites'); $global_config = $app->getconf->get_global_config('sites'); $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord); - + if ($this->dataRecord['username'] != ""){ /* REMOVE the restriction */ $app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $shelluser_prefix)); } - - $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $shelluser_prefix, $global_config['shelluser_prefix'])); - + + $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $shelluser_prefix, $global_config['shelluser_prefix'])); + if($this->id > 0) { //* we are editing a existing record $app->tpl->setVar("edit_disabled", 1); @@ -94,13 +94,13 @@ parent::onShowEnd(); } - + function onSubmit() { global $app, $conf; - + // Get the record of the parent domain //$parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r')); - //if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm"); + //if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm"); if(isset($this->dataRecord["parent_domain_id"])) { $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r')); if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm"); @@ -110,20 +110,20 @@ if(!$parent_domain) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm"); unset($tmp); } - + // Set a few fixed values $this->dataRecord["server_id"] = $parent_domain["server_id"]; - + if(isset($this->dataRecord['username']) && trim($this->dataRecord['username']) == '') $app->tform->errorMessage .= $app->tform->lng('username_error_empty').'<br />'; if(isset($this->dataRecord['username']) && empty($this->dataRecord['parent_domain_id'])) $app->tform->errorMessage .= $app->tform->lng('parent_domain_id_error_empty').'<br />'; - if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'..')) $app->tform->errorMessage .= $app->tform->lng('dir_dot_error').'<br />'; - if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'./')) $app->tform->errorMessage .= $app->tform->lng('dir_slashdot_error').'<br />'; - + if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'], '..')) $app->tform->errorMessage .= $app->tform->lng('dir_dot_error').'<br />'; + if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'], './')) $app->tform->errorMessage .= $app->tform->lng('dir_slashdot_error').'<br />'; + if(isset($this->dataRecord['ssh_rsa'])) $this->dataRecord['ssh_rsa'] = trim($this->dataRecord['ssh_rsa']); - + parent::onSubmit(); } - + function onBeforeInsert() { global $app, $conf, $interfaceConf; @@ -135,45 +135,45 @@ } } unset($blacklist); - + /* * If the names should be restricted -> do it! */ if ($app->tform->errorMessage == ''){ - + $app->uses('getconf,tools_sites'); $global_config = $app->getconf->get_global_config('sites'); $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord); - - $this->dataRecord['username_prefix'] = $shelluser_prefix; + + $this->dataRecord['username_prefix'] = $shelluser_prefix; /* restrict the names */ $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username']; - + if(strlen($this->dataRecord['username']) > 32) $app->tform->errorMessage .= $app->tform->lng("username_must_not_exceed_32_chars_txt"); } parent::onBeforeInsert(); } - + function onAfterInsert() { global $app, $conf; - + $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"])); $server_id = $web["server_id"]; $dir = $web["document_root"]; $puser = $web["system_user"]; $pgroup = $web["system_group"]; - + // The FTP user shall be owned by the same group then the website $sys_groupid = $web['sys_groupid']; - + $sql = "UPDATE shell_user SET server_id = $server_id, dir = '$dir', puser = '$puser', pgroup = '$pgroup', sys_groupid = '$sys_groupid' WHERE shell_user_id = ".$this->id; $app->db->query($sql); - + } - + function onBeforeUpdate() { global $app, $conf, $interfaceConf; - + // check if the username is not blacklisted $blacklist = file(ISPC_LIB_PATH.'/shelluser_blacklist'); foreach($blacklist as $line) { @@ -193,26 +193,27 @@ $app->uses('getconf,tools_sites'); $global_config = $app->getconf->get_global_config('sites'); $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord); - - $old_record = $app->tform->getDataRecord($this->id); - $shelluser_prefix = $app->tools_sites->getPrefix($old_record['username_prefix'], $shelluser_prefix); - $this->dataRecord['username_prefix'] = $shelluser_prefix; - + + $old_record = $app->tform->getDataRecord($this->id); + $shelluser_prefix = $app->tools_sites->getPrefix($old_record['username_prefix'], $shelluser_prefix); + $this->dataRecord['username_prefix'] = $shelluser_prefix; + /* restrict the names */ $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username']; - + if(strlen($this->dataRecord['username']) > 32) $app->tform->errorMessage .= $app->tform->lng("username_must_not_exceed_32_chars_txt"); } } - + function onAfterUpdate() { global $app, $conf; - - + + } + } $page = new page_action; $page->onLoad(); -?> \ No newline at end of file +?> -- Gitblit v1.9.1