X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=fce4cbcf01b5b2a37a8ef7a9d66d08323b612205;hb=f84c696925467f4091a6ac2e27f97d6a921c1643;hp=178d297a422e8d4547bb060794109a898bd63beb;hpb=3900cf9874da6995a79c3f9295dc0e1833756256;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index 178d297a42..fce4cbcf01 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -22,7 +22,7 @@
 use Friendica\App;
 use Friendica\Content\ForumManager;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -175,20 +175,20 @@ function ping_init(App $a)
 			}
 		}
 
-		$intros1 = q(
+		$intros1 = DBA::toArray(DBA::p(
 			"SELECT  `intro`.`id`, `intro`.`datetime`,
-			`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
-			FROM `intro` INNER JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-			WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`fid` != 0",
-			intval(local_user())
-		);
-		$intros2 = q(
+			`contact`.`name`, `contact`.`url`, `contact`.`photo`
+			FROM `intro` INNER JOIN `contact` ON `intro`.`suggest-cid` = `contact`.`id`
+			WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`suggest-cid` != 0",
+			local_user()
+		));
+		$intros2 = DBA::toArray(DBA::p(
 			"SELECT `intro`.`id`, `intro`.`datetime`,
 			`contact`.`name`, `contact`.`url`, `contact`.`photo`
 			FROM `intro` INNER JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
-			WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`fid` = 0 OR `intro`.`fid` IS NULL)",
-			intval(local_user())
-		);
+			WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`suggest-cid` = 0 OR `intro`.`suggest-cid` IS NULL)",
+			local_user()
+		));
 
 		$intro_count = count($intros1) + count($intros2);
 		$intros = $intros1 + $intros2;
@@ -196,7 +196,7 @@ function ping_init(App $a)
 		$myurl = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
 		$mail_count = DBA::count('mail', ["`uid` = ? AND NOT `seen` AND `from-url` != ?", local_user(), $myurl]);
 
-		if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && is_site_admin()) {
+		if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && $a->isSiteAdmin()) {
 			$regs = Friendica\Model\Register::getPending();
 
 			if (DBA::isResult($regs)) {
@@ -397,17 +397,17 @@ function ping_get_notifications($uid)
 	$quit    = false;
 
 	do {
-		$r = q(
+		$r = DBA::toArray(DBA::p(
 			"SELECT `notify`.*, `post`.`visible`, `post`.`deleted`
 			FROM `notify` LEFT JOIN `post` ON `post`.`uri-id` = `notify`.`uri-id`
-			WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
-			AND NOT (`notify`.`type` IN (%d, %d))
-			AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50",
-			intval($uid),
-			intval(Notification\Type::INTRO),
-			intval(Notification\Type::MAIL),
-			intval($offset)
-		);
+			WHERE `notify`.`uid` = ? AND `notify`.`msg` != ''
+			AND NOT (`notify`.`type` IN (?, ?))
+			AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT ?, 50",
+			$uid,
+			Notification\Type::INTRO,
+			Notification\Type::MAIL,
+			$offset
+		));
 
 		if (!$r && !$seen) {
 			$seen = true;