Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

[friendica.git] / mod / mood.php

diff --git a/mod/mood.php b/mod/mood.php
index 7a793c71e0fd91d0428d9b1e515055576b9f9847..0e603c869a110e5155819b611a42c2bf58f4102c 100644 (file)
--- a/mod/mood.php
+++ b/mod/mood.php
@@ -5,15 +5,16 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function mood_init(&$a) {
+function mood_init(App &$a) {
 
-       if(! local_user())
+       if (! local_user()) {
                return;
+       }
 
        $uid = local_user();
        $verb = notags(trim($_GET['verb']));
-       
-       if(! $verb) 
+
+       if(! $verb)
                return;
 
        $verbs = get_mood_verbs();
@@ -30,13 +31,13 @@ function mood_init(&$a) {
 
 
        if($parent) {
-               $r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid 
+               $r = q("select uri, 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),
                        intval($uid)
                );
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        $parent_uri = $r[0]['uri'];
                        $private    = $r[0]['private'];
                        $allow_cid  = $r[0]['allow_cid'];
@@ -62,7 +63,7 @@ function mood_init(&$a) {
        $action = sprintf( t('%1$s is currently %2$s'), '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' , $verbs[$verb]); 
 
        $arr = array();
-
+       $arr['guid']          = get_guid(32);
        $arr['uid']           = $uid;
        $arr['uri']           = $uri;
        $arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
@@ -90,27 +91,27 @@ function mood_init(&$a) {
 
        $item_id = item_store($arr);
        if($item_id) {
-               q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
-                       dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+               q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
+                       dbesc(App::get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
                        intval($uid),
                        intval($item_id)
                );
-               proc_run('php',"include/notifier.php","tag","$item_id");
+               proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
        }
 
 
        call_hooks('post_local_end', $arr);
 
-       proc_run('php',"include/notifier.php","like","$post_id");
+       proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id);
 
        return;
 }
 
 
 
-function mood_content(&$a) {
+function mood_content(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@ -139,4 +140,4 @@ function mood_content(&$a) {
 
        return $o;
 
-}
\ No newline at end of file
+}