X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=34eea0c64296ac846759779685166d7e1a7bb416;hb=afa194200beb2b814612119acb5ab5cf54ae4d36;hp=460deba25d44bdbe751bb7eeac18674e0823d602;hpb=9a3e773a9a0464a309e4891f40c1105c8e2fed33;p=friendica.git diff --git a/mod/photos.php b/mod/photos.php index 460deba25d..34eea0c642 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -2,38 +2,45 @@ /** * @file mod/photos.php */ + use Friendica\App; use Friendica\Content\Feature; -use Friendica\Core\System; +use Friendica\Content\Nav; +use Friendica\Content\Text\BBCode; +use Friendica\Core\ACL; +use Friendica\Core\Addon; 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/photos.php'; require_once 'include/items.php'; -require_once 'include/acl_selectors.php'; -require_once 'include/bbcode.php'; require_once 'include/security.php'; -require_once 'include/redir.php'; -require_once 'include/tags.php'; -require_once 'include/threads.php'; function photos_init(App $a) { if ($a->argc > 1) { - auto_redir($a, $a->argv[1]); + DFRN::autoRedir($a, $a->argv[1]); } if (Config::get('system', 'block_public') && !local_user() && !remote_user()) { return; } - nav_set_selected('home'); + Nav::setSelected('home'); if ($a->argc > 1) { $nick = $a->argv[1]; @@ -49,26 +56,26 @@ function photos_init(App $a) { $a->profile_uid = $user[0]['uid']; $is_owner = (local_user() && (local_user() == $a->profile_uid)); - $profile = get_profiledata_by_nick($nick, $a->profile_uid); + $profile = Profile::getByNickname($nick, $a->profile_uid); $account_type = Contact::getAccountType($profile); $tpl = get_markup_template("vcard-widget.tpl"); - $vcard_widget = replace_macros($tpl, array( + $vcard_widget = replace_macros($tpl, [ '$name' => $profile['name'], '$photo' => $profile['photo'], '$addr' => defaults($profile, 'addr', ''), '$account_type' => $account_type, '$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); // add various encodings to the array so we can just loop through and pick them out in a template - $ret = array('success' => false); + $ret = ['success' => false]; if ($albums) { $a->data['albums'] = $albums; @@ -76,18 +83,18 @@ function photos_init(App $a) { $ret['success'] = true; } - $ret['albums'] = array(); + $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 = array( + $entry = [ 'text' => $album['album'], 'total' => $album['total'], 'url' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']), 'urlencode' => urlencode($album['album']), 'bin2hex' => bin2hex($album['album']) - ); + ]; $ret['albums'][] = $entry; } } @@ -97,15 +104,15 @@ function photos_init(App $a) { } if ($ret['success']) { - $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'), array( + $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' => array(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 - )); + ]); } @@ -116,9 +123,9 @@ function photos_init(App $a) { $a->page['aside'] .= $photo_albums_widget; $tpl = get_markup_template("photos_head.tpl"); - $a->page['htmlhead'] .= replace_macros($tpl,array( - '$ispublic' => t('everybody') - )); + $a->page['htmlhead'] .= replace_macros($tpl,[ + '$ispublic' => L10n::t('everybody') + ]); } return; @@ -165,27 +172,22 @@ function photos_post(App $a) } 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 } @@ -195,7 +197,7 @@ function photos_post(App $a) 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 } @@ -214,7 +216,7 @@ function photos_post(App $a) 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); @@ -225,27 +227,27 @@ function photos_post(App $a) * 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; - $extra_inputs = array( - array('name' => 'albumname', 'value' => $_POST['albumname']), - ); - $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array( + $extra_inputs = [ + ['name' => 'albumname', 'value' => $_POST['albumname']], + ]; + $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; } - $res = array(); + $res = []; // get the list of photos we are about to delete @@ -273,35 +275,15 @@ function photos_post(App $a) $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_albums($page_owner_uid, true); + Photo::clearAlbumCache($page_owner_uid); } goaway('photos/' . $a->data['user']['nickname']); @@ -314,22 +296,22 @@ function photos_post(App $a) 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 // 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'), array( + $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [ '$method' => 'post', - '$message' => t('Do you really want to delete this photo?'), - '$extra_inputs' => array(), - '$confirm' => t('Delete Photo'), + '$message' => L10n::t('Do you really want to delete this photo?'), + '$extra_inputs' => [], + '$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; } @@ -351,30 +333,11 @@ function photos_post(App $a) 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_albums($page_owner_uid, true); - - 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']); @@ -395,7 +358,7 @@ function photos_post(App $a) $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 && @@ -409,7 +372,7 @@ function photos_post(App $a) 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(); @@ -473,7 +436,7 @@ function photos_post(App $a) // Update the photo albums cache if album name was changed if ($albname !== $origaname) { - photo_albums($page_owner_uid, true); + Photo::clearAlbumCache($page_owner_uid); } } @@ -487,9 +450,9 @@ function photos_post(App $a) if (!$item_id) { // Create item container $title = ''; - $uri = item_new_uri($a->get_hostname(),$page_owner_uid); + $uri = Item::newURI($page_owner_uid); - $arr = array(); + $arr = []; $arr['guid'] = get_guid(32); $arr['uid'] = $page_owner_uid; $arr['uri'] = $uri; @@ -509,7 +472,6 @@ function photos_post(App $a) $arr['allow_gid'] = $p[0]['allow_gid']; $arr['deny_cid'] = $p[0]['deny_cid']; $arr['deny_gid'] = $p[0]['deny_gid']; - $arr['last-child'] = 1; $arr['visible'] = $visibility; $arr['origin'] = 1; @@ -517,18 +479,15 @@ function photos_post(App $a) . '[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)) { @@ -541,7 +500,7 @@ function photos_post(App $a) $rawtags = '#' . $rawtags; } - $taginfo = array(); + $taginfo = []; $tags = get_tags($rawtags); if (count($tags)) { @@ -566,7 +525,7 @@ function photos_post(App $a) } } } - $taginfo[] = array($newname, $profile, $salmon); + $taginfo[] = [$newname, $profile, $salmon]; } else { $newname = $name; $alias = ''; @@ -611,9 +570,9 @@ function photos_post(App $a) } if ($profile) { if (substr($notify, 0, 4) === 'cid:') { - $taginfo[] = array($newname, $profile, $notify, $r[0], '@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]'); + $taginfo[] = [$newname, $profile, $notify, $r[0], '@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]']; } else { - $taginfo[] = array($newname, $profile, $notify, null, $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]'); + $taginfo[] = [$newname, $profile, $notify, null, $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]']; } if (strlen($str_tags)) { $str_tags .= ','; @@ -640,16 +599,9 @@ function photos_post(App $a) } $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) { @@ -665,9 +617,9 @@ function photos_post(App $a) if (count($taginfo)) { foreach ($taginfo as $tagged) { - $uri = item_new_uri($a->get_hostname(), $page_owner_uid); + $uri = Item::newURI($page_owner_uid); - $arr = array(); + $arr = []; $arr['guid'] = get_guid(32); $arr['uid'] = $page_owner_uid; $arr['uri'] = $uri; @@ -686,15 +638,15 @@ function photos_post(App $a) $arr['allow_gid'] = $p[0]['allow_gid']; $arr['deny_cid'] = $p[0]['deny_cid']; $arr['deny_gid'] = $p[0]['deny_gid']; - $arr['last-child'] = 1; $arr['visible'] = 1; $arr['verb'] = ACTIVITY_TAG; + $arr['gravity'] = GRAVITY_PARENT; $arr['object-type'] = ACTIVITY_OBJ_PERSON; $arr['target-type'] = ACTIVITY_OBJ_IMAGE; $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'] = '' . ACTIVITY_OBJ_PERSON . '' . $tagged[0] . '' . $tagged[1] . '/' . $tagged[0] . ''; @@ -708,7 +660,7 @@ function photos_post(App $a) . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ''; $arr['target'] .= '' . xmlify('' . "\n" . '') . ''; - $item_id = item_store($arr); + $item_id = Item::insert($arr); if ($item_id) { Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id); } @@ -721,7 +673,7 @@ function photos_post(App $a) // default post action - upload a photo - call_hooks('photo_post_init', $_POST); + Addon::callHooks('photo_post_init', $_POST); // Determine the album to use $album = x($_REQUEST, 'album') ? notags(trim($_REQUEST['album'])) : ''; @@ -733,7 +685,7 @@ function photos_post(App $a) if (strlen($newalbum)) { $album = $newalbum; } else { - $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'); + $album = DateTimeFormat::localNow('Y'); } } @@ -749,7 +701,7 @@ function photos_post(App $a) 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; @@ -769,9 +721,9 @@ function photos_post(App $a) $str_group_deny = perms2str(is_array($group_deny) ? $group_deny : explode(',', $group_deny)); $str_contact_deny = perms2str(is_array($contact_deny) ? $contact_deny : explode(',', $contact_deny)); - $ret = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''); + $ret = ['src' => '', 'filename' => '', 'filesize' => 0, 'type' => '']; - call_hooks('photo_post_file', $ret); + Addon::callHooks('photo_post_file', $ret); if (x($ret, 'src') && x($ret, 'filesize')) { $src = $ret['src']; @@ -790,26 +742,26 @@ function photos_post(App $a) 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); $foo = 0; - call_hooks('photo_post_end', $foo); + Addon::callHooks('photo_post_end', $foo); return; } @@ -822,18 +774,18 @@ function photos_post(App $a) $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; - call_hooks('photo_post_end', $foo); + Addon::callHooks('photo_post_end', $foo); return; } if (!$filesize) { - notice(t('Image file is empty.') . EOL); + notice(L10n::t('Image file is empty.') . EOL); @unlink($src); $foo = 0; - call_hooks('photo_post_end', $foo); + Addon::callHooks('photo_post_end', $foo); return; } @@ -845,10 +797,10 @@ function photos_post(App $a) 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; - call_hooks('photo_post_end',$foo); + Addon::callHooks('photo_post_end',$foo); killme(); } @@ -868,13 +820,13 @@ function photos_post(App $a) $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(); } @@ -890,16 +842,16 @@ function photos_post(App $a) $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')) { - $lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']); - $lon = getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']); + 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']); } - $arr = array(); + $arr = []; if ($lat && $lon) { $arr['coord'] = $lat . ' ' . $lon; } @@ -923,7 +875,6 @@ function photos_post(App $a) $arr['allow_gid'] = $str_group_allow; $arr['deny_cid'] = $str_contact_deny; $arr['deny_gid'] = $str_group_deny; - $arr['last-child'] = 1; $arr['visible'] = $visible; $arr['origin'] = 1; @@ -931,15 +882,15 @@ function photos_post(App $a) . '[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_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)); + Addon::callHooks('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 @@ -960,16 +911,15 @@ function photos_content(App $a) // 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; } @@ -1065,7 +1015,7 @@ function photos_content(App $a) } 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; } @@ -1075,12 +1025,12 @@ function photos_content(App $a) // tabs $is_owner = (local_user() && (local_user() == $owner_uid)); - $o .= profile_tabs($a, $is_owner, $a->data['user']['nickname']); + $o .= Profile::getTabs($a, $is_owner, $a->data['user']['nickname']); // Display upload form if ($datatype === 'upload') { if (!$can_post) { - notice(t('Permission denied.')); + notice(L10n::t('Permission denied.')); return; } @@ -1091,7 +1041,7 @@ function photos_content(App $a) $albumselect .= ''; 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" ' : ''); @@ -1101,33 +1051,33 @@ function photos_content(App $a) $uploader = ''; - $ret = array('post_url' => 'photos/' . $a->data['user']['nickname'], + $ret = ['post_url' => 'photos/' . $a->data['user']['nickname'], 'addon_text' => $uploader, - 'default_upload' => true); + 'default_upload' => true]; - call_hooks('photo_upload_form',$ret); + Addon::callHooks('photo_upload_form',$ret); - $default_upload_box = replace_macros(get_markup_template('photos_default_uploader_box.tpl'), array()); - $default_upload_submit = replace_macros(get_markup_template('photos_default_uploader_submit.tpl'), array( - '$submit' => t('Submit'), - )); + $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' => 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,array( - '$pagename' => t('Upload Photos'), + $o .= replace_macros($tpl,[ + '$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 : ''), @@ -1135,11 +1085,10 @@ function photos_content(App $a) '$uploadurl' => $ret['post_url'], // ACL permissions box - '$acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector - '$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, - )); + ]); return $o; } @@ -1179,35 +1128,35 @@ function photos_content(App $a) // 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,array( - '$nametext' => t('New album name: '), + $o .= replace_macros($edit_tpl,[ + '$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 = array(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 = array(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 = array(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 = array(); + $photos = []; if (DBM::is_result($r)) { // "Twist" is only used for the duepunto theme with style "slackr" @@ -1220,31 +1169,31 @@ function photos_content(App $a) $imgalt_e = $rr['filename']; $desc_e = $rr['desc']; - $photos[] = array( + $photos[] = [ 'id' => $rr['id'], '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, 'ext' => $ext, 'hash'=> $rr['resource-id'], - ); + ]; } } $tpl = get_markup_template('photo_album.tpl'); - $o .= replace_macros($tpl, array( + $o .= replace_macros($tpl, [ '$photos' => $photos, '$album' => $album, '$can_post' => $can_post, - '$upload' => array(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), - )); + ]); return $o; @@ -1266,9 +1215,9 @@ function photos_content(App $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; } @@ -1276,11 +1225,14 @@ function photos_content(App $a) $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') { $order = 'ASC'; } else { @@ -1313,8 +1265,10 @@ function photos_content(App $a) } } - 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 @@ -1326,47 +1280,49 @@ function photos_content(App $a) } $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 = array( - 'edit' => array('photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))), - 'profile'=>array('profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')), - ); + $tools = [ + '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,array( + $a->page['htmlhead'] .= replace_macros($tpl,[ '$prevlink' => $prevlink, '$nextlink' => $nextlink - )); + ]); } - if ($prevlink) - $prevlink = array($prevlink, '') ; + if ($prevlink) { + $prevlink = [$prevlink, ''] ; + } - $photo = array( + $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'], 'filename' => $hires['filename'], - ); + ]; if ($nextlink) { - $nextlink = array($nextlink, ''); + $nextlink = [$nextlink, '']; } @@ -1378,7 +1334,8 @@ function photos_content(App $a) // 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) ); @@ -1386,49 +1343,18 @@ function photos_content(App $a) $link_item = []; if (DBM::is_result($linked_items)) { - $link_item = $linked_items[0]; - - $r = q("SELECT COUNT(*) AS `total` - FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`uid` = %d - $sql_extra ", - dbesc($link_item['uri']), - dbesc($link_item['uri']), - intval($link_item['uid']) - - ); + // This is a workaround to not being forced to rewrite the while $sql_extra handling + $link_item = Item::selectFirst([], ['id' => $linked_items[0]['id']]); - if (DBM::is_result($r)) { - $a->set_pager_total($r[0]['total']); - } - - - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, - `contact`.`rel`, `contact`.`thumb`, `contact`.`self`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`uid` = %d - $sql_extra - ORDER BY `parent` DESC, `id` ASC LIMIT %d ,%d ", - dbesc($link_item['uri']), - dbesc($link_item['uri']), - intval($link_item['uid']), - intval($a->pager['start']), - intval($a->pager['itemspage']) + $condition = ["`parent` = ? AND `parent` != `id`", $link_item['parent']]; + $a->set_pager_total(dba::count('item', $condition)); - ); + $params = ['order' => ['id'], 'limit' => [$a->pager['start'], $a->pager['itemspage']]]; + $result = Item::selectForUser($link_item['uid'], [], $condition, $params); + $items = Item::inArray($result); 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']) { @@ -1446,12 +1372,12 @@ function photos_content(App $a) if (strlen($tag_str)) { $tag_str .= ', '; } - $tag_str .= bbcode($t); + $tag_str .= BBCode::convert($t); } - $tags = array(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]'); } } @@ -1462,32 +1388,31 @@ function photos_content(App $a) $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, array( + $edit = replace_macros($edit_tpl, [ '$id' => $ph[0]['id'], - '$album' => array('albname', t('New album name'), $album_e,''), - '$caption' => array('desc', t('Caption'), $caption_e, ''), - '$tags' => array('newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')), - '$rotate_none' => array('rotate', t('Do not rotate'),0,'', true), - '$rotate_cw' => array('rotate', t('Rotate CW (right)'),1,''), - '$rotate_ccw' => array('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 - '$acl_data' => construct_acl_data($a, $ph[0]), // For non-Javascript ACL selector - '$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 = ''; @@ -1502,20 +1427,20 @@ function photos_content(App $a) $tpl = get_markup_template('photo_item.tpl'); $return_url = $a->cmd; - if ($can_post || can_write_wall($a, $owner_uid)) { + if ($can_post || can_write_wall($owner_uid)) { $like_tpl = get_markup_template('like_noshare.tpl'); - $likebuttons = replace_macros($like_tpl, array( + $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, - )); + ]); } - if (!DBM::is_result($r)) { - if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) { - $comments .= replace_macros($cmnt_tpl, array( + if (!DBM::is_result($items)) { + if (($can_post || can_write_wall($owner_uid))) { + $comments .= replace_macros($cmnt_tpl, [ '$return_path' => '', '$jsreload' => $return_url, '$type' => 'wall-comment', @@ -1523,26 +1448,26 @@ function photos_content(App $a) '$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 = array( - 'like' => array('title' => t('Likes','title')),'dislike' => array('title' => t('Dislikes','title')), - 'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title')) - ); + $conv_responses = [ + '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 - if (DBM::is_result($r)) { - foreach ($r as $item) { + if (DBM::is_result($items)) { + foreach ($items as $item) { builtin_activity_puller($item, $conv_responses); } @@ -1553,8 +1478,8 @@ function photos_content(App $a) $dislike = format_like($conv_responses['dislike'][$link_item['uri']], $conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike', $link_item['id']); } - if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) { - $comments .= replace_macros($cmnt_tpl,array( + if (($can_post || can_write_wall($owner_uid))) { + $comments .= replace_macros($cmnt_tpl,[ '$return_path' => '', '$jsreload' => $return_url, '$type' => 'wall-comment', @@ -1562,18 +1487,18 @@ function photos_content(App $a) '$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) - )); + ]); } - foreach ($r as $item) { + foreach ($items as $item) { $comment = ''; $template = $tpl; $sparkle = ''; @@ -1582,52 +1507,40 @@ function photos_content(App $a) 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['author-id']); + if (strpos($profile_url, 'redir/') === 0) { $sparkle = ' sparkle'; } else { - $profile_url = $item['url']; $sparkle = ''; } - $diff_author = (($item['url'] !== $item['author-link']) ? true : false); - - $profile_name = ((strlen($item['author-name']) && $diff_author) ? $item['author-name'] : $item['name']); - $profile_avatar = ((strlen($item['author-avatar']) && $diff_author) ? $item['author-avatar'] : $item['thumb']); - - $profile_link = $profile_url; - $dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user())); - $drop = array( + $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,array( + $comments .= replace_macros($template,[ '$id' => $item['item_id'], - '$profile_url' => $profile_link, - '$name' => $name_e, - '$thumb' => $profile_avatar, + '$profile_url' => $profile_url, + '$name' => $item['author-name'], + '$thumb' => $item['author-avatar'], '$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 - )); + ]); - if (($can_post || can_write_wall($a, $owner_uid)) && $item['last-child']) { - $comments .= replace_macros($cmnt_tpl, array( + if (($can_post || can_write_wall($owner_uid))) { + $comments .= replace_macros($cmnt_tpl, [ '$return_path' => '', '$jsreload' => $return_url, '$type' => 'wall-comment', @@ -1635,19 +1548,19 @@ function photos_content(App $a) '$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) - )); + ]); } } } - $response_verbs = array('like'); + $response_verbs = ['like']; if (Feature::isEnabled($owner_uid, 'dislike')) { $response_verbs[] = 'dislike'; } @@ -1657,7 +1570,7 @@ function photos_content(App $a) } $photo_tpl = get_markup_template('photo_view.tpl'); - $o .= replace_macros($photo_tpl, array( + $o .= replace_macros($photo_tpl, [ '$id' => $ph[0]['id'], '$album' => [$album_link, $ph[0]['album']], '$tools' => $tools, @@ -1669,14 +1582,14 @@ function photos_content(App $a) '$tags' => $tags, '$edit' => $edit, '$map' => $map, - '$map_text' => t('Map'), + '$map_text' => L10n::t('Map'), '$likebuttons' => $likebuttons, '$like' => $like, '$dislike' => $dislike, 'responses' => $responses, '$comments' => $comments, '$paginate' => $paginate, - )); + ]); $a->page['htmlhead'] .= "\n" . '' . "\n"; $a->page['htmlhead'] .= '' . "\n"; @@ -1694,7 +1607,7 @@ function photos_content(App $a) $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)); @@ -1708,19 +1621,20 @@ function photos_content(App $a) $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']) ); - $photos = array(); + $photos = []; if (DBM::is_result($r)) { // "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 && !remote_user() && ($rr['album'] == t('Profile Photos'))) + if (!$is_owner && !remote_user() && ($rr['album'] == L10n::t('Profile Photos'))) { continue; + } $twist = !$twist; @@ -1729,31 +1643,31 @@ function photos_content(App $a) $alt_e = $rr['filename']; $name_e = $rr['album']; - $photos[] = array( + $photos[] = [ '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' => array( + '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, array( - '$title' => t('Recent Photos'), + $o .= replace_macros($tpl, [ + '$title' => L10n::t('Recent Photos'), '$can_post' => $can_post, - '$upload' => array(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), - )); + ]); return $o; }