X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftheme.php;h=9bae9053af09e7a7e8ba65433beedcafb3b65995;hb=fdc6608af8fe4731f1f37d8a3837124ba5b5686b;hp=f46b42788fe9253da7355c6e9285f695cff474f2;hpb=5fd44020747d16fc90d902cfb89a2fca40d2d9ee;p=friendica.git

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index f46b42788f..9bae9053af 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -13,31 +13,25 @@ use Friendica\Content\Widget;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model;
 use Friendica\Module;
-
-$frio = 'view/theme/frio';
-
-global $frio;
+use Friendica\Util\Strings;
 
 function frio_init(App $a)
 {
+	global $frio;
+	$frio = 'view/theme/frio';
+
 	// disable the events module link in the profile tab
 	$a->theme_events_in_profile = false;
 	$a->videowidth = 622;
 
-	$a->setActiveTemplateEngine('smarty3');
-
-	$baseurl = System::baseUrl();
-
-	$style = PConfig::get(local_user(), 'frio', 'style');
-
-	$frio = 'view/theme/frio';
-
-	global $frio;
+	Renderer::setActiveTemplateEngine('smarty3');
 
 	// if the device is a mobile device set js is_mobile
 	// variable so the js scripts can use this information
@@ -48,10 +42,6 @@ function frio_init(App $a)
 			</script>
 EOT;
 	}
-
-	if ($style == '') {
-		$style = Config::get('frio', 'style');
-	}
 }
 
 function frio_install()
@@ -63,7 +53,7 @@ function frio_install()
 	Addon::registerHook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup');
 	Addon::registerHook('display_item', 'view/theme/frio/theme.php', 'frio_display_item');
 
-	logger('installed theme frio');
+	Logger::log('installed theme frio');
 }
 
 function frio_uninstall()
@@ -75,7 +65,7 @@ function frio_uninstall()
 	Addon::unregisterHook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup');
 	Addon::unregisterHook('display_item', 'view/theme/frio/theme.php', 'frio_display_item');
 
-	logger('uninstalled theme frio');
+	Logger::log('uninstalled theme frio');
 }
 
 /**
@@ -298,7 +288,7 @@ function frio_remote_nav($a, &$nav)
  */
 function frio_acl_lookup(App $a, &$results)
 {
-	$nets = x($_GET, 'nets') ? notags(trim($_GET['nets'])) : '';
+	$nets = !empty($_GET['nets']) ? Strings::escapeTags(trim($_GET['nets'])) : '';
 
 	// we introduce a new search type, r should do the same query like it's
 	// done in /src/Module/Contact.php for connections
@@ -308,7 +298,7 @@ function frio_acl_lookup(App $a, &$results)
 
 	$sql_extra = '';
 	if ($results['search']) {
-		$search_txt = DBA::escape(protect_sprintf(preg_quote($results['search'])));
+		$search_txt = DBA::escape(Strings::protectSprintf(preg_quote($results['search'])));
 		$sql_extra .= " AND (`attag` LIKE '%%" . $search_txt . "%%' OR `name` LIKE '%%" . $search_txt . "%%' OR `nick` LIKE '%%" . $search_txt . "%%') ";
 	}
 
@@ -318,14 +308,14 @@ function frio_acl_lookup(App $a, &$results)
 
 	$total = 0;
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
-		WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ", intval($_SESSION['uid']));
+		WHERE `uid` = %d AND NOT `self` AND NOT `deleted` AND NOT `pending` $sql_extra ", intval($_SESSION['uid']));
 	if (DBA::isResult($r)) {
 		$total = $r[0]['total'];
 	}
 
 	$sql_extra3 = Widget::unavailableNetworks();
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra $sql_extra3 ORDER BY `name` ASC LIMIT %d, %d ",
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `deleted` AND NOT `pending` $sql_extra $sql_extra3 ORDER BY `name` ASC LIMIT %d, %d ",
 		intval($_SESSION['uid']), intval($results['start']), intval($results['count'])
 	);