mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-01 14:30:32 +02:00
Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (666 commits) [ticket/11077] Remove code from old global announcements system [ticket/11189] Replace DEBUG_EXTRA with DEBUG [ticket/11189] Always log critical errors when in cron or in image output [ticket/11187] Added a blank array to fix errors in functional tests [ticket/10780] Make L_COLON available in the installer. [ticket/11183] Remove $load_extensions and weird dl() calls [ticket/10970] Added extra documentation to parse_dynamic_path. [ticket/10939] Added documentation for phpbb_request::file [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON} [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [ticket/10172] Show prosilver birthday list even if there are no birthdays. ... Conflicts: phpBB/common.php phpBB/download/file.php phpBB/includes/db/dbal.php phpBB/includes/db/firebird.php phpBB/includes/db/mssql.php phpBB/includes/db/mssql_odbc.php phpBB/includes/db/mssqlnative.php phpBB/includes/db/mysql.php phpBB/includes/db/mysqli.php phpBB/includes/db/oracle.php phpBB/includes/db/postgres.php phpBB/includes/db/sqlite.php phpBB/includes/extension/manager.php phpBB/install/database_update.php
This commit is contained in:
@@ -78,7 +78,7 @@ class phpbb_test_case_helpers
|
||||
include($test_config);
|
||||
|
||||
$config = array_merge($config, array(
|
||||
'dbms' => $dbms,
|
||||
'dbms' => 'phpbb_db_driver_' . $dbms,
|
||||
'dbhost' => $dbhost,
|
||||
'dbport' => $dbport,
|
||||
'dbname' => $dbname,
|
||||
@@ -115,4 +115,112 @@ class phpbb_test_case_helpers
|
||||
|
||||
return $config;
|
||||
}
|
||||
|
||||
/**
|
||||
* Recursive directory copying function
|
||||
*
|
||||
* @param string $source
|
||||
* @param string $dest
|
||||
* @return array list of files copied
|
||||
*/
|
||||
public function copy_dir($source, $dest)
|
||||
{
|
||||
$source = (substr($source, -1) == '/') ? $source : $source . '/';
|
||||
$dest = (substr($dest, -1) == '/') ? $dest : $dest . '/';
|
||||
|
||||
$copied_files = array();
|
||||
|
||||
if (!is_dir($dest))
|
||||
{
|
||||
$this->makedirs($dest);
|
||||
}
|
||||
|
||||
$files = scandir($source);
|
||||
foreach ($files as $file)
|
||||
{
|
||||
if ($file == '.' || $file == '..')
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (is_dir($source . $file))
|
||||
{
|
||||
$created_dir = false;
|
||||
if (!is_dir($dest . $file))
|
||||
{
|
||||
$created_dir = true;
|
||||
$this->makedirs($dest . $file);
|
||||
}
|
||||
|
||||
$copied_files = array_merge($copied_files, self::copy_dir($source . $file, $dest . $file));
|
||||
|
||||
if ($created_dir)
|
||||
{
|
||||
$copied_files[] = $dest . $file;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!file_exists($dest . $file))
|
||||
{
|
||||
copy($source . $file, $dest . $file);
|
||||
|
||||
$copied_files[] = $dest . $file;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $copied_files;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove files/directories that are listed in an array
|
||||
* Designed for use with $this->copy_dir()
|
||||
*
|
||||
* @param array $file_list
|
||||
*/
|
||||
public function remove_files($file_list)
|
||||
{
|
||||
foreach ($file_list as $file)
|
||||
{
|
||||
if (is_dir($file))
|
||||
{
|
||||
rmdir($file);
|
||||
}
|
||||
else
|
||||
{
|
||||
unlink($file);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Empty directory (remove any subdirectories/files below)
|
||||
*
|
||||
* @param array $file_list
|
||||
*/
|
||||
public function empty_dir($path)
|
||||
{
|
||||
$path = (substr($path, -1) == '/') ? $path : $path . '/';
|
||||
|
||||
$files = scandir($path);
|
||||
foreach ($files as $file)
|
||||
{
|
||||
if ($file == '.' || $file == '..')
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (is_dir($path . $file))
|
||||
{
|
||||
$this->empty_dir($path . $file);
|
||||
|
||||
rmdir($path . $file);
|
||||
}
|
||||
else
|
||||
{
|
||||
unlink($path . $file);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user