applied coding convention:

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index f63f843dbe645485a439138d52e34469f2f3b1e3..27d8499c2809699d655b375f745c55a36dcb9d12 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -10,7 +10,9 @@ require_once('include/tags.php');
 require_once('include/threads.php');
 require_once('include/Probe.php');
 
-function photos_init(App &$a) {
+use \Friendica\Core\Config;
+
+function photos_init(App $a) {
 
        if ($a->argc > 1)
                auto_redir($a, $a->argv[1]);
@@ -112,7 +114,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 +184,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 +820,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 +948,7 @@ function photos_post(App &$a) {
 
 
 
-function photos_content(App &$a) {
+function photos_content(App $a) {
 
        // URLs:
        // photos/name
@@ -1338,35 +1341,38 @@ function photos_content(App &$a) {
                $prevlink = '';
                $nextlink = '';
 
-               if ($_GET['order'] === 'posted')
-                       $order = 'ASC';
-               else
-                       $order = 'DESC';
-
+               /// @todo This query is totally bad, the whole functionality has to be changed
+               // The query leads to a really intense used index.
+               // By now we hide it if someone wants to.
+               if (!Config::get('system', 'no_count', false)) {
+                       if ($_GET['order'] === 'posted')
+                               $order = 'ASC';
+                       else
+                               $order = 'DESC';
 
-               $prvnxt = qu("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0
-                       $sql_extra ORDER BY `created` $order ",
-                       dbesc($ph[0]['album']),
-                       intval($owner_uid)
-               );
+                       $prvnxt = qu("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0
+                               $sql_extra ORDER BY `created` $order ",
+                               dbesc($ph[0]['album']),
+                               intval($owner_uid)
+                       );
 
-               if (count($prvnxt)) {
-                       for($z = 0; $z < count($prvnxt); $z++) {
-                               if ($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) {
-                                       $prv = $z - 1;
-                                       $nxt = $z + 1;
-                                       if ($prv < 0)
-                                               $prv = count($prvnxt) - 1;
-                                       if ($nxt >= count($prvnxt))
-                                               $nxt = 0;
-                                       break;
+                       if (count($prvnxt)) {
+                               for($z = 0; $z < count($prvnxt); $z++) {
+                                       if ($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) {
+                                               $prv = $z - 1;
+                                               $nxt = $z + 1;
+                                               if ($prv < 0)
+                                                       $prv = count($prvnxt) - 1;
+                                               if ($nxt >= count($prvnxt))
+                                                       $nxt = 0;
+                                               break;
+                                       }
                                }
-                       }
-                       $edit_suffix = ((($cmd === 'edit') && ($can_post)) ? '/edit' : '');
-                       $prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
-                       $nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
-               }
-
+                               $edit_suffix = ((($cmd === 'edit') && ($can_post)) ? '/edit' : '');
+                               $prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+                               $nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+                       }
+               }
 
                if (count($ph) == 1)
                        $hires = $lores = $ph[0];