Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
old mode 100644 (file)
new mode 100755 (executable)
index 3994620..3a70251
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -23,7 +23,7 @@ function photo_init(&$a) {
                        // NOTREACHED
        }
 
-       $default = 'images/default-profile.jpg';
+       $default = 'images/person-175.jpg';
 
        if(isset($type)) {
 
@@ -39,12 +39,12 @@ function photo_init(&$a) {
                                break;
                        case 'micro':
                                $resolution = 6;
-                               $default = 'images/default-profile-mm.jpg';
+                               $default = 'images/person-48.jpg';
                                break;
                        case 'avatar':
                        default:
                                $resolution = 5;
-                               $default = 'images/default-profile-sm.jpg';
+                               $default = 'images/person-80.jpg';
                                break;
                }
 
@@ -115,11 +115,27 @@ function photo_init(&$a) {
        }
 
        if(! isset($data)) {
-               killme();
-               // NOTREACHED
+               if(isset($resolution)) {
+                       switch($resolution) {
+
+                               case 4:
+                                       $data = file_get_contents('images/person-175.jpg');
+                                       break;
+                               case 5:
+                                       $data = file_get_contents('images/person-80.jpg');
+                                       break;
+                               case 6:
+                                       $data = file_get_contents('images/person-48.jpg');
+                                       break;
+                               default:
+                                       killme();
+                                       // NOTREACHED
+                                       break;
+                       }
+               }
        }
 
-       if(intval($customres) && $customres > 0 && $customres < 500) {
+       if(isset($customres) && $customres > 0 && $customres < 500) {
                require_once('include/Photo.php');
                $ph = new Photo($data);
                if($ph->is_valid()) {
@@ -128,7 +144,14 @@ function photo_init(&$a) {
                }
        }
 
+       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