Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

1 files changed, 42 insertions, 44 deletions

diff --git a/Zotlabs/Module/Mood.php b/Zotlabs/Module/Mood.php
index 453f08f9f..cb2ca566b 100644
--- a/Zotlabs/Module/Mood.php
+++ b/Zotlabs/Module/Mood.php
@@ -14,36 +14,36 @@ require_once('include/items.php');
 class Mood extends Controller {
 
 	function init() {
-	
+
 		if(! local_channel())
 			return;
 
 		if(! Apps::system_app_installed(local_channel(), 'Mood')) {
 			return;
 		}
-	
+
 		$uid = local_channel();
 		$channel = App::get_channel();
 		$verb = notags(trim($_GET['verb']));
-		
-		if(! $verb) 
+
+		if(! $verb)
 			return;
-	
+
 		$verbs = get_mood_verbs();
-	
+
 		if(! array_key_exists($verb,$verbs))
 			return;
-	
+
 		$activity = ACTIVITY_MOOD . '#' . urlencode($verb);
-	
+
 		$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
-	
-	
+
+
 		logger('mood: verb ' . $verb, LOGGER_DEBUG);
-	
-	
+
+
 		if($parent) {
-			$r = q("select mid, owner_xchan, private, allow_cid, allow_gid, deny_cid, deny_gid 
+			$r = q("select mid, owner_xchan, private, allow_cid, allow_gid, deny_cid, deny_gid
 				from item where id = %d and parent = %d and uid = %d limit 1",
 				intval($parent),
 				intval($parent),
@@ -59,24 +59,24 @@ class Mood extends Controller {
 			}
 		}
 		else {
-	
+
 			$private       = 0;
-	
+
 			$allow_cid     =  $channel['channel_allow_cid'];
 			$allow_gid     =  $channel['channel_allow_gid'];
 			$deny_cid      =  $channel['channel_deny_cid'];
 			$deny_gid      =  $channel['channel_deny_gid'];
 		}
-	
+
 		$poster = App::get_observer();
-	
+
 		$uuid = item_message_id();
 		$mid = z_root() . '/item/' . $uuid;
-	
-		$action = sprintf( t('%1$s is %2$s','mood'), '[zrl=' . $poster['xchan_url'] . ']' . $poster['xchan_name'] . '[/zrl]' , $verbs[$verb]); 
-	
+
+		$action = sprintf( t('%1$s is %2$s','mood'), '[zrl=' . $poster['xchan_url'] . ']' . $poster['xchan_name'] . '[/zrl]' , $verbs[$verb]);
+
 		$arr = array();
-	
+
 		$arr['aid']           = get_account_id();
 		$arr['uid']           = $uid;
 		$arr['uuid']          = $uuid;
@@ -97,31 +97,31 @@ class Mood extends Controller {
 		$arr['item_unseen']   = 1;
 		if(! $parent_mid)
 			$item['item_thread_top'] = 1;
-	
+
 		if ((! $arr['plink']) && intval($arr['item_thread_top'])) {
 			$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']);
 		}
-	
-	
+
+
 		$post = item_store($arr);
 		$item_id = $post['item_id'];
-	
+
 		if($item_id) {
 			\Zotlabs\Daemon\Master::Summon(array('Notifier','activity', $item_id));
 		}
-	
+
 		call_hooks('post_local_end', $arr);
-	
+
 		if($_SESSION['return_url'])
 			goaway(z_root() . '/' . $_SESSION['return_url']);
-	
+
 		return;
 	}
-	
-	
-	
+
+
+
 	function get() {
-	
+
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL);
 			return;
@@ -130,26 +130,24 @@ class Mood extends Controller {
 		if(! Apps::system_app_installed(local_channel(), 'Mood')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Mood App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Set your current mood and tell your friends');
-			return $o;
+			$papp = Apps::get_papp('Mood');
+			return Apps::app_render($papp, 'module');
 		}
 
 		nav_set_selected('Mood');
 
 		$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
-	
+
 		$verbs = get_mood_verbs();
-	
+
 		$shortlist = array();
 		foreach($verbs as $k => $v)
 			if($v !== 'NOTRANSLATION')
 				$shortlist[] = array($k,$v);
-	
-	
+
+
 		$tpl = get_markup_template('mood_content.tpl');
-	
+
 		$o = replace_macros($tpl,array(
 			'$title' => t('Mood'),
 			'$desc' => t('Set your current mood and tell your friends'),
@@ -157,9 +155,9 @@ class Mood extends Controller {
 			'$parent' => $parent,
 			'$submit' => t('Submit'),
 		));
-	
+
 		return $o;
-	
+
 	}
-	
+
 }