]> git.mxchange.org Git - friendica.git/blobdiff - mod/photos.php
get markup template
[friendica.git] / mod / photos.php
index b26c5edb9b3ce4ad42ad4df7f7fe833b5d677ef1..82a6ccca2962e9292e6bec004354a224301c8273 100644 (file)
@@ -6,11 +6,14 @@
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
+use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -25,10 +28,10 @@ use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
+use Friendica\Util\Security;
 use Friendica\Util\Temporal;
 
 require_once 'include/items.php';
-require_once 'include/security.php';
 
 function photos_init(App $a) {
 
@@ -60,9 +63,9 @@ function photos_init(App $a) {
 
                $account_type = Contact::getAccountType($profile);
 
-               $tpl = get_markup_template("vcard-widget.tpl");
+               $tpl = Renderer::getMarkupTemplate("vcard-widget.tpl");
 
-               $vcard_widget = replace_macros($tpl, [
+               $vcard_widget = Renderer::replaceMacros($tpl, [
                        '$name' => $profile['name'],
                        '$photo' => $profile['photo'],
                        '$addr' => defaults($profile, 'addr', ''),
@@ -79,6 +82,7 @@ function photos_init(App $a) {
 
                if ($albums) {
                        $a->data['albums'] = $albums;
+
                        if ($albums_visible) {
                                $ret['success'] = true;
                        }
@@ -106,7 +110,7 @@ function photos_init(App $a) {
                }
 
                if ($ret['success']) {
-                       $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'), [
+                       $photo_albums_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('photo_albums.tpl'), [
                                '$nick'     => $a->data['user']['nickname'],
                                '$title'    => L10n::t('Photo Albums'),
                                '$recent'   => L10n::t('Recent Photos'),
@@ -117,7 +121,6 @@ function photos_init(App $a) {
                        ]);
                }
 
-
                if (empty($a->page['aside'])) {
                        $a->page['aside'] = '';
                }
@@ -128,9 +131,9 @@ function photos_init(App $a) {
                        $a->page['aside'] .= $photo_albums_widget;
                }
 
-               $tpl = get_markup_template("photos_head.tpl");
+               $tpl = Renderer::getMarkupTemplate("photos_head.tpl");
 
-               $a->page['htmlhead'] .= replace_macros($tpl,[
+               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
                        '$ispublic' => L10n::t('everybody')
                ]);
        }
@@ -140,9 +143,9 @@ function photos_init(App $a) {
 
 function photos_post(App $a)
 {
-       logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
-       logger('mod_photos: REQUEST ' . print_r($_REQUEST, true), LOGGER_DATA);
-       logger('mod_photos: FILES '   . print_r($_FILES, true), LOGGER_DATA);
+       Logger::log('mod-photos: photos_post: begin' , Logger::DEBUG);
+       Logger::log('mod_photos: REQUEST ' . print_r($_REQUEST, true), Logger::DATA);
+       Logger::log('mod_photos: FILES '   . print_r($_FILES, true), Logger::DATA);
 
        $phototypes = Image::supportedTypes();
 
@@ -166,7 +169,7 @@ function photos_post(App $a)
                        }
                }
 
-               if ($contact_id) {
+               if ($contact_id > 0) {
                        $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
                                intval($contact_id),
                                intval($page_owner_uid)
@@ -188,7 +191,7 @@ function photos_post(App $a)
 
        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);
+               Logger::log('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
                killme();
        }
 
@@ -196,7 +199,7 @@ function photos_post(App $a)
                $album = hex2bin($a->argv[3]);
 
                if ($album === L10n::t('Profile Photos') || $album === 'Contact Photos' || $album === L10n::t('Contact Photos')) {
-                       goaway($_SESSION['photo_return']);
+                       $a->internalRedirect($_SESSION['photo_return']);
                        return; // NOTREACHED
                }
 
@@ -204,15 +207,16 @@ function photos_post(App $a)
                        DBA::escape($album),
                        intval($page_owner_uid)
                );
+
                if (!DBA::isResult($r)) {
                        notice(L10n::t('Album not found.') . EOL);
-                       goaway($_SESSION['photo_return']);
+                       $a->internalRedirect($_SESSION['photo_return']);
                        return; // NOTREACHED
                }
 
                // Check if the user has responded to a delete confirmation query
-               if ($_REQUEST['canceled']) {
-                       goaway($_SESSION['photo_return']);
+               if (!empty($_REQUEST['canceled'])) {
+                       $a->internalRedirect($_SESSION['photo_return']);
                }
 
                // RENAME photo album
@@ -226,8 +230,7 @@ function photos_post(App $a)
                        // Update the photo albums cache
                        Photo::clearAlbumCache($page_owner_uid);
 
-                       $newurl = System::baseUrl() . '/photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum);
-                       goaway($newurl);
+                       $a->internalRedirect('photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum));
                        return; // NOTREACHED
                }
 
@@ -244,7 +247,7 @@ function photos_post(App $a)
                                        ['name' => 'albumname', 'value' => $_POST['albumname']],
                                ];
 
-                               $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
+                               $a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                        '$method' => 'post',
                                        '$message' => L10n::t('Do you really want to delete this photo album and all its photos?'),
                                        '$extra_inputs' => $extra_inputs,
@@ -253,6 +256,7 @@ function photos_post(App $a)
                                        '$confirm_name' => 'dropalbum', // Needed so that confirmation will bring us back into this if statement
                                        '$cancel' => L10n::t('Cancel'),
                                ]);
+
                                $a->error = 1; // Set $a->error so the other module functions don't execute
                                return;
                        }
@@ -273,12 +277,13 @@ function photos_post(App $a)
                                        DBA::escape($album)
                                );
                        }
+
                        if (DBA::isResult($r)) {
                                foreach ($r as $rr) {
                                        $res[] = "'" . DBA::escape($rr['rid']) . "'" ;
                                }
                        } else {
-                               goaway($_SESSION['photo_return']);
+                               $a->internalRedirect($_SESSION['photo_return']);
                                return; // NOTREACHED
                        }
 
@@ -296,14 +301,14 @@ function photos_post(App $a)
                        Photo::clearAlbumCache($page_owner_uid);
                }
 
-               goaway('photos/' . $a->data['user']['nickname']);
+               $a->internalRedirect('photos/' . $a->data['user']['nickname']);
                return; // NOTREACHED
        }
 
 
        // Check if the user has responded to a delete confirmation query for a single photo
        if ($a->argc > 2 && !empty($_REQUEST['canceled'])) {
-               goaway($_SESSION['photo_return']);
+               $a->internalRedirect($_SESSION['photo_return']);
        }
 
        if ($a->argc > 2 && defaults($_POST, 'delete', '') === L10n::t('Delete Photo')) {
@@ -313,7 +318,8 @@ function photos_post(App $a)
                // Check if we should do HTML-based delete confirmation
                if (!empty($_REQUEST['confirm'])) {
                        $drop_url = $a->query_string;
-                       $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
+
+                       $a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'post',
                                '$message' => L10n::t('Do you really want to delete this photo?'),
                                '$extra_inputs' => [],
@@ -322,6 +328,7 @@ function photos_post(App $a)
                                '$confirm_name' => 'delete', // Needed so that confirmation will bring us back into this if statement
                                '$cancel' => L10n::t('Cancel'),
                        ]);
