aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Scrape.php2
-rw-r--r--include/expire.php6
-rw-r--r--include/items.php2
-rw-r--r--include/poller.php6
-rw-r--r--include/salmon.php4
5 files changed, 10 insertions, 10 deletions
diff --git a/include/Scrape.php b/include/Scrape.php
index 553bd529b..698ec9cf0 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -442,7 +442,7 @@ function probe_url($url) {
if(x($feedret,'photo'))
$vcard['photo'] = $feedret['photo'];
- require_once('simplepie/simplepie.inc');
+ require_once('library/simplepie/simplepie.inc');
$feed = new SimplePie();
$xml = fetch_url($poll);
diff --git a/include/expire.php b/include/expire.php
index 3c30e01c1..cf3b7c8e2 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -16,9 +16,9 @@ function expire_run($argv, $argc){
unset($db_host, $db_user, $db_pass, $db_data);
};
- require_once('session.php');
- require_once('datetime.php');
- require_once('simplepie/simplepie.inc');
+ require_once('include/session.php');
+ require_once('include/datetime.php');
+ require_once('library/simplepie/simplepie.inc');
require_once('include/items.php');
require_once('include/Contact.php');
diff --git a/include/items.php b/include/items.php
index 47a38d5e5..63e180f76 100644
--- a/include/items.php
+++ b/include/items.php
@@ -995,7 +995,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_feed = false) {
- require_once('simplepie/simplepie.inc');
+ require_once('library/simplepie/simplepie.inc');
$feed = new SimplePie();
$feed->set_raw_data($xml);
diff --git a/include/poller.php b/include/poller.php
index 7490bfa81..99517a7ee 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -17,9 +17,9 @@ function poller_run($argv, $argc){
};
- require_once('session.php');
- require_once('datetime.php');
- require_once('simplepie/simplepie.inc');
+ require_once('include/session.php');
+ require_once('include/datetime.php');
+ require_once('library/simplepie/simplepie.inc');
require_once('include/items.php');
require_once('include/Contact.php');
require_once('include/email.php');
diff --git a/include/salmon.php b/include/salmon.php
index 74da98c93..c1af1a852 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -145,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;