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

Google Drive (second look)

Browse source
This commit is contained in:
RainLoop Team 2014-07-29 14:28:02 +04:00
parent eea55d4e0a
commit 7107104e1a
18 changed files with 507 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

28
rainloop/v/0.0.0/app/libraries/MailSo/Base/Http.php
View file

@ -449,8 +449,8 @@ class Http
$sNewUrl = $sUrl;
$oCurl = \curl_init($sUrl);
\curl_setopt_array($oCurl, array(
$aAddOptions = array(
CURLOPT_URL => $sUrl,
CURLOPT_HEADER => true,
CURLOPT_NOBODY => true,
@ -460,7 +460,14 @@ class Http
CURLOPT_FORBID_REUSE => false,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_TIMEOUT => 5
));
);
if (isset($aOptions[CURLOPT_HTTPHEADER]) && \is_array($aOptions[CURLOPT_HTTPHEADER]) && 0 < \count($aOptions[CURLOPT_HTTPHEADER]))
{
$aAddOptions[CURLOPT_HTTPHEADER] = $aOptions[CURLOPT_HTTPHEADER];
}
\curl_setopt_array($oCurl, $aAddOptions);
do
{
@ -514,11 +521,12 @@ class Http
* @param int $iTimeout = 10
* @param string $sProxy = ''
* @param string $sProxyAuth = ''
* @param string $sAuthorization = ''
*
* @return bool
*/
public function SaveUrlToFile($sUrl, $rFile, $sCustomUserAgent = 'MailSo Http User Agent (v1)', &$sContentType = '', &$iCode = 0,
$oLogger = null, $iTimeout = 10, $sProxy = '', $sProxyAuth = '')
$oLogger = null, $iTimeout = 10, $sProxy = '', $sProxyAuth = '', $sAuthorization = '')
{
if (!is_resource($rFile))
{
@ -530,6 +538,8 @@ class Http
return false;
}
$aHeaders = array();
$aOptions = array(
CURLOPT_URL => $sUrl,
CURLOPT_HEADER => false,
@ -547,6 +557,11 @@ class Http
$aOptions[CURLOPT_USERAGENT] = $sCustomUserAgent;
}
if (0 < \strlen($sAuthorization))
{
$aHeaders[] = 'Authorization '.$sAuthorization;
}
if (0 < \strlen($sProxy))
{
$aOptions[CURLOPT_PROXY] = $sProxy;
@ -556,6 +571,11 @@ class Http
}
}
if (0 < \count($aHeaders))
{
$aOptions[CURLOPT_HTTPHEADER] = $aHeaders;
}
if ($oLogger)
{
$oLogger->Write('cUrl: URL: '.$sUrl);