+
                        $a->error = 1; // Set $a->error so the other module functions don't execute
                        return;
                }
@@ -351,7 +358,7 @@ function photos_post(App $a)
                        Photo::clearAlbumCache($page_owner_uid);
                }
 
-               goaway('photos/' . $a->data['user']['nickname']);
+               $a->internalRedirect('photos/' . $a->data['user']['nickname']);
                return; // NOTREACHED
        }
 
@@ -374,7 +381,7 @@ function photos_post(App $a)
                }
 
                if (!empty($_POST['rotate']) && (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) {
-                       logger('rotate');
+                       Logger::log('rotate');
 
                        $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0 LIMIT 1",
                                DBA::escape($resource_id),
@@ -434,6 +441,7 @@ function photos_post(App $a)
                        DBA::escape($resource_id),
                        intval($page_owner_uid)
                );
+
                if (DBA::isResult($p)) {
                        $ext = $phototypes[$p[0]['type']];
                        $r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
@@ -466,7 +474,7 @@ function photos_post(App $a)
                        $uri = Item::newURI($page_owner_uid);
 
                        $arr = [];
-                       $arr['guid']          = System::createGUID(32);
+                       $arr['guid']          = System::createUUID();
                        $arr['uid']           = $page_owner_uid;
                        $arr['uri']           = $uri;
                        $arr['parent-uri']    = $uri;
@@ -521,28 +529,35 @@ function photos_post(App $a)
                                        if (strpos($tag, '@') === 0) {
                                                $profile = '';
                                                $name = substr($tag,1);
+
                                                if ((strpos($name, '@')) || (strpos($name, 'http://'))) {
                                                        $newname = $name;
                                                        $links = @Probe::lrdd($name);
+
                                                        if (count($links)) {
                                                                foreach ($links as $link) {
                                                                        if ($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
                                                                                $profile = $link['@attributes']['href'];
                                                                        }
+
                                                                        if ($link['@attributes']['rel'] === 'salmon') {
                                                                                $salmon = '$url:' . str_replace(',', '%sc', $link['@attributes']['href']);
+
                                                                                if (strlen($inform)) {
                                                                                        $inform .= ',';
                                                                                }
+
                                                                                $inform .= $salmon;
                                                                        }
                                                                }
                                                        }
+
                                                        $taginfo[] = [$newname, $profile, $salmon];
                                                } else {
                                                        $newname = $name;
                                                        $alias = '';
                                                        $tagcid = 0;
+
                                                        if (strrpos($newname, '+')) {
                                                                $tagcid = intval(substr($newname, strrpos($newname, '+') + 1));
                                                        }
@@ -574,6 +589,7 @@ function photos_post(App $a)
                                                        if (DBA::isResult($r)) {
                                                                $newname = $r[0]['name'];
                                                                $profile = $r[0]['url'];
+
                                                                $notify = 'cid:' . $r[0]['id'];
                                                                if (strlen($inform)) {
                                                                        $inform .= ',';
@@ -581,21 +597,24 @@ function photos_post(App $a)
                                                                $inform .= $notify;
                                                        }
                                                }
+
                                                if ($profile) {
                                                        if (substr($notify, 0, 4) === 'cid:') {
                                                                $taginfo[] = [$newname, $profile, $notify, $r[0], '@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]'];
                                                        } else {
                                                                $taginfo[] = [$newname, $profile, $notify, null, $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]'];
                                                        }
+
                                                        if (strlen($str_tags)) {
                                                                $str_tags .= ',';
                                                        }
+
                                                        $profile = str_replace(',', '%2c', $profile);
                                                        $str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
                                                }
                                        } elseif (strpos($tag, '#') === 0) {
                                                $tagname = substr($tag, 1);
-                                               $str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url]';
+                                               $str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url],';
                                        }
                                }
                        }
