shaka, slackr theme

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
old mode 100644 (file)
new mode 100755 (executable)
index 51d6a4b..77b44ce
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -39,7 +39,7 @@ function photos_init(&$a) {
                        $o .= '</div>';
                        
                        $o .= '<div id="side-bar-photos-albums" class="widget">';
-                       $o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h4>';
+                       $o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
                                        
                        $o .= '<ul>';
                        foreach($albums as $album) {
@@ -49,9 +49,15 @@ function photos_init(&$a) {
 
                                if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
                                        continue;
-                               $o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" />' . $album['album'] . '</a></li>'; 
+                               $o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>'; 
                        }
                        $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>';
                }
 
                if(! x($a->page,'aside'))
@@ -92,7 +98,7 @@ EOT;
 
 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);
@@ -742,6 +748,7 @@ function photos_content(&$a) {
        // URLs:
        // photos/name
        // photos/name/upload
+       // photos/name/upload/xxxxx (xxxxx is album name)
        // photos/name/album/xxxxx
        // photos/name/album/xxxxx/edit
        // photos/name/image/xxxxx
@@ -858,14 +865,21 @@ function photos_content(&$a) {
                        notice( t('Permission denied.'));
                        return;
                }
+
+
+               $selname = (($datum) ? hex2bin($datum) : '');
+
+
                $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'])) {
                        foreach($a->data['albums'] as $album) {
                                if(($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
                                        continue;
-                               $albumselect .= '<option value="' . $album['album'] . '">' . $album['album'] . '</option>';
+                               $selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
+                               $albumselect .= '<option value="' . $album['album'] . '"' . $selected . '>' . $album['album'] . '</option>';
                        }
                }
 
@@ -956,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');
                if(count($r))
                        foreach($r as $rr) {
@@ -1201,6 +1220,7 @@ function photos_content(&$a) {
                                                        '$myphoto' => $contact['thumb'],
                                                        '$comment' => t('Comment'),
                                                        '$submit' => t('Submit'),
+                                                       '$preview' => t('Preview'),
                                                        '$ww' => ''
                                                ));
                                        }
@@ -1365,30 +1385,36 @@ function photos_content(&$a) {
                intval($a->pager['itemspage'])
        );
 
-       $o .= '<h3>' . t('Recent Photos') . '</h3>';
 
-       if($can_post) {
-               $o .= '<div id="photo-top-links"><a id="photo-top-upload-link" href="'. $a->get_baseurl() . '/photos/' 
-                       . $a->data['user']['nickname'] . '/upload' . '">' . t('Upload New Photos') . '</a></div>';
-       }
 
-       $tpl = get_markup_template('photo_top.tpl');
+       $photos = array();
        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'],
-                               '$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'  => template_escape($rr['album']),
-                               '$albumalt'   => t('View Album'),
-                               '$imgalt'     => template_escape($rr['filename'])
-                       ));
-
+                       $photos[] = array(
+                               'id'       => $rr['id'],
+                               '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']) . '.jpg',
+                               'alt'           => template_escape($rr['filename']),
+                               'album' => array(
+                                       'link'  => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+                                       'name'  => template_escape($rr['album']),
+                                       'alt'   => t('View Album'),
+                               ),
+                               
+                       );
                }
-               $o .= '<div id="photo-top-end"></div>';
        }
+       
+       $tpl = get_markup_template('photos_recent.tpl'); 
+       $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'),
+               '$photos' => $photos,
+       ));
+
+       
        $o .= paginate($a);
        return $o;
 }