send unfollow before removing ostatus contact

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 07df671da46e101dcaa76992a90f682ea91eab7d..39808776b7e4fad331db8a0cc9028221b3f73a97 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -42,10 +42,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)) {
@@ -56,28 +56,35 @@ function profile_photo_post(&$a) {
                        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 );
 
                                $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 );
 
+                               $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(get_uid())
+                                       intval(local_user())
                                );
 
                                $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
                                        dbesc(datetime_convert()),
-                                       intval(get_uid())
+                                       intval(local_user())
                                );
 
                                // Update global directory in background
@@ -90,6 +97,7 @@ function profile_photo_post(&$a) {
                        else
                                notice( t('Unable to process image') . EOL);
                }
+
                goaway($a->get_baseurl() . '/profiles');
                return; // NOTREACHED
        }
@@ -98,6 +106,14 @@ 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);
 
@@ -123,7 +139,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 );
@@ -132,7 +148,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 );