Code standards in api_get_user

[friendica.git] / include / photos.php

diff --git a/include/photos.php b/include/photos.php
index 02d1b174039f4a1956b03cfb7459c08ff79120e0..592a138325e7da15b6ad892f0ff30eb7edddee2e 100644 (file)
--- a/include/photos.php
+++ b/include/photos.php
@@ -3,16 +3,16 @@
  * @file include/photos.php
  * @brief Functions related to photo handling.
  */
-
-use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 function getGps($exifCoord, $hemi) {
        $degrees = count($exifCoord) > 0 ? gps2Num($exifCoord[0]) : 0;
        $minutes = count($exifCoord) > 1 ? gps2Num($exifCoord[1]) : 0;
        $seconds = count($exifCoord) > 2 ? gps2Num($exifCoord[2]) : 0;
 
-       $flip = ($hemi == 'W' or $hemi == 'S') ? -1 : 1;
+       $flip = ($hemi == 'W' || $hemi == 'S') ? -1 : 1;
 
        return floatval($flip * ($degrees + ($minutes / 60) + ($seconds / 3600)));
 }
@@ -44,24 +44,23 @@ function photo_albums($uid, $update = false) {
 
        $key = "photo_albums:".$uid.":".local_user().":".remote_user();
        $albums = Cache::get($key);
-       if (is_null($albums) OR $update) {
+       if (is_null($albums) || $update) {
                if (!Config::get('system', 'no_count', false)) {
                        /// @todo This query needs to be renewed. It is really slow
                        // At this time we just store the data in the cache
-                       $albums = qu("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`
+                       $albums = q("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`, ANY_VALUE(`created`) AS `created`
                                FROM `photo`
                                WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra
-                               GROUP BY `album`, `created` ORDER BY `created` DESC",
+                               GROUP BY `album` ORDER BY `created` DESC",
                                intval($uid),
                                dbesc('Contact Photos'),
                                dbesc(t('Contact Photos'))
                        );
                } else {
                        // This query doesn't do the count and is much faster
-                       $albums = qu("SELECT DISTINCT(`album`), '' AS `total`
-                               FROM `photo`
-                               WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra
-                               GROUP BY `album`, `created` ORDER BY `created` DESC",
+                       $albums = q("SELECT DISTINCT(`album`), '' AS `total`
+                               FROM `photo` USE INDEX (`uid_album_scale_created`)
+                               WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra",
                                intval($uid),
                                dbesc('Contact Photos'),
                                dbesc(t('Contact Photos'))