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/mail/mail_spamfilter_edit.php | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/interface/web/mail/mail_spamfilter_edit.php b/interface/web/mail/mail_spamfilter_edit.php
index 768ec9b..50ecb4f 100644
--- a/interface/web/mail/mail_spamfilter_edit.php
+++ b/interface/web/mail/mail_spamfilter_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('mail');
@@ -49,15 +49,15 @@
$app->load('tform_actions');
class page_action extends tform_actions {
-
+
function onShowEnd() {
global $app, $conf;
-
+
// Getting email from data record
$email = $this->dataRecord["email"];
- $email_parts = explode("@",$email);
- $app->tpl->setVar("email_local_part",$email_parts[0]);
-
+ $email_parts = explode("@", $email);
+ $app->tpl->setVar("email_local_part", $email_parts[0]);
+
// Getting Domains of the user
$sql = "SELECT domain FROM mail_domain WHERE type = 'local' AND ".$app->tform->getAuthSQL('r');
$domains = $app->db->queryAllRecords($sql);
@@ -66,30 +66,30 @@
$selected = ($domain["domain"] == $email_parts[1])?'SELECTED':'';
$domain_select .= "<option value='$domain[domain]' $selected>$domain[domain]</option>\r\n";
}
- $app->tpl->setVar("email_domain",$domain_select);
-
+ $app->tpl->setVar("email_domain", $domain_select);
+
// calculate scores
if(count($this->dataRecord) > 0) {
- $app->tpl->setVar("spam_rewrite_score_int",number_format($this->dataRecord["spam_rewrite_score_int"] / 100, 2, '.', ''));
- $app->tpl->setVar("spam_redirect_score_int",number_format($this->dataRecord["spam_redirect_score_int"] / 100, 2, '.', ''));
- $app->tpl->setVar("spam_delete_score_int",number_format($this->dataRecord["spam_delete_score_int"] / 100, 2, '.', ''));
+ $app->tpl->setVar("spam_rewrite_score_int", number_format($this->dataRecord["spam_rewrite_score_int"] / 100, 2, '.', ''));
+ $app->tpl->setVar("spam_redirect_score_int", number_format($this->dataRecord["spam_redirect_score_int"] / 100, 2, '.', ''));
+ $app->tpl->setVar("spam_delete_score_int", number_format($this->dataRecord["spam_delete_score_int"] / 100, 2, '.', ''));
}
-
+
// Changing maildir to mailbox_id
$sql = "SELECT mailbox_id FROM mail_box WHERE maildir = '".$this->dataRecord["spam_redirect_maildir"]."' AND ".$app->tform->getAuthSQL('r');
$mailbox = $app->db->queryOneRecord($sql);
$this->dataRecord["spam_redirect_maildir"] = $mailbox["mailbox_id"];
-
+
parent::onShowEnd();
}
-
+
function onSubmit() {
global $app, $conf;
-
+
// Check if Domain belongs to user
$domain = $app->db->queryOneRecord("SELECT server_id, domain FROM mail_domain WHERE domain = '".$app->db->quote($_POST["email_domain"])."' AND ".$app->tform->getAuthSQL('r'));
if($domain["domain"] != $_POST["email_domain"]) $app->tform->errorMessage .= $app->tform->wordbook["no_domain_perm"];
-
+
// compose the email field
if($_POST["email_local_part"] != '') {
$this->dataRecord["email"] = $_POST["email_local_part"]."@".$_POST["email_domain"];
@@ -98,27 +98,27 @@
}
// Set the server id of the mailbox = server ID of mail domain.
$this->dataRecord["server_id"] = $domain["server_id"];
-
+
unset($this->dataRecord["email_local_part"]);
unset($this->dataRecord["email_domain"]);
-
+
// calculate scores
- $this->dataRecord["spam_rewrite_score_int"] = $_POST["spam_rewrite_score_int"] * 100;
- $this->dataRecord["spam_redirect_score_int"] = $_POST["spam_redirect_score_int"] * 100;
- $this->dataRecord["spam_delete_score_int"] = $_POST["spam_delete_score_int"] * 100;
-
+ $this->dataRecord["spam_rewrite_score_int"] = $_POST["spam_rewrite_score_int"] * 100;
+ $this->dataRecord["spam_redirect_score_int"] = $_POST["spam_redirect_score_int"] * 100;
+ $this->dataRecord["spam_delete_score_int"] = $_POST["spam_delete_score_int"] * 100;
+
// Changing mailbox_id to maildir
$sql = "SELECT maildir FROM mail_box WHERE mailbox_id = '".$app->functions->intval($_POST["spam_redirect_maildir"])."' AND ".$app->tform->getAuthSQL('r');
$mailbox = $app->db->queryOneRecord($sql);
$this->dataRecord["spam_redirect_maildir"] = $mailbox["maildir"];
-
+
parent::onSubmit();
}
-
+
}
$app->tform_actions = new page_action;
$app->tform_actions->onLoad();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1