Merge branch 'pull'

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index 9809aa418de296d9c7b55581b8f2480701743d2c..3994620f89cfcd1e3fb1253cdfa7bb9bf1290097 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -5,6 +5,11 @@ 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];
@@ -29,6 +34,7 @@ function photo_init(&$a) {
                switch($type) {
 
                        case 'profile':
+                       case 'custom':
                                $resolution = 4;
                                break;
                        case 'micro':
@@ -113,8 +119,17 @@ function photo_init(&$a) {
                // NOTREACHED
        }
 
+       if(intval($customres) && $customres > 0 && $customres < 500) {
+               require_once('include/Photo.php');
+               $ph = new Photo($data);
+               if($ph->is_valid()) {
+                       $ph->scaleImageSquare($customres);
+                       $data = $ph->imageString();
+               }
+       }
+
        header("Content-type: image/jpeg");
        echo $data;
        killme();
        // NOTREACHED
-}
\ No newline at end of file
+}