keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't show the connect link in the profile on the "follow" page

Browse source
This commit is contained in:
Michael 2017-12-29 22:53:08 +00:00
parent 6bd19e7dab
commit 69d16d9cfa
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/identity.php
View file

@ -41,8 +41,9 @@ require_once 'mod/proxy.php';
* @param string $nickname string * @param string $nickname string
* @param int $profile int * @param int $profile int
* @param array $profiledata array * @param array $profiledata array
* @param boolean $show_connect Show connect link
*/ */
function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) function profile_load(App $a, $nickname, $profile = 0, $profiledata = array(), $show_connect = true)
{ {
$user = q( $user = q(
"SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1", "SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
@ -115,7 +116,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array())
); );
} }
$block = (((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) ? true : false); $block = ((Config::get('system', 'block_public') && !local_user() && !remote_user()) ? true : false);
/** /**
* @todo * @todo
@ -123,9 +124,9 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array())
* But: When this profile was on the same server, then we could display the contacts * But: When this profile was on the same server, then we could display the contacts
*/ */
if ($profiledata) { if ($profiledata) {
$a->page['aside'] .= profile_sidebar($profiledata, true); $a->page['aside'] .= profile_sidebar($profiledata, true, $show_connect);
} else { } else {
$a->page['aside'] .= profile_sidebar($a->profile, $block); $a->page['aside'] .= profile_sidebar($a->profile, $block, $show_connect);
} }
/*if (! $block) /*if (! $block)
@ -206,6 +207,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0)
* *
* @param array $profile * @param array $profile
* @param int $block * @param int $block
* @param boolean $show_connect Show connect link
* *
* @return HTML string stuitable for sidebar inclusion * @return HTML string stuitable for sidebar inclusion
* *
@ -216,7 +218,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0)
* @hooks 'profile_sidebar' * @hooks 'profile_sidebar'
* array $arr * array $arr
*/ */
function profile_sidebar($profile, $block = 0) function profile_sidebar($profile, $block = 0, $show_connect = true)
{ {
$a = get_app(); $a = get_app();
@ -256,6 +258,10 @@ function profile_sidebar($profile, $block = 0)
} }
} }
if (!$show_connect) {
$connect = false;
}
// Is the local user already connected to that user? // Is the local user already connected to that user?
if ($connect && local_user()) { if ($connect && local_user()) {
if (isset($profile["url"])) { if (isset($profile["url"])) {

21
mod/follow.php
View file

@ -11,8 +11,8 @@ require_once 'include/contact_selectors.php';
function follow_post(App $a) { function follow_post(App $a) {
if (! local_user()) { if (!local_user()) {
notice( t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
// NOTREACHED // NOTREACHED
} }
@ -40,7 +40,7 @@ function follow_post(App $a) {
goaway(System::baseUrl().'/contacts/'.$result['cid']); goaway(System::baseUrl().'/contacts/'.$result['cid']);
} }
info( t('Contact added').EOL); info(t('Contact added').EOL);
if (strstr($return_url,'contacts')) { if (strstr($return_url,'contacts')) {
goaway(System::baseUrl().'/contacts/'.$contact_id); goaway(System::baseUrl().'/contacts/'.$contact_id);
@ -52,8 +52,8 @@ function follow_post(App $a) {
function follow_content(App $a) { function follow_content(App $a) {
if (! local_user()) { if (!local_user()) {
notice( t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
// NOTREACHED // NOTREACHED
} }
@ -81,21 +81,21 @@ function follow_content(App $a) {
$ret = Probe::uri($url); $ret = Probe::uri($url);
if (($ret["network"] == NETWORK_DIASPORA) && !Config::get('system','diaspora_enabled')) { if (($ret["network"] == NETWORK_DIASPORA) && !Config::get('system','diaspora_enabled')) {
notice( t("Diaspora support isn't enabled. Contact can't be added.") . EOL); notice(t("Diaspora support isn't enabled. Contact can't be added.") . EOL);
$submit = ""; $submit = "";
//goaway($_SESSION['return_url']); //goaway($_SESSION['return_url']);
// NOTREACHED // NOTREACHED
} }
if (($ret["network"] == NETWORK_OSTATUS) && Config::get('system','ostatus_disabled')) { if (($ret["network"] == NETWORK_OSTATUS) && Config::get('system','ostatus_disabled')) {
notice( t("OStatus support is disabled. Contact can't be added.") . EOL); notice(t("OStatus support is disabled. Contact can't be added.") . EOL);
$submit = ""; $submit = "";
//goaway($_SESSION['return_url']); //goaway($_SESSION['return_url']);
// NOTREACHED // NOTREACHED
} }
if ($ret["network"] == NETWORK_PHANTOM) { if ($ret["network"] == NETWORK_PHANTOM) {
notice( t("The network type couldn't be detected. Contact can't be added.") . EOL); notice(t("The network type couldn't be detected. Contact can't be added.") . EOL);
$submit = ""; $submit = "";
//goaway($_SESSION['return_url']); //goaway($_SESSION['return_url']);
// NOTREACHED // NOTREACHED
@ -116,7 +116,7 @@ function follow_content(App $a) {
$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid)); $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
if (!$r) { if (!$r) {
notice( t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
// NOTREACHED // NOTREACHED
} }
@ -176,7 +176,8 @@ function follow_content(App $a) {
)); ));
$a->page['aside'] = ""; $a->page['aside'] = "";
profile_load($a, "", 0, Contact::getDetailsByURL($ret["url"]));
profile_load($a, "", 0, Contact::getDetailsByURL($ret["url"]), false);
if ($gcontact_id <> 0) { if ($gcontact_id <> 0) {
$o .= replace_macros(get_markup_template('section_title.tpl'), $o .= replace_macros(get_markup_template('section_title.tpl'),