]> git.mxchange.org Git - friendica.git/blobdiff - mod/photos.php
projects / friendica.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Log the execution time
[friendica.git] / mod / photos.php
diff --git a/mod/photos.php b/mod/photos.php
index ba964ce5fa06515ec828c6f6210824cc3d1412e5..fa8a434c44a14382e0eaebca3344298145abdc6f 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -85,9 +85,6 @@ function photos_init(App $a) {
 
                        $ret['albums'] = [];
                        foreach ($albums as $k => $album) {
-                               //hide profile photos to others
-                               if (!$is_owner && !Session::getRemoteContactID($owner['uid']) && ($album['album'] == DI::l10n()->t(Photo::PROFILE_PHOTOS)))
-                                       continue;
                                $entry = [
                                        'text'      => $album['album'],
                                        'total'     => $album['total'],
@@ -161,6 +158,7 @@ function photos_post(App $a)
 
        if (!$can_post) {
                notice(DI::l10n()->t('Permission denied.'));
+               DI::page()->logRuntime();
                exit();
        }
 
@@ -169,6 +167,7 @@ function photos_post(App $a)
        if (!$owner_record) {
                notice(DI::l10n()->t('Contact information unavailable'));
                DI::logger()->info('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
+               DI::page()->logRuntime();
                exit();
        }
 
@@ -195,12 +194,7 @@ function photos_post(App $a)
                }
                $album = hex2bin(DI::args()->getArgv()[3]);
 
-               if ($album === DI::l10n()->t(Photo::PROFILE_PHOTOS) || $album === Photo::CONTACT_PHOTOS || $album === DI::l10n()->t(Photo::CONTACT_PHOTOS)) {
-                       DI::baseUrl()->redirect($_SESSION['photo_return']);
-                       return; // NOTREACHED
-               }
-
-               if (!DBA::exists('photo', ['album' => $album, 'uid' => $page_owner_uid])) {
+               if (!DBA::exists('photo', ['album' => $album, 'uid' => $page_owner_uid, 'photo-type' => Photo::DEFAULT])) {
                        notice(DI::l10n()->t('Album not found.'));
                        DI::baseUrl()->redirect('photos/' . $user['nickname'] . '/album');
                        return; // NOTREACHED
@@ -212,7 +206,7 @@ function photos_post(App $a)
                }
 
                // RENAME photo album
-               $newalbum = Strings::escapeTags(trim($_POST['albumname']));
+               $newalbum = trim($_POST['albumname'] ?? '');
                if ($newalbum != $album) {
                        Photo::update(['album' => $newalbum], ['album' => $album, 'uid' => $page_owner_uid]);
                        // Update the photo albums cache
@@ -299,11 +293,11 @@ function photos_post(App $a)
        }
 
        if (DI::args()->getArgc() > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || isset($_POST['albname']))) {
-               $desc        = !empty($_POST['desc'])      ? Strings::escapeTags(trim($_POST['desc']))      : '';
-               $rawtags     = !empty($_POST['newtag'])    ? Strings::escapeTags(trim($_POST['newtag']))    : '';
-               $item_id     = !empty($_POST['item_id'])   ? intval($_POST['item_id'])                      : 0;
-               $albname     = !empty($_POST['albname'])   ? trim($_POST['albname'])                        : '';
-               $origaname   = !empty($_POST['origaname']) ? Strings::escapeTags(trim($_POST['origaname'])) : '';
+               $desc      = !empty($_POST['desc'])      ? trim($_POST['desc'])      : '';
+               $rawtags   = !empty($_POST['newtag'])    ? trim($_POST['newtag'])    : '';
+               $item_id   = !empty($_POST['item_id'])   ? intval($_POST['item_id']) : 0;
+               $albname   = !empty($_POST['albname'])   ? trim($_POST['albname'])   : '';
+               $origaname = !empty($_POST['origaname']) ? trim($_POST['origaname']) : '';
 
                $resource_id = DI::args()->getArgv()[3];
 
@@ -612,7 +606,7 @@ function photos_post(App $a)
         * they acquire comments, likes, dislikes, and/or tags
         */
 
-       $r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR', $album, $page_owner_uid]);
+       $r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > ?', $album, $page_owner_uid, DateTimeFormat::utc('now - 3 hours')]);
 
        if (!DBA::isResult($r) || ($album == DI::l10n()->t(Photo::PROFILE_PHOTOS))) {
                $visible = 1;
@@ -711,9 +705,6 @@ function photos_post(App $a)
        @unlink($src);
 
        $max_length = DI::config()->get('system', 'max_image_length');
-       if (!$max_length) {
-               $max_length = MAX_IMAGE_LENGTH;
-       }
        if ($max_length > 0) {
                $image->scaleDown($max_length);
        }
@@ -917,7 +908,7 @@ function photos_content(App $a)
                $albums = Photo::getAlbums($owner_uid);
                if (!empty($albums)) {
                        foreach ($albums as $album) {
-                               if (($album['album'] === '') || ($album['album'] === Photo::CONTACT_PHOTOS) || ($album['album'] === DI::l10n()->t(Photo::CONTACT_PHOTOS))) {
+                               if ($album['album'] === '') {
                                        continue;
                                }
                                $selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
@@ -976,6 +967,10 @@ function photos_content(App $a)
                }
                $album = hex2bin($datum);
 
+               if ($can_post && !Photo::exists(['uid' => $owner_uid, 'album' => $album, 'photo-type' => Photo::DEFAULT])) {
+                       $can_post = false;
+               }
+
                $total = 0;
                $r = DBA::toArray(DBA::p("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = ? AND `album` = ?
                        AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
@@ -1025,27 +1020,23 @@ function photos_content(App $a)
 
                // edit album name
                if ($cmd === 'edit') {
-                       if (($album !== DI::l10n()->t(Photo::PROFILE_PHOTOS)) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS))) {
-                               if ($can_post) {
-                                       $edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl');
-
-                                       $album_e = $album;
-
-                                       $o .= Renderer::replaceMacros($edit_tpl,[
-                                               '$nametext' => DI::l10n()->t('New album name: '),
-                                               '$nickname' => $user['nickname'],
-                                               '$album' => $album_e,
-                                               '$hexalbum' => bin2hex($album),
-                                               '$submit' => DI::l10n()->t('Submit'),
-                                               '$dropsubmit' => DI::l10n()->t('Delete Album')
-                                       ]);
-                               }
-                       }
-               } else {
-                       if (($album !== DI::l10n()->t(Photo::PROFILE_PHOTOS)) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS)) && $can_post) {
-                               $edit = [DI::l10n()->t('Edit Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/edit'];
-                               $drop = [DI::l10n()->t('Drop Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/drop'];
+                       if ($can_post) {
+                               $edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl');
+
+                               $album_e = $album;
+
+                               $o .= Renderer::replaceMacros($edit_tpl,[
+                                       '$nametext' => DI::l10n()->t('New album name: '),
+                                       '$nickname' => $user['nickname'],
+                                       '$album' => $album_e,
+                                       '$hexalbum' => bin2hex($album),
+                                       '$submit' => DI::l10n()->t('Submit'),
+                                       '$dropsubmit' => DI::l10n()->t('Delete Album')
+                               ]);
                        }
+               } elseif ($can_post) {
+                       $edit = [DI::l10n()->t('Edit Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/edit'];
+                       $drop = [DI::l10n()->t('Drop Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/drop'];
                }
 
                if ($order_field === 'posted') {
@@ -1443,7 +1434,7 @@ function photos_content(App $a)
                                        ];
 
                                        $title_e = $item['title'];
-                                       $body_e = BBCode::convert($item['body']);
+                                       $body_e = BBCode::convertForUriId($item['uri-id'], $item['body']);
 
                                        $comments .= Renderer::replaceMacros($template,[
                                                '$id' => $item['id'],
@@ -1546,11 +1537,10 @@ function photos_content(App $a)
        // Default - show recent photos with upload link (if applicable)
        //$o = '';
        $total = 0;
-       $r = DBA::toArray(DBA::p("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = ? AND NOT `photo-type` IN (?, ?)
+       $r = DBA::toArray(DBA::p("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = ? AND `photo-type` = ?
                $sql_extra GROUP BY `resource-id`",
                $user['uid'],
-               Photo::CONTACT_AVATAR,
-               Photo::CONTACT_BANNER
+               Photo::DEFAULT,
        ));
        if (DBA::isResult($r)) {
                $total = count($r);
@@ -1561,11 +1551,10 @@ function photos_content(App $a)
        $r = DBA::toArray(DBA::p("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
                ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`,
                ANY_VALUE(`created`) AS `created` FROM `photo`
-               WHERE `uid` = ? AND NOT `photo-type` IN (?, ?)
+               WHERE `uid` = ? AND `photo-type` = ?
                $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT ? , ?",
                $user['uid'],
-               Photo::CONTACT_AVATAR,
-               Photo::CONTACT_BANNER,
+               Photo::DEFAULT,
                $pager->getStart(),
                $pager->getItemsPerPage()
        ));
@@ -1575,11 +1564,6 @@ function photos_content(App $a)
                // "Twist" is only used for the duepunto theme with style "slackr"
                $twist = false;
                foreach ($r as $rr) {
-                       //hide profile photos to others
-                       if (!$is_owner && !Session::getRemoteContactID($owner_uid) && ($rr['album'] == DI::l10n()->t(Photo::PROFILE_PHOTOS))) {
-                               continue;
-                       }
-
                        $twist = !$twist;
                        $ext = $phototypes[$rr['type']];
 
Unnamed repository; edit this file 'description' to name the repository.