aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-05-19 20:38:53 -0700
committerfriendica <info@friendica.com>2013-05-19 20:38:53 -0700
commit52acfce84b4c53ed01e7a37da05d0395bbceeeff (patch)
tree8d811636455d42b73d7e380e5a32b5c638f34bc2
parent1f921a51ae7c2b608e89a238e206ba5539eeb3c4 (diff)
downloadvolse-hubzilla-52acfce84b4c53ed01e7a37da05d0395bbceeeff.tar.gz
volse-hubzilla-52acfce84b4c53ed01e7a37da05d0395bbceeeff.tar.bz2
volse-hubzilla-52acfce84b4c53ed01e7a37da05d0395bbceeeff.zip
some auto-friending cleanups
-rw-r--r--include/follow.php4
-rw-r--r--mod/follow.php2
-rw-r--r--view/theme/redbasic/css/style.css7
-rwxr-xr-xview/tpl/abook_edit.tpl2
4 files changed, 12 insertions, 3 deletions
diff --git a/include/follow.php b/include/follow.php
index eba353c8b..6b192234c 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -164,8 +164,10 @@ function new_contact($uid,$url,$channel,$interactive = false) {
dbesc($xchan_hash),
intval($uid)
);
- if($r)
+ if($r) {
$result['abook'] = $r[0];
+ proc_run('php', 'include/notifier.php', 'permission_update', $result['abook']['abook_id']);
+ }
/** If there is a default group for this channel, add this member to it */
diff --git a/mod/follow.php b/mod/follow.php
index 5a1ea9505..d21c50df6 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -21,7 +21,7 @@ function follow_init(&$a) {
goaway($return_url);
}
- info( t('Channel added') . EOL);
+ info( t('Channel added.') . EOL);
goaway(z_root() . '/connections/' . $result['abook']['abook_id']);
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 93cf70efe..33ccd5cbf 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -349,6 +349,13 @@ footer {
font-weight: bold;
}
+.warning-text {
+ width: auto;
+ font-size: 1.2em;
+ font-weight: bold;
+ color: #ff0000;
+}
+
.preview {
background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif');
}
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 9f6556842..e226da72c 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -39,7 +39,7 @@
<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
{{if $noperms}}
-<div id="noperm-desc" class="descriptive-paragraph">{{$noperms}}</div>
+<div id="noperm-desc" class="warning-text">{{$noperms}}</div>
{{/if}}