Browse Source

Merge pull request #745 from tobiasd/20181011-diaspora_getHostName

Adoption of get_hostname changes for diaspora bridge
pull/748/head
Michael Vogel 4 years ago committed by GitHub
parent
commit
cb4241af69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      diaspora/diaspora.php
  2. 2
      libertree/libertree.php
  3. 2
      mailstream/mailstream.php
  4. 2
      notifyall/notifyall.php
  5. 4
      pumpio/pumpio.php
  6. 2
      securemail/securemail.php
  7. 2
      statusnet/statusnet.php
  8. 4
      twitter/twitter.php
  9. 2
      xmpp/xmpp.php

4
diaspora/diaspora.php

@ -57,7 +57,7 @@ function diaspora_jot_nets(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'",
DBA::escape(Protocol::DIASPORA2)
@ -287,7 +287,7 @@ function diaspora_post_local(App $a, array &$b)
function diaspora_send(App $a, array &$b)
{
$hostname = $a->get_hostname();
$hostname = $a->getHostName();
logger('diaspora_send: invoked');

2
libertree/libertree.php

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

2
mailstream/mailstream.php

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

2
notifyall/notifyall.php

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

4
pumpio/pumpio.php

@ -102,7 +102,7 @@ function pumpio_registerclient(App $a, $host)
$application_name = Config::get('pumpio', 'application_name');
if ($application_name == "") {
$application_name = $a->get_hostname();
$application_name = $a->getHostName();
}
$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');
}
if ($application_name == "") {
$application_name = $a->get_hostname();
$application_name = $a->getHostName();
}
$first_time = ($lastdate == "");

2
securemail/securemail.php

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

2
statusnet/statusnet.php

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

4
twitter/twitter.php

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

2
xmpp/xmpp.php

@ -164,7 +164,7 @@ function xmpp_converse(App $a)
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,
authentication: 'login',

Loading…
Cancel
Save