Update settings page to use field templates.

[friendica.git] / include / salmon.php

diff --git a/include/salmon.php b/include/salmon.php
index 8a56882adb6f16ef6671b8b431cb38428e482c91..c1af1a8526312539dcc2f9a458cdbab7db0cb2fd 100644 (file)
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -128,7 +128,9 @@ $namespaces = <<< EOT
       xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
       xmlns:as="http://activitystrea.ms/spec/1.0/"
       xmlns:georss="http://www.georss.org/georss" 
-      xmlns:poco="http://portablecontacts.net/spec/1.0" >
+      xmlns:poco="http://portablecontacts.net/spec/1.0" 
+      xmlns:ostatus="http://ostatus.org/schema/1.0" 
+         xmlns:statusnet="http://status.net/schema/api/1/" >                                                                                                   >
 EOT;
 
        $slap = str_replace('<entry>',$namespaces,$slap);
@@ -143,9 +145,9 @@ EOT;
 
        // Setup RSA stuff to PKCS#1 sign the data
 
-       set_include_path(get_include_path() . PATH_SEPARATOR . 'phpsec');
+       set_include_path(get_include_path() . PATH_SEPARATOR . 'library' . PATH_SEPARATOR . 'phpsec');
 
-       require_once('phpsec/Crypt/RSA.php');
+       require_once('library/phpsec/Crypt/RSA.php');
 
     $rsa = new CRYPT_RSA();
     $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
@@ -160,7 +162,7 @@ EOT;
 
        $signature2  = base64url_encode($rsa->sign($data));
 
-       $salmon_tpl = load_view_file('view/magicsig.tpl');
+       $salmon_tpl = get_markup_template('magicsig.tpl');
        $salmon = replace_macros($salmon_tpl,array(
                '$data'      => $data,
                '$encoding'  => $encoding,