From 7c774146bffff2fe13392f80f435bbc46f4e8222 Mon Sep 17 00:00:00 2001
From: aydreeihn <adriane@enhancesoft.com>
Date: Mon, 9 Apr 2018 11:02:19 -0500
Subject: [PATCH] code cleanup + archive dept/ht fixes
---
include/class.filter.php | 2 +-
include/class.filter_action.php | 3 +--
include/class.topic.php | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/include/class.filter.php b/include/class.filter.php
index 3889c770e..e76b5175a 100644
--- a/include/class.filter.php
+++ b/include/class.filter.php
@@ -526,7 +526,7 @@ class Filter {
.',execorder='.db_input($vars['execorder'])
.',email_id='.db_input($emailId)
.',match_all_rules='.db_input($vars['match_all_rules'])
- .',stop_onmatch='.db_input(isset($vars['stop_onmatch'])?1:0)
+ .',stop_onmatch='.db_input($vars['stop_onmatch'])
.',notes='.db_input(Format::sanitize($vars['notes']));
if($id) {
diff --git a/include/class.filter_action.php b/include/class.filter_action.php
index c963e355c..59bafbf57 100644
--- a/include/class.filter_action.php
+++ b/include/class.filter_action.php
@@ -41,8 +41,7 @@ class FilterAction extends VerySimpleModel {
return $this->_config;
}
- function parseConfiguration($source, &$errors=array())
- {
+ function parseConfiguration($source, &$errors=array()) {
if (!$source)
return $this->getConfiguration();
diff --git a/include/class.topic.php b/include/class.topic.php
index 84a1c9d47..245b3c39f 100644
--- a/include/class.topic.php
+++ b/include/class.topic.php
@@ -191,8 +191,7 @@ implements TemplateVariable, Searchable {
return $this->isActive();
}
- function isActive()
- {
+ function isActive() {
return !!($this->flags & self::FLAG_ACTIVE);
}
--
GitLab