Some Bugfixes, and variable checks

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index a5a5a1dc174fb05ecb1a7e9bc64b527aed58b5eb..1d38fe8e45189c67ccc7f572a881763453e0f67a 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -4,6 +4,30 @@ require_once('include/security.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
+               }
+       }*/
+
        switch($a->argc) {
                case 4:
                        $person = $a->argv[3];
@@ -23,10 +47,11 @@ function photo_init(&$a) {
                        // NOTREACHED
        }
 
-       $default = 'images/default-profile.jpg';
+       $default = 'images/person-175.jpg';
 
        if(isset($type)) {
 
+
                /**
                 * Profile photos
                 */
@@ -39,12 +64,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 +140,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,6 +169,10 @@ function photo_init(&$a) {
                }
        }
 
+       // Writing in cachefile
+       if (isset($cachefile) && $cachefile != '')
+               file_put_contents($cachefile, $data);
+
        if(function_exists('header_remove')) {
                header_remove('Pragma');
                header_remove('pragma');