aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-07 20:28:04 -0800
committerfriendica <info@friendica.com>2014-03-07 20:28:04 -0800
commitab0eab49e866e29b1c1b5ef58897c6a446d24864 (patch)
treea47417a06a935bc0cb91ada8150f86b219447a40
parent3b0b59dfad2c69539e018e43b9ee946a9d9993bc (diff)
downloadvolse-hubzilla-ab0eab49e866e29b1c1b5ef58897c6a446d24864.tar.gz
volse-hubzilla-ab0eab49e866e29b1c1b5ef58897c6a446d24864.tar.bz2
volse-hubzilla-ab0eab49e866e29b1c1b5ef58897c6a446d24864.zip
start new connections out with even more sane defaults than before by pre-filling the connedit form page. This still lets them change things before any damage has been done or before any privacy has leaked, but should reduce the number of new connections that can't comment.
-rw-r--r--mod/connedit.php6
-rw-r--r--mod/follow.php2
-rw-r--r--view/js/mod_connedit.js3
3 files changed, 10 insertions, 1 deletions
diff --git a/mod/connedit.php b/mod/connedit.php
index c6f64ccfc..b9b7fcce3 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -177,7 +177,13 @@ function connedit_content(&$a) {
$sort_type = 0;
$o = '';
+ // this triggers some javascript to set Full Sharing by default after
+ // completing a "follow" - which can be changed to something else before
+ // form submission, but this gives us something useable
+ if($_GET['follow'] == 1) {
+ $o .= '<script>var after_following = 1;</script>';
+ }
if(! local_user()) {
notice( t('Permission denied.') . EOL);
return login();
diff --git a/mod/follow.php b/mod/follow.php
index 962bb71a7..4fcb5bda3 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -30,7 +30,7 @@ function follow_init(&$a) {
proc_run('php','include/onepoll.php',$result['abook']['abook_id']);
- goaway(z_root() . '/connedit/' . $result['abook']['abook_id']);
+ goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1);
}
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index a641029f3..80a56f854 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -1,5 +1,8 @@
$(document).ready(function() {
+ if(typeof(after_following) !== 'undefined' && after_following)
+ connectFullShare();
+
$('#id_pending').click(function() {
connectFullShare();
});