From 091120d93993256f72ec797c14db51b222322abb Mon Sep 17 00:00:00 2001 From: lutranf Date: Tue, 23 Dec 2014 15:27:00 +0100 Subject: [PATCH] authorize all files in 9gag (test) --- inc/databap.php | 9 ++++++--- inc/toolbox.php | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/inc/databap.php b/inc/databap.php index f7e8b97..f2ffad7 100755 --- a/inc/databap.php +++ b/inc/databap.php @@ -735,8 +735,11 @@ class Databap extends PhpObject break; } } - $asResult = $this->downloadToTmp($o9gagImage->getAttribute('src')); - + + $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()); + if($asResult['error']=='') { $asPost['url_img'] = $asResult['out']; @@ -1957,7 +1960,7 @@ class Databap extends PhpObject $sFrom = $asUserFrom['name'].' '; $sTo = $asUserTo['name'].' <'.$asUserTo['email'].'>'; - $sMessage .= "\n\n\n".'Ne répondez pas à ce mail. Connectez-vous sur Databap.'; + $sMessage .= "\n\n\n".'Ne répondez pas à ce mail. Connectez-vous sur Databap.'; $sResult = ToolBox::sendMail($sFrom, 'Databap PM', $sMessage, $sTo, array(), false); $bSuccess = ($sResult==ToolBox::MAIL_SUCCESS); diff --git a/inc/toolbox.php b/inc/toolbox.php index c96a8f2..90c6c67 100644 --- a/inc/toolbox.php +++ b/inc/toolbox.php @@ -177,7 +177,7 @@ class ToolBox elseif(!array_key_exists('extension', $asOutInfo)) $sOutPath .= '.'.$sImageExt; //folder + filename, but getting ext from file info //New sizes - if(!in_array($sImageExt, $asImageExts)) $asResult['error'] = 'Wrong file type: '.$sImageExt; + if(!in_array($sImageExt, $asImageExts) && !empty($asImageExts)) $asResult['error'] = 'Wrong file type: '.$sImageExt; else { list($iWidth, $iHeight) = getimagesize($sInPath);