use sha1 keys for friends as well

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index 97587cbb5d34bd7ff79424651402e8561f1b33b0..f570d5b13ed376efec631788aba9ef599630caa7 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once('Photo.php');
+require_once('include/Photo.php');
 require_once('include/items.php');
-require_once('view/acl_selectors.php');
+require_once('include/acl_selectors.php');
 require_once('include/bbcode.php');
 
 function photos_init(&$a) {
@@ -453,6 +453,14 @@ function photos_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);
 
@@ -990,7 +998,7 @@ function photos_content(&$a) {
 
                                        $drop = '';
 
-                                       if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == local_user()))
+                                       if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
                                                $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));