From e846c4fbdc443766bab83ae5a3dbbdd4e1270755 Mon Sep 17 00:00:00 2001 From: lutranf Date: Tue, 23 Dec 2014 16:43:41 +0100 Subject: [PATCH] fix Mime type method (no HEAD http request) --- inc/databap.php | 35 ++--------------------------------- inc/toolbox.php | 3 ++- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/inc/databap.php b/inc/databap.php index fbd5654..c4b538c 100755 --- a/inc/databap.php +++ b/inc/databap.php @@ -402,35 +402,7 @@ class Databap extends PhpObject public function goLive() { - $sUrl = 'http://img-9gag-ftw.9cache.com/photo/a5dmY7G_700b.jpg'; - $asResult = array(); - - $oCurl = curl_init($sUrl); - curl_setopt($oCurl, CURLOPT_RETURNTRANSFER, true); - curl_setopt($oCurl, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($oCurl, CURLOPT_HEADER, true); - //curl_setopt($oCurl, CURLOPT_NOBODY, true); - curl_setopt($oCurl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); - curl_setopt($oCurl, CURLOPT_SSL_VERIFYPEER, false); - curl_exec($oCurl); - $asResult[] = 'curl: '.curl_getinfo($oCurl, CURLINFO_CONTENT_TYPE); - curl_close($oCurl); - - $asResult[] = 'get_headers: '.print_r(get_headers($sUrl, 1), true); - - stream_context_set_default(array('http' => array('method' => 'HEAD'))); - $asResult[] = 'get_headers HEAD: '.print_r(get_headers($sUrl, 1), true); - - file_get_contents($sUrl); - $asResult[] = '$http_response_header: '.print_r($http_response_header, true); - - $size = getimagesize($sUrl); - $asResult[] = 'getimagesize: '.$size['mime']; - - $oFileInfo = new finfo(FILEINFO_MIME); - $asResult[] = 'finfo: '.$oFileInfo->file($sUrl); - - return implode('
', $asResult); + } private function setUserId($iUserId) @@ -763,10 +735,7 @@ class Databap extends PhpObject break; } } - - $sUrl = $o9gagImage->getAttribute('src'); - $sFilePath = self::DOC_TMP_FOLDER.uniqid(); - $asResult = ToolBox::createThumbnail($sUrl, self::CHAT_IMG_MAX_WIDTH, self::CHAT_IMG_MAX_HEIGHT, $sFilePath, false, array()); + $asResult = $this->downloadToTmp($o9gagImage->getAttribute('src')); if($asResult['error']=='') { diff --git a/inc/toolbox.php b/inc/toolbox.php index 90c6c67..1bdffce 100644 --- a/inc/toolbox.php +++ b/inc/toolbox.php @@ -140,11 +140,12 @@ class ToolBox } else //Remote { + //get_headers($sUrl, 1) $oCurl = curl_init($sPath); curl_setopt($oCurl, CURLOPT_RETURNTRANSFER, true); curl_setopt($oCurl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($oCurl, CURLOPT_HEADER, true); - curl_setopt($oCurl, CURLOPT_NOBODY, true); + //curl_setopt($oCurl, CURLOPT_NOBODY, true); curl_setopt($oCurl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); curl_setopt($oCurl, CURLOPT_SSL_VERIFYPEER, false); curl_exec($oCurl);