composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 02:28:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2366 remove DBBackup::CreateZip

Browse Source 
* remove method and its dependencies
* create \utils::GetFileMimeType
* in \DBBackup::DownloadBackup mime type isn't hardcoded anymore
This commit is contained in:
Pierre Goiffon
2019-07-19 11:37:50 +02:00
parent ee2e109769
commit dc868b16ab
2 changed files with 436 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
application/utils.inc.php
View File

@@ -384,24 +384,8 @@ class utils
$sName = is_null($sIndex) ? $aFileInfo['name'] : $aFileInfo['name'][$sIndex];
$doc_content = file_get_contents($sTmpName);
if (function_exists('finfo_file'))
{
// as of PHP 5.3 the fileinfo extension is bundled within PHP
// in which case we don't trust the mime type provided by the browser
$rInfo = @finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension
if ($rInfo !== false)
{
$sType = @finfo_file($rInfo, $sTmpName);
if ( ($sType !== false)
&& is_string($sType)
&& (strlen($sType)>0))
{
$sMimeType = $sType;
}
}
@finfo_close($rInfo);
}
$oDocument = new ormDocument($doc_content, $sMimeType, $sName);
$sMimeType = self::GetFileMimeType($sTmpName);
$oDocument = new ormDocument($doc_content, $sMimeType, $sName);
break;
case UPLOAD_ERR_NO_FILE:
@@ -2045,4 +2029,38 @@ class utils
{
return ITOP_REVISION === 'svn';
}
/**
* @see https://php.net/manual/en/function.finfo-file.php
*
* @param string $sFilePath file full path
* @param string $sDefaultMimeType
*
* @return string mime type, defaults to <code>application/octet-stream</code>
* @uses finfo_file in FileInfo extension (bundled in PHP since version 5.3)
* @since 2.7.0 N°2366
*/
public static function GetFileMimeType($sFilePath, $sDefaultMimeType = 'application/octet-stream')
{
if (!function_exists('finfo_file'))
{
return $sDefaultMimeType;
}
$sMimeType = $sDefaultMimeType;
$rInfo = @finfo_open(FILEINFO_MIME_TYPE);
if ($rInfo !== false)
{
$sType = @finfo_file($rInfo, $sFilePath);
if (($sType !== false)
&& is_string($sType)
&& ($sType !== ''))
{
$sMimeType = $sType;
}
}
@finfo_close($rInfo);
return $sMimeType;
}
}

988
setup/backup.class.inc.php
View File

File diff suppressed because it is too large Load Diff