Conversation and Item now handles (dis)like as they should

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index 3cd8250a9e7bd727cfbe5666c6b96e58da09f5fb..dee483d835bbda6479376d21a0c5a603f9cf29b1 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once('include/security.php');
+require_once('include/Photo.php');
 
 function photo_init(&$a) {
 
@@ -75,7 +76,7 @@ function photo_init(&$a) {
                                break;
                }
 
-               $uid = str_replace('.jpg', '', $person);
+               $uid = str_replace(array('.jpg','.png'),array('',''), $person);
 
                $r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
                        intval($resolution),
@@ -83,9 +84,11 @@ function photo_init(&$a) {
                );
                if(count($r)) {
                        $data = $r[0]['data'];
+                       $mimetype = $r[0]['type'];
                }
                if(! isset($data)) {
                        $data = file_get_contents($default);
+                       $mimetype = 'image/jpeg';
                }
        }
        else {
@@ -95,7 +98,9 @@ function photo_init(&$a) {
                 */
 
                $resolution = 0;
-               $photo = str_replace('.jpg','',$photo);
+               foreach( Photo::supportedTypes() as $m=>$e){
+                       $photo = str_replace(".$e",'',$photo);
+               }
        
                if(substr($photo,-2,1) == '-') {
                        $resolution = intval(substr($photo,-1,1));
@@ -119,6 +124,7 @@ function photo_init(&$a) {
 
                        if(count($r)) {
                                $data = $r[0]['data'];
+                               $mimetype = $r[0]['type'];
                        }
                        else {
 
@@ -136,6 +142,7 @@ function photo_init(&$a) {
                                );
                                if(count($r)) {
                                        $data = file_get_contents('images/nosign.jpg');
+                                       $mimetype = 'image/jpeg';
                                        $prvcachecontrol = true;
                                }
                        }
@@ -148,12 +155,15 @@ function photo_init(&$a) {
 
                                case 4:
                                        $data = file_get_contents('images/person-175.jpg');
+                                       $mimetype = 'image/jpeg';
                                        break;
                                case 5:
                                        $data = file_get_contents('images/person-80.jpg');
+                                       $mimetype = 'image/jpeg';
                                        break;
                                case 6:
                                        $data = file_get_contents('images/person-48.jpg');
+                                       $mimetype = 'image/jpeg';
                                        break;
                                default:
                                        killme();
@@ -164,11 +174,11 @@ function photo_init(&$a) {
        }
 
        if(isset($customres) && $customres > 0 && $customres < 500) {
-               require_once('include/Photo.php');
-               $ph = new Photo($data);
+               $ph = new Photo($data, $mimetype);
                if($ph->is_valid()) {
                        $ph->scaleImageSquare($customres);
                        $data = $ph->imageString();
+                       $mimetype = $ph->getType();
                }
        }
 
@@ -181,7 +191,7 @@ function photo_init(&$a) {
                header_remove('pragma');
        }
 
-       header("Content-type: image/jpeg");
+       header("Content-type: ".$mimetype);
 
        if($prvcachecontrol) {