abstractify items, check photos for birthday paradox

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 377bc3313a1634a5e9d7dec5f1c7e31b57907d27..e431e059de019e919f0abf14b99c12fc98d1d4c1 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -45,7 +45,7 @@ function profile_photo_post(&$a) {
 //dbg(3);
                $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1",
                        dbesc($image_id),
-                       dbesc($_SESSION['uid']),
+                       dbesc(get_uid()),
                        intval($scale));
 
                if(count($r)) {
@@ -55,14 +55,14 @@ function profile_photo_post(&$a) {
                        $im = new Photo($base_image['data']);
                        $im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
 
-                       $r = $im->store($_SESSION['uid'], 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1);
+                       $r = $im->store(get_uid(), 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($_SESSION['uid'], 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
+                       $r = $im->store(get_uid(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
                        
                        if($r === false)
                                notice( t('Image size reduction (80) failed.') . EOL );
@@ -71,12 +71,12 @@ function profile_photo_post(&$a) {
 
                        $r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
                                dbesc($base_image['resource-id']),
-                               intval($_SESSION['uid'])
+                               intval(get_uid())
                        );
 
                        $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
                                dbesc(datetime_convert()),
-                               intval($_SESSION['uid'])
+                               intval(get_uid())
                        );
 
                        // Update global directory in background
@@ -115,12 +115,12 @@ function profile_photo_post(&$a) {
                $height = $ph->getHeight();
        }
 
-       $hash = hash('md5',uniqid(mt_rand(),true));
+       $hash = photo_new_resource();
        
 
        $smallest = 0;
 
-       $r = $ph->store($_SESSION['uid'], 0 , $hash, $filename, t('Profile Photos'), 0 );       
+       $r = $ph->store(get_uid(), 0 , $hash, $filename, t('Profile Photos'), 0 );      
 
        if($r)
                notice( t('Image uploaded successfully.') . EOL );
@@ -129,7 +129,7 @@ function profile_photo_post(&$a) {
 
        if($width > 640 || $height > 640) {
                $ph->scaleImage(640);
-               $r = $ph->store($_SESSION['uid'], 0 , $hash, $filename, t('Profile Photos'), 1 );       
+               $r = $ph->store(get_uid(), 0 , $hash, $filename, t('Profile Photos'), 1 );      
 
                if($r === false)
                        notice( t('Image size reduction (640) failed.') . EOL );