/**
* @file mod/photos.php
*/
+
use Friendica\App;
use Friendica\Content\Feature;
use Friendica\Content\Nav;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\ACL;
use Friendica\Core\Addon;
-use Friendica\Core\System;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Group;
+use Friendica\Model\Item;
use Friendica\Model\Photo;
use Friendica\Model\Profile;
+use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Protocol\DFRN;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Map;
+use Friendica\Util\Temporal;
require_once 'include/items.php';
-require_once 'include/acl_selectors.php';
-require_once 'include/bbcode.php';
require_once 'include/security.php';
-require_once 'include/tags.php';
-require_once 'include/threads.php';
function photos_init(App $a) {
$ret['albums'] = [];
foreach ($albums as $k => $album) {
//hide profile photos to others
- if (!$is_owner && !remote_user() && ($album['album'] == t('Profile Photos')))
+ if (!$is_owner && !remote_user() && ($album['album'] == L10n::t('Profile Photos')))
continue;
$entry = [
'text' => $album['album'],
if ($ret['success']) {
$photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'), [
'$nick' => $a->data['user']['nickname'],
- '$title' => t('Photo Albums'),
- '$recent' => t('Recent Photos'),
+ '$title' => L10n::t('Photo Albums'),
+ '$recent' => L10n::t('Recent Photos'),
'$albums' => $ret['albums'],
'$baseurl' => System::baseUrl(),
- '$upload' => [t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'],
+ '$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'],
'$can_post' => $can_post
]);
}
$tpl = get_markup_template("photos_head.tpl");
$a->page['htmlhead'] .= replace_macros($tpl,[
- '$ispublic' => t('everybody')
+ '$ispublic' => L10n::t('everybody')
]);
}
}
if (!$can_post) {
- notice( t('Permission denied.') . EOL );
+ notice(L10n::t('Permission denied.') . EOL);
killme();
}
- $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
- WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1",
- intval($page_owner_uid)
- );
+ $owner_record = User::getOwnerDataById($page_owner_uid);
- if (!DBM::is_result($r)) {
- notice( t('Contact information unavailable') . EOL);
+ if (!$owner_record) {
+ notice(L10n::t('Contact information unavailable') . EOL);
logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
killme();
}
- $owner_record = $r[0];
-
if ($a->argc > 3 && $a->argv[2] === 'album') {
$album = hex2bin($a->argv[3]);
- if ($album === t('Profile Photos') || $album === 'Contact Photos' || $album === t('Contact Photos')) {
+ if ($album === L10n::t('Profile Photos') || $album === 'Contact Photos' || $album === L10n::t('Contact Photos')) {
goaway($_SESSION['photo_return']);
return; // NOTREACHED
}
intval($page_owner_uid)
);
if (!DBM::is_result($r)) {
- notice( t('Album not found.') . EOL);
+ notice(L10n::t('Album not found.') . EOL);
goaway($_SESSION['photo_return']);
return; // NOTREACHED
}
* DELETE photo album and all its photos
*/
- if ($_POST['dropalbum'] == t('Delete Album')) {
+ if ($_POST['dropalbum'] == L10n::t('Delete Album')) {
// Check if we should do HTML-based delete confirmation
if (x($_REQUEST, 'confirm')) {
$drop_url = $a->query_string;
];
$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
'$method' => 'post',
- '$message' => t('Do you really want to delete this photo album and all its photos?'),
+ '$message' => L10n::t('Do you really want to delete this photo album and all its photos?'),
'$extra_inputs' => $extra_inputs,
- '$confirm' => t('Delete Album'),
+ '$confirm' => L10n::t('Delete Album'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'dropalbum', // Needed so that confirmation will bring us back into this if statement
- '$cancel' => t('Cancel'),
+ '$cancel' => L10n::t('Cancel'),
]);
$a->error = 1; // Set $a->error so the other module functions don't execute
return;
$str_res = implode(',', $res);
// remove the associated photos
- q("DELETE FROM `photo` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
+ q("DELETE FROM `photo` WHERE `resource-id` IN ($str_res) AND `uid` = %d",
intval($page_owner_uid)
);
// find and delete the corresponding item with all the comments and likes/dislikes
- $r = q("SELECT `id`, `parent-uri`, `visible` FROM `item` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
- intval($page_owner_uid)
- );
- if (DBM::is_result($r)) {
- foreach ($r as $rr) {
- q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
- dbesc(datetime_convert()),
- dbesc($rr['parent-uri']),
- intval($page_owner_uid)
- );
- create_tags_from_itemuri($rr['parent-uri'], $page_owner_uid);
- delete_thread_uri($rr['parent-uri'], $page_owner_uid);
-
- $drop_id = intval($rr['id']);
-
- // send the notification upstream/downstream as the case may be
- if ($rr['visible']) {
- Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
- }
- }
- }
+ Item::deleteForUser(['resource-id' => $res, 'uid' => $page_owner_uid], $page_owner_uid);
// Update the photo albums cache
Photo::clearAlbumCache($page_owner_uid);
goaway($_SESSION['photo_return']);
}
- if ($a->argc > 2 && defaults($_POST, 'delete', '') === t('Delete Photo')) {
+ if ($a->argc > 2 && defaults($_POST, 'delete', '') === L10n::t('Delete Photo')) {
// same as above but remove single photo
$drop_url = $a->query_string;
$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
'$method' => 'post',
- '$message' => t('Do you really want to delete this photo?'),
+ '$message' => L10n::t('Do you really want to delete this photo?'),
'$extra_inputs' => [],
- '$confirm' => t('Delete Photo'),
+ '$confirm' => L10n::t('Delete Photo'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'delete', // Needed so that confirmation will bring us back into this if statement
- '$cancel' => t('Cancel'),
+ '$cancel' => L10n::t('Cancel'),
]);
$a->error = 1; // Set $a->error so the other module functions don't execute
return;
intval($page_owner_uid),
dbesc($r[0]['resource-id'])
);
- $i = q("SELECT `id`, `uri`, `visible` FROM `item` WHERE `resource-id` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($r[0]['resource-id']),
- intval($page_owner_uid)
- );
- if (DBM::is_result($i)) {
- q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc($i[0]['uri']),
- intval($page_owner_uid)
- );
- create_tags_from_itemuri($i[0]['uri'], $page_owner_uid);
- delete_thread_uri($i[0]['uri'], $page_owner_uid);
- $url = System::baseUrl();
- $drop_id = intval($i[0]['id']);
+ Item::deleteForUser(['resource-id' => $r[0]['resource-id'], 'uid' => $page_owner_uid], $page_owner_uid);
- // Update the photo albums cache
- Photo::clearAlbumCache($page_owner_uid);
-
- if ($i[0]['visible']) {
- Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
- }
- }
+ // Update the photo albums cache
+ Photo::clearAlbumCache($page_owner_uid);
}
goaway('photos/' . $a->data['user']['nickname']);
$resource_id = $a->argv[2];
if (!strlen($albname)) {
- $albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+ $albname = DateTimeFormat::localNow('Y');
}
if (x($_POST,'rotate') !== false &&
if (DBM::is_result($r)) {
$Image = new Image($r[0]['data'], $r[0]['type']);
if ($Image->isValid()) {
- $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
+ $rotate_deg = ((intval($_POST['rotate']) == 1) ? 270 : 90);
$Image->rotate($rotate_deg);
$width = $Image->getWidth();
if (!$item_id) {
// Create item container
$title = '';
- $uri = item_new_uri($a->get_hostname(),$page_owner_uid);
+ $uri = Item::newURI($page_owner_uid);
$arr = [];
$arr['guid'] = get_guid(32);
. '[img]' . System::baseUrl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
. '[/url]';
- $item_id = item_store($arr);
+ $item_id = Item::insert($arr);
}
if ($item_id) {
- $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($item_id),
- intval($page_owner_uid)
- );
+ $item = Item::selectFirst(['tag', 'inform'], ['id' => $item_id, 'uid' => $page_owner_uid]);
}
- if (DBM::is_result($r)) {
- $old_tag = $r[0]['tag'];
- $old_inform = $r[0]['inform'];
+ if (DBM::is_result($item)) {
+ $old_tag = $item['tag'];
+ $old_inform = $item['inform'];
}
if (strlen($rawtags)) {
}
$newinform .= $inform;
- $r = q("UPDATE `item` SET `tag` = '%s', `inform` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d",
- dbesc($newtag),
- dbesc($newinform),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($item_id),
- intval($page_owner_uid)
- );
- create_tags_from_item($item_id);
- update_thread($item_id);
+ $fields = ['tag' => $newtag, 'inform' => $newinform, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()];
+ $condition = ['id' => $item_id];
+ Item::update($fields, $condition);
$best = 0;
foreach ($p as $scales) {
if (count($taginfo)) {
foreach ($taginfo as $tagged) {
- $uri = item_new_uri($a->get_hostname(), $page_owner_uid);
+ $uri = Item::newURI($page_owner_uid);
$arr = [];
$arr['guid'] = get_guid(32);
$arr['tag'] = $tagged[4];
$arr['inform'] = $tagged[2];
$arr['origin'] = 1;
- $arr['body'] = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
+ $arr['body'] = L10n::t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
$arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
. System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
- $item_id = item_store($arr);
+ $item_id = Item::insert($arr);
if ($item_id) {
Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id);
}
if (strlen($newalbum)) {
$album = $newalbum;
} else {
- $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+ $album = DateTimeFormat::localNow('Y');
}
}
dbesc($album),
intval($page_owner_uid)
);
- if (!DBM::is_result($r) || ($album == t('Profile Photos'))) {
+ if (!DBM::is_result($r) || ($album == L10n::t('Profile Photos'))) {
$visible = 1;
} else {
$visible = 0;
if ($error !== UPLOAD_ERR_OK) {
switch ($error) {
case UPLOAD_ERR_INI_SIZE:
- notice(t('Image exceeds size limit of %s', ini_get('upload_max_filesize')) . EOL);
+ notice(L10n::t('Image exceeds size limit of %s', ini_get('upload_max_filesize')) . EOL);
break;
case UPLOAD_ERR_FORM_SIZE:
- notice(t('Image exceeds size limit of %s', formatBytes(defaults($_REQUEST, 'MAX_FILE_SIZE', 0))) . EOL);
+ notice(L10n::t('Image exceeds size limit of %s', formatBytes(defaults($_REQUEST, 'MAX_FILE_SIZE', 0))) . EOL);
break;
case UPLOAD_ERR_PARTIAL:
- notice(t('Image upload didn\'t complete, please try again') . EOL);
+ notice(L10n::t('Image upload didn\'t complete, please try again') . EOL);
break;
case UPLOAD_ERR_NO_FILE:
- notice(t('Image file is missing') . EOL);
+ notice(L10n::t('Image file is missing') . EOL);
break;
case UPLOAD_ERR_NO_TMP_DIR:
case UPLOAD_ERR_CANT_WRITE:
case UPLOAD_ERR_EXTENSION:
- notice(t('Server can\'t accept new file upload at this time, please contact your administrator') . EOL);
+ notice(L10n::t('Server can\'t accept new file upload at this time, please contact your administrator') . EOL);
break;
}
@unlink($src);
$maximagesize = Config::get('system', 'maximagesize');
if ($maximagesize && ($filesize > $maximagesize)) {
- notice(t('Image exceeds size limit of %s', formatBytes($maximagesize)) . EOL);
+ notice(L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize)) . EOL);
@unlink($src);
$foo = 0;
Addon::callHooks('photo_post_end', $foo);
}
if (!$filesize) {
- notice(t('Image file is empty.') . EOL);
+ notice(L10n::t('Image file is empty.') . EOL);
@unlink($src);
$foo = 0;
Addon::callHooks('photo_post_end', $foo);
if (!$Image->isValid()) {
logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
- notice(t('Unable to process image.') . EOL);
+ notice(L10n::t('Unable to process image.') . EOL);
@unlink($src);
$foo = 0;
Addon::callHooks('photo_post_end',$foo);
$smallest = 0;
- $photo_hash = photo_new_resource();
+ $photo_hash = Photo::newResource();
$r = Photo::store($Image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
if (!$r) {
- logger('mod/photos.php: photos_post(): image store failed' , LOGGER_DEBUG);
- notice(t('Image upload failed.') . EOL);
+ logger('mod/photos.php: photos_post(): image store failed', LOGGER_DEBUG);
+ notice(L10n::t('Image upload failed.') . EOL);
killme();
}
$smallest = 2;
}
- $uri = item_new_uri($a->get_hostname(), $page_owner_uid);
+ $uri = Item::newURI($page_owner_uid);
// Create item container
$lat = $lon = null;
- if ($exif && $exif['GPS'] && Feature::isEnabled($channel_id, 'photo_location')) {
+ if ($exif && $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']);
}
. '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$Image->getExt() . '[/img]'
. '[/url]';
- $item_id = item_store($arr);
+ $item_id = Item::insert($arr);
// Update the photo albums cache
Photo::clearAlbumCache($page_owner_uid);
// photos/name/image/xxxxx/edit
if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
- notice( t('Public access denied.') . EOL);
+ notice(L10n::t('Public access denied.') . EOL);
return;
}
- require_once 'include/bbcode.php';
require_once 'include/security.php';
require_once 'include/conversation.php';
if (!x($a->data,'user')) {
- notice( t('No photos selected') . EOL );
+ notice(L10n::t('No photos selected') . EOL);
return;
}
}
if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) {
- notice( t('Access to this item is restricted.') . EOL);
+ notice(L10n::t('Access to this item is restricted.') . EOL);
return;
}
// Display upload form
if ($datatype === 'upload') {
if (!$can_post) {
- notice(t('Permission denied.'));
+ notice(L10n::t('Permission denied.'));
return;
}
$albumselect .= '<option value="" ' . (!$selname ? ' selected="selected" ' : '') . '> </option>';
if (count($a->data['albums'])) {
foreach ($a->data['albums'] as $album) {
- if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos'))) {
+ if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === L10n::t('Contact Photos'))) {
continue;
}
$selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
$default_upload_box = replace_macros(get_markup_template('photos_default_uploader_box.tpl'), []);
$default_upload_submit = replace_macros(get_markup_template('photos_default_uploader_submit.tpl'), [
- '$submit' => t('Submit'),
+ '$submit' => L10n::t('Submit'),
]);
$usage_message = '';
$tpl = get_markup_template('photos_upload.tpl');
- $aclselect_e = ($visitor ? '' : populate_acl($a->user));
+ $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML($a->user));
$o .= replace_macros($tpl,[
- '$pagename' => t('Upload Photos'),
+ '$pagename' => L10n::t('Upload Photos'),
'$sessid' => session_id(),
'$usage' => $usage_message,
'$nickname' => $a->data['user']['nickname'],
- '$newalbum' => t('New album name: '),
- '$existalbumtext' => t('or existing album name: '),
- '$nosharetext' => t('Do not show a status post for this upload'),
+ '$newalbum' => L10n::t('New album name: '),
+ '$existalbumtext' => L10n::t('or existing album name: '),
+ '$nosharetext' => L10n::t('Do not show a status post for this upload'),
'$albumselect' => $albumselect,
- '$permissions' => t('Permissions'),
+ '$permissions' => L10n::t('Permissions'),
'$aclselect' => $aclselect_e,
'$alt_uploader' => $ret['addon_text'],
'$default_upload_box' => ($ret['default_upload'] ? $default_upload_box : ''),
'$uploadurl' => $ret['post_url'],
// ACL permissions box
- '$group_perms' => t('Show to Groups'),
- '$contact_perms' => t('Show to Contacts'),
+ '$group_perms' => L10n::t('Show to Groups'),
+ '$contact_perms' => L10n::t('Show to Contacts'),
'$return_path' => $a->query_string,
]);
// edit album name
if ($cmd === 'edit') {
- if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
+ if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos'))) {
if ($can_post) {
$edit_tpl = get_markup_template('album_edit.tpl');
$album_e = $album;
$o .= replace_macros($edit_tpl,[
- '$nametext' => t('New album name: '),
+ '$nametext' => L10n::t('New album name: '),
'$nickname' => $a->data['user']['nickname'],
'$album' => $album_e,
'$hexalbum' => bin2hex($album),
- '$submit' => t('Submit'),
- '$dropsubmit' => t('Delete Album')
+ '$submit' => L10n::t('Submit'),
+ '$dropsubmit' => L10n::t('Delete Album')
]);
}
}
} else {
- if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos')) && $can_post) {
- $edit = [t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit'];
+ if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos')) && $can_post) {
+ $edit = [L10n::t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit'];
}
}
if ($order_field === 'posted') {
- $order = [t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album)];
+ $order = [L10n::t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album)];
} else {
- $order = [t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted'];
+ $order = [L10n::t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted'];
}
$photos = [];
'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
. ($order_field === 'posted' ? '?f=&order=posted' : ''),
- 'title' => t('View Photo'),
+ 'title' => L10n::t('View Photo'),
'src' => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
'alt' => $imgalt_e,
'desc'=> $desc_e,
'$photos' => $photos,
'$album' => $album,
'$can_post' => $can_post,
- '$upload' => [t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)],
+ '$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)],
'$order' => $order,
'$edit' => $edit,
'$paginate' => paginate($a),
dbesc($datum)
);
if (DBM::is_result($ph)) {
- notice(t('Permission denied. Access to this item may be restricted.'));
+ notice(L10n::t('Permission denied. Access to this item may be restricted.'));
} else {
- notice(t('Photo not available') . EOL );
+ notice(L10n::t('Photo not available') . EOL);
}
return;
}
$prevlink = '';
$nextlink = '';
- /// @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.
+ /*
+ * @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)) {
- $order_field = defaults($_GET, 'order', '');
- if ($order_field === 'posted') {
+ if ($_GET['order'] === 'posted') {
$order = 'ASC';
} else {
$order = 'DESC';
}
}
- if (count($ph) == 1)
+ if (count($ph) == 1) {
$hires = $lores = $ph[0];
+ }
+
if (count($ph) > 1) {
if ($ph[1]['scale'] == 2) {
// original is 640 or less, we can display it directly
}
$album_link = 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
+
$tools = null;
$lock = null;
if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
$tools = [
- 'edit' => ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))],
- 'profile'=>['profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')],
+ 'edit' => ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? L10n::t('View photo') : L10n::t('Edit photo'))],
+ 'profile'=>['profile_photo/use/'.$ph[0]['resource-id'], L10n::t('Use as profile photo')],
];
// lock
- $lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
- || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
- ? t('Private Message')
+ $lock = ((($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
+ || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])))
+ ? L10n::t('Private Message')
: Null);
}
- if ( $cmd === 'edit') {
+ if ($cmd === 'edit') {
$tpl = get_markup_template('photo_edit_head.tpl');
$a->page['htmlhead'] .= replace_macros($tpl,[
'$prevlink' => $prevlink,
]);
}
- if ($prevlink)
+ if ($prevlink) {
$prevlink = [$prevlink, '<div class="icon prev"></div>'] ;
+ }
$photo = [
'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
- 'title'=> t('View Full Size'),
- 'src' => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . datetime_convert('','','','ymdhis'),
+ 'title'=> L10n::t('View Full Size'),
+ 'src' => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . DateTimeFormat::utcNow('ymdhis'),
'height' => $hires['height'],
'width' => $hires['width'],
'album' => $hires['album'],
// The difference is that we won't be displaying the conversation head item
// as a "post" but displaying instead the photo it is linked to
- $linked_items = q("SELECT * FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
+ /// @todo Rewrite this query. To do so, $sql_extra must be changed
+ $linked_items = q("SELECT `id` FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
dbesc($datum)
);
$link_item = [];
if (DBM::is_result($linked_items)) {
- $link_item = $linked_items[0];
+ // This is a workaround to not being forced to rewrite the while $sql_extra handling
+ $link_item = Item::selectFirstForUser(local_user(), [], ['id' => $linked_items[0]['id']]);
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
);
if (local_user() && (local_user() == $link_item['uid'])) {
- q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d and `uid` = %d",
- intval($link_item['parent']),
- intval(local_user())
- );
- update_thread($link_item['parent']);
+ Item::update(['unseen' => false], ['parent' => $link_item['parent']]);
}
if ($link_item['coord']) {
if (strlen($tag_str)) {
$tag_str .= ', ';
}
- $tag_str .= bbcode($t);
+ $tag_str .= BBCode::convert($t);
}
- $tags = [t('Tags: '), $tag_str];
+ $tags = [L10n::t('Tags: '), $tag_str];
if ($cmd === 'edit') {
$tags[] = 'tagrm/' . $link_item['id'];
- $tags[] = t('[Remove any tag]');
+ $tags[] = L10n::t('[Remove any tag]');
}
}
$album_e = $ph[0]['album'];
$caption_e = $ph[0]['desc'];
- $aclselect_e = populate_acl($ph[0]);
+ $aclselect_e = ACL::getFullSelectorHTML($ph[0]);
$edit = replace_macros($edit_tpl, [
'$id' => $ph[0]['id'],
- '$album' => ['albname', t('New album name'), $album_e,''],
- '$caption' => ['desc', t('Caption'), $caption_e, ''],
- '$tags' => ['newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')],
- '$rotate_none' => ['rotate', t('Do not rotate'),0,'', true],
- '$rotate_cw' => ['rotate', t('Rotate CW (right)'),1,''],
- '$rotate_ccw' => ['rotate', t('Rotate CCW (left)'),2,''],
+ '$album' => ['albname', L10n::t('New album name'), $album_e,''],
+ '$caption' => ['desc', L10n::t('Caption'), $caption_e, ''],
+ '$tags' => ['newtag', L10n::t('Add a Tag'), "", L10n::t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')],
+ '$rotate_none' => ['rotate', L10n::t('Do not rotate'),0,'', true],
+ '$rotate_cw' => ['rotate', L10n::t("Rotate CW \x28right\x29"),1,''],
+ '$rotate_ccw' => ['rotate', L10n::t("Rotate CCW \x28left\x29"),2,''],
'$nickname' => $a->data['user']['nickname'],
'$resource_id' => $ph[0]['resource-id'],
- '$permissions' => t('Permissions'),
+ '$permissions' => L10n::t('Permissions'),
'$aclselect' => $aclselect_e,
'$item_id' => defaults($link_item, 'id', 0),
- '$submit' => t('Submit'),
- '$delete' => t('Delete Photo'),
+ '$submit' => L10n::t('Submit'),
+ '$delete' => L10n::t('Delete Photo'),
// ACL permissions box
- '$group_perms' => t('Show to Groups'),
- '$contact_perms' => t('Show to Contacts'),
+ '$group_perms' => L10n::t('Show to Groups'),
+ '$contact_perms' => L10n::t('Show to Contacts'),
'$return_path' => $a->query_string,
]);
}
$like_tpl = get_markup_template('like_noshare.tpl');
$likebuttons = replace_macros($like_tpl, [
'$id' => $link_item['id'],
- '$likethis' => t("I like this \x28toggle\x29"),
- '$nolike' => (Feature::isEnabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''),
- '$wait' => t('Please wait'),
+ '$likethis' => L10n::t("I like this \x28toggle\x29"),
+ '$nolike' => (Feature::isEnabled(local_user(), 'dislike') ? L10n::t("I don't like this \x28toggle\x29") : ''),
+ '$wait' => L10n::t('Please wait'),
'$return_path' => $a->query_string,
]);
}
'$parent' => $link_item['id'],
'$profile_uid' => $owner_uid,
'$mylink' => $contact['url'],
- '$mytitle' => t('This is you'),
+ '$mytitle' => L10n::t('This is you'),
'$myphoto' => $contact['thumb'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$preview' => t('Preview'),
- '$sourceapp' => t($a->sourcename),
+ '$comment' => L10n::t('Comment'),
+ '$submit' => L10n::t('Submit'),
+ '$preview' => L10n::t('Preview'),
+ '$sourceapp' => L10n::t($a->sourcename),
'$ww' => '',
'$rand_num' => random_digits(12)
]);
}
$conv_responses = [
- 'like' => ['title' => t('Likes','title')],'dislike' => ['title' => t('Dislikes','title')],
- 'attendyes' => ['title' => t('Attending','title')], 'attendno' => ['title' => t('Not attending','title')], 'attendmaybe' => ['title' => t('Might attend','title')]
+ 'like' => ['title' => L10n::t('Likes','title')],'dislike' => ['title' => L10n::t('Dislikes','title')],
+ 'attendyes' => ['title' => L10n::t('Attending','title')], 'attendno' => ['title' => L10n::t('Not attending','title')], 'attendmaybe' => ['title' => L10n::t('Might attend','title')]
];
// display comments
'$parent' => $link_item['id'],
'$profile_uid' => $owner_uid,
'$mylink' => $contact['url'],
- '$mytitle' => t('This is you'),
+ '$mytitle' => L10n::t('This is you'),
'$myphoto' => $contact['thumb'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$preview' => t('Preview'),
- '$sourceapp' => t($a->sourcename),
+ '$comment' => L10n::t('Comment'),
+ '$submit' => L10n::t('Submit'),
+ '$preview' => L10n::t('Preview'),
+ '$sourceapp' => L10n::t($a->sourcename),
'$ww' => '',
'$rand_num' => random_digits(12)
]);
continue;
}
- $redirect_url = 'redir/' . $item['cid'];
-
- if (local_user() && ($item['contact-uid'] == local_user())
- && ($item['network'] == NETWORK_DFRN) && !$item['self']) {
- $profile_url = $redirect_url;
+ $profile_url = Contact::MagicLinkById($item['cid']);
+ if (strpos($profile_url, 'redir/') === 0) {
$sparkle = ' sparkle';
} else {
- $profile_url = $item['url'];
$sparkle = '';
}
$drop = [
'dropping' => $dropping,
'pagedrop' => false,
- 'select' => t('Select'),
- 'delete' => t('Delete'),
+ 'select' => L10n::t('Select'),
+ 'delete' => L10n::t('Delete'),
];
$name_e = $profile_name;
$title_e = $item['title'];
- $body_e = bbcode($item['body']);
+ $body_e = BBCode::convert($item['body']);
$comments .= replace_macros($template,[
'$id' => $item['item_id'],
'$sparkle' => $sparkle,
'$title' => $title_e,
'$body' => $body_e,
- '$ago' => relative_date($item['created']),
+ '$ago' => Temporal::getRelativeDate($item['created']),
'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
'$drop' => $drop,
'$comment' => $comment
'$parent' => $item['parent'],
'$profile_uid' => $owner_uid,
'$mylink' => $contact['url'],
- '$mytitle' => t('This is you'),
+ '$mytitle' => L10n::t('This is you'),
'$myphoto' => $contact['thumb'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$preview' => t('Preview'),
- '$sourceapp' => t($a->sourcename),
+ '$comment' => L10n::t('Comment'),
+ '$submit' => L10n::t('Submit'),
+ '$preview' => L10n::t('Preview'),
+ '$sourceapp' => L10n::t($a->sourcename),
'$ww' => '',
'$rand_num' => random_digits(12)
]);
'$tags' => $tags,
'$edit' => $edit,
'$map' => $map,
- '$map_text' => t('Map'),
+ '$map_text' => L10n::t('Map'),
'$likebuttons' => $likebuttons,
'$like' => $like,
'$dislike' => $dislike,
$sql_extra GROUP BY `resource-id`",
intval($a->data['user']['uid']),
dbesc('Contact Photos'),
- dbesc( t('Contact Photos'))
+ dbesc(L10n::t('Contact Photos'))
);
if (DBM::is_result($r)) {
$a->set_pager_total(count($r));
$sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
intval($a->data['user']['uid']),
dbesc('Contact Photos'),
- dbesc( t('Contact Photos')),
+ dbesc(L10n::t('Contact Photos')),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
$twist = false;
foreach ($r as $rr) {
//hide profile photos to others
- if (!$is_owner && !remote_user() && ($rr['album'] == t('Profile Photos')))
+ if (!$is_owner && !remote_user() && ($rr['album'] == L10n::t('Profile Photos'))) {
continue;
+ }
$twist = !$twist;
'id' => $rr['id'],
'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
- 'title' => t('View Photo'),
+ 'title' => L10n::t('View Photo'),
'src' => 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
'alt' => $alt_e,
'album' => [
'link' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
'name' => $name_e,
- 'alt' => t('View Album'),
+ 'alt' => L10n::t('View Album'),
],
];
$tpl = get_markup_template('photos_recent.tpl');
$o .= replace_macros($tpl, [
- '$title' => t('Recent Photos'),
+ '$title' => L10n::t('Recent Photos'),
'$can_post' => $can_post,
- '$upload' => [t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'],
+ '$upload' => [L10n::t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'],
'$photos' => $photos,
'$paginate' => paginate($a),
]);
projects / friendica.git / blobdiff