[xoops-svn] SF.net SVN: xoops:[3067] XoopsCore/trunk/htdocs/image.php

[<tr...@us...>]

Revision: 3067
          http://xoops.svn.sourceforge.net/xoops/?rev=3067&view=rev
Author:   trabis
Date:     2009-03-28 22:34:18 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
Fixing bug #2691957 : Images not given in the image manager

Modified Paths:
--------------
    XoopsCore/trunk/htdocs/image.php

Modified: XoopsCore/trunk/htdocs/image.php
===================================================================
--- XoopsCore/trunk/htdocs/image.php	2009-03-28 21:02:25 UTC (rev 3066)
+++ XoopsCore/trunk/htdocs/image.php	2009-03-28 22:34:18 UTC (rev 3067)
@@ -32,36 +32,36 @@
 $image_id = isset($_GET['id']) ? intval($_GET['id']) : 0;
 if (empty($image_id)) {
 	header('Content-type: image/gif');
-	readfile(XOOPS_UPLOAD_PATH.'/blank.gif');
+	readfile(XOOPS_UPLOAD_PATH . '/blank.gif');
 	exit();
 }
 $xoopsOption['nocommon'] = 1;
-include './mainfile.php';
-include XOOPS_ROOT_PATH.'/include/functions.php';
-include_once XOOPS_ROOT_PATH.'/class/logger.php';
-include_once XOOPS_ROOT_PATH."/class/module.textsanitizer.php";
+include dirname(__FILE__) . '/mainfile.php';
+include XOOPS_ROOT_PATH . '/include/functions.php';
+include_once XOOPS_ROOT_PATH . '/class/logger/xoopslogger.php';
+include_once XOOPS_ROOT_PATH . '/class/module.textsanitizer.php';
 $xoopsLogger =& XoopsLogger::instance();
 $xoopsLogger->startTime();
-include_once XOOPS_ROOT_PATH.'/class/database/databasefactory.php';
+include_once XOOPS_ROOT_PATH . '/class/database/databasefactory.php';
 define('XOOPS_DB_PROXY', 1);
 $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 // ################# Include class manager file ##############
-require_once XOOPS_ROOT_PATH.'/kernel/object.php';
-require_once XOOPS_ROOT_PATH.'/class/criteria.php';
+require_once XOOPS_ROOT_PATH . '/kernel/object.php';
+require_once XOOPS_ROOT_PATH . '/class/criteria.php';
 $imagehandler =& xoops_gethandler('image');
 $criteria = new CriteriaCompo(new Criteria('i.image_display', 1));
 $criteria->add(new Criteria('i.image_id', $image_id));
 $image = $imagehandler->getObjects($criteria, false, true);
 if (count($image) > 0) {
-	header('Content-type: '.$image[0]->getVar('image_mimetype'));
+	header('Content-type: ' . $image[0]->getVar('image_mimetype'));
 	header('Cache-control: max-age=31536000');
-	header('Expires: '.gmdate("D, d M Y H:i:s",time()+31536000).'GMT');
-	header('Content-disposition: filename='.$image[0]->getVar('image_name'));
-	header('Content-Length: '.strlen($image[0]->getVar('image_body')));
-	header('Last-Modified: '.gmdate("D, d M Y H:i:s",$image[0]->getVar('image_created')).'GMT');
+	header('Expires: ' . gmdate("D, d M Y H:i:s", time() + 31536000) . 'GMT');
+	header('Content-disposition: filename=' . $image[0]->getVar('image_name'));
+	header('Content-Length: ' . strlen($image[0]->getVar('image_body')));
+	header('Last-Modified: ' . gmdate("D, d M Y H:i:s", $image[0]->getVar('image_created')) . 'GMT');
 	echo $image[0]->getVar('image_body');
 } else {
 	header('Content-type: image/gif');
-	readfile(XOOPS_UPLOAD_PATH.'/blank.gif');
+	readfile(XOOPS_UPLOAD_PATH . '/blank.gif');
 }
-?>
\ No newline at end of file
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.