diff --git a/core/Models/ConfigItem.php b/core/Models/ConfigItem.php
index f8951792883e..bec06cd669e8 100644
--- a/core/Models/ConfigItem.php
+++ b/core/Models/ConfigItem.php
@@ -158,9 +158,9 @@ public function getConfValueForOutput() {
 	 */
 	public function setConfValueForInput($value, $force_slash = false) {
 		if ($this->conf_formtype == 'textarea' && $this->conf_valuetype !== 'array') {
-			$value = icms_core_DataFilter::checkVar($value, 'html', 'input');
+			$value = DataFilter::checkVar($value, 'html', 'input');
 		} elseif ($this->conf_formtype == 'textsarea' && $this->conf_valuetype !== 'array') {
-			$value = icms_core_DataFilter::checkVar($value, 'text', 'input');
+			$value = DataFilter::checkVar($value, 'text', 'input');
 		} elseif ($this->conf_formtype == 'password') {
 			$value = filter_var($value, FILTER_SANITIZE_URL);
 		} else {
diff --git a/edituser.php b/edituser.php
index 1c0dcacaf3b4..af5887a69621 100644
--- a/edituser.php
+++ b/edituser.php
@@ -27,15 +27,17 @@
 /**
  * Generates form and validation for editing users
  *
- * @copyright	http://www.xoops.org/ The Xoops Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		Member
- * @subpackage	Users
- * @since		Xoops
- * @author		skalpa <psk@psykaos.net>
+ * @copyright    http://www.xoops.org/ The Xoops Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        Member
+ * @subpackage    Users
+ * @since        Xoops
+ * @author        skalpa <psk@psykaos.net>
  */
 
+use ImpressCMS\Core\DataFilter;
+
 $xoopsOption['pagetype'] = 'user';
 if (icms_get_module_status('profile') && file_exists(ICMS_MODULES_PATH . '/profile/edituser.php')) {
 	header('Location: ' . ICMS_MODULES_URL . '/profile/edituser.php');
@@ -94,11 +96,11 @@
 );
 
 if (!empty($_GET)) {
-	$clean_GET = icms_core_DataFilter::checkVarArray($_GET, $filter_get, false);
+	$clean_GET = DataFilter::checkVarArray($_GET, $filter_get, false);
 	extract($clean_GET);
 }
 if (!empty($_POST)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_POST, $filter_post, false);
+	$clean_POST = DataFilter::checkVarArray($_POST, $filter_post, false);
 	extract($clean_POST);
 }
 
@@ -116,17 +118,17 @@
 
 			if ($icmsConfigUser['allow_chgmail'] == 1) {
 				if (!empty($email)) {
-					$email = icms_core_DataFilter::stripSlashesGPC(trim($email));
+					$email = DataFilter::stripSlashesGPC(trim($email));
 				}
 
-				if ($email == '' || !icms_core_DataFilter::checkVar($email, 'email', 0, 1)) {
+				if ($email == '' || !DataFilter::checkVar($email, 'email', 0, 1)) {
 					$errors[] = _US_INVALIDMAIL;
 				}
 
 				$count = 0;
 				if ($email) {
 					$sql = sprintf('SELECT COUNT(*) FROM %s WHERE email = %s',
-							icms::$xoopsDB->prefix('users'), icms::$xoopsDB->quoteString(addslashes($email)));
+						icms::$xoopsDB->prefix('users'), icms::$xoopsDB->quoteString(addslashes($email)));
 					$result = icms::$xoopsDB->query($sql);
 					list($count) = icms::$xoopsDB->fetchRow($result);
 					if ($count > 1) {
@@ -137,7 +139,7 @@
 
 			if ($icmsConfigUser['allow_chguname'] == 1) {
 				if (!empty($uname)) {
-					$uname = icms_core_DataFilter::stripSlashesGPC(trim($uname));
+					$uname = DataFilter::stripSlashesGPC(trim($uname));
 				}
 
 				if ($uname == '') {
@@ -171,9 +173,9 @@
 			}
 
 			if (!empty($password)) {
-				$password = icms_core_DataFilter::stripSlashesGPC(trim($password));
+				$password = DataFilter::stripSlashesGPC(trim($password));
 				$oldpass = !empty($old_password)
-					? icms_core_DataFilter::stripSlashesGPC(trim($old_password))
+					? DataFilter::stripSlashesGPC(trim($old_password))
 					: '';
 
 				$member_handler = icms::handler('icms_member');
@@ -187,7 +189,7 @@
 				}
 
 				if (!empty($vpass)) {
-					$vpass = icms_core_DataFilter::stripSlashesGPC(trim($vpass));
+					$vpass = DataFilter::stripSlashesGPC(trim($vpass));
 				}
 
 				if ($password != $vpass) {
@@ -195,7 +197,7 @@
 				}
 
 				if ($password == $username
-					|| $password == icms_core_DataFilter::utf8_strrev($username, true)
+					|| $password == DataFilter::utf8_strrev($username, true)
 					|| strripos($password, $username) === true
 					) {
 					$errors[] = _US_BADPWD;
@@ -224,10 +226,10 @@
 				$edituser->user_from = $user_from;
 				if ($icmsConfigUser['allwshow_sig'] == 1) {
 					if ($icmsConfigUser['allow_htsig'] == 0) {
-						$signature = strip_tags(icms_core_DataFilter::checkVar($user_sig, 'text', 'input'));
-						$edituser->user_sig = icms_core_DataFilter::icms_substr($signature, 0, (int) $icmsConfigUser['sig_max_length']);
+						$signature = strip_tags(DataFilter::checkVar($user_sig, 'text', 'input'));
+						$edituser->user_sig = DataFilter::icms_substr($signature, 0, (int)$icmsConfigUser['sig_max_length']);
 					} else {
-						$signature = icms_core_DataFilter::checkVar($user_sig, 'html', 'input');
+						$signature = DataFilter::checkVar($user_sig, 'html', 'input');
 						$edituser->user_sig = $signature;
 					}
 				}
@@ -240,14 +242,14 @@
 					$edituser->setVar('pass', $pass, true);
 				}
 
-				$attachsig = !empty($attachsig)?1:0;
+				$attachsig = !empty($attachsig) ? 1 : 0;
 				$edituser->attachsig = $attachsig;
 				$edituser->timezone_offset = $timezone_offset;
 				$edituser->uorder = $uorder;
 				$edituser->umode = $umode;
 				$edituser->notify_method = $notify_method;
 				$edituser->notify_mode = $notify_mode;
-				$edituser->bio = icms_core_DataFilter::icms_substr($bio, 0, 255);
+				$edituser->bio = DataFilter::icms_substr($bio, 0, 255);
 				$edituser->user_occ = $user_occ;
 				$edituser->user_intrest = $user_intrest;
 				$edituser->user_mailok = $user_mailok;
@@ -539,10 +541,10 @@
 
 			$avt_handler = icms::handler('icms_data_avatar');
 			if (!empty($user_avatar)) {
-				$user_avatar = icms_core_DataFilter::addSlashes(trim($user_avatar));
+				$user_avatar = DataFilter::addSlashes(trim($user_avatar));
 				$criteria_avatar = new icms_db_criteria_Compo(new icms_db_criteria_Item('avatar_file', $user_avatar));
 				$criteria_avatar->add(new icms_db_criteria_Item('avatar_type', "S"));
-				$avatars = & $avt_handler->getObjects($criteria_avatar);
+				$avatars = &$avt_handler->getObjects($criteria_avatar);
 				if (!is_array($avatars) || !count($avatars)) {
 					$user_avatar = 'blank.gif';
 				}
diff --git a/include/checklogin.php b/include/checklogin.php
index ba4dd1d2c21c..490dad1924b2 100644
--- a/include/checklogin.php
+++ b/include/checklogin.php
@@ -42,6 +42,7 @@
  * @since		XOOPS
  */
 
+use ImpressCMS\Core\DataFilter;
 use ImpressCMS\Core\Facades\Member;
 
 icms_loadLanguageFile('core', 'user');
@@ -81,15 +82,15 @@
 $member_handler = icms::handler('icms_member');
 
 icms_loadLanguageFile('core', 'auth');
-$icmsAuth = & icms_auth_Factory::getAuthConnection(icms_core_DataFilter::addSlashes($uname));
+$icmsAuth = &icms_auth_Factory::getAuthConnection(DataFilter::addSlashes($uname));
 
-$uname4sql = addslashes(icms_core_DataFilter::stripSlashesGPC($uname));
-$pass4sql = icms_core_DataFilter::stripSlashesGPC($pass);
+$uname4sql = addslashes(DataFilter::stripSlashesGPC($uname));
+$pass4sql = DataFilter::stripSlashesGPC($pass);
 
 
 /* Check to see if being access by a user - if not, attempt to authenticate */
 if (empty($user) || !is_object($user)) {
-	$user = & $icmsAuth->authenticate($uname4sql, $pass4sql);
+	$user = &$icmsAuth->authenticate($uname4sql, $pass4sql);
 }
 
 /* User exists: check to see if the user has been activated.
diff --git a/include/comment_form.php b/include/comment_form.php
index 559ae3f06521..d5df1463f64c 100644
--- a/include/comment_form.php
+++ b/include/comment_form.php
@@ -27,15 +27,17 @@
 /**
  * The comment form extra include file
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license	LICENSE.txt
- * @package	core
- * @since	XOOPS
- * @author	http://www.xoops.org The XOOPS Project
- * @author	modified by UnderDog <underdog@impresscms.org>
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license    LICENSE.txt
+ * @package    core
+ * @since    XOOPS
+ * @author    http://www.xoops.org The XOOPS Project
+ * @author    modified by UnderDog <underdog@impresscms.org>
  */
 
+use ImpressCMS\Core\DataFilter;
+
 if (!is_object($icmsModule)) {
 	exit();
 }
@@ -127,9 +129,9 @@
 		foreach ($comment_config['extraParams'] as $extra_param) {
 			// This routine is included from forms accessed via both GET and POST
 			if (isset($_POST[$extra_param])) {
-				$hidden_value = icms_core_DataFilter::stripSlashesGPC($_POST[$extra_param]);
+				$hidden_value = DataFilter::stripSlashesGPC($_POST[$extra_param]);
 			} elseif (isset($_GET[$extra_param])) {
-				$hidden_value = icms_core_DataFilter::stripSlashesGPC($_GET[$extra_param]);
+				$hidden_value = DataFilter::stripSlashesGPC($_GET[$extra_param]);
 			} else {
 				$hidden_value = '';
 			}
diff --git a/include/comment_new.php b/include/comment_new.php
index 411e920761d7..e7128504d7d1 100644
--- a/include/comment_new.php
+++ b/include/comment_new.php
@@ -31,15 +31,18 @@
 /**
  * The new comment include file
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license	LICENSE.txt
- * @package		Administration
- * @subpackage	Comments
- * @since	XOOPS
- * @author	http://www.xoops.org The XOOPS Project
- * @author	modified by UnderDog <underdog@impresscms.org>
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license    LICENSE.txt
+ * @package        Administration
+ * @subpackage    Comments
+ * @since    XOOPS
+ * @author    http://www.xoops.org The XOOPS Project
+ * @author    modified by UnderDog <underdog@impresscms.org>
  */
+
+use ImpressCMS\Core\DataFilter;
+
 include_once ICMS_INCLUDE_PATH . '/comment_constants.php';
 if (('system' != $icmsModule->dirname && XOOPS_COMMENT_APPROVENONE == $icmsModuleConfig['com_rule'])
 	|| (!is_object(icms::$user) && !$icmsModuleConfig['com_anonpost'])
@@ -58,9 +61,9 @@
 			//themecenterposts($com_replytitle, $com_replytext);
 			echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer"><tr><td class="head">' . $com_replytitle . '</td></tr><tr><td><br />' . $com_replytext . '<br /></td></tr></table>';
 		}
-		$com_title = icms_core_DataFilter::htmlSpecialChars($com_replytitle);
+		$com_title = DataFilter::htmlSpecialChars($com_replytitle);
 		if (!preg_match("/^(Re|" . _CM_RE . "):/i", $com_title)) {
-			$com_title = _CM_RE . ": " . icms_core_DataFilter::icms_substr($com_title, 0, 56);
+			$com_title = _CM_RE . ": " . DataFilter::icms_substr($com_title, 0, 56);
 		}
 	} else {
 		$com_title = '';
diff --git a/include/comment_post.php b/include/comment_post.php
index 9a5d401f0775..3410f7f111bd 100644
--- a/include/comment_post.php
+++ b/include/comment_post.php
@@ -31,22 +31,24 @@
 /**
  * The post a comment include file
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license	LICENSE.txt
- * @package	core
- * @since	XOOPS
- * @author	http://www.xoops.org The XOOPS Project
- * @author	modified by UnderDog <underdog@impresscms.org>
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license    LICENSE.txt
+ * @package    core
+ * @since    XOOPS
+ * @author    http://www.xoops.org The XOOPS Project
+ * @author    modified by UnderDog <underdog@impresscms.org>
  */
 
+use ImpressCMS\Core\DataFilter;
+
 if (!is_object($icmsModule)) {
 	exit();
 }
 icms_loadLanguageFile('core', 'comment');
 include_once ICMS_INCLUDE_PATH . '/comment_constants.php';
 if ('system' == $icmsModule->dirname) {
-	$com_id = isset($_POST['com_id'])?(int) $_POST['com_id']:0;
+	$com_id = isset($_POST['com_id']) ? (int)$_POST['com_id'] : 0;
 	if (empty($com_id)) {
 		exit();
 	}
@@ -121,7 +123,7 @@
 			break;
 		case "preview":
 			$doimage = 1;
-			$com_title = icms_core_DataFilter::htmlSpecialChars(icms_core_DataFilter::stripSlashesGPC($_POST['com_title']));
+			$com_title = DataFilter::htmlSpecialChars(DataFilter::stripSlashesGPC($_POST['com_title']));
 			if ($dohtml != 0) {
 				if (is_object(icms::$user)) {
 					if (!icms::$user->isAdmin($com_modid)) {
@@ -134,9 +136,9 @@
 					$dohtml = 0;
 				}
 			}
-			$p_comment = icms_core_DataFilter::checkVar($_POST['com_text'], 'html', 'input');
-			$noname = isset($noname)?(int) $noname:0;
-			$com_text = icms_core_DataFilter::htmlSpecialChars(icms_core_DataFilter::stripSlashesGPC($_POST['com_text']));
+			$p_comment = DataFilter::checkVar($_POST['com_text'], 'html', 'input');
+			$noname = isset($noname) ? (int)$noname : 0;
+			$com_text = DataFilter::htmlSpecialChars(DataFilter::stripSlashesGPC($_POST['com_text']));
 			if ($icmsModule->dirname != 'system') {
 				include ICMS_ROOT_PATH . '/header.php';
 				//themecenterposts($com_title, $p_comment);
@@ -278,23 +280,23 @@
 						$comment->com_status = XOOPS_COMMENT_PENDING;
 						// RMV-NOTIFY
 						$notify_event = 'comment_submit';
-					break;
+						break;
 				}
 			}
-			$comment->com_uid = $uid;
-		}
+				$comment->com_uid = $uid;
+			}
 
-		$com_title = icms_core_DataFilter::icms_trim($_POST['com_title']);
-		$com_title = ($com_title == '')? _NOTITLE : $com_title;
-		$comment->com_title = $com_title;
-		$comment->com_text = $_POST['com_text'];
-		$comment->dohtml = $dohtml;
-		$comment->dosmiley = $dosmiley;
-		$comment->doxcode = $doxcode;
-		$comment->doimage = $doimage;
-		$comment->dobr = $dobr;
-		$comment->com_icon = $com_icon;
-		$comment->com_modified = time();
+			$com_title = DataFilter::icms_trim($_POST['com_title']);
+			$com_title = ($com_title == '') ? _NOTITLE : $com_title;
+			$comment->com_title = $com_title;
+			$comment->com_text = $_POST['com_text'];
+			$comment->dohtml = $dohtml;
+			$comment->dosmiley = $dosmiley;
+			$comment->doxcode = $doxcode;
+			$comment->doimage = $doimage;
+			$comment->dobr = $dobr;
+			$comment->com_icon = $com_icon;
+			$comment->com_modified = time();
 		$comment->com_modid = $com_modid;
 		if (isset($extra_params)) {
 			$comment->com_exparams = $extra_params;
diff --git a/include/comment_reply.php b/include/comment_reply.php
index c8b3fe1cd279..c12f7335f1c7 100644
--- a/include/comment_reply.php
+++ b/include/comment_reply.php
@@ -31,22 +31,24 @@
 /**
  * The commentreply include file
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license	LICENSE.txt
- * @package	core
- * @since	XOOPS
- * @author	http://www.xoops.org The XOOPS Project
- * @author	modified by UnderDog <underdog@impresscms.org>
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license    LICENSE.txt
+ * @package    core
+ * @since    XOOPS
+ * @author    http://www.xoops.org The XOOPS Project
+ * @author    modified by UnderDog <underdog@impresscms.org>
  */
 
+use ImpressCMS\Core\DataFilter;
+
 if (!is_object($icmsModule)) {
 	exit();
 }
 
 include_once ICMS_INCLUDE_PATH . '/comment_constants.php';
 if (('system' != $icmsModule->dirname
-	&& XOOPS_COMMENT_APPROVENONE == $icmsModuleConfig['com_rule'])
+		&& XOOPS_COMMENT_APPROVENONE == $icmsModuleConfig['com_rule'])
 	|| (!is_object(icms::$user) && !$icmsModuleConfig['com_anonpost'])
 	|| !is_object($icmsModule)) {
 	redirect_header(ICMS_URL . '/user.php', 1, _NOPERM);
@@ -77,7 +79,7 @@
 $r_text = _CM_POSTER . ': <strong>' . $r_name . '</strong>&nbsp;&nbsp;' . _CM_POSTED . ': <strong>' . formatTimestamp($comment->com_created) . '</strong><br /><br />' . $comment->com_text;
 $com_title = $comment->getVar('com_title', 'E');
 if (!preg_match("/^(Re|" . _CM_RE . "):/i", $com_title)) {
-	$com_title = _CM_RE . ": " . icms_core_DataFilter::icms_substr($com_title, 0, 56);
+	$com_title = _CM_RE . ": " . DataFilter::icms_substr($com_title, 0, 56);
 }
 $com_pid = $com_id;
 $com_text = '';
diff --git a/include/comment_view.php b/include/comment_view.php
index ad66420aa436..076726faa4f7 100644
--- a/include/comment_view.php
+++ b/include/comment_view.php
@@ -31,15 +31,17 @@
 /**
  * The commentview include file
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license	LICENSE.txt
- * @package	core
- * @since	XOOPS
- * @author	http://www.xoops.org The XOOPS Project
- * @author	modified by UnderDog <underdog@impresscms.org>
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license    LICENSE.txt
+ * @package    core
+ * @since    XOOPS
+ * @author    http://www.xoops.org The XOOPS Project
+ * @author    modified by UnderDog <underdog@impresscms.org>
  */
 
+use ImpressCMS\Core\DataFilter;
+
 if (!is_object($icmsModule)) {
 	exit();
 }
@@ -73,11 +75,11 @@
 
 /* filter the user input */
 if (!empty($_GET)) {
-	$clean_GET = icms_core_DataFilter::checkVarArray($_GET, $filter_get, false);
+	$clean_GET = DataFilter::checkVarArray($_GET, $filter_get, false);
 	extract($clean_GET);
 }
 if (!empty($_POST)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_POST, $filter_post, false);
+	$clean_POST = DataFilter::checkVarArray($_POST, $filter_post, false);
 	extract($clean_POST);
 }
 
diff --git a/include/commentform.inc.php b/include/commentform.inc.php
index b0000a79c219..80ae30b5e92d 100644
--- a/include/commentform.inc.php
+++ b/include/commentform.inc.php
@@ -27,19 +27,21 @@
 /**
  * The commentform include file
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license	LICENSE.txt
- * @package		Administration
- * @subpackage	Comments
- * @since	XOOPS
- * @author	http://www.xoops.org The XOOPS Project
- * @author	modified by UnderDog <underdog@impresscms.org>
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license    LICENSE.txt
+ * @package        Administration
+ * @subpackage    Comments
+ * @since    XOOPS
+ * @author    http://www.xoops.org The XOOPS Project
+ * @author    modified by UnderDog <underdog@impresscms.org>
  */
 
+use ImpressCMS\Core\DataFilter;
+
 $cform = new icms_form_Theme(_CM_POSTCOMMENT, "commentform", "postcomment.php", "post", true);
 if (!preg_match("/^re:/i", $subject)) {
-	$subject = "Re: " . icms_core_DataFilter::icms_substr($subject, 0, 56);
+	$subject = "Re: " . DataFilter::icms_substr($subject, 0, 56);
 }
 $cform->addElement(new icms_form_elements_Text(_CM_TITLE, 'subject', 50, 255, $subject), true);
 $icons_radio = new icms_form_elements_Radio(_MESSAGEICON, 'icon', $icon);
diff --git a/include/findusers.php b/include/findusers.php
index 90c7da409ebf..4c22d8a66029 100644
--- a/include/findusers.php
+++ b/include/findusers.php
@@ -5,13 +5,15 @@
  * limit: Only work with javascript enabled
  * @todo: plugins for external applications, including but not limited: sending massive emails/PMs, membership edit
  *
- * @copyright	The XOOPS project http://www.xoops.org/
- * @license		https://www.gnu.org/licenses/old-licenses/gpl-2.0.html GPLv2 or later license
- * @author		Taiwen Jiang (phppp or D.J.) <php_pp@hotmail.com>
- * @since		Xoops 1.00
+ * @copyright    The XOOPS project http://www.xoops.org/
+ * @license        https://www.gnu.org/licenses/old-licenses/gpl-2.0.html GPLv2 or later license
+ * @author        Taiwen Jiang (phppp or D.J.) <php_pp@hotmail.com>
+ * @since        Xoops 1.00
  * @package core
  */
 
+use ImpressCMS\Core\DataFilter;
+
 xoops_header(false);
 
 $denied = true;
@@ -182,8 +184,8 @@
 		$criteria = new icms_db_criteria_Compo();
 		foreach (array_keys($items_match) as $var) {
 			if (!empty($_POST[$var])) {
-				$match = (!empty($_POST["{$var}_match"]))?(int) ($_POST["{$var}_match"]):XOOPS_MATCH_START;
-				$value = str_replace("_", "\\\_", icms_core_DataFilter::addSlashes(trim($_POST[$var])));
+				$match = (!empty($_POST["{$var}_match"])) ? (int)($_POST["{$var}_match"]) : XOOPS_MATCH_START;
+				$value = str_replace("_", "\\\_", DataFilter::addSlashes(trim($_POST[$var])));
 				switch ($match) {
 					case XOOPS_MATCH_START:
 						$criteria->add(new icms_db_criteria_Item($var, $value . '%', 'LIKE'));
@@ -207,14 +209,14 @@
 		}
 
 		if (!empty($_POST['user_from'])) {
-			$criteria->add(new icms_db_criteria_Item('user_from', '%' . icms_core_DataFilter::addSlashes(trim($_POST['user_from'])) . '%', 'LIKE'));
+			$criteria->add(new icms_db_criteria_Item('user_from', '%' . DataFilter::addSlashes(trim($_POST['user_from'])) . '%', 'LIKE'));
 		}
 
 		if (!empty($_POST['user_intrest'])) {
-			$criteria->add(new icms_db_criteria_Item('user_intrest', '%' . icms_core_DataFilter::addSlashes(trim($_POST['user_intrest'])) . '%', 'LIKE'));
+			$criteria->add(new icms_db_criteria_Item('user_intrest', '%' . DataFilter::addSlashes(trim($_POST['user_intrest'])) . '%', 'LIKE'));
 		}
 		if (!empty($_POST['user_occ'])) {
-			$criteria->add(new icms_db_criteria_Item('user_occ', '%' . icms_core_DataFilter::addSlashes(trim($_POST['user_occ'])) . '%', 'LIKE'));
+			$criteria->add(new icms_db_criteria_Item('user_occ', '%' . DataFilter::addSlashes(trim($_POST['user_occ'])) . '%', 'LIKE'));
 		}
 
 		foreach (array("last_login", "user_regdate") as $var) {
@@ -366,7 +368,7 @@ function addusers()
 				// regenerate token value
 				$hiddenform .= icms::$security->getTokenHTML() . "\n";
 			} else {
-				$hiddenform .= "<input type='hidden' name='" . htmlSpecialChars($k, ENT_QUOTES) . "' value='" . htmlSpecialChars(icms_core_DataFilter::stripSlashesGPC($v), ENT_QUOTES) . "' />\n";
+				$hiddenform .= "<input type='hidden' name='" . htmlSpecialChars($k, ENT_QUOTES) . "' value='" . htmlSpecialChars(DataFilter::stripSlashesGPC($v), ENT_QUOTES) . "' />\n";
 			}
 		}
 
@@ -452,7 +454,7 @@ function addusers()
 				// regenerate token value
 				$hiddenform .= icms::$security->getTokenHTML() . "\n";
 			} else {
-				$hiddenform .= "<input type='hidden' name='" . htmlSpecialChars($k, ENT_QUOTES) . "' value='" . htmlSpecialChars(icms_core_DataFilter::stripSlashesGPC($v), ENT_QUOTES) . "' />\n";
+				$hiddenform .= "<input type='hidden' name='" . htmlSpecialChars($k, ENT_QUOTES) . "' value='" . htmlSpecialChars(DataFilter::stripSlashesGPC($v), ENT_QUOTES) . "' />\n";
 			}
 		}
 
diff --git a/include/functions.php b/include/functions.php
index 108afa317909..3bd7712baa6a 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -36,6 +36,7 @@
  */
 
 use Aura\Session\Session;
+use ImpressCMS\Core\DataFilter;
 use ImpressCMS\Core\Response\ViewResponse;
 
 if (!function_exists('xoops_header')) {
@@ -796,7 +797,7 @@ function icms_purifyText($text, $keyword = false)
 		$text = str_replace('<br', ' ', $text);
 		$text = strip_tags($text);
 		$text = html_entity_decode($text);
-		$text = icms_core_DataFilter::undoHtmlSpecialChars($text);
+		$text = DataFilter::undoHtmlSpecialChars($text);
 		$text = str_replace(')', ' ', $text);
 		$text = str_replace('(', ' ', $text);
 		$text = str_replace(':', ' ', $text);
@@ -943,7 +944,7 @@ function icms_getCookieVar($name, $default = '')
 	function icms_get_page_before_form()
 	{
 		return isset($_POST['icms_page_before_form'])
-			? icms_core_DataFilter::checkVar($_POST['icms_page_before_form'], 'url')
+			? DataFilter::checkVar($_POST['icms_page_before_form'], 'url')
 			: icms::$urls['previouspage'];
 	}
 }
diff --git a/include/inviteform.php b/include/inviteform.php
index 0ae656a66eb9..4366f3049544 100644
--- a/include/inviteform.php
+++ b/include/inviteform.php
@@ -2,15 +2,17 @@
 /**
  * Handles all functions for the invitation form within ImpressCMS
  *
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license	LICENSE.txt
- * @package	core
- * @since	1.1
- * @author	modified by UnderDog <underdog@impresscms.org>
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license    LICENSE.txt
+ * @package    core
+ * @since    1.1
+ * @author    modified by UnderDog <underdog@impresscms.org>
  */
 
+use ImpressCMS\Core\DataFilter;
+
 $invite_form = new icms_form_Theme(_US_USERINVITE, "userinvite", "invite.php", "post", true);
-$invite_form->addElement(new icms_form_elements_Text(_US_EMAIL, "email", 25, 60, icms_core_DataFilter::htmlSpecialChars($email)), true);
+$invite_form->addElement(new icms_form_elements_Text(_US_EMAIL, "email", 25, 60, DataFilter::htmlSpecialChars($email)), true);
 $invite_form->addElement(new icms_form_elements_Captcha(_SECURITYIMAGE_GETCODE, "scode"), true);
 $invite_form->addElement(new icms_form_elements_Hidden("op", "finish"));
 $invite_form->addElement(new icms_form_elements_Button("", "submit", _US_SUBMIT, "submit"));
\ No newline at end of file
diff --git a/include/registerform.php b/include/registerform.php
index 75bb6850f079..b71c2fb1dfa5 100644
--- a/include/registerform.php
+++ b/include/registerform.php
@@ -27,34 +27,36 @@
 /**
  * Registration form
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		LICENSE.txt
- * @package	core
- * @since		XOOPS
- * @author		http://www.xoops.org The XOOPS Project
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        LICENSE.txt
+ * @package    core
+ * @since        XOOPS
+ * @author        http://www.xoops.org The XOOPS Project
  */
 
+use ImpressCMS\Core\DataFilter;
+
 $email_tray = new icms_form_elements_Tray(_US_EMAIL, "<br />");
-$email_text = new icms_form_elements_Text("", "email", 25, 60, icms_core_DataFilter::htmlSpecialChars($email));
+$email_text = new icms_form_elements_Text("", "email", 25, 60, DataFilter::htmlSpecialChars($email));
 $email_option = new icms_form_elements_Checkbox("", "user_viewemail", $user_viewemail);
 $email_option->addOption(1, _US_ALLOWVIEWEMAIL);
 $email_tray->addElement($email_text, true);
 $email_tray->addElement($email_option);
 $reg_form = new icms_form_Theme(_US_USERREG, "userinfo", "register.php", "post", true);
-$uname_size = $icmsConfigUser['maxuname'] < 75?$icmsConfigUser['maxuname']:75;
-$uname_size = $icmsConfigUser['maxuname'] > 3?$icmsConfigUser['maxuname']:3;
-$reg_form->addElement(new icms_form_elements_Text(_US_NICKNAME, "uname", $uname_size, $uname_size, icms_core_DataFilter::htmlSpecialChars($uname)), true);
-$login_name_size = $icmsConfigUser['maxuname'] < 75?$icmsConfigUser['maxuname']:75;
-$reg_form->addElement(new icms_form_elements_Text(_US_LOGIN_NAME, "login_name", $login_name_size, $login_name_size, icms_core_DataFilter::htmlSpecialChars($login_name)), true);
+$uname_size = $icmsConfigUser['maxuname'] < 75 ? $icmsConfigUser['maxuname'] : 75;
+$uname_size = $icmsConfigUser['maxuname'] > 3 ? $icmsConfigUser['maxuname'] : 3;
+$reg_form->addElement(new icms_form_elements_Text(_US_NICKNAME, "uname", $uname_size, $uname_size, DataFilter::htmlSpecialChars($uname)), true);
+$login_name_size = $icmsConfigUser['maxuname'] < 75 ? $icmsConfigUser['maxuname'] : 75;
+$reg_form->addElement(new icms_form_elements_Text(_US_LOGIN_NAME, "login_name", $login_name_size, $login_name_size, DataFilter::htmlSpecialChars($login_name)), true);
 $reg_form->addElement($email_tray);
 if ($icmsConfigUser['pass_level'] > 20) {
 	icms_PasswordMeter();
 }
-$reg_form->addElement(new icms_form_elements_Password(_US_PASSWORD, "pass", 10, 255, icms_core_DataFilter::htmlSpecialChars($pass), false, ($icmsConfigUser['pass_level']?'password_adv':'')), true);
-$reg_form->addElement(new icms_form_elements_Password(_US_VERIFYPASS, "vpass", 10, 255, icms_core_DataFilter::htmlSpecialChars($vpass)), true);
-$reg_form->addElement(new icms_form_elements_Text(_US_WEBSITE, "url", 25, 255, icms_core_DataFilter::htmlSpecialChars($url)));
-$tzselected = ($timezone_offset != "")?$timezone_offset:$icmsConfig['default_TZ'];
+$reg_form->addElement(new icms_form_elements_Password(_US_PASSWORD, "pass", 10, 255, DataFilter::htmlSpecialChars($pass), false, ($icmsConfigUser['pass_level'] ? 'password_adv' : '')), true);
+$reg_form->addElement(new icms_form_elements_Password(_US_VERIFYPASS, "vpass", 10, 255, DataFilter::htmlSpecialChars($vpass)), true);
+$reg_form->addElement(new icms_form_elements_Text(_US_WEBSITE, "url", 25, 255, DataFilter::htmlSpecialChars($url)));
+$tzselected = ($timezone_offset != "") ? $timezone_offset : $icmsConfig['default_TZ'];
 $reg_form->addElement(new icms_form_elements_select_Timezone(_US_TIMEZONE, "timezone_offset", $tzselected));
 //$reg_form->addElement($avatar_tray);
 $reg_form->addElement(new icms_form_elements_Radioyn(_US_MAILOK, 'user_mailok', $user_mailok));
@@ -73,7 +75,7 @@
 	$reg_form->addElement($disc_tray);
 }
 
-$reg_form->addElement(new icms_form_elements_Hidden("actkey", icms_core_DataFilter::htmlSpecialChars($actkey)));
+$reg_form->addElement(new icms_form_elements_Hidden("actkey", DataFilter::htmlSpecialChars($actkey)));
 
 if ($icmsConfigUser['use_captcha'] == true) {
 	$reg_form->addElement(new icms_form_elements_Captcha(_SECURITYIMAGE_GETCODE, "scode"), true);
diff --git a/invite.php b/invite.php
index 6672d554e44e..364e69183428 100644
--- a/invite.php
+++ b/invite.php
@@ -2,14 +2,16 @@
 /**
  * All functions for Registering users by invitation are going through here.
  *
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		LICENSE.txt
- * @package		Member
- * @subpackage	Users
- * @author		marcan <marcan@impresscms.org>
- * @author	    Sina Asghari (aka stranger) <pesian_stranger@users.sourceforge.net>
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        LICENSE.txt
+ * @package        Member
+ * @subpackage    Users
+ * @author        marcan <marcan@impresscms.org>
+ * @author        Sina Asghari (aka stranger) <pesian_stranger@users.sourceforge.net>
  */
 
+use ImpressCMS\Core\DataFilter;
+
 $xoopsOption['pagetype'] = 'user';
 
 // If not a user and invite needs one, redirect
@@ -18,8 +20,8 @@
 	exit();
 }
 
-$op = !isset($_POST['op'])?'invite':$_POST['op'];
-$email = isset($_POST['email'])? trim(icms_core_DataFilter::stripSlashesGPC($_POST['email'])):'';
+$op = !isset($_POST['op']) ? 'invite' : $_POST['op'];
+$email = isset($_POST['email']) ? trim(DataFilter::stripSlashesGPC($_POST['email'])) : '';
 
 switch ($op) {
 	case 'finish':
diff --git a/lostpass.php b/lostpass.php
index 649ee0f4e499..fd132f6a2518 100644
--- a/lostpass.php
+++ b/lostpass.php
@@ -29,14 +29,16 @@
  *
  * Form and process for sending a new password to a user
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		Member
- * @subpackage	Users
- * @since		XOOPS
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        Member
+ * @subpackage    Users
+ * @since        XOOPS
  */
 
+use ImpressCMS\Core\DataFilter;
+
 $xoopsOption['pagetype'] = 'user';
 /* $_POST parameters
  *	email
@@ -53,11 +55,11 @@
 $code = '';
 
 if (!empty($_GET)) {
-	$clean_GET = icms_core_DataFilter::checkVarArray($_GET, $filter_get, false);
+	$clean_GET = DataFilter::checkVarArray($_GET, $filter_get, false);
 	extract($clean_GET);
 }
 if (!empty($_POST)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_POST, $filter_post, false);
+	$clean_POST = DataFilter::checkVarArray($_POST, $filter_post, false);
 	extract($clean_POST);
 }
 if ($email == '') {
diff --git a/misc.php b/misc.php
index 2487377ad812..7cd406a3bebd 100644
--- a/misc.php
+++ b/misc.php
@@ -36,6 +36,7 @@
  */
 
 use ImpressCMS\Core\DataFilter;
+use ImpressCMS\Core\Models\User;
 
 icms_loadLanguageFile('core', 'misc');
 /* set filter types, if not strings */
@@ -78,18 +79,13 @@
 			if ($target == '' || !preg_match('/^[0-9a-z_]*$/i', $target)) {} else {
 				echo "<script type=\"text/javascript\"><!--//
 				function doSmilie(addSmilie) {
-				var currentMessage = window.opener.xoopsGetElementById(\"".$target . "\").value;
-				window.opener.xoopsGetElementById(\"".$target . "\").value=currentMessage+addSmilie;
-				return;
-				}
-				//-->
-				</script>
-				";
+				var currentMessage = window.opener.xoopsGetElementById(\"" . $target . "\").value;
+				window.opener.xoopsGetElementById(\"" . $target . ";
 				echo '</head><body>
 				<table width="100%" class="outer">
 				<tr><th colspan="3">'._MSC_SMILIES . '</th></tr>
 				<tr class="head"><td>'._MSC_CODE . '</td><td>' . _MSC_EMOTION . '</td><td>' . _IMAGE . '</td></tr>';
-				$smiles = icms_core_DataFilter::getSmileys(1);
+				$smiles = DataFilter::getSmileys(1);
 				$count = count($smiles);
 				if ($count > 0) {
 					$rcolor = 'even';
@@ -167,7 +163,7 @@ function showAvatar() {
 								<input type='hidden' name='op' value='sendsite' />
 								<input type='hidden' name='action' value='showpopups' />
 								<input type='hidden' name='type' value='friend' />\n";
-					echo _MSC_YOURNAMEC . "</td>
+				echo _MSC_YOURNAMEC . "</td>
 						<td class='even'><input type='text' name='yname' value='$yname' id='yname' /></td></tr>
 						<tr><td class='head'>" . _MSC_YOUREMAILC . "</td><td class='odd'>
 						<input type='text' name='ymail' value='".$ymail . "' id='ymail' /></td></tr>
@@ -177,34 +173,34 @@ function showAvatar() {
 						<td class='odd'><input type='text' name='fmail' value='$fmail' id='fmail' /></td></tr>
 						<tr><td class='head'>&nbsp;</td><td class='even'>
 						<input type='submit' value='" . _SEND . "' />&nbsp;
-						<input value='"._CLOSE . "' type='button' onclick='javascript:window.close();' />"
-						. icms::$security->getTokenHTML() . "</td></tr>
+						<input value='"._CLOSE . "' type='button' onclick='window.close();' />"
+				. icms::$security->getTokenHTML() . "</td></tr>
 						</table></form>\n";
-					$closebutton = 0;
+				$closebutton = 0;
 				} elseif ($op == 'sendsite') {
-					if (icms::$user) {
-						$ymail = icms::$user->email;
-					} else {
-						$ymail = isset($ymail)? icms_core_DataFilter::stripSlashesGPC(trim($ymail)):'';
-					}
-					if (!isset($yname) || trim($yname) == '' || $ymail == ''
-						|| !isset($fname) || trim($fname) == ''
-						|| !isset($fmail) || trim($fmail) == '') {
-						redirect_header(ICMS_URL . '/misc.php?action=showpopups&amp;type=friend&amp;op=sendform', 2, _MSC_NEEDINFO);
-					}
-					$yname = icms_core_DataFilter::stripSlashesGPC(trim($_POST['yname']));
-					$fname = icms_core_DataFilter::stripSlashesGPC(trim($_POST['fname']));
-					$fmail = icms_core_DataFilter::stripSlashesGPC(trim($_POST['fmail']));
-					if (!checkEmail($fmail) || !checkEmail($ymail) || preg_match('/[\\0-\\31]/', $yname)) {
-						$errormessage = _MSC_INVALIDEMAIL1 . '<br />' . _MSC_INVALIDEMAIL2 . '';
-						redirect_header(ICMS_URL . '/misc.php?action=showpopups&amp;type=friend&amp;op=sendform', 2, $errormessage);
-					}
-					global $icmsConfig;
+				if (icms::$user) {
+				$ymail = icms::$user->email;
+				} else {
+				$ymail = isset($ymail)? DataFilter::stripSlashesGPC(trim($ymail)):'';
+				}
+				if (!isset($yname) || trim($yname) == '' || $ymail == ''
+				|| !isset($fname) || trim($fname) == ''
+				|| !isset($fmail) || trim($fmail) == '') {
+				redirect_header(ICMS_URL . '/misc.php?action=showpopups&amp;type=friend&amp;op=sendform', 2, _MSC_NEEDINFO);
+				}
+				$yname = DataFilter::stripSlashesGPC(trim($_POST['yname']));
+				$fname = DataFilter::stripSlashesGPC(trim($_POST['fname']));
+				$fmail = DataFilter::stripSlashesGPC(trim($_POST['fmail']));
+				if (!checkEmail($fmail) || !checkEmail($ymail) || preg_match('/[\\0-\\31]/', $yname)) {
+				$errormessage = _MSC_INVALIDEMAIL1 . '<br />' . _MSC_INVALIDEMAIL2 . '';
+				redirect_header(ICMS_URL . '/misc.php?action=showpopups&amp;type=friend&amp;op=sendform', 2, $errormessage);
+				}
+				global $icmsConfig;
 
-					$mailer = new icms_messaging_Handler();
-					$mailer->setTemplate('tellfriend.tpl');
-					$mailer->assign('SITENAME', $icmsConfig['sitename']);
-					$mailer->assign('ADMINMAIL', $icmsConfig['adminmail']);
+				$mailer = new icms_messaging_Handler();
+				$mailer->setTemplate('tellfriend.tpl');
+				$mailer->assign('SITENAME', $icmsConfig['sitename']);
+				$mailer->assign('ADMINMAIL', $icmsConfig['adminmail']);
 					$mailer->assign('SITEURL', ICMS_URL.'/');
 					$mailer->assign('YOUR_NAME', $yname);
 					$mailer->assign('FRIEND_NAME', $fname);
@@ -226,25 +222,29 @@ function showAvatar() {
 				$criteria = new icms_db_criteria_Compo();
 				$criteria->setLimit($limit);
 				$criteria->setStart($start);
-				$onlines = & $online_handler->getAll($criteria);
+				$onlines = &$online_handler->getAll($criteria);
 				$count = count($onlines);
 				$module_handler = icms::handler('icms_module');
-				$modules = & $module_handler->getList(new icms_db_criteria_Item('isactive', 1));
-				for ($i = 0; $i < $count; $i++) {
-					if ($onlines[$i]['online_uid'] == 0) {
-						$onlineUsers[$i]['user'] = '';
-					} else {
-						$onlineUsers[$i]['user'] = new \ImpressCMS\Core\Models\User($onlines[$i]['online_uid']);
-					}
-					$onlineUsers[$i]['ip'] = $onlines[$i]['online_ip'];
-					$onlineUsers[$i]['updated'] = $onlines[$i]['online_updated'];
-					$onlineUsers[$i]['module'] = ($onlines[$i]['online_module'] > 0)?$modules[$onlines[$i]['online_module']]:'';
+				$modules = &$module_handler->getList(new icms_db_criteria_Item('isactive', 1));
+				for ($i = 0;
+				$i < $count;
+				$i++) {
+				if ($onlines[$i]['online_uid'] == 0) {
+				$onlineUsers[$i]['user'] = '';
+				} else {
+				$onlineUsers[$i]['user'] = new User($onlines[$i]['online_uid']);
+				}
+				$onlineUsers[$i]['ip'] = $onlines[$i]['online_ip'];
+				$onlineUsers[$i]['updated'] = $onlines[$i]['online_updated'];
+				$onlineUsers[$i]['module'] = ($onlines[$i]['online_module'] > 0)?$modules[$onlines[$i]['online_module']]:'';
 				}
 				$class = 'even';
-				for ($i = 0; $i < $count; $i++) {
-					$class = ($class == 'odd')?'even':'odd';
-					echo '<tr valign="middle" align="center" class="' . $class . '">';
-					if (is_object($onlineUsers[$i]['user'])) {
+				for ($i = 0;
+				$i < $count;
+				$i++) {
+				$class = ($class == 'odd')?'even':'odd';
+				echo '<tr valign="middle" align="center" class="' . $class . '">';
+				if (is_object($onlineUsers[$i]['user'])) {
 						$avatar = $onlineUsers[$i]['user']->user_avatar
 							?'<img src="' . ICMS_UPLOAD_URL . '/' . $onlineUsers[$i]['user']->user_avatar . '" alt="" />':'&nbsp;';
 						echo '<td>' . $avatar . "</td><td>
@@ -272,25 +272,25 @@ function showAvatar() {
 					echo '<div style="text-align:center;">
 						<input class="formButton" value="'._CLOSE . '" type="button" onclick="window.opener.location.reload();window.close();" />
 						</div>';
-					$closebutton = false;
+				$closebutton = false;
 				}
 				break;
-			default:
+				default:
 				break;
 				}
 				if ($closebutton) {
-					echo '<div style="text-align:center;">
-						<input class="formButton" value="'._CLOSE . '" type="button" onclick="javascript:window.close();" />
+				echo '<div style="text-align:center;">
+						<input class="formButton" value="'._CLOSE . '" type="button" onclick="window.close();" />
 						</div>';
 				}
 				xoops_footer();
-			}
+				}
 
-			function printCheckForm() {
+				function printCheckForm() {
 				?>
 					<script language='javascript'>
-					<!--//
-					function checkForm() {
+						<!--//
+						function checkForm() {
 						if (xoopsGetElementById("yname").value == "") {
 							alert("<?php echo _MSC_ENTERYNAME; ?>");
 							xoopsGetElementById("yname").focus();
diff --git a/modules/system/admin/admin_header.php b/modules/system/admin/admin_header.php
index 019452936cd1..7009bb51a18f 100644
--- a/modules/system/admin/admin_header.php
+++ b/modules/system/admin/admin_header.php
@@ -2,13 +2,15 @@
 /**
  *
  *
- * @category	ICMS
- * @package		Administration
- * @subpackage	System
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		LICENSE.txt
+ * @category    ICMS
+ * @package        Administration
+ * @subpackage    System
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        LICENSE.txt
  */
 
+use ImpressCMS\Core\DataFilter;
+
 if (!is_object(icms::$user)
 	|| !is_object(icms::$module)
 	|| !icms::$user->isAdmin(icms::$module->mid)
@@ -40,11 +42,11 @@
 
 /* filter the user input */
 if (!empty($_GET)) {
-	$clean_GET = icms_core_DataFilter::checkVarArray($_GET, $filter_get, false);
+	$clean_GET = DataFilter::checkVarArray($_GET, $filter_get, false);
 	extract($clean_GET);
 }
 if (!empty($_POST)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_POST, $filter_post, false);
+	$clean_POST = DataFilter::checkVarArray($_POST, $filter_post, false);
 	extract($clean_POST);
 }
 
diff --git a/modules/system/admin/findusers.php b/modules/system/admin/findusers.php
index e3f68b2c8eb4..c8d3a792af46 100644
--- a/modules/system/admin/findusers.php
+++ b/modules/system/admin/findusers.php
@@ -31,13 +31,15 @@
 /**
  * Administration of finding users, main file
  *
- * @copyright	http://www.XOOPS.org/
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		Administration
- * @subpackage	Users
+ * @copyright    http://www.XOOPS.org/
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        Administration
+ * @subpackage    Users
  */
 
+use ImpressCMS\Core\DataFilter;
+
 if (!is_object(icms::$user) || !is_object($icmsModule) || !icms::$user->isAdmin($icmsModule->mid)) {
 	exit("Access Denied");
 }
@@ -49,11 +51,11 @@
 $filter_get = array();
 
 if (!empty($_POST)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_POST, $filter_post, false);
+	$clean_POST = DataFilter::checkVarArray($_POST, $filter_post, false);
 	extract($clean_POST);
 }
 if (!empty($_GET)) {
-	$clean_GET = icms_core_DataFilter::checkVarArray($_GET, $filter_get, false);
+	$clean_GET = DataFilter::checkVarArray($_GET, $filter_get, false);
 	extract($clean_GET);
 }
 
@@ -156,19 +158,19 @@
 		$match = (!empty($user_uname_match))?(int) $user_uname_match:XOOPS_MATCH_START;
 		switch ($match) {
 			case XOOPS_MATCH_START:
-				$criteria->add(new icms_db_criteria_Item('uname', icms_core_DataFilter::addSlashes(trim($user_uname)) . '%', 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('uname', DataFilter::addSlashes(trim($user_uname)) . '%', 'LIKE'));
 				break;
 
 			case XOOPS_MATCH_END:
-				$criteria->add(new icms_db_criteria_Item('uname', '%' . icms_core_DataFilter::addSlashes(trim($user_uname)), 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('uname', '%' . DataFilter::addSlashes(trim($user_uname)), 'LIKE'));
 				break;
 
 			case XOOPS_MATCH_EQUAL:
-				$criteria->add(new icms_db_criteria_Item('uname', icms_core_DataFilter::addSlashes(trim($user_uname))));
+				$criteria->add(new icms_db_criteria_Item('uname', DataFilter::addSlashes(trim($user_uname))));
 				break;
 
 			case XOOPS_MATCH_CONTAIN:
-				$criteria->add(new icms_db_criteria_Item('uname', '%' . icms_core_DataFilter::addSlashes(trim($user_uname)) . '%', 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('uname', '%' . DataFilter::addSlashes(trim($user_uname)) . '%', 'LIKE'));
 				break;
 
 			default:
@@ -179,19 +181,19 @@
 		$match = (!empty($user_name_match))?(int) $user_name_match:XOOPS_MATCH_START;
 		switch ($match) {
 			case XOOPS_MATCH_START:
-				$criteria->add(new icms_db_criteria_Item('name', icms_core_DataFilter::addSlashes(trim($user_name)) . '%', 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('name', DataFilter::addSlashes(trim($user_name)) . '%', 'LIKE'));
 				break;
 
 			case XOOPS_MATCH_END:
-				$criteria->add(new icms_db_criteria_Item('name', '%' . icms_core_DataFilter::addSlashes(trim($user_name)), 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('name', '%' . DataFilter::addSlashes(trim($user_name)), 'LIKE'));
 				break;
 
 			case XOOPS_MATCH_EQUAL:
-				$criteria->add(new icms_db_criteria_Item('name', icms_core_DataFilter::addSlashes(trim($user_name))));
+				$criteria->add(new icms_db_criteria_Item('name', DataFilter::addSlashes(trim($user_name))));
 				break;
 
 			case XOOPS_MATCH_CONTAIN:
-				$criteria->add(new icms_db_criteria_Item('name', '%' . icms_core_DataFilter::addSlashes(trim($user_name)) . '%', 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('name', '%' . DataFilter::addSlashes(trim($user_name)) . '%', 'LIKE'));
 				break;
 
 			default:
@@ -202,19 +204,19 @@
 		$match = (!empty($user_login_name_match))?(int) $user_login_name_match:XOOPS_MATCH_START;
 		switch ($match) {
 			case XOOPS_MATCH_START:
-				$criteria->add(new icms_db_criteria_Item('login_name', icms_core_DataFilter::addSlashes(trim($user_login_name)) . '%', 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('login_name', DataFilter::addSlashes(trim($user_login_name)) . '%', 'LIKE'));
 				break;
 
 			case XOOPS_MATCH_END:
-				$criteria->add(new icms_db_criteria_Item('login_name', '%' . icms_core_DataFilter::addSlashes(trim($user_login_name)), 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('login_name', '%' . DataFilter::addSlashes(trim($user_login_name)), 'LIKE'));
 				break;
 
 			case XOOPS_MATCH_EQUAL:
-				$criteria->add(new icms_db_criteria_Item('login_name', icms_core_DataFilter::addSlashes(trim($user_login_name))));
+				$criteria->add(new icms_db_criteria_Item('login_name', DataFilter::addSlashes(trim($user_login_name))));
 				break;
 
 			case XOOPS_MATCH_CONTAIN:
-				$criteria->add(new icms_db_criteria_Item('login_name', '%' . icms_core_DataFilter::addSlashes(trim($user_login_name)) . '%', 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('login_name', '%' . DataFilter::addSlashes(trim($user_login_name)) . '%', 'LIKE'));
 				break;
 
 			default:
@@ -225,19 +227,19 @@
 		$match = (!empty($user_email_match))?(int) $user_email_match:XOOPS_MATCH_START;
 		switch ($match) {
 			case XOOPS_MATCH_START:
-				$criteria->add(new icms_db_criteria_Item('email', icms_core_DataFilter::addSlashes(trim($user_email)) . '%', 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('email', DataFilter::addSlashes(trim($user_email)) . '%', 'LIKE'));
 				break;
 
 			case XOOPS_MATCH_END:
-				$criteria->add(new icms_db_criteria_Item('email', '%' . icms_core_DataFilter::addSlashes(trim($user_email)), 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('email', '%' . DataFilter::addSlashes(trim($user_email)), 'LIKE'));
 				break;
 
 			case XOOPS_MATCH_EQUAL:
-				$criteria->add(new icms_db_criteria_Item('email', icms_core_DataFilter::addSlashes(trim($user_email))));
+				$criteria->add(new icms_db_criteria_Item('email', DataFilter::addSlashes(trim($user_email))));
 				break;
 
 			case XOOPS_MATCH_CONTAIN:
-				$criteria->add(new icms_db_criteria_Item('email', '%' . icms_core_DataFilter::addSlashes(trim($user_email)) . '%', 'LIKE'));
+				$criteria->add(new icms_db_criteria_Item('email', '%' . DataFilter::addSlashes(trim($user_email)) . '%', 'LIKE'));
 				break;
 
 			default:
@@ -249,13 +251,13 @@
 		$criteria->add(new icms_db_criteria_Item('url', $url . '%', 'LIKE'));
 	}
 	if (!empty($user_from)) {
-		$criteria->add(new icms_db_criteria_Item('user_from', '%' . icms_core_DataFilter::addSlashes(trim($user_from)) . '%', 'LIKE'));
+		$criteria->add(new icms_db_criteria_Item('user_from', '%' . DataFilter::addSlashes(trim($user_from)) . '%', 'LIKE'));
 	}
 	if (!empty($user_intrest)) {
-		$criteria->add(new icms_db_criteria_Item('user_intrest', '%' . icms_core_DataFilter::addSlashes(trim($user_intrest)) . '%', 'LIKE'));
+		$criteria->add(new icms_db_criteria_Item('user_intrest', '%' . DataFilter::addSlashes(trim($user_intrest)) . '%', 'LIKE'));
 	}
 	if (!empty($user_occ)) {
-		$criteria->add(new icms_db_criteria_Item('user_occ', '%' . icms_core_DataFilter::addSlashes(trim($user_occ)) . '%', 'LIKE'));
+		$criteria->add(new icms_db_criteria_Item('user_occ', '%' . DataFilter::addSlashes(trim($user_occ)) . '%', 'LIKE'));
 	}
 
 	if (!empty($user_lastlog_more) && is_numeric($user_lastlog_more)) {
@@ -375,7 +377,7 @@
 					// regenerate token value
 					$hiddenform .= icms::$security->getTokenHTML() . "\n";
 				} else {
-					$hiddenform .= "<input type='hidden' name='" . icms_core_DataFilter::htmlSpecialChars($k) . "' value='" . icms_core_DataFilter::htmlSpecialChars(icms_core_DataFilter::stripSlashesGPC($v)) . "' />\n";
+					$hiddenform .= "<input type='hidden' name='" . DataFilter::htmlSpecialChars($k) . "' value='" . DataFilter::htmlSpecialChars(DataFilter::stripSlashesGPC($v)) . "' />\n";
 				}
 			}
 
diff --git a/modules/system/admin/groupperm.php b/modules/system/admin/groupperm.php
index 833f847393e6..a83f0e96ab96 100644
--- a/modules/system/admin/groupperm.php
+++ b/modules/system/admin/groupperm.php
@@ -33,13 +33,16 @@
  * Target for the group permissions form to handle the POST data. Only used
  * by some modules - not the core.
  *
- * @todo		Full refactoring: this should really be a callback method, not a separate target.
+ * @todo        Full refactoring: this should really be a callback method, not a separate target.
  *
- * @copyright	http://www.XOOPS.org/
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		Administration
+ * @copyright    http://www.XOOPS.org/
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        Administration
  */
+
+use ImpressCMS\Core\DataFilter;
+
 define('ICMS_IN_ADMIN', 1);
 
 /** necessary files, since this is a direct POST target */
@@ -62,7 +65,7 @@
 
 /* filter the user input */
 if (!empty($_POST)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_POST, $filter_post, false);
+	$clean_POST = DataFilter::checkVarArray($_POST, $filter_post, false);
 	extract($clean_POST);
 }
 
diff --git a/modules/system/admin/images.php b/modules/system/admin/images.php
index 10a1aaffb0a1..885051eb004a 100644
--- a/modules/system/admin/images.php
+++ b/modules/system/admin/images.php
@@ -43,6 +43,7 @@
  * @author		Rodrigo Pereira Lima (AKA TheRplima) <therplima@impresscms.org>
  */
 
+use ImpressCMS\Core\DataFilter;
 use WideImage\WideImage as WideImage;
 
 /* set filter types, if not strings */
@@ -487,17 +488,17 @@ function imanager_listimg($imgcat_id, $start = 0) {
 		$arrimg[$i]['weight'] = $images[$i]->image_weight;
 		$arrimg[$i]['display'] = $images[$i]->image_display;
 		$arrimg[$i]['categ_id'] = $images[$i]->imgcat_id;
-		$arrimg[$i]['display_nicename'] = icms_core_DataFilter::icms_substr($images[$i]->image_nicename, 0, 20);
+		$arrimg[$i]['display_nicename'] = DataFilter::icms_substr($images[$i]->image_nicename, 0, 20);
 
 		$uniq = icms_random_str(5);
 
 		if ($imagecategory->imgcat_storetype == 'db') {
 			$src = ICMS_MODULES_URL . "/system/admin/images/preview.php?file=" . $images[$i]->image_name . '&resize=0';
-						if ($images[$i]->image_body) {
-							$img = WideImage::load($images[$i]->image_body);
-						} else {
-							$img = WideImage::createTrueColorImage(1, 1);
-						}
+			if ($images[$i]->image_body) {
+				$img = WideImage::load($images[$i]->image_body);
+			} else {
+				$img = WideImage::createTrueColorImage(1, 1);
+			}
 						$img->saveToFile(ICMS_IMANAGER_FOLDER_PATH . '/' . $images[$i]->image_name);
 			$arrimg[$i]['size'] = icms_convert_size(filesize(ICMS_IMANAGER_FOLDER_PATH . '/' . $images[$i]->image_name));
 			$arrimg[$i]['width'] = $img->getWidth();
diff --git a/modules/system/admin/images/browser.php b/modules/system/admin/images/browser.php
index a9db7b54541d..ae2db6df5bc7 100644
--- a/modules/system/admin/images/browser.php
+++ b/modules/system/admin/images/browser.php
@@ -16,6 +16,7 @@
 	redirect_header(ICMS_URL . '/index.php', 6, _NOPERM);
 }
 
+use ImpressCMS\Core\DataFilter;
 use WideImage\WideImage;
 
 $icmsTpl = new icms_view_Tpl();
@@ -435,7 +436,7 @@ function imanager_listimg($imgcat_id, $start = 0) {
 		$arrimg[$i]['weight'] = $images[$i]->image_weight;
 		$arrimg[$i]['display'] = $images[$i]->image_display;
 		$arrimg[$i]['categ_id'] = $images[$i]->imgcat_id;
-		$arrimg[$i]['display_nicename'] = icms_core_DataFilter::icms_substr($images[$i]->image_nicename, 0, 20);
+		$arrimg[$i]['display_nicename'] = DataFilter::icms_substr($images[$i]->image_nicename, 0, 20);
 
 		$uniq = icms_random_str(5);
 
diff --git a/modules/system/admin/mailusers.php b/modules/system/admin/mailusers.php
index 0d895330c83a..579407319e76 100644
--- a/modules/system/admin/mailusers.php
+++ b/modules/system/admin/mailusers.php
@@ -62,6 +62,9 @@
  * (str) mail_body
  *
  */
+
+use ImpressCMS\Core\DataFilter;
+
 if (!is_object(icms::$user) || !is_object($icmsModule) || !icms::$user->isAdmin($icmsModule->mid)) {
 	exit("Access Denied");
 } else {
@@ -183,10 +186,10 @@
 				$mailer->setToUsers($added[$i]);
 			}
 
-			$mailer->setFromName(icms_core_DataFilter::stripSlashesGPC($_POST['mail_fromname']));
-			$mailer->setFromEmail(icms_core_DataFilter::stripSlashesGPC($_POST['mail_fromemail']));
-			$mailer->setSubject(icms_core_DataFilter::stripSlashesGPC($_POST['mail_subject']));
-			$mailer->setBody(icms_core_DataFilter::stripSlashesGPC($_POST['mail_body']));
+			$mailer->setFromName(DataFilter::stripSlashesGPC($_POST['mail_fromname']));
+			$mailer->setFromEmail(DataFilter::stripSlashesGPC($_POST['mail_fromemail']));
+			$mailer->setSubject(DataFilter::stripSlashesGPC($_POST['mail_subject']));
+			$mailer->setBody(DataFilter::stripSlashesGPC($_POST['mail_body']));
 			if (in_array("mail", $_POST['mail_send_to'])) {
 				$mailer->useMail();
 			}
@@ -207,21 +210,21 @@
 					}
 				}
 				$inactive_hidden = new icms_form_elements_Hidden("mail_inactive", @$_POST['mail_inactive']);
-				$lastlog_min_hidden = new icms_form_elements_Hidden("mail_lastlog_min", icms_core_DataFilter::checkVar($_POST['mail_lastlog_min'], 'text'));
-				$lastlog_max_hidden = new icms_form_elements_Hidden("mail_lastlog_max", icms_core_DataFilter::checkVar($_POST['mail_lastlog_max'], 'text'));
-				$regd_min_hidden = new icms_form_elements_Hidden("mail_regd_min", icms_core_DataFilter::checkVar($_POST['mail_regd_min'], 'text'));
-				$regd_max_hidden = new icms_form_elements_Hidden("mail_regd_max", icms_core_DataFilter::checkVar($_POST['mail_regd_max'], 'text'));
-				$idle_more_hidden = new icms_form_elements_Hidden("mail_idle_more", icms_core_DataFilter::checkVar($_POST['mail_idle_more'], 'text'));
-				$idle_less_hidden = new icms_form_elements_Hidden("mail_idle_less", icms_core_DataFilter::checkVar($_POST['mail_idle_less'], 'text'));
-				$fname_hidden = new icms_form_elements_Hidden("mail_fromname", icms_core_DataFilter::checkVar($_POST['mail_fromname'], 'text'));
-				$femail_hidden = new icms_form_elements_Hidden("mail_fromemail", icms_core_DataFilter::checkVar($_POST['mail_fromemail'], 'text'));
-				$subject_hidden = new icms_form_elements_Hidden("mail_subject", icms_core_DataFilter::checkVar($_POST['mail_subject'], 'text'));
-				$body_hidden = new icms_form_elements_Hidden("mail_body", icms_core_DataFilter::checkVar($_POST['mail_body'], 'text'));
-				$start_hidden = new icms_form_elements_Hidden("mail_start", (int) $_POST['mail_start'] + $limit);
-				$mail_mailok_hidden = new icms_form_elements_Hidden("mail_mailok", icms_core_DataFilter::checkVar(@$_POST['mail_mailok']));
+				$lastlog_min_hidden = new icms_form_elements_Hidden("mail_lastlog_min", DataFilter::checkVar($_POST['mail_lastlog_min'], 'text'));
+				$lastlog_max_hidden = new icms_form_elements_Hidden("mail_lastlog_max", DataFilter::checkVar($_POST['mail_lastlog_max'], 'text'));
+				$regd_min_hidden = new icms_form_elements_Hidden("mail_regd_min", DataFilter::checkVar($_POST['mail_regd_min'], 'text'));
+				$regd_max_hidden = new icms_form_elements_Hidden("mail_regd_max", DataFilter::checkVar($_POST['mail_regd_max'], 'text'));
+				$idle_more_hidden = new icms_form_elements_Hidden("mail_idle_more", DataFilter::checkVar($_POST['mail_idle_more'], 'text'));
+				$idle_less_hidden = new icms_form_elements_Hidden("mail_idle_less", DataFilter::checkVar($_POST['mail_idle_less'], 'text'));
+				$fname_hidden = new icms_form_elements_Hidden("mail_fromname", DataFilter::checkVar($_POST['mail_fromname'], 'text'));
+				$femail_hidden = new icms_form_elements_Hidden("mail_fromemail", DataFilter::checkVar($_POST['mail_fromemail'], 'text'));
+				$subject_hidden = new icms_form_elements_Hidden("mail_subject", DataFilter::checkVar($_POST['mail_subject'], 'text'));
+				$body_hidden = new icms_form_elements_Hidden("mail_body", DataFilter::checkVar($_POST['mail_body'], 'text'));
+				$start_hidden = new icms_form_elements_Hidden("mail_start", (int)$_POST['mail_start'] + $limit);
+				$mail_mailok_hidden = new icms_form_elements_Hidden("mail_mailok", DataFilter::checkVar(@$_POST['mail_mailok']));
 				$op_hidden = new icms_form_elements_Hidden("op", "send");
 				$submit_button = new icms_form_elements_Button("", "mail_submit", _AM_SENDNEXT, "submit");
-				$sent_label = new icms_form_elements_Label(_AM_SENT, sprintf(_AM_SENTNUM, (int) $_POST['mail_start'] + 1, (int) $_POST['mail_start'] + $limit, $count_criteria + $added_count - $limit));
+				$sent_label = new icms_form_elements_Label(_AM_SENT, sprintf(_AM_SENTNUM, (int)$_POST['mail_start'] + 1, (int)$_POST['mail_start'] + $limit, $count_criteria + $added_count - $limit));
 				$form->addElement($sent_label);
 				$form->addElement($inactive_hidden);
 				$form->addElement($lastlog_min_hidden);
diff --git a/modules/system/admin/modules.php b/modules/system/admin/modules.php
index 0fef2448f636..57824d44338f 100644
--- a/modules/system/admin/modules.php
+++ b/modules/system/admin/modules.php
@@ -29,15 +29,18 @@
 // ------------------------------------------------------------------------- //
 
 /**
- * @copyright	http://www.XOOPS.org/
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		System
- * @subpackage	Modules
- * @author	    Sina Asghari (aka stranger) <pesian_stranger@users.sourceforge.net>
+ * @copyright    http://www.XOOPS.org/
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        System
+ * @subpackage    Modules
+ * @author        Sina Asghari (aka stranger) <pesian_stranger@users.sourceforge.net>
  */
 
 /* set get and post filters before including admin_header, if not strings */
+
+use ImpressCMS\Core\DataFilter;
+
 $filter_get = array('mid' => 'int');
 
 $filter_post = array('mid' => 'int');
@@ -87,8 +90,8 @@
 		$mcount = 0;
 		foreach ($module as $mid) {
 			$class = ($mcount % 2 != 0) ? 'odd' : 'even';
-			echo '<tr class="' . $class . '"><td align="center">' . icms_core_DataFilter::stripSlashesGPC($oldname[$mid]);
-			$newname[$mid] = trim(icms_core_DataFilter::stripslashesGPC($newname[$mid]));
+			echo '<tr class="' . $class . '"><td align="center">' . DataFilter::stripSlashesGPC($oldname[$mid]);
+			$newname[$mid] = trim(DataFilter::stripslashesGPC($newname[$mid]));
 			if ($newname[$mid] != $oldname[$mid]) {
 				printf('&nbsp;&raquo;&raquo;&nbsp;<span style="color:#ff0000;font-weight:bold;">%s</span>', $newname[$mid]);
 			}
@@ -97,8 +100,8 @@
 				if ($oldstatus[$mid] == 0) {
 					printf("<span style='color:#ff0000;font-weight:bold;'>%s</span>", _MD_AM_ACTIVATE);
 				} else {
-						echo _MD_AM_NOCHANGE;
-					}
+					echo _MD_AM_NOCHANGE;
+				}
 				} else {
 					$newstatus[$mid] = 0;
 					if ($oldstatus[$mid] == 1) {
diff --git a/modules/system/admin/preferences.php b/modules/system/admin/preferences.php
index 80757922eeb9..b993017aec60 100644
--- a/modules/system/admin/preferences.php
+++ b/modules/system/admin/preferences.php
@@ -38,6 +38,7 @@
  * @subpackage    Preferences
  */
 
+use ImpressCMS\Core\DataFilter;
 use ImpressCMS\Core\Extensions\Editors\EditorsRegistry;
 
 if (!is_object(icms::$user)
@@ -122,10 +123,10 @@
 						if ($config[$i]->conf_valuetype == 'array') {
 							// this is exceptional.. only when value type is array, need a smarter way for this
 							$ele = ($config[$i]->conf_value != '')
-								?new icms_form_elements_Textarea($title, $config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50)
+								? new icms_form_elements_Textarea($title, $config[$i]->conf_name, DataFilter::htmlSpecialChars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50)
 								: new icms_form_elements_Textarea($title, $config[$i]->conf_name, '', 5, 50);
 						} else {
-							$ele = new icms_form_elements_Textarea($title, $config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
+							$ele = new icms_form_elements_Textarea($title, $config[$i]->conf_name, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
 						}
 						break;
 
@@ -133,10 +134,10 @@
 						if ($config[$i]->conf_valuetype == 'array') {
 							// this is exceptional.. only when value type is array, need a smarter way for this
 							$ele = ($config[$i]->conf_value != '')
-								?new icms_form_elements_Textarea($title, $config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50)
+								? new icms_form_elements_Textarea($title, $config[$i]->conf_name, DataFilter::htmlSpecialChars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50)
 								: new icms_form_elements_Textarea($title, $config[$i]->conf_name, '', 5, 50);
 						} else {
-							$ele = new icms_form_elements_Dhtmltextarea($title, $config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
+							$ele = new icms_form_elements_Dhtmltextarea($title, $config[$i]->conf_name, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
 						}
 						break;
 
@@ -353,15 +354,15 @@ function ($item) {
 						break;
 
 					case 'password' :
-						$ele = new icms_form_elements_Password($title, $config[$i]->conf_name, 50, 255, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()), false, ($icmsConfigUser['pass_level']?'password_adv':''));
+						$ele = new icms_form_elements_Password($title, $config[$i]->conf_name, 50, 255, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()), false, ($icmsConfigUser['pass_level'] ? 'password_adv' : ''));
 						break;
 
 					case 'color' :
-						$ele = new icms_form_elements_Colorpicker($title, $config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
+						$ele = new icms_form_elements_Colorpicker($title, $config[$i]->conf_name, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
 						break;
 
 					case 'hidden' :
-						$ele = new icms_form_elements_Hidden($config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
+						$ele = new icms_form_elements_Hidden($config[$i]->conf_name, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
 						break;
 
 					case 'select_pages' :
@@ -405,7 +406,7 @@ function ($item) {
 
 					case 'textbox' :
 					default :
-						$ele = new icms_form_elements_Text($title, $config[$i]->conf_name, 50, 255, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
+						$ele = new icms_form_elements_Text($title, $config[$i]->conf_name, 50, 255, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
 						break;
 					}
 			$hidden = new icms_form_elements_Hidden('conf_ids[]', $config[$i]->conf_id);
@@ -462,18 +463,18 @@ function ($item) {
 					case 'textsarea' :
 						if ($config[$i]->conf_valuetype == 'array') {
 							// this is exceptional.. only when value type is arrayneed a smarter way for this
-							$ele = ($config[$i]->conf_value != '')?new icms_form_elements_Textarea($title, $config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50):new icms_form_elements_Textarea($title, $config[$i]->conf_name, '', 5, 50);
+							$ele = ($config[$i]->conf_value != '') ? new icms_form_elements_Textarea($title, $config[$i]->conf_name, DataFilter::htmlSpecialChars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new icms_form_elements_Textarea($title, $config[$i]->conf_name, '', 5, 50);
 						} else {
-							$ele = new icms_form_elements_Textarea($title, $config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()), 5, 50);
+							$ele = new icms_form_elements_Textarea($title, $config[$i]->conf_name, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()), 5, 50);
 						}
 						break;
 
 					case 'textarea' :
 						if ($config[$i]->conf_valuetype == 'array') {
 							// this is exceptional.. only when value type is array need a smarter way for this
-							$ele = ($config[$i]->conf_value != '')?new icms_form_elements_Textarea($title, $config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50):new icms_form_elements_Textarea($title, $config[$i]->conf_name, '', 5, 50);
+							$ele = ($config[$i]->conf_value != '') ? new icms_form_elements_Textarea($title, $config[$i]->conf_name, DataFilter::htmlSpecialChars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new icms_form_elements_Textarea($title, $config[$i]->conf_name, '', 5, 50);
 						} else {
-							$ele = new icms_form_elements_Dhtmltextarea($title, $config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()), 5, 50);
+							$ele = new icms_form_elements_Dhtmltextarea($title, $config[$i]->conf_name, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()), 5, 50);
 						}
 						break;
 
@@ -521,15 +522,15 @@ function ($item) {
 						break;
 
 					case 'password' :
-						$ele = new icms_form_elements_Password($title, $config[$i]->conf_name, 50, 255, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
+						$ele = new icms_form_elements_Password($title, $config[$i]->conf_name, 50, 255, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
 						break;
 
 					case 'color' :
-						$ele = new icms_form_elements_Colorpicker($title, $config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
+						$ele = new icms_form_elements_Colorpicker($title, $config[$i]->conf_name, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
 						break;
 
 					case 'hidden' :
-						$ele = new icms_form_elements_Hidden($config[$i]->conf_name, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
+						$ele = new icms_form_elements_Hidden($config[$i]->conf_name, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
 						break;
 
 					case 'select_pages' :
@@ -540,7 +541,7 @@ function ($item) {
 
 					case 'textbox' :
 					default :
-						$ele = new icms_form_elements_Text($title, $config[$i]->conf_name, 50, 255, icms_core_DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
+						$ele = new icms_form_elements_Text($title, $config[$i]->conf_name, 50, 255, DataFilter::htmlSpecialChars($config[$i]->getConfValueForOutput()));
 						break;
 					}
 			$hidden = new icms_form_elements_Hidden('conf_ids[]', $config[$i]->conf_id);
diff --git a/modules/system/admin/smilies.php b/modules/system/admin/smilies.php
index bb9de853400b..3c0736e11a03 100644
--- a/modules/system/admin/smilies.php
+++ b/modules/system/admin/smilies.php
@@ -31,14 +31,17 @@
 /**
  * Administration of smilies, main file
  *
- * @copyright	http://www.XOOPS.org/
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		System
- * @subpackage	Smilies
+ * @copyright    http://www.XOOPS.org/
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        System
+ * @subpackage    Smilies
  */
 
 /* set get and post filters before including admin_header, if not strings */
+
+use ImpressCMS\Core\DataFilter;
+
 $filter_get = array(
 	'id' => 'int',
 );
@@ -90,11 +93,11 @@
 				$err = $uploader->getErrors();
 			} else {
 				$smile_url = $uploader->getSavedFileName();
-				$smile_code = icms_core_DataFilter::stripSlashesGPC($smile_code);
-				$smile_desc = icms_core_DataFilter::stripSlashesGPC($smile_desc);
-				$smile_display = (int) $smile_display > 0?1:0;
+				$smile_code = DataFilter::stripSlashesGPC($smile_code);
+				$smile_desc = DataFilter::stripSlashesGPC($smile_desc);
+				$smile_display = (int)$smile_display > 0 ? 1 : 0;
 				$newid = $db->genId($db->prefix('smilies') . "_id_seq");
-				$sql = sprintf("INSERT INTO %s (id, code, smile_url, emotion, display) VALUES ('%d', %s, %s, %s, '%d')", $db->prefix('smiles'), (int) $newid, $db->quoteString($smile_code), $db->quoteString($smile_url), $db->quoteString($smile_desc), $smile_display);
+				$sql = sprintf("INSERT INTO %s (id, code, smile_url, emotion, display) VALUES ('%d', %s, %s, %s, '%d')", $db->prefix('smiles'), (int)$newid, $db->quoteString($smile_code), $db->quoteString($smile_url), $db->quoteString($smile_desc), $smile_display);
 				if (!$db->query($sql)) {
 					$err = _CO_ICMS_SAVE_ERROR;
 				}
@@ -122,9 +125,9 @@
 		if ($id <= 0 | !icms::$security->check()) {
 			redirect_header('admin.php?fct=smilies', 3, implode('<br />', icms::$security->getErrors()));
 		}
-		$smile_code = icms_core_DataFilter::stripSlashesGPC($smile_code);
-		$smile_desc = icms_core_DataFilter::stripSlashesGPC($smile_desc);
-		$smile_display = (int) $smile_display > 0?1:0;
+		$smile_code = DataFilter::stripSlashesGPC($smile_code);
+		$smile_desc = DataFilter::stripSlashesGPC($smile_desc);
+		$smile_display = (int)$smile_display > 0 ? 1 : 0;
 		if ($_FILES['smile_url']['name'] != "") {
 			$uploader = new icms_file_MediaUploadHandler(ICMS_UPLOAD_PATH, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png'), 100000, 120, 120);
 			$uploader->setPrefix('smil');
diff --git a/modules/system/admin/smilies/smilies.php b/modules/system/admin/smilies/smilies.php
index 870da4817e94..588ae62b2785 100644
--- a/modules/system/admin/smilies/smilies.php
+++ b/modules/system/admin/smilies/smilies.php
@@ -27,15 +27,17 @@
 // URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
+use ImpressCMS\Core\DataFilter;
+
 /**
  * Administration of smilies, main functions file
  *
- * @copyright	http://www.XOOPS.org/
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		System
- * @subpackage	Smilies
- * @todo		Extract HTML and CSS to a template
+ * @copyright    http://www.XOOPS.org/
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        System
+ * @subpackage    Smilies
+ * @todo        Extract HTML and CSS to a template
 
 if (!is_object(icms::$user) || !is_object($icmsModule) || !icms::$user->isAdmin($icmsModule->mid)) {
 	exit("Access Denied");
@@ -57,11 +59,11 @@ function SmilesAdmin() {
 		} else {
 			$i = 0;
 			while ($smiles = $db->fetchArray($getsmiles)) {
-				$smile[$i]['code'] = icms_core_DataFilter::htmlSpecialChars($smiles['code']);
-				$smile[$i]['smile_url'] = icms_core_DataFilter::htmlSpecialChars($smiles['smile_url']);
-				$smile[$i]['smile_emotion'] = icms_core_DataFilter::htmlSpecialChars($smiles['emotion']);
-				$smile[$i]['id'] = icms_core_DataFilter::htmlSpecialChars($smiles['id']);
-				$smile[$i]['display'] = icms_core_DataFilter::htmlSpecialChars($smiles['display']);
+				$smile[$i]['code'] = DataFilter::htmlSpecialChars($smiles['code']);
+				$smile[$i]['smile_url'] = DataFilter::htmlSpecialChars($smiles['smile_url']);
+				$smile[$i]['smile_emotion'] = DataFilter::htmlSpecialChars($smiles['emotion']);
+				$smile[$i]['id'] = DataFilter::htmlSpecialChars($smiles['id']);
+				$smile[$i]['display'] = DataFilter::htmlSpecialChars($smiles['display']);
 				$i++;
 				$icmsAdminTpl->assign("smilesarray", $smile);
 			}
@@ -98,9 +100,9 @@ function SmilesEdit($id) {
 			//EMPTY
 		} else {
 			if ($smiles = $db->fetchArray($getsmiles)) {
-				$smiles['smile_code'] = icms_core_DataFilter::htmlSpecialChars($smiles['code']);
-				$smiles['smile_url'] = icms_core_DataFilter::htmlSpecialChars($smiles['smile_url']);
-				$smiles['smile_desc'] = icms_core_DataFilter::htmlSpecialChars($smiles['emotion']);
+				$smiles['smile_code'] = DataFilter::htmlSpecialChars($smiles['code']);
+				$smiles['smile_url'] = DataFilter::htmlSpecialChars($smiles['smile_url']);
+				$smiles['smile_desc'] = DataFilter::htmlSpecialChars($smiles['emotion']);
 				$smiles['smile_display'] = $smiles['display'];
 				$smiles['smile_form'] = _AM_EDITSMILE;
 				$smiles['op'] = 'SmilesSave';
diff --git a/modules/system/admin/tplsets.php b/modules/system/admin/tplsets.php
index 221486f906c5..bf034d085c94 100644
--- a/modules/system/admin/tplsets.php
+++ b/modules/system/admin/tplsets.php
@@ -30,14 +30,17 @@
 /**
  * Administration of template sets, main file
  *
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		LICENSE.txt
- * @package		System
- * @subpackage	Templates
- * @todo		Extract HTML and CSS to a template
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        LICENSE.txt
+ * @package        System
+ * @subpackage    Templates
+ * @todo        Extract HTML and CSS to a template
  */
 
 /* set get and post filters before including admin_header, if not strings */
+
+use ImpressCMS\Core\DataFilter;
+
 $filter_get = array(
 	'html' => 'html',
 );
@@ -887,7 +890,7 @@
 		}
 
 
-		$html = icms_core_DataFilter::stripSlashesGPC($html);
+		$html = DataFilter::stripSlashesGPC($html);
 		/**
 		 * @var icms_view_template_file_Handler $tpltpl_handler
 		 */
diff --git a/modules/system/admin/users.php b/modules/system/admin/users.php
index 5370b9d08924..40fbe0c31f86 100644
--- a/modules/system/admin/users.php
+++ b/modules/system/admin/users.php
@@ -31,19 +31,22 @@
 /**
  * Administration of users, main file
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		Administration
- * @since		XOOPS
- * @author		http://www.xoops.org The XOOPS Project
- * @author		modified by UnderDog <underdog@impresscms.org>
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        Administration
+ * @since        XOOPS
+ * @author        http://www.xoops.org The XOOPS Project
+ * @author        modified by UnderDog <underdog@impresscms.org>
  */
 
 /* set get and post filters before including admin_header, if not strings */
+
+use ImpressCMS\Core\DataFilter;
+
 $filter_post = array(
 	'user_sig' => 'html',
-	'bio'=> 'html',
+	'bio' => 'html',
 );
 
 $filter_get = array(
@@ -213,9 +216,9 @@
 						icms_cp_footer();
 						exit();
 					}
-					if ($password == $username || $password == icms_core_DataFilter::utf8_strrev($username, true)
+					if ($password == $username || $password == DataFilter::utf8_strrev($username, true)
 						|| strripos($password, $username) === true || $password == $login_name
-						|| $password == icms_core_Datafilter::utf8_strrev($login_name, true)
+						|| $password == DataFilter::utf8_strrev($login_name, true)
 						|| strripos($password, $login_name) === true
 					) {
 						icms_cp_header();
diff --git a/modules/system/admin/users/users.php b/modules/system/admin/users/users.php
index 75de5ecc2ace..4aa558a24055 100644
--- a/modules/system/admin/users/users.php
+++ b/modules/system/admin/users/users.php
@@ -30,13 +30,15 @@
 /**
  * Administration of users, main functions file
  *
- * @copyright	http://www.XOOPS.org/
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		System
- * @subpackage	Users
+ * @copyright    http://www.XOOPS.org/
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        System
+ * @subpackage    Users
  */
 
+use ImpressCMS\Core\DataFilter;
+
 if (!is_object(icms::$user)
 	|| !is_object($icmsModule)
 	|| !icms::$user->isAdmin($icmsModule->mid)
@@ -289,10 +291,10 @@ function updateUser(
 		$edituser->url = $url;
 		$edituser->user_from = $userFrom;
 		if ($icmsConfigUser['allow_htsig'] == 0) {
-			$signature = strip_tags(icms_core_DataFilter::codeDecode($user_sig, 1));
-			$edituser->user_sig = icms_core_DataFilter::icms_substr($signature, 0, (int) $icmsConfigUser['sig_max_length']);
+			$signature = strip_tags(DataFilter::codeDecode($user_sig, 1));
+			$edituser->user_sig = DataFilter::icms_substr($signature, 0, (int)$icmsConfigUser['sig_max_length']);
 		} else {
-			$signature = icms_core_DataFilter::checkVar($userSignature, 'html', 'input');
+			$signature = DataFilter::checkVar($userSignature, 'html', 'input');
 			$edituser->user_sig = $signature;
 		}
 		$userViewEmail = (isset($userViewEmail) && $userViewEmail == 1)?1:0;
diff --git a/modules/system/admin/version.php b/modules/system/admin/version.php
index 004b8b5fdce4..64366d5dd786 100644
--- a/modules/system/admin/version.php
+++ b/modules/system/admin/version.php
@@ -4,14 +4,16 @@
  *
  * This page checks if the ImpressCMS install runs the latest released version
  *
- * @copyright	The ImpressCMS Project http://www.impresscms.org/
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		System
- * @subpackage	Version
- * @since		1.0
- * @author		malanciault <marcan@impresscms.org)
+ * @copyright    The ImpressCMS Project http://www.impresscms.org/
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        System
+ * @subpackage    Version
+ * @since        1.0
+ * @author        malanciault <marcan@impresscms.org)
  */
 
+use ImpressCMS\Core\DataFilter;
+
 if (!is_object(icms::$user) || !is_object($icmsModule) || !icms::$user->isAdmin()) {
 	exit("Access Denied");
 }
@@ -36,7 +38,7 @@
 icms_cp_header();
 if ($icmsVersionChecker->check()) {
 	$icmsAdminTpl->assign('update_available', true);
-	$icmsAdminTpl->assign('latest_changelog', icms_core_DataFilter::makeClickable($icmsVersionChecker->latest_changelog));
+	$icmsAdminTpl->assign('latest_changelog', DataFilter::makeClickable($icmsVersionChecker->latest_changelog));
 	$icmsAdminTpl->assign('latest_version', $icmsVersionChecker->latest_version_name);
 	$icmsAdminTpl->assign('latest_url', $icmsVersionChecker->latest_url);
 } else {
diff --git a/modules/system/blocks/system_blocks.php b/modules/system/blocks/system_blocks.php
index 4f79491204b7..a135d40df3eb 100644
--- a/modules/system/blocks/system_blocks.php
+++ b/modules/system/blocks/system_blocks.php
@@ -27,24 +27,28 @@
 // URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
+
 /**
  * Good ol' system blocks
  *
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		LICENSE.txt
- * @package		System
- * @subpackage	Blocks
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        LICENSE.txt
+ * @package        System
+ * @subpackage    Blocks
  */
 
+use ImpressCMS\Core\DataFilter;
+
 /**
  * Shows which users and guests are online
  *
  * @return mixed $block or FALSE if no users were online
  */
-function b_system_online_show() {
+function b_system_online_show()
+{
 	global $icmsModule;
 	$online_handler = icms::handler('icms_core_Online');
-	mt_srand((double) microtime() * 1000000);
+	mt_srand((double)microtime() * 1000000);
 	// set gc probabillity to 10% for now..
 	if (mt_rand(1, 100) < 11) {
 		$online_handler->gc(300);
@@ -257,15 +261,15 @@ function b_system_info_show($options) {
 			while ($userinfo = icms::$xoopsDB->fetchArray($result)) {
 				if ($prev_caption != $userinfo['groupname']) {
 					$prev_caption = $userinfo['groupname'];
-					$block['groups'][$i]['name'] = icms_core_DataFilter::htmlSpecialChars($userinfo['groupname']);
+					$block['groups'][$i]['name'] = DataFilter::htmlSpecialChars($userinfo['groupname']);
 				}
 				if (isset(icms::$user) && is_object(icms::$user)) {
-					$block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => icms_core_DataFilter::htmlSpecialChars($userinfo['uname']), 'msglink' => "<a href=\"javascript:openWithSelfMain('" . ICMS_URL . "/pmlite.php?send2=1&amp;to_userid=" . $userinfo['uid'] . "','pmlite',800,680);\"><img src=\"" . ICMS_URL . "/images/icons/" . $GLOBALS["icmsConfig"]["language"] . "/pm_small.gif\" width=\"27px\" height=\"17px\" alt=\"\" /></a>", 'avatar' => ICMS_UPLOAD_URL . '/' . $userinfo['user_avatar']);
+					$block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => DataFilter::htmlSpecialChars($userinfo['uname']), 'msglink' => "<a href=\"javascript:openWithSelfMain('" . ICMS_URL . "/pmlite.php?send2=1&amp;to_userid=" . $userinfo['uid'] . "','pmlite',800,680);\"><img src=\"" . ICMS_URL . "/images/icons/" . $GLOBALS["icmsConfig"]["language"] . "/pm_small.gif\" width=\"27px\" height=\"17px\" alt=\"\" /></a>", 'avatar' => ICMS_UPLOAD_URL . '/' . $userinfo['user_avatar']);
 				} else {
 					if ($userinfo['user_viewemail']) {
-						$block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => icms_core_DataFilter::htmlSpecialChars($userinfo['uname']), 'msglink' => '<a href="mailto:' . $userinfo['email'] . '"><img src="' . ICMS_URL . '/images/icons/' . $GLOBALS["icmsConfig"]["language"] . '/em_small.gif" width="16px" height="14px" alt="" /></a>', 'avatar' => ICMS_UPLOAD_URL . '/' . $userinfo['user_avatar']);
+						$block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => DataFilter::htmlSpecialChars($userinfo['uname']), 'msglink' => '<a href="mailto:' . $userinfo['email'] . '"><img src="' . ICMS_URL . '/images/icons/' . $GLOBALS["icmsConfig"]["language"] . '/em_small.gif" width="16px" height="14px" alt="" /></a>', 'avatar' => ICMS_UPLOAD_URL . '/' . $userinfo['user_avatar']);
 					} else {
-						$block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => icms_core_DataFilter::htmlSpecialChars($userinfo['uname']), 'msglink' => '&nbsp;', 'avatar' => ICMS_UPLOAD_URL . '/' . $userinfo['user_avatar']);
+						$block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => DataFilter::htmlSpecialChars($userinfo['uname']), 'msglink' => '&nbsp;', 'avatar' => ICMS_UPLOAD_URL . '/' . $userinfo['user_avatar']);
 					}
 				}
 				$i++;
diff --git a/modules/system/class/Adsense.php b/modules/system/class/Adsense.php
index e372957b4a34..b7c5cec1fb83 100644
--- a/modules/system/class/Adsense.php
+++ b/modules/system/class/Adsense.php
@@ -2,18 +2,20 @@
 /**
  * ImpressCMS Adsenses
  *
- * @copyright	The ImpressCMS Project http://www.impresscms.org/
- * @license	http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @since	1.2
- * @author	Sina Asghari (aka stranger) <pesian_stranger@users.sourceforge.net>
+ * @copyright    The ImpressCMS Project http://www.impresscms.org/
+ * @license    http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @since    1.2
+ * @author    Sina Asghari (aka stranger) <pesian_stranger@users.sourceforge.net>
  */
 
+use ImpressCMS\Core\DataFilter;
+
 /**
  * AdSense object - Google AdSense
  *
  * @package ImpressCMS\Modules\System\Class\Adsense
  *
- * @property int    $adsenseid          Adsense ID
+ * @property int $adsenseid          Adsense ID
  * @property string $description        Description
  * @property string $client_id          Client ID
  * @property string $slot               Slot
@@ -193,9 +195,10 @@ public function emptyString($var) {
 	 * Generate a unique tag for an AdSense unit
 	 * @return	string
 	 */
-	public function generateTag() {
+	public function generateTag()
+	{
 		$title = rawurlencode(strtolower($this->getVar('description', 'e')));
-		$title = icms_core_DataFilter::icms_substr($title, 0, 10, '');
+		$title = DataFilter::icms_substr($title, 0, 10, '');
 
 		$pattern = array("/%09/", "/%20/", "/%21/", "/%22/", "/%23/", "/%25/", "/%26/", "/%27/", "/%28/", "/%29/", "/%2C/", "/%2F/", "/%3A/", "/%3B/", "/%3C/", "/%3D/", "/%3E/", "/%3F/", "/%40/", "/%5B/", "/%5C/", "/%5D/", "/%5E/", "/%7B/", "/%7C/", "/%7D/", "/%7E/", "/\./");
 		$rep_pat = array("-", "-", "-", "-", "-", "-100", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-at-", "-", "-", "-", "-", "-", "-", "-", "-", "-");
diff --git a/modules/system/class/Pages.php b/modules/system/class/Pages.php
index b0ae83c6cb29..1c5745e1f8fc 100644
--- a/modules/system/class/Pages.php
+++ b/modules/system/class/Pages.php
@@ -2,16 +2,19 @@
 /**
  * Administration of Symlinks
  *
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license	LICENSE.txt
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license    LICENSE.txt
  */
 
+use ImpressCMS\Core\DataFilter;
+
 /**
  * Symlinks object
  *
  * @package     ImpressCMS\Modules\System\Class\Pages
  */
-class mod_system_Pages extends icms_data_page_Object {
+class mod_system_Pages extends icms_data_page_Object
+{
 
 	/**
 	 * Constructor
@@ -64,11 +67,12 @@ public function getAdminViewItemLink($onlyUrl = false) {
 	 * Build a link to the page represented by the symlink, if available
 	 * @return	string
 	 */
-	public function getViewItemLink($onlyUrl = false, $withimage = true, $userSide = false) {
+	public function getViewItemLink($onlyUrl = false, $withimage = true, $userSide = false)
+	{
 		$url = (substr($this->getVar('page_url', 'e'), 0, 7) == 'http://')
-			?$this->getVar('page_url', 'e')
+			? $this->getVar('page_url', 'e')
 			: ICMS_URL . '/' . $this->getVar('page_url', 'e');
-		$url = icms_core_DataFilter::checkVar($url, 'url', 'host');
+		$url = DataFilter::checkVar($url, 'url', 'host');
 
 		if (!$url) {
 			$ret = '';
diff --git a/plugins/preloads/autologin.php b/plugins/preloads/autologin.php
index 952b84529bae..1031d65b3246 100644
--- a/plugins/preloads/autologin.php
+++ b/plugins/preloads/autologin.php
@@ -1,5 +1,6 @@
 <?php
 
+use ImpressCMS\Core\DataFilter;
 use ImpressCMS\Core\Event;
 
 class icms_AutologinEventHandler {
@@ -37,8 +38,8 @@ static public function sessionAutologin($autologinName, $autologinPass) {
 			redirect_header(ICMS_URL . '/session_confirm.php', 0, '&nbsp;');
 		}
 
-		$uname = icms_core_DataFilter::stripSlashesGPC($autologinName);
-		$pass = icms_core_DataFilter::stripSlashesGPC($autologinPass);
+		$uname = DataFilter::stripSlashesGPC($autologinName);
+		$pass = DataFilter::stripSlashesGPC($autologinPass);
 		if (empty($uname) || is_numeric($pass)) {
 			$user = false;
 		} else {
diff --git a/plugins/preloads/protectEmail.php b/plugins/preloads/protectEmail.php
index a5a3fa31b606..c599d0d0b5c2 100644
--- a/plugins/preloads/protectEmail.php
+++ b/plugins/preloads/protectEmail.php
@@ -19,7 +19,7 @@
 class IcmsPreloadProtectEmail extends icms_preload_Item {
 
 	/**
-	 * Function to be triggered after completing icms_core_DataFilter::filterTextareaDisplay() function
+	 * Function to be triggered after completing \ImpressCMS\Core\DataFilter::filterTextareaDisplay() function
 	 *
 	 * The $array var is structured like this:
 	 * $array[0] = $text
@@ -38,7 +38,7 @@ function eventAfterFilterTextareaDisplay($array) {
 	}
 
 	/**
-	 * Function to be triggered after icms_core_DataFilter::filterHTMLdisplay() function
+	 * Function to be triggered after \ImpressCMS\Core\DataFilter::filterHTMLdisplay() function
 	 *
 	 * The $array var is structured like this:
 	 * $array[0] = $text
diff --git a/pmlite.php b/pmlite.php
index 616f043ff047..d3eade83433e 100644
--- a/pmlite.php
+++ b/pmlite.php
@@ -38,6 +38,7 @@
 
 /* this will set which language file will load for this page */
 
+use ImpressCMS\Core\DataFilter;
 use ImpressCMS\Core\Models\User;
 
 $xoopsOption['pagetype'] = "pmsg";
@@ -66,12 +67,12 @@
 
 /* filter the user input */
 if (!empty($_GET)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_GET, $filter_get, false);
+	$clean_POST = DataFilter::checkVarArray($_GET, $filter_get, false);
 	extract($clean_POST);
 }
 
 if (!empty($_POST)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_POST, $filter_post, false);
+	$clean_POST = DataFilter::checkVarArray($_POST, $filter_post, false);
 	extract($clean_POST);
 }
 
@@ -144,8 +145,8 @@
 					$mailer->assign('X_ADMINMAIL', $icmsConfig['adminmail']);
 					$mailer->assign('X_UNAME', $toUser->uname);
 					$mailer->assign('X_FROMUNAME', icms::$user->uname);
-					$mailer->assign('X_SUBJECT', icms_core_DataFilter::stripSlashesGPC($subject));
-					$mailer->assign('X_MESSAGE', icms_core_DataFilter::stripSlashesGPC($message));
+					$mailer->assign('X_SUBJECT', DataFilter::stripSlashesGPC($subject));
+					$mailer->assign('X_MESSAGE', DataFilter::stripSlashesGPC($message));
 					$mailer->assign('X_ITEM_URL', ICMS_URL . "/viewpmsg.php");
 					$mailer->setSubject(sprintf(_PM_MESSAGEPOSTED_EMAILSUBJ, $icmsConfig['sitename']));
 					$mailer->send();
diff --git a/privpolicy.php b/privpolicy.php
index c4b31ffc5a08..3f55325563ca 100644
--- a/privpolicy.php
+++ b/privpolicy.php
@@ -4,13 +4,15 @@
  *
  * This page displays the privacy policy of the site
  *
- * @copyright	The ImpressCMS Project http://www.impresscms.org/
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		core
- * @since		1.0
- * @author		m0nty_
+ * @copyright    The ImpressCMS Project http://www.impresscms.org/
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        core
+ * @since        1.0
+ * @author        m0nty_
  */
 
+use ImpressCMS\Core\DataFilter;
+
 $xoopsOption['pagetype'] = 'privpolicy';
 if ($icmsConfigUser['priv_dpolicy'] == false) {
 	redirect_header('index.php', 2, _US_NOPERMISS);
@@ -22,7 +24,7 @@
 $xoopsTpl->assign('priv_poltype', 'page');
 $priv = str_replace('{X_SITEURL}', ICMS_URL . '/', $icmsConfigUser['priv_policy']);
 $priv = str_replace('{X_SITENAME}', $icmsConfig['sitename'], $priv);
-$priv = icms_core_DataFilter::checkVar($priv, 'html', 'output');
+$priv = DataFilter::checkVar($priv, 'html', 'output');
 $xoopsTpl->assign('priv_policy', $priv);
 $xoopsTpl->assign('lang_privacy_policy', _PRV_PRIVACY_POLICY);
 
diff --git a/readpmsg.php b/readpmsg.php
index 239b1ce2f2a0..6a95f53c555c 100644
--- a/readpmsg.php
+++ b/readpmsg.php
@@ -35,6 +35,7 @@
  * @author	    Sina Asghari (aka stranger) <pesian_stranger@users.sourceforge.net>
  */
 
+use ImpressCMS\Core\DataFilter;
 use ImpressCMS\Core\Facades\Member;
 
 $xoopsOption['pagetype'] = "pmsg";
@@ -60,12 +61,12 @@
 
 /* filter the user input */
 if (!empty($_GET)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_GET, $filter_get, false);
+	$clean_POST = DataFilter::checkVarArray($_GET, $filter_get, false);
 	extract($clean_POST);
 }
 
 if (!empty($_POST)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_POST, $filter_post, false);
+	$clean_POST = DataFilter::checkVarArray($_POST, $filter_post, false);
 	extract($clean_POST);
 }
 
@@ -147,20 +148,20 @@
 $next = $start + 1;
 
 $icmsTpl->assign(
-		array(
-			'total_messages' => $total_messages,
-			'messages' => $pm_arr,
-			'uid' => icms::$user->uid,
-			'subject' => $pm_arr[0]->subject,
-			'poster' => $poster,
-			'image' => $pm_arr[0]->getVar("msg_image", "E"),
-			'sent_time' => formatTimestamp($pm_arr[0]->msg_time),
-			'message_body' => icms_core_DataFilter::checkVar($var, $filterType, 'output'),
-			'msg_id' => $pm_arr[0]->msg_id,
-			'form' => $form->render(),
-			'previous' => $previous,
-			'next' => $next
-		)
+	array(
+		'total_messages' => $total_messages,
+		'messages' => $pm_arr,
+		'uid' => icms::$user->uid,
+		'subject' => $pm_arr[0]->subject,
+		'poster' => $poster,
+		'image' => $pm_arr[0]->getVar("msg_image", "E"),
+		'sent_time' => formatTimestamp($pm_arr[0]->msg_time),
+		'message_body' => DataFilter::checkVar($var, $filterType, 'output'),
+		'msg_id' => $pm_arr[0]->msg_id,
+		'form' => $form->render(),
+		'previous' => $previous,
+		'next' => $next
+	)
 );
 
 require 'footer.php';
diff --git a/register.php b/register.php
index 880794482c6f..38678c0cb3e5 100644
--- a/register.php
+++ b/register.php
@@ -28,16 +28,18 @@
  * Registration process for new users
  * Gathers required information and validates the new user
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @since		XOOPS
- * @author		http://www.xoops.org The XOOPS Project
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @since        XOOPS
+ * @author        http://www.xoops.org The XOOPS Project
  * @author      skenow <skenow@impresscms.org>
- * @package		Member
- * @subpackage	Users
+ * @package        Member
+ * @subpackage    Users
  */
 
+use ImpressCMS\Core\DataFilter;
+
 $xoopsOption['pagetype'] = 'user';
 
 if (icms_get_module_status('profile') && file_exists(ICMS_MODULES_PATH . '/profile/register.php')) {
@@ -51,18 +53,18 @@
 if (is_object(icms::$user)) {
 	redirect_header('index.php', 6, _US_ALREADY_LOGED_IN);
 }
-$op = !isset($_POST['op'])?'register':filter_input(INPUT_POST, 'op');
-$login_name = isset($_POST['login_name'])? icms_core_DataFilter::stripSlashesGPC($_POST['login_name']):'';
-$uname = isset($_POST['uname'])? icms_core_DataFilter::stripSlashesGPC($_POST['uname']):'';
-$email = isset($_POST['email'])? trim(icms_core_DataFilter::stripSlashesGPC($_POST['email'])):'';
-$url = isset($_POST['url'])? trim(icms_core_DataFilter::stripSlashesGPC($_POST['url'])):'';
-$pass = isset($_POST['pass'])? icms_core_DataFilter::stripSlashesGPC($_POST['pass']):'';
-$vpass = isset($_POST['vpass'])? icms_core_DataFilter::stripSlashesGPC($_POST['vpass']):'';
-$timezone_offset = isset($_POST['timezone_offset'])?(float) ($_POST['timezone_offset']):$icmsConfig['default_TZ'];
-$user_viewemail = (isset($_POST['user_viewemail']) && (int) $_POST['user_viewemail'])?1:0;
-$user_mailok = (isset($_POST['user_mailok']) && (int) $_POST['user_mailok'])?1:0;
-$agree_disc = (isset($_POST['agree_disc']) && (int) $_POST['agree_disc'])?1:0;
-$actkey = isset($_POST['actkey'])? trim(icms_core_DataFilter::stripSlashesGPC($_POST['actkey'])):'';
+$op = !isset($_POST['op']) ? 'register' : filter_input(INPUT_POST, 'op');
+$login_name = isset($_POST['login_name']) ? DataFilter::stripSlashesGPC($_POST['login_name']) : '';
+$uname = isset($_POST['uname']) ? DataFilter::stripSlashesGPC($_POST['uname']) : '';
+$email = isset($_POST['email']) ? trim(DataFilter::stripSlashesGPC($_POST['email'])) : '';
+$url = isset($_POST['url']) ? trim(DataFilter::stripSlashesGPC($_POST['url'])) : '';
+$pass = isset($_POST['pass']) ? DataFilter::stripSlashesGPC($_POST['pass']) : '';
+$vpass = isset($_POST['vpass']) ? DataFilter::stripSlashesGPC($_POST['vpass']) : '';
+$timezone_offset = isset($_POST['timezone_offset']) ? (float)($_POST['timezone_offset']) : $icmsConfig['default_TZ'];
+$user_viewemail = (isset($_POST['user_viewemail']) && (int)$_POST['user_viewemail']) ? 1 : 0;
+$user_mailok = (isset($_POST['user_mailok']) && (int)$_POST['user_mailok']) ? 1 : 0;
+$agree_disc = (isset($_POST['agree_disc']) && (int)$_POST['agree_disc']) ? 1 : 0;
+$actkey = isset($_POST['actkey']) ? trim(DataFilter::stripSlashesGPC($_POST['actkey'])) : '';
 
 $thisuser = icms::handler('icms_member_user');
 switch ($op) {
@@ -90,26 +92,26 @@
 		}
 		$stop .= $thisuser->userCheck($login_name, $uname, $email, $pass, $vpass);
 		if (empty($stop)) {
-			echo _US_LOGINNAME . ": " . icms_core_DataFilter::htmlSpecialChars($login_name) . "<br />"
-				. _US_NICKNAME . ": " . icms_core_DataFilter::htmlSpecialChars($uname) . "<br />"
-				. _US_EMAIL . ": " . icms_core_DataFilter::htmlSpecialChars($email) . "<br />";
+			echo _US_LOGINNAME . ": " . DataFilter::htmlSpecialChars($login_name) . "<br />"
+				. _US_NICKNAME . ": " . DataFilter::htmlSpecialChars($uname) . "<br />"
+				. _US_EMAIL . ": " . DataFilter::htmlSpecialChars($email) . "<br />";
 			if ($url != '') {
 				$url = formatURL($url);
-				echo _US_WEBSITE . ': ' . icms_core_DataFilter::htmlSpecialChars($url) . '<br />';
+				echo _US_WEBSITE . ': ' . DataFilter::htmlSpecialChars($url) . '<br />';
 			}
-			$f_timezone = ($timezone_offset < 0)?'GMT ' . $timezone_offset:'GMT +' . $timezone_offset;
+			$f_timezone = ($timezone_offset < 0) ? 'GMT ' . $timezone_offset : 'GMT +' . $timezone_offset;
 			echo _US_TIMEZONE . ": $f_timezone<br />";
 			echo "<form action='register.php' method='post'><input type='hidden' name='login_name' value='"
-				. icms_core_DataFilter::htmlSpecialChars($login_name)
-				. "' /><input type='hidden' name='uname' value='" . icms_core_DataFilter::htmlSpecialChars($uname)
-				. "' /><input type='hidden' name='email' value='" . icms_core_DataFilter::htmlSpecialChars($email)
-				. "' /><input type='hidden' name='user_viewemail' value='" . (int) $user_viewemail
+				. DataFilter::htmlSpecialChars($login_name)
+				. "' /><input type='hidden' name='uname' value='" . DataFilter::htmlSpecialChars($uname)
+				. "' /><input type='hidden' name='email' value='" . DataFilter::htmlSpecialChars($email)
+				. "' /><input type='hidden' name='user_viewemail' value='" . (int)$user_viewemail
 				. "' /><input type='hidden' name='timezone_offset' value='" . $timezone_offset
-				. "' /><input type='hidden' name='url' value='" . icms_core_DataFilter::htmlSpecialChars($url)
-				. "' /><input type='hidden' name='pass' value='" . icms_core_DataFilter::htmlSpecialChars($pass)
-				. "' /><input type='hidden' name='vpass' value='" . icms_core_DataFilter::htmlSpecialChars($vpass)
-				. "' /><input type='hidden' name='user_mailok' value='" . (int) $user_mailok
-				. "' /><input type='hidden' name='actkey' value='" . icms_core_DataFilter::htmlSpecialChars($actkey)
+				. "' /><input type='hidden' name='url' value='" . DataFilter::htmlSpecialChars($url)
+				. "' /><input type='hidden' name='pass' value='" . DataFilter::htmlSpecialChars($pass)
+				. "' /><input type='hidden' name='vpass' value='" . DataFilter::htmlSpecialChars($vpass)
+				. "' /><input type='hidden' name='user_mailok' value='" . (int)$user_mailok
+				. "' /><input type='hidden' name='actkey' value='" . DataFilter::htmlSpecialChars($actkey)
 				. "' /><input type='hidden' name='agree_disc' value='" . (int) $agree_disc
 				. "' /><br /><br /><input type='hidden' name='op' value='finish' />" . icms::$security->getTokenHTML()
 				. "<input type='submit' value='" . _US_FINISH . "' /></form>";
diff --git a/resetpass.php b/resetpass.php
index 3c14f1cba9b0..f8ed99b9f775 100644
--- a/resetpass.php
+++ b/resetpass.php
@@ -3,15 +3,17 @@
  * All functions for Password Expiry & Reset Password generator are going through here.
  * Form and process for resetting password and sending to user
  *
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @package		Member
- * @subpackage	Users
- * @since		ImpressCMS 1.1
- * @author		Vaughan Montgomery <vaughan@impresscms.org>
- * @author		The ImpressCMS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package        Member
+ * @subpackage    Users
+ * @since        ImpressCMS 1.1
+ * @author        Vaughan Montgomery <vaughan@impresscms.org>
+ * @author        The ImpressCMS Project
  */
 
+use ImpressCMS\Core\DataFilter;
+
 $xoopsOption['pagetype'] = 'user';
 /* the following are passed through $_POST/$_GET
  *	'c_password' => 'str',
@@ -25,11 +27,11 @@
 	'email' => array('email', 'options' => array(0, 1)),
 );
 if (!empty($_GET)) {
-	$clean_GET = icms_core_DataFilter::checkVarArray($_GET, $filter_get, false);
+	$clean_GET = DataFilter::checkVarArray($_GET, $filter_get, false);
 	extract($clean_GET);
 }
 if (!empty($_POST)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_POST, $filter_post, false);
+	$clean_POST = DataFilter::checkVarArray($_POST, $filter_post, false);
 	extract($clean_POST);
 }
 
diff --git a/search.php b/search.php
index 7bff03642fe2..fe7626b303e5 100644
--- a/search.php
+++ b/search.php
@@ -26,15 +26,17 @@
 
 /**
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @since		XOOPS
- * @author		http://www.xoops.org The XOOPS Project
- * @author		Sina Asghari (aka stranger) <pesian_stranger@users.sourceforge.net>
- * @package		core
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @since        XOOPS
+ * @author        http://www.xoops.org The XOOPS Project
+ * @author        Sina Asghari (aka stranger) <pesian_stranger@users.sourceforge.net>
+ * @package        core
  */
 
+use ImpressCMS\Core\DataFilter;
+
 $xoopsOption['pagetype'] = "search";
 
 include 'mainfile.php';
@@ -149,9 +151,9 @@
 		foreach ($temp_queries as $q) {
 			$q = trim($q);
 			if (strlen($q) >= $icmsConfigSearch['keyword_min']) {
-				$queries[] = icms_core_DataFilter::addSlashes($q);
+				$queries[] = DataFilter::addSlashes($q);
 			} else {
-				$ignored_queries[] = icms_core_DataFilter::addSlashes($q);
+				$ignored_queries[] = DataFilter::addSlashes($q);
 			}
 		}
 
@@ -165,7 +167,7 @@
 			redirect_header('search.php', 2, sprintf(_SR_KEYTOOSHORT, icms_conv_nr2local($icmsConfigSearch['keyword_min'])));
 			exit();
 		}
-		$queries = array(icms_core_DataFilter::addSlashes($query));
+		$queries = array(DataFilter::addSlashes($query));
 	}
 }
 $xoopsTpl->assign("label_search_results", _SR_SEARCHRESULTS);
@@ -220,7 +222,7 @@
 				} else {
 					(($count - $start) > $max_results_per_page)?$num_show_this_page = $max_results_per_page:$num_show_this_page = $count - $start;
 					for ($i = 0; $i < $num_show_this_page; $i++) {
-						$results[$i]['processed_image_alt_text'] = icms_core_DataFilter::checkVar($modname, 'text', 'output') . ": ";
+						$results[$i]['processed_image_alt_text'] = DataFilter::checkVar($modname, 'text', 'output') . ": ";
 
 						if (isset($results[$i]['image']) && $results[$i]['image'] != "") {
 							$results[$i]['processed_image_url'] = "modules/" . $moddir . "/" . $results[$i]['image'];
@@ -232,7 +234,7 @@
 							if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
 								$results[$i]['link'] = "modules/" . $moddir . "/" . $results[$i]['link'];
 							}
-							$results[$i]['processed_title'] = icms_core_DataFilter::checkVar($results[$i]['title'], 'text', 'output');
+							$results[$i]['processed_title'] = DataFilter::checkVar($results[$i]['title'], 'text', 'output');
 						}
 						/*UnderDog Mark*/
 						if ($icmsConfigSearch['search_user_date']) {
@@ -289,7 +291,7 @@
 			?$num_show_this_page = $max_results_per_page
 			: $num_show_this_page = $count - $start;
 			for ($i = $start; $i < $start + $num_show_this_page; $i++) {
-				$results[$i]['processed_image_alt_text'] = icms_core_DataFilter::checkVar($modname, 'text', 'output') . ": ";
+				$results[$i]['processed_image_alt_text'] = DataFilter::checkVar($modname, 'text', 'output') . ": ";
 				if (isset($results[$i]['image']) && $results[$i]['image'] != "") {
 					$results[$i]['processed_image_url'] = "modules/" . $moddir . "/" . $results[$i]['image'];
 				} else {
@@ -298,15 +300,15 @@
 				if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
 					$results[$i]['link'] = "modules/" . $moddir . "/" . $results[$i]['link'];
 				}
-				$results[$i]['processed_title'] = icms_core_DataFilter::checkVar($results[$i]['title'], 'text', 'output');
+				$results[$i]['processed_title'] = DataFilter::checkVar($results[$i]['title'], 'text', 'output');
 				if ($icmsConfigSearch['search_user_date']) {
-					$results[$i]['uid'] = @ (int) $results[$i]['uid'];
+					$results[$i]['uid'] = @ (int)$results[$i]['uid'];
 					if (!empty($results[$i]['uid'])) {
 						$uname = \ImpressCMS\Core\Models\User::getUnameFromId($results[$i]['uid']);
 						$results[$i]['processed_user_name'] = $uname;
 						$results[$i]['processed_user_url'] = ICMS_URL . '/userinfo.php?uid=' . $results[$i]['uid'];
 					}
-					$results[$i]['processed_time'] = !empty($results[$i]['time'])?" (" . formatTimestamp((int) $results[$i]['time']) . ")":"";
+					$results[$i]['processed_time'] = !empty($results[$i]['time']) ? " (" . formatTimestamp((int)$results[$i]['time']) . ")" : "";
 				}
 			}
 
diff --git a/tests/libraries/icms/FilterTest.php b/tests/libraries/icms/FilterTest.php
index d4cef508bdd8..7a04d8201d89 100644
--- a/tests/libraries/icms/FilterTest.php
+++ b/tests/libraries/icms/FilterTest.php
@@ -4,6 +4,7 @@
 
 use icms_core_DataFilter;
 use icms_core_HTMLFilter;
+use ImpressCMS\Core\DataFilter;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -19,17 +20,18 @@ class FilterTest extends TestCase {
     public function testAvailability() {
         $this->assertTrue(class_exists('icms_core_DataFilter', true), "icms_core_DataFilter class doesn't exist");
         $this->assertTrue(class_exists('icms_core_HTMLFilter', true), "icms_core_HTMLFilter class doesn't exist");
-        $instance = new icms_core_HTMLFilter();
-        $this->assertInstanceOf(icms_core_DataFilter::class, $instance, 'icms_core_HTMLFilter is not instanceof icms_core_DataFilter');
+		$instance = new icms_core_HTMLFilter();
+		$this->assertInstanceOf(DataFilter::class, $instance, 'icms_core_HTMLFilter is not instanceof icms_core_DataFilter');
     }
 
     /**
      * Tests if static variables has correct values
      */
-    public function testStaticVariables() {
-        $this->assertIsArray( icms_core_DataFilter::$allSmileys, '$allSmileys must be an array');
-        $this->assertIsArray( icms_core_DataFilter::$displaySmileys, '$displaySmileys must be an array');
-    }
+    public function testStaticVariables()
+	{
+		$this->assertIsArray(DataFilter::$allSmileys, '$allSmileys must be an array');
+		$this->assertIsArray(DataFilter::$displaySmileys, '$displaySmileys must be an array');
+	}
 
     /**
      * Checks if all required static methdos are available
diff --git a/userinfo.php b/userinfo.php
index 624aa565e4c0..7983c7c985d8 100644
--- a/userinfo.php
+++ b/userinfo.php
@@ -35,6 +35,7 @@
  * @subpackage    User
  */
 
+use ImpressCMS\Core\DataFilter;
 use ImpressCMS\Core\Models\GroupPermHandler;
 
 $xoopsOption['pagetype'] = 'user';
@@ -135,7 +136,7 @@
 	'lang_interest' => _US_INTEREST,
 	'user_interest' => $thisUser->user_intrest,
 	'lang_extrainfo' => _US_EXTRAINFO,
-	'user_extrainfo' => icms_core_DataFilter::checkVar($thisUser->bio, 'text', 'output'),
+	'user_extrainfo' => DataFilter::checkVar($thisUser->bio, 'text', 'output'),
 	'lang_statistics' => _US_STATISTICS,
 	'lang_membersince' => _US_MEMBERSINCE,
 	'user_joindate' => formatTimestamp($thisUser->user_regdate, 's'),
@@ -168,7 +169,7 @@
    	icms_makeSmarty(array(
 		'user_showsignature' => true,
 		'lang_signature' => _US_SIGNATURE,
-		'user_signature' => icms_core_DataFilter::checkVar($thisUser->user_sig, 'html', 'output')
+		'user_signature' => DataFilter::checkVar($thisUser->user_sig, 'html', 'output')
 	));
 }
 
@@ -194,8 +195,8 @@
 						$results[$i]['link'] = "modules/" . $module->dirname . "/" . $results[$i]['link'];
 					}
 				}
-				$results[$i]['title'] = icms_core_DataFilter::htmlSpecialChars($results[$i]['title']);
-				$results[$i]['time'] = $results[$i]['time']? formatTimestamp($results[$i]['time']):'';
+				$results[$i]['title'] = DataFilter::htmlSpecialChars($results[$i]['title']);
+				$results[$i]['time'] = $results[$i]['time'] ? formatTimestamp($results[$i]['time']) : '';
 			}
 			if ($count == 5) {
 				$showall_link = '<a href="search.php?action=showallbyuser&amp;mid=' . (int) $mid .
diff --git a/viewpmsg.php b/viewpmsg.php
index 09d860d238e4..a997bc0873f3 100644
--- a/viewpmsg.php
+++ b/viewpmsg.php
@@ -27,24 +27,26 @@
 /**
  * View and manage your private messages
  *
- * @copyright	http://www.xoops.org/ The XOOPS Project
- * @copyright	http://www.impresscms.org/ The ImpressCMS Project
- * @license		http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
- * @since		XOOPS
- * @author		http://www.xoops.org The XOOPS Project
+ * @copyright    http://www.xoops.org/ The XOOPS Project
+ * @copyright    http://www.impresscms.org/ The ImpressCMS Project
+ * @license        http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @since        XOOPS
+ * @author        http://www.xoops.org The XOOPS Project
  * @author      sato-san <sato-san@impresscms.org>
- * @package		core
- * @subpackage	Privmessage
+ * @package        core
+ * @subpackage    Privmessage
  */
+
+use ImpressCMS\Core\DataFilter;
+
 $xoopsOption['pagetype'] = 'pmsg';
 
 /* set filter types, if not strings */
-$filter_get = array(
-);
+$filter_get = array();
 
 $filter_post = array(
-		'msg_id' => 'int',
-		'delete_messages' => 'str',
+	'msg_id' => 'int',
+	'delete_messages' => 'str',
 );
 
 /* set default values for variables */
@@ -53,12 +55,12 @@
 
 /* filter the user input */
 if (!empty($_GET)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_GET, $filter_get, false);
+	$clean_POST = DataFilter::checkVarArray($_GET, $filter_get, false);
 	extract($clean_POST);
 }
 
 if (!empty($_POST)) {
-	$clean_POST = icms_core_DataFilter::checkVarArray($_POST, $filter_post, false);
+	$clean_POST = DataFilter::checkVarArray($_POST, $filter_post, false);
 	extract($clean_POST);
 }