From 457cc4804345cd3ac6ef821de059f20a6f1f3a27 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 21 Jan 2016 12:22:54 +0000 Subject: Type of script --- util/shredder/JSON.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/util/shredder/JSON.sh b/util/shredder/JSON.sh index 65f5f1f66..20c4d282e 100755 --- a/util/shredder/JSON.sh +++ b/util/shredder/JSON.sh @@ -1,3 +1,4 @@ +#!/bin/bash # The MIT License # # Copyright (c) 2011 Dominic Tarr -- cgit v1.2.3 From 78b2a4af1ab3668ff9b9a1e3ed7055e7cb78b612 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 21 Jan 2016 12:23:25 +0000 Subject: README files should not be executable --- library/HTMLPurifier/DefinitionCache/Serializer/README | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 library/HTMLPurifier/DefinitionCache/Serializer/README diff --git a/library/HTMLPurifier/DefinitionCache/Serializer/README b/library/HTMLPurifier/DefinitionCache/Serializer/README old mode 100755 new mode 100644 -- cgit v1.2.3 From cbedb50cb3a62b344f9d3881ea869cfc4a09e2f4 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 21 Jan 2016 12:23:49 +0000 Subject: css files should not be executable --- library/font_awesome/src/assets/css/prettify.css | 0 library/stylish_select/stylish-select.css | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 library/font_awesome/src/assets/css/prettify.css mode change 100755 => 100644 library/stylish_select/stylish-select.css diff --git a/library/font_awesome/src/assets/css/prettify.css b/library/font_awesome/src/assets/css/prettify.css old mode 100755 new mode 100644 diff --git a/library/stylish_select/stylish-select.css b/library/stylish_select/stylish-select.css old mode 100755 new mode 100644 -- cgit v1.2.3 From 88d29a7b4b0a431a118cb46433ccc93fdfb81273 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 21 Jan 2016 12:26:46 +0000 Subject: Executable flash files ??? --- library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf | Bin 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf diff --git a/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf b/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf old mode 100755 new mode 100644 -- cgit v1.2.3 From 55e9bd36605690cc0dfdc03145ab8ed13a417866 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Thu, 21 Jan 2016 22:02:31 +0100 Subject: A few minor tweaks in schemas + link to login form in lostpass --- mod/lostpass.php | 2 +- view/theme/redbasic/schema/bluegrid.css | 8 ++++++++ view/theme/redbasic/schema/dark.css | 2 +- view/theme/redbasic/schema/simple_black_on_white.css | 4 ++++ view/theme/redbasic/schema/simple_green_on_black.css | 4 ++++ view/theme/redbasic/schema/simple_white_on_black.css | 4 ++++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/mod/lostpass.php b/mod/lostpass.php index 3dbc2fe7d..ffdd7b62e 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -87,7 +87,7 @@ function lostpass_content(&$a) { '$lbl2' => t('Your password has been reset as requested.'), '$lbl3' => t('Your new password is'), '$lbl4' => t('Save or copy your new password - and then'), - '$lbl5' => '' . t('click here to login') . '.', + '$lbl5' => '' . t('click here to login') . '.', '$lbl6' => t('Your password may be changed from the Settings page after successful login.'), '$newpass' => $new_password, '$baseurl' => $a->get_baseurl() diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css index f0ae1e8df..38701024f 100644 --- a/view/theme/redbasic/schema/bluegrid.css +++ b/view/theme/redbasic/schema/bluegrid.css @@ -160,6 +160,14 @@ nav .badge:hover, nav .badge:focus { color: rgba(255,255,255,.8); } +.widget .conv-participants { + color: #BBB; +} + +.widget .active:hover .conv-participants, .widget .active:focus .conv-participants { + color: inherit; +} + .help-block, .comment-icon, .jot-icons, .admin-icons { color: inherit; } diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 936f74761..f65e9aac9 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -88,7 +88,7 @@ background-color: #111; } -.jotnets-wrapper > a.btn { +a.btn, aside a { font-weight: 400 !important; } diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index f69ba3450..5a6b2655b 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -75,6 +75,10 @@ background-color: #fff; } +a.btn, aside a { + font-weight: 400 !important; +} + .btn-default { background-color: #fff; border-color: #000; diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index 1f0a2f1e6..d25585f98 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -75,6 +75,10 @@ background-color: #000; } +a.btn, aside a { + font-weight: 400 !important; +} + .btn-default { background-color: #000; border-color: #143D12; diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index 627f3ee5c..277ac7a12 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -71,6 +71,10 @@ background-color: #000; } +a.btn, aside a { + font-weight: 400 !important; +} + .btn-default { background-color: #000; border-color: #fff; -- cgit v1.2.3 From 8847e39fb737f36a9d478a12d6f72e87c5b15114 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 21 Jan 2016 14:03:46 -0800 Subject: regression: public forums granting send stream permissions to all connections --- include/permissions.php | 4 ++-- version.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/permissions.php b/include/permissions.php index a8e761f87..8071af686 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -641,10 +641,10 @@ function get_role_perms($role) { $ret['directory_publish'] = true; $ret['online'] = false; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK - |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK - |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; diff --git a/version.inc b/version.inc index f5b62614f..2e8e8f4ff 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-20.1284H +2016-01-21.1285H -- cgit v1.2.3 From 2be515e7bbec6ffb960fc037be970582291039a8 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 21 Jan 2016 14:32:41 -0800 Subject: set the actual value of the password input field to a single space on remove channel and remove account because firefox does not honour 'autocomplete="off"' and insists on filling in the password, which completely defeats the purpose of password protecting this function. We want to ensure it can only be executed by somebody who knows the password and not somebody who happens upon an unattended browser session. This space is annoying and must be removed to enter the password correctly but this appears to be the only way to provide the necessary safety for that page. Setting autocomplete to a random string as suggested by the firefox doco doesn't appear to do anything useful, as autocomplete is still performed. --- view/tpl/removeaccount.tpl | 2 +- view/tpl/removeme.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl index aefcd51a8..ce6c8ac22 100644 --- a/view/tpl/removeaccount.tpl +++ b/view/tpl/removeaccount.tpl @@ -10,7 +10,7 @@
- +
{{include file="field_checkbox.tpl" field=$global}} diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl index 5b329dd6d..40b9546d2 100755 --- a/view/tpl/removeme.tpl +++ b/view/tpl/removeme.tpl @@ -10,7 +10,7 @@
- +
{{include file="field_checkbox.tpl" field=$global}} -- cgit v1.2.3 From 7d7ef5ac4eebb1f59a8a70ef018fa8af579467e2 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 21 Jan 2016 18:42:44 -0800 Subject: add a fixme --- include/text.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/text.php b/include/text.php index a03648081..0b5ad9c72 100644 --- a/include/text.php +++ b/include/text.php @@ -2716,5 +2716,7 @@ function item_url_replace($channel,&$item,$old,$new) { $item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey'])); $item['item_verified'] = 1; } + + // @fixme item['plink'] and item['llink'] } -- cgit v1.2.3 From e52f64e3d2c646f6c6ed1f4710db707d23b279bf Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 21 Jan 2016 19:26:04 -0800 Subject: fix visitor photo uploads --- mod/photos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/photos.php b/mod/photos.php index b0d9bc631..f1b7aceed 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -463,7 +463,7 @@ function photos_post(&$a) { $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']); } - $r = attach_store($a->channel,get_observer_hash(), '', $_REQUEST); + $r = attach_store($channel,get_observer_hash(), '', $_REQUEST); if(! $r['success']) { notice($r['message'] . EOL); -- cgit v1.2.3