bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

more calendar work, undo strict_privacy flag to use different approach

Browse source
This commit is contained in:
Friendika 2011-06-08 21:06:02 -07:00
commit df8ac668b8
10 changed files with 119 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mod/dfrn_request.php
View file

@ -626,11 +626,9 @@ function dfrn_request_content(&$a) {
else
$tpl = get_markup_template('auto_request.tpl');
$prv = get_config('system','strict_privacy');
$o .= replace_macros($tpl,array(
'$header' => t('Friend/Connection Request'),
'$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo') . (($prv) ? ', testuser@identi.ca' : ''),
'$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'),
'$pls_answer' => t('Please answer the following:'),
'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
'$yes' => t('Yes'),
@ -638,9 +636,9 @@ function dfrn_request_content(&$a) {
'$add_note' => t('Add a personal note:'),
'$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"),
'$friendika' => t('Friendika'),
'$statusnet' => (($prv) ? t('StatusNet/Federated Social Web') : ''),
'$statusnet' => t('StatusNet/Federated Social Web'),
'$private_net' => t("Private \x28secure\x29 network"),
'$public_net' => (($prv) ? t("Public \x28insecure\x29 network") : ''),
'$public_net' => t("Public \x28insecure\x29 network"),
'$your_address' => t('Your Identity Address:'),
'$submit' => t('Submit Request'),
'$cancel' => t('Cancel'),

3
mod/follow.php
View file

@ -34,9 +34,6 @@ function follow_post(&$a) {
// NOTREACHED
}
elseif(get_config('system','strict_privacy')) {
unset($ret['notify']);
}
// do we have enough information?

5
mod/salmon.php
View file

@ -192,11 +192,6 @@ function salmon_post(&$a) {
// NOTREACHED
}
// Check if we're allowed to talk to insecure networks
if(get_config('system','strict_privacy'))
salmon_return(400);
require_once('include/items.php');
// Placeholder for hub discovery. We shouldn't find any hubs