Merge remote branch 'friendika-master/master'

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index bc2e5b4eaa16e99c37e22bac37b9c7999f730cdb..8b72bfca06ee27104e4f450718dc2dd7dceaea44 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -8,7 +8,6 @@ function profile_photo_init(&$a) {
                return;
        }
 
-       require_once("mod/profile.php");
        profile_load($a,$a->user['nickname']);
 
 }
@@ -42,10 +41,10 @@ function profile_photo_post(&$a) {
                $srcY = $_POST['ystart'];
                $srcW = $_POST['xfinal'] - $srcX;
                $srcH = $_POST['yfinal'] - $srcY;
-//dbg(3);
+
                $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1",
                        dbesc($image_id),
-                       dbesc(get_uid()),
+                       dbesc(local_user()),
                        intval($scale));
 
                if(count($r)) {
@@ -53,40 +52,51 @@ function profile_photo_post(&$a) {
                        $base_image = $r[0];
 
                        $im = new Photo($base_image['data']);
-                       $im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
+                       if($im->is_valid()) {
+                               $im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
 
-                       $r = $im->store(get_uid(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1);
+                               $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1);
 
-                       if($r === false)
-                               notice ( t('Image size reduction [175] failed.') . EOL );
+                               if($r === false)
+                                       notice ( t('Image size reduction [175] failed.') . EOL );
 
-                       $im->scaleImage(80);
+                               $im->scaleImage(80);
 
-                       $r = $im->store(get_uid(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
+                               $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
                        
-                       if($r === false)
-                               notice( t('Image size reduction [80] failed.') . EOL );
-
-                       // Unset the profile photo flag from any other photos I own
-
-                       $r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
-                               dbesc($base_image['resource-id']),
-                               intval(get_uid())
-                       );
+                               if($r === false)
+                                       notice( t('Image size reduction [80] failed.') . EOL );
 
-                       $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
-                               dbesc(datetime_convert()),
-                               intval(get_uid())
-                       );
-
-                       // Update global directory in background
-                       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-                       $url = $_SESSION['my_url'];
-                       if($url && strlen(get_config('system','directory_submit_url')))
-                               proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
-                                       array(),$foo));
+                               $im->scaleImage(48);
 
+                               $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, 1);
+                       
+                               if($r === false)
+                                       notice( t('Image size reduction [48] failed.') . EOL );
+
+                               // Unset the profile photo flag from any other photos I own
+
+                               $r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
+                                       dbesc($base_image['resource-id']),
+                                       intval(local_user())
+                               );
+
+                               $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+                                       dbesc(datetime_convert()),
+                                       intval(local_user())
+                               );
+
+                               // Update global directory in background
+                               $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+                               $url = $_SESSION['my_url'];
+                               if($url && strlen(get_config('system','directory_submit_url')))
+                                       //proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo));
+                                       proc_run($php_path,"include/directory.php","$url");
+                       }
+                       else
+                               notice( t('Unable to process image') . EOL);
                }
+
                goaway($a->get_baseurl() . '/profiles');
                return; // NOTREACHED
        }
@@ -95,10 +105,18 @@ function profile_photo_post(&$a) {
        $filename = basename($_FILES['userfile']['name']);
        $filesize = intval($_FILES['userfile']['size']);
 
+       $maximagesize = get_config('system','maximagesize');
+
+       if(($maximagesize) && ($filesize > $maximagesize)) {
+               notice( t('Image exceeds size limit of ') . $maximagesize . EOL);
+               @unlink($src);
+               return;
+       }
+
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata);
 
-       if(! ($image = $ph->getImage())) {
+       if(! $ph->is_valid()) {
                notice( t('Unable to process image.') . EOL );
                @unlink($src);
                return;
@@ -120,7 +138,7 @@ function profile_photo_post(&$a) {
 
        $smallest = 0;
 
-       $r = $ph->store(get_uid(), 0 , $hash, $filename, t('Profile Photos'), 0 );      
+       $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );   
 
        if($r)
                notice( t('Image uploaded successfully.') . EOL );
@@ -129,7 +147,7 @@ function profile_photo_post(&$a) {
 
        if($width > 640 || $height > 640) {
                $ph->scaleImage(640);
-               $r = $ph->store(get_uid(), 0 , $hash, $filename, t('Profile Photos'), 1 );      
+               $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );   
 
                if($r === false)
                        notice( t('Image size reduction [640] failed.') . EOL );