diff options
| -rw-r--r-- | mod/connedit.php | 1 | ||||
| -rwxr-xr-x | mod/subthread.php | 10 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/js/mod_connedit.js | 9 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 11 |
5 files changed, 22 insertions, 11 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index 198a66b56..61bb62766 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -482,6 +482,7 @@ function connedit_content(&$a) { '$them' => t('Their Settings'), '$me' => t('My Settings'), '$perms' => $perms, + '$clear' => t('Clear/Disable Automatic Permissions'), '$forum' => t('Forum Members'), '$soapbox' => t('Soapbox'), '$full' => t('Full Sharing (typical social network permissions)'), diff --git a/mod/subthread.php b/mod/subthread.php index 11b7236fb..a9d18621c 100755 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -37,15 +37,15 @@ function subthread_content(&$a) { $remote_owner = null; - if(! $item['wall']) { + if(! ($item['item_flags'] & ITEM_WALL)) { // The top level post may have been written by somebody on another system - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($item['contact-id']), + $r = q("SELECT * FROM abook WHERE abook_xchan = '%s' AND uid = %d LIMIT 1", + intval($item['author_xchan']), intval($item['uid']) ); - if(! count($r)) + if(! $r) return; - if(! $r[0]['self']) + if(! ($r[0]['abook_flags'] & ABOOK_FLAG_SELF)) $remote_owner = $r[0]; } diff --git a/version.inc b/version.inc index b701accdf..8b6f8c940 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-04-20.651 +2014-04-21.652 diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index 64240abb8..e66c26cda 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -80,6 +80,15 @@ function connectForum() { } +function connectClear() { + $('.abook-edit-me').each(function() { + if(! $(this).is(':disabled')) + $(this).removeAttr('checked'); + }); + $('.abook-permschange').show(); + $('.abook-permschange').html(aStr['permschange']); +} + function connectSoapBox() { $('.abook-edit-me').each(function() { if(! $(this).is(':disabled')) diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index b7a02c15e..b8b01df4c 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -67,12 +67,13 @@ <h3>{{$quick}}</h3> <ul> {{if $self}} -<li><span class="fakelink" onclick="connectForum(); // $('#abook-edit-form').submit();">{{$forum}}</span></li> -<li><span class="fakelink" onclick="connectSoapBox(); // $('#abook-edit-form').submit();">{{$soapbox}}</span></li> +<li><span class="fakelink" onclick="connectClear();">{{$clear}}</span></li> +<li><span class="fakelink" onclick="connectForum();">{{$forum}}</span></li> +<li><span class="fakelink" onclick="connectSoapBox();">{{$soapbox}}</span></li> {{/if}} -<li><span class="fakelink" onclick="connectFullShare(); // $('#abook-edit-form').submit();">{{$full}}</span></li> -<li><span class="fakelink" onclick="connectCautiousShare(); // $('#abook-edit-form').submit();">{{$cautious}}</span></li> -<li><span class="fakelink" onclick="connectFollowOnly(); // $('#abook-edit-form').submit();">{{$follow}}</span></li> +<li><span class="fakelink" onclick="connectFullShare();">{{$full}}</span></li> +<li><span class="fakelink" onclick="connectCautiousShare();">{{$cautious}}</span></li> +<li><span class="fakelink" onclick="connectFollowOnly();">{{$follow}}</span></li> </ul> <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> |