X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=504f0ff1460df4fa5cc6b695c0c9568834fb15be;hb=de4a2e6fd03cd0aab94a256eba92ed593931534b;hp=a22f919c89f70168a7e8a6fad8b712e481d66f9f;hpb=5b80a1fcaa04e96992cc54c27e8437a88df591f1;p=friendica.git
diff --git a/mod/photos.php b/mod/photos.php
index a22f919c89..504f0ff146 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,5 +1,16 @@
argv[1]);
}
- if ((get_config('system', 'block_public')) && (! local_user()) && (! remote_user())) {
+ if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
return;
}
@@ -26,11 +34,11 @@ function photos_init(App $a) {
if ($a->argc > 1) {
$nick = $a->argv[1];
- $user = qu("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+ $user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
dbesc($nick)
);
- if (! dbm::is_result($user)) {
+ if (! DBM::is_result($user)) {
return;
}
@@ -40,7 +48,7 @@ function photos_init(App $a) {
$profile = get_profiledata_by_nick($nick, $a->profile_uid);
- $account_type = account_type($profile);
+ $account_type = Contact::getAccountType($profile);
$tpl = get_markup_template("vcard-widget.tpl");
@@ -93,7 +101,7 @@ function photos_init(App $a) {
'$title' => t('Photo Albums'),
'$recent' => t('Recent Photos'),
'$albums' => $albums['albums'],
- '$baseurl' => z_root(),
+ '$baseurl' => System::baseUrl(),
'$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'),
'$can_post' => $can_post
));
@@ -150,11 +158,11 @@ function photos_post(App $a) {
}
if ($contact_id) {
- $r = qu("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+ $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)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$can_post = true;
$visitor = $contact_id;
}
@@ -167,12 +175,12 @@ function photos_post(App $a) {
killme();
}
- $r = qu("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
+ $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1",
intval($page_owner_uid)
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
notice( t('Contact information unavailable') . EOL);
logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
killme();
@@ -189,11 +197,11 @@ function photos_post(App $a) {
return; // NOTREACHED
}
- $r = qu("SELECT `album` FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
+ $r = q("SELECT `album` FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
dbesc($album),
intval($page_owner_uid)
);
- if (!dbm::is_result($r)) {
+ if (!DBM::is_result($r)) {
notice( t('Album not found.') . EOL);
goaway($_SESSION['photo_return']);
return; // NOTREACHED
@@ -264,7 +272,7 @@ function photos_post(App $a) {
dbesc($album)
);
}
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
foreach ($r as $rr) {
$res[] = "'" . dbesc($rr['rid']) . "'" ;
}
@@ -286,7 +294,7 @@ function photos_post(App $a) {
$r = q("SELECT `parent-uri` FROM `item` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
intval($page_owner_uid)
);
- if (dbm::is_result($r)) {
+ 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()),
@@ -301,7 +309,7 @@ function photos_post(App $a) {
// send the notification upstream/downstream as the case may be
if ($rr['visible']) {
- proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
}
}
}
@@ -352,7 +360,7 @@ function photos_post(App $a) {
dbesc($a->argv[2])
);
}
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
intval($page_owner_uid),
dbesc($r[0]['resource-id'])
@@ -361,7 +369,7 @@ function photos_post(App $a) {
dbesc($r[0]['resource-id']),
intval($page_owner_uid)
);
- if (dbm::is_result($i)) {
+ 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()),
@@ -371,14 +379,14 @@ function photos_post(App $a) {
create_tags_from_itemuri($i[0]['uri'], $page_owner_uid);
delete_thread_uri($i[0]['uri'], $page_owner_uid);
- $url = App::get_baseurl();
+ $url = System::baseUrl();
$drop_id = intval($i[0]['id']);
// Update the photo albums cache
photo_albums($page_owner_uid, true);
if ($i[0]['visible']) {
- proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
}
}
}
@@ -414,9 +422,9 @@ function photos_post(App $a) {
dbesc($resource_id),
intval($page_owner_uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$ph = new Photo($r[0]['data'], $r[0]['type']);
- if ($ph->is_valid()) {
+ if ($ph->isValid()) {
$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
$ph->rotate($rotate_deg);
@@ -466,7 +474,7 @@ function photos_post(App $a) {
dbesc($resource_id),
intval($page_owner_uid)
);
- if (dbm::is_result($p)) {
+ if (DBM::is_result($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",
dbesc($desc),
@@ -523,8 +531,8 @@ function photos_post(App $a) {
$arr['visible'] = $visibility;
$arr['origin'] = 1;
- $arr['body'] = '[url=' . App::get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']'
- . '[img]' . App::get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
+ $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]'
. '[/url]';
$item_id = item_store($arr);
@@ -537,7 +545,7 @@ function photos_post(App $a) {
intval($page_owner_uid)
);
}
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$old_tag = $r[0]['tag'];
$old_inform = $r[0]['inform'];
}
@@ -604,7 +612,7 @@ function photos_post(App $a) {
intval($page_owner_uid)
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
//select someone by attag or nick and the name passed in
$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
dbesc($name),
@@ -614,7 +622,7 @@ function photos_post(App $a) {
}
}
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$newname = $r[0]['name'];
$profile = $r[0]['url'];
$notify = 'cid:' . $r[0]['id'];
@@ -638,7 +646,7 @@ function photos_post(App $a) {
}
} elseif (strpos($tag, '#') === 0) {
$tagname = substr($tag, 1);
- $str_tags .= '#[url=' . App::get_baseurl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url]';
+ $str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url]';
}
}
}
@@ -710,8 +718,8 @@ 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=' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
- $arr['body'] .= "\n\n" . '[url=' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . App::get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
+ $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'] .= "\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'] = '' . "\n";
$arr['target'] = '' . ACTIVITY_OBJ_IMAGE . '' . $p[0]['desc'] . ''
- . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '';
- $arr['target'] .= '' . xmlify('' . "\n" . '') . '';
+ . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '';
+ $arr['target'] .= '' . xmlify('' . "\n" . '') . '';
$item_id = item_store($arr);
if ($item_id) {
- proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id);
}
}
}
@@ -771,7 +779,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 == t('Profile Photos'))) {
$visible = 1;
} else {
$visible = 0;
@@ -802,12 +810,12 @@ function photos_post(App $a) {
$type = $_FILES['userfile']['type'];
}
if ($type == "") {
- $type = guess_image_type($filename);
+ $type = Photo::guessImageType($filename);
}
logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG);
- $maximagesize = get_config('system','maximagesize');
+ $maximagesize = Config::get('system','maximagesize');
if (($maximagesize) && ($filesize > $maximagesize)) {
notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
@@ -829,27 +837,9 @@ function photos_post(App $a) {
$imagedata = @file_get_contents($src);
-
- $limit = service_class_fetch($a->data['user']['uid'], 'photo_upload_limit');
-
- if ($limit) {
- $r = q("SELECT SUM(OCTET_LENGTH(`data`)) AS `total` FROM `photo` WHERE `uid` = %d AND `scale` = 0 AND `album` != 'Contact Photos'",
- intval($a->data['user']['uid'])
- );
- $size = $r[0]['total'];
-
- if (($size + strlen($imagedata)) > $limit) {
- notice( upgrade_message() . EOL );
- @unlink($src);
- $foo = 0;
- call_hooks('photo_post_end',$foo);
- killme();
- }
- }
-
$ph = new Photo($imagedata, $type);
- if (! $ph->is_valid()) {
+ if (! $ph->isValid()) {
logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
notice( t('Unable to process image.') . EOL );
@unlink($src);
@@ -861,7 +851,7 @@ function photos_post(App $a) {
$exif = $ph->orient($src);
@unlink($src);
- $max_length = get_config('system', 'max_image_length');
+ $max_length = Config::get('system', 'max_image_length');
if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH;
}
@@ -940,8 +930,8 @@ function photos_post(App $a) {
$arr['visible'] = $visible;
$arr['origin'] = 1;
- $arr['body'] = '[url=' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
- . '[img]' . App::get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
+ $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
+ . '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
. '[/url]';
$item_id = item_store($arr);
@@ -949,7 +939,7 @@ function photos_post(App $a) {
photo_albums($page_owner_uid, true);
if ($visible) {
- proc_run(PRIORITY_HIGH, "include/notifier.php", 'wall-new', $item_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", 'wall-new', $item_id);
}
call_hooks('photo_post_end',intval($item_id));
@@ -975,14 +965,14 @@ function photos_content(App $a) {
// photos/name/image/xxxxx/edit
- if ((get_config('system', 'block_public')) && (! local_user()) && (! remote_user())) {
+ if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL);
return;
}
- require_once('include/bbcode.php');
- require_once('include/security.php');
- require_once('include/conversation.php');
+ require_once 'include/bbcode.php';
+ require_once 'include/security.php';
+ require_once 'include/conversation.php';
if (! x($a->data,'user')) {
notice( t('No photos selected') . EOL );
@@ -1044,7 +1034,7 @@ function photos_content(App $a) {
intval($contact_id),
intval($owner_uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$can_post = true;
$contact = $r[0];
$remote_contact = true;
@@ -1072,7 +1062,7 @@ function photos_content(App $a) {
intval($contact_id),
intval($owner_uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$contact = $r[0];
$remote_contact = true;
}
@@ -1142,15 +1132,6 @@ function photos_content(App $a) {
));
$usage_message = '';
- $limit = service_class_fetch($a->data['user']['uid'], 'photo_upload_limit');
- if ($limit !== false) {
-
- $r = q("SELECT SUM(`datasize`) AS `total` FROM `photo` WHERE `uid` = %d AND `scale` = 0 AND `album` != 'Contact Photos'",
- intval($a->data['user']['uid'])
- );
- $usage_message = sprintf(t("You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."), $r[0]['total'] / 1024000, $limit / 1024000 );
- }
-
// Private/public post links for the non-JS ACL form
$private_post = 1;
@@ -1176,13 +1157,8 @@ function photos_content(App $a) {
$tpl = get_markup_template('photos_upload.tpl');
- if ($a->theme['template_engine'] === 'internal') {
- $albumselect_e = template_escape($albumselect);
- $aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user)));
- } else {
- $albumselect_e = $albumselect;
- $aclselect_e = (($visitor) ? '' : populate_acl($a->user));
- }
+ $albumselect_e = $albumselect;
+ $aclselect_e = (($visitor) ? '' : populate_acl($a->user));
$o .= replace_macros($tpl,array(
'$pagename' => t('Upload Photos'),
@@ -1228,7 +1204,7 @@ function photos_content(App $a) {
intval($owner_uid),
dbesc($album)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$a->set_pager_total(count($r));
$a->set_pager_itemspage(20);
}
@@ -1257,11 +1233,7 @@ function photos_content(App $a) {
if ($can_post) {
$edit_tpl = get_markup_template('album_edit.tpl');
- if ($a->theme['template_engine'] === 'internal') {
- $album_e = template_escape($album);
- } else {
- $album_e = $album;
- }
+ $album_e = $album;
$o .= replace_macros($edit_tpl,array(
'$nametext' => t('New album name: '),
@@ -1287,7 +1259,7 @@ function photos_content(App $a) {
$photos = array();
- if (dbm::is_result($r))
+ if (DBM::is_result($r))
$twist = 'rotright';
foreach ($r as $rr) {
if ($twist == 'rotright') {
@@ -1298,13 +1270,8 @@ function photos_content(App $a) {
$ext = $phototypes[$rr['type']];
- if ($a->theme['template_engine'] === 'internal') {
- $imgalt_e = template_escape($rr['filename']);
- $desc_e = template_escape($rr['desc']);
- } else {
- $imgalt_e = $rr['filename'];
- $desc_e = $rr['desc'];
- }
+ $imgalt_e = $rr['filename'];
+ $desc_e = $rr['desc'];
$photos[] = array(
'id' => $rr['id'],
@@ -1349,13 +1316,13 @@ function photos_content(App $a) {
dbesc($datum)
);
- if (! dbm::is_result($ph)) {
+ if (! DBM::is_result($ph)) {
$ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
LIMIT 1",
intval($owner_uid),
dbesc($datum)
);
- if (dbm::is_result($ph)) {
+ if (DBM::is_result($ph)) {
notice(t('Permission denied. Access to this item may be restricted.'));
} else {
notice(t('Photo not available') . EOL );
@@ -1375,13 +1342,13 @@ function photos_content(App $a) {
else
$order = 'DESC';
- $prvnxt = qu("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0
+ $prvnxt = q("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0
$sql_extra ORDER BY `created` $order ",
dbesc($ph[0]['album']),
intval($owner_uid)
);
- if (dbm::is_result($prvnxt)) {
+ if (DBM::is_result($prvnxt)) {
foreach ($prvnxt as $z => $entry) {
if ($entry['resource-id'] == $ph[0]['resource-id']) {
$prv = $z - 1;
@@ -1472,10 +1439,10 @@ function photos_content(App $a) {
$map = null;
- if (dbm::is_result($linked_items)) {
+ if (DBM::is_result($linked_items)) {
$link_item = $linked_items[0];
- $r = qu("SELECT COUNT(*) AS `total`
+ $r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
@@ -1487,12 +1454,12 @@ function photos_content(App $a) {
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$a->set_pager_total($r[0]['total']);
}
- $r = qu("SELECT `item`.*, `item`.`id` AS `item_id`,
+ $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`,
`contact`.`rel`, `contact`.`thumb`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@@ -1569,15 +1536,9 @@ function photos_content(App $a) {
$public_post_link = '&public=1';
}
- if ($a->theme['template_engine'] === 'internal') {
- $album_e = template_escape($ph[0]['album']);
- $caption_e = template_escape($ph[0]['desc']);
- $aclselect_e = template_escape(populate_acl($ph[0]));
- } else {
- $album_e = $ph[0]['album'];
- $caption_e = $ph[0]['desc'];
- $aclselect_e = populate_acl($ph[0]);
- }
+ $album_e = $ph[0]['album'];
+ $caption_e = $ph[0]['desc'];
+ $aclselect_e = populate_acl($ph[0]);
$edit = replace_macros($edit_tpl, array(
'$id' => $ph[0]['id'],
@@ -1630,7 +1591,7 @@ function photos_content(App $a) {
}
$comments = '';
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) {
$comments .= replace_macros($cmnt_tpl, array(
'$return_path' => '',
@@ -1664,7 +1625,7 @@ function photos_content(App $a) {
);
// display comments
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
foreach ($r as $item) {
builtin_activity_puller($item, $conv_responses);
@@ -1729,15 +1690,9 @@ function photos_content(App $a) {
'delete' => t('Delete'),
);
- if ($a->theme['template_engine'] === 'internal') {
- $name_e = template_escape($profile_name);
- $title_e = template_escape($item['title']);
- $body_e = template_escape(bbcode($item['body']));
- } else {
- $name_e = $profile_name;
- $title_e = $item['title'];
- $body_e = bbcode($item['body']);
- }
+ $name_e = $profile_name;
+ $title_e = $item['title'];
+ $body_e = bbcode($item['body']);
$comments .= replace_macros($template,array(
'$id' => $item['item_id'],
@@ -1787,17 +1742,10 @@ function photos_content(App $a) {
$photo_tpl = get_markup_template('photo_view.tpl');
- if ($a->theme['template_engine'] === 'internal') {
- $album_e = array($album_link,template_escape($ph[0]['album']));
- $tags_e = template_escape($tags);
- $like_e = template_escape($like);
- $dislike_e = template_escape($dislike);
- } else {
- $album_e = array($album_link, $ph[0]['album']);
- $tags_e = $tags;
- $like_e = $like;
- $dislike_e = $dislike;
- }
+ $album_e = array($album_link, $ph[0]['album']);
+ $tags_e = $tags;
+ $like_e = $like;
+ $dislike_e = $dislike;
$o .= replace_macros($photo_tpl, array(
'$id' => $ph[0]['id'],
@@ -1832,18 +1780,18 @@ function photos_content(App $a) {
// Default - show recent photos with upload link (if applicable)
//$o = '';
- $r = qu("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
+ $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']),
dbesc('Contact Photos'),
dbesc( t('Contact Photos'))
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$a->set_pager_total(count($r));
$a->set_pager_itemspage(20);
}
- $r = qu("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
+ $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`
WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
@@ -1856,7 +1804,7 @@ function photos_content(App $a) {
);
$photos = array();
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$twist = 'rotright';
foreach ($r as $rr) {
//hide profile photos to others
@@ -1870,13 +1818,8 @@ function photos_content(App $a) {
$ext = $phototypes[$rr['type']];
- if ($a->theme['template_engine'] === 'internal') {
- $alt_e = template_escape($rr['filename']);
- $name_e = template_escape($rr['album']);
- } else {
- $alt_e = $rr['filename'];
- $name_e = $rr['album'];
- }
+ $alt_e = $rr['filename'];
+ $name_e = $rr['album'];
$photos[] = array(
'id' => $rr['id'],