X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fcontacts.php;h=aee6548fe6a225e9fccb67b28911e9d4aabdf687;hb=ee11a74d0b7cff5061a4d498f8ecd15e55b91b07;hp=61d9ce3986f49056147d353e9c088ab050444a4c;hpb=a3fd84661f74b0759f9edad1f068b32820b03c5d;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index 61d9ce3986..aee6548fe6 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -9,15 +9,20 @@ function contacts_init(&$a) { $a->page['aside'] .= group_side(); if($a->config['register_policy'] != REGISTER_CLOSED) - $a->page['aside'] .= '
'; + $a->page['aside'] .= ''; + + if(strlen(get_config('system','directory_submit_url'))) + $a->page['aside'] .= ''; $tpl = load_view_file('view/follow.tpl'); $a->page['aside'] .= replace_macros($tpl,array( - '$label' => t('Connect/Follow [profile address]'), + '$label' => t('Connect/Follow'), '$hint' => t('Example: bob@example.com, http://example.com/barbara'), '$follow' => t('Follow') )); + + } function contacts_post(&$a) { @@ -124,9 +129,7 @@ function contacts_content(&$a) { if($cmd === 'update') { // pull feed and consume it, which should subscribe to the hub. - - $php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - proc_run($php_path,"include/poller.php","$contact_id"); + proc_run('php',"include/poller.php","$contact_id"); goaway($a->get_baseurl() . '/contacts/' . $contact_id); // NOTREACHED } @@ -139,7 +142,8 @@ function contacts_content(&$a) { intval(local_user()) ); if($r) { - notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL ); + //notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL ); + notice( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL ); } goaway($a->get_baseurl() . '/contacts/' . $contact_id); return; // NOTREACHED @@ -153,7 +157,7 @@ function contacts_content(&$a) { intval(local_user()) ); if($r) { - notice( t('Contact has been ') . (($readonly) ? t('ignored') : t('unignored')) . EOL ); + notice( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL ); } goaway($a->get_baseurl() . '/contacts/' . $contact_id); return; // NOTREACHED @@ -245,6 +249,16 @@ function contacts_content(&$a) { $sparkle = ''; } + $insecure = '' + . t('Private communications are not available for this contact.') . '