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 2f8d180..3a70251
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -1,8 +1,15 @@
 <?php
 
+require_once('include/security.php');
+
 function photo_init(&$a) {
 
        switch($a->argc) {
+               case 4:
+                       $person = $a->argv[3];
+                       $customres = intval($a->argv[2]);
+                       $type = $a->argv[1];
+                       break;
                case 3:
                        $person = $a->argv[2];
                        $type = $a->argv[1];
@@ -16,22 +23,28 @@ function photo_init(&$a) {
                        // NOTREACHED
        }
 
-       $default = 'images/default-profile.jpg';
+       $default = 'images/person-175.jpg';
 
        if(isset($type)) {
+
+               /**
+                * Profile photos
+                */
+
                switch($type) {
 
                        case 'profile':
+                       case 'custom':
                                $resolution = 4;
                                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;
                }
 
@@ -50,6 +63,10 @@ function photo_init(&$a) {
        }
        else {
 
+               /**
+                * Other photos
+                */
+
                $resolution = 0;
                $photo = str_replace('.jpg','',$photo);
        
@@ -64,39 +81,7 @@ function photo_init(&$a) {
                );
                if(count($r)) {
                        
-                       $owner = $r[0]['uid'];
-
-                       $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' ";
-
-                       if(local_user() && ($owner == $_SESSION['uid'])) {
-
-                               // Owner can always see his/her photos
-                               $sql_extra = ''; 
-
-                       }
-                       elseif(remote_user()) {
-
-                               // authenticated visitor - here lie dragons
-
-                               $groups = init_groups_visitor($_SESSION['visitor_id']);
-                               $gs = '<<>>'; // should be impossible to match
-                               if(count($groups)) {
-                                       foreach($groups as $g)
-                                               $gs .= '|<' . intval($g) . '>';
-                               } 
-
-                               $sql_extra = sprintf(
-                                       " AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' ) 
-                                         AND ( `deny_cid`  = '' OR  NOT `deny_cid` REGEXP '<%d>' ) 
-                                         AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
-                                         AND ( `deny_gid`  = '' OR NOT `deny_gid` REGEXP '%s') ",
-
-                                       intval($_SESSION['visitor_id']),
-                                       intval($_SESSION['visitor_id']),
-                                       dbesc($gs),
-                                       dbesc($gs)
-                               );
-                       }
+                       $sql_extra = permissions_sql($r[0]['uid']);
 
                        // Now we'll see if we can access the photo
 
@@ -114,7 +99,7 @@ function photo_init(&$a) {
                                // but who should otherwise be able to view it. Show a default image to let 
                                // them know permissions was denied. It may be possible to view the image 
                                // through an authenticated profile visit.
-                               // There won't be many complete unauthorised people seeing this because
+                               // There won't be many completely unauthorised people seeing this because
                                // they won't have the photo link, so there's a reasonable chance that the person
                                // might be able to obtain permission to view it.
  
@@ -130,12 +115,44 @@ 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(isset($customres) && $customres > 0 && $customres < 500) {
+               require_once('include/Photo.php');
+               $ph = new Photo($data);
+               if($ph->is_valid()) {
+                       $ph->scaleImageSquare($customres);
+                       $data = $ph->imageString();
+               }
+       }
+
+       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
-}
\ No newline at end of file
+}