github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-14 18:48:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Minor adjustments #572

Browse source 
* Replaced bb_ltrim method with native
* Replaced bb_rtrim method with native
* Simplified make_rand_str method
This commit is contained in:
Roman Kelesidis 2023-03-08 10:29:56 +07:00
commit 90d1fc4236
3 changed files with 15 additions and 31 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':
$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);

18
common.php
View file

@ -344,13 +344,19 @@ function str_compact($str)
return preg_replace('#\s+#u', ' ', trim($str));
}
function make_rand_str($len = 10)
/**
* Generate a "random" alphanumeric string.
*
* Should not be considered sufficient for cryptography, etc.
*
* @param int|string $length
* @return string
*/
function make_rand_str($length = 10): string
{
$str = '';
while (strlen($str) < $len) {
$str .= str_shuffle(preg_replace('#[^0-9a-zA-Z]#', '', password_hash(uniqid(mt_rand(), true), PASSWORD_BCRYPT)));
}
return substr($str, 0, $len);
$pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
return substr(str_shuffle(str_repeat($pool, (int)$length)), 0, $length);
}
function array_deep(&$var, $fn, $one_dimensional = false, $array_only = false)

24
library/includes/functions.php
View file

@ -926,34 +926,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)
{