X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=diaspora%2Fdiaspora.php;h=f637f468ed8d7a75f0ef518dad13a4a6e8d9b560;hb=5360f08f4295f2306d815a7659fbdff94fda01a3;hp=9675d7a69a313ae9359063a0d813806130a37ab7;hpb=c3e93f1ed9a487f823bcc75ddd43024334c25bfc;p=friendica-addons.git diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php old mode 100755 new mode 100644 index 9675d7a6..f637f468 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -9,8 +9,6 @@ require_once("addon/diaspora/Diaspora_Connection.php"); -use Friendica\Core\PConfig; - function diaspora_install() { register_hook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local'); register_hook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send'); @@ -33,9 +31,9 @@ function diaspora_jot_nets(&$a,&$b) { if(! local_user()) return; - $diaspora_post = PConfig::get(local_user(),'diaspora','post'); + $diaspora_post = get_pconfig(local_user(),'diaspora','post'); if(intval($diaspora_post) == 1) { - $diaspora_defpost = PConfig::get(local_user(),'diaspora','post_by_default'); + $diaspora_defpost = get_pconfig(local_user(),'diaspora','post_by_default'); $selected = ((intval($diaspora_defpost) == 1) ? ' checked="checked" ' : ''); $b .= '
' . t('Post to Diaspora') . '
'; @@ -68,9 +66,9 @@ function diaspora_queue_hook(&$a,&$b) { $userdata = $r[0]; - $handle = PConfig::get($userdata['uid'],'diaspora','handle'); - $password = PConfig::get($userdata['uid'],'diaspora','password'); - $aspect = PConfig::get($userdata['uid'],'diaspora','aspect'); + $handle = get_pconfig($userdata['uid'],'diaspora','handle'); + $password = get_pconfig($userdata['uid'],'diaspora','password'); + $aspect = get_pconfig($userdata['uid'],'diaspora','aspect'); $success = false; @@ -121,17 +119,17 @@ function diaspora_settings(&$a,&$s) { /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(),'diaspora','post'); + $enabled = get_pconfig(local_user(),'diaspora','post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(local_user(),'diaspora','post_by_default'); + $def_enabled = get_pconfig(local_user(),'diaspora','post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $handle = PConfig::get(local_user(), 'diaspora', 'handle'); - $password = PConfig::get(local_user(), 'diaspora', 'password'); - $aspect = PConfig::get(local_user(),'diaspora','aspect'); + $handle = get_pconfig(local_user(), 'diaspora', 'handle'); + $password = get_pconfig(local_user(), 'diaspora', 'password'); + $aspect = get_pconfig(local_user(),'diaspora','aspect'); $status = ""; @@ -224,11 +222,11 @@ function diaspora_settings_post(&$a,&$b) { if(x($_POST,'diaspora-submit')) { - PConfig::set(local_user(),'diaspora','post',intval($_POST['diaspora'])); - PConfig::set(local_user(),'diaspora','post_by_default',intval($_POST['diaspora_bydefault'])); - PConfig::set(local_user(),'diaspora','handle',trim($_POST['handle'])); - PConfig::set(local_user(),'diaspora','password',trim($_POST['password'])); - PConfig::set(local_user(),'diaspora','aspect',trim($_POST['aspect'])); + set_pconfig(local_user(),'diaspora','post',intval($_POST['diaspora'])); + set_pconfig(local_user(),'diaspora','post_by_default',intval($_POST['diaspora_bydefault'])); + set_pconfig(local_user(),'diaspora','handle',trim($_POST['handle'])); + set_pconfig(local_user(),'diaspora','password',trim($_POST['password'])); + set_pconfig(local_user(),'diaspora','aspect',trim($_POST['aspect'])); } } @@ -247,11 +245,11 @@ function diaspora_post_local(&$a,&$b) { return; } - $diaspora_post = intval(PConfig::get(local_user(),'diaspora','post')); + $diaspora_post = intval(get_pconfig(local_user(),'diaspora','post')); $diaspora_enable = (($diaspora_post && x($_REQUEST,'diaspora_enable')) ? intval($_REQUEST['diaspora_enable']) : 0); - if ($b['api_source'] && intval(PConfig::get(local_user(),'diaspora','post_by_default'))) { + if ($b['api_source'] && intval(get_pconfig(local_user(),'diaspora','post_by_default'))) { $diaspora_enable = 1; } @@ -285,9 +283,9 @@ function diaspora_send(&$a,&$b) { logger('diaspora_send: prepare posting', LOGGER_DEBUG); - $handle = PConfig::get($b['uid'],'diaspora','handle'); - $password = PConfig::get($b['uid'],'diaspora','password'); - $aspect = PConfig::get($b['uid'],'diaspora','aspect'); + $handle = get_pconfig($b['uid'],'diaspora','handle'); + $password = get_pconfig($b['uid'],'diaspora','password'); + $aspect = get_pconfig($b['uid'],'diaspora','aspect'); if ($handle && $password) {