aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-08-08 01:58:26 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-08-08 01:58:26 -0700
commitc9d8211ae73332b6c4e91d82ba06275b92d7523a (patch)
tree8a3a35745be170d37bcb65613c585d96865749de /mod
parent5933f13ab72337554d5fa23a064a3f61f3dee5e4 (diff)
downloadvolse-hubzilla-c9d8211ae73332b6c4e91d82ba06275b92d7523a.tar.gz
volse-hubzilla-c9d8211ae73332b6c4e91d82ba06275b92d7523a.tar.bz2
volse-hubzilla-c9d8211ae73332b6c4e91d82ba06275b92d7523a.zip
photo editing
Diffstat (limited to 'mod')
-rw-r--r--mod/contacts.php2
-rw-r--r--mod/photos.php38
2 files changed, 38 insertions, 2 deletions
diff --git a/mod/contacts.php b/mod/contacts.php
index c1b3781bf..89e1f24df 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -187,7 +187,7 @@ function contacts_content(&$a) {
'$poll_interval' => contact_poll_interval($r[0]['priority']),
'$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00')
? t('Never')
- : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, G:i A')),
+ : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')),
'$profile_select' => contact_profile_assign($r[0]['profile-id']),
'$contact_id' => $r[0]['id'],
'$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
diff --git a/mod/photos.php b/mod/photos.php
index e680bc5a2..ca05f651b 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -51,6 +51,29 @@ function photos_post(&$a) {
killme();
}
+ if(($a->argc > 1) && (x($_POST,'desc') !== false)) {
+ $desc = notags(trim($_POST['desc']));
+ $tags = notags(trim($_POST['tags']));
+ $item_id = intval($_POST['item_id']);
+ $id = $a->argv[1];
+
+ $r = q("UPDATE `photo` SET `desc` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ dbesc($desc),
+ intval($id),
+ intval($_SESSION['uid'])
+ );
+ $r = q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ dbesc($tags),
+ intval($item_id),
+ intval($_SESSION['uid'])
+ );
+
+ goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ return; // NOTREACHED
+ }
+
+
+
$r = q("SELECT * FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1",
intval($_SESSION['uid'])
);
@@ -409,11 +432,17 @@ function photos_content(&$a) {
$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']) . '">' . $ph[0]['album'] . '</a></h3>';
+ if(local_user() && ($ph[0]['uid'] == $_SESSION['uid'])) {
+ $o .= '<div id="photo-edit-link-wrap" ><a id="photo-edit-link" href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit' . '">' . t('Edit photo') . '</a></div>';
+ }
+
+
$o .= '<a href="' . $a->get_baseurl() . '/photo/'
. $hires['resource-id'] . '-' . $hires['scale'] . '.jpg" title="'
. t('View Full Size') . '" ><img src="' . $a->get_baseurl() . '/photo/'
. $lores['resource-id'] . '-' . $lores['scale'] . '.jpg' . '" /></a>';
+
// Do we have an item for this photo?
$i1 = q("SELECT * FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
@@ -465,7 +494,14 @@ function photos_content(&$a) {
if($cmd == 'edit') {
$edit_tpl = file_get_contents('view/photo_edit.tpl');
$o .= replace_macros($edit_tpl, array(
- '$id' => $ph[0]['id']
+ '$id' => $ph[0]['id'],
+ '$capt_label' => t('Caption'),
+ '$caption' => $ph[0]['desc'],
+ '$tag_label' => t('Tags'),
+ '$tags' => $i1[0]['tag'],
+ '$item_id' => $i1[0]['id'],
+ '$submit' => t('Submit')
+
));
}