"getUserNickname" is now "getLoggedInUserNickname"
This commit is contained in:
parent
9cf43bb85b
commit
08c64387d7
|
@ -57,7 +57,7 @@ function ifttt_settings(App $a, &$s)
|
||||||
$s .= '<div id="ifttt-configuration-wrapper">';
|
$s .= '<div id="ifttt-configuration-wrapper">';
|
||||||
$s .= '<p>' . DI::l10n()->t('Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:') . '</p>';
|
$s .= '<p>' . DI::l10n()->t('Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:') . '</p>';
|
||||||
$s .= '<h4>URL</h4>';
|
$s .= '<h4>URL</h4>';
|
||||||
$s .= '<p>' . DI::baseUrl()->get() . '/ifttt/' . $a->getUserNickname() . '</p>';
|
$s .= '<p>' . DI::baseUrl()->get() . '/ifttt/' . $a->getLoggedInUserNickname() . '</p>';
|
||||||
$s .= '<h4>Method</h4>';
|
$s .= '<h4>Method</h4>';
|
||||||
$s .= '<p>POST</p>';
|
$s .= '<p>POST</p>';
|
||||||
$s .= '<h4>Content Type</h4>';
|
$s .= '<h4>Content Type</h4>';
|
||||||
|
|
|
@ -283,7 +283,7 @@ function jappixmini_settings(App $a, &$s)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($username == "") && DI::config()->get("jappixmini", "default_user")) {
|
if (($username == "") && DI::config()->get("jappixmini", "default_user")) {
|
||||||
$username = $a->getUserNickname();
|
$username = $a->getLoggedInUserNickname();
|
||||||
}
|
}
|
||||||
|
|
||||||
$info_text = DI::config()->get("jappixmini", "infotext");
|
$info_text = DI::config()->get("jappixmini", "infotext");
|
||||||
|
|
|
@ -105,7 +105,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
|
||||||
|
|
||||||
// Never filter own messages
|
// Never filter own messages
|
||||||
// TODO: find a better way to extract this
|
// TODO: find a better way to extract this
|
||||||
$logged_user_profile = DI::baseUrl()->get() . '/profile/' . $a->getUserNickname();
|
$logged_user_profile = DI::baseUrl()->get() . '/profile/' . $a->getLoggedInUserNickname();
|
||||||
if ($logged_user_profile == $hook_data['item']['author-link']) {
|
if ($logged_user_profile == $hook_data['item']['author-link']) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,7 +153,7 @@ function xmpp_converse(App $a)
|
||||||
DI::pConfig()->set(local_user(), "xmpp", "password", $password);
|
DI::pConfig()->set(local_user(), "xmpp", "password", $password);
|
||||||
}
|
}
|
||||||
|
|
||||||
$jid = $a->getUserNickname() . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5);
|
$jid = $a->getLoggedInUserNickname() . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5);
|
||||||
|
|
||||||
$auto_login = "auto_login: true,
|
$auto_login = "auto_login: true,
|
||||||
authentication: 'login',
|
authentication: 'login',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user