X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=050a254af381d4ce41d7c34e51cfe3a34294e68c;hb=65cd49343100d41f3bc0d93c5861d8f0d6aac964;hp=9624982ca9076a41b0c6c3f7a56e459fb54ea09e;hpb=97a3587e5821d6d2208d38941b36118e7da17059;p=friendica.git diff --git a/mod/photos.php b/mod/photos.php index 9624982ca9..050a254af3 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1,6 +1,6 @@ getArgc() > 1) { - $owner = User::getOwnerDataByNick(DI::args()->getArgv()[1]); + $owner = Profile::load(DI::app(), DI::args()->getArgv()[1], false); if (!isset($owner['account_removed']) || $owner['account_removed']) { throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); } @@ -112,12 +111,6 @@ function photos_init(App $a) ]); } - if (empty(DI::page()['aside'])) { - DI::page()['aside'] = ''; - } - - DI::page()['aside'] .= Widget\VCard::getHTML($owner); - if (!empty($photo_albums_widget)) { DI::page()['aside'] .= $photo_albums_widget; } @@ -565,217 +558,6 @@ function photos_post(App $a) DI::baseUrl()->redirect($_SESSION['photo_return']); return; // NOTREACHED } - - - // default post action - upload a photo - Hook::callAll('photo_post_init', $_POST); - - // Determine the album to use - $album = trim($_REQUEST['album'] ?? ''); - $newalbum = trim($_REQUEST['newalbum'] ?? ''); - - Logger::debug('album= ' . $album . ' newalbum= ' . $newalbum); - - if (!strlen($album)) { - if (strlen($newalbum)) { - $album = $newalbum; - } else { - $album = DateTimeFormat::localNow('Y'); - } - } - - /* - * We create a wall item for every photo, but we don't want to - * overwhelm the data stream with a hundred newly uploaded photos. - * So we will make the first photo uploaded to this album in the last several hours - * visible by default, the rest will become visible over time when and if - * they acquire comments, likes, dislikes, and/or tags - */ - - $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; - } else { - $visible = 0; - } - - if (!empty($_REQUEST['not_visible']) && $_REQUEST['not_visible'] !== 'false') { - $visible = 0; - } - - $ret = ['src' => '', 'filename' => '', 'filesize' => 0, 'type' => '']; - - Hook::callAll('photo_post_file', $ret); - - if (!empty($ret['src']) && !empty($ret['filesize'])) { - $src = $ret['src']; - $filename = $ret['filename']; - $filesize = $ret['filesize']; - $type = $ret['type']; - $error = UPLOAD_ERR_OK; - } elseif (!empty($_FILES['userfile'])) { - $src = $_FILES['userfile']['tmp_name']; - $filename = basename($_FILES['userfile']['name']); - $filesize = intval($_FILES['userfile']['size']); - $type = $_FILES['userfile']['type']; - $error = $_FILES['userfile']['error']; - } else { - $error = UPLOAD_ERR_NO_FILE; - } - - if ($error !== UPLOAD_ERR_OK) { - switch ($error) { - case UPLOAD_ERR_INI_SIZE: - DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', ini_get('upload_max_filesize'))); - break; - case UPLOAD_ERR_FORM_SIZE: - DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($_REQUEST['MAX_FILE_SIZE'] ?? 0))); - break; - case UPLOAD_ERR_PARTIAL: - DI::sysmsg()->addNotice(DI::l10n()->t('Image upload didn\'t complete, please try again')); - break; - case UPLOAD_ERR_NO_FILE: - DI::sysmsg()->addNotice(DI::l10n()->t('Image file is missing')); - break; - case UPLOAD_ERR_NO_TMP_DIR: - case UPLOAD_ERR_CANT_WRITE: - case UPLOAD_ERR_EXTENSION: - DI::sysmsg()->addNotice(DI::l10n()->t('Server can\'t accept new file upload at this time, please contact your administrator')); - break; - } - @unlink($src); - $foo = 0; - Hook::callAll('photo_post_end', $foo); - return; - } - - $type = Images::getMimeTypeBySource($src, $filename, $type); - - Logger::info('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes'); - - $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')); - - if ($maximagesize == 0) { - $maximagesize = INF; - } - - if ($maximagesize && ($filesize > $maximagesize)) { - DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize))); - @unlink($src); - $foo = 0; - Hook::callAll('photo_post_end', $foo); - return; - } - - if (!$filesize) { - DI::sysmsg()->addNotice(DI::l10n()->t('Image file is empty.')); - @unlink($src); - $foo = 0; - Hook::callAll('photo_post_end', $foo); - return; - } - - Logger::debug('loading contents', ['src' => $src]); - - $imagedata = @file_get_contents($src); - - $image = new Image($imagedata, $type); - - if (!$image->isValid()) { - Logger::notice('unable to process image'); - DI::sysmsg()->addNotice(DI::l10n()->t('Unable to process image.')); - @unlink($src); - $foo = 0; - Hook::callAll('photo_post_end',$foo); - return; - } - - $exif = $image->orient($src); - @unlink($src); - - $max_length = DI::config()->get('system', 'max_image_length'); - if ($max_length > 0) { - $image->scaleDown($max_length); - } - - $width = $image->getWidth(); - $height = $image->getHeight(); - - $smallest = 0; - - $resource_id = Photo::newResource(); - - $r = Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0 , Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); - - if (!$r) { - Logger::warning('image store failed'); - DI::sysmsg()->addNotice(DI::l10n()->t('Image upload failed.')); - return; - } - - if ($width > 640 || $height > 640) { - $image->scaleDown(640); - Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 1, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); - $smallest = 1; - } - - if ($width > 320 || $height > 320) { - $image->scaleDown(320); - Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 2, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); - $smallest = 2; - } - - $uri = Item::newURI(); - - // Create item container - $lat = $lon = null; - if (!empty($exif['GPS']) && Feature::isEnabled($page_owner_uid, 'photo_location')) { - $lat = Photo::getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']); - $lon = Photo::getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']); - } - - $arr = []; - if ($lat && $lon) { - $arr['coord'] = $lat . ' ' . $lon; - } - - $arr['guid'] = System::createUUID(); - $arr['uid'] = $page_owner_uid; - $arr['uri'] = $uri; - $arr['post-type'] = Item::PT_IMAGE; - $arr['wall'] = 1; - $arr['resource-id'] = $resource_id; - $arr['contact-id'] = $owner_record['id']; - $arr['owner-name'] = $owner_record['name']; - $arr['owner-link'] = $owner_record['url']; - $arr['owner-avatar'] = $owner_record['thumb']; - $arr['author-name'] = $owner_record['name']; - $arr['author-link'] = $owner_record['url']; - $arr['author-avatar'] = $owner_record['thumb']; - $arr['title'] = ''; - $arr['allow_cid'] = $str_contact_allow; - $arr['allow_gid'] = $str_group_allow; - $arr['deny_cid'] = $str_contact_deny; - $arr['deny_gid'] = $str_group_deny; - $arr['visible'] = $visible; - $arr['origin'] = 1; - - $arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $resource_id . ']' - . '[img]' . DI::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$image->getExt() . '[/img]' - . '[/url]'; - - $item_id = Item::insert($arr); - // Update the photo albums cache - Photo::clearAlbumCache($page_owner_uid); - - Hook::callAll('photo_post_end', $item_id); - - // addon uploaders should call "exit()" within the photo_post_end hook - // if they do not wish to be redirected - - DI::baseUrl()->redirect($_SESSION['photo_return']); - // NOTREACHED } function photos_content(App $a) @@ -869,9 +651,8 @@ function photos_content(App $a) $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => $owner_uid, 'blocked' => false, 'pending' => false]); } - if ($user['hidewall'] && (DI::userSession()->getLocalUserId() != $owner_uid) && !$remote_contact) { - DI::sysmsg()->addNotice(DI::l10n()->t('Access to this item is restricted.')); - return; + if ($user['hidewall'] && !DI::userSession()->isAuthenticated()) { + DI::baseUrl()->redirect('profile/' . $user['nickname'] . '/restricted'); } $sql_extra = Security::getPermissionsSQLByUserId($owner_uid); @@ -880,7 +661,7 @@ function photos_content(App $a) // tabs $is_owner = (DI::userSession()->getLocalUserId() && (DI::userSession()->getLocalUserId() == $owner_uid)); - $o .= BaseProfile::getTabsHTML($a, 'photos', $is_owner, $user['nickname'], $profile['hide-friends']); + $o .= BaseProfile::getTabsHTML('photos', $is_owner, $user['nickname'], $profile['hide-friends']); // Display upload form if ($datatype === 'upload') { @@ -889,6 +670,9 @@ function photos_content(App $a) return; } + // This prevents the photo upload form to return to itself without a hint the picture has been correctly uploaded. + DI::session()->remove('photo_return'); + $selname = (!is_null($datum) && Strings::isHex($datum)) ? hex2bin($datum) : ''; $albumselect = ''; @@ -918,7 +702,6 @@ function photos_content(App $a) '$submit' => DI::l10n()->t('Submit'), ]); - $maximagesize_Mbytes = 0; // Get the relevant size limits for uploads. Abbreviated var names: MaxImageSize -> mis; upload_max_filesize -> umf $mis_bytes = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')); $umf_bytes = Strings::getBytesFromShorthand(ini_get('upload_max_filesize')); @@ -929,10 +712,10 @@ function photos_content(App $a) } // When PHP is configured with upload_max_filesize less than maximagesize provide this lower limit. - $maximagesize_Mbytes = (is_numeric($mis_bytes) && ($mis_bytes < $umf_bytes) ? $mis_bytes : $umf_bytes) / (1048576); + $maximagesize_bytes = (is_numeric($mis_bytes) && ($mis_bytes < $umf_bytes) ? $mis_bytes : $umf_bytes); // @todo We may be want to use appropriate binary prefixed dynamicly - $usage_message = DI::l10n()->t('The maximum accepted image size is %.6g MB', $maximagesize_Mbytes); + $usage_message = DI::l10n()->t('The maximum accepted image size is %s', Strings::formatBytes($maximagesize_bytes)); $tpl = Renderer::getMarkupTemplate('photos_upload.tpl'); @@ -1135,7 +918,7 @@ function photos_content(App $a) if ($order_field === 'created') { $params = ['order' => [$order_field]]; - } elseif (!empty($order_field)) { + } elseif (!empty($order_field) && DBStructure::existsColumn('photo', [$order_field])) { $params = ['order' => [$order_field => true]]; } else { $params = []; @@ -1148,11 +931,17 @@ function photos_content(App $a) $nxt = null; foreach ($prvnxt as $z => $entry) { if ($entry['resource-id'] == $ph[0]['resource-id']) { - $prv = $z - 1; - $nxt = $z + 1; + $prv = $order_field === 'created' ? $z - 1 : $z + 1; + $nxt = $order_field === 'created' ? $z + 1 : $z - 1; if ($prv < 0) { $prv = count($prvnxt) - 1; } + if ($nxt < 0) { + $nxt = count($prvnxt) - 1; + } + if ($prv >= count($prvnxt)) { + $prv = 0; + } if ($nxt >= count($prvnxt)) { $nxt = 0; }