tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2010-06-29 Sergio Martin <sergio.martin@artica.es> 

* include/Image/image_functions.php: Reverted an 
	undesired last commit change



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2932 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-06-29 11:06:16 +00:00
parent fcf9cf2a2d
commit d7dc6b79a5
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2010-06-29 Sergio Martin <sergio.martin@artica.es>
* include/Image/image_functions.php: Reverted an
undesired last commit change
2010-06-29 Sergio Martin <sergio.martin@artica.es> 2010-06-29 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/visual_console_builder.php * godmode/reporting/visual_console_builder.php

10
pandora_console/include/Image/image_functions.php
View File

@ -37,21 +37,15 @@ if (isset($_GET['getFile'])) {
$fileTemp = sys_get_temp_dir() . "/tumb_" . $newWidth . "x" . $newHeight . "_" . $fileName; $fileTemp = sys_get_temp_dir() . "/tumb_" . $newWidth . "x" . $newHeight . "_" . $fileName;
$protocol = 'http';
if(!empty($_SERVER['HTTPS']))
$protocol .= 's';
$protocol .= '://';
if (is_file($fileTemp)) { if (is_file($fileTemp)) {
if (!is_readable($fileTemp)) { if (!is_readable($fileTemp)) {
$fileTemp = sys_get_temp_dir() . "/tumb_" . $newWidth . "x" . $newHeight . "_" . uniqid() . "_" . $fileName; $fileTemp = sys_get_temp_dir() . "/tumb_" . $newWidth . "x" . $newHeight . "_" . uniqid() . "_" . $fileName;
createthumb($protocol.$_SERVER['SERVER_NAME'] . $file, $fileTemp,$newWidth,$newHeight); createthumb( $_SERVER['DOCUMENT_ROOT'] . $file, $fileTemp,$newWidth,$newHeight);
} }
} }
else createthumb($protocol.$_SERVER['SERVER_NAME'] . $file, $fileTemp,$newWidth,$newHeight); else createthumb( $_SERVER['DOCUMENT_ROOT'] . $file, $fileTemp,$newWidth,$newHeight);
getFile($fileName, $fileTemp); getFile($fileName, $fileTemp);
unlink($fileTemp); unlink($fileTemp);
echo $protocol.$_SERVER['SERVER_NAME'] . $file;
} }
} }
//END Lines of code for direct url call script //END Lines of code for direct url call script