X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fnotifications.php;h=145c38435017b0d9a5c1003ffa6fa65e2016a4d6;hb=4bb45f611f1a43294859dae1c81bf0aff923cf20;hp=b113be030d8337cc95f19d744e4f9a57f2671443;hpb=6cf50a14fae25210a0cdb617c29d549abcfde9ac;p=friendica.git

diff --git a/mod/notifications.php b/mod/notifications.php
index b113be030d..145c384350 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -3,13 +3,15 @@
  * @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\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 function notifications_post(App $a)
 {
@@ -24,9 +26,9 @@ function notifications_post(App $a)
 	}
 
 	if ($request_id) {
-		$intro = dba::selectFirst('intro', ['id', 'contact-id', 'fid'], ['id' => $request_id, 'uid' => local_user()]);
+		$intro = DBA::selectFirst('intro', ['id', 'contact-id', 'fid'], ['id' => $request_id, 'uid' => local_user()]);
 
-		if (DBM::is_result($intro)) {
+		if (DBA::isResult($intro)) {
 			$intro_id = $intro['id'];
 			$contact_id = $intro['contact-id'];
 		} else {
@@ -40,20 +42,20 @@ function notifications_post(App $a)
 		$fid = $intro['fid'];
 
 		if ($_POST['submit'] == L10n::t('Discard')) {
-			dba::delete('intro', ['id' => $intro_id]);
+			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
 				$condition = ['id' => $contact_id, 'uid' => local_user(),
 					'self' => false, 'blocked' => true, 'pending' => true];
-				dba::delete('contact', $condition);
+				DBA::delete('contact', $condition);
 			}
 			goaway('notifications/intros');
 		}
 
 		if ($_POST['submit'] == L10n::t('Ignore')) {
-			dba::update('intro', ['ignore' => true], ['id' => $intro_id]);
+			DBA::update('intro', ['ignore' => true], ['id' => $intro_id]);
 			goaway('notifications/intros');
 		}
 	}
@@ -131,6 +133,10 @@ function notifications_content(App $a)
 
 	$notif_tpl = get_markup_template('notifications.tpl');
 
+	if (!isset($notifs['ident'])) {
+		logger('Missing data in notifs: ' . System::callstack(20), LOGGER_DEBUG);
+	}
+
 	// Process the data for template creation
 	if ($notifs['ident'] === 'introductions') {
 		$sugg = get_markup_template('suggestions.tpl');
@@ -180,8 +186,8 @@ function notifications_content(App $a)
 
 				// Normal connection requests
 				default:
-					$friend_selected = (($it['network'] !== NETWORK_OSTATUS) ? ' checked="checked" ' : ' disabled ');
-					$fan_selected = (($it['network'] === NETWORK_OSTATUS) ? ' checked="checked" disabled ' : '');
+					$friend_selected = (($it['network'] !== Protocol::OSTATUS) ? ' checked="checked" ' : ' disabled ');
+					$fan_selected = (($it['network'] === Protocol::OSTATUS) ? ' checked="checked" disabled ' : '');
 					$dfrn_tpl = get_markup_template('netfriend.tpl');
 
 					$knowyou   = '';
@@ -191,8 +197,8 @@ function notifications_content(App $a)
 					$helptext2 = '';
 					$helptext3 = '';
 
-					if ($it['network'] === NETWORK_DFRN || $it['network'] === NETWORK_DIASPORA) {
-						if ($it['network'] === NETWORK_DFRN) {
+					if ($it['network'] === Protocol::DFRN || $it['network'] === Protocol::DIASPORA) {
+						if ($it['network'] === Protocol::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?');
@@ -214,7 +220,7 @@ function notifications_content(App $a)
 						'$approve_as2' => $helptext2,
 						'$approve_as3' => $helptext3,
 						'$as_friend' => L10n::t('Friend'),
-						'$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
+						'$as_fan' => (($it['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
 					]);
 
 					$header = $it["name"];
@@ -225,7 +231,7 @@ function notifications_content(App $a)
 
 					$header .= " (".ContactSelector::networkToName($it['network'], $it['url']).")";
 
-					if ($it['network'] != NETWORK_DIASPORA) {
+					if ($it['network'] != Protocol::DIASPORA) {
 						$discard = L10n::t('Discard');
 					} else {
 						$discard = '';