X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fphotos.php;h=3d3b92a46d9a8b7861c54f5a3e44c3b78434e5f0;hb=a22581e86cba4c96980ef7bd334aaaa43d02176d;hp=79a51fd4c97effa9dbab099d5d7fe8bf9fee79e4;hpb=0d4d15c73d0bd7f571753d40937ead4c55a797b8;p=friendica.git
diff --git a/mod/photos.php b/mod/photos.php
index 79a51fd4c9..3d3b92a46d 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -6,6 +6,7 @@ require_once('include/bbcode.php');
require_once('include/security.php');
require_once('include/redir.php');
require_once('include/tags.php');
+require_once('include/threads.php');
function photos_init(&$a) {
@@ -28,50 +29,72 @@ function photos_init(&$a) {
return;
$a->data['user'] = $r[0];
+ $a->profile_uid = $r[0]['uid'];
- $o .= '
';
- $o .= '
' . $a->data['user']['username'] . '
';
- $o .= '
';
- $o .= '
';
+ $profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
+
+ $tpl = get_markup_template("vcard-widget.tpl");
+
+ $vcard_widget .= replace_macros($tpl, array(
+ '$name' => $a->data['user']['username'],
+ '$photo' => $profilephoto
+ ));
$sql_extra = permissions_sql($a->data['user']['uid']);
- $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc",
- intval($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'))
);
- if(count($albums)) {
- $a->data['albums'] = $albums;
+ $albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
- $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_visible) {
- $o .= '';
+ 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'),
+ '$albums' => $albums['albums'],
+ '$baseurl' => z_root(),
+ '$upload' => array( t('Upload New Photos'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload'),
+ '$can_post' => $can_post
+ ));
}
+
if(! x($a->page,'aside'))
$a->page['aside'] = '';
- $a->page['aside'] .= $o;
+ $a->page['aside'] .= $vcard_widget;
+ $a->page['aside'] .= $photo_albums_widget;
$tpl = get_markup_template("photos_head.tpl");
@@ -134,7 +157,7 @@ function photos_post(&$a) {
killme();
}
- $r = q("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)
);
@@ -145,7 +168,7 @@ function photos_post(&$a) {
killme();
}
- $owner_record = $r[0];
+ $owner_record = $r[0];
if(($a->argc > 3) && ($a->argv[2] === 'album')) {
@@ -253,6 +276,7 @@ function photos_post(&$a) {
intval($page_owner_uid)
);
create_tags_from_itemuri($rr['parent-uri'], $page_owner_uid);
+ delete_thread_uri($rr['parent-uri'], $page_owner_uid);
$drop_id = intval($rr['id']);
@@ -323,6 +347,7 @@ function photos_post(&$a) {
intval($page_owner_uid)
);
create_tags_from_itemuri($i[0]['uri'], $page_owner_uid);
+ delete_thread_uri($i[0]['uri'], $page_owner_uid);
$url = $a->get_baseurl();
$drop_id = intval($i[0]['id']);
@@ -338,7 +363,6 @@ function photos_post(&$a) {
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'])) : '');
$item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0);
@@ -354,7 +378,7 @@ function photos_post(&$a) {
$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');
@@ -371,7 +395,7 @@ function photos_post(&$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 = 0 limit 1",
+ $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),
@@ -384,7 +408,7 @@ function photos_post(&$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 limit 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),
@@ -398,7 +422,7 @@ function photos_post(&$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 limit 1",
+ $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),
@@ -433,19 +457,19 @@ function photos_post(&$a) {
$visibility = 0;
if($p[0]['desc'] !== $desc || strlen($rawtags))
$visibility = 1;
-
+
if(! $item_id) {
// Create item container
$title = '';
$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
-
+
$arr = array();
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
- $arr['parent-uri'] = $uri;
+ $arr['parent-uri'] = $uri;
$arr['type'] = 'photo';
$arr['wall'] = 1;
$arr['resource-id'] = $p[0]['resource-id'];
@@ -464,11 +488,11 @@ function photos_post(&$a) {
$arr['last-child'] = 1;
$arr['visible'] = $visibility;
$arr['origin'] = 1;
-
- $arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']'
- . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
+
+ $arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']'
+ . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
. '[/url]';
-
+
$item_id = item_store($arr);
}
@@ -583,14 +607,17 @@ function photos_post(&$a) {
if(strlen($str_tags))
$str_tags .= ',';
$profile = str_replace(',','%2c',$profile);
- $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]';
+ $str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
}
+ } elseif (strpos($tag,'#') === 0) {
+ $tagname = substr($tag, 1);
+ $str_tags .= '#[url='.$a->get_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;
@@ -599,7 +626,7 @@ function photos_post(&$a) {
$newinform .= ',';
$newinform .= $inform;
- $r = q("UPDATE `item` SET `tag` = '%s', `inform` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ $r = q("UPDATE `item` SET `tag` = '%s', `inform` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d",
dbesc($newtag),
dbesc($newinform),
dbesc(datetime_convert()),
@@ -608,6 +635,7 @@ function photos_post(&$a) {
intval($page_owner_uid)
);
create_tags_from_item($item_id);
+ update_thread($item_id);
$best = 0;
foreach($p as $scales) {
@@ -623,7 +651,7 @@ function photos_post(&$a) {
if(count($taginfo)) {
foreach($taginfo as $tagged) {
-
+
$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
$arr = array();
@@ -668,11 +696,11 @@ function photos_post(&$a) {
$item_id = item_store($arr);
if($item_id) {
- q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
- dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id),
- intval($page_owner_uid),
- intval($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");
}
@@ -714,7 +742,7 @@ function photos_post(&$a) {
* 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
+ * they acquire comments, likes, dislikes, and/or tags
*
*/
@@ -726,7 +754,7 @@ function photos_post(&$a) {
$visible = 1;
else
$visible = 0;
-
+
if(intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true')
$visible = 0;
@@ -758,7 +786,7 @@ function photos_post(&$a) {
$maximagesize = get_config('system','maximagesize');
if(($maximagesize) && ($filesize > $maximagesize)) {
- notice( t('Image exceeds size limit of ') . $maximagesize . EOL);
+ notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
@unlink($src);
$foo = 0;
call_hooks('photo_post_end',$foo);
@@ -792,7 +820,7 @@ function photos_post(&$a) {
call_hooks('photo_post_end',$foo);
killme();
}
-
+
$ph = new Photo($imagedata, $type);
@@ -840,7 +868,7 @@ function photos_post(&$a) {
$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;
}
-
+
$basename = basename($filename);
$uri = item_new_uri($a->get_hostname(), $page_owner_uid);
@@ -870,19 +898,19 @@ function photos_post(&$a) {
$arr['visible'] = $visible;
$arr['origin'] = 1;
- $arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
- . '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
+ $arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
+ . '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
. '[/url]';
$item_id = item_store($arr);
- if($item_id) {
- q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
- dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id),
- intval($page_owner_uid),
- intval($item_id)
- );
- }
+ //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);
@@ -914,8 +942,8 @@ function photos_content(&$a) {
notice( t('Public access denied.') . EOL);
return;
}
-
-
+
+
require_once('include/bbcode.php');
require_once('include/security.php');
require_once('include/conversation.php');
@@ -930,7 +958,7 @@ function photos_content(&$a) {
$_SESSION['photo_return'] = $a->cmd;
//
- // Parse arguments
+ // Parse arguments
//
if($a->argc > 3) {
@@ -1032,7 +1060,7 @@ function photos_content(&$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']);
//
// dispatch request
@@ -1051,7 +1079,7 @@ function photos_content(&$a) {
$albumselect = '';
-
+
$albumselect .= ' ';
if(count($a->data['albums'])) {
foreach($a->data['albums'] as $album) {
@@ -1062,8 +1090,6 @@ function photos_content(&$a) {
}
}
- $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
-
$uploader = '';
$ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
@@ -1112,11 +1138,11 @@ function photos_content(&$a) {
if($a->theme['template_engine'] === 'internal') {
$albumselect_e = template_escape($albumselect);
- $aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb)));
+ $aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user)));
}
else {
$albumselect_e = $albumselect;
- $aclselect_e = (($visitor) ? '' : populate_acl($a->user, $celeb));
+ $aclselect_e = (($visitor) ? '' : populate_acl($a->user));
}
$o .= replace_macros($tpl,array(
@@ -1147,14 +1173,14 @@ function photos_content(&$a) {
));
- return $o;
+ return $o;
}
if($datatype === 'album') {
$album = hex2bin($datum);
- $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
+ $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
intval($owner_uid),
dbesc($album)
@@ -1169,7 +1195,7 @@ function photos_content(&$a) {
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`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` 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),
@@ -1177,9 +1203,7 @@ function photos_content(&$a) {
intval($a->pager['itemspage'])
);
- $o .= '' . $album . ' ';
-
- if($cmd === 'edit') {
+ 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');
@@ -1205,25 +1229,18 @@ function photos_content(&$a) {
else {
if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
if($can_post) {
- $o .= '';
+ $edit = array(t('Edit Album'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit');
}
}
}
if($_GET['order'] === 'posted')
- $o .= '';
+ $order = array(t('Show Newest First'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album));
else
- $o .= '';
+ $order = array(t('Show Oldest First'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted');
+ $photos = array();
- if($can_post) {
- $o .= '';
- }
-
-
- $tpl = get_markup_template('photo_album.tpl');
if(count($r))
$twist = 'rotright';
foreach($r as $rr) {
@@ -1231,7 +1248,7 @@ function photos_content(&$a) {
$twist = 'rotleft';
else
$twist = 'rotright';
-
+
$ext = $phototypes[$rr['type']];
if($a->theme['template_engine'] === 'internal') {
@@ -1243,24 +1260,35 @@ function photos_content(&$a) {
$desc_e = $rr['desc'];
}
- $o .= replace_macros($tpl,array(
- '$id' => $rr['id'],
- '$twist' => ' ' . $twist . rand(2,4),
- '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
+ $photos[] = array(
+ 'id' => $rr['id'],
+ 'twist' => ' ' . $twist . rand(2,4),
+ 'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''),
- '$phototitle' => t('View Photo'),
- '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
- '$imgalt' => $imgalt_e,
- '$desc'=> $desc_e
- ));
-
+ 'title' => t('View Photo'),
+ 'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
+ 'alt' => $imgalt_e,
+ 'desc'=> $desc_e,
+ 'ext' => $ext,
+ 'hash'=> $rr['resource_id'],
+ );
}
- $o .= '
';
+
+ $tpl = get_markup_template('photo_album.tpl');
+ $o .= replace_macros($tpl, array(
+ '$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)),
+ '$order' => $order,
+ '$edit' => $edit
+ ));
+
$o .= paginate($a);
return $o;
- }
+ }
if($datatype === 'image') {
@@ -1270,19 +1298,19 @@ function photos_content(&$a) {
//$o = '';
// fetch image, item containing image, then comments
- $ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
+ $ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
$sql_extra ORDER BY `scale` ASC ",
intval($owner_uid),
dbesc($datum)
);
if(! count($ph)) {
- $ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
+ $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 );
@@ -1298,11 +1326,11 @@ function photos_content(&$a) {
$order = 'DESC';
- $prvnxt = q("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++) {
@@ -1338,7 +1366,7 @@ function photos_content(&$a) {
$album_link = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
$tools = Null;
$lock = Null;
-
+
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'))),
@@ -1346,12 +1374,12 @@ function photos_content(&$a) {
);
// lock
- $lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
- || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
+ $lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
+ || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
? t('Private Message')
: Null);
-
-
+
+
}
if( $cmd === 'edit') {
@@ -1368,7 +1396,11 @@ function photos_content(&$a) {
$photo = array(
'href' => $a->get_baseurl() . '/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' => $a->get_baseurl() . '/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)
@@ -1377,7 +1409,7 @@ function photos_content(&$a) {
// Do we have an item for this photo?
- // FIXME! - replace following code to display the conversation with our normal
+ // FIXME! - replace following code to display the conversation with our normal
// conversation functions so that it works correctly and tracks changes
// in the evolving conversation code.
// The difference is that we won't be displaying the conversation head item
@@ -1392,7 +1424,7 @@ function photos_content(&$a) {
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
- AND `item`.`uid` = %d
+ AND `item`.`uid` = %d
$sql_extra ",
dbesc($link_item['uri']),
dbesc($link_item['uri']),
@@ -1404,9 +1436,9 @@ function photos_content(&$a) {
$a->set_pager_total($r[0]['total']);
- $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`,
- `contact`.`rel`, `contact`.`thumb`, `contact`.`self`,
+ $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`
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
@@ -1427,6 +1459,7 @@ function photos_content(&$a) {
intval($link_item['parent']),
intval(local_user())
);
+ update_thread($link_item['parent']);
}
}
@@ -1440,7 +1473,7 @@ function photos_content(&$a) {
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'];
@@ -1484,19 +1517,18 @@ function photos_content(&$a) {
$edit = replace_macros($edit_tpl, array(
'$id' => $ph[0]['id'],
- '$rotatecw' => t('Rotate CW (right)'),
- '$rotateccw' => t('Rotate CCW (left)'),
- '$album' => $album_e,
- '$newalbum' => t('New album name'),
+ '$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,''),
+
'$nickname' => $a->data['user']['nickname'],
'$resource_id' => $ph[0]['resource-id'],
- '$capt_label' => t('Caption'),
- '$caption' => $caption_e,
- '$tag_label' => t('Add a Tag'),
- '$tags' => $link_item['tag'],
'$permissions' => t('Permissions'),
'$aclselect' => $aclselect_e,
- '$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
+
'$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
'$submit' => t('Submit'),
'$delete' => t('Delete Photo'),
@@ -1539,7 +1571,7 @@ function photos_content(&$a) {
if($can_post || can_write_wall($a,$owner_uid)) {
if($link_item['last-child']) {
$comments .= replace_macros($cmnt_tpl,array(
- '$return_path' => '',
+ '$return_path' => '',
'$jsreload' => $return_url,
'$type' => 'wall-comment',
'$id' => $link_item['id'],
@@ -1561,7 +1593,7 @@ function photos_content(&$a) {
$alike = array();
$dlike = array();
-
+
$like = '';
$dislike = '';
@@ -1612,10 +1644,10 @@ function photos_content(&$a) {
continue;
$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
- if(local_user() && ($item['contact-uid'] == local_user())
- && ($item['network'] == 'dfrn') && (! $item['self'] )) {
+
+ if(local_user() && ($item['contact-uid'] == local_user())
+ && ($item['network'] == NETWORK_DFRN) && (! $item['self'] )) {
$profile_url = $redirect_url;
$sparkle = ' sparkle';
}
@@ -1623,7 +1655,7 @@ function photos_content(&$a) {
$profile_url = $item['url'];
$sparkle = '';
}
-
+
$diff_author = (($item['url'] !== $item['author-link']) ? true : false);
$profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
@@ -1631,10 +1663,15 @@ function photos_content(&$a) {
$profile_link = $profile_url;
- $drop = '';
- if(($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()))
- $drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+
+ $dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()));
+ $drop = array(
+ 'dropping' => $dropping,
+ 'pagedrop' => false,
+ 'select' => t('Select'),
+ 'delete' => t('Delete'),
+ );
if($a->theme['template_engine'] === 'internal') {
@@ -1689,7 +1726,7 @@ function photos_content(&$a) {
$paginate = paginate($a);
}
-
+
$photo_tpl = get_markup_template('photo_view.tpl');
if($a->theme['template_engine'] === 'internal') {
@@ -1715,21 +1752,27 @@ function photos_content(&$a) {
'$nextlink' => $nextlink,
'$desc' => $ph[0]['desc'],
'$tags' => $tags_e,
- '$edit' => $edit,
+ '$edit' => $edit,
'$likebuttons' => $likebuttons,
'$like' => $like_e,
'$dislike' => $dikslike_e,
'$comments' => $comments,
'$paginate' => $paginate,
));
-
+
+ $a->page['htmlhead'] .= "\n".' '."\n";
+ $a->page['htmlhead'] .= ' '."\n";
+ $a->page['htmlhead'] .= ' '."\n";
+ $a->page['htmlhead'] .= ' '."\n";
+ $a->page['htmlhead'] .= ' '."\n";
+
return $o;
}
// 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 = 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'),
@@ -1741,7 +1784,7 @@ function photos_content(&$a) {
}
$r = q("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo`
- WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
+ 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']),
dbesc('Contact Photos'),
@@ -1761,7 +1804,7 @@ function photos_content(&$a) {
else
$twist = 'rotright';
$ext = $phototypes[$rr['type']];
-
+
if($a->theme['template_engine'] === 'internal') {
$alt_e = template_escape($rr['filename']);
$name_e = template_escape($rr['album']);
@@ -1783,12 +1826,12 @@ function photos_content(&$a) {
'name' => $name_e,
'alt' => t('View Album'),
),
-
+
);
}
}
-
- $tpl = get_markup_template('photos_recent.tpl');
+
+ $tpl = get_markup_template('photos_recent.tpl');
$o .= replace_macros($tpl, array(
'$title' => t('Recent Photos'),
'$can_post' => $can_post,
@@ -1796,7 +1839,7 @@ function photos_content(&$a) {
'$photos' => $photos,
));
-
+
$o .= paginate($a);
return $o;
}