Merge pull request #3078 from Hypolite/issue/#3039-mod-2of3

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index b451535e42aff45812cc5b15915d7cbe5e7594da..60e5dee64361356ac0388ba62b40ab18768f8851 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -10,7 +10,7 @@ require_once('include/tags.php');
 require_once('include/threads.php');
 require_once('include/Probe.php');
 
-function photos_init(App &$a) {
+function photos_init(App $a) {
 
        if ($a->argc > 1)
                auto_redir($a, $a->argv[1]);
@@ -112,7 +112,7 @@ function photos_init(App &$a) {
 
 
 
-function photos_post(App &$a) {
+function photos_post(App $a) {
 
        logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
 
@@ -182,11 +182,11 @@ function photos_post(App &$a) {
                        return; // NOTREACHED
                }
 
-               $r = qu("SELECT count(*) FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
+               $r = qu("SELECT `album` FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
                        dbesc($album),
                        intval($page_owner_uid)
                );
-               if (! dbm::is_result($r)) {
+               if (!dbm::is_result($r)) {
                        notice( t('Album not found.') . EOL);
                        goaway($_SESSION['photo_return']);
                        return; // NOTREACHED
@@ -818,22 +818,23 @@ function photos_post(App &$a) {
        $imagedata = @file_get_contents($src);
 
 
-
-       $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
-               intval($a->data['user']['uid'])
-       );
-
        $limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
 
-       if (($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
-               notice( upgrade_message() . EOL );
-               @unlink($src);
-               $foo = 0;
-               call_hooks('photo_post_end',$foo);
-               killme();
+       if ($limit) {
+               $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+                       intval($a->data['user']['uid'])
+               );
+               $size = $r[0]['total'];
+
+               if (($size + strlen($imagedata)) > $limit) {
+                       notice( upgrade_message() . EOL );
+                       @unlink($src);
+                       $foo = 0;
+                       call_hooks('photo_post_end',$foo);
+                       killme();
+               }
        }
 
-
        $ph = new Photo($imagedata, $type);
 
        if (! $ph->is_valid()) {
@@ -945,7 +946,7 @@ function photos_post(App &$a) {
 
 
 
-function photos_content(App &$a) {
+function photos_content(App $a) {
 
        // URLs:
        // photos/name
@@ -1307,7 +1308,7 @@ function photos_content(App &$a) {
 
        }
 
-       /** 
+       /**
         * Display one photo
         */