X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftheme.php;h=a61810f99e4196b9387ab5be4c9852d8a866ea43;hb=0eef382e82c689330ea5071af8e4fb98638ab0df;hp=9d2b77d1f1a2796436792f48c88afa964ee66317;hpb=6cf50a14fae25210a0cdb617c29d549abcfde9ac;p=friendica.git

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 9d2b77d1f1..a61810f99e 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -2,7 +2,7 @@
 /*
  * Name: frio
  * Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the <a href="https://github.com/friendica/friendica/tree/develop/view/theme/frio/README.md">ReadMe</a>.
- * Version: V.0.8
+ * Version: V.0.8.5
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus>
  *
  */
@@ -13,10 +13,14 @@ 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\DBM;
-use Friendica\Model\Profile;
+use Friendica\Database\DBA;
+use Friendica\Model;
+use Friendica\Module;
+use Friendica\Util\Strings;
 
 $frio = 'view/theme/frio';
 
@@ -28,7 +32,7 @@ function frio_init(App $a)
 	$a->theme_events_in_profile = false;
 	$a->videowidth = 622;
 
-	$a->set_template_engine('smarty3');
+	Renderer::setActiveTemplateEngine('smarty3');
 
 	$baseurl = System::baseUrl();
 
@@ -62,7 +66,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()
@@ -74,7 +78,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');
 }
 
 /**
@@ -150,8 +154,18 @@ function frio_item_photo_menu(App $a, &$arr)
 function frio_contact_photo_menu(App $a, &$args)
 {
 	$cid = $args['contact']['id'];
-	$pokelink = $args['menu']['poke'][1];
-	$pmlink = $args['menu']['pm'][1];
+
+	if (!empty($args['menu']['poke'])) {
+		$pokelink = $args['menu']['poke'][1];
+	} else {
+		$pokelink = '';
+	}
+
+	if (!empty($args['menu']['poke'])) {
+		$pmlink = $args['menu']['pm'][1];
+	} else {
+		$pmlink = '';
+	}
 
 	// Set the the indicator for opening the status, profile and photo pages
 	// in a new tab to false if the contact a dfrn (friendica) contact
@@ -198,7 +212,7 @@ function frio_contact_photo_menu(App $a, &$args)
 function frio_remote_nav($a, &$nav)
 {
 	// get the homelink from $_XSESSION
-	$homelink = Profile::getMyURL();
+	$homelink = Model\Profile::getMyURL();
 	if (!$homelink) {
 		$homelink = defaults($_SESSION, 'visitor_home', '');
 	}
@@ -231,23 +245,23 @@ function frio_remote_nav($a, &$nav)
 		// user info
 		$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid']));
 
-		$r[0]['photo'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg');
+		$r[0]['photo'] = (DBA::isResult($r) ? $a->removeBaseURL($r[0]['micro']) : 'images/person-48.jpg');
 		$r[0]['name'] = $a->user['username'];
 	} elseif (!local_user() && remote_user()) {
 		$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
 		$nav['remote'] = L10n::t('Guest');
-	} elseif (Profile::getMyURL()) {
+	} elseif (Model\Profile::getMyURL()) {
 		$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
 				WHERE `addr` = '%s' AND `network` = 'dfrn'",
-			dbesc($webbie));
+			DBA::escape($webbie));
 		$nav['remote'] = L10n::t('Visitor');
 	} else {
 		$r = false;
 	}
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$nav['userinfo'] = [
-			'icon' => (DBM::is_result($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
+			'icon' => (DBA::isResult($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
 			'name' => $r[0]['name'],
 		];
 	}
@@ -267,8 +281,8 @@ function frio_remote_nav($a, &$nav)
 		$nav['events'] = [$server_url . '/events', L10n::t('Events'), '', L10n::t('Events and Calendar')];
 		$nav['messages'] = [$server_url . '/message', L10n::t('Messages'), '', L10n::t('Private mail')];
 		$nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), '', L10n::t('Account settings')];
-		$nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
-		$nav['sitename'] = $a->config['sitename'];
+		$nav['contacts'] = [$server_url . '/contact', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
+		$nav['sitename'] = Config::get('config', 'sitename');
 	}
 }
 
@@ -276,7 +290,7 @@ function frio_remote_nav($a, &$nav)
  * @brief: Search for contacts
  *
  * This function search for a users contacts. The code is copied from contact search
- * in /mod/contacts.php. With this function the contacts will permitted to acl_lookup()
+ * in /src/Module/Contact.php. With this function the contacts will permitted to acl_lookup()
  * and can grabbed as json. For this we use the type="r". This is usful to to let js
  * grab the contact data.
  * We use this to give the data to textcomplete and have a filter function at the
@@ -287,30 +301,28 @@ function frio_remote_nav($a, &$nav)
  */
 function frio_acl_lookup(App $a, &$results)
 {
-	require_once 'mod/contacts.php';
-
-	$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 /mod/contacts for connections
+	// done in /src/Module/Contact.php for connections
 	if ($results['type'] !== 'r') {
 		return;
 	}
 
 	$sql_extra = '';
 	if ($results['search']) {
-		$search_txt = dbesc(protect_sprintf(preg_quote($results['search'])));
-		$sql_extra .= " AND (`attag` LIKE '%%" . dbesc($search_txt) . "%%' OR `name` LIKE '%%" . dbesc($search_txt) . "%%' OR `nick` LIKE '%%" . dbesc($search_txt) . "%%') ";
+		$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 . "%%') ";
 	}
 
 	if ($nets) {
-		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
+		$sql_extra .= sprintf(" AND network = '%s' ", DBA::escape($nets));
 	}
 
 	$total = 0;
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
 		WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ", intval($_SESSION['uid']));
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$total = $r[0]['total'];
 	}
 
@@ -322,9 +334,9 @@ function frio_acl_lookup(App $a, &$results)
 
 	$contacts = [];
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
-			$contacts[] = _contact_detail_for_template($rr);
+			$contacts[] = Module\Contact::getContactTemplateVars($rr);
 		}
 	}