]> git.mxchange.org Git - friendica.git/blobdiff - mod/notifications.php
Fixes:
[friendica.git] / mod / notifications.php
index 46519075b4a933d7590a78cc12628e52bb91a067..b639b089f84fa73e8896d828e6f77c9b47fcae53 100644 (file)
@@ -3,37 +3,35 @@
  * @file mod/notifications.php
  * @brief The notifications module
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
 use Friendica\Core\L10n;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 
-function notifications_post(App $a) {
-
-       if (! local_user()) {
+function notifications_post(App $a)
+{
+       if (!local_user()) {
                goaway(System::baseUrl());
        }
 
        $request_id = (($a->argc > 1) ? $a->argv[1] : 0);
 
-       if($request_id === "all")
+       if ($request_id === "all") {
                return;
+       }
 
-       if($request_id) {
-
-               $r = q("SELECT * FROM `intro` WHERE `id` = %d  AND `uid` = %d LIMIT 1",
-                       intval($request_id),
-                       intval(local_user())
-               );
+       if ($request_id) {
+               $intro = DBA::selectFirst('intro', ['id', 'contact-id', 'fid'], ['id' => $request_id, 'uid' => local_user()]);
 
-               if (DBM::is_result($r)) {
-                       $intro_id = $r[0]['id'];
-                       $contact_id = $r[0]['contact-id'];
-               }
-               else {
+               if (DBM::is_result($intro)) {
+                       $intro_id = $intro['id'];
+                       $contact_id = $intro['contact-id'];
+               } else {
                        notice(L10n::t('Invalid request identifier.') . EOL);
                        return;
                }
@@ -41,35 +39,31 @@ function notifications_post(App $a) {
                // If it is a friend suggestion, the contact is not a new friend but an existing friend
                // that should not be deleted.
 
-               $fid = $r[0]['fid'];
+               $fid = $intro['fid'];
 
-               if($_POST['submit'] == L10n::t('Discard')) {
-                       $r = q("DELETE FROM `intro` WHERE `id` = %d",
-                               intval($intro_id)
-                       );
-                       if(! $fid) {
+               if ($_POST['submit'] == L10n::t('Discard')) {
+                       DBA::delete('intro', ['id' => $intro_id]);
 
+                       if (!$fid) {
                                // The check for blocked and pending is in case the friendship was already approved
                                // and we just want to get rid of the now pointless notification
-
-                               $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1",
-                                       intval($contact_id),
-                                       intval(local_user())
-                               );
+                               $condition = ['id' => $contact_id, 'uid' => local_user(),
+                                       'self' => false, 'blocked' => true, 'pending' => true];
+                               DBA::delete('contact', $condition);
                        }
                        goaway('notifications/intros');
                }
-               if($_POST['submit'] == L10n::t('Ignore')) {
-                       $r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d",
-                               intval($intro_id));
+
+               if ($_POST['submit'] == L10n::t('Ignore')) {
+                       DBA::update('intro', ['ignore' => true], ['id' => $intro_id]);
                        goaway('notifications/intros');
                }
        }
 }
 
-function notifications_content(App $a) {
-
-       if (! local_user()) {
+function notifications_content(App $a)
+{
+       if (!local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
                return;
        }
@@ -87,6 +81,7 @@ function notifications_content(App $a) {
        // Get the nav tabs for the notification pages
        $tabs = $nm->getTabs();
        $notif_content = [];
+       $notif_nocontent = '';
 
        // Notification results per page
        $perpage = 20;
@@ -102,26 +97,22 @@ function notifications_content(App $a) {
                $notifs = $nm->introNotifs($all, $startrec, $perpage);
 
        // Get the network notifications
-       } else if (($a->argc > 1) && ($a->argv[1] == 'network')) {
-
+       } elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {
                $notif_header = L10n::t('Network Notifications');
                $notifs = $nm->networkNotifs($show, $startrec, $perpage);
 
        // Get the system notifications
-       } else if (($a->argc > 1) && ($a->argv[1] == 'system')) {
-
+       } elseif (($a->argc > 1) && ($a->argv[1] == 'system')) {
                $notif_header = L10n::t('System Notifications');
                $notifs = $nm->systemNotifs($show, $startrec, $perpage);
 
        // Get the personal notifications
-       } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) {
-
+       } elseif (($a->argc > 1) && ($a->argv[1] == 'personal')) {
                $notif_header = L10n::t('Personal Notifications');
                $notifs = $nm->personalNotifs($show, $startrec, $perpage);
 
        // Get the home notifications
-       } else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
-
+       } elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
                $notif_header = L10n::t('Home Notifications');
                $notifs = $nm->homeNotifs($show, $startrec, $perpage);
 
@@ -129,7 +120,6 @@ function notifications_content(App $a) {
 
 
        // Set the pager
-       $a->set_pager_total($notifs['total']);
        $a->set_pager_itemspage($perpage);
 
        // Add additional informations (needed for json output)
@@ -144,8 +134,7 @@ function notifications_content(App $a) {
        $notif_tpl = get_markup_template('notifications.tpl');
 
        // Process the data for template creation
-       if($notifs['ident'] === 'introductions') {
-
+       if ($notifs['ident'] === 'introductions') {
                $sugg = get_markup_template('suggestions.tpl');
                $tpl = get_markup_template("intros.tpl");
 
@@ -164,16 +153,23 @@ function notifications_content(App $a) {
                        switch ($it['label']) {
                                case 'friend_suggestion':
                                        $notif_content[] = replace_macros($sugg, [
-                                               '$str_notifytype' => L10n::t('Notification type: '),
+                                               '$type' => $it['label'],
+                                               '$str_notifytype' => L10n::t('Notification type:'),
                                                '$notify_type' => $it['notify_type'],
                                                '$intro_id' => $it['intro_id'],
-                                               '$madeby' => L10n::t('suggested by %s', $it['madeby']),
-                                               '$contact_id' => $it['contact-id'],
+                                               '$lbl_madeby' => L10n::t('Suggested by:'),
+                                               '$madeby' => $it['madeby'],
+                                               '$madeby_url' => $it['madeby_url'],
+                                               '$madeby_zrl' => $it['madeby_zrl'],
+                                               '$madeby_addr' => $it['madeby_addr'],
+                                               '$contact_id' => $it['contact_id'],
                                                '$photo' => $it['photo'],
                                                '$fullname' => $it['name'],
                                                '$url' => $it['url'],
+                                               '$zrl' => $it['zrl'],
+                                               '$lbl_url' => L10n::t('Profile URL'),
+                                               '$addr' => $it['addr'],
                                                '$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''],
-                                               '$activity' => ['activity', L10n::t('Post a new friend activity'), $it['post_newfriend'], L10n::t('if applicable')],
 
                                                '$knowyou' => $it['knowyou'],
                                                '$approve' => L10n::t('Approve'),
@@ -191,10 +187,14 @@ function notifications_content(App $a) {
                                        $dfrn_tpl = get_markup_template('netfriend.tpl');
 
                                        $knowyou   = '';
+                                       $lbl_knowyou = '';
                                        $dfrn_text = '';
+                                       $helptext = '';
+                                       $helptext2 = '';
+                                       $helptext3 = '';
 
-                                       if($it['network'] === NETWORK_DFRN || $it['network'] === NETWORK_DIASPORA) {
-                                               if($it['network'] === NETWORK_DFRN) {
+                                       if ($it['network'] === NETWORK_DFRN || $it['network'] === NETWORK_DIASPORA) {
+                                               if ($it['network'] === NETWORK_DFRN) {
                                                        $lbl_knowyou = L10n::t('Claims to be known to you: ');
                                                        $knowyou = (($it['knowyou']) ? L10n::t('yes') : L10n::t('no'));
                                                        $helptext = L10n::t('Shall your connection be bidirectional or not?');
@@ -221,8 +221,9 @@ function notifications_content(App $a) {
 
                                        $header = $it["name"];
 
-                                       if ($it["addr"] != "")
+                                       if ($it["addr"] != "") {
                                                $header .= " <".$it["addr"].">";
+                                       }
 
                                        $header .= " (".ContactSelector::networkToName($it['network'], $it['url']).")";
 
@@ -233,8 +234,9 @@ function notifications_content(App $a) {
                                        }
 
                                        $notif_content[] = replace_macros($tpl, [
+                                               '$type' => $it['label'],
                                                '$header' => htmlentities($header),
-                                               '$str_notifytype' => L10n::t('Notification type: '),
+                                               '$str_notifytype' => L10n::t('Notification type:'),
                                                '$notify_type' => $it['notify_type'],
                                                '$dfrn_text' => $dfrn_text,
                                                '$dfrn_id' => $it['dfrn_id'],
@@ -252,7 +254,6 @@ function notifications_content(App $a) {
                                                '$gender' => $it['gender'],
                                                '$lbl_gender' => L10n::t('Gender:'),
                                                '$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''],
-                                               '$activity' => ['activity', L10n::t('Post a new friend activity'), $it['post_newfriend'], L10n::t('if applicable')],
                                                '$url' => $it['url'],
                                                '$zrl' => $it['zrl'],
                                                '$lbl_url' => L10n::t('Profile URL'),
@@ -271,12 +272,12 @@ function notifications_content(App $a) {
                        }
                }
 
-               if($notifs['total'] == 0)
+               if (count($notifs['notifications']) == 0) {
                        info(L10n::t('No introductions.') . EOL);
+               }
 
        // Normal notifications (no introductions)
        } else {
-
                // The template files we need in different cases for formatting the content
                $tpl_item_like = 'notifications_likes_item.tpl';
                $tpl_item_dislike = 'notifications_dislikes_item.tpl';
@@ -308,17 +309,13 @@ function notifications_content(App $a) {
                        ]);
                }
 
-               // It doesn't make sense to show the Show unread / Show all link visible if the user is on the
-               // "Show all" page and there are no notifications. So we will hide it.
-               if ($show == 0 || intval($show) && $notifs['total'] > 0) {
-                       $notif_show_lnk = [
-                               'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
-                               'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
-                       ];
-               }
+               $notif_show_lnk = [
+                       'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
+                       'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
+               ];
 
                // Output if there aren't any notifications available
-               if ($notifs['total'] == 0) {
+               if (count($notifs['notifications']) == 0) {
                        $notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
                }
        }
@@ -329,7 +326,7 @@ function notifications_content(App $a) {
                '$notif_content' => $notif_content,
                '$notif_nocontent' => $notif_nocontent,
                '$notif_show_lnk' => $notif_show_lnk,
-               '$notif_paginate' => paginate($a)
+               '$notif_paginate' => alt_pager($a, count($notif_content))
        ]);
 
        return $o;