diff options
| author | friendica <info@friendica.com> | 2015-01-26 18:27:03 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-26 18:27:03 -0800 |
| commit | ac594183c6fdc6cf4d5a2a29ade7478a17336397 (patch) | |
| tree | d38f73727da4d8697b00d2102ae10b501d1909ce /mod/connedit.php | |
| parent | e6bfe3f2c10e851ed5ba49886ec8d0a9a9de2296 (diff) | |
| parent | 9f5bfca28dde23893156ad36682e20ca2fc0dd45 (diff) | |
| download | volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.tar.gz volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.tar.bz2 volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.zip | |
Merge branch 'master' into tres and add some work on the item_deleted flag refactor
Conflicts:
include/attach.php
include/onedirsync.php
include/zot.php
mod/locs.php
Diffstat (limited to 'mod/connedit.php')
| -rw-r--r-- | mod/connedit.php | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index f5dba8a02..34951f99d 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 @@ -275,27 +276,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() { @@ -582,6 +575,7 @@ function connedit_content(&$a) { '$autolbl' => t('Apply the permissions indicated on this page to all new connections.'), '$buttons' => (($self) ? '' : $buttons), '$viewprof' => t('View Profile'), + '$clickme' => t('Click to open/close'), '$lbl_slider' => t('Slide to adjust your degree of friendship'), '$lbl_rating' => t('Rating (this information may be public)'), '$lbl_rating_txt' => t('Optionally explain your rating (this information may be public)'), @@ -629,6 +623,7 @@ function connedit_content(&$a) { '$lblrecent' => t('View conversations'), '$lblsuggest' => $lblsuggest, '$delete' => t('Delete contact'), + '$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)), '$poll_enabled' => $poll_enabled, '$lastupdtext' => t('Last update:'), |