aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-12-31 15:47:51 -0800
committerfriendica <info@friendica.com>2012-12-31 15:47:51 -0800
commita8812346c4a2962182b66345bf93144bc13c16ad (patch)
treedd55186b4de5c6d168626fc3a3cd8908e2998093
parent791302f317de466a079b71e548892c4ffc172005 (diff)
downloadvolse-hubzilla-a8812346c4a2962182b66345bf93144bc13c16ad.tar.gz
volse-hubzilla-a8812346c4a2962182b66345bf93144bc13c16ad.tar.bz2
volse-hubzilla-a8812346c4a2962182b66345bf93144bc13c16ad.zip
couple of fixes to follow, prepare for default connection permissions
-rw-r--r--include/follow.php10
-rw-r--r--mod/follow.php11
-rw-r--r--mod/settings.php46
-rw-r--r--version.inc2
4 files changed, 49 insertions, 20 deletions
diff --git a/include/follow.php b/include/follow.php
index 6eac2d465..1403dcb23 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -118,7 +118,7 @@ function new_contact($uid,$url,$channel,$interactive = false) {
return $result;
}
- $r = q("select abook_xchan from abook_id where abook_xchan = '%s' and abook_channel = %d limit 1",
+ $r = q("select abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
dbesc($xchan_hash),
intval($uid)
);
@@ -143,6 +143,14 @@ function new_contact($uid,$url,$channel,$interactive = false) {
if(! $r)
logger('mod_follow: abook creation failed');
+ $r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash
+ where abook_xchan = '%s' and abook_channel = %d limit 1",
+ dbesc($xchan_hash),
+ intval($uid)
+ );
+ if($r)
+ $result['abook'] = $r[0];
+
// Then send a ping/message to the other side
diff --git a/mod/follow.php b/mod/follow.php
index 05d1eee73..fd2f8af19 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,21 +1,19 @@
<?php
-require_once('Scrape.php');
+
require_once('include/follow.php');
function follow_init(&$a) {
if(! local_user()) {
notice( t('Permission denied.') . EOL);
- goaway($_SESSION['return_url']);
- // NOTREACHED
+ return;
}
$uid = local_user();
$url = notags(trim($_REQUEST['url']));
$return_url = $_SESSION['return_url'];
-
$result = new_contact($uid,$url,$a->get_channel(),true);
if($result['success'] == false) {
@@ -26,9 +24,6 @@ function follow_init(&$a) {
info( t('Channel added') . EOL);
- if(strstr($return_url,'channel'))
- goaway($a->get_baseurl() . '/channel/' . $result['channel_id']);
+ goaway(z_root() . '/connection/' . $result['abook']['abook_id']);
- goaway($return_url);
- // NOTREACHED
}
diff --git a/mod/settings.php b/mod/settings.php
index 2409c2eca..fa4b4ee7c 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -340,9 +340,39 @@ function settings_post(&$a) {
$arr['channel_w_photos'] = (($_POST['post_photos']) ? $_POST['post_photos'] : 0);
$arr['channel_w_chat'] = (($_POST['chat']) ? $_POST['chat'] : 0);
$arr['channel_a_delegate'] = (($_POST['delegate']) ? $_POST['delegate'] : 0);
- $arr['channel_r_storage'] = (($_POST['view_storage']) ? $_POST['view_storage'] : 0);
- $arr['channel_w_storage'] = (($_POST['write_storage']) ? $_POST['write_storage'] : 0);
-
+ $arr['channel_r_storage'] = (($_POST['view_storage']) ? $_POST['view_storage'] : 0);
+ $arr['channel_w_storage'] = (($_POST['write_storage']) ? $_POST['write_storage'] : 0);
+
+
+ $defperms = 0;
+ if(x($_POST['def_view_stream']))
+ $defperms += $_POST['def_view_stream'];
+ if(x($_POST['def_view_profile']))
+ $defperms += $_POST['def_view_profile'];
+ if(x($_POST['def_view_photos']))
+ $defperms += $_POST['def_view_photos'];
+ if(x($_POST['def_view_contacts']))
+ $defperms += $_POST['def_view_contacts'];
+ if(x($_POST['def_send_stream']))
+ $defperms += $_POST['def_send_stream'];
+ if(x($_POST['def_post_wall']))
+ $defperms += $_POST['def_post_wall'];
+ if(x($_POST['def_tag_deliver']))
+ $defperms += $_POST['def_tag_deliver'];
+ if(x($_POST['def_post_comments']))
+ $defperms += $_POST['def_post_comments'];
+ if(x($_POST['def_post_mail']))
+ $defperms += $_POST['def_post_mail'];
+ if(x($_POST['def_post_photos']))
+ $defperms += $_POST['def_post_photos'];
+ if(x($_POST['def_chat']))
+ $defperms += $_POST['def_chat'];
+ if(x($_POST['def_delegate']))
+ $defperms += $_POST['def_delegate'];
+ if(x($_POST['def_view_storage']))
+ $defperms += $_POST['def_view_storage'];
+ if(x($_POST['def_write_storage']))
+ $defperms += $_POST['def_write_storage'];
$notify = 0;
@@ -398,7 +428,7 @@ function settings_post(&$a) {
set_pconfig(local_user(),'system','post_joingroup', $post_joingroup);
set_pconfig(local_user(),'system','post_profilechange', $post_profilechange);
-
+/*
if($page_flags == PAGE_PRVGROUP) {
$hidewall = 1;
if((! $str_contact_allow) && (! $str_group_allow) && (! $str_contact_deny) && (! $str_group_deny)) {
@@ -412,6 +442,8 @@ function settings_post(&$a) {
}
}
+*/
+
/*
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `def_gid` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d LIMIT 1",
dbesc($username),
@@ -455,12 +487,6 @@ function settings_post(&$a) {
intval(local_user())
);
-
-
-
-
-
-
if($r)
info( t('Settings updated.') . EOL);
diff --git a/version.inc b/version.inc
index bcf27472c..a0cec95ed 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-12-30.185
+2012-12-31.186