diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d9a56fe2ba..f42d7fe53a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2010-06-29 Sergio Martin + + * include/Image/image_functions.php: Reverted an + undesired last commit change + 2010-06-29 Sergio Martin * godmode/reporting/visual_console_builder.php diff --git a/pandora_console/include/Image/image_functions.php b/pandora_console/include/Image/image_functions.php index 98f10ecb66..e1056cedec 100644 --- a/pandora_console/include/Image/image_functions.php +++ b/pandora_console/include/Image/image_functions.php @@ -37,21 +37,15 @@ if (isset($_GET['getFile'])) { $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_readable($fileTemp)) { $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); unlink($fileTemp); - echo $protocol.$_SERVER['SERVER_NAME'] . $file; } } //END Lines of code for direct url call script