wrong path for salmon verify

diff --git a/boot.php b/boot.php
index 61585419adba998fe6dc6f92646f8ee2c5e45929..a5ce5f5c3eeac12988984c95b47ae0440c41b940 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -135,7 +135,7 @@ define ( 'NAMESPACE_POCO',            'http://portablecontacts.net/spec/1.0' );
 define ( 'NAMESPACE_FEED',            'http://schemas.google.com/g/2010#updates-from' );
 define ( 'NAMESPACE_OSTATUS',         'http://ostatus.org/schema/1.0' );
 define ( 'NAMESPACE_STATUSNET',       'http://status.net/schema/api/1/' );
-
+define ( 'NAMESPACE_ATOM1',           'http://www.w3.org/2005/Atom' );
 /**
  * activity stream defines
  */

diff --git a/include/salmon.php b/include/salmon.php
index c1af1a8526312539dcc2f9a458cdbab7db0cb2fd..473432f259542c92a067a41e8681e2f2846ccbc7 100644 (file)
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -145,7 +145,7 @@ EOT;
 
        // Setup RSA stuff to PKCS#1 sign the data
 
-       set_include_path(get_include_path() . PATH_SEPARATOR . 'library' . PATH_SEPARATOR . 'phpsec');
+       set_include_path(get_include_path() . PATH_SEPARATOR . 'library/phpsec');
 
        require_once('library/phpsec/Crypt/RSA.php');
 

diff --git a/mod/receive.php b/mod/receive.php
index 6e36109b3b880114ea39f7b5434b228c1fa3ed61..6fb68e15454c36c5d9d54a4b0ee0ff16cf2dfbdd 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -5,7 +5,6 @@
  */
 
 
-
 require_once('include/salmon.php');
 require_once('library/simplepie/simplepie.inc');
 

diff --git a/mod/salmon.php b/mod/salmon.php
index 721eae4371f6b278e6f12b83c45827763e7f90c3..56ac071b065209aa7a82ced4042790492026b889 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -130,7 +130,7 @@ function salmon_post(&$a) {
 
        // Setup RSA stuff to verify the signature
 
-       set_include_path(get_include_path() . PATH_SEPARATOR . 'library' . PATH_SEPARATOR . 'phpsec');
+       set_include_path(get_include_path() . PATH_SEPARATOR . 'library/phpsec');
 
        require_once('library/phpsec/Crypt/RSA.php');