diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-11-10 17:01:34 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-11-10 17:01:34 +0100 |
| commit | 65226168ee2841dbe7f6934b16ff38f0a27ac09b (patch) | |
| tree | 8add3b4f9a09657d15176600e8d2dbe44e4bfbfe | |
| parent | 02fd679b2623f7435c1e4842c4c8cbf05099cd21 (diff) | |
| parent | 31703585cb2faf9ca0c2072ebabdc2b3ec62e146 (diff) | |
| download | forums-65226168ee2841dbe7f6934b16ff38f0a27ac09b.tar forums-65226168ee2841dbe7f6934b16ff38f0a27ac09b.tar.gz forums-65226168ee2841dbe7f6934b16ff38f0a27ac09b.tar.bz2 forums-65226168ee2841dbe7f6934b16ff38f0a27ac09b.tar.xz forums-65226168ee2841dbe7f6934b16ff38f0a27ac09b.zip | |
Merge pull request #5434 from rubencm/ticket/15860
[ticket/15860] Fix format of backup files
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index b98756a34b..19c4f6e4f1 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -203,7 +203,7 @@ class acp_database $file = $request->variable('file', ''); $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); } @@ -402,7 +402,7 @@ class acp_database { 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)) { diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 3fec88a354..99f65a0e92 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -115,7 +115,7 @@ function gen_rand_string_friendly($num_chars = 8) */ function unique_id() { - return gen_rand_string(32); + return strtolower(gen_rand_string(16)); } /** |