X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=a191dcf0712562cd5222233024f8b20d9d2be7dc;hb=78514db6e8960e93f62f31294eb00661d3ab0dab;hp=ca770d95aac6fb1517e715dc8c25e1bcec190b25;hpb=24c91a4fedc7d06063c1f3c900546b2f79839747;p=friendica.git diff --git a/mod/photos.php b/mod/photos.php index ca770d95aa..a191dcf071 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1,5 +1,6 @@ argc > 1) { $nick = $a->argv[1]; - $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", + $user = q("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->data['user'] = $user[0]; + $a->profile_uid = $user[0]['uid']; + $is_owner = (local_user() && (local_user() == $a->profile_uid)); + + $profile = get_profiledata_by_nick($nick, $a->profile_uid); - $profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg'); + if((intval($profile['page-flags']) == PAGE_COMMUNITY) || (intval($profile['page-flags']) == PAGE_PRVGROUP)) + $account_type = t('Forum'); + else + $account_type = ""; - $tpl = get_markup_template("vcard-widget.tpl"); + $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", + $sql_extra group by album order by created desc", intval($a->data['user']['uid']), - dbesc('Contact Photos'), - dbesc( t('Contact Photos')) + dbesc('Contact Photos'), + dbesc( t('Contact Photos')) ); - $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) { - $a->data['albums'] = $albums; - if ($albums_visible) - $ret['success'] = true; - - $ret['albums'] = array(); - foreach($albums as $k => $album) { - $entry = array( - 'text' => $album['album'], - 'total' => $album['total'], - 'url' => z_root() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']), - 'urlencode' => urlencode($album['album']), - 'bin2hex' => bin2hex($album['album']) - ); - $ret['albums'][] = $entry; - } - } - - $albums = $ret; - - 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 - )); - } + $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) { + $a->data['albums'] = $albums; + if ($albums_visible) + $ret['success'] = true; + + $ret['albums'] = array(); + foreach($albums as $k => $album) { + //hide profile photos to others + if((! $is_owner) && (! remote_user()) && ($album['album'] == t('Profile Photos'))) + continue; + $entry = array( + 'text' => $album['album'], + 'total' => $album['total'], + 'url' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']), + 'urlencode' => urlencode($album['album']), + 'bin2hex' => bin2hex($album['album']) + ); + $ret['albums'][] = $entry; + } + } + + $albums = $ret; + + 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'), 'photos/' . $a->data['user']['nickname'] . '/upload'), + '$can_post' => $can_post + )); + } if(! x($a->page,'aside')) $a->page['aside'] = ''; - $a->page['aside'] .= $vcard_widget; - $a->page['aside'] .= $photo_albums_widget; + $a->page['aside'] .= $vcard_widget; + $a->page['aside'] .= $photo_albums_widget; $tpl = get_markup_template("photos_head.tpl"); @@ -174,7 +191,7 @@ function photos_post(&$a) { $album = hex2bin($a->argv[3]); if($album === t('Profile Photos') || $album === 'Contact Photos' || $album === t('Contact Photos')) { - goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); + goaway($_SESSION['photo_return']); return; // NOTREACHED } @@ -184,15 +201,19 @@ function photos_post(&$a) { ); 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']); + goaway($_SESSION['photo_return']); } + /* + * RENAME photo album + */ + $newalbum = notags(trim($_POST['albumname'])); if($newalbum != $album) { q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d", @@ -201,10 +222,13 @@ function photos_post(&$a) { intval($page_owner_uid) ); $newurl = str_replace(bin2hex($album),bin2hex($newalbum),$_SESSION['photo_return']); - goaway($a->get_baseurl() . '/' . $newurl); + goaway($newurl); return; // NOTREACHED } + /* + * DELETE photo album and all its photos + */ if($_POST['dropalbum'] == t('Delete Album')) { @@ -250,7 +274,7 @@ function photos_post(&$a) { } } else { - goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); + goaway($_SESSION['photo_return']); return; // NOTREACHED } @@ -282,18 +306,18 @@ 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"); + 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']); + goaway($_SESSION['photo_return']); } if(($a->argc > 2) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) { @@ -352,11 +376,11 @@ function photos_post(&$a) { $drop_id = intval($i[0]['id']); if($i[0]['visible']) - proc_run('php',"include/notifier.php","drop","$drop_id"); + 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 } @@ -465,7 +489,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; @@ -529,16 +553,16 @@ function photos_post(&$a) { $name = substr($tag,1); if((strpos($name,'@')) || (strpos($name,'http://'))) { $newname = $name; - $links = @lrdd($name); + $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']; + $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; } } } @@ -654,7 +678,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; @@ -695,20 +719,14 @@ 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) - //); - - proc_run('php',"include/notifier.php","tag","$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 } @@ -785,7 +803,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); @@ -832,7 +850,7 @@ function photos_post(&$a) { killme(); } - $ph->orient($src); + $exif = $ph->orient($src); @unlink($src); $max_length = get_config('system','max_image_length'); @@ -873,8 +891,21 @@ function photos_post(&$a) { // Create item container + $lat = $lon = null; + + 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']); + } + } + $arr = array(); + if($lat && $lon) + $arr['coord'] = $lat . ' ' . $lon; + + $arr['guid'] = get_guid(32); $arr['uid'] = $page_owner_uid; $arr['uri'] = $uri; $arr['parent-uri'] = $uri; @@ -903,23 +934,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); + 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 } @@ -1058,13 +1081,12 @@ function photos_content(&$a) { $o = ""; // tabs - $_is_owner = (local_user() && (local_user() == $owner_uid)); - $o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']); - - // - // dispatch request - // + $is_owner = (local_user() && (local_user() == $owner_uid)); + $o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']); + /** + * Display upload form + */ if($datatype === 'upload') { if(! ($can_post)) { @@ -1089,11 +1111,9 @@ 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'], + $ret = array('post_url' => 'photos/' . $a->data['user']['nickname'], 'addon_text' => $uploader, 'default_upload' => true); @@ -1139,11 +1159,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( @@ -1177,6 +1197,10 @@ function photos_content(&$a) { return $o; } + /* + * Display a single photo album + */ + if($datatype === 'album') { $album = hex2bin($datum); @@ -1204,6 +1228,7 @@ function photos_content(&$a) { intval($a->pager['itemspage']) ); + //edit album name if($cmd === 'edit') { if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if($can_post) { @@ -1230,15 +1255,15 @@ 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'); + $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)); + $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(); @@ -1264,10 +1289,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, @@ -1280,22 +1305,22 @@ 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; } + /** + * Display one photo + */ if($datatype === 'image') { - - //$o = ''; // fetch image, item containing image, then comments @@ -1346,8 +1371,8 @@ function photos_content(&$a) { } } $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' : ''); } @@ -1364,14 +1389,14 @@ function photos_content(&$a) { } } - $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)) { $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 @@ -1395,9 +1420,9 @@ function photos_content(&$a) { $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'], @@ -1419,6 +1444,9 @@ function photos_content(&$a) { $linked_items = q("SELECT * FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1", dbesc($datum) ); + + $map = null; + if(count($linked_items)) { $link_item = $linked_items[0]; $r = q("SELECT COUNT(*) AS `total` @@ -1462,6 +1490,10 @@ function photos_content(&$a) { ); update_thread($link_item['parent']); } + + if($link_item['coord']) { + $map = generate_map($link_item['coord']); + } } $tags=Null; @@ -1477,7 +1509,7 @@ function photos_content(&$a) { } $tags = array(t('Tags: '), $tag_str); if($cmd === 'edit') { - $tags[] = $a->get_baseurl() . '/tagrm/' . $link_item['id']; + $tags[] = 'tagrm/' . $link_item['id']; $tags[] = t('[Remove any tag]'); } } @@ -1598,18 +1630,22 @@ 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)) { foreach($r as $item) { - like_puller($a,$item,$alike,'like'); - like_puller($a,$item,$dlike,'dislike'); + 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']) : ''); @@ -1644,7 +1680,7 @@ function photos_content(&$a) { 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()) @@ -1728,6 +1764,12 @@ 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') { @@ -1754,9 +1796,12 @@ function photos_content(&$a) { '$desc' => $ph[0]['desc'], '$tags' => $tags_e, '$edit' => $edit, + '$map' => $map, + '$map_text' => t('Map'), '$likebuttons' => $likebuttons, '$like' => $like_e, '$dislike' => $dikslike_e, + 'responses' => $responses, '$comments' => $comments, '$paginate' => $paginate, )); @@ -1800,6 +1845,10 @@ 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 @@ -1816,14 +1865,14 @@ 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'], + 'id' => $rr['id'], + 'twist' => ' ' . $twist . rand(2,4), + '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'), ), @@ -1836,12 +1885,11 @@ 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; }