Merge pull request #216 from zzottel/master

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
old mode 100755 (executable)
new mode 100644 (file)
index 466fe44..2a808cb
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -38,21 +38,22 @@ function photos_init(&$a) {
                        $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg" alt="' . $a->data['user']['username'] . '" /></div>';
                        $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></h3>';
+                       if(! intval($a->data['user']['hidewall'])) {
+                               $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></h3>';
                                        
-                       $o .= '<ul>';
-                       foreach($albums as $album) {
+                               $o .= '<ul>';
+                               foreach($albums as $album) {
 
-                               // don't show contact photos. We once translated this name, but then you could still access it under
-                               // a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
+                                       // don't show contact photos. We once translated this name, but then you could still access it under
+                                       // a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
 
-                               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>'; 
+                                       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 .= '</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>';
                        }
@@ -98,7 +99,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);
@@ -571,7 +572,7 @@ function photos_post(&$a) {
        $album    = notags(trim($_REQUEST['album']));
        $newalbum = notags(trim($_REQUEST['newalbum']));
 
-       logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , 'LOGGER_DEBUG');
+       logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
 
        if(! strlen($album)) {
                if(strlen($newalbum))
@@ -643,13 +644,13 @@ function photos_post(&$a) {
                return;
        }
 
-       logger('mod/photos.php: photos_post(): loading the contents of ' . $src , 'LOGGER_DEBUG');
+       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');
+               logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
                notice( t('Unable to process image.') . EOL );
                @unlink($src);
                $foo = 0;
@@ -669,7 +670,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');
+               logger('mod/photos.php: photos_post(): image store failed' , LOGGER_DEBUG);
                notice( t('Image upload failed.') . EOL );
                killme();
        }
@@ -1081,6 +1082,17 @@ function photos_content(&$a) {
                        
                }
 
+               if(! $cmd !== 'edit') {
+                       $a->page['htmlhead'] .= '<script>
+                               $(document).keydown(function(event) {' . "\n";
+
+                       if($prevlink)
+                               $a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = \'' . $prevlink . '\'; }' . "\n";
+                       if($nextlink)
+                               $a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = \'' . $nextlink . '\'; }' . "\n";
+                       $a->page['htmlhead'] .= '});</script>';
+               }
+
                if($prevlink)
                        $prevlink = array($prevlink, '<div class="icon prev"></div>') ;