From 8f2150a9865c9cc63f1bcfb0042e297128015eb2 Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@gmail.com>
Date: Mon, 29 May 2023 16:23:28 +0700
Subject: [PATCH] Minor improvements (#735)

---
 admin/admin_smilies.php        |  4 ++--
 common.php                     |  8 ++++----
 library/includes/functions.php | 26 ++------------------------
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/admin/admin_smilies.php b/admin/admin_smilies.php
index 6011617b3..a5dcb984c 100644
--- a/admin/admin_smilies.php
+++ b/admin/admin_smilies.php
@@ -229,7 +229,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) {
         case 'save':
             $smile_code = isset($_POST['smile_code']) ? trim($_POST['smile_code']) : trim($_GET['smile_code']);
             $smile_url = isset($_POST['smile_url']) ? trim($_POST['smile_url']) : trim($_GET['smile_url']);
-            $smile_url = bb_ltrim(basename($smile_url), "'");
+            $smile_url = ltrim(basename($smile_url), "'");
             $smile_emotion = isset($_POST['smile_emotion']) ? trim($_POST['smile_emotion']) : trim($_GET['smile_emotion']);
             $smile_id = isset($_POST['smile_id']) ? (int)$_POST['smile_id'] : (int)$_GET['smile_id'];
 
@@ -256,7 +256,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) {
         case 'savenew':
             $smile_code = $_POST['smile_code'] ?? $_GET['smile_code'];
             $smile_url = $_POST['smile_url'] ?? $_GET['smile_url'];
-            $smile_url = bb_ltrim(basename($smile_url), "'");
+            $smile_url = ltrim(basename($smile_url), "'");
             $smile_emotion = $_POST['smile_emotion'] ?? $_GET['smile_emotion'];
             $smile_code = trim($smile_code);
             $smile_url = trim($smile_url);
diff --git a/common.php b/common.php
index 47742eb42..92796a1ef 100644
--- a/common.php
+++ b/common.php
@@ -250,16 +250,16 @@ function bb_mkdir($path, $mode = 0777)
     return $dir;
 }
 
-function mkdir_rec($path, $mode)
+function mkdir_rec($path, $mode): bool
 {
     if (is_dir($path)) {
-        return ($path !== '.' && $path !== '..') ? is_writable($path) : false;
+        return ($path !== '.' && $path !== '..') && is_writable($path);
     }
 
-    return mkdir_rec(dirname($path), $mode) ? mkdir($path, $mode) : false;
+    return mkdir_rec(dirname($path), $mode) && mkdir($path, $mode);
 }
 
-function verify_id($id, $length)
+function verify_id($id, $length): bool
 {
     return (is_string($id) && preg_match('#^[a-zA-Z0-9]{' . $length . '}$#', $id));
 }
diff --git a/library/includes/functions.php b/library/includes/functions.php
index b6372162d..ab25e86c6 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -109,7 +109,7 @@ function get_last_read($topic_id = 0, $forum_id = 0)
     return max($t, $f, $user->data['user_lastvisit']);
 }
 
-function is_unread($ref, $topic_id = 0, $forum_id = 0)
+function is_unread($ref, $topic_id = 0, $forum_id = 0): bool
 {
     return (!IS_GUEST && $ref > get_last_read($topic_id, $forum_id));
 }
@@ -951,34 +951,12 @@ function get_db_stat($mode)
 function clean_username($username)
 {
     $username = mb_substr(htmlspecialchars(str_replace("\'", "'", trim($username))), 0, 25, 'UTF-8');
-    $username = bb_rtrim($username, "\\");
+    $username = rtrim($username, "\\");
     $username = str_replace("'", "\'", $username);
 
     return $username;
 }
 
-function bb_ltrim($str, $charlist = false)
-{
-    if ($charlist === false) {
-        return ltrim($str);
-    }
-
-    $str = ltrim($str, $charlist);
-
-    return $str;
-}
-
-function bb_rtrim($str, $charlist = false)
-{
-    if ($charlist === false) {
-        return rtrim($str);
-    }
-
-    $str = rtrim($str, $charlist);
-
-    return $str;
-}
-
 // Get Userdata, $u can be username or user_id. If $force_name is true, the username will be forced.
 function get_userdata($u, $force_name = false, $allow_guest = false)
 {