github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-20 21:33:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Minor improvements (#735)

Browse source
This commit is contained in:
Roman Kelesidis 2023-05-29 16:23:28 +07:00 • committed by GitHub
commit 8f2150a986
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/admin_smilies.php
View file

@ -229,7 +229,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) {
case 'save': case 'save':
$smile_code = isset($_POST['smile_code']) ? trim($_POST['smile_code']) : trim($_GET['smile_code']); $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 = 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_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']; $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': case 'savenew':
$smile_code = $_POST['smile_code'] ?? $_GET['smile_code']; $smile_code = $_POST['smile_code'] ?? $_GET['smile_code'];
$smile_url = $_POST['smile_url'] ?? $_GET['smile_url']; $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_emotion = $_POST['smile_emotion'] ?? $_GET['smile_emotion'];
$smile_code = trim($smile_code); $smile_code = trim($smile_code);
$smile_url = trim($smile_url); $smile_url = trim($smile_url);

8
common.php
View file

@ -250,16 +250,16 @@ function bb_mkdir($path, $mode = 0777)
return $dir; return $dir;
} }
function mkdir_rec($path, $mode) function mkdir_rec($path, $mode): bool
{ {
if (is_dir($path)) { 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)); return (is_string($id) && preg_match('#^[a-zA-Z0-9]{' . $length . '}$#', $id));
} }

26
library/includes/functions.php
View file

@ -109,7 +109,7 @@ function get_last_read($topic_id = 0, $forum_id = 0)
return max($t, $f, $user->data['user_lastvisit']); 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)); return (!IS_GUEST && $ref > get_last_read($topic_id, $forum_id));
} }
@ -951,34 +951,12 @@ function get_db_stat($mode)
function clean_username($username) function clean_username($username)
{ {
$username = mb_substr(htmlspecialchars(str_replace("\'", "'", trim($username))), 0, 25, 'UTF-8'); $username = mb_substr(htmlspecialchars(str_replace("\'", "'", trim($username))), 0, 25, 'UTF-8');
$username = bb_rtrim($username, "\\"); $username = rtrim($username, "\\");
$username = str_replace("'", "\'", $username); $username = str_replace("'", "\'", $username);
return $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. // 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) function get_userdata($u, $force_name = false, $allow_guest = false)
{ {