X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fphotos.php;h=89fef2ee8652f26d432c9867c9c14743de1daf0b;hb=ad2aded25986f423835ce2bafe78169235d374ce;hp=f29c393869cd4eda108f3ab16be3e5b8ff7a3470;hpb=a96da925712184eec97f6ca01072b7c2bee92a7e;p=friendica.git diff --git a/mod/photos.php b/mod/photos.php index f29c393869..89fef2ee86 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1,5 +1,4 @@ argc > 1) { @@ -49,9 +52,18 @@ function photos_init(&$a) { - function photos_post(&$a) { +logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG'); + +foreach($_REQUEST AS $key => $val) { + logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG'); +} + +foreach($_FILES AS $key => $val) { + logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG'); +} + $can_post = false; $visitor = 0; @@ -174,14 +186,11 @@ function photos_post(&$a) { ); $drop_id = intval($rr['id']); - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); // send the notification upstream/downstream as the case may be if($rr['visible']) - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ", - array(),$foo)); - + proc_run('php',"include/notifier.php","drop","$drop_id"); } } } @@ -225,11 +234,9 @@ function photos_post(&$a) { $url = $a->get_baseurl(); $drop_id = intval($i[0]['id']); - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); if($i[0]['visible']) - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ", - array(),$foo)); + proc_run('php',"include/notifier.php","drop","$drop_id"); } } @@ -237,24 +244,46 @@ function photos_post(&$a) { return; // NOTREACHED } - if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== 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'])) : ''); + $item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0); + $albname = ((x($_POST,'albname')) ? notags(trim($_POST['albname'])) : ''); + $str_group_allow = perms2str($_POST['group_allow']); + $str_contact_allow = perms2str($_POST['contact_allow']); + $str_group_deny = perms2str($_POST['group_deny']); + $str_contact_deny = perms2str($_POST['contact_deny']); - $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); $resource_id = $a->argv[2]; + if(! strlen($albname)) + $albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'); + + $p = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ORDER BY `scale` DESC", dbesc($resource_id), intval($page_owner_uid) ); - if((count($p)) && ($p[0]['desc'] !== $desc)) { - $r = q("UPDATE `photo` SET `desc` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d", + if(count($p)) { + $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), + dbesc($albname), + dbesc($str_contact_allow), + dbesc($str_group_allow), + dbesc($str_contact_deny), + dbesc($str_group_deny), dbesc($resource_id), intval($page_owner_uid) ); } + + /* Don't make the item visible if the only change was the album name */ + + $visibility = 0; + if($p[0]['desc'] !== $desc || strlen($rawtags)) + $visibility = 1; + if(! $item_id) { // Create item container @@ -284,6 +313,8 @@ function photos_post(&$a) { $arr['deny_cid'] = $p[0]['deny_cid']; $arr['deny_gid'] = $p[0]['deny_gid']; $arr['last-child'] = 1; + $arr['visible'] = $visibility; + $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'] . '.jpg' . '[/img]' . '[/url]'; @@ -453,9 +484,8 @@ function photos_post(&$a) { $arr['target'] .= '' . xmlify('' . "\n" . '') . ''; $item_id = item_store($arr); - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"tag\" \"$item_id\" & ", - array(),$foo)); + if($item_id) + proc_run('php',"include/notifier.php","tag","$item_id"); } } @@ -466,18 +496,20 @@ function photos_post(&$a) { } - // default post action - upload a photo + /** + * default post action - upload a photo + */ - if(! x($_FILES,'userfile')) - killme(); + call_hooks('photo_post_init', $_POST); - if($_POST['partitionCount']) - $java_upload = true; - else - $java_upload = false; + /** + * Determine the album to use + */ - $album = notags(trim($_POST['album'])); - $newalbum = notags(trim($_POST['newalbum'])); + $album = notags(trim($_REQUEST['album'])); + $newalbum = notags(trim($_REQUEST['newalbum'])); + + logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , 'LOGGER_DEBUG'); if(! strlen($album)) { if(strlen($newalbum)) @@ -486,6 +518,16 @@ function photos_post(&$a) { $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'); } + /** + * + * We create a wall item for every photo, but we don't want to + * overwhelm the data stream with a hundred newly uploaded photos. + * So we will make one photo (the first one uploaded to this album) + * visible by default, the rest will become visible over time when and if + * they acquire comments, likes, dislikes, and/or tags + * + */ + $r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d", dbesc($album), intval($page_owner_uid) @@ -495,36 +537,53 @@ function photos_post(&$a) { else $visible = 0; + $str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',',$_REQUEST['group_allow']))); + $str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',',$_REQUEST['contact_allow']))); + $str_group_deny = perms2str(((is_array($_REQUEST['group_deny'])) ? $_REQUEST['group_deny'] : explode(',',$_REQUEST['group_deny']))); + $str_contact_deny = perms2str(((is_array($_REQUEST['contact_deny'])) ? $_REQUEST['contact_deny'] : explode(',',$_REQUEST['contact_deny']))); + + $ret = array('src' => '', 'filename' => '', 'filesize' => 0); - $str_group_allow = perms2str($_POST['group_allow']); - $str_contact_allow = perms2str($_POST['contact_allow']); - $str_group_deny = perms2str($_POST['group_deny']); - $str_contact_deny = perms2str($_POST['contact_deny']); + call_hooks('photo_post_file',$ret); - $src = $_FILES['userfile']['tmp_name']; - $filename = basename($_FILES['userfile']['name']); - $filesize = intval($_FILES['userfile']['size']); + if(x($ret,'src') && x($ret,'filesize')) { + $src = $ret['src']; + $filename = $ret['filename']; + $filesize = $ret['filesize']; + } + else { + $src = $_FILES['userfile']['tmp_name']; + $filename = basename($_FILES['userfile']['name']); + $filesize = intval($_FILES['userfile']['size']); + } $maximagesize = get_config('system','maximagesize'); if(($maximagesize) && ($filesize > $maximagesize)) { notice( t('Image exceeds size limit of ') . $maximagesize . EOL); @unlink($src); + $foo = 0; + call_hooks('photo_post_end',$foo); return; } + logger('mod/photos.php: photos_post(): loading the contents of ' . $src , 'LOGGER_DEBUG'); + $imagedata = @file_get_contents($src); $ph = new Photo($imagedata); 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); + $foo = 0; + call_hooks('photo_post_end',$foo); killme(); } @unlink($src); - $width = $ph->getWidth(); + $width = $ph->getWidth(); $height = $ph->getHeight(); $smallest = 0; @@ -534,6 +593,7 @@ 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) { + logger('mod/photos.php: photos_post(): image store failed' , 'LOGGER_DEBUG'); notice( t('Image upload failed.') . EOL ); killme(); } @@ -555,7 +615,6 @@ function photos_post(&$a) { // Create item container - $arr = array(); $arr['uid'] = $page_owner_uid; @@ -584,14 +643,24 @@ function photos_post(&$a) { $item_id = item_store($arr); - if(! $java_upload) { - goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); - return; // NOTREACHED + 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($visible) + proc_run('php', "include/notifier.php", 'wall-new', $item_id); + + call_hooks('photo_post_end',intval($item_id)); - killme(); - return; // NOTREACHED + // 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']); + // NOTREACHED } @@ -607,6 +676,16 @@ function photos_content(&$a) { // photos/name/image/xxxxx/edit + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + notice( t('Public access denied.') . EOL); + return; + } + + + require_once('include/bbcode.php'); + require_once('include/security.php'); + require_once('include/conversation.php'); + if(! x($a->data,'user')) { notice( t('No photos selected') . EOL ); return; @@ -737,21 +816,36 @@ function photos_content(&$a) { $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); $albumselect .= ''; - $tpl = load_view_file('view/photos_upload.tpl'); + + $uploader = ''; + + $ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'], + 'addon_text' => $uploader, + 'default_upload' => true); + + + call_hooks('photo_upload_form',$ret); + + $default_upload = '
+
'; + + + + + $tpl = get_markup_template('photos_upload.tpl'); $o .= replace_macros($tpl,array( '$pagename' => t('Upload Photos'), '$sessid' => session_id(), '$nickname' => $a->data['user']['nickname'], '$newalbum' => t('New album name: '), '$existalbumtext' => t('or existing album name: '), - '$filestext' => t('Select files to upload: '), '$albumselect' => $albumselect, '$permissions' => t('Permissions'), '$aclselect' => (($visitor) ? '' : populate_acl($a->user, $celeb)), - '$archive' => $a->get_baseurl() . '/jumploader_z.jar', - '$nojava' => t('Use the following controls only if the Java uploader [above] fails to launch.'), - '$uploadurl' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'], - '$submit' => t('Submit') + '$uploader' => $ret['addon_text'], + '$default' => (($ret['default_upload']) ? $default_upload : ''), + '$uploadurl' => $ret['post_url'] + )); return $o; @@ -766,11 +860,12 @@ function photos_content(&$a) { intval($owner_uid), dbesc($album) ); - if(count($r)) + if(count($r)) { $a->set_pager_total(count($r)); + $a->set_pager_itemspage(20); + } - - $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' + $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($owner_uid), dbesc($album), @@ -783,7 +878,7 @@ function photos_content(&$a) { if($cmd === 'edit') { if(($album != t('Profile Photos')) && ($album != t('Contact Photos'))) { if($can_post) { - $edit_tpl = load_view_file('view/album_edit.tpl'); + $edit_tpl = get_markup_template('album_edit.tpl'); $o .= replace_macros($edit_tpl,array( '$nametext' => t('New album name: '), '$nickname' => $a->data['user']['nickname'], @@ -804,7 +899,7 @@ function photos_content(&$a) { } } } - $tpl = load_view_file('view/photo_album.tpl'); + $tpl = get_markup_template('photo_album.tpl'); if(count($r)) foreach($r as $rr) { $o .= replace_macros($tpl,array( @@ -812,11 +907,14 @@ function photos_content(&$a) { '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'], '$phototitle' => t('View Photo'), '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg', - '$imgalt' => $rr['filename'] + '$imgalt' => $rr['filename'], + '$desc'=> $rr['desc'] )); } $o .= '
'; + $o .= paginate($a); + return $o; } @@ -824,10 +922,9 @@ function photos_content(&$a) { if($datatype === 'image') { - require_once('security.php'); - require_once('bbcode.php'); - $o = '
' . "\r\n"; + + $o = ''; // fetch image, item containing image, then comments $ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' @@ -841,6 +938,32 @@ function photos_content(&$a) { return; } + $prevlink = ''; + $nextlink = ''; + + $prvnxt = q("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0 + $sql_extra ORDER BY `created` DESC ", + dbesc($ph[0]['album']), + intval($owner_uid) + ); + + if(count($prvnxt)) { + for($z = 0; $z < count($prvnxt); $z++) { + if($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) { + $prv = $z - 1; + $nxt = $z + 1; + if($prv < 0) + $prv = count($prvnxt) - 1; + if($nxt >= count($prvnxt)) + $nxt = 0; + break; + } + } + $prevlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] ; + $nextlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] ; + } + + if(count($ph) == 1) $hires = $lores = $ph[0]; if(count($ph) > 1) { @@ -854,18 +977,36 @@ function photos_content(&$a) { } } - - $o .= '

