X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=137e0adb563218b312b51fc3b0dc021899df677f;hb=a876c208504af3ee801689886ec8cab8f3eeff00;hp=8ddb0010d13ca79db6cd041951d9e1f06eceabc0;hpb=c6ce9ddaa41a59496cbe5cd93ace9bc552478ccd;p=friendica.git
diff --git a/mod/photos.php b/mod/photos.php
index 8ddb0010d1..137e0adb56 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -9,12 +9,12 @@ 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\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
-use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Group;
@@ -25,12 +25,13 @@ use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Protocol\DFRN;
+use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map;
use Friendica\Util\Security;
use Friendica\Util\Temporal;
-
-require_once 'include/items.php';
+use Friendica\Util\Strings;
+use Friendica\Util\XML;
function photos_init(App $a) {
@@ -62,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', ''),
@@ -109,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'),
@@ -130,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')
]);
}
@@ -152,7 +153,7 @@ function photos_post(App $a)
$visitor = 0;
$page_owner_uid = $a->data['user']['uid'];
- $community_page = $a->data['user']['page-flags'] == Contact::PAGE_COMMUNITY;
+ $community_page = $a->data['user']['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
if (local_user() && (local_user() == $page_owner_uid)) {
$can_post = true;
@@ -183,7 +184,7 @@ function photos_post(App $a)
if (!$can_post) {
notice(L10n::t('Permission denied.') . EOL);
- killme();
+ exit();
}
$owner_record = User::getOwnerDataById($page_owner_uid);
@@ -191,7 +192,7 @@ function photos_post(App $a)
if (!$owner_record) {
notice(L10n::t('Contact information unavailable') . EOL);
Logger::log('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
- killme();
+ exit();
}
if ($a->argc > 3 && $a->argv[2] === 'album') {
@@ -219,7 +220,7 @@ function photos_post(App $a)
}
// RENAME photo album
- $newalbum = notags(trim($_POST['albumname']));
+ $newalbum = Strings::escapeTags(trim($_POST['albumname']));
if ($newalbum != $album) {
q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
DBA::escape($newalbum),
@@ -246,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,
@@ -279,19 +280,15 @@ function photos_post(App $a)
if (DBA::isResult($r)) {
foreach ($r as $rr) {
- $res[] = "'" . DBA::escape($rr['rid']) . "'" ;
+ $res[] = $rr['rid'];
}
} else {
$a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
- $str_res = implode(',', $res);
-
// remove the associated photos
- q("DELETE FROM `photo` WHERE `resource-id` IN ($str_res) AND `uid` = %d",
- intval($page_owner_uid)
- );
+ Photo::delete(['resource-id' => $res, 'uid' => $page_owner_uid]);
// find and delete the corresponding item with all the comments and likes/dislikes
Item::deleteForUser(['resource-id' => $res, 'uid' => $page_owner_uid], $page_owner_uid);
@@ -318,7 +315,7 @@ function photos_post(App $a)
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' => [],
@@ -346,10 +343,7 @@ function photos_post(App $a)
}
if (DBA::isResult($r)) {
- q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
- intval($page_owner_uid),
- DBA::escape($r[0]['resource-id'])
- );
+ Photo::delete(['uid' => $page_owner_uid, 'resource-id' => $r[0]['resource-id']]);
Item::deleteForUser(['resource-id' => $r[0]['resource-id'], 'uid' => $page_owner_uid], $page_owner_uid);
@@ -361,12 +355,12 @@ function photos_post(App $a)
return; // NOTREACHED
}
- if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || !empty($_POST['albname']) !== false)) {
- $desc = !empty($_POST['desc']) ? notags(trim($_POST['desc'])) : '';
- $rawtags = !empty($_POST['newtag']) ? notags(trim($_POST['newtag'])) : '';
- $item_id = !empty($_POST['item_id']) ? intval($_POST['item_id']) : 0;
- $albname = !empty($_POST['albname']) ? notags(trim($_POST['albname'])) : '';
- $origaname = !empty($_POST['origaname']) ? notags(trim($_POST['origaname'])) : '';
+ if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || isset($_POST['albname']))) {
+ $desc = !empty($_POST['desc']) ? Strings::escapeTags(trim($_POST['desc'])) : '';
+ $rawtags = !empty($_POST['newtag']) ? Strings::escapeTags(trim($_POST['newtag'])) : '';
+ $item_id = !empty($_POST['item_id']) ? intval($_POST['item_id']) : 0;
+ $albname = !empty($_POST['albname']) ? Strings::escapeTags(trim($_POST['albname'])) : '';
+ $origaname = !empty($_POST['origaname']) ? Strings::escapeTags(trim($_POST['origaname'])) : '';
$str_group_allow = !empty($_POST['group_allow']) ? perms2str($_POST['group_allow']) : '';
$str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
@@ -382,13 +376,10 @@ function photos_post(App $a)
if (!empty($_POST['rotate']) && (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) {
Logger::log('rotate');
- $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0 LIMIT 1",
- DBA::escape($resource_id),
- intval($page_owner_uid)
- );
+ $photo = Photo::getPhotoForUser($page_owner_uid, $resource_id);
- if (DBA::isResult($r)) {
- $image = new Image($r[0]['data'], $r[0]['type']);
+ if (DBA::isResult($photo)) {
+ $image = Photo::getImageForPhoto($photo);
if ($image->isValid()) {
$rotate_deg = ((intval($_POST['rotate']) == 1) ? 270 : 90);
@@ -397,26 +388,14 @@ function photos_post(App $a)
$width = $image->getWidth();
$height = $image->getHeight();
- $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0",
- DBA::escape($image->asString()),
- intval($height),
- intval($width),
- DBA::escape($resource_id),
- intval($page_owner_uid)
- );
+ Photo::update(['height' => $height, 'width' => $width], ['resource-id' => $resource_id, 'uid' => $page_owner_uid, 'scale' => 0], $image);
if ($width > 640 || $height > 640) {
$image->scaleDown(640);
$width = $image->getWidth();
$height = $image->getHeight();
- $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 1",
- DBA::escape($image->asString()),
- intval($height),
- intval($width),
- DBA::escape($resource_id),
- intval($page_owner_uid)
- );
+ Photo::update(['height' => $height, 'width' => $width], ['resource-id' => $resource_id, 'uid' => $page_owner_uid, 'scale' => 1], $image);
}
if ($width > 320 || $height > 320) {
@@ -424,50 +403,37 @@ function photos_post(App $a)
$width = $image->getWidth();
$height = $image->getHeight();
- $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 2",
- DBA::escape($image->asString()),
- intval($height),
- intval($width),
- DBA::escape($resource_id),
- intval($page_owner_uid)
- );
+ Photo::update(['height' => $height, 'width' => $width], ['resource-id' => $resource_id, 'uid' => $page_owner_uid, 'scale' => 2], $image);
}
}
}
}
- $p = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ORDER BY `scale` DESC",
- DBA::escape($resource_id),
- intval($page_owner_uid)
- );
+ $photos_stmt = DBA::select('photo', [], ['resource-id' => $resource_id, 'uid' => $page_owner_uid], ['order' => ['scale' => true]]);
- 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",
- DBA::escape($desc),
- DBA::escape($albname),
- DBA::escape($str_contact_allow),
- DBA::escape($str_group_allow),
- DBA::escape($str_contact_deny),
- DBA::escape($str_group_deny),
- DBA::escape($resource_id),
- intval($page_owner_uid)
+ $photos = DBA::toArray($photos_stmt);
+
+ if (DBA::isResult($photos)) {
+ $photo = $photos[0];
+ $ext = $phototypes[$photo['type']];
+ Photo::update(
+ ['desc' => $desc, 'album' => $albname, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny],
+ ['resource-id' => $resource_id, 'uid' => $page_owner_uid]
);
// Update the photo albums cache if album name was changed
if ($albname !== $origaname) {
Photo::clearAlbumCache($page_owner_uid);
}
- }
-
- /* Don't make the item visible if the only change was the album name */
+ /* Don't make the item visible if the only change was the album name */
- $visibility = 0;
- if ($p[0]['desc'] !== $desc || strlen($rawtags)) {
- $visibility = 1;
+ $visibility = 0;
+ if ($photo['desc'] !== $desc || strlen($rawtags)) {
+ $visibility = 1;
+ }
}
- if (!$item_id) {
+ if (DBA::isResult($photos) && !$item_id) {
// Create item container
$title = '';
$uri = Item::newURI($page_owner_uid);
@@ -479,7 +445,7 @@ function photos_post(App $a)
$arr['parent-uri'] = $uri;
$arr['post-type'] = Item::PT_IMAGE;
$arr['wall'] = 1;
- $arr['resource-id'] = $p[0]['resource-id'];
+ $arr['resource-id'] = $photo['resource-id'];
$arr['contact-id'] = $owner_record['id'];
$arr['owner-name'] = $owner_record['name'];
$arr['owner-link'] = $owner_record['url'];
@@ -488,15 +454,15 @@ function photos_post(App $a)
$arr['author-link'] = $owner_record['url'];
$arr['author-avatar'] = $owner_record['thumb'];
$arr['title'] = $title;
- $arr['allow_cid'] = $p[0]['allow_cid'];
- $arr['allow_gid'] = $p[0]['allow_gid'];
- $arr['deny_cid'] = $p[0]['deny_cid'];
- $arr['deny_gid'] = $p[0]['deny_gid'];
+ $arr['allow_cid'] = $photo['allow_cid'];
+ $arr['allow_gid'] = $photo['allow_gid'];
+ $arr['deny_cid'] = $photo['deny_cid'];
+ $arr['deny_gid'] = $photo['deny_gid'];
$arr['visible'] = $visibility;
$arr['origin'] = 1;
- $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']'
- . '[img]' . System::baseUrl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
+ $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $photo['resource-id'] . ']'
+ . '[img]' . System::baseUrl() . '/photo/' . $photo['resource-id'] . '-' . $photo['scale'] . '.'. $ext . '[/img]'
. '[/url]';
$item_id = Item::insert($arr);
@@ -521,7 +487,7 @@ function photos_post(App $a)
}
$taginfo = [];
- $tags = get_tags($rawtags);
+ $tags = BBCode::getTags($rawtags);
if (count($tags)) {
foreach ($tags as $tag) {
@@ -554,7 +520,6 @@ function photos_post(App $a)
$taginfo[] = [$newname, $profile, $salmon];
} else {
$newname = $name;
- $alias = '';
$tagcid = 0;
if (strrpos($newname, '+')) {
@@ -564,7 +529,7 @@ function photos_post(App $a)
if ($tagcid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($tagcid),
- intval($profile_uid)
+ intval($page_owner_uid)
);
} else {
$newname = str_replace('_',' ',$name);
@@ -609,7 +574,7 @@ function photos_post(App $a)
}
$profile = str_replace(',', '%2c', $profile);
- $str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
+ $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]';
}
} elseif (strpos($tag, '#') === 0) {
$tagname = substr($tag, 1);
@@ -635,7 +600,7 @@ function photos_post(App $a)
Item::update($fields, $condition);
$best = 0;
- foreach ($p as $scales) {
+ foreach ($photos as $scales) {
if (intval($scales['scale']) == 2) {
$best = 2;
break;
@@ -665,10 +630,10 @@ function photos_post(App $a)
$arr['author-link'] = $owner_record['url'];
$arr['author-avatar'] = $owner_record['thumb'];
$arr['title'] = '';
- $arr['allow_cid'] = $p[0]['allow_cid'];
- $arr['allow_gid'] = $p[0]['allow_gid'];
- $arr['deny_cid'] = $p[0]['deny_cid'];
- $arr['deny_gid'] = $p[0]['deny_gid'];
+ $arr['allow_cid'] = $photo['allow_cid'];
+ $arr['allow_gid'] = $photo['allow_gid'];
+ $arr['deny_cid'] = $photo['deny_cid'];
+ $arr['deny_gid'] = $photo['deny_gid'];
$arr['visible'] = 1;
$arr['verb'] = ACTIVITY_TAG;
$arr['gravity'] = GRAVITY_PARENT;
@@ -677,21 +642,21 @@ function photos_post(App $a)
$arr['tag'] = $tagged[4];
$arr['inform'] = $tagged[2];
$arr['origin'] = 1;
- $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['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/' . $photo['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/' . $photo['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $photo['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
$arr['object'] = '' . "\n";
- $arr['target'] = '' . ACTIVITY_OBJ_IMAGE . '' . $p[0]['desc'] . ''
- . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '';
- $arr['target'] .= '' . xmlify('' . "\n" . '') . '';
+ $arr['target'] = '' . ACTIVITY_OBJ_IMAGE . '' . $photo['desc'] . ''
+ . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . '';
+ $arr['target'] .= '' . XML::escape('' . "\n" . '') . '';
- $item_id = Item::insert($arr);
+ Item::insert($arr);
}
}
}
@@ -701,11 +666,11 @@ function photos_post(App $a)
// default post action - upload a photo
- Addon::callHooks('photo_post_init', $_POST);
+ Hook::callAll('photo_post_init', $_POST);
// Determine the album to use
- $album = !empty($_REQUEST['album']) ? notags(trim($_REQUEST['album'])) : '';
- $newalbum = !empty($_REQUEST['newalbum']) ? notags(trim($_REQUEST['newalbum'])) : '';
+ $album = !empty($_REQUEST['album']) ? Strings::escapeTags(trim($_REQUEST['album'])) : '';
+ $newalbum = !empty($_REQUEST['newalbum']) ? Strings::escapeTags(trim($_REQUEST['newalbum'])) : '';
Logger::log('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , Logger::DEBUG);
@@ -725,10 +690,7 @@ function photos_post(App $a)
* they acquire comments, likes, dislikes, and/or tags
*/
- $r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR ",
- DBA::escape($album),
- intval($page_owner_uid)
- );
+ $r = Photo::select([], ['`album` = ? AND `uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR', $album, $page_owner_uid]);
if (!DBA::isResult($r) || ($album == L10n::t('Profile Photos'))) {
$visible = 1;
@@ -752,7 +714,7 @@ function photos_post(App $a)
$ret = ['src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''];
- Addon::callHooks('photo_post_file', $ret);
+ Hook::callAll('photo_post_file', $ret);
if (!empty($ret['src']) && !empty($ret['filesize'])) {
$src = $ret['src'];
@@ -776,7 +738,7 @@ function photos_post(App $a)
notice(L10n::t('Image exceeds size limit of %s', ini_get('upload_max_filesize')) . EOL);
break;
case UPLOAD_ERR_FORM_SIZE:
- notice(L10n::t('Image exceeds size limit of %s', formatBytes(defaults($_REQUEST, 'MAX_FILE_SIZE', 0))) . EOL);
+ notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes(defaults($_REQUEST, 'MAX_FILE_SIZE', 0))) . EOL);
break;
case UPLOAD_ERR_PARTIAL:
notice(L10n::t('Image upload didn\'t complete, please try again') . EOL);
@@ -792,7 +754,7 @@ function photos_post(App $a)
}
@unlink($src);
$foo = 0;
- Addon::callHooks('photo_post_end', $foo);
+ Hook::callAll('photo_post_end', $foo);
return;
}
@@ -805,10 +767,10 @@ function photos_post(App $a)
$maximagesize = Config::get('system', 'maximagesize');
if ($maximagesize && ($filesize > $maximagesize)) {
- notice(L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize)) . EOL);
+ notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL);
@unlink($src);
$foo = 0;
- Addon::callHooks('photo_post_end', $foo);
+ Hook::callAll('photo_post_end', $foo);
return;
}
@@ -816,7 +778,7 @@ function photos_post(App $a)
notice(L10n::t('Image file is empty.') . EOL);
@unlink($src);
$foo = 0;
- Addon::callHooks('photo_post_end', $foo);
+ Hook::callAll('photo_post_end', $foo);
return;
}
@@ -831,8 +793,8 @@ function photos_post(App $a)
notice(L10n::t('Unable to process image.') . EOL);
@unlink($src);
$foo = 0;
- Addon::callHooks('photo_post_end',$foo);
- killme();
+ Hook::callAll('photo_post_end',$foo);
+ exit();
}
$exif = $image->orient($src);
@@ -858,7 +820,7 @@ function photos_post(App $a)
if (!$r) {
Logger::log('mod/photos.php: photos_post(): image store failed', Logger::DEBUG);
notice(L10n::t('Image upload failed.') . EOL);
- killme();
+ exit();
}
if ($width > 640 || $height > 640) {
@@ -917,7 +879,7 @@ function photos_post(App $a)
// Update the photo albums cache
Photo::clearAlbumCache($page_owner_uid);
- Addon::callHooks('photo_post_end', $item_id);
+ Hook::callAll('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
@@ -942,8 +904,6 @@ function photos_content(App $a)
return;
}
- require_once 'include/conversation.php';
-
if (empty($a->data['user'])) {
notice(L10n::t('No photos selected') . EOL);
return;
@@ -980,7 +940,7 @@ function photos_content(App $a)
$owner_uid = $a->data['user']['uid'];
- $community_page = (($a->data['user']['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
+ $community_page = (($a->data['user']['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
if (local_user() && (local_user() == $owner_uid)) {
$can_post = true;
@@ -1082,20 +1042,20 @@ function photos_content(App $a)
'addon_text' => $uploader,
'default_upload' => true];
- Addon::callHooks('photo_upload_form',$ret);
+ Hook::callAll('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,
@@ -1165,11 +1125,11 @@ function photos_content(App $a)
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,
@@ -1219,8 +1179,8 @@ function photos_content(App $a)
}
}
- $tpl = get_markup_template('photo_album.tpl');
- $o .= replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate('photo_album.tpl');
+ $o .= Renderer::replaceMacros($tpl, [
'$photos' => $photos,
'$album' => $album,
'$can_post' => $can_post,
@@ -1341,15 +1301,15 @@ 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
]);
}
if ($prevlink) {
- $prevlink = [$prevlink, ''] ;
+ $prevlink = [$prevlink, ''];
}
$photo = [
@@ -1428,13 +1388,13 @@ function photos_content(App $a)
$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, ''],
@@ -1467,16 +1427,16 @@ 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');
+ $cmnt_tpl = Renderer::getMarkupTemplate('comment_item.tpl');
+ $tpl = Renderer::getMarkupTemplate('photo_item.tpl');
$return_path = $a->cmd;
if ($can_post || Security::canWriteToUserWall($owner_uid)) {
- $like_tpl = get_markup_template('like_noshare.tpl');
- $likebuttons = replace_macros($like_tpl, [
+ $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") : ''),
+ '$nolike' => L10n::t("I don't like this \x28toggle\x29"),
'$wait' => L10n::t('Please wait'),
'$return_path' => $a->query_string,
]);
@@ -1484,7 +1444,7 @@ function photos_content(App $a)
if (!DBA::isResult($items)) {
if (($can_post || Security::canWriteToUserWall($owner_uid))) {
- $comments .= replace_macros($cmnt_tpl, [
+ $comments .= Renderer::replaceMacros($cmnt_tpl, [
'$return_path' => '',
'$jsreload' => $return_path,
'$id' => $link_item['id'],
@@ -1498,7 +1458,7 @@ function photos_content(App $a)
'$preview' => L10n::t('Preview'),
'$sourceapp' => L10n::t($a->sourcename),
'$ww' => '',
- '$rand_num' => random_digits(12)
+ '$rand_num' => Crypto::randomDigits(12)
]);
}
}
@@ -1523,7 +1483,7 @@ function photos_content(App $a)
}
if (($can_post || Security::canWriteToUserWall($owner_uid))) {
- $comments .= replace_macros($cmnt_tpl,[
+ $comments .= Renderer::replaceMacros($cmnt_tpl,[
'$return_path' => '',
'$jsreload' => $return_path,
'$id' => $link_item['id'],
@@ -1537,7 +1497,7 @@ function photos_content(App $a)
'$preview' => L10n::t('Preview'),
'$sourceapp' => L10n::t($a->sourcename),
'$ww' => '',
- '$rand_num' => random_digits(12)
+ '$rand_num' => Crypto::randomDigits(12)
]);
}
@@ -1568,7 +1528,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'],
@@ -1583,7 +1543,7 @@ function photos_content(App $a)
]);
if (($can_post || Security::canWriteToUserWall($owner_uid))) {
- $comments .= replace_macros($cmnt_tpl, [
+ $comments .= Renderer::replaceMacros($cmnt_tpl, [
'$return_path' => '',
'$jsreload' => $return_path,
'$id' => $item['item_id'],
@@ -1597,22 +1557,20 @@ function photos_content(App $a)
'$preview' => L10n::t('Preview'),
'$sourceapp' => L10n::t($a->sourcename),
'$ww' => '',
- '$rand_num' => random_digits(12)
+ '$rand_num' => Crypto::randomDigits(12)
]);
}
}
}
$response_verbs = ['like'];
- if (Feature::isEnabled($owner_uid, 'dislike')) {
- $response_verbs[] = 'dislike';
- }
- $responses = get_responses($conv_responses, $response_verbs, '', $link_item);
+ $response_verbs[] = 'dislike';
+ $responses = get_responses($conv_responses, $response_verbs, $link_item);
$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,
@@ -1680,7 +1638,6 @@ function photos_content(App $a)
}
$twist = !$twist;
-
$ext = $phototypes[$rr['type']];
$alt_e = $rr['filename'];
@@ -1703,8 +1660,8 @@ 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'],