diff options
| -rw-r--r-- | boot.php | 4 | ||||
| -rw-r--r-- | include/main.js | 8 | ||||
| -rw-r--r-- | include/salmon.php | 2 | ||||
| -rw-r--r-- | mod/receive.php | 1 | ||||
| -rw-r--r-- | mod/salmon.php | 2 |
5 files changed, 12 insertions, 5 deletions
@@ -1,6 +1,6 @@ <?php -define ( 'FRIENDIKA_VERSION', '2.2.1046' ); +define ( 'FRIENDIKA_VERSION', '2.2.1047' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1076 ); @@ -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/main.js b/include/main.js index 040e9695e..288fd6f01 100644 --- a/include/main.js +++ b/include/main.js @@ -100,6 +100,14 @@ $('#pause').html(''); } } + else { + // any key to resume + if(stopped == true) { + stopped = false; + $('#pause').html(''); + } + } + }); }); diff --git a/include/salmon.php b/include/salmon.php index c1af1a852..473432f25 100644 --- 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 6e36109b3..6fb68e154 100644 --- 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 721eae437..56ac071b0 100644 --- 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'); |