Replaced deprecaded Expires headers by Cache-Control

[bizou.git] / index.php

diff --git a/index.php b/index.php
index 7c9b462..708a9e3 100644 (file)
--- a/index.php
+++ b/index.php
@@ -26,89 +26,8 @@ if (substr($rootUrl, -1) !== '/') $rootUrl.='/';  // add a trailing / to rootUrl
 // $scriptUrl =  "/path/to/bizou/index.php"
 // $rootUrl =  "/path/to/bizou/"
 
-// load plugins
-$plugins = array();
-if (is_dir("plugins")) {
-       $plugins = scandir("plugins");
-       array_shift($plugins); array_shift($plugins); // remove . and ..
-       foreach ($plugins as $p) if (is_file("plugins/$p/functions.php"))
-               require "plugins/$p/functions.php";
-}
-
-function plugins_include($phpFile)
-{
-       foreach ($GLOBALS['plugins'] as $p) if (is_file("plugins/$p/$phpFile"))
-               require "plugins/$p/$phpFile";
-}
-
-if (! function_exists('getImageLink')) {
-function getImageLink($imageSimplePath)
-{
-       return $GLOBALS['rootUrl'].IMAGES_DIR.$imageSimplePath;
-}
-}
-
-function getPreview($imgFile, $maxSize = THUMB_SIZE)
-{
-       # example: data/myalbum/100.mypic.jpg
-       $newImgFile = DATA_DIR."/".dirname($imgFile)."/".$maxSize.".".basename($imgFile);
-       
-       if (! is_file($newImgFile))
-       {
-               $ext = strtolower(substr($imgFile, -4));
-               if ($ext == ".jpg")
-                       $img = imagecreatefromjpeg($imgFile);
-               else
-                       $img = imagecreatefrompng($imgFile);
-
-               $w = imagesx($img);
-               $h = imagesy($img);
-               # don't do anything if the image is already small
-               if ($w <= $maxSize and $h <= $maxSize) {
-                       imagedestroy($img);
-                       return $imgFile;
-               }
-
-               # uncomment this if you need group writable files
-               #umask(0002);
-
-               # create the thumbs directory recursively
-               if (! is_dir(dirname($newImgFile))) mkdir(dirname($newImgFile), 0777, true);
-
-               if ($w > $h) {
-                       $newW = $maxSize;
-                       $newH = $h/($w/$maxSize);
-               } else {
-                       $newW = $w/($h/$maxSize);
-                       $newH = $maxSize;
-               }
-
-               $newImg = imagecreatetruecolor($newW, $newH);
+require 'functions.php';
 
-               imagecopyresampled($newImg, $img, 0, 0, 0, 0, $newW, $newH, $w, $h);
-
-               if ($ext == ".jpg")
-                       imagejpeg($newImg, $newImgFile);
-               else
-                       imagepng($newImg, $newImgFile);
-               
-               imagedestroy($img);
-               imagedestroy($newImg);
-       }
-
-       return $GLOBALS['rootUrl'].$newImgFile;
-}
-
-function getAlbumPreview($dir)
-{
-       foreach (scandir($dir) as $file) if ($file != '.' and $file != '..') {
-               $ext = strtolower(substr($file, -4));
-               if ($ext == ".jpg" or $ext == ".png")
-                       return getPreview("$dir/$file");
-       }
-
-       return '';
-}
 
 // if url == http://localhost/photos/index.php/toto/titi, path_info == /toto/titi
 // if url == http://localhost/photos/index.php, path_info is not set
@@ -119,16 +38,9 @@ if (! isset($_SERVER["PATH_INFO"])) {
        exit();
 }
 
-# simplePath is the simple path to the image
-# /index.php/toto/titi => simplePath == /toto/titi
-$simplePath = $_SERVER["PATH_INFO"];
-if ($simplePath == '/') $simplePath = '';
-// extra security check to avoid /photos/index/../.. like urls, maybe useless but..
-if (strpos($simplePath, '..') !== false) die(".. found in url");
-
-$folders = array();
-$imageFiles = array();
-$otherFiles = array();
+// simplePath is the simple path to the directory
+// extract /path/to/dir/ from /index.php/path/to/dir/
+$simplePath = getPathInfo();
 
 # realDir is the directory in filesystem
 # seen from current script directory
@@ -139,17 +51,21 @@ if (! is_dir($realDir)) {
        die("Directory Not Found");
 }
 
-foreach (scandir($realDir) as $file) if ($file != '.' and $file != '..')
+$folders = array();
+$imageFiles = array();
+$otherFiles = array();
+
+foreach (scandir($realDir) as $file) if ($file[0] != '.')
 {
        if (is_dir("$realDir/$file"))
        {
-               $folders[] = array( "name" => $file, "link" => "$scriptUrl$simplePath/$file", "preview" => getAlbumPreview("$realDir/$file") );
+               $folders[] = array( "name" => $file, "file" => "$realDir/$file", "link" => "$scriptUrl$simplePath/$file" );
        }
        else
        {
                $ext = strtolower(substr($file, -4));
                if ($ext == ".jpg" or $ext == ".png") {
-                       $imageFiles[] = array( "name" => $file, "url" => getPreview("$realDir/$file"), "link" => getImageLink("$simplePath/$file") );
+                       $imageFiles[] = array( "name" => $file, "file" => "$realDir/$file", "link" => getImageLink("$simplePath/$file") );
                } else {
                        $otherFiles[] = array( "name" => $file, "link" => "$rootUrl$realDir/$file" );
                }
@@ -163,7 +79,7 @@ else
 
 ///// template starts here /////
 header('Content-Type: text/html; charset=utf-8');
-header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + 3600));
+header('Cache-Control: max-age=3600');
 
 require 'template.php';