Update for PHP 8.2

1 files changed, 20 insertions, 20 deletions

diff --git a/inc/util.inc.php b/inc/util.inc.php
index aaf46c6..0e06e6a 100644
--- a/inc/util.inc.php
+++ b/inc/util.inc.php
@@ -59,7 +59,7 @@ SADFACE;
 	public static function redirect($location = false)
 	{
 		if ($location === false) {
-			$location = preg_replace('/(&|\?)message\[\]\=[^&]*/', '\1', $_SERVER['REQUEST_URI']);
+			$location = preg_replace('/([&?])message\[]=[^&]*/', '\1', $_SERVER['REQUEST_URI']);
 		}
 		Session::save();
 		$messages = Message::toRequest();
@@ -113,9 +113,9 @@ SADFACE;
 	public static function markup($string)
 	{
 		$string = htmlspecialchars($string);
-		$string = preg_replace('#(^|[\n \-_/\.])\*(.+?)\*($|[ \-_/\.\!\?,:])#is', '$1<b>$2</b>$3', $string);
-		$string = preg_replace('#(^|[\n \-\*/\.])_(.+?)_($|[ \-\*/\.\!\?,:])#is', '$1<u>$2</u>$3', $string);
-		$string = preg_replace('#(^|[\n \-_\*\.])/(.+?)/($|[ \-_\*\.\!\?,:])#is', '$1<i>$2</i>$3', $string);
+		$string = preg_replace('#(^|[\n \-_/.])\*(.+?)\*($|[ \-_/.!?,:])#is', '$1<b>$2</b>$3', $string);
+		$string = preg_replace('#(^|[\n \-*/.])_(.+?)_($|[ \-*/.!?,:])#is', '$1<u>$2</u>$3', $string);
+		$string = preg_replace('#(^|[\n \-_*.])/(.+?)/($|[ \-_*.!?,:])#is', '$1<i>$2</i>$3', $string);
 		return nl2br($string);
 	}
 
@@ -123,11 +123,11 @@ SADFACE;
 	 * Convert given number to human readable file size string.
 	 * Will append Bytes, KiB, etc. depending on magnitude of number.
 	 * 
-	 * @param type $bytes numeric value of the filesize to make readable
-	 * @param type $decimals number of decimals to show, -1 for automatic
-	 * @return type human readable string representing the given filesize
+	 * @param int $bytes numeric value of the filesize to make readable
+	 * @param int $decimals number of decimals to show, -1 for automatic
+	 * @return string human-readable string representing the given filesize
 	 */
-	public static function readableFileSize($bytes, $decimals = -1)
+	public static function readableFileSize(int $bytes, int $decimals = -1): string
 	{
 		static $sz = array('Byte', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB');
 		$factor = floor((strlen($bytes) - 1) / 3);
@@ -139,20 +139,20 @@ SADFACE;
 		return sprintf("%.{$decimals}f ", $bytes / pow(1024, $factor)) . $sz[$factor];
 	}
 
-	public static function sanitizeFilename($name)
+	public static function sanitizeFilename(string $name): string
 	{
 		return preg_replace('/[^a-zA-Z0-9_\-]+/', '_', $name);
 	}
 
-	public static function safePath($path, $prefix = '')
+	public static function safePath(string $path, string $prefix = ''): ?string
 	{
 		if (empty($path))
-			return false;
+			return null;
 		$path = trim($path);
-		if ($path{0} == '/' || preg_match('/[\x00-\x19\?\*]/', $path))
-			return false;
+		if ($path[0] == '/' || preg_match('/[\x00-\x19?*]/', $path))
+			return null;
 		if (strpos($path, '..') !== false)
-			return false;
+			return null;
 		if (substr($path, 0, 2) !== './')
 			$path = "./$path";
 		if (empty($prefix))
@@ -160,7 +160,7 @@ SADFACE;
 		if (substr($prefix, 0, 2) !== './')
 			$prefix = "./$prefix";
 		if (substr($path, 0, strlen($prefix)) !== $prefix)
-			return false;
+			return null;
 		return $path;
 	}
 
@@ -249,14 +249,14 @@ SADFACE;
 	/**
 	 * Send a file to user for download.
 	 *
-	 * @param type $file path of local file
-	 * @param type $name name of file to send to user agent
-	 * @param type $delete delete the file when done?
-	 * @return boolean false: file could not be opened.
+	 * @param string $file path of local file
+	 * @param string $name name of file to send to user agent
+	 * @param bool $delete delete the file when done?
+	 * @return bool false: file could not be opened.
 	 *		true: error while reading the file
 	 *		- on success, the function does not return
 	 */
-	public static function sendFile($file, $name, $delete = false)
+	public static function sendFile(string $file, string $name, bool $delete = false): bool
 	{
 		while ((@ob_get_level()) > 0)
 			@ob_end_clean();