friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[xmpp] Fixes: (#668) 

- rewrote from deprecated x() to empty()
- added some empty lines for better readability
- used single quotes
pull/672/head
Roland Häder 2018-07-24 23:54:00 +02:00 committed by Hypolite Petovan
parent 9d74809504
commit 40f01ae601
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xmpp/xmpp.php
View File

@ -5,6 +5,7 @@
* Version: 0.1 * Version: 0.1
* Author: Michael Vogel <https://pirati.ca/profile/heluecht> * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
@ -29,9 +30,10 @@ function xmpp_uninstall()
function xmpp_addon_settings_post() function xmpp_addon_settings_post()
{ {
if (!local_user() || (!x($_POST, 'xmpp-settings-submit'))) { if (!local_user() || empty($_POST['xmpp-settings-submit'])) {
return; return;
} }
PConfig::set(local_user(), 'xmpp', 'enabled', intval($_POST['xmpp_enabled'])); PConfig::set(local_user(), 'xmpp', 'enabled', intval($_POST['xmpp_enabled']));
PConfig::set(local_user(), 'xmpp', 'individual', intval($_POST['xmpp_individual'])); PConfig::set(local_user(), 'xmpp', 'individual', intval($_POST['xmpp_individual']));
PConfig::set(local_user(), 'xmpp', 'bosh_proxy', $_POST['xmpp_bosh_proxy']); PConfig::set(local_user(), 'xmpp', 'bosh_proxy', $_POST['xmpp_bosh_proxy']);
@ -94,15 +96,15 @@ function xmpp_addon_settings(App $a, &$s)
function xmpp_login() function xmpp_login()
{ {
if (empty($_SESSION["allow_api"])) { if (empty($_SESSION['allow_api'])) {
$password = random_string(16); $password = random_string(16);
PConfig::set(local_user(), "xmpp", "password", $password); PConfig::set(local_user(), 'xmpp', 'password', $password);
} }
} }
function xmpp_addon_admin(App $a, &$o) function xmpp_addon_admin(App $a, &$o)
{ {
$t = get_markup_template("admin.tpl", "addon/xmpp/"); $t = get_markup_template('admin.tpl', 'addon/xmpp/');
$o = replace_macros($t, [ $o = replace_macros($t, [
'$submit' => L10n::t('Save Settings'), '$submit' => L10n::t('Save Settings'),
@ -113,10 +115,12 @@ function xmpp_addon_admin(App $a, &$o)
function xmpp_addon_admin_post() function xmpp_addon_admin_post()
{ {
$bosh_proxy = ((x($_POST, 'bosh_proxy')) ? trim($_POST['bosh_proxy']) : ''); $bosh_proxy = ((!empty($_POST['bosh_proxy'])) ? trim($_POST['bosh_proxy']) : '');
$central_userbase = ((x($_POST, 'central_userbase')) ? intval($_POST['central_userbase']) : false); $central_userbase = ((!empty($_POST['central_userbase'])) ? intval($_POST['central_userbase']) : false);
Config::set('xmpp', 'bosh_proxy', $bosh_proxy); Config::set('xmpp', 'bosh_proxy', $bosh_proxy);
Config::set('xmpp', 'central_userbase', $central_userbase); Config::set('xmpp', 'central_userbase', $central_userbase);
info(L10n::t('Settings updated.') . EOL); info(L10n::t('Settings updated.') . EOL);
} }