makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5434 from rubencm/ticket/15860

Browse source 
[ticket/15860] Fix format of backup files
This commit is contained in:
Marc Alexander 2018-11-10 17:01:34 +01:00
commit 65226168ee
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/acp/acp_database.php
View file

@ -203,7 +203,7 @@ class acp_database
$file = $request->variable('file', ''); $file = $request->variable('file', '');
$download = $request->variable('download', ''); $download = $request->variable('download', '');
if (!preg_match('#^backup_\d{10,}_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches)) if (!preg_match('#^backup_\d{10,}_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches))
{ {
trigger_error($user->lang['BACKUP_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['BACKUP_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
@ -402,7 +402,7 @@ class acp_database
{ {
while (($file = readdir($dh)) !== false) while (($file = readdir($dh)) !== false)
{ {
if (preg_match('#^backup_(\d{10,})_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches)) if (preg_match('#^backup_(\d{10,})_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches))
{ {
if (in_array($matches[2], $methods)) if (in_array($matches[2], $methods))
{ {

2
phpBB/includes/functions.php
View file

@ -115,7 +115,7 @@ function gen_rand_string_friendly($num_chars = 8)
*/ */
function unique_id() function unique_id()
{ {
return gen_rand_string(32); return strtolower(gen_rand_string(16));
} }
/** /**