Merge pull request #29 from tobiasd/master

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index cb7df15ccf96d6428e5f9d32a960ea8ab04e1c1c..28416922197cd8e907996c62e8a7b4193fc8ca46 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -34,7 +34,7 @@ function photos_init(&$a) {
                        $a->data['albums'] = $albums;
 
                        $o .= '<div class="vcard">';
-                       $o .= '<div class="fn">' . $a->data['user']['username'] . '</h4>';
+                       $o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
                        $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>';
                        
@@ -92,15 +92,11 @@ EOT;
 
 function photos_post(&$a) {
 
-       logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
+       logger('mod-photos: 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');
-       }
+       logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA);
+       logger('mod_photos: FILES '   . print_r($_FILES,true), LOGGER_DATA);
 
        $can_post  = false;
        $visitor   = 0;
@@ -585,6 +581,9 @@ function photos_post(&$a) {
        else
                $visible = 0;
 
+       if(intval($_REQUEST['not_visible']))
+               $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'])));
@@ -832,18 +831,8 @@ function photos_content(&$a) {
        $o = "";
 
        // tabs
-       $tpl = get_markup_template('profile_tabs.tpl');
        $_is_owner = (local_user() && (local_user() == $owner_uid));
-       $o .= replace_macros($tpl,array(
-               '$url' => $a->get_baseurl() . '/profile/' .$a->data['user']['nickname'],
-               '$phototab' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
-               '$status' => t('Status'),
-               '$profile' => t('Profile'),
-               '$photos' => t('Photos'),
-               '$events' => (($_is_owner) ? t('Events') : ''),
-               '$notes' => (($_is_owner) ?     t('Personal Notes') : ''),
-               '$activetab' => "photos",
-       ));     
+       $o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);        
 
        //
        // dispatch request
@@ -892,6 +881,7 @@ function photos_content(&$a) {
                        '$nickname' => $a->data['user']['nickname'],
                        '$newalbum' => t('New album name: '),
                        '$existalbumtext' => t('or existing album name: '),
+                       '$nosharetext' => t('Do not show a status post for this upload'),
                        '$albumselect' => template_escape($albumselect),
                        '$permissions' => t('Permissions'),
                        '$aclselect' => (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb))),