clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #745 from tobiasd/20181011-diaspora_getHostName 

Adoption of get_hostname changes for diaspora bridge
This commit is contained in:
Michael Vogel 2018-10-11 13:39:52 +02:00 committed by GitHub
parent 30c1542893 3f6239bb2b
commit cb4241af69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diaspora/diaspora.php
View File

@ -57,7 +57,7 @@ function diaspora_jot_nets(App $a, &$b)
} }
function diaspora_queue_hook(App $a, &$b) { function diaspora_queue_hook(App $a, &$b) {
$hostname = $a->get_hostname(); $hostname = $a->getHostName();
$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'", $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
DBA::escape(Protocol::DIASPORA2) DBA::escape(Protocol::DIASPORA2)
@ -287,7 +287,7 @@ function diaspora_post_local(App $a, array &$b)
function diaspora_send(App $a, array &$b) function diaspora_send(App $a, array &$b)
{ {
$hostname = $a->get_hostname(); $hostname = $a->getHostName();
logger('diaspora_send: invoked'); logger('diaspora_send: invoked');

2
libertree/libertree.php
View File

@ -181,7 +181,7 @@ function libertree_send(&$a,&$b) {
$ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token'); $ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token');
$ltree_url = PConfig::get($b['uid'],'libertree','libertree_url'); $ltree_url = PConfig::get($b['uid'],'libertree','libertree_url');
$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token"; $ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
$ltree_source = $a->get_hostname(); $ltree_source = $a->getHostName();
if ($b['app'] != "") if ($b['app'] != "")
$ltree_source .= " (".$b['app'].")"; $ltree_source .= " (".$b['app'].")";

2
mailstream/mailstream.php
View File

@ -91,7 +91,7 @@ function mailstream_addon_admin_post ($a) {
function mailstream_generate_id($a, $uri) { function mailstream_generate_id($a, $uri) {
// http://www.jwz.org/doc/mid.html // http://www.jwz.org/doc/mid.html
$host = $a->get_hostname(); $host = $a->getHostName();
$resource = hash('md5', $uri); $resource = hash('md5', $uri);
$message_id = "<" . $resource . "@" . $host . ">"; $message_id = "<" . $resource . "@" . $host . ">";
logger('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri, LOGGER_DEBUG); logger('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri, LOGGER_DEBUG);

2
notifyall/notifyall.php
View File

@ -53,7 +53,7 @@ function notifyall_post(App $a)
} }
if (! x(Config::get('config', 'sender_email'))) { if (! x(Config::get('config', 'sender_email'))) {
$sender_email = 'noreply@' . $a->get_hostname(); $sender_email = 'noreply@' . $a->getHostName();
} else { } else {
$sender_email = Config::get('config', 'sender_email'); $sender_email = Config::get('config', 'sender_email');
} }

4
pumpio/pumpio.php
View File

@ -102,7 +102,7 @@ function pumpio_registerclient(App $a, $host)
$application_name = Config::get('pumpio', 'application_name'); $application_name = Config::get('pumpio', 'application_name');
if ($application_name == "") { if ($application_name == "") {
$application_name = $a->get_hostname(); $application_name = $a->getHostName();
} }
$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))); $adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
@ -749,7 +749,7 @@ function pumpio_fetchtimeline(App $a, $uid)
$application_name = Config::get('pumpio', 'application_name'); $application_name = Config::get('pumpio', 'application_name');
} }
if ($application_name == "") { if ($application_name == "") {
$application_name = $a->get_hostname(); $application_name = $a->getHostName();
} }
$first_time = ($lastdate == ""); $first_time = ($lastdate == "");

2
securemail/securemail.php
View File

@ -97,7 +97,7 @@ function securemail_settings_post(App &$a, array &$b){
if ($_POST['securemail-submit'] == L10n::t('Save and send test')) { if ($_POST['securemail-submit'] == L10n::t('Save and send test')) {
$sitename = Config::get('config', 'sitename'); $sitename = Config::get('config', 'sitename');
$hostname = $a->get_hostname(); $hostname = $a->getHostName();
if (strpos($hostname, ':')) { if (strpos($hostname, ':')) {
$hostname = substr($hostname, 0, strpos($hostname, ':')); $hostname = substr($hostname, 0, strpos($hostname, ':'));
} }

2
statusnet/statusnet.php
View File

@ -791,7 +791,7 @@ function statusnet_fetchtimeline(App $a, $uid)
$application_name = Config::get('statusnet', 'application_name'); $application_name = Config::get('statusnet', 'application_name');
} }
if ($application_name == "") { if ($application_name == "") {
$application_name = $a->get_hostname(); $application_name = $a->getHostName();
} }
$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);

4
twitter/twitter.php
View File

@ -866,7 +866,7 @@ function twitter_fetchtimeline(App $a, $uid)
$application_name = Config::get('twitter', 'application_name'); $application_name = Config::get('twitter', 'application_name');
if ($application_name == "") { if ($application_name == "") {
$application_name = $a->get_hostname(); $application_name = $a->getHostName();
} }
$has_picture = false; $has_picture = false;
@ -1597,7 +1597,7 @@ function twitter_fetchhometimeline(App $a, $uid)
$application_name = Config::get('twitter', 'application_name'); $application_name = Config::get('twitter', 'application_name');
if ($application_name == "") { if ($application_name == "") {
$application_name = $a->get_hostname(); $application_name = $a->getHostName();
} }
require_once 'include/items.php'; require_once 'include/items.php';

2
xmpp/xmpp.php
View File

@ -164,7 +164,7 @@ function xmpp_converse(App $a)
PConfig::set(local_user(), "xmpp", "password", $password); PConfig::set(local_user(), "xmpp", "password", $password);
} }
$jid = $a->user["nickname"] . "@" . $a->get_hostname() . "/converse-" . random_string(5); $jid = $a->user["nickname"] . "@" . $a->getHostName() . "/converse-" . random_string(5);
$auto_login = "auto_login: true, $auto_login = "auto_login: true,
authentication: 'login', authentication: 'login',