aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-25 13:30:40 -0800
committerfriendica <info@friendica.com>2015-01-25 13:30:40 -0800
commit4ca2ec7638664dd0514beddd982c9d7b541522eb (patch)
tree9d6ef6ce0454958a059c04119047d030cdbfcaf6
parent642c933d9893f927b866038a73125247cf79cd73 (diff)
downloadvolse-hubzilla-4ca2ec7638664dd0514beddd982c9d7b541522eb.tar.gz
volse-hubzilla-4ca2ec7638664dd0514beddd982c9d7b541522eb.tar.bz2
volse-hubzilla-4ca2ec7638664dd0514beddd982c9d7b541522eb.zip
rework the new connection stuff so we don't need a "permissions have been changed but not saved" message.
-rw-r--r--include/follow.php23
-rw-r--r--mod/connedit.php13
-rw-r--r--view/js/mod_connedit.js8
3 files changed, 16 insertions, 28 deletions
diff --git a/include/follow.php b/include/follow.php
index 1abd0e3b9..06c0c5c62 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -66,14 +66,15 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
$my_perms = get_channel_default_perms($uid);
- if($is_red && $j) {
+ $role = get_pconfig($uid,'system','permissions_role');
+ if($role) {
+ $x = get_role_perms($role);
+ if($x['perms_follow'])
+ $my_perms = $x['perms_follow'];
+ }
- $role = get_pconfig($uid,'system','permissions_role');
- if($role) {
- $x = get_role_perms($role);
- if($x['perms_follow'])
- $my_perms = $x['perms_follow'];
- }
+
+ if($is_red && $j) {
logger('follow: ' . $url . ' ' . print_r($j,true), LOGGER_DEBUG);
@@ -105,7 +106,6 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
$xchan_hash = $x['hash'];
-
$their_perms = 0;
$global_perms = get_perms();
@@ -163,12 +163,6 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
if($r) {
$xchan_hash = $r[0]['xchan_hash'];
$their_perms = 0;
- $role = get_pconfig($uid,'system','permissions_role');
- if($role) {
- $x = get_role_perms($role);
- if($x['perms_follow'])
- $my_perms = $x['perms_follow'];
- }
}
}
@@ -198,6 +192,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
}
if($is_http) {
+
if(! intval(get_config('system','feed_contacts'))) {
$result['message'] = t('Protocol disabled.');
return $result;
diff --git a/mod/connedit.php b/mod/connedit.php
index c27f4588a..089587fc7 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -131,6 +131,7 @@ function connedit_post(&$a) {
if(($_REQUEST['pending']) && ($abook_flags & ABOOK_FLAG_PENDING)) {
$abook_flags = ( $abook_flags ^ ABOOK_FLAG_PENDING );
$new_friend = true;
+
}
$r = q("UPDATE abook SET abook_profile = '%s', abook_my_perms = %d , abook_closeness = %d, abook_rating = %d, abook_rating_text = '%s', abook_flags = %d
@@ -273,27 +274,19 @@ 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();
}
- $my_perms = 0;
+ $my_perms = get_channel_default_perms(local_user());
$role = get_pconfig(local_user(),'system','permissions_role');
if($role) {
$x = get_role_perms($role);
if($x['perms_accept'])
$my_perms = $x['perms_accept'];
- else
- $my_perms = get_channel_default_perms(local_user());
}
+
if($my_perms) {
$o .= "<script>function connectDefaultShare() {
\$('.abook-edit-me').each(function() {
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 765cbcc30..ee34f0508 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -1,13 +1,13 @@
function abook_perms_msg() {
- $('.abook-permsmsg').show();
+// $('.abook-permsmsg').show();
// $('.abook-permschange').html(aStr['permschange']);
- $('.abook-permssave').show();
+// $('.abook-permssave').show();
}
function abook_perms_new() {
- $('.abook-permsnew').show();
- $('.abook-permssave').show();
+// $('.abook-permsnew').show();
+// $('.abook-permssave').show();
}