aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-10-01 06:20:41 -0700
committerFriendika <info@friendika.com>2011-10-01 06:20:41 -0700
commit0ad9e7b5f4f72f789363ae1a1836e43d5707bf0a (patch)
treef8f17298b1bdd3a42a4b9f2502885e8517dd493e
parent8f47540e9b8e5bde94cf3acd7e27d0a4060315e9 (diff)
downloadvolse-hubzilla-0ad9e7b5f4f72f789363ae1a1836e43d5707bf0a.tar.gz
volse-hubzilla-0ad9e7b5f4f72f789363ae1a1836e43d5707bf0a.tar.bz2
volse-hubzilla-0ad9e7b5f4f72f789363ae1a1836e43d5707bf0a.zip
option to not post photos to status stream
-rw-r--r--mod/photos.php13
-rw-r--r--view/photos_upload.tpl5
-rw-r--r--view/theme/duepuntozero/style.css6
3 files changed, 16 insertions, 8 deletions
diff --git a/mod/photos.php b/mod/photos.php
index b6be8d025..1321af192 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -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,7 +581,7 @@ function photos_post(&$a) {
else
$visible = 0;
- if(intval($_REQUEST,'not_visible'))
+ if(intval($_REQUEST['not_visible']))
$visible = 0;
$str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',',$_REQUEST['group_allow'])));
@@ -895,6 +891,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))),
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
index c7c61c6db..318a92427 100644
--- a/view/photos_upload.tpl
+++ b/view/photos_upload.tpl
@@ -13,6 +13,11 @@
</div>
<div id="photos-upload-exist-end"></div>
+ <div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+ <input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
+ <label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
+ </div>
+
<div id="photos-upload-perms" class="photos-upload-perms" >
<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" />
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 1fe8fb2f4..4769da8af 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1559,6 +1559,8 @@ input#dfrn-url {
display:block!important;
}
+
+
#acl-wrapper {
width: 690px;
float:left;
@@ -1917,6 +1919,10 @@ a.mail-list-link {
float: left;
width: 175px;
}
+
+#photos-upload-noshare {
+ margin-bottom: 10px;
+}
#photos-upload-existing-album-text {
float: left;
width: 175px;