@@ -622,6 +641,7 @@ function photos_post(App $a)
                                        $best = 2;
                                        break;
                                }
+
                                if (intval($scales['scale']) == 4) {
                                        $best = 4;
                                        break;
@@ -633,7 +653,7 @@ function photos_post(App $a)
                                        $uri = Item::newURI($page_owner_uid);
 
                                        $arr = [];
-                                       $arr['guid']          = System::createGUID(32);
+                                       $arr['guid']          = System::createUUID();
                                        $arr['uid']           = $page_owner_uid;
                                        $arr['uri']           = $uri;
                                        $arr['parent-uri']    = $uri;
@@ -673,13 +693,10 @@ function photos_post(App $a)
                                        $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::insert($arr);
-                                       if ($item_id) {
-                                               Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id);
-                                       }
                                }
                        }
                }
-               goaway($_SESSION['photo_return']);
+               $a->internalRedirect($_SESSION['photo_return']);
                return; // NOTREACHED
        }
 
@@ -691,7 +708,7 @@ function photos_post(App $a)
        $album    = !empty($_REQUEST['album'])    ? notags(trim($_REQUEST['album']))    : '';
        $newalbum = !empty($_REQUEST['newalbum']) ? notags(trim($_REQUEST['newalbum'])) : '';
 
-       logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
+       Logger::log('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , Logger::DEBUG);
 
        if (!strlen($album)) {
                if (strlen($newalbum)) {
@@ -744,12 +761,14 @@ function photos_post(App $a)
                $filesize = $ret['filesize'];
                $type     = $ret['type'];
                $error    = UPLOAD_ERR_OK;
-       } else {
+       } elseif (!empty($_FILES['userfile'])) {
                $src      = $_FILES['userfile']['tmp_name'];
                $filename = basename($_FILES['userfile']['name']);
                $filesize = intval($_FILES['userfile']['size']);
                $type     = $_FILES['userfile']['type'];
                $error    = $_FILES['userfile']['error'];
+       } else {
+               $error    = UPLOAD_ERR_NO_FILE;
        }
 
        if ($error !== UPLOAD_ERR_OK) {
@@ -782,7 +801,7 @@ function photos_post(App $a)
                $type = Image::guessType($filename);
        }
 
-       logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG);
+       Logger::log('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', Logger::DEBUG);
 
        $maximagesize = Config::get('system', 'maximagesize');
 
@@ -802,14 +821,14 @@ function photos_post(App $a)
                return;
        }
 
