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/web_subdomain_edit.php | 118 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 59 insertions(+), 59 deletions(-) diff --git a/interface/web/sites/web_subdomain_edit.php b/interface/web/sites/web_subdomain_edit.php index 3475ed5..1e5bfa7 100644 --- a/interface/web/sites/web_subdomain_edit.php +++ b/interface/web/sites/web_subdomain_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,28 +49,28 @@ $app->load('tform_actions'); class page_action extends tform_actions { - + var $parent_domain_record; - + function onShowNew() { global $app, $conf; - + // we will check only users, not admins if($_SESSION["s"]["user"]["typ"] == 'user') { - if(!$app->tform->checkClientLimit('limit_web_subdomain',"(type = 'subdomain' OR type = 'vhostsubdomain')")) { + if(!$app->tform->checkClientLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) { $app->error($app->tform->wordbook["limit_web_subdomain_txt"]); } - if(!$app->tform->checkResellerLimit('limit_web_subdomain',"(type = 'subdomain' OR type = 'vhostsubdomain')")) { + if(!$app->tform->checkResellerLimit('limit_web_subdomain', "(type = 'subdomain' OR type = 'vhostsubdomain')")) { $app->error('Reseller: '.$app->tform->wordbook["limit_web_subdomain_txt"]); } } - + parent::onShowNew(); } - + function onShowEnd() { global $app, $conf; - + $app->uses('ini_parser,getconf'); $settings = $app->getconf->get_global_config('domains'); if ($settings['use_domain_module'] == 'y') { @@ -79,14 +79,14 @@ */ $domains = $app->tools_sites->getDomainModuleDomains(); $domain_select = ''; - $selected_domain = ''; + $selected_domain = ''; if(is_array($domains) && sizeof($domains) > 0) { /* We have domains in the list, so create the drop-down-list */ foreach( $domains as $domain) { $domain_select .= "<option value=" . $domain['domain_id'] ; if ('.' . $domain['domain'] == substr($this->dataRecord["domain"], -strlen($domain['domain']) - 1)) { $domain_select .= " selected"; - $selected_domain = $domain['domain']; + $selected_domain = $domain['domain']; } $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n"; } @@ -99,20 +99,20 @@ */ $domain_select .= "<option value=''></option>\r\n"; } - $app->tpl->setVar("domain_option",$domain_select); - $this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1); + $app->tpl->setVar("domain_option", $domain_select); + $this->dataRecord['domain'] = substr($this->dataRecord["domain"], 0, strlen($this->dataRecord['domain']) - strlen($selected_domain) - 1); } else { - - // 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"])); - - // remove the parent domain part of the domain name before we show it in the text field. - $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"],'',$this->dataRecord["domain"]); - } - $app->tpl->setVar("domain",$this->dataRecord["domain"]); - + + // 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"])); + + // remove the parent domain part of the domain name before we show it in the text field. + $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"], '', $this->dataRecord["domain"]); + } + $app->tpl->setVar("domain", $this->dataRecord["domain"]); + if($_SESSION["s"]["user"]["typ"] == 'admin') { - // Directive Snippets + // Directive Snippets $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'"); $proxy_directive_snippets_txt = ''; if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){ @@ -121,78 +121,78 @@ } } if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------'; - $app->tpl->setVar("proxy_directive_snippets_txt",$proxy_directive_snippets_txt); + $app->tpl->setVar("proxy_directive_snippets_txt", $proxy_directive_snippets_txt); } - + 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"); - + + // 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"); + $app->uses('ini_parser,getconf'); $settings = $app->getconf->get_global_config('domains'); if ($settings['use_domain_module'] == 'y') { - // get the record of the domain module domain - $domain = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']); - if(!$domain) { - $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />"; - } else { - $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain; - } - } else { - $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"]; - } - + // get the record of the domain module domain + $domain = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']); + if(!$domain) { + $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />"; + } else { + $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain; + } + } else { + $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"]; + } + // nginx: if redirect type is proxy and redirect path is no URL, display error - if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'],0,1) == '/'){ + if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'], 0, 1) == '/'){ $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />"; } - + // Set a few fixed values $this->dataRecord["type"] = 'subdomain'; $this->dataRecord["server_id"] = $parent_domain["server_id"]; - + $this->parent_domain_record = $parent_domain; - + //* make sure that the domain is lowercase if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]); - + parent::onSubmit(); } - + function onAfterInsert() { global $app, $conf; - + $app->db->query('UPDATE web_domain SET sys_groupid = '.$app->functions->intval($this->parent_domain_record['sys_groupid']).' WHERE domain_id = '.$this->id); - + } - + function onAfterUpdate() { global $app, $conf; - + //* Check if parent domain has been changed if($this->dataRecord['parent_domain_id'] != $this->oldDataRecord['parent_domain_id']) { - + //* Update the domain owner $app->db->query('UPDATE web_domain SET sys_groupid = '.$app->functions->intval($this->parent_domain_record['sys_groupid']).' WHERE domain_id = '.$this->id); - + //* Update the old website, so that the vhost alias gets removed //* We force the update by inserting a transaction record without changes manually. $old_website = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$this->oldDataRecord['domain_id']); - $app->db->datalogSave('web_domain', 'UPDATE', 'domain_id', $this->oldDataRecord['parent_domain_id'], $old_website, $old_website, true); + $app->db->datalogSave('web_domain', 'UPDATE', 'domain_id', $this->oldDataRecord['parent_domain_id'], $old_website, $old_website, true); } - + } - + } $page = new page_action; $page->onLoad(); -?> \ No newline at end of file +?> -- Gitblit v1.9.1