X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=504f0ff1460df4fa5cc6b695c0c9568834fb15be;hb=de4a2e6fd03cd0aab94a256eba92ed593931534b;hp=27d8499c2809699d655b375f745c55a36dcb9d12;hpb=7b352f3f74b045690cdeae507b609f7a9cc8db03;p=friendica.git
diff --git a/mod/photos.php b/mod/photos.php
index 27d8499c28..504f0ff146 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,23 +1,32 @@
argc > 1)
+ if ($a->argc > 1) {
auto_redir($a, $a->argv[1]);
+ }
- if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
return;
}
@@ -25,12 +34,13 @@ 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 (! count($user))
+ if (! DBM::is_result($user)) {
return;
+ }
$a->data['user'] = $user[0];
$a->profile_uid = $user[0]['uid'];
@@ -38,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");
@@ -59,8 +69,9 @@ function photos_init(App $a) {
if ($albums) {
$a->data['albums'] = $albums;
- if ($albums_visible)
+ if ($albums_visible) {
$ret['success'] = true;
+ }
$ret['albums'] = array();
foreach ($albums as $k => $album) {
@@ -80,24 +91,26 @@ function photos_init(App $a) {
$albums = $ret;
- if (local_user() && $a->data['user']['uid'] == local_user())
+ if (local_user() && $a->data['user']['uid'] == local_user()) {
$can_post = true;
+ }
if ($albums['success']) {
- $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'),array(
+ $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'), array(
'$nick' => $a->data['user']['nickname'],
'$title' => t('Photo Albums'),
- '$recent' => t('Recent Photos'),
+ '$recent' => t('Recent Photos'),
'$albums' => $albums['albums'],
- '$baseurl' => z_root(),
- '$upload' => array( t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'),
+ '$baseurl' => System::baseUrl(),
+ '$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'),
'$can_post' => $can_post
));
}
- if (! x($a->page,'aside'))
+ if (! x($a->page, 'aside')) {
$a->page['aside'] = '';
+ }
$a->page['aside'] .= $vcard_widget;
$a->page['aside'] .= $photo_albums_widget;
@@ -130,9 +143,9 @@ function photos_post(App $a) {
$page_owner_uid = $a->data['user']['uid'];
$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
- if ((local_user()) && (local_user() == $page_owner_uid))
+ if ((local_user()) && (local_user() == $page_owner_uid)) {
$can_post = true;
- else {
+ } else {
if ($community_page && remote_user()) {
$contact_id = 0;
if (is_array($_SESSION['remote'])) {
@@ -145,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;
}
@@ -162,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();
@@ -184,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
@@ -259,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']) . "'" ;
}
@@ -281,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()),
@@ -295,8 +308,9 @@ 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);
+ if ($rr['visible']) {
+ Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
+ }
}
}
@@ -346,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'])
@@ -355,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()),
@@ -365,14 +379,15 @@ 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);
+ if ($i[0]['visible']) {
+ Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
+ }
}
}
@@ -394,28 +409,29 @@ function photos_post(App $a) {
$resource_id = $a->argv[2];
- if (! strlen($albname))
+ if (! strlen($albname)) {
$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+ }
if ((x($_POST,'rotate') !== false) &&
( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
logger('rotate');
- $r = q("select * from photo where `resource-id` = '%s' and uid = %d and scale = 0 limit 1",
+ $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0 LIMIT 1",
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);
$width = $ph->getWidth();
$height = $ph->getHeight();
- $x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 0",
+ $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0",
dbesc($ph->imageString()),
intval($height),
intval($width),
@@ -428,7 +444,7 @@ function photos_post(App $a) {
$width = $ph->getWidth();
$height = $ph->getHeight();
- $x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 1",
+ $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 1",
dbesc($ph->imageString()),
intval($height),
intval($width),
@@ -442,7 +458,7 @@ function photos_post(App $a) {
$width = $ph->getWidth();
$height = $ph->getHeight();
- $x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 2",
+ $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 2",
dbesc($ph->imageString()),
intval($height),
intval($width),
@@ -458,7 +474,7 @@ function photos_post(App $a) {
dbesc($resource_id),
intval($page_owner_uid)
);
- if (count($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),
@@ -470,6 +486,7 @@ function photos_post(App $a) {
dbesc($resource_id),
intval($page_owner_uid)
);
+
// Update the photo albums cache if album name was changed
if ($albname !== $origaname) {
photo_albums($page_owner_uid, true);
@@ -479,8 +496,9 @@ function photos_post(App $a) {
/* Don't make the item visible if the only change was the album name */
$visibility = 0;
- if ($p[0]['desc'] !== $desc || strlen($rawtags))
+ if ($p[0]['desc'] !== $desc || strlen($rawtags)) {
$visibility = 1;
+ }
if (! $item_id) {
@@ -513,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);
@@ -527,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'];
}
@@ -540,40 +558,45 @@ function photos_post(App $a) {
// if the new tag doesn't have a namespace specifier (@foo or #foo) give it a hashtag
$x = substr($rawtags,0,1);
- if ($x !== '@' && $x !== '#')
+ if ($x !== '@' && $x !== '#') {
$rawtags = '#' . $rawtags;
+ }
$taginfo = array();
$tags = get_tags($rawtags);
if (count($tags)) {
foreach ($tags as $tag) {
- if (isset($profile))
+ if (isset($profile)) {
unset($profile);
- if (strpos($tag,'@') === 0) {
+ }
+ if (strpos($tag, '@') === 0) {
$name = substr($tag,1);
- if ((strpos($name,'@')) || (strpos($name,'http://'))) {
+ 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')
+ 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))
+ $salmon = '$url:' . str_replace(',', '%sc', $link['@attributes']['href']);
+ if (strlen($inform)) {
$inform .= ',';
- $inform .= $salmon;
+ }
+ $inform .= $salmon;
}
}
}
- $taginfo[] = array($newname,$profile,$salmon);
+ $taginfo[] = array($newname, $profile, $salmon);
} else {
$newname = $name;
$alias = '';
$tagcid = 0;
- if (strrpos($newname,'+'))
- $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
+ if (strrpos($newname, '+')) {
+ $tagcid = intval(substr($newname, strrpos($newname, '+') + 1));
+ }
if ($tagcid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -589,7 +612,7 @@ function photos_post(App $a) {
intval($page_owner_uid)
);
- if (! $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),
@@ -598,53 +621,46 @@ function photos_post(App $a) {
);
}
}
-/* elseif (strstr($name,'_') || strstr($name,' ')) {
- $newname = str_replace('_',' ',$name);
- $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($newname),
- intval($page_owner_uid)
- );
- } else {
- $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
- dbesc($name),
- dbesc($name),
- intval($page_owner_uid)
- );
- }*/
- if (dbm::is_result($r)) {
+
+ if (DBM::is_result($r)) {
$newname = $r[0]['name'];
$profile = $r[0]['url'];
$notify = 'cid:' . $r[0]['id'];
- if (strlen($inform))
+ if (strlen($inform)) {
$inform .= ',';
+ }
$inform .= $notify;
}
}
if ($profile) {
- if (substr($notify,0,4) === 'cid:')
- $taginfo[] = array($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]');
- if (strlen($str_tags))
+ if (substr($notify, 0, 4) === 'cid:') {
+ $taginfo[] = array($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]');
+ }
+ if (strlen($str_tags)) {
$str_tags .= ',';
- $profile = str_replace(',','%2c',$profile);
+ }
+ $profile = str_replace(',', '%2c', $profile);
$str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
}
- } elseif (strpos($tag,'#') === 0) {
+ } 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]';
}
}
}
$newtag = $old_tag;
- if (strlen($newtag) && strlen($str_tags))
+ if (strlen($newtag) && strlen($str_tags)) {
$newtag .= ',';
+ }
$newtag .= $str_tags;
$newinform = $old_inform;
- if (strlen($newinform) && strlen($inform))
+ if (strlen($newinform) && strlen($inform)) {
$newinform .= ',';
+ }
$newinform .= $inform;
$r = q("UPDATE `item` SET `tag` = '%s', `inform` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d",
@@ -702,27 +718,26 @@ 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);
}
}
-
}
-
}
goaway($_SESSION['photo_return']);
return; // NOTREACHED
@@ -745,38 +760,39 @@ function photos_post(App $a) {
logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
if (! strlen($album)) {
- if (strlen($newalbum))
+ if (strlen($newalbum)) {
$album = $newalbum;
- else
+ } else {
$album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+ }
}
- /**
- *
+ /*
* We create a wall item for every photo, but we don't want to
* overwhelm the data stream with a hundred newly uploaded photos.
* So we will make the first photo uploaded to this album in the last several hours
* visible by default, the rest will become visible over time when and if
* 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 ",
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
+ } else {
$visible = 0;
+ }
- if (intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true')
+ if (intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true') {
$visible = 0;
+ }
- $str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',',$_REQUEST['group_allow'])));
- $str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',',$_REQUEST['contact_allow'])));
- $str_group_deny = perms2str(((is_array($_REQUEST['group_deny'])) ? $_REQUEST['group_deny'] : explode(',',$_REQUEST['group_deny'])));
- $str_contact_deny = perms2str(((is_array($_REQUEST['contact_deny'])) ? $_REQUEST['contact_deny'] : explode(',',$_REQUEST['contact_deny'])));
+ $str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',', $_REQUEST['group_allow'])));
+ $str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',', $_REQUEST['contact_allow'])));
+ $str_group_deny = perms2str(((is_array($_REQUEST['group_deny'])) ? $_REQUEST['group_deny'] : explode(',', $_REQUEST['group_deny'])));
+ $str_contact_deny = perms2str(((is_array($_REQUEST['contact_deny'])) ? $_REQUEST['contact_deny'] : explode(',', $_REQUEST['contact_deny'])));
$ret = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => '');
@@ -793,11 +809,13 @@ function photos_post(App $a) {
$filesize = intval($_FILES['userfile']['size']);
$type = $_FILES['userfile']['type'];
}
- if ($type=="") $type=guess_image_type($filename);
+ if ($type == "") {
+ $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);
@@ -819,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);
@@ -851,11 +851,13 @@ function photos_post(App $a) {
$exif = $ph->orient($src);
@unlink($src);
- $max_length = get_config('system','max_image_length');
- if (! $max_length)
+ $max_length = Config::get('system', 'max_image_length');
+ if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH;
- if ($max_length > 0)
+ }
+ if ($max_length > 0) {
$ph->scaleImage($max_length);
+ }
$width = $ph->getWidth();
$height = $ph->getHeight();
@@ -891,6 +893,7 @@ function photos_post(App $a) {
$lat = $lon = null;
+ /// @TODO merge these 2 if() into one?
if ($exif && $exif['GPS']) {
if (feature_enabled($channel_id,'photo_location')) {
$lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
@@ -900,8 +903,9 @@ function photos_post(App $a) {
$arr = array();
- if ($lat && $lon)
+ if ($lat && $lon) {
$arr['coord'] = $lat . ' ' . $lon;
+ }
$arr['guid'] = get_guid(32);
$arr['uid'] = $page_owner_uid;
@@ -926,28 +930,29 @@ 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);
// Update the photo albums cache
photo_albums($page_owner_uid, true);
- if ($visible)
- proc_run(PRIORITY_HIGH, "include/notifier.php", 'wall-new', $item_id);
+ if ($visible) {
+ Worker::add(PRIORITY_HIGH, "Notifier", 'wall-new', $item_id);
+ }
call_hooks('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
+ /*
+ * 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']);
// NOTREACHED
}
-
-
function photos_content(App $a) {
// URLs:
@@ -960,15 +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 );
@@ -986,15 +990,17 @@ function photos_content(App $a) {
if ($a->argc > 3) {
$datatype = $a->argv[2];
$datum = $a->argv[3];
- } elseif (($a->argc > 2) && ($a->argv[2] === 'upload'))
+ } elseif (($a->argc > 2) && ($a->argv[2] === 'upload')) {
$datatype = 'upload';
- else
+ } else {
$datatype = 'summary';
+ }
- if ($a->argc > 4)
+ if ($a->argc > 4) {
$cmd = $a->argv[4];
- else
+ } else {
$cmd = 'view';
+ }
//
// Setup permissions structures
@@ -1010,9 +1016,9 @@ function photos_content(App $a) {
$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
- if ((local_user()) && (local_user() == $owner_uid))
+ if ((local_user()) && (local_user() == $owner_uid)) {
$can_post = true;
- else {
+ } else {
if ($community_page && remote_user()) {
if (is_array($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $v) {
@@ -1028,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;
@@ -1056,13 +1062,14 @@ 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;
}
}
}
+ /// @TODO merge these 2 if() into one?
if (! $remote_contact) {
if (local_user()) {
$contact_id = $_SESSION['cid'];
@@ -1081,7 +1088,7 @@ 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_tabs($a, $is_owner, $a->data['user']['nickname']);
/**
* Display upload form
@@ -1089,7 +1096,7 @@ function photos_content(App $a) {
if ($datatype === 'upload') {
if (! ($can_post)) {
- notice( t('Permission denied.'));
+ notice(t('Permission denied.'));
return;
}
@@ -1103,8 +1110,9 @@ function photos_content(App $a) {
$albumselect .= '';
if (count($a->data['albums'])) {
foreach ($a->data['albums'] as $album) {
- if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
+ if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos'))) {
continue;
+ }
$selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
$albumselect .= '';
}
@@ -1116,7 +1124,6 @@ function photos_content(App $a) {
'addon_text' => $uploader,
'default_upload' => true);
-
call_hooks('photo_upload_form',$ret);
$default_upload_box = replace_macros(get_markup_template('photos_default_uploader_box.tpl'), array());
@@ -1125,44 +1132,33 @@ 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;
- if ($_REQUEST['public'])
+ if ($_REQUEST['public']) {
$private_post = 0;
+ }
$query_str = $a->query_string;
- if (strpos($query_str, 'public=1') !== false)
+ if (strpos($query_str, 'public=1') !== false) {
$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+ }
- // I think $a->query_string may never have ? in it, but I could be wrong
- // It looks like it's from the index.php?q=[etc] rewrite that the web
- // server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
- if (strpos($query_str, '?') === false)
+ /*
+ * I think $a->query_string may never have ? in it, but I could be wrong
+ * It looks like it's from the index.php?q=[etc] rewrite that the web
+ * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
+ */
+ if (strpos($query_str, '?') === false) {
$public_post_link = '?public=1';
- else
+ } else {
$public_post_link = '&public=1';
-
-
+ }
$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'),
@@ -1208,17 +1204,22 @@ 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);
}
- if ($_GET['order'] === 'posted')
+ /// @TODO I have seen this many times, maybe generalize it script-wide and encapsulate it?
+ if ($_GET['order'] === 'posted') {
$order = 'ASC';
- else
+ } else {
$order = 'DESC';
+ }
- $r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
+ $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
+ ANY_VALUE(`type`) AS `type`, max(`scale`) AS `scale`, ANY_VALUE(`desc`) as `desc`,
+ ANY_VALUE(`created`) as `created`
+ FROM `photo` WHERE `uid` = %d AND `album` = '%s'
AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d",
intval($owner_uid),
dbesc($album),
@@ -1226,17 +1227,13 @@ function photos_content(App $a) {
intval($a->pager['itemspage'])
);
- //edit album name
+ // edit album name
if ($cmd === 'edit') {
if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
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: '),
@@ -1249,37 +1246,32 @@ function photos_content(App $a) {
}
}
} else {
- if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
- if ($can_post) {
- $edit = array(t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit');
- }
+ 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 ($_GET['order'] === 'posted')
+ if ($_GET['order'] === 'posted') {
$order = array(t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album));
- else
+ } else {
$order = array(t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted');
+ }
$photos = array();
- if (dbm::is_result($r))
+ if (DBM::is_result($r))
$twist = 'rotright';
foreach ($r as $rr) {
- if ($twist == 'rotright')
+ if ($twist == 'rotright') {
$twist = 'rotleft';
- else
+ } else {
$twist = 'rotright';
+ }
$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'],
@@ -1310,10 +1302,9 @@ function photos_content(App $a) {
}
- /**
+ /*
* Display one photo
*/
-
if ($datatype === 'image') {
//$o = '';
@@ -1325,16 +1316,17 @@ function photos_content(App $a) {
dbesc($datum)
);
- if (! count($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 (count($ph))
- notice( t('Permission denied. Access to this item may be restricted.'));
- else
- notice( t('Photo not available') . EOL );
+ if (DBM::is_result($ph)) {
+ notice(t('Permission denied. Access to this item may be restricted.'));
+ } else {
+ notice(t('Photo not available') . EOL );
+ }
return;
}
@@ -1350,21 +1342,23 @@ 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 (count($prvnxt)) {
- for($z = 0; $z < count($prvnxt); $z++) {
- if ($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) {
+ if (DBM::is_result($prvnxt)) {
+ foreach ($prvnxt as $z => $entry) {
+ if ($entry['resource-id'] == $ph[0]['resource-id']) {
$prv = $z - 1;
$nxt = $z + 1;
- if ($prv < 0)
+ if ($prv < 0) {
$prv = count($prvnxt) - 1;
- if ($nxt >= count($prvnxt))
+ }
+ if ($nxt >= count($prvnxt)) {
$nxt = 0;
+ }
break;
}
}
@@ -1387,8 +1381,8 @@ function photos_content(App $a) {
}
$album_link = 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
- $tools = Null;
- $lock = Null;
+ $tools = null;
+ $lock = null;
if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
$tools = array(
@@ -1426,8 +1420,9 @@ function photos_content(App $a) {
'filename' => $hires['filename'],
);
- if ($nextlink)
+ if ($nextlink) {
$nextlink = array($nextlink, '');
+ }
// Do we have an item for this photo?
@@ -1444,9 +1439,10 @@ function photos_content(App $a) {
$map = null;
- if (count($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
@@ -1458,11 +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`
@@ -1493,15 +1490,16 @@ function photos_content(App $a) {
}
}
- $tags=Null;
+ $tags = null;
if (count($linked_items) && strlen($link_item['tag'])) {
- $arr = explode(',',$link_item['tag']);
+ $arr = explode(',', $link_item['tag']);
// parse tags and add links
$tag_str = '';
foreach ($arr as $t) {
- if (strlen($tag_str))
+ if (strlen($tag_str)) {
$tag_str .= ', ';
+ }
$tag_str .= bbcode($t);
}
$tags = array(t('Tags: '), $tag_str);
@@ -1518,40 +1516,38 @@ function photos_content(App $a) {
// Private/public post links for the non-JS ACL form
$private_post = 1;
- if ($_REQUEST['public'])
+ if ($_REQUEST['public']) {
$private_post = 0;
+ }
$query_str = $a->query_string;
- if (strpos($query_str, 'public=1') !== false)
+ if (strpos($query_str, 'public=1') !== false) {
$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+ }
- // I think $a->query_string may never have ? in it, but I could be wrong
- // It looks like it's from the index.php?q=[etc] rewrite that the web
- // server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
- if (strpos($query_str, '?') === false)
+ /*
+ * I think $a->query_string may never have ? in it, but I could be wrong
+ * It looks like it's from the index.php?q=[etc] rewrite that the web
+ * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
+ */
+ if (strpos($query_str, '?') === false) {
$public_post_link = '?public=1';
- else
- $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]);
+ $public_post_link = '&public=1';
}
+ $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'],
'$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,''),
+ '$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,''),
'$nickname' => $a->data['user']['nickname'],
'$resource_id' => $ph[0]['resource-id'],
@@ -1584,8 +1580,8 @@ function photos_content(App $a) {
$likebuttons = '';
- if ($can_post || can_write_wall($a,$owner_uid)) {
- $likebuttons = replace_macros($like_tpl,array(
+ if ($can_post || can_write_wall($a, $owner_uid)) {
+ $likebuttons = replace_macros($like_tpl, array(
'$id' => $link_item['id'],
'$likethis' => t("I like this \x28toggle\x29"),
'$nolike' => (feature_enabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''),
@@ -1595,27 +1591,25 @@ function photos_content(App $a) {
}
$comments = '';
- if (! dbm::is_result($r)) {
- if ($can_post || can_write_wall($a,$owner_uid)) {
- if ($link_item['last-child']) {
- $comments .= replace_macros($cmnt_tpl,array(
- '$return_path' => '',
- '$jsreload' => $return_url,
- '$type' => 'wall-comment',
- '$id' => $link_item['id'],
- '$parent' => $link_item['id'],
- '$profile_uid' => $owner_uid,
- '$mylink' => $contact['url'],
- '$mytitle' => t('This is you'),
- '$myphoto' => $contact['thumb'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$preview' => t('Preview'),
- '$sourceapp' => t($a->sourcename),
- '$ww' => '',
- '$rand_num' => random_digits(12)
- ));
- }
+ 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' => '',
+ '$jsreload' => $return_url,
+ '$type' => 'wall-comment',
+ '$id' => $link_item['id'],
+ '$parent' => $link_item['id'],
+ '$profile_uid' => $owner_uid,
+ '$mylink' => $contact['url'],
+ '$mytitle' => t('This is you'),
+ '$myphoto' => $contact['thumb'],
+ '$comment' => t('Comment'),
+ '$submit' => t('Submit'),
+ '$preview' => t('Preview'),
+ '$sourceapp' => t($a->sourcename),
+ '$ww' => '',
+ '$rand_num' => random_digits(12)
+ ));
}
}
@@ -1630,40 +1624,34 @@ function photos_content(App $a) {
'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
);
-
-
// display comments
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
foreach ($r as $item) {
builtin_activity_puller($item, $conv_responses);
}
- $like = ((x($conv_responses['like'],$link_item['uri'])) ? format_like($conv_responses['like'][$link_item['uri']],$conv_responses['like'][$link_item['uri'] . '-l'],'like',$link_item['id']) : '');
- $dislike = ((x($conv_responses['dislike'],$link_item['uri'])) ? 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)) {
- if ($link_item['last-child']) {
- $comments .= replace_macros($cmnt_tpl,array(
- '$return_path' => '',
- '$jsreload' => $return_url,
- '$type' => 'wall-comment',
- '$id' => $link_item['id'],
- '$parent' => $link_item['id'],
- '$profile_uid' => $owner_uid,
- '$mylink' => $contact['url'],
- '$mytitle' => t('This is you'),
- '$myphoto' => $contact['thumb'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$preview' => t('Preview'),
- '$sourceapp' => t($a->sourcename),
- '$ww' => '',
- '$rand_num' => random_digits(12)
- ));
- }
+ $like = ((x($conv_responses['like'], $link_item['uri'])) ? format_like($conv_responses['like'][$link_item['uri']], $conv_responses['like'][$link_item['uri'] . '-l'], 'like',$link_item['id']) : '');
+ $dislike = ((x($conv_responses['dislike'], $link_item['uri'])) ? 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(
+ '$return_path' => '',
+ '$jsreload' => $return_url,
+ '$type' => 'wall-comment',
+ '$id' => $link_item['id'],
+ '$parent' => $link_item['id'],
+ '$profile_uid' => $owner_uid,
+ '$mylink' => $contact['url'],
+ '$mytitle' => t('This is you'),
+ '$myphoto' => $contact['thumb'],
+ '$comment' => t('Comment'),
+ '$submit' => t('Submit'),
+ '$preview' => t('Preview'),
+ '$sourceapp' => t($a->sourcename),
+ '$ww' => '',
+ '$rand_num' => random_digits(12)
+ ));
}
@@ -1675,7 +1663,7 @@ function photos_content(App $a) {
if (((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
continue;
- $redirect_url = 'redir/' . $item['cid'] ;
+ $redirect_url = 'redir/' . $item['cid'];
if (local_user() && ($item['contact-uid'] == local_user())
@@ -1694,8 +1682,6 @@ function photos_content(App $a) {
$profile_link = $profile_url;
-
-
$dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()));
$drop = array(
'dropping' => $dropping,
@@ -1704,16 +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'],
@@ -1729,27 +1708,24 @@ function photos_content(App $a) {
'$comment' => $comment
));
- if ($can_post || can_write_wall($a,$owner_uid)) {
-
- if ($item['last-child']) {
- $comments .= replace_macros($cmnt_tpl,array(
- '$return_path' => '',
- '$jsreload' => $return_url,
- '$type' => 'wall-comment',
- '$id' => $item['item_id'],
- '$parent' => $item['parent'],
- '$profile_uid' => $owner_uid,
- '$mylink' => $contact['url'],
- '$mytitle' => t('This is you'),
- '$myphoto' => $contact['thumb'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$preview' => t('Preview'),
- '$sourceapp' => t($a->sourcename),
- '$ww' => '',
- '$rand_num' => random_digits(12)
- ));
- }
+ if (($can_post || can_write_wall($a, $owner_uid)) && $item['last-child']) {
+ $comments .= replace_macros($cmnt_tpl, array(
+ '$return_path' => '',
+ '$jsreload' => $return_url,
+ '$type' => 'wall-comment',
+ '$id' => $item['item_id'],
+ '$parent' => $item['parent'],
+ '$profile_uid' => $owner_uid,
+ '$mylink' => $contact['url'],
+ '$mytitle' => t('This is you'),
+ '$myphoto' => $contact['thumb'],
+ '$comment' => t('Comment'),
+ '$submit' => t('Submit'),
+ '$preview' => t('Preview'),
+ '$sourceapp' => t($a->sourcename),
+ '$ww' => '',
+ '$rand_num' => random_digits(12)
+ ));
}
}
}
@@ -1759,23 +1735,17 @@ function photos_content(App $a) {
$response_verbs = array('like');
- if (feature_enabled($owner_uid,'dislike'))
+ if (feature_enabled($owner_uid, 'dislike')) {
$response_verbs[] = 'dislike';
- $responses = get_responses($conv_responses,$response_verbs,'',$link_item);
+ }
+ $responses = get_responses($conv_responses,$response_verbs, '', $link_item);
$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'],
@@ -1798,11 +1768,11 @@ function photos_content(App $a) {
'$paginate' => $paginate,
));
- $a->page['htmlhead'] .= "\n".''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ $a->page['htmlhead'] .= "\n" . '' . "\n";
+ $a->page['htmlhead'] .= '' . "\n";
+ $a->page['htmlhead'] .= '' . "\n";
+ $a->page['htmlhead'] .= '' . "\n";
+ $a->page['htmlhead'] .= '' . "\n";
return $o;
}
@@ -1810,18 +1780,20 @@ 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`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo`
+ $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'
$sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
intval($a->data['user']['uid']),
@@ -1832,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
@@ -1846,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'],