-       logger('mod/photos.php: photos_post(): loading the contents of ' . $src , LOGGER_DEBUG);
+       Logger::log('mod/photos.php: photos_post(): loading the contents of ' . $src , Logger::DEBUG);
 
        $imagedata = @file_get_contents($src);
 
        $image = new Image($imagedata, $type);
 
        if (!$image->isValid()) {
-               logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
+               Logger::log('mod/photos.php: photos_post(): unable to process image' , Logger::DEBUG);
                notice(L10n::t('Unable to process image.') . EOL);
                @unlink($src);
                $foo = 0;
@@ -838,7 +857,7 @@ 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);
+               Logger::log('mod/photos.php: photos_post(): image store failed', Logger::DEBUG);
                notice(L10n::t('Image upload failed.') . EOL);
                killme();
        }
@@ -869,7 +888,7 @@ function photos_post(App $a)
                $arr['coord'] = $lat . ' ' . $lon;
        }
 
-       $arr['guid']          = System::createGUID(32);
+       $arr['guid']          = System::createUUID();
        $arr['uid']           = $page_owner_uid;
        $arr['uri']           = $uri;
        $arr['parent-uri']    = $uri;
@@ -899,16 +918,12 @@ function photos_post(App $a)
        // Update the photo albums cache
        Photo::clearAlbumCache($page_owner_uid);
 
-       if ($visible) {
-               Worker::add(PRIORITY_HIGH, "Notifier", 'wall-new', $item_id);
-       }
-
        Addon::callHooks('photo_post_end', $item_id);
 
        // addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
        // if they do not wish to be redirected
 
-       goaway($_SESSION['photo_return']);
+       $a->internalRedirect($_SESSION['photo_return']);
        // NOTREACHED
 }
 
@@ -928,7 +943,6 @@ function photos_content(App $a)
                return;
        }
 
-       require_once 'include/security.php';
        require_once 'include/conversation.php';
 
        if (empty($a->data['user'])) {
@@ -1033,7 +1047,7 @@ function photos_content(App $a)
                return;
        }
 
-       $sql_extra = permissions_sql($owner_uid, $remote_contact, $groups);
+       $sql_extra = Security::getPermissionsSQLByUserId($owner_uid, $remote_contact, $groups);
 
        $o = "";
 
@@ -1071,18 +1085,18 @@ function photos_content(App $a)
 
                Addon::callHooks('photo_upload_form',$ret);
 
-               $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'), [
+               $default_upload_box = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_box.tpl'), []);
+               $default_upload_submit = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_submit.tpl'), [
                        '$submit' => L10n::t('Submit'),
                ]);
 
                $usage_message = '';
 
-               $tpl = get_markup_template('photos_upload.tpl');
+               $tpl = Renderer::getMarkupTemplate('photos_upload.tpl');
 
                $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML($a->user));
 
