From 2924969b308712888973c46a93c4c1a18b2fe84a Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 2 Oct 2021 18:32:56 +0000
Subject: [PATCH] Some more "q" calls replaced

---
 mod/events.php  | 18 +++---------------
 mod/message.php |  9 +++------
 mod/photos.php  | 17 ++++++-----------
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/mod/events.php b/mod/events.php
index ebb7d3f11..89da0c2c0 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -242,17 +242,11 @@ function events_content(App $a)
 	}
 
 	if ((DI::args()->getArgc() > 2) && (DI::args()->getArgv()[1] === 'ignore') && intval(DI::args()->getArgv()[2])) {
-		q("UPDATE `event` SET `ignore` = 1 WHERE `id` = %d AND `uid` = %d",
-			intval(DI::args()->getArgv()[2]),
-			intval(local_user())
-		);
+		DBA::update('event', ['ignore' => true], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
 	}
 
 	if ((DI::args()->getArgc() > 2) && (DI::args()->getArgv()[1] === 'unignore') && intval(DI::args()->getArgv()[2])) {
-		q("UPDATE `event` SET `ignore` = 0 WHERE `id` = %d AND `uid` = %d",
-			intval(DI::args()->getArgv()[2]),
-			intval(local_user())
-		);
+		DBA::update('event', ['ignore' => false], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
 	}
 
 	if ($a->getThemeInfoValue('events_in_profile')) {
@@ -444,13 +438,7 @@ function events_content(App $a)
 	}
 
 	if (($mode === 'edit' || $mode === 'copy') && $event_id) {
-		$r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($event_id),
-			intval(local_user())
-		);
-		if (DBA::isResult($r)) {
-			$orig_event = $r[0];
-		}
+		$orig_event = DBA::selectFirst('event', [], ['id' => $event_id, 'uid' => local_user()]);
 	}
 
 	// Passed parameters overrides anything found in the DB
diff --git a/mod/message.php b/mod/message.php
index 2f4fe0c1a..7324840a0 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -158,12 +158,9 @@ function message_content(App $a)
 
 			DI::baseUrl()->redirect('message/' . $conversation['id'] );
 		} else {
-			$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval(DI::args()->getArgv()[2]),
-				intval(local_user())
-			);
-			if (DBA::isResult($r)) {
-				$parent = $r[0]['parent-uri'];
+			$parentmail = DBA::selectFirst('mail', ['parent-uri'], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
+			if (DBA::isResult($parentmail)) {
+				$parent = $parentmail['parent-uri'];
 
 				if (!DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
 					notice(DI::l10n()->t('Conversation was not removed.'));
diff --git a/mod/photos.php b/mod/photos.php
index 209b9fb7b..55e8add60 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -200,12 +200,7 @@ function photos_post(App $a)
 			return; // NOTREACHED
 		}
 
-		$r = q("SELECT `album` FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
-			DBA::escape($album),
-			intval($page_owner_uid)
-		);
-
-		if (!DBA::isResult($r)) {
+		if (!DBA::exists('photo', ['album' => $album, 'uid' => $page_owner_uid])) {
 			notice(DI::l10n()->t('Album not found.'));
 			DI::baseUrl()->redirect('photos/' . $user['nickname'] . '/album');
 			return; // NOTREACHED
@@ -321,7 +316,7 @@ function photos_post(App $a)
 		}
 
 		if (!empty($_POST['rotate']) && (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) {
-			Logger::log('rotate');
+			Logger::notice('rotate');
 
 			$photo = Photo::getPhotoForUser($page_owner_uid, $resource_id);
 
@@ -681,7 +676,7 @@ function photos_post(App $a)
 
 	$type = Images::getMimeTypeBySource($src, $filename, $type);
 
-	Logger::log('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', Logger::DEBUG);
+	Logger::info('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes');
 
 	$maximagesize = DI::config()->get('system', 'maximagesize');
 
@@ -701,14 +696,14 @@ function photos_post(App $a)
 		return;
 	}
 
-	Logger::log('mod/photos.php: photos_post(): loading the contents of ' . $src , Logger::DEBUG);
+	Logger::info('loading the contents of ' . $src);
 
 	$imagedata = @file_get_contents($src);
 
 	$image = new Image($imagedata, $type);
 
 	if (!$image->isValid()) {
-		Logger::log('mod/photos.php: photos_post(): unable to process image' , Logger::DEBUG);
+		Logger::info('unable to process image');
 		notice(DI::l10n()->t('Unable to process image.'));
 		@unlink($src);
 		$foo = 0;
@@ -737,7 +732,7 @@ function photos_post(App $a)
 	$r = Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 
 	if (!$r) {
-		Logger::log('mod/photos.php: photos_post(): image store failed', Logger::DEBUG);
+		Logger::info('image store failed');
 		notice(DI::l10n()->t('Image upload failed.'));
 		return;
 	}