diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/connections.php | 3 | ||||
| -rw-r--r-- | mod/directory.php | 2 | ||||
| -rw-r--r-- | mod/dirsearch.php | 2 | ||||
| -rw-r--r-- | mod/display.php | 25 | ||||
| -rw-r--r-- | mod/item.php | 3 | ||||
| -rwxr-xr-x | mod/setup.php | 4 | ||||
| -rw-r--r-- | mod/view.php | 2 |
7 files changed, 34 insertions, 7 deletions
diff --git a/mod/connections.php b/mod/connections.php index 95fc18174..bcb78f138 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -422,6 +422,7 @@ function connections_content(&$a) { '$tab_str' => $tab_str, '$is_pending' => (($contact['abook_flags'] & ABOOK_FLAG_PENDING) ? 1 : ''), '$unapproved' => $unapproved, + '$inherited' => t('inherited'), '$approve' => t('Approve this connection'), '$noperms' => (((! $self) && (! $contact['abook_my_perms'])) ? t('Connection has no individual permissions!') : ''), '$noperm_desc' => (((! $self) && (! $contact['abook_my_perms'])) ? t('This may be appropriate based on your <a href="settings">privacy settings</a>, though you may wish to review the "Advanced Permissions".') : ''), @@ -440,7 +441,7 @@ function connections_content(&$a) { '$cautious' => t('Cautious Sharing'), '$follow' => t('Follow Only'), '$permlbl' => t('Individual Permissions'), - '$permnote' => t('Individual permissions are only enabled for <a href="settings">privacy settings</a> which are set to "Only those you specifically allow". Otherwise they are controlled by your privacy settings.'), + '$permnote' => t('Some permissions may be inherited from your <a href="settings">privacy settings</a>, which have higher priority. Changing those on this page will have no effect.'), '$advanced' => t('Advanced Permissions'), '$quick' => t('Quick Links'), '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'], diff --git a/mod/directory.php b/mod/directory.php index 195ca993e..13855cff7 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -14,6 +14,8 @@ function directory_aside(&$a) { require_once('include/contact_widgets.php'); $a->set_widget('find_people',findpeople_widget()); } + $a->set_widget('dir_sort_order',dir_sort_links()); + } diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 14307f274..3506178ea 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -132,7 +132,7 @@ function dirsearch_content(&$a) { if($sort_order == 'date') - $order = ""; // Not currently implemented + $order = " order by xchan_name_date desc "; elseif($sort_order == 'reverse') $order = " order by xchan_name desc "; else diff --git a/mod/display.php b/mod/display.php index c9f6595c6..d91d14d01 100644 --- a/mod/display.php +++ b/mod/display.php @@ -35,6 +35,29 @@ function display_content(&$a, $update = 0, $load = false) { $observer_is_owner = false; + + if(local_user() && (! $update)) { + + $channel = $a->get_channel(); + + $x = array( + 'is_owner' => true, + 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), + 'default_location' => $channel['channel_location'], + 'nickname' => $channel['channel_address'], + 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + + 'acl' => populate_acl($channel, false), + 'bang' => '', + 'visitor' => 'block', + 'profile_uid' => local_user(), + 'return_path' => 'channel/' . $channel['channel_address'] + ); + + $o .= status_editor($a,$x); + + } + // This page can be viewed by anybody so the query could be complicated // First we'll see if there is a copy of the item which is owned by us - if we're logged in locally. // If that fails (or we aren't logged in locally), @@ -166,6 +189,8 @@ function display_content(&$a, $update = 0, $load = false) { ); } + $o .= '<div id="content-complete"></div>'; + return $o; diff --git a/mod/item.php b/mod/item.php index 3d4845a47..08076bdf6 100644 --- a/mod/item.php +++ b/mod/item.php @@ -161,7 +161,6 @@ function item_post(&$a) { $observer = $a->get_observer(); - if($parent) { logger('mod_item: item_post parent=' . $parent); $can_comment = false; @@ -529,7 +528,7 @@ function item_post(&$a) { 'type' => TERM_CATEGORY, 'otype' => TERM_OBJ_POST, 'term' => trim($cat), - 'url' => '' + 'url' => $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat)) ); } } diff --git a/mod/setup.php b/mod/setup.php index 97bdba34e..b825b5e0d 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -453,8 +453,8 @@ function check_funcs(&$checks) { $ck_funcs[4]['help']= t('Error: mb_string PHP module required but not installed.'); } if(! function_exists('mcrypt_encrypt')){ - $ck_funcs[4]['status']= false; - $ck_funcs[4]['help']= t('Error: mcrypt PHP module required but not installed.'); + $ck_funcs[5]['status']= false; + $ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.'); } $checks = array_merge($checks, $ck_funcs); diff --git a/mod/view.php b/mod/view.php index 9e5eff962..d4381743c 100644 --- a/mod/view.php +++ b/mod/view.php @@ -1,6 +1,6 @@ <?php /** - * load view/theme/$current_theme/style.php with friendica contex + * load view/theme/$current_theme/style.php with Red context */ function view_init($a){ |