+++ /dev/null
-<?php
-/**
- * @file include/photos.php
- * @brief Functions related to photo handling.
- */
-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' || $hemi == 'S') ? -1 : 1;
-
- return floatval($flip * ($degrees + ($minutes / 60) + ($seconds / 3600)));
-}
-
-function gps2Num($coordPart) {
- $parts = explode('/', $coordPart);
-
- if (count($parts) <= 0)
- return 0;
-
- if (count($parts) == 1)
- return $parts[0];
-
- return floatval($parts[0]) / floatval($parts[1]);
-}
-
-/**
- * @brief Fetch the photo albums that are available for a viewer
- *
- * The query in this function is cost intensive, so it is cached.
- *
- * @param int $uid User id of the photos
- * @param bool $update Update the cache
- *
- * @return array Returns array of the photo albums
- */
-function photo_albums($uid, $update = false) {
- $sql_extra = permissions_sql($uid);
-
- $key = "photo_albums:".$uid.":".local_user().":".remote_user();
- $albums = Cache::get($key);
- 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 = 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` 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 = 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'))
- );
- }
- Cache::set($key, $albums, CACHE_DAY);
- }
- return $albums;
-}
use Friendica\Network\Probe;
use Friendica\Object\Image;
-require_once 'include/photos.php';
require_once 'include/items.php';
require_once 'include/acl_selectors.php';
require_once 'include/bbcode.php';
'$pdesc' => defaults($profile, 'pdesc', ''),
));
- $albums = photo_albums($a->data['user']['uid']);
+ $albums = Photo::getAlbums($a->data['user']['uid']);
$albums_visible = ((intval($a->data['user']['hidewall']) && !local_user() && !remote_user()) ? false : true);
intval($page_owner_uid)
);
// Update the photo albums cache
- photo_albums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
$newurl = str_replace(bin2hex($album), bin2hex($newalbum), $_SESSION['photo_return']);
goaway($newurl);
}
// Update the photo albums cache
- photo_albums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
}
goaway('photos/' . $a->data['user']['nickname']);
$drop_id = intval($i[0]['id']);
// Update the photo albums cache
- photo_albums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
if ($i[0]['visible']) {
Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
// Update the photo albums cache if album name was changed
if ($albname !== $origaname) {
- photo_albums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
}
}
// Create item container
$lat = $lon = null;
if ($exif && $exif['GPS'] && Feature::isEnabled($channel_id, 'photo_location')) {
- $lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
- $lon = getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
+ $lat = Photo::getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
+ $lon = Photo::getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
}
$arr = array();
$item_id = item_store($arr);
// Update the photo albums cache
- photo_albums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
if ($visible) {
Worker::add(PRIORITY_HIGH, "Notifier", 'wall-new', $item_id);
}
- call_hooks('photo_post_end',intval($item_id));
+ call_hooks('photo_post_end', intval($item_id));
// addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
// if they do not wish to be redirected
<?php
-
/**
* @file src/Model/Photo.php
* @brief This file contains the Photo class for database interface
*/
-
namespace Friendica\Model;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Object\Image;
use dba;
require_once 'include/dba.php';
-require_once "include/photos.php";
/**
* Class to handle photo dabatase table
class Photo
{
/**
+ * @param Image $Image image
* @param integer $uid uid
* @param integer $cid cid
* @param integer $rid rid
return array($photo, $thumb, $micro);
}
+
+ /**
+ * @param string $exifCoord coordinate
+ * @param string $hemi hemi
+ * @return float
+ */
+ public static function getGps($exifCoord, $hemi)
+ {
+ $degrees = count($exifCoord) > 0 ? self::gps2Num($exifCoord[0]) : 0;
+ $minutes = count($exifCoord) > 1 ? self::gps2Num($exifCoord[1]) : 0;
+ $seconds = count($exifCoord) > 2 ? self::gps2Num($exifCoord[2]) : 0;
+
+ $flip = ($hemi == 'W' || $hemi == 'S') ? -1 : 1;
+
+ return floatval($flip * ($degrees + ($minutes / 60) + ($seconds / 3600)));
+ }
+
+ /**
+ * @param string $coordPart coordPart
+ * @return float
+ */
+ private static function gps2Num($coordPart)
+ {
+ $parts = explode('/', $coordPart);
+
+ if (count($parts) <= 0) {
+ return 0;
+ }
+
+ if (count($parts) == 1) {
+ return $parts[0];
+ }
+
+ return floatval($parts[0]) / floatval($parts[1]);
+ }
+
+ /**
+ * @brief Fetch the photo albums that are available for a viewer
+ *
+ * The query in this function is cost intensive, so it is cached.
+ *
+ * @param int $uid User id of the photos
+ * @param bool $update Update the cache
+ *
+ * @return array Returns array of the photo albums
+ */
+ public static function getAlbums($uid, $update = false)
+ {
+ $sql_extra = permissions_sql($uid);
+
+ $key = "photo_albums:".$uid.":".local_user().":".remote_user();
+ $albums = Cache::get($key);
+ 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 = 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` 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 = 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'))
+ );
+ }
+ Cache::set($key, $albums, CACHE_DAY);
+ }
+ return $albums;
+ }
+
+ /**
+ * @param int $uid User id of the photos
+ * @return void
+ */
+ public static function clearAlbumCache($uid)
+ {
+ $key = "photo_albums:".$uid.":".local_user().":".remote_user();
+ Cache::set($key, null, CACHE_DAY);
+ }
}
use Imagick;
use ImagickPixel;
-require_once "include/photos.php";
-
/**
* Class to handle images
*/
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
+use Friendica\Model\Photo;
use Friendica\Network\Probe;
use Friendica\Protocol\PortableContact;
use dba;
require_once 'include/datetime.php';
require_once 'include/post_update.php';
require_once 'mod/nodeinfo.php';
- require_once 'include/photos.php';
// No parameter set? So return
if ($command == '') {
return;
}
- foreach ($r AS $user) {
- photo_albums($user['uid'], true);
+ foreach ($r as $user) {
+ Photo::clearAlbumCache($user['uid']);
}
}
projects / friendica.git / commitdiff