X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=diaspora%2Fdiaspora.php;h=f637f468ed8d7a75f0ef518dad13a4a6e8d9b560;hb=5360f08f4295f2306d815a7659fbdff94fda01a3;hp=04ed24ca84b42d12d5f3dfed190a3e3fecaacdf3;hpb=b3d73b125526002e147302cfd05279d33bd8db73;p=friendica-addons.git

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
old mode 100755
new mode 100644
index 04ed24ca..f637f468
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -9,9 +9,6 @@
 
 require_once("addon/diaspora/Diaspora_Connection.php");
 
-use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
-
 function diaspora_install() {
 	register_hook('post_local',           'addon/diaspora/diaspora.php', 'diaspora_post_local');
 	register_hook('notifier_normal',      'addon/diaspora/diaspora.php', 'diaspora_send');
@@ -34,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 .= '<div class="profile-jot-net"><input type="checkbox" name="diaspora_enable"' . $selected . ' value="1" /> '
             . t('Post to Diaspora') . '</div>';
@@ -69,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;
 
@@ -122,22 +119,22 @@ 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 = "";
 
 	$r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
-	if (DBM::is_result($r)) {
+	if (dbm::is_result($r)) {
 		$status = sprintf(t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. "), $r[0]['addr']);
 		$status .= t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
 		$status .= sprintf(t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.'), $r[0]['addr']);
@@ -225,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']));
 	}
 
 }
@@ -248,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;
 	}
 
@@ -284,18 +281,11 @@ function diaspora_send(&$a,&$b) {
 	if($b['parent'] != $b['id'])
 		return;
 
-	// Dont't post if the post doesn't belong to us.
-	// This is a check for forum postings
-	$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
-	if ($b['contact-id'] != $self['id']) {
-		return;
-	}
-
 	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) {