friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add photo upload link to album widget and "upload to this album" ability

Browse source
This commit is contained in:
friendica 2012-01-15 17:48:42 -08:00
parent e9fb809a2d
commit e3a415d409
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
mod/photos.php
View file

@ -53,6 +53,10 @@ function photos_init(&$a) {
} }
$o .= '</ul>'; $o .= '</ul>';
if(local_user() && $a->data['user']['uid'] == local_user()) {
$o .= '<div id="photo-albums-upload-link"><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
}
$o .= '</div>'; $o .= '</div>';
} }
@ -94,7 +98,7 @@ EOT;
function photos_post(&$a) { function photos_post(&$a) {
logger('mod-photos: photos_post(): begin' , 'LOGGER_DEBUG'); logger('mod-photos: photos_post: begin' , 'LOGGER_DEBUG');
logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA); logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA);
@ -744,6 +748,7 @@ function photos_content(&$a) {
// URLs: // URLs:
// photos/name // photos/name
// photos/name/upload // photos/name/upload
// photos/name/upload/xxxxx (xxxxx is album name)
// photos/name/album/xxxxx // photos/name/album/xxxxx
// photos/name/album/xxxxx/edit // photos/name/album/xxxxx/edit
// photos/name/image/xxxxx // photos/name/image/xxxxx
@ -860,14 +865,21 @@ function photos_content(&$a) {
notice( t('Permission denied.')); notice( t('Permission denied.'));
return; return;
} }
$selname = (($datum) ? hex2bin($datum) : '');
$albumselect = '<select id="photos-upload-album-select" name="album" size="4">'; $albumselect = '<select id="photos-upload-album-select" name="album" size="4">';
$albumselect .= '<option value="" selected="selected" >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
$albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
if(count($a->data['albums'])) { if(count($a->data['albums'])) {
foreach($a->data['albums'] as $album) { foreach($a->data['albums'] as $album) {
if(($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos'))) if(($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
continue; continue;
$albumselect .= '<option value="' . $album['album'] . '">' . $album['album'] . '</option>'; $selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
$albumselect .= '<option value="' . $album['album'] . '"' . $selected . '>' . $album['album'] . '</option>';
} }
} }
@ -958,6 +970,11 @@ function photos_content(&$a) {
} }
} }
} }
if($can_post) {
$o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album) . '" >' . t('Upload New Photos') . '</a></div>';
}
$tpl = get_markup_template('photo_album.tpl'); $tpl = get_markup_template('photo_album.tpl');
if(count($r)) if(count($r))
foreach($r as $rr) { foreach($r as $rr) {