Diaspora: Comments and Likes are now signed at any time

diff --git a/include/diaspora.php b/include/diaspora.php
index ce3d4ef00db1a817414fabff3a610cc51a4fd1cd..0556511857ea0f9eb8c1297e41d4b4ee5a330323 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -3122,12 +3122,6 @@ class diaspora {
         */
        public static function store_like_signature($contact, $post_id) {
 
-               $enabled = intval(get_config('system','diaspora_enabled'));
-               if (!$enabled) {
-                       logger('Diaspora support disabled, not storing like signature', LOGGER_DEBUG);
-                       return false;
-               }
-
                // Is the contact the owner? Then fetch the private key
                if (!$contact['self'] OR ($contact['uid'] == 0)) {
                        logger("No owner post, so not storing signature", LOGGER_DEBUG);
@@ -3191,12 +3185,6 @@ class diaspora {
                        return false;
                }
 
-               $enabled = intval(get_config('system','diaspora_enabled'));
-               if (!$enabled) {
-                       logger('Diaspora support disabled, not storing comment signature', LOGGER_DEBUG);
-                       return false;
-               }
-
                $contact["uprvkey"] = $uprvkey;
 
                $message = self::construct_comment($item, $contact);

diff --git a/mod/xrd.php b/mod/xrd.php
index c23119145ca4d0685f0aab07ed549dd7df997f3d..094211360e03b107c23e7d841d385c96253b2ec1 100644 (file)
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -29,16 +29,12 @@ function xrd_init(&$a) {
        header('Access-Control-Allow-Origin: *');
        header("Content-type: text/xml");
 
-       if(get_config('system','diaspora_enabled')) {
-               $tpl = get_markup_template('xrd_diaspora.tpl');
-               $dspr = replace_macros($tpl,array(
-                       '$baseurl' => $a->get_baseurl(),
-                       '$dspr_guid' => $r[0]['guid'],
-                       '$dspr_key' => base64_encode(pemtorsa($r[0]['pubkey']))
-               ));
-       }
-       else
-               $dspr = '';
+       $tpl = get_markup_template('xrd_diaspora.tpl');
+       $dspr = replace_macros($tpl,array(
+               '$baseurl' => $a->get_baseurl(),
+               '$dspr_guid' => $r[0]['guid'],
+               '$dspr_key' => base64_encode(pemtorsa($r[0]['pubkey']))
+       ));
 
        $tpl = get_markup_template('xrd_person.tpl');