-               $o .= replace_macros($tpl,[
+               $o .= Renderer::replaceMacros($tpl,[
                        '$pagename' => L10n::t('Upload Photos'),
                        '$sessid' => session_id(),
                        '$usage' => $usage_message,
@@ -1117,16 +1131,18 @@ function photos_content(App $a)
        if ($datatype === 'album') {
                $album = hex2bin($datum);
 
+               $total = 0;
                $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
                        AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
                        intval($owner_uid),
                        DBA::escape($album)
                );
                if (DBA::isResult($r)) {
-                       $a->set_pager_total(count($r));
-                       $a->set_pager_itemspage(20);
+                       $total = count($r);
                }
 
+               $pager = new Pager($a->query_string, 20);
+
                /// @TODO I have seen this many times, maybe generalize it script-wide and encapsulate it?
                $order_field = defaults($_GET, 'order', '');
                if ($order_field === 'posted') {
@@ -1142,19 +1158,19 @@ function photos_content(App $a)
                        AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d",
                        intval($owner_uid),
                        DBA::escape($album),
-                       intval($a->pager['start']),
-                       intval($a->pager['itemspage'])
+                       $pager->getStart(),
+                       $pager->getItemsPerPage()
                );
 
                // edit album name
                if ($cmd === 'edit') {
                        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');
+                                       $edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl');
 
                                        $album_e = $album;
 
-                                       $o .= replace_macros($edit_tpl,[
+                                       $o .= Renderer::replaceMacros($edit_tpl,[
                                                '$nametext' => L10n::t('New album name: '),
                                                '$nickname' => $a->data['user']['nickname'],
                                                '$album' => $album_e,
@@ -1204,16 +1220,16 @@ function photos_content(App $a)
                        }
                }
 
-               $tpl = get_markup_template('photo_album.tpl');
-               $o .= replace_macros($tpl, [
-                               '$photos' => $photos,
-                               '$album' => $album,
-                               '$can_post' => $can_post,
-                               '$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)],
-                               '$order' => $order,
-                               '$edit' => $edit,
-                               '$paginate' => paginate($a),
-                       ]);
+               $tpl = Renderer::getMarkupTemplate('photo_album.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
+                       '$photos' => $photos,
+                       '$album' => $album,
+                       '$can_post' => $can_post,
+                       '$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)],
+                       '$order' => $order,
+                       '$edit' => $edit,
+                       '$paginate' => $pager->renderFull($total),
+               ]);
 
                return $o;
 
@@ -1326,8 +1342,8 @@ function photos_content(App $a)
                }
 
                if ($cmd === 'edit') {
-                       $tpl = get_markup_template('photo_edit_head.tpl');
-                       $a->page['htmlhead'] .= replace_macros($tpl,[
+                       $tpl = Renderer::getMarkupTemplate('photo_edit_head.tpl');
+                       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
                                '$prevlink' => $prevlink,
                                '$nextlink' => $nextlink
                        ]);
@@ -1367,15 +1383,18 @@ function photos_content(App $a)
 
                $map = null;
                $link_item = [];
+               $total = 0;
 
                if (DBA::isResult($linked_items)) {
                        // This is a workaround to not being forced to rewrite the while $sql_extra handling
                        $link_item = Item::selectFirst([], ['id' => $linked_items[0]['id']]);
 
                        $condition = ["`parent` = ? AND `parent` != `id`",  $link_item['parent']];
-                       $a->set_pager_total(DBA::count('item', $condition));
+                       $total = DBA::count('item', $condition);
 
-                       $params = ['order' => ['id'], 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+                       $pager = new Pager($a->query_string);
+
+                       $params = ['order' => ['id'], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
                        $result = Item::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params);
                        $items = Item::inArray($result);
 
@@ -1393,30 +1412,30 @@ function photos_content(App $a)
                if (count($linked_items) && strlen($link_item['tag'])) {
                        $arr = explode(',', $link_item['tag']);
                        // parse tags and add links
-                       $tag_str = '';
-                       foreach ($arr as $t) {
-                               if (strlen($tag_str)) {
-                                       $tag_str .= ', ';
-                               }
-                               $tag_str .= BBCode::convert($t);
+                       $tag_arr = [];
+                       foreach ($arr as $tag) {
+                               $tag_arr[] = [
+                                       'name' => BBCode::convert($tag),
+                                       'removeurl' => '/tagrm/'.$link_item['id'] . '/' . bin2hex($tag)
+                               ];
                        }
-                       $tags = [L10n::t('Tags: '), $tag_str];
+                       $tags = ['title' => L10n::t('Tags: '), 'tags' => $tag_arr];
                        if ($cmd === 'edit') {
-                               $tags[] = 'tagrm/' . $link_item['id'];
-                               $tags[] = L10n::t('[Remove any tag]');
+                               $tags['removeanyurl'] = 'tagrm/' . $link_item['id'];
+                               $tags['removetitle'] = L10n::t('[Select tags to remove]');
                        }
                }
 
 
                $edit = Null;
                if ($cmd === 'edit' && $can_post) {
-                       $edit_tpl = get_markup_template('photo_edit.tpl');
+                       $edit_tpl = Renderer::getMarkupTemplate('photo_edit.tpl');
 
                        $album_e = $ph[0]['album'];
                        $caption_e = $ph[0]['desc'];
                        $aclselect_e = ACL::getFullSelectorHTML($a->user, false, $ph[0]);
 
-                       $edit = replace_macros($edit_tpl, [
+                       $edit = Renderer::replaceMacros($edit_tpl, [
                                '$id' => $ph[0]['id'],
                                '$album' => ['albname', L10n::t('New album name'), $album_e,''],
                                '$caption' => ['desc', L10n::t('Caption'), $caption_e, ''],
@@ -1449,13 +1468,13 @@ function photos_content(App $a)
                $responses = '';
 
                if (count($linked_items)) {
-                       $cmnt_tpl = get_markup_template('comment_item.tpl');
-                       $tpl = get_markup_template('photo_item.tpl');
-                       $return_url = $a->cmd;
+                       $cmnt_tpl = Renderer::getMarkupTemplate('comment_item.tpl');
+                       $tpl = Renderer::getMarkupTemplate('photo_item.tpl');
+                       $return_path = $a->cmd;
 
-                       if ($can_post || can_write_wall($owner_uid)) {
-                               $like_tpl = get_markup_template('like_noshare.tpl');
-                               $likebuttons = replace_macros($like_tpl, [
+                       if ($can_post || Security::canWriteToUserWall($owner_uid)) {
+                               $like_tpl = Renderer::getMarkupTemplate('like_noshare.tpl');
+                               $likebuttons = Renderer::replaceMacros($like_tpl, [
                                        '$id' => $link_item['id'],
                                        '$likethis' => L10n::t("I like this \x28toggle\x29"),
                                        '$nolike' => (Feature::isEnabled(local_user(), 'dislike') ? L10n::t("I don't like this \x28toggle\x29") : ''),
@@ -1465,10 +1484,10 @@ function photos_content(App $a)
                        }
 
                        if (!DBA::isResult($items)) {
-                               if (($can_post || can_write_wall($owner_uid))) {
-                                       $comments .= replace_macros($cmnt_tpl, [
+                               if (($can_post || Security::canWriteToUserWall($owner_uid))) {
+                                       $comments .= Renderer::replaceMacros($cmnt_tpl, [
                                                '$return_path' => '',
-                                               '$jsreload' => $return_url,
+                                               '$jsreload' => $return_path,
                                                '$id' => $link_item['id'],
                                                '$parent' => $link_item['id'],
                                                '$profile_uid' =>  $owner_uid,
@@ -1504,10 +1523,10 @@ 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($owner_uid))) {
-                                       $comments .= replace_macros($cmnt_tpl,[
+                               if (($can_post || Security::canWriteToUserWall($owner_uid))) {
+                                       $comments .= Renderer::replaceMacros($cmnt_tpl,[
                                                '$return_path' => '',
-                                               '$jsreload' => $return_url,
+                                               '$jsreload' => $return_path,
                                                '$id' => $link_item['id'],
                                                '$parent' => $link_item['id'],
                                                '$profile_uid' =>  $owner_uid,
@@ -1550,7 +1569,7 @@ function photos_content(App $a)
                                        $title_e = $item['title'];
                                        $body_e = BBCode::convert($item['body']);
 
-                                       $comments .= replace_macros($template,[
+                                       $comments .= Renderer::replaceMacros($template,[
                                                '$id' => $item['id'],
                                                '$profile_url' => $profile_url,
                                                '$name' => $item['author-name'],
@@ -1564,10 +1583,10 @@ function photos_content(App $a)
                                                '$comment' => $comment
                                        ]);
 
-                                       if (($can_post || can_write_wall($owner_uid))) {
-                                               $comments .= replace_macros($cmnt_tpl, [
+                                       if (($can_post || Security::canWriteToUserWall($owner_uid))) {
+                                               $comments .= Renderer::replaceMacros($cmnt_tpl, [
                                                        '$return_path' => '',
-                                                       '$jsreload' => $return_url,
+                                                       '$jsreload' => $return_path,
                                                        '$id' => $item['item_id'],
                                                        '$parent' => $item['parent'],
                                                        '$profile_uid' =>  $owner_uid,
@@ -1590,11 +1609,11 @@ function photos_content(App $a)
                        }
                        $responses = get_responses($conv_responses, $response_verbs, '', $link_item);
 
-                       $paginate = paginate($a);
+                       $paginate = $pager->renderFull($total);
                }
 
-               $photo_tpl = get_markup_template('photo_view.tpl');
-               $o .= replace_macros($photo_tpl, [
+               $photo_tpl = Renderer::getMarkupTemplate('photo_view.tpl');
+               $o .= Renderer::replaceMacros($photo_tpl, [
                        '$id' => $ph[0]['id'],
                        '$album' => [$album_link, $ph[0]['album']],
                        '$tools' => $tools,
@@ -1615,7 +1634,7 @@ function photos_content(App $a)
                        '$paginate' => $paginate,
                ]);
 
-               $a->page['htmlhead'] .= "\n" . '<meta name="twitter:card" content="photo" />' . "\n";
+               $a->page['htmlhead'] .= "\n" . '<meta name="twitter:card" content="summary_large_image" />' . "\n";
                $a->page['htmlhead'] .= '<meta name="twitter:title" content="' . $photo["album"] . '" />' . "\n";
                $a->page['htmlhead'] .= '<meta name="twitter:image" content="' . $photo["href"] . '" />' . "\n";
                $a->page['htmlhead'] .= '<meta name="twitter:image:width" content="' . $photo["width"] . '" />' . "\n";
@@ -1626,19 +1645,19 @@ function photos_content(App $a)
 
        // Default - show recent photos with upload link (if applicable)
        //$o = '';
-
+       $total = 0;
        $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
                $sql_extra GROUP BY `resource-id`",
                intval($a->data['user']['uid']),
                DBA::escape('Contact Photos'),
                DBA::escape(L10n::t('Contact Photos'))
        );
-
        if (DBA::isResult($r)) {
-               $a->set_pager_total(count($r));
-               $a->set_pager_itemspage(20);
+               $total = count($r);
        }
 
+       $pager = new Pager($a->query_string, 20);
+
        $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
                ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`,
                ANY_VALUE(`created`) AS `created` FROM `photo`
@@ -1647,8 +1666,8 @@ function photos_content(App $a)
                intval($a->data['user']['uid']),
                DBA::escape('Contact Photos'),
                DBA::escape(L10n::t('Contact Photos')),
-               intval($a->pager['start']),
-               intval($a->pager['itemspage'])
+               $pager->getStart(),
+               $pager->getItemsPerPage()
        );
 
        $photos = [];
@@ -1685,13 +1704,13 @@ function photos_content(App $a)
                }
        }
 
-       $tpl = get_markup_template('photos_recent.tpl');
-       $o .= replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('photos_recent.tpl');
+       $o .= Renderer::replaceMacros($tpl, [
                '$title' => L10n::t('Recent Photos'),
                '$can_post' => $can_post,
                '$upload' => [L10n::t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'],
                '$photos' => $photos,
-               '$paginate' => paginate($a),
+               '$paginate' => $pager->renderFull($total),
        ]);
 
        return $o;