X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=6d147a6f55a694f9696650828a2cbb0730ebd5ad;hb=389b7de451eb8e684b48e2c96598f1d12c1465d9;hp=37aab7c1f20944ad1f87ee86fd4b3b0e49d5b222;hpb=b9afb38f4d73c7a2c0e3c375a7a207fd6f6bfba7;p=friendica.git diff --git a/mod/photos.php b/mod/photos.php index 37aab7c1f2..6d147a6f55 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) { @@ -16,6 +17,8 @@ function photos_init(&$a) { return; } + nav_set_selected('home'); + $o = ''; if($a->argc > 1) { @@ -28,50 +31,76 @@ function photos_init(&$a) { return; $a->data['user'] = $r[0]; + $a->profile_uid = $r[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'); - $o .= '
'; - $o .= '
' . $a->data['user']['username'] . '
'; - $o .= '
' . $a->data['user']['username'] . '
'; - $o .= '
'; + $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); - if($albums_visible) { - $o .= ''; + 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( + '$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 +163,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 +174,7 @@ function photos_post(&$a) { killme(); } - $owner_record = $r[0]; + $owner_record = $r[0]; if(($a->argc > 3) && ($a->argv[2] === 'album')) { @@ -166,6 +195,11 @@ function photos_post(&$a) { return; // NOTREACHED } + // Check if the user has responded to a delete confirmation query + if($_REQUEST['canceled']) { + goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); + } + $newalbum = notags(trim($_POST['albumname'])); if($newalbum != $album) { q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d", @@ -181,6 +215,25 @@ function photos_post(&$a) { if($_POST['dropalbum'] == t('Delete Album')) { + // Check if we should do HTML-based delete confirmation + if($_REQUEST['confirm']) { + $drop_url = $a->query_string; + $extra_inputs = array( + array('name' => 'albumname', 'value' => $_POST['albumname']), + ); + $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array( + '$method' => 'post', + '$message' => t('Do you really want to delete this photo album and all its photos?'), + '$extra_inputs' => $extra_inputs, + '$confirm' => t('Delete Album'), + '$confirm_url' => $drop_url, + '$confirm_name' => 'dropalbum', // Needed so that confirmation will bring us back into this if statement + '$cancel' => t('Cancel'), + )); + $a->error = 1; // Set $a->error so the other module functions don't execute + return; + } + $res = array(); // get the list of photos we are about to delete @@ -229,6 +282,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']); @@ -243,10 +297,32 @@ function photos_post(&$a) { 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) && (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']) { + $drop_url = $a->query_string; + $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array( + '$method' => 'post', + '$message' => t('Do you really want to delete this photo?'), + '$extra_inputs' => array(), + '$confirm' => t('Delete Photo'), + '$confirm_url' => $drop_url, + '$confirm_name' => 'delete', // Needed so that confirmation will bring us back into this if statement + '$cancel' => t('Cancel'), + )); + $a->error = 1; // Set $a->error so the other module functions don't execute + return; + } + 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), @@ -277,6 +353,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']); @@ -286,13 +363,12 @@ function photos_post(&$a) { } } - goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); + goaway($a->get_baseurl() . '/photos/' . $a->data['user']['nickname']); return; // NOTREACHED } 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); @@ -308,7 +384,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'); @@ -325,7 +401,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), @@ -338,7 +414,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), @@ -352,7 +428,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), @@ -387,19 +463,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']; @@ -418,11 +494,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); } @@ -464,12 +540,12 @@ function photos_post(&$a) { if(count($links)) { foreach($links as $link) { if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') - $profile = $link['@attributes']['href']; + $profile = $link['@attributes']['href']; if($link['@attributes']['rel'] === 'salmon') { $salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']); if(strlen($inform)) $inform .= ','; - $inform .= $salmon; + $inform .= $salmon; } } } @@ -537,14 +613,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; @@ -553,7 +632,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()), @@ -562,6 +641,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) { @@ -577,7 +657,7 @@ function photos_post(&$a) { if(count($taginfo)) { foreach($taginfo as $tagged) { - + $uri = item_new_uri($a->get_hostname(),$page_owner_uid); $arr = array(); @@ -622,11 +702,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"); } @@ -668,7 +748,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 * */ @@ -680,7 +760,7 @@ function photos_post(&$a) { $visible = 1; else $visible = 0; - + if(intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true') $visible = 0; @@ -712,7 +792,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); @@ -746,7 +826,7 @@ function photos_post(&$a) { call_hooks('photo_post_end',$foo); killme(); } - + $ph = new Photo($imagedata, $type); @@ -794,7 +874,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); @@ -824,19 +904,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); @@ -868,8 +948,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'); @@ -884,7 +964,7 @@ function photos_content(&$a) { $_SESSION['photo_return'] = $a->cmd; // - // Parse arguments + // Parse arguments // if($a->argc > 3) { @@ -985,8 +1065,8 @@ function photos_content(&$a) { $o = ""; // tabs - $_is_owner = (local_user() && (local_user() == $owner_uid)); - $o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']); + $is_owner = (local_user() && (local_user() == $owner_uid)); + $o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']); // // dispatch request @@ -1005,7 +1085,7 @@ function photos_content(&$a) { $albumselect = ''; - + $albumselect .= ''; if(count($a->data['albums'])) { foreach($a->data['albums'] as $album) { @@ -1016,8 +1096,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'], @@ -1027,8 +1105,10 @@ function photos_content(&$a) { call_hooks('photo_upload_form',$ret); - $default_upload = '
-
'; + $default_upload_box = replace_macros(get_markup_template('photos_default_uploader_box.tpl'), array()); + $default_upload_submit = replace_macros(get_markup_template('photos_default_uploader_submit.tpl'), array( + '$submit' => t('Submit'), + )); $usage_message = ''; $limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit'); @@ -1041,15 +1121,34 @@ function photos_content(&$a) { } + // Private/public post links for the non-JS ACL form + $private_post = 1; + if($_REQUEST['public']) + $private_post = 0; + + $query_str = $a->query_string; + 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) + $public_post_link = '?public=1'; + 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, $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( @@ -1063,20 +1162,31 @@ function photos_content(&$a) { '$albumselect' => $albumselect_e, '$permissions' => t('Permissions'), '$aclselect' => $aclselect_e, - '$uploader' => $ret['addon_text'], - '$default' => (($ret['default_upload']) ? $default_upload : ''), - '$uploadurl' => $ret['post_url'] + '$alt_uploader' => $ret['addon_text'], + '$default_upload_box' => (($ret['default_upload']) ? $default_upload_box : ''), + '$default_upload_submit' => (($ret['default_upload']) ? $default_upload_submit : ''), + '$uploadurl' => $ret['post_url'], + + // ACL permissions box + '$acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector + '$group_perms' => t('Show to Groups'), + '$contact_perms' => t('Show to Contacts'), + '$private' => t('Private Photo'), + '$public' => t('Public Photo'), + '$is_private' => $private_post, + '$return_path' => $query_str, + '$public_link' => $public_post_link, )); - 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) @@ -1091,7 +1201,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), @@ -1099,9 +1209,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'); @@ -1127,25 +1235,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 .= '
' . t('Show Newest First') . '
'; + $order = array(t('Show Newest First'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album)); else - $o .= '
' . t('Show Oldest First') . '
'; + $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 .= '
' . t('Upload New Photos') . '
'; - } - - - $tpl = get_markup_template('photo_album.tpl'); if(count($r)) $twist = 'rotright'; foreach($r as $rr) { @@ -1153,7 +1254,7 @@ function photos_content(&$a) { $twist = 'rotleft'; else $twist = 'rotright'; - + $ext = $phototypes[$rr['type']]; if($a->theme['template_engine'] === 'internal') { @@ -1165,24 +1266,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') { @@ -1192,19 +1304,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 ); @@ -1220,11 +1332,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++) { @@ -1260,7 +1372,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'))), @@ -1268,12 +1380,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') { @@ -1290,7 +1402,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) @@ -1299,7 +1415,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 @@ -1314,7 +1430,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']), @@ -1326,9 +1442,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 @@ -1349,6 +1465,7 @@ function photos_content(&$a) { intval($link_item['parent']), intval(local_user()) ); + update_thread($link_item['parent']); } } @@ -1362,7 +1479,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']; @@ -1375,6 +1492,24 @@ function photos_content(&$a) { 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']) + $private_post = 0; + + $query_str = $a->query_string; + 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) + $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']); @@ -1388,22 +1523,31 @@ 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') + '$delete' => t('Delete Photo'), + + // ACL permissions box + '$acl_data' => construct_acl_data($a, $ph[0]), // For non-Javascript ACL selector + '$group_perms' => t('Show to Groups'), + '$contact_perms' => t('Show to Contacts'), + '$private' => t('Private photo'), + '$public' => t('Public photo'), + '$is_private' => $private_post, + '$return_path' => $query_str, + '$public_link' => $public_post_link, )); } @@ -1421,9 +1565,10 @@ function photos_content(&$a) { $likebuttons = replace_macros($like_tpl,array( '$id' => $link_item['id'], '$likethis' => t("I like this \x28toggle\x29"), - '$nolike' => t("I don't like this \x28toggle\x29"), + '$nolike' => (feature_enabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''), '$share' => t('Share'), - '$wait' => t('Please wait') + '$wait' => t('Please wait'), + '$return_path' => $a->query_string, )); } @@ -1432,7 +1577,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'], @@ -1454,7 +1599,7 @@ function photos_content(&$a) { $alike = array(); $dlike = array(); - + $like = ''; $dislike = ''; @@ -1505,10 +1650,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'; } @@ -1516,7 +1661,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']); @@ -1524,10 +1669,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') { @@ -1582,7 +1732,7 @@ function photos_content(&$a) { $paginate = paginate($a); } - + $photo_tpl = get_markup_template('photo_view.tpl'); if($a->theme['template_engine'] === 'internal') { @@ -1608,21 +1758,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'), @@ -1634,7 +1790,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'), @@ -1649,12 +1805,16 @@ function photos_content(&$a) { if(count($r)) { $twist = 'rotright'; foreach($r as $rr) { + //hide profile photos to others + if((! $is_owner) && (! remote_user()) && ($rr['album'] == t('Profile Photos'))) + continue; + if($twist == 'rotright') $twist = 'rotleft'; 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']); @@ -1665,8 +1825,8 @@ function photos_content(&$a) { } $photos[] = array( - 'id' => $rr['id'], - 'twist' => ' ' . $twist . rand(2,4), + 'id' => $rr['id'], + 'twist' => ' ' . $twist . rand(2,4), 'link' => $a->get_baseurl() . '/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, @@ -1676,12 +1836,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, @@ -1689,7 +1849,7 @@ function photos_content(&$a) { '$photos' => $photos, )); - + $o .= paginate($a); return $o; }