X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=edaba5a9027c7427e8c62f80be4db92a7846264a;hb=7823223a0595a541e1a5e011fe65f8c56c1e4d50;hp=03021e55018ba678805c701d7065580b77e237ae;hpb=05b2836d660c043d00b204c05463e720bb72f62a;p=friendica.git
diff --git a/mod/photos.php b/mod/photos.php
index 03021e5501..edaba5a902 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -8,13 +8,14 @@ require_once('include/security.php');
require_once('include/redir.php');
require_once('include/tags.php');
require_once('include/threads.php');
+require_once('include/Probe.php');
function photos_init(&$a) {
- if($a->argc > 1)
+ if ($a->argc > 1)
auto_redir($a, $a->argv[1]);
- if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
return;
}
@@ -22,57 +23,54 @@ function photos_init(&$a) {
$o = '';
- if($a->argc > 1) {
+ if ($a->argc > 1) {
$nick = $a->argv[1];
- $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+ $user = qu("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
dbesc($nick)
);
- if(! count($r))
+ if (! count($user))
return;
- $a->data['user'] = $r[0];
- $a->profile_uid = $r[0]['uid'];
+ $a->data['user'] = $user[0];
+ $a->profile_uid = $user[0]['uid'];
$is_owner = (local_user() && (local_user() == $a->profile_uid));
- $profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
+ $profile = get_profiledata_by_nick($nick, $a->profile_uid);
+
+ $account_type = account_type($profile);
$tpl = get_markup_template("vcard-widget.tpl");
$vcard_widget .= replace_macros($tpl, array(
- '$name' => $a->data['user']['username'],
- '$photo' => $profilephoto
+ '$name' => $profile['name'],
+ '$photo' => $profile['photo'],
+ '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
+ '$account_type' => $account_type,
+ '$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
));
-
- $sql_extra = permissions_sql($a->data['user']['uid']);
-
- $albums = q("SELECT count(distinct `resource-id`) AS `total`, `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
- $sql_extra group by album order by created desc",
- intval($a->data['user']['uid']),
- dbesc('Contact Photos'),
- dbesc( t('Contact Photos'))
- );
+ $albums = photo_albums($a->data['user']['uid']);
$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
// add various encodings to the array so we can just loop through and pick them out in a template
$ret = array('success' => false);
- if($albums) {
+ if ($albums) {
$a->data['albums'] = $albums;
if ($albums_visible)
$ret['success'] = true;
$ret['albums'] = array();
- foreach($albums as $k => $album) {
+ foreach ($albums as $k => $album) {
//hide profile photos to others
- if((! $is_owner) && (! remote_user()) && ($album['album'] == t('Profile Photos')))
+ if ((! $is_owner) && (! remote_user()) && ($album['album'] == t('Profile Photos')))
continue;
$entry = array(
'text' => $album['album'],
'total' => $album['total'],
- 'url' => z_root() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']),
+ 'url' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']),
'urlencode' => urlencode($album['album']),
'bin2hex' => bin2hex($album['album'])
);
@@ -82,23 +80,23 @@ function photos_init(&$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']) {
+ if ($albums['success']) {
$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'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload'),
+ '$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;
@@ -132,26 +130,26 @@ function photos_post(&$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 {
- if($community_page && remote_user()) {
+ if ($community_page && remote_user()) {
$cid = 0;
- if(is_array($_SESSION['remote'])) {
- foreach($_SESSION['remote'] as $v) {
- if($v['uid'] == $page_owner_uid) {
+ if (is_array($_SESSION['remote'])) {
+ foreach ($_SESSION['remote'] as $v) {
+ if ($v['uid'] == $page_owner_uid) {
$cid = $v['cid'];
break;
}
}
}
- if($cid) {
+ if ($cid) {
- $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+ $r = qu("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($cid),
intval($page_owner_uid)
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$can_post = true;
$visitor = $cid;
}
@@ -159,17 +157,17 @@ function photos_post(&$a) {
}
}
- if(! $can_post) {
+ if (! $can_post) {
notice( t('Permission denied.') . EOL );
killme();
}
- $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
+ $r = qu("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(! count($r)) {
+ if (! count($r)) {
notice( t('Contact information unavailable') . EOL);
logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
killme();
@@ -178,27 +176,27 @@ function photos_post(&$a) {
$owner_record = $r[0];
- if(($a->argc > 3) && ($a->argv[2] === 'album')) {
+ if (($a->argc > 3) && ($a->argv[2] === 'album')) {
$album = hex2bin($a->argv[3]);
- if($album === t('Profile Photos') || $album === 'Contact Photos' || $album === t('Contact Photos')) {
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ if ($album === t('Profile Photos') || $album === 'Contact Photos' || $album === t('Contact Photos')) {
+ goaway($_SESSION['photo_return']);
return; // NOTREACHED
}
- $r = q("SELECT count(*) FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
+ $r = qu("SELECT count(*) FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
dbesc($album),
intval($page_owner_uid)
);
- if(! count($r)) {
+ if (! count($r)) {
notice( t('Album not found.') . EOL);
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ goaway($_SESSION['photo_return']);
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query
- if($_REQUEST['canceled']) {
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ if ($_REQUEST['canceled']) {
+ goaway($_SESSION['photo_return']);
}
/*
@@ -206,14 +204,14 @@ function photos_post(&$a) {
*/
$newalbum = notags(trim($_POST['albumname']));
- if($newalbum != $album) {
+ if ($newalbum != $album) {
q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
dbesc($newalbum),
dbesc($album),
intval($page_owner_uid)
);
$newurl = str_replace(bin2hex($album),bin2hex($newalbum),$_SESSION['photo_return']);
- goaway($a->get_baseurl() . '/' . $newurl);
+ goaway($newurl);
return; // NOTREACHED
}
@@ -221,10 +219,10 @@ function photos_post(&$a) {
* DELETE photo album and all its photos
*/
- if($_POST['dropalbum'] == t('Delete Album')) {
+ if ($_POST['dropalbum'] == t('Delete Album')) {
// Check if we should do HTML-based delete confirmation
- if($_REQUEST['confirm']) {
+ if ($_REQUEST['confirm']) {
$drop_url = $a->query_string;
$extra_inputs = array(
array('name' => 'albumname', 'value' => $_POST['albumname']),
@@ -246,26 +244,24 @@ function photos_post(&$a) {
// get the list of photos we are about to delete
- if($visitor) {
+ if ($visitor) {
$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `album` = '%s'",
intval($visitor),
intval($page_owner_uid),
dbesc($album)
);
- }
- else {
+ } else {
$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
intval(local_user()),
dbesc($album)
);
}
- if(count($r)) {
- foreach($r as $rr) {
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
$res[] = "'" . dbesc($rr['rid']) . "'" ;
}
- }
- else {
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ } else {
+ goaway($_SESSION['photo_return']);
return; // NOTREACHED
}
@@ -282,8 +278,8 @@ function photos_post(&$a) {
$r = q("SELECT `parent-uri` FROM `item` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
intval($page_owner_uid)
);
- if(count($r)) {
- foreach($r as $rr) {
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()),
dbesc($rr['parent-uri']),
@@ -296,27 +292,27 @@ function photos_post(&$a) {
// send the notification upstream/downstream as the case may be
- if($rr['visible'])
- proc_run('php',"include/notifier.php","drop","$drop_id");
+ if ($rr['visible'])
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
}
}
}
- goaway($a->get_baseurl() . '/photos/' . $a->data['user']['nickname']);
+ goaway('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query for a single photo
- if(($a->argc > 2) && $_REQUEST['canceled']) {
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ if (($a->argc > 2) && $_REQUEST['canceled']) {
+ goaway($_SESSION['photo_return']);
}
- if(($a->argc > 2) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) {
+ if (($a->argc > 2) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) {
// same as above but remove single photo
// Check if we should do HTML-based delete confirmation
- if($_REQUEST['confirm']) {
+ if ($_REQUEST['confirm']) {
$drop_url = $a->query_string;
$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
'$method' => 'post',
@@ -331,20 +327,19 @@ function photos_post(&$a) {
return;
}
- if($visitor) {
+ if ($visitor) {
$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource-id` = '%s' LIMIT 1",
intval($visitor),
intval($page_owner_uid),
dbesc($a->argv[2])
);
- }
- else {
+ } else {
$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' LIMIT 1",
intval(local_user()),
dbesc($a->argv[2])
);
}
- if(count($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'])
@@ -353,7 +348,7 @@ function photos_post(&$a) {
dbesc($r[0]['resource-id']),
intval($page_owner_uid)
);
- if(count($i)) {
+ if (count($i)) {
q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
@@ -366,16 +361,16 @@ function photos_post(&$a) {
$url = $a->get_baseurl();
$drop_id = intval($i[0]['id']);
- if($i[0]['visible'])
- proc_run('php',"include/notifier.php","drop","$drop_id");
+ if ($i[0]['visible'])
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
}
}
- goaway($a->get_baseurl() . '/photos/' . $a->data['user']['nickname']);
+ goaway('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
- if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) {
+ if (($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) {
$desc = ((x($_POST,'desc')) ? notags(trim($_POST['desc'])) : '');
$rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : '');
@@ -388,11 +383,11 @@ function photos_post(&$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) &&
+ if ((x($_POST,'rotate') !== false) &&
( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
logger('rotate');
@@ -400,9 +395,9 @@ function photos_post(&$a) {
dbesc($resource_id),
intval($page_owner_uid)
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$ph = new Photo($r[0]['data'], $r[0]['type']);
- if($ph->is_valid()) {
+ if ($ph->is_valid()) {
$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
$ph->rotate($rotate_deg);
@@ -417,7 +412,7 @@ function photos_post(&$a) {
intval($page_owner_uid)
);
- if($width > 640 || $height > 640) {
+ if ($width > 640 || $height > 640) {
$ph->scaleImage(640);
$width = $ph->getWidth();
$height = $ph->getHeight();
@@ -431,7 +426,7 @@ function photos_post(&$a) {
);
}
- if($width > 320 || $height > 320) {
+ if ($width > 320 || $height > 320) {
$ph->scaleImage(320);
$width = $ph->getWidth();
$height = $ph->getHeight();
@@ -452,7 +447,7 @@ function photos_post(&$a) {
dbesc($resource_id),
intval($page_owner_uid)
);
- if(count($p)) {
+ if (count($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),
@@ -469,10 +464,10 @@ function photos_post(&$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) {
+ if (! $item_id) {
// Create item container
@@ -480,7 +475,7 @@ function photos_post(&$a) {
$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
$arr = array();
-
+ $arr['guid'] = get_guid(32);
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;
@@ -511,18 +506,18 @@ function photos_post(&$a) {
}
- if($item_id) {
+ if ($item_id) {
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($item_id),
intval($page_owner_uid)
);
}
- if(count($r)) {
+ if (dbm::is_result($r)) {
$old_tag = $r[0]['tag'];
$old_inform = $r[0]['inform'];
}
- if(strlen($rawtags)) {
+ if (strlen($rawtags)) {
$str_tags = '';
$inform = '';
@@ -530,49 +525,47 @@ function photos_post(&$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 (count($tags)) {
+ foreach ($tags as $tag) {
+ 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 = @lrdd($name);
- if(count($links)) {
- foreach($links as $link) {
- if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
+ $links = @Probe::lrdd($name);
+ if (count($links)) {
+ foreach ($links as $link) {
+ if ($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
$profile = $link['@attributes']['href'];
- if($link['@attributes']['rel'] === 'salmon') {
+ if ($link['@attributes']['rel'] === 'salmon') {
$salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']);
- if(strlen($inform))
+ if (strlen($inform))
$inform .= ',';
$inform .= $salmon;
}
}
}
$taginfo[] = array($newname,$profile,$salmon);
- }
- else {
+ } else {
$newname = $name;
$alias = '';
$tagcid = 0;
- if(strrpos($newname,'+'))
+ if (strrpos($newname,'+'))
$tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
- if($tagcid) {
+ if ($tagcid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($tagcid),
intval($profile_uid)
);
- }
- else {
+ } else {
$newname = str_replace('_',' ',$name);
//select someone from this user's contacts by name
@@ -581,7 +574,7 @@ function photos_post(&$a) {
intval($page_owner_uid)
);
- if(! $r) {
+ if (! $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),
@@ -590,35 +583,34 @@ function photos_post(&$a) {
);
}
}
-/* elseif(strstr($name,'_') || strstr($name,' ')) {
+/* 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 {
+ } 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(count($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:')
+ 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 (strlen($str_tags))
$str_tags .= ',';
$profile = str_replace(',','%2c',$profile);
$str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
@@ -631,12 +623,12 @@ function photos_post(&$a) {
}
$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;
@@ -652,24 +644,24 @@ function photos_post(&$a) {
update_thread($item_id);
$best = 0;
- foreach($p as $scales) {
- if(intval($scales['scale']) == 2) {
+ foreach ($p as $scales) {
+ if (intval($scales['scale']) == 2) {
$best = 2;
break;
}
- if(intval($scales['scale']) == 4) {
+ if (intval($scales['scale']) == 4) {
$best = 4;
break;
}
}
- if(count($taginfo)) {
- foreach($taginfo as $tagged) {
+ if (count($taginfo)) {
+ foreach ($taginfo as $tagged) {
$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
$arr = array();
-
+ $arr['guid'] = get_guid(32);
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;
@@ -700,7 +692,7 @@ function photos_post(&$a) {
$arr['object'] = '' . "\n";
@@ -709,21 +701,15 @@ function photos_post(&$a) {
$arr['target'] .= '' . xmlify('' . "\n" . '') . '';
$item_id = item_store($arr);
- if($item_id) {
- //q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
- // dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id),
- // intval($page_owner_uid),
- // intval($item_id)
- //);
-
- proc_run('php',"include/notifier.php","tag","$item_id");
+ if ($item_id) {
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
}
}
}
}
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ goaway($_SESSION['photo_return']);
return; // NOTREACHED
}
@@ -743,8 +729,8 @@ function photos_post(&$a) {
logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
- if(! strlen($album)) {
- if(strlen($newalbum))
+ if (! strlen($album)) {
+ if (strlen($newalbum))
$album = $newalbum;
else
$album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
@@ -764,12 +750,12 @@ function photos_post(&$a) {
dbesc($album),
intval($page_owner_uid)
);
- if((! count($r)) || ($album == t('Profile Photos')))
+ if ((! count($r)) || ($album == t('Profile Photos')))
$visible = 1;
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'])));
@@ -781,13 +767,12 @@ function photos_post(&$a) {
call_hooks('photo_post_file',$ret);
- if(x($ret,'src') && x($ret,'filesize')) {
+ if (x($ret,'src') && x($ret,'filesize')) {
$src = $ret['src'];
$filename = $ret['filename'];
$filesize = $ret['filesize'];
$type = $ret['type'];
- }
- else {
+ } else {
$src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
@@ -799,7 +784,7 @@ function photos_post(&$a) {
$maximagesize = get_config('system','maximagesize');
- if(($maximagesize) && ($filesize > $maximagesize)) {
+ if (($maximagesize) && ($filesize > $maximagesize)) {
notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
@unlink($src);
$foo = 0;
@@ -807,7 +792,7 @@ function photos_post(&$a) {
return;
}
- if(! $filesize) {
+ if (! $filesize) {
notice( t('Image file is empty.') . EOL);
@unlink($src);
$foo = 0;
@@ -827,7 +812,7 @@ function photos_post(&$a) {
$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
- if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
+ if (($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
notice( upgrade_message() . EOL );
@unlink($src);
$foo = 0;
@@ -838,7 +823,7 @@ function photos_post(&$a) {
$ph = new Photo($imagedata, $type);
- if(! $ph->is_valid()) {
+ if (! $ph->is_valid()) {
logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
notice( t('Unable to process image.') . EOL );
@unlink($src);
@@ -851,9 +836,9 @@ function photos_post(&$a) {
@unlink($src);
$max_length = get_config('system','max_image_length');
- if(! $max_length)
+ if (! $max_length)
$max_length = MAX_IMAGE_LENGTH;
- if($max_length > 0)
+ if ($max_length > 0)
$ph->scaleImage($max_length);
$width = $ph->getWidth();
@@ -865,19 +850,19 @@ function photos_post(&$a) {
$r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
- if(! $r) {
+ if (! $r) {
logger('mod/photos.php: photos_post(): image store failed' , LOGGER_DEBUG);
notice( t('Image upload failed.') . EOL );
killme();
}
- if($width > 640 || $height > 640) {
+ if ($width > 640 || $height > 640) {
$ph->scaleImage(640);
$ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
$smallest = 1;
}
- if($width > 320 || $height > 320) {
+ if ($width > 320 || $height > 320) {
$ph->scaleImage(320);
$ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
$smallest = 2;
@@ -890,8 +875,8 @@ function photos_post(&$a) {
$lat = $lon = null;
- if($exif && $exif['GPS']) {
- if(feature_enabled($channel_id,'photo_location')) {
+ if ($exif && $exif['GPS']) {
+ if (feature_enabled($channel_id,'photo_location')) {
$lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
$lon = getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
}
@@ -899,9 +884,10 @@ function photos_post(&$a) {
$arr = array();
- if($lat && $lon)
+ if ($lat && $lon)
$arr['coord'] = $lat . ' ' . $lon;
+ $arr['guid'] = get_guid(32);
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;
@@ -930,23 +916,15 @@ function photos_post(&$a) {
$item_id = item_store($arr);
- //if($item_id) {
- // q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
- // dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id),
- // intval($page_owner_uid),
- // intval($item_id)
- // );
- //}
-
- if($visible)
- proc_run('php', "include/notifier.php", 'wall-new', $item_id);
+ if ($visible)
+ proc_run(PRIORITY_HIGH, "include/notifier.php", '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
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ goaway($_SESSION['photo_return']);
// NOTREACHED
}
@@ -964,7 +942,7 @@ function photos_content(&$a) {
// photos/name/image/xxxxx/edit
- if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL);
return;
}
@@ -974,7 +952,7 @@ function photos_content(&$a) {
require_once('include/security.php');
require_once('include/conversation.php');
- if(! x($a->data,'user')) {
+ if (! x($a->data,'user')) {
notice( t('No photos selected') . EOL );
return;
}
@@ -987,16 +965,15 @@ function photos_content(&$a) {
// Parse arguments
//
- if($a->argc > 3) {
+ 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
$datatype = 'summary';
- if($a->argc > 4)
+ if ($a->argc > 4)
$cmd = $a->argv[4];
else
$cmd = 'view';
@@ -1015,25 +992,25 @@ function photos_content(&$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 {
- if($community_page && remote_user()) {
- if(is_array($_SESSION['remote'])) {
- foreach($_SESSION['remote'] as $v) {
- if($v['uid'] == $owner_uid) {
+ if ($community_page && remote_user()) {
+ if (is_array($_SESSION['remote'])) {
+ foreach ($_SESSION['remote'] as $v) {
+ if ($v['uid'] == $owner_uid) {
$contact_id = $v['cid'];
break;
}
}
}
- if($contact_id) {
+ if ($contact_id) {
$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
intval($owner_uid)
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$can_post = true;
$contact = $r[0];
$remote_contact = true;
@@ -1045,37 +1022,37 @@ function photos_content(&$a) {
// perhaps they're visiting - but not a community page, so they wouldn't have write access
- if(remote_user() && (! $visitor)) {
+ if (remote_user() && (! $visitor)) {
$contact_id = 0;
- if(is_array($_SESSION['remote'])) {
- foreach($_SESSION['remote'] as $v) {
- if($v['uid'] == $owner_uid) {
+ if (is_array($_SESSION['remote'])) {
+ foreach ($_SESSION['remote'] as $v) {
+ if ($v['uid'] == $owner_uid) {
$contact_id = $v['cid'];
break;
}
}
}
- if($contact_id) {
+ if ($contact_id) {
$groups = init_groups_visitor($contact_id);
$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
intval($owner_uid)
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$contact = $r[0];
$remote_contact = true;
}
}
}
- if(! $remote_contact) {
- if(local_user()) {
+ if (! $remote_contact) {
+ if (local_user()) {
$contact_id = $_SESSION['cid'];
$contact = $a->contact;
}
}
- if($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) {
+ if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) {
notice( t('Access to this item is restricted.') . EOL);
return;
}
@@ -1092,8 +1069,8 @@ function photos_content(&$a) {
* Display upload form
*/
- if($datatype === 'upload') {
- if(! ($can_post)) {
+ if ($datatype === 'upload') {
+ if (! ($can_post)) {
notice( t('Permission denied.'));
return;
}
@@ -1106,9 +1083,9 @@ function photos_content(&$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 (count($a->data['albums'])) {
+ foreach ($a->data['albums'] as $album) {
+ if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
continue;
$selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
$albumselect .= '';
@@ -1117,7 +1094,7 @@ function photos_content(&$a) {
$uploader = '';
- $ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
+ $ret = array('post_url' => 'photos/' . $a->data['user']['nickname'],
'addon_text' => $uploader,
'default_upload' => true);
@@ -1131,7 +1108,7 @@ function photos_content(&$a) {
$usage_message = '';
$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
- if($limit !== false) {
+ 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'])
@@ -1142,17 +1119,17 @@ function photos_content(&$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)
+ if (strpos($query_str, '?') === false)
$public_post_link = '?public=1';
else
$public_post_link = '&public=1';
@@ -1161,11 +1138,10 @@ function photos_content(&$a) {
$tpl = get_markup_template('photos_upload.tpl');
- if($a->theme['template_engine'] === 'internal') {
+ if ($a->theme['template_engine'] === 'internal') {
$albumselect_e = template_escape($albumselect);
$aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user)));
- }
- else {
+ } else {
$albumselect_e = $albumselect;
$aclselect_e = (($visitor) ? '' : populate_acl($a->user));
}
@@ -1205,7 +1181,7 @@ function photos_content(&$a) {
* Display a single photo album
*/
- if($datatype === 'album') {
+ if ($datatype === 'album') {
$album = hex2bin($datum);
@@ -1214,12 +1190,12 @@ function photos_content(&$a) {
intval($owner_uid),
dbesc($album)
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$a->set_pager_total(count($r));
$a->set_pager_itemspage(20);
}
- if($_GET['order'] === 'posted')
+ if ($_GET['order'] === 'posted')
$order = 'ASC';
else
$order = 'DESC';
@@ -1233,15 +1209,14 @@ function photos_content(&$a) {
);
//edit album name
- if($cmd === 'edit') {
- if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
- if($can_post) {
+ 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') {
+ if ($a->theme['template_engine'] === 'internal') {
$album_e = template_escape($album);
- }
- else {
+ } else {
$album_e = $album;
}
@@ -1255,37 +1230,35 @@ function photos_content(&$a) {
));
}
}
- }
- else {
- if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
- if($can_post) {
- $edit = array(t('Edit Album'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit');
+ } 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($_GET['order'] === 'posted')
- $order = array(t('Show Newest First'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album));
+ if ($_GET['order'] === 'posted')
+ $order = array(t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album));
else
- $order = array(t('Show Oldest First'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted');
+ $order = array(t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted');
$photos = array();
- if(count($r))
+ if (dbm::is_result($r))
$twist = 'rotright';
- foreach($r as $rr) {
- if($twist == 'rotright')
+ foreach ($r as $rr) {
+ if ($twist == 'rotright')
$twist = 'rotleft';
else
$twist = 'rotright';
$ext = $phototypes[$rr['type']];
- if($a->theme['template_engine'] === 'internal') {
+ if ($a->theme['template_engine'] === 'internal') {
$imgalt_e = template_escape($rr['filename']);
$desc_e = template_escape($rr['desc']);
- }
- else {
+ } else {
$imgalt_e = $rr['filename'];
$desc_e = $rr['desc'];
}
@@ -1293,10 +1266,10 @@ function photos_content(&$a) {
$photos[] = array(
'id' => $rr['id'],
'twist' => ' ' . $twist . rand(2,4),
- 'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
+ 'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''),
'title' => t('View Photo'),
- 'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
+ 'src' => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
'alt' => $imgalt_e,
'desc'=> $desc_e,
'ext' => $ext,
@@ -1309,13 +1282,12 @@ function photos_content(&$a) {
'$photos' => $photos,
'$album' => $album,
'$can_post' => $can_post,
- '$upload' => array(t('Upload New Photos'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)),
+ '$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)),
'$order' => $order,
- '$edit' => $edit
+ '$edit' => $edit,
+ '$paginate' => paginate($a),
));
- $o .= paginate($a);
-
return $o;
}
@@ -1324,7 +1296,7 @@ function photos_content(&$a) {
* Display one photo
*/
- if($datatype === 'image') {
+ if ($datatype === 'image') {
//$o = '';
// fetch image, item containing image, then comments
@@ -1335,13 +1307,13 @@ function photos_content(&$a) {
dbesc($datum)
);
- if(! count($ph)) {
+ if (! count($ph)) {
$ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
LIMIT 1",
intval($owner_uid),
dbesc($datum)
);
- if(count($ph))
+ if (count($ph))
notice( t('Permission denied. Access to this item may be restricted.'));
else
notice( t('Photo not available') . EOL );
@@ -1351,57 +1323,56 @@ function photos_content(&$a) {
$prevlink = '';
$nextlink = '';
- if($_GET['order'] === 'posted')
+ if ($_GET['order'] === 'posted')
$order = 'ASC';
else
$order = 'DESC';
- $prvnxt = q("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0
+ $prvnxt = qu("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)) {
+ if (count($prvnxt)) {
for($z = 0; $z < count($prvnxt); $z++) {
- if($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) {
+ if ($prvnxt[$z]['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;
}
}
$edit_suffix = ((($cmd === 'edit') && ($can_post)) ? '/edit' : '');
- $prevlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
- $nextlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+ $prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+ $nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
}
- if(count($ph) == 1)
+ if (count($ph) == 1)
$hires = $lores = $ph[0];
- if(count($ph) > 1) {
- if($ph[1]['scale'] == 2) {
+ if (count($ph) > 1) {
+ if ($ph[1]['scale'] == 2) {
// original is 640 or less, we can display it directly
$hires = $lores = $ph[0];
- }
- else {
- $hires = $ph[0];
- $lores = $ph[1];
+ } else {
+ $hires = $ph[0];
+ $lores = $ph[1];
}
}
- $album_link = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
+ $album_link = 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
$tools = Null;
$lock = Null;
- if($can_post && ($ph[0]['uid'] == $owner_uid)) {
+ if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
$tools = array(
- 'edit' => array($a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))),
- 'profile'=>array($a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')),
+ 'edit' => array('photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))),
+ 'profile'=>array('profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')),
);
// lock
@@ -1413,7 +1384,7 @@ function photos_content(&$a) {
}
- if( $cmd === 'edit') {
+ if ( $cmd === 'edit') {
$tpl = get_markup_template('photo_edit_head.tpl');
$a->page['htmlhead'] .= replace_macros($tpl,array(
'$prevlink' => $prevlink,
@@ -1421,20 +1392,20 @@ function photos_content(&$a) {
));
}
- if($prevlink)
+ if ($prevlink)
$prevlink = array($prevlink, '') ;
$photo = array(
- 'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
+ 'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
'title'=> t('View Full Size'),
- 'src' => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . datetime_convert('','','','ymdhis'),
+ 'src' => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . datetime_convert('','','','ymdhis'),
'height' => $hires['height'],
'width' => $hires['width'],
'album' => $hires['album'],
'filename' => $hires['filename'],
);
- if($nextlink)
+ if ($nextlink)
$nextlink = array($nextlink, '');
@@ -1452,9 +1423,9 @@ function photos_content(&$a) {
$map = null;
- if(count($linked_items)) {
+ if (count($linked_items)) {
$link_item = $linked_items[0];
- $r = q("SELECT COUNT(*) AS `total`
+ $r = qu("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
@@ -1466,11 +1437,11 @@ function photos_content(&$a) {
);
- if(count($r))
+ if (dbm::is_result($r))
$a->set_pager_total($r[0]['total']);
- $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+ $r = qu("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`
@@ -1488,7 +1459,7 @@ function photos_content(&$a) {
);
- if((local_user()) && (local_user() == $link_item['uid'])) {
+ if ((local_user()) && (local_user() == $link_item['uid'])) {
q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d and `uid` = %d",
intval($link_item['parent']),
intval(local_user())
@@ -1496,58 +1467,57 @@ function photos_content(&$a) {
update_thread($link_item['parent']);
}
- if($link_item['coord']) {
+ if ($link_item['coord']) {
$map = generate_map($link_item['coord']);
}
}
$tags=Null;
- if(count($linked_items) && strlen($link_item['tag'])) {
+ if (count($linked_items) && strlen($link_item['tag'])) {
$arr = explode(',',$link_item['tag']);
// parse tags and add links
$tag_str = '';
- foreach($arr as $t) {
- if(strlen($tag_str))
+ foreach ($arr as $t) {
+ if (strlen($tag_str))
$tag_str .= ', ';
$tag_str .= bbcode($t);
}
$tags = array(t('Tags: '), $tag_str);
- if($cmd === 'edit') {
- $tags[] = $a->get_baseurl() . '/tagrm/' . $link_item['id'];
+ if ($cmd === 'edit') {
+ $tags[] = 'tagrm/' . $link_item['id'];
$tags[] = t('[Remove any tag]');
}
}
$edit = Null;
- if(($cmd === 'edit') && ($can_post)) {
+ if (($cmd === 'edit') && ($can_post)) {
$edit_tpl = get_markup_template('photo_edit.tpl');
// 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)
+ if (strpos($query_str, '?') === false)
$public_post_link = '?public=1';
else
$public_post_link = '&public=1';
- if($a->theme['template_engine'] === 'internal') {
+ 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 {
+ } else {
$album_e = $ph[0]['album'];
$caption_e = $ph[0]['desc'];
$aclselect_e = populate_acl($ph[0]);
@@ -1583,7 +1553,7 @@ function photos_content(&$a) {
));
}
- if(count($linked_items)) {
+ if (count($linked_items)) {
$cmnt_tpl = get_markup_template('comment_item.tpl');
$tpl = get_markup_template('photo_item.tpl');
@@ -1593,7 +1563,7 @@ function photos_content(&$a) {
$likebuttons = '';
- if($can_post || can_write_wall($a,$owner_uid)) {
+ 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"),
@@ -1605,9 +1575,9 @@ function photos_content(&$a) {
}
$comments = '';
- if(! count($r)) {
- if($can_post || can_write_wall($a,$owner_uid)) {
- if($link_item['last-child']) {
+ if (! count($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,
@@ -1635,23 +1605,27 @@ function photos_content(&$a) {
$like = '';
$dislike = '';
+ $conv_responses = array(
+ 'like' => array('title' => t('Likes','title')),'dislike' => array('title' => t('Dislikes','title')),
+ 'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
+ );
+
// display comments
- if(count($r)) {
+ if (dbm::is_result($r)) {
- foreach($r as $item) {
- like_puller($a,$item,$alike,'like');
- like_puller($a,$item,$dlike,'dislike');
+ foreach ($r as $item) {
+ builtin_activity_puller($item, $conv_responses);
}
- $like = ((isset($alike[$link_item['id']])) ? format_like($alike[$link_item['id']],$alike[$link_item['id'] . '-l'],'like',$link_item['id']) : '');
- $dislike = ((isset($dlike[$link_item['id']])) ? format_like($dlike[$link_item['id']],$dlike[$link_item['id'] . '-l'],'dislike',$link_item['id']) : '');
+ $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']) {
+ 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,
@@ -1673,23 +1647,22 @@ function photos_content(&$a) {
}
- foreach($r as $item) {
+ foreach ($r as $item) {
$comment = '';
$template = $tpl;
$sparkle = '';
- if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
+ if (((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
continue;
- $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+ $redirect_url = 'redir/' . $item['cid'] ;
- if(local_user() && ($item['contact-uid'] == local_user())
+ if (local_user() && ($item['contact-uid'] == local_user())
&& ($item['network'] == NETWORK_DFRN) && (! $item['self'] )) {
$profile_url = $redirect_url;
$sparkle = ' sparkle';
- }
- else {
+ } else {
$profile_url = $item['url'];
$sparkle = '';
}
@@ -1712,12 +1685,11 @@ function photos_content(&$a) {
);
- if($a->theme['template_engine'] === 'internal') {
+ 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 {
+ } else {
$name_e = $profile_name;
$title_e = $item['title'];
$body_e = bbcode($item['body']);
@@ -1737,9 +1709,9 @@ function photos_content(&$a) {
'$comment' => $comment
));
- if($can_post || can_write_wall($a,$owner_uid)) {
+ if ($can_post || can_write_wall($a,$owner_uid)) {
- if($item['last-child']) {
+ if ($item['last-child']) {
$comments .= replace_macros($cmnt_tpl,array(
'$return_path' => '',
'$jsreload' => $return_url,
@@ -1765,15 +1737,20 @@ function photos_content(&$a) {
$paginate = paginate($a);
}
+
+ $response_verbs = array('like');
+ if (feature_enabled($owner_uid,'dislike'))
+ $response_verbs[] = 'dislike';
+ $responses = get_responses($conv_responses,$response_verbs,'',$link_item);
+
$photo_tpl = get_markup_template('photo_view.tpl');
- if($a->theme['template_engine'] === 'internal') {
+ 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 {
+ } else {
$album_e = array($album_link,$ph[0]['album']);
$tags_e = $tags;
$like_e = $like;
@@ -1796,6 +1773,7 @@ function photos_content(&$a) {
'$likebuttons' => $likebuttons,
'$like' => $like_e,
'$dislike' => $dikslike_e,
+ 'responses' => $responses,
'$comments' => $comments,
'$paginate' => $paginate,
));
@@ -1812,18 +1790,18 @@ function photos_content(&$a) {
// Default - show recent photos with upload link (if applicable)
//$o = '';
- $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
+ $r = qu("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(count($r)) {
+ if (dbm::is_result($r)) {
$a->set_pager_total(count($r));
$a->set_pager_itemspage(20);
}
- $r = q("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo`
+ $r = qu("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` 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']),
@@ -1836,24 +1814,24 @@ function photos_content(&$a) {
$photos = array();
- if(count($r)) {
+ if (dbm::is_result($r)) {
$twist = 'rotright';
- foreach($r as $rr) {
+ foreach ($r as $rr) {
//hide profile photos to others
- if((! $is_owner) && (! remote_user()) && ($rr['album'] == t('Profile Photos')))
+ if ((! $is_owner) && (! remote_user()) && ($rr['album'] == t('Profile Photos')))
continue;
-
- if($twist == 'rotright')
+
+ if ($twist == 'rotright')
$twist = 'rotleft';
else
$twist = 'rotright';
+
$ext = $phototypes[$rr['type']];
- if($a->theme['template_engine'] === 'internal') {
+ if ($a->theme['template_engine'] === 'internal') {
$alt_e = template_escape($rr['filename']);
$name_e = template_escape($rr['album']);
- }
- else {
+ } else {
$alt_e = $rr['filename'];
$name_e = $rr['album'];
}
@@ -1861,12 +1839,12 @@ function photos_content(&$a) {
$photos[] = array(
'id' => $rr['id'],
'twist' => ' ' . $twist . rand(2,4),
- 'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
+ 'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
'title' => t('View Photo'),
- 'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
+ 'src' => 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
'alt' => $alt_e,
'album' => array(
- 'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+ 'link' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
'name' => $name_e,
'alt' => t('View Album'),
),
@@ -1879,12 +1857,10 @@ function photos_content(&$a) {
$o .= replace_macros($tpl, array(
'$title' => t('Recent Photos'),
'$can_post' => $can_post,
- '$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['user']['nickname'].'/upload'),
+ '$upload' => array(t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'),
'$photos' => $photos,
+ '$paginate' => paginate($a),
));
-
- $o .= paginate($a);
return $o;
}
-