' . '' . $ph[0]['album'] . '

'; + $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)) { - $o .= ''; + $tools = array( + 'edit' => array($a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit', t('Edit photo')), + 'profile'=>array($a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')), + ); + + // 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'])) ) + ? t('Private Message') + : Null); + + } + if($prevlink) + $prevlink = array($prevlink, t('<< Prev')) ; - $o .= ''; + $photo = array( + 'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.jpg', + 'title'=> t('View Full Size'), + 'src' => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.jpg' + ); + + if($nextlink) + $nextlink = array($nextlink, t('Next >>')); // Do we have an item for this photo? @@ -917,35 +1058,38 @@ function photos_content(&$a) { } } - $o .= '
' . $ph[0]['desc'] . '
'; - + $tags=Null; if(count($linked_items) && strlen($link_item['tag'])) { $arr = explode(',',$link_item['tag']); - // parse tags and add links - $o .= '
' . t('Tags: ') . '
'; - $o .= '
'; + // parse tags and add links $tag_str = ''; foreach($arr as $t) { if(strlen($tag_str)) $tag_str .= ', '; $tag_str .= bbcode($t); } - $o .= $tag_str . '
'; + $tags = array(t('Tags: '), $tag_str); if($cmd === 'edit') - $o .= '
' . t('[Remove any tag]') . '
'; + $tags[] = $a->get_baseurl() . '/tagrm/' . $link_item['id']; + $tags[] = t('[Remove any tag]'); } + $edit = Null; if(($cmd === 'edit') && ($can_post)) { - $edit_tpl = load_view_file('view/photo_edit.tpl'); - $o .= replace_macros($edit_tpl, array( + $edit_tpl = get_markup_template('photo_edit.tpl'); + $edit = replace_macros($edit_tpl, array( '$id' => $ph[0]['id'], + '$album' => $ph[0]['album'], + '$newalbum' => t('New album name'), '$nickname' => $a->data['user']['nickname'], '$resource_id' => $ph[0]['resource-id'], '$capt_label' => t('Caption'), '$caption' => $ph[0]['desc'], '$tag_label' => t('Add a Tag'), '$tags' => $link_item['tag'], + '$permissions' => t('Permissions'), + '$aclselect' => populate_acl($ph[0]), '$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'), '$item_id' => ((count($linked_items)) ? $link_item['id'] : 0), '$submit' => t('Submit'), @@ -955,26 +1099,31 @@ function photos_content(&$a) { if(count($linked_items)) { - $cmnt_tpl = load_view_file('view/comment_item.tpl'); - $tpl = load_view_file('view/photo_item.tpl'); + $cmnt_tpl = get_markup_template('comment_item.tpl'); + $tpl = get_markup_template('photo_item.tpl'); $return_url = $a->cmd; - $like_tpl = load_view_file('view/like.tpl'); + $like_tpl = get_markup_template('like_noshare.tpl'); $likebuttons = ''; - if($can_post || can_write_wall($a,$owner_uid)) - $likebuttons = replace_macros($like_tpl,array('$id' => $link_item['id'])); + if($can_post || can_write_wall($a,$owner_uid)) { + $likebuttons = replace_macros($like_tpl,array( + '$id' => $link_item['id'], + '$likethis' => t("I like this \x28toggle\x29"), + '$nolike' => t("I don't like this \x28toggle\x29"), + '$share' => t('Share'), + '$wait' => t('Please wait') + )); + } + $comments = ''; if(! count($r)) { - $o .= '
'; - $o .= $likebuttons; - $o .= '
'; - if($can_post || can_write_wall($a,$owner_uid)) { if($link_item['last-child']) { - $o .= replace_macros($cmnt_tpl,array( - '$return_path' => $return_url, + $comments .= replace_macros($cmnt_tpl,array( + '$return_path' => '', + '$jsreload' => $return_url, '$type' => 'wall-comment', '$id' => $link_item['id'], '$parent' => $link_item['id'], @@ -982,6 +1131,8 @@ function photos_content(&$a) { '$mylink' => $contact['url'], '$mytitle' => t('This is you'), '$myphoto' => $contact['thumb'], + '$comment' => t('Comment'), + '$submit' => t('Submit'), '$ww' => '' )); } @@ -990,6 +1141,9 @@ function photos_content(&$a) { $alike = array(); $dlike = array(); + + $like = ''; + $dislike = ''; // display comments if(count($r)) { @@ -999,21 +1153,16 @@ function photos_content(&$a) { like_puller($a,$item,$dlike,'dislike'); } - $like = ((isset($alike[$link_item['id']])) ? format_like($alike[$link_item['id']],$alike[$link_item['id'] . '-l'],'like',$link_item['id']) : ''); + $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']) : ''); - $o .= '
'; - $o .= $likebuttons; - $o .= $like; - $o .= $dislike; - $o .= '
'; - if($can_post || can_write_wall($a,$owner_uid)) { if($link_item['last-child']) { - $o .= replace_macros($cmnt_tpl,array( - '$return_path' => $return_url, + $comments .= replace_macros($cmnt_tpl,array( + '$return_path' => '', + '$jsreload' => $return_url, '$type' => 'wall-comment', '$id' => $link_item['id'], '$parent' => $link_item['id'], @@ -1021,6 +1170,8 @@ function photos_content(&$a) { '$mylink' => $contact['url'], '$mytitle' => t('This is you'), '$myphoto' => $contact['thumb'], + '$comment' => t('Comment'), + '$submit' => t('Submit'), '$ww' => '' )); } @@ -1040,8 +1191,9 @@ function photos_content(&$a) { if($can_post || can_write_wall($a,$owner_uid)) { if($item['last-child']) { - $comment = replace_macros($cmnt_tpl,array( - '$return_path' => $return_url, + $comments .= replace_macros($cmnt_tpl,array( + '$return_path' => '', + '$jsreload' => $return_url, '$type' => 'wall-comment', '$id' => $item['item_id'], '$parent' => $item['parent'], @@ -1049,6 +1201,8 @@ function photos_content(&$a) { '$mylink' => $contact['url'], '$mytitle' => t('This is you'), '$myphoto' => $contact['thumb'], + '$comment' => t('Comment'), + '$submit' => t('Submit'), '$ww' => '' )); } @@ -1075,10 +1229,10 @@ function photos_content(&$a) { $drop = ''; if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user())) - $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'])); + $drop = replace_macros(get_markup_template('wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); - $o .= replace_macros($template,array( + $comments .= replace_macros($template,array( '$id' => $item['item_id'], '$profile_url' => $profile_link, '$name' => $profile_name, @@ -1094,8 +1248,28 @@ function photos_content(&$a) { } } - $o .= paginate($a); + $paginate = paginate($a); } + + $photo_tpl = get_markup_template('photo_view.tpl'); + $o .= replace_macros($photo_tpl, array( + '$id' => $ph[0]['id'], + '$album' => array($album_link,$ph[0]['album']), + '$tools' => $tools, + '$lock' => $lock, + '$photo' => $photo, + '$prevlink' => $prevlink, + '$nextlink' => $nextlink, + '$desc' => $ph[0]['desc'], + '$tags' => $tags, + '$edit' => $edit, + '$likebuttons' => $likebuttons, + '$like' => $like, + '$dislike' => $dislike, + '$comments' => $comments, + '$paginate' => $paginate, + )); + return $o; } @@ -1107,9 +1281,10 @@ function photos_content(&$a) { intval($a->data['user']['uid']), dbesc( t('Contact Photos')) ); - if(count($r)) + if(count($r)) { $a->set_pager_total(count($r)); - + $a->set_pager_itemspage(20); + } $r = q("SELECT `resource-id`, `id`, `filename`, `album`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' @@ -1127,25 +1302,24 @@ function photos_content(&$a) { . $a->data['user']['nickname'] . '/upload' . '">' . t('Upload New Photos') . ''; } - $tpl = load_view_file('view/photo_top.tpl'); + $tpl = get_markup_template('photo_top.tpl'); if(count($r)) { foreach($r as $rr) { $o .= replace_macros($tpl,array( - '$id' => $rr['id'], - '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] - . '/image/' . $rr['resource-id'], + '$id' => $rr['id'], + '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'], '$phototitle' => t('View Photo'), - '$imgsrc' => $a->get_baseurl() . '/photo/' - . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg', - '$albumlink' => $a->get_baseurl() . '/photos/' - . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), - '$albumname' => $rr['album'], - '$albumalt' => t('View Album'), - '$imgalt' => $rr['filename'] + '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg', + '$albumlink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), + '$albumname' => $rr['album'], + '$albumalt' => t('View Album'), + '$imgalt' => $rr['filename'] )); } $o .= '
'; } + $o .= paginate($a); return $o; } +