Merge pull request #927 from annando/master

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index dee483d835bbda6479376d21a0c5a603f9cf29b1..434193f71318edc6b9b63abac8feefb8d95a6b4c 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -4,32 +4,10 @@ require_once('include/security.php');
 require_once('include/Photo.php');
 
 function photo_init(&$a) {
-
-       // To-Do:
-       // - checking with realpath
-       // - checking permissions
-       /*
-       $cache = get_config('system','itemcache');
-        if (($cache != '') and is_dir($cache)) {
-               $cachefile = $cache."/".$a->argc."-".$a->argv[1]."-".$a->argv[2]."-".$a->argv[3];
-               if (file_exists($cachefile)) {
-                       $data = file_get_contents($cachefile);
-
-                       if(function_exists('header_remove')) {
-                               header_remove('Pragma');
-                               header_remove('pragma');
-                       }
-
-                       header("Content-type: image/jpeg");
-                       header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
-                       header("Cache-Control: max-age=" . (3600*24));
-                       echo $data;
-                       killme();
-                       // NOTREACHED
-               }
-       }*/
+       global $_SERVER;
 
        $prvcachecontrol = false;
+       $file = "";
 
        switch($a->argc) {
                case 4:
@@ -43,6 +21,7 @@ function photo_init(&$a) {
                        break;
                case 2:
                        $photo = $a->argv[1];
+                       $file = $photo;
                        break;
                case 1:
                default:
@@ -50,6 +29,21 @@ function photo_init(&$a) {
                        // NOTREACHED
        }
 
+       //      strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= filemtime($localFileName)) {
+       if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
+               header('HTTP/1.1 304 Not Modified');
+               header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
+               header('Etag: '.$_SERVER['HTTP_IF_NONE_MATCH']);
+               header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
+               header("Cache-Control: max-age=31536000");
+               if(function_exists('header_remove')) {
+                       header_remove('Last-Modified');
+                       header_remove('Expires');
+                       header_remove('Cache-Control');
+               }
+               exit;
+       }
+
        $default = 'images/person-175.jpg';
 
        if(isset($type)) {
@@ -101,7 +95,7 @@ function photo_init(&$a) {
                foreach( Photo::supportedTypes() as $m=>$e){
                        $photo = str_replace(".$e",'',$photo);
                }
-       
+
                if(substr($photo,-2,1) == '-') {
                        $resolution = intval(substr($photo,-1,1));
                        $photo = substr($photo,0,-2);
@@ -112,7 +106,7 @@ function photo_init(&$a) {
                        intval($resolution)
                );
                if(count($r)) {
-                       
+
                        $sql_extra = permissions_sql($r[0]['uid']);
 
                        // Now we'll see if we can access the photo
@@ -122,6 +116,8 @@ function photo_init(&$a) {
                                intval($resolution)
                        );
 
+                       $public = ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');
+
                        if(count($r)) {
                                $data = $r[0]['data'];
                                $mimetype = $r[0]['type'];
@@ -173,19 +169,18 @@ function photo_init(&$a) {
                }
        }
 
-       if(isset($customres) && $customres > 0 && $customres < 500) {
+       // Resize only if its not a GIF
+       if ($mime != "image/gif") {
                $ph = new Photo($data, $mimetype);
                if($ph->is_valid()) {
-                       $ph->scaleImageSquare($customres);
+                       if(isset($customres) && $customres > 0 && $customres < 500) {
+                               $ph->scaleImageSquare($customres);
+                       }
                        $data = $ph->imageString();
                        $mimetype = $ph->getType();
                }
        }
 
-       // Writing in cachefile
-       if (isset($cachefile) && $cachefile != '')
-               file_put_contents($cachefile, $data);
-
        if(function_exists('header_remove')) {
                header_remove('Pragma');
                header_remove('pragma');
@@ -203,12 +198,24 @@ function photo_init(&$a) {
 
        }
        else {
+               header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
+               header('Etag: "'.md5($data).'"');
+               header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
+               header("Cache-Control: max-age=31536000");
+       }
+       echo $data;
 
-               header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
-               header("Cache-Control: max-age=" . (3600*24));
+       // If the photo is public and there is an existing photo directory store the photo there
+       if ($public and ($file != "")) {
+               // If the photo path isn't there, try to create it
+               if (!is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
+                       if (is_writable($_SERVER["DOCUMENT_ROOT"]))
+                               mkdir($_SERVER["DOCUMENT_ROOT"]."/photo");
 
+               if (is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
+                       file_put_contents($_SERVER["DOCUMENT_ROOT"]."/photo/".$file, $data);
        }
-       echo $data;
+
        killme();
        // NOTREACHED
 }