friendica/friendica-addons
1
0
Fork 0
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-07-07 00:48:55 +00:00
Code Issues Releases Wiki Activity

Issue 3873

Browse source 
Replace deprecated functions with new syntax
This commit is contained in:
Adam Magness 2017-11-06 18:55:24 -05:00
parent 72474dc2f6
commit 48dcbc6f3f
61 changed files with 1036 additions and 920 deletions
Download patch file Download diff file Expand all files Collapse all files

41
xmpp/xmpp.php
View file

@ -6,6 +6,9 @@
* Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/
use Friendica\Core\Config;
use Friendica\Core\PConfig;
function xmpp_install() {
register_hook('plugin_settings', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings');
register_hook('plugin_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings_post');
@ -23,9 +26,9 @@ function xmpp_uninstall() {
function xmpp_plugin_settings_post($a,$post) {
if(! local_user() || (! x($_POST,'xmpp-settings-submit')))
return;
set_pconfig(local_user(),'xmpp','enabled',intval($_POST['xmpp_enabled']));
set_pconfig(local_user(),'xmpp','individual',intval($_POST['xmpp_individual']));
set_pconfig(local_user(),'xmpp','bosh_proxy',$_POST['xmpp_bosh_proxy']);
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','bosh_proxy',$_POST['xmpp_bosh_proxy']);
info( t('XMPP settings updated.') . EOL);
}
@ -41,13 +44,13 @@ function xmpp_plugin_settings(&$a,&$s) {
/* Get the current state of our config variable */
$enabled = intval(get_pconfig(local_user(),'xmpp','enabled'));
$enabled = intval(PConfig::get(local_user(),'xmpp','enabled'));
$enabled_checked = (($enabled) ? ' checked="checked" ' : '');
$individual = intval(get_pconfig(local_user(),'xmpp','individual'));
$individual = intval(PConfig::get(local_user(),'xmpp','individual'));
$individual_checked = (($individual) ? ' checked="checked" ' : '');
$bosh_proxy = get_pconfig(local_user(),"xmpp","bosh_proxy");
$bosh_proxy = PConfig::get(local_user(),"xmpp","bosh_proxy");
/* Add some HTML to the existing form */
$s .= '<span id="settings_xmpp_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_xmpp_expanded\'); openClose(\'settings_xmpp_inflated\');">';
@ -63,13 +66,13 @@ function xmpp_plugin_settings(&$a,&$s) {
$s .= '<input id="xmpp-enabled" type="checkbox" name="xmpp_enabled" value="1" ' . $enabled_checked . '/>';
$s .= '<div class="clear"></div>';
if (get_config("xmpp", "central_userbase")) {
if (Config::get("xmpp", "central_userbase")) {
$s .= '<label id="xmpp-individual-label" for="xmpp-individual">' . t('Individual Credentials') . '</label>';
$s .= '<input id="xmpp-individual" type="checkbox" name="xmpp_individual" value="1" ' . $individual_checked . '/>';
$s .= '<div class="clear"></div>';
}
if (!get_config("xmpp", "central_userbase") || get_pconfig(local_user(),"xmpp","individual")) {
if (!Config::get("xmpp", "central_userbase") || PConfig::get(local_user(),"xmpp","individual")) {
$s .= '<label id="xmpp-bosh-proxy-label" for="xmpp-bosh-proxy">'.t('Jabber BOSH host').'</label>';
$s .= ' <input id="xmpp-bosh-proxy" type="text" name="xmpp_bosh_proxy" value="'.$bosh_proxy.'" />';
$s .= '<div class="clear"></div>';
@ -86,7 +89,7 @@ function xmpp_plugin_settings(&$a,&$s) {
function xmpp_login($a,$b) {
if (!$_SESSION["allow_api"]) {
$password = substr(random_string(),0,16);
set_pconfig(local_user(), "xmpp", "password", $password);
PConfig::set(local_user(), "xmpp", "password", $password);
}
}
@ -95,16 +98,16 @@ function xmpp_plugin_admin(&$a, &$o){
$o = replace_macros($t, array(
'$submit' => t('Save Settings'),
'$bosh_proxy' => array('bosh_proxy', t('Jabber BOSH host'), get_config('xmpp', 'bosh_proxy'), ''),
'$central_userbase' => array('central_userbase', t('Use central userbase'), get_config('xmpp', 'central_userbase'), t('If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the "auth_ejabberd.php" script.')),
'$bosh_proxy' => array('bosh_proxy', t('Jabber BOSH host'), Config::get('xmpp', 'bosh_proxy'), ''),
'$central_userbase' => array('central_userbase', t('Use central userbase'), Config::get('xmpp', 'central_userbase'), t('If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the "auth_ejabberd.php" script.')),
));
}
function xmpp_plugin_admin_post(&$a){
$bosh_proxy = ((x($_POST,'bosh_proxy')) ? trim($_POST['bosh_proxy']) : '');
$central_userbase = ((x($_POST,'central_userbase')) ? intval($_POST['central_userbase']) : false);
set_config('xmpp','bosh_proxy',$bosh_proxy);
set_config('xmpp','central_userbase',$central_userbase);
Config::set('xmpp','bosh_proxy',$bosh_proxy);
Config::set('xmpp','central_userbase',$central_userbase);
info( t('Settings updated.'). EOL );
}
@ -122,7 +125,7 @@ function xmpp_converse(&$a,&$s) {
if ($a->is_mobile || $a->is_tablet)
return;
if (!get_pconfig(local_user(),"xmpp","enabled"))
if (!PConfig::get(local_user(),"xmpp","enabled"))
return;
if (in_array($a->query_string, array("admin/federation/")))
@ -131,14 +134,14 @@ function xmpp_converse(&$a,&$s) {
$a->page['htmlhead'] .= '<link type="text/css" rel="stylesheet" media="screen" href="addon/xmpp/converse/css/converse.css" />'."\n";
$a->page['htmlhead'] .= '<script src="addon/xmpp/converse/builds/converse.min.js"></script>'."\n";
if (get_config("xmpp", "central_userbase") && !get_pconfig(local_user(),"xmpp","individual")) {
$bosh_proxy = get_config("xmpp", "bosh_proxy");
if (Config::get("xmpp", "central_userbase") && !PConfig::get(local_user(),"xmpp","individual")) {
$bosh_proxy = Config::get("xmpp", "bosh_proxy");
$password = get_pconfig(local_user(), "xmpp", "password");
$password = PConfig::get(local_user(), "xmpp", "password");
if ($password == "") {
$password = substr(random_string(),0,16);
set_pconfig(local_user(), "xmpp", "password", $password);
PConfig::set(local_user(), "xmpp", "password", $password);
}
$jid = $a->user["nickname"]."@".$a->get_hostname()."/converse-".substr(random_string(),0,5);;
@ -149,7 +152,7 @@ function xmpp_converse(&$a,&$s) {
password: '$password',
allow_logout: false,";
} else {
$bosh_proxy = get_pconfig(local_user(), "xmpp", "bosh_proxy");
$bosh_proxy = PConfig::get(local_user(), "xmpp", "bosh_proxy");
$auto_login = "";
}