From 6c808abcfc9a52f8f331f9bfb58a455a90d1970d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 31 Jan 2022 09:49:00 +0100
Subject: PHP 8.1 band-aid

---
 include/text.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index aea8790fc..b76175a06 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1492,6 +1492,10 @@ function day_translate($s) {
  * @return string
  */
 function normalise_link($url) {
+	if (!$url) {
+		return EMPTY_STR;
+	}
+
 	$ret = str_replace(array('https:', '//www.'), array('http:', '//'), $url);
 
 	return(rtrim($ret, '/'));
-- 
cgit v1.2.3


From eb207898219937435f5735eb96fe32e5b2d489f0 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Tue, 1 Feb 2022 10:01:56 +0000
Subject: allow zotfinger to recurse through all known hublocs if the one we
 got does not exist (404) or got removed (410). add functions for updating
 tables from array and deleting hublocs.

---
 include/text.php | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index b76175a06..3b6039c31 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3592,6 +3592,45 @@ function create_table_from_array($table, $arr, $binary_fields = []) {
 	return $r;
 }
 
+
+function update_table_from_array($table, $arr, $where, $binary_fields = []) {
+
+	if (! ($arr && $table)) {
+		return false;
+	}
+
+	$columns = db_columns($table);
+
+	$clean = [];
+	foreach ($arr as $k => $v) {
+		if (! in_array($k, $columns)) {
+			continue;
+		}
+
+		$matches = false;
+		if (preg_match('/([^a-zA-Z0-9\-\_\.])/', $k, $matches)) {
+			return false;
+		}
+		if (in_array($k, $binary_fields)) {
+			$clean[$k] = dbescbin($v);
+		} else {
+			$clean[$k] = dbesc($v);
+		}
+	}
+
+	$sql = "UPDATE " . TQUOT . $table . TQUOT . " SET ";
+
+	foreach ($clean as $k => $v) {
+		$sql .= TQUOT . $k . TQUOT . ' = "' . $v . '",';
+	}
+
+	$sql = rtrim($sql,',');
+
+	$r = dbq($sql . " WHERE " . $where);
+
+    return $r;
+}
+
 function share_shield($m) {
 	return str_replace($m[1],'!=+=+=!' . base64url_encode($m[1]) . '=+!=+!=',$m[0]);
 }
-- 
cgit v1.2.3


From d8372f84339b29ef05f92d452ec196df32087f4a Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 2 Feb 2022 12:44:39 +0000
Subject: more PHP 8.1 deprecated warnings

---
 include/text.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index 3b6039c31..2e5e728a0 100644
--- a/include/text.php
+++ b/include/text.php
@@ -417,6 +417,9 @@ function xmlify($str) {
 
 	//$buffer = '';
 
+	if (!$str)
+		return EMPTY_STR;
+
 	if(is_array($str)) {
 
 		// allow to fall through so we ge a PHP error, as the log statement will
@@ -482,6 +485,9 @@ function unxmlify($s) {
 	return $ret;
 */
 
+	if (!$s)
+		return EMPTY_STR;
+
 	if(is_array($s)) {
 
 		// allow to fall through so we ge a PHP error, as the log statement will
-- 
cgit v1.2.3


From 1740ae2104ff734edd45f6c0f1273d561cc4a69c Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 2 Feb 2022 17:58:29 +0000
Subject: more PHP 8.1 deprecated warnings

---
 include/text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index 2e5e728a0..29a2ab3b1 100644
--- a/include/text.php
+++ b/include/text.php
@@ -846,7 +846,7 @@ function activity_match($haystack,$needle) {
 
 	if($needle) {
 		foreach($needle as $n) {
-			if(($haystack === $n) || (strtolower(basename($n)) === strtolower(basename($haystack)))) {
+			if(($haystack === $n) || (strtolower(basename((string)$n)) === strtolower(basename((string)$haystack)))) {
 				return true;
 			}
 		}
-- 
cgit v1.2.3