X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftheme.php;h=70cac3b3a89811d7dcd01886ac2795a7f2f60274;hb=4ca68c7af05b7b41e1b04936b9080802ca2b7716;hp=d8b10c4e3efe523bb083c633986594876bd638a7;hpb=b067a1114679ebc3dc6132759c511c3ac8b73e49;p=friendica.git

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index d8b10c4e3e..70cac3b3a8 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -2,11 +2,17 @@
 /*
  * 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.7
+ * Version: V.0.8
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus>
  *
  */
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
 $frio = "view/theme/frio";
 
 global $frio;
@@ -16,14 +22,11 @@ function frio_init(App $a) {
 	// disable the events module link in the profile tab
 	$a->theme_events_in_profile = false;
 
-	// Disallow the richtext editor
-	$a->theme_richtext_editor = false;
-
 	set_template_engine($a, 'smarty3');
 
-	$baseurl = App::get_baseurl();
+	$baseurl = System::baseUrl();
 
-	$style = get_pconfig(local_user(), 'frio', 'style');
+	$style = PConfig::get(local_user(), 'frio', 'style');
 
 	$frio = "view/theme/frio";
 
@@ -33,14 +36,14 @@ function frio_init(App $a) {
 	// variable so the js scripts can use this information
 	if($a->is_mobile || $a->is_tablet) {
 		$a->page["htmlhead"] .= <<< EOT
-			<script>
+			<script type="text/javascript">
 				var is_mobile = 1;
 			</script>
 EOT;
-			}
+}
 
 	if ($style == "")
-		$style = get_config('frio', 'style');
+		$style = Config::get('frio', 'style');
 }
 
 function frio_install() {
@@ -49,6 +52,7 @@ function frio_install() {
 	register_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu');
 	register_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav');
 	register_hook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup');
+	register_hook('display_item', 'view/theme/frio/theme.php', 'frio_display_item');
 
 	logger("installed theme frio");
 }
@@ -59,6 +63,7 @@ function frio_uninstall() {
 	unregister_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu');
 	unregister_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav');
 	unregister_hook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup');
+	unregister_hook('display_item', 'view/theme/frio/theme.php', 'frio_display_item');
 
 	logger("uninstalled theme frio");
 }
@@ -133,7 +138,7 @@ function frio_item_photo_menu(App $a, &$arr) {
  *  Additionally the profile, status and photo page links  will be changed
  *  to don't open in a new tab if the contact is a friendica contact.
  *
- * @param app $a The app data
+ * @param App $a The app data
  * @param array $args Contains contact data and the original photo_menu
  */
 function frio_contact_photo_menu(App $a, &$args){
@@ -185,7 +190,7 @@ function frio_contact_photo_menu(App $a, &$args){
  *  Some links will point to the local pages because the user would expect
  *  local page (these pages are: search, community, help, apps, directory).
  *
- * @param app $a The App class
+ * @param App $a The App class
  * @param array $nav The original nav menu
  */
 function frio_remote_nav($a,&$nav) {
@@ -215,35 +220,37 @@ function frio_remote_nav($a,&$nav) {
 
 	// since $userinfo isn't available for the hook we write it to the nav array
 	// this isn't optimal because the contact query will be done now twice
-	if(local_user()) {
+	if (local_user()) {
 		// empty the server url for local user because we won't need it
 		$server_url = '';
 		// 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'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg");
 		$r[0]['name'] = $a->user['username'];
 
-	} elseif(!local_user() && remote_user()) {
+	} elseif (!local_user() && remote_user()) {
 		$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
 		$nav['remote'] = t("Guest");
 
-	} elseif(get_my_url ()) {
+	} elseif (get_my_url()) {
 		$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
 				WHERE `addr` = '%s' AND `network` = 'dfrn'",
 			dbesc($webbie));
 		$nav['remote'] = t("Visitor");
+	} else {
+		$r = false;
 	}
 
-	if (dbm::is_result($r)){
+	if (DBM::is_result($r)) {
 			$nav['userinfo'] = array(
-				'icon' => (dbm::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"),
+				'icon' => (DBM::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"),
 				'name' => $r[0]['name'],
 			);
 		}
 
-	if(!local_user() && !empty($server_url)) {
-		$nav['logout'] = Array($server_url . '/logout',t('Logout'), "", t('End this session'));
+	if (!local_user() && !empty($server_url)) {
+		$nav['logout'] = Array($server_url . '/logout', t('Logout'), "", t('End this session'));
 
 		// user menu
 		$nav['usermenu'][] = Array($server_url . '/profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations'));
@@ -274,7 +281,7 @@ function frio_remote_nav($a,&$nav) {
  * @param App $a The app data @TODO Unused
  * @param array $results The array with the originals from acl_lookup()
  */
-function frio_acl_lookup($a, &$results) {
+function frio_acl_lookup(App $a, &$results) {
 	require_once("mod/contacts.php");
 
 	$nets = ((x($_GET,"nets")) ? notags(trim($_GET["nets"])) : "");
@@ -300,7 +307,7 @@ function frio_acl_lookup($a, &$results) {
 		$r = q("SELECT COUNT(*) AS `total` FROM `contact`
 			WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra $sql_extra2 ",
 			intval($_SESSION['uid']));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$total = $r[0]["total"];
 		}
 
@@ -312,7 +319,7 @@ function frio_acl_lookup($a, &$results) {
 
 		$contacts = array();
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				$contacts[] = _contact_detail_for_template($rr);
 			}
@@ -322,3 +329,28 @@ function frio_acl_lookup($a, &$results) {
 		$results["tot"] = $total;
 	}
 }
+
+/**
+ * @brief Manipulate the data of the item
+ * 
+ * At the moment we use this function to add some own stuff to the item menu
+ * 
+ * @param App $a App $a The app data
+ * @param array $arr Array with the item and the item actions<br>
+ *     'item' => Array with item data<br>
+ *     'output' => Array with item actions<br>
+ */
+function frio_display_item(App $a,&$arr) {
+
+	// Add subthread to the item menu
+	$subthread = array();
+	if ((local_user()) && local_user() == $arr['item']['uid'] && $arr['item']['parent'] == $arr['item']['id'] && (! $arr['item']['self'])) {
+		$subthread = array(
+			'menu'   => 'follow_thread',
+			'title'  => t('Follow Thread'),
+			'action' => 'dosubthread(' . $arr['item']['id'] . '); return false;',
+			'href'   => '#'
+		);
+	}
+	$arr['output']['subthread'] = $subthread;
+}