More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index bed00c5eaf95ac1969855d1ed8190a04dbf19c4c..d548ec1ac72bfda6df3d3d85776ca6c639dc3c22 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -49,7 +49,7 @@ function notification($params) {
        // with $params['show_in_notification_page'] == false, the notification isn't inserted into
        // the database, and an email is sent if applicable.
        // default, if not specified: true
-       $show_in_notification_page = ((x($params, 'show_in_notification_page')) ? $params['show_in_notification_page']:True);
+       $show_in_notification_page = ((x($params, 'show_in_notification_page')) ? $params['show_in_notification_page']:true);
 
        $additional_mail_header = "";
        $additional_mail_header .= "Precedence: list\n";
@@ -411,13 +411,14 @@ function notification($params) {
                        $hash = random_string();
                        $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1",
                                dbesc($hash));
-                       if (count($r))
+                       if (dbm::is_result($r))
                                $dups = true;
                } while($dups == true);
 
                $datarray = array();
                $datarray['hash']  = $hash;
                $datarray['name']  = $params['source_name'];
+               $datarray['name_cache'] = strip_tags(bbcode($params['source_name']));
                $datarray['url']   = $params['source_link'];
                $datarray['photo'] = $params['source_photo'];
                $datarray['date']  = datetime_convert();
@@ -439,8 +440,8 @@ function notification($params) {
 
                // create notification entry in DB
 
-               $r = q("INSERT INTO `notify` (`hash`, `name`, `url`, `photo`, `date`, `uid`, `link`, `iid`, `parent`, `type`, `verb`, `otype`)
-                       values('%s', '%s', '%s', '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s')",
+               $r = q("INSERT INTO `notify` (`hash`, `name`, `url`, `photo`, `date`, `uid`, `link`, `iid`, `parent`, `type`, `verb`, `otype`, `name_cache`)
+                       values('%s', '%s', '%s', '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s')",
                        dbesc($datarray['hash']),
                        dbesc($datarray['name']),
                        dbesc($datarray['url']),
@@ -452,7 +453,8 @@ function notification($params) {
                        intval($datarray['parent']),
                        intval($datarray['type']),
                        dbesc($datarray['verb']),
-                       dbesc($datarray['otype'])
+                       dbesc($datarray['otype']),
+                       dbesc($datarray["name_cache"])
                );
 
                $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' AND `uid` = %d LIMIT 1",
@@ -494,8 +496,10 @@ function notification($params) {
 
                $itemlink = $a->get_baseurl().'/notify/view/'.$notify_id;
                $msg = replace_macros($epreamble, array('$itemlink' => $itemlink));
-               $r = q("UPDATE `notify` SET `msg` = '%s' WHERE `id` = %d AND `uid` = %d",
+               $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(bbcode($msg)));
+               $r = q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
                        dbesc($msg),
+                       dbesc($msg_cache),
                        intval($notify_id),
                        intval($params['uid'])
                );
@@ -644,6 +648,7 @@ function notification($params) {
  * @param str $defaulttype (Optional) Forces a notification with this type.
  */
 function check_item_notification($itemid, $uid, $defaulttype = "") {
+       $a = get_app();
 
        $notification_data = array("uid" => $uid, "profiles" => array());
        call_hooks('check_item_notification', $notification_data);
@@ -662,7 +667,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
        $profiles[] = $owner[0]["url"];
 
        // Notifications from Diaspora are often with an URL in the Diaspora format
-       $profiles[] = App::get_baseurl()."/u/".$user[0]["nickname"];
+       $profiles[] = $a->get_baseurl()."/u/".$user[0]["nickname"];
 
        $profiles2 = array();
 
@@ -716,7 +721,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
        $params["to_email"] = $user[0]["email"];
        $params["item"] = $item[0];
        $params["parent"] = $item[0]["parent"];
-       $params["link"] = App::get_baseurl().'/display/'.urlencode($item[0]["guid"]);
+       $params["link"] = $a->get_baseurl().'/display/'.urlencode($item[0]["guid"]);
        $params["otype"] = 'item';
        $params["source_name"] = $item[0]["author-name"];
        $params["source_link"] = $item[0]["author-link"];
@@ -728,7 +733,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
                        intval($item[0]['contact-id']),
                        intval($uid)
                );
-               $send_notification = count($r);
+               $send_notification = dbm::is_result($r);
 
                if (!$send_notification) {
                        $tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d",
@@ -738,7 +743,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
                                foreach ($tags AS $tag) {
                                        $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `notify_new_posts`",
                                                normalise_link($tag["url"]), intval($uid));
-                                       if (count($r))
+                                       if (dbm::is_result($r))
                                                $send_notification = true;
                                }
                        }
@@ -778,4 +783,27 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
        if (isset($params["type"]))
                notification($params);
 }
-?>
+
+/**
+ * @brief Formats a notification message with the notification author
+ *
+ * Replace the name with {0} but ensure to make that only once. The {0} is used
+ * later and prints the name in bold.
+ *
+ * @param string $name
+ * @param string $message
+ * @return string Formatted message
+ */
+function format_notification_message($name, $message) {
+       if ($name != '') {
+               $pos = strpos($message, $name);
+       } else {
+               $pos = false;
+       }
+
+       if ($pos !== false) {
+               $message = substr_replace($message, '{0}', $pos, strlen($name));
+       }
+
+       return $message;
+}