]> git.mxchange.org Git - friendica.git/blobdiff - mod/photos.php
Merge pull request #4393 from MrPetovan/task/3878-move-include-tags-to-src
[friendica.git] / mod / photos.php
index fde505a6f75fc864875189489fabf3a4df712fba..6742497ac320c3c9249f5aca4b84b43f8014ff9f 100644 (file)
@@ -2,37 +2,46 @@
 /**
  * @file mod/photos.php
  */
+
 use Friendica\App;
 use Friendica\Content\Feature;
-use Friendica\Core\System;
+use Friendica\Content\Nav;
+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\Term;
 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];
@@ -48,26 +57,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;
@@ -75,18 +84,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;
                        }
                }
@@ -96,15 +105,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
-                       ));
+                       ]);
                }
 
 
@@ -115,9 +124,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;
@@ -164,7 +173,7 @@ function photos_post(App $a)
        }
 
        if (!$can_post) {
-               notice( t('Permission denied.') . EOL );
+               notice(L10n::t('Permission denied.') . EOL );
                killme();
        }
 
@@ -174,7 +183,7 @@ function photos_post(App $a)
        );
 
        if (!DBM::is_result($r)) {
-               notice( t('Contact information unavailable') . EOL);
+               notice(L10n::t('Contact information unavailable') . EOL);
                logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
                killme();
        }
@@ -184,7 +193,7 @@ function photos_post(App $a)
        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
                }
@@ -194,7 +203,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
                }
@@ -213,7 +222,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);
@@ -224,27 +233,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
 
@@ -283,11 +292,11 @@ function photos_post(App $a)
                        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(DateTimeFormat::utcNow()),
                                                dbesc($rr['parent-uri']),
                                                intval($page_owner_uid)
                                        );
-                                       create_tags_from_itemuri($rr['parent-uri'], $page_owner_uid);
+                                       Term::insertFromTagFieldByItemUri($rr['parent-uri'], $page_owner_uid);
                                        delete_thread_uri($rr['parent-uri'], $page_owner_uid);
 
                                        $drop_id = intval($rr['id']);
@@ -300,7 +309,7 @@ function photos_post(App $a)
                        }
 
                        // Update the photo albums cache
-                       photo_albums($page_owner_uid, true);
+                       Photo::clearAlbumCache($page_owner_uid);
                }
 
                goaway('photos/' . $a->data['user']['nickname']);
@@ -313,22 +322,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;
                }
@@ -356,19 +365,19 @@ function photos_post(App $a)
                        );
                        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(DateTimeFormat::utcNow()),
+                                       dbesc(DateTimeFormat::utcNow()),
                                        dbesc($i[0]['uri']),
                                        intval($page_owner_uid)
                                );
-                               create_tags_from_itemuri($i[0]['uri'], $page_owner_uid);
+                               Term::insertFromTagFieldByItemUri($i[0]['uri'], $page_owner_uid);
                                delete_thread_uri($i[0]['uri'], $page_owner_uid);
 
                                $url = System::baseUrl();
                                $drop_id = intval($i[0]['id']);
 
                                // Update the photo albums cache
-                               photo_albums($page_owner_uid, true);
+                               Photo::clearAlbumCache($page_owner_uid);
 
                                if ($i[0]['visible']) {
                                        Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
@@ -394,7 +403,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 &&
@@ -472,7 +481,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);
                        }
                }
 
@@ -488,7 +497,7 @@ function photos_post(App $a)
                        $title = '';
                        $uri = item_new_uri($a->get_hostname(),$page_owner_uid);
 
-                       $arr = array();
+                       $arr = [];
                        $arr['guid']          = get_guid(32);
                        $arr['uid']           = $page_owner_uid;
                        $arr['uri']           = $uri;
@@ -508,7 +517,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;
 
@@ -516,7 +524,7 @@ 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) {
@@ -540,7 +548,7 @@ function photos_post(App $a)
                                $rawtags = '#' . $rawtags;
                        }
 
-                       $taginfo = array();
+                       $taginfo = [];
                        $tags = get_tags($rawtags);
 
                        if (count($tags)) {
@@ -565,7 +573,7 @@ function photos_post(App $a)
                                                                        }
                                                                }
                                                        }
-                                                       $taginfo[] = array($newname, $profile, $salmon);
+                                                       $taginfo[] = [$newname, $profile, $salmon];
                                                } else {
                                                        $newname = $name;
                                                        $alias = '';
@@ -610,9 +618,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 .= ',';
@@ -642,12 +650,12 @@ function photos_post(App $a)
                        $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()),
+                               dbesc(DateTimeFormat::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                intval($item_id),
                                intval($page_owner_uid)
                        );
-                       create_tags_from_item($item_id);
+                       Term::insertFromTagFieldByItemId($item_id);
                        update_thread($item_id);
 
                        $best = 0;
@@ -666,7 +674,7 @@ function photos_post(App $a)
                                foreach ($taginfo as $tagged) {
                                        $uri = item_new_uri($a->get_hostname(), $page_owner_uid);
 
-                                       $arr = array();
+                                       $arr = [];
                                        $arr['guid']          = get_guid(32);
                                        $arr['uid']           = $page_owner_uid;
                                        $arr['uri']           = $uri;
@@ -685,7 +693,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']       = 1;
                                        $arr['verb']          = ACTIVITY_TAG;
                                        $arr['object-type']   = ACTIVITY_OBJ_PERSON;
@@ -693,7 +700,7 @@ function photos_post(App $a)
                                        $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>';
@@ -707,7 +714,7 @@ function photos_post(App $a)
                                                . 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);
                                        }
@@ -720,7 +727,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'])) : '';
@@ -732,7 +739,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');
                }
        }
 
@@ -748,7 +755,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;
@@ -768,9 +775,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'];
@@ -789,26 +796,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;
        }
 
@@ -821,18 +828,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;
        }
 
@@ -844,10 +851,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();
        }
 
@@ -872,8 +879,8 @@ function photos_post(App $a)
        $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();
        }
 
@@ -894,11 +901,11 @@ function photos_post(App $a)
        // Create item container
        $lat = $lon = null;
        if ($exif && $exif['GPS'] && Feature::isEnabled($channel_id, 'photo_location')) {
-               $lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
-               $lon = getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
+               $lat = Photo::getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
+               $lon = Photo::getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
        }
 
-       $arr = array();
+       $arr = [];
        if ($lat && $lon) {
                $arr['coord'] = $lat . ' ' . $lon;
        }
@@ -922,7 +929,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;
 
@@ -930,15 +936,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
@@ -959,7 +965,7 @@ 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;
        }
 
@@ -968,7 +974,7 @@ function photos_content(App $a)
        require_once 'include/conversation.php';
 
        if (!x($a->data,'user')) {
-               notice( t('No photos selected') . EOL );
+               notice(L10n::t('No photos selected') . EOL );
                return;
        }
 
@@ -1046,7 +1052,7 @@ function photos_content(App $a)
                        }
                }
                if ($contact_id) {
-                       $groups = init_groups_visitor($contact_id);
+                       $groups = Group::getIdsByContactId($contact_id);
                        $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
                                intval($contact_id),
                                intval($owner_uid)
@@ -1064,7 +1070,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;
        }
 
@@ -1074,12 +1080,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;
                }
 
@@ -1090,7 +1096,7 @@ function photos_content(App $a)
                $albumselect .= '<option value="" ' . (!$selname ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</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" ' : '');
@@ -1100,16 +1106,16 @@ 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 = '';
 
@@ -1117,16 +1123,16 @@ function photos_content(App $a)
 
                $aclselect_e = ($visitor ? '' : populate_acl($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 : ''),
@@ -1134,11 +1140,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;
        }
@@ -1178,35 +1183,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"
@@ -1219,31 +1224,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;
 
@@ -1265,9 +1270,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;
                }
@@ -1329,15 +1334,15 @@ function photos_content(App $a)
                $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')
+                                       ? L10n::t('Private Message')
                                        : Null);
 
 
@@ -1345,27 +1350,27 @@ function photos_content(App $a)
 
                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, '<div class="icon prev"></div>') ;
+                       $prevlink = [$prevlink, '<div class="icon prev"></div>'] ;
 
-               $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, '<div class="icon next"></div>');
+                       $nextlink = [$nextlink, '<div class="icon next"></div>'];
                }
 
 
@@ -1447,10 +1452,10 @@ function photos_content(App $a)
                                }
                                $tag_str .= bbcode($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]');
                        }
                }
 
@@ -1463,30 +1468,29 @@ function photos_content(App $a)
                        $caption_e = $ph[0]['desc'];
                        $aclselect_e = populate_acl($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 = '';
@@ -1501,20 +1505,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 (($can_post || can_write_wall($owner_uid))) {
+                                       $comments .= replace_macros($cmnt_tpl, [
                                                '$return_path' => '',
                                                '$jsreload' => $return_url,
                                                '$type' => 'wall-comment',
@@ -1522,22 +1526,22 @@ 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)) {
@@ -1552,8 +1556,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',
@@ -1561,15 +1565,15 @@ 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) {
@@ -1600,18 +1604,18 @@ function photos_content(App $a)
                                        $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']);
 
-                                       $comments .= replace_macros($template,array(
+                                       $comments .= replace_macros($template,[
                                                '$id' => $item['item_id'],
                                                '$profile_url' => $profile_link,
                                                '$name' => $name_e,
@@ -1619,14 +1623,14 @@ function photos_content(App $a)
                                                '$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',
@@ -1634,19 +1638,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';
                        }
@@ -1656,7 +1660,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,
@@ -1668,14 +1672,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" . '<meta name="twitter:card" content="photo" />' . "\n";
                $a->page['htmlhead'] .= '<meta name="twitter:title" content="' . $photo["album"] . '" />' . "\n";
@@ -1693,7 +1697,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));
@@ -1707,18 +1711,18 @@ 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;
@@ -1728,31 +1732,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;
 }