Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-25 18:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Save attachments as ...

Browse source
This commit is contained in:
RainLoop Team 2015-04-25 02:15:11 +04:00
parent f5f067f1f3
commit 48b91fb957
20 changed files with 687 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files.php
View file

@ -116,6 +116,17 @@ class Files extends \RainLoop\Providers\AbstractProvider
$this->oDriver->CloseAllOpenedFiles() : false;
}
/**
* @param \RainLoop\Model\Account $oAccount
* @param string $sKey
*
* @return string
*/
public function GenerateLocalFullFileName($oAccount, $sKey)
{
return $this->oDriver ? $this->oDriver->GenerateLocalFullFileName($oAccount, $sKey) : '';
}
/**
* @return bool
*/

27
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
View file

@ -25,6 +25,17 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
$this->sDataPath = \rtrim(\trim($sStoragePath), '\\/');
}
/**
* @param \RainLoop\Model\Account $oAccount
* @param string $sKey
*
* @return string
*/
public function GenerateLocalFullFileName($oAccount, $sKey)
{
return $this->generateFullFileName($oAccount, $sKey, true);
}
/**
* @param \RainLoop\Model\Account $oAccount
* @param string $sKey
@ -37,7 +48,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
$bResult = false;
if ($rSource)
{
$rOpenOutput = @\fopen($this->generateFileName($oAccount, $sKey, true), 'w+b');
$rOpenOutput = @\fopen($this->generateFullFileName($oAccount, $sKey, true), 'w+b');
if ($rOpenOutput)
{
$bResult = (false !== \MailSo\Base\Utils::MultipleStreamWriter($rSource, array($rOpenOutput)));
@ -57,7 +68,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
public function MoveUploadedFile($oAccount, $sKey, $sSource)
{
return @\move_uploaded_file($sSource,
$this->generateFileName($oAccount, $sKey, true));
$this->generateFullFileName($oAccount, $sKey, true));
}
/**
@ -72,7 +83,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
$mResult = false;
$bCreate = !!\preg_match('/[wac]/', $sOpenMode);
$sFileName = $this->generateFileName($oAccount, $sKey, $bCreate);
$sFileName = $this->generateFullFileName($oAccount, $sKey, $bCreate);
if ($bCreate || \file_exists($sFileName))
{
$mResult = @\fopen($sFileName, $sOpenMode);
@ -95,7 +106,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
public function GetFileName($oAccount, $sKey)
{
$mResult = false;
$sFileName = $this->generateFileName($oAccount, $sKey);
$sFileName = $this->generateFullFileName($oAccount, $sKey);
if (\file_exists($sFileName))
{
$mResult = $sFileName;
@ -113,7 +124,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
public function Clear($oAccount, $sKey)
{
$mResult = true;
$sFileName = $this->generateFileName($oAccount, $sKey);
$sFileName = $this->generateFullFileName($oAccount, $sKey);
if (\file_exists($sFileName))
{
if (isset($this->aResources[$sFileName]) && \is_resource($this->aResources[$sFileName]))
@ -136,7 +147,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
public function FileSize($oAccount, $sKey)
{
$mResult = false;
$sFileName = $this->generateFileName($oAccount, $sKey);
$sFileName = $this->generateFullFileName($oAccount, $sKey);
if (\file_exists($sFileName))
{
$mResult = \filesize($sFileName);
@ -153,7 +164,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
*/
public function FileExists($oAccount, $sKey)
{
return @\file_exists($this->generateFileName($oAccount, $sKey));
return @\file_exists($this->generateFullFileName($oAccount, $sKey));
}
/**
@ -198,7 +209,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
*
* @return string
*/
private function generateFileName($oAccount, $sKey, $bMkDir = false)
private function generateFullFileName($oAccount, $sKey, $bMkDir = false)
{
$sEmail = $sSubEmail = '';
if ($oAccount instanceof \RainLoop\Model\Account)

8
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/IFiles.php
View file

@ -4,6 +4,14 @@ namespace RainLoop\Providers\Files;
interface IFiles
{
/**
* @param \RainLoop\Model\Account $oAccount
* @param string $sKey
*
* @return string
*/
public function GenerateLocalFullFileName($oAccount, $sKey);
/**
* @param \RainLoop\Model\Account $oAccount
* @param string $sKey

5
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php
View file

@ -24,9 +24,8 @@ class OwnCloudSuggestions implements \RainLoop\Providers\Suggestions\ISuggestion
try
{
if ('' === $sQuery || !$oAccount || !\RainLoop\Utils::IsOwnCloud() ||
!\class_exists('\\OCP\\Contacts') || !\OCP\Contacts::isEnabled() ||
!\class_exists('\\OCP\\User') || !\OCP\User::isLoggedIn()
if ('' === $sQuery || !$oAccount || !\RainLoop\Utils::IsOwnCloudLoggedIn() ||
!\class_exists('\\OCP\\Contacts') || !\OCP\Contacts::isEnabled()
)
{
return $aResult;