From f4c961b90676dad0a6773e52e4bd08b33c9b68c6 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 1 Oct 2011 02:22:48 -0700 Subject: override pragma --- mod/photo.php | 5 +++++ mod/photos.php | 3 +++ 2 files changed, 8 insertions(+) (limited to 'mod') diff --git a/mod/photo.php b/mod/photo.php index 71c345fc5..a5a5a1dc1 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -128,6 +128,11 @@ function photo_init(&$a) { } } + if(function_exists('header_remove')) { + header_remove('Pragma'); + header_remove('pragma'); + } + header("Content-type: image/jpeg"); header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT"); header("Cache-Control: max-age=" . (3600*24)); diff --git a/mod/photos.php b/mod/photos.php index 90d51000e..b6be8d025 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -585,6 +585,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']))); -- cgit v1.2.3 From 0ad9e7b5f4f72f789363ae1a1836e43d5707bf0a Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 1 Oct 2011 06:20:41 -0700 Subject: option to not post photos to status stream --- mod/photos.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'mod') 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))), -- cgit v1.2.3 From c72883f06822658491134d41a3b8ab83d9984b86 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Oct 2011 01:21:51 -0700 Subject: malformed xml in ping --- mod/ping.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/ping.php b/mod/ping.php index 30f1dc837..544a42e14 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -114,7 +114,7 @@ function ping_init(&$a) { function xmlize($href, $name, $url, $photo, $date, $message){ $notsxml = '%s'; return sprintf ( $notsxml, - $href, $name, $url, $photo, $date, $message + xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($message) ); } -- cgit v1.2.3