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/mailuser/mail_user_filter_edit.php | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/interface/web/mailuser/mail_user_filter_edit.php b/interface/web/mailuser/mail_user_filter_edit.php index 14f8dd5..9274e3d 100644 --- a/interface/web/mailuser/mail_user_filter_edit.php +++ b/interface/web/mailuser/mail_user_filter_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('mailuser'); @@ -52,40 +52,40 @@ function onShowNew() { global $app, $conf; - + // we will check the limits only when the email address belongs to a client and not the admin if($_SESSION["s"]["user"]["default_group"] > 0) { - if(!$app->tform->checkClientLimit('limit_mailfilter',"")) { + if(!$app->tform->checkClientLimit('limit_mailfilter', "")) { $app->error($app->tform->lng("limit_mailfilter_txt")); } - if(!$app->tform->checkResellerLimit('limit_mailfilter',"")) { + if(!$app->tform->checkResellerLimit('limit_mailfilter', "")) { $app->error('Reseller: '.$app->tform->lng("limit_mailfilter_txt")); } } - + parent::onShowNew(); } - + function onSubmit() { global $app, $conf; - + // Get the parent mail_user record $mailuser = $app->db->queryOneRecord("SELECT * FROM mail_user WHERE mailuser_id = '".$app->functions->intval($_SESSION['s']['user']['mailuser_id'])."'"); - + // Set the mailuser_id $this->dataRecord["mailuser_id"] = $mailuser["mailuser_id"]; - + // Remove leading dots - if(substr($this->dataRecord['target'],0,1) == '.') $this->dataRecord['target'] = substr($this->dataRecord['target'],1); - + if(substr($this->dataRecord['target'], 0, 1) == '.') $this->dataRecord['target'] = substr($this->dataRecord['target'], 1); + // Check the client limits if the email address is assigned to a client if($_SESSION["s"]["user"]["default_group"] > 0) { // if user is not admin // Get the limits of the client $client_group_id = $_SESSION["s"]["user"]["default_group"]; $client = $app->db->queryOneRecord("SELECT limit_mailfilter FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); - + // Check if the user may add another filter if($this->id == 0 && $client["limit_mailfilter"] >= 0) { $tmp = $app->db->queryOneRecord("SELECT count(filter_id) as number FROM mail_user_filter WHERE sys_groupid = $client_group_id"); @@ -95,13 +95,13 @@ unset($tmp); } } // end if user is not admin - + parent::onSubmit(); } - + } $page = new page_action; $page->onLoad(); -?> \ No newline at end of file +?> -- Gitblit v1.9.1