bug #96 move libraries to library - better alignment of like rotator

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);
 

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('include/session.php');
-	require_once('datetime.php');
+	require_once('include/datetime.php');
-	require_once('simplepie/simplepie.inc');
+	require_once('library/simplepie/simplepie.inc');
 	require_once('include/items.php');
 	require_once('include/Contact.php');
 

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);

include/poller.php

@@ -17,9 +17,9 @@ function poller_run($argv, $argc){
   	};
 
 
-	require_once('session.php');
+	require_once('include/session.php');
-	require_once('datetime.php');
+	require_once('include/datetime.php');
-	require_once('simplepie/simplepie.inc');
+	require_once('library/simplepie/simplepie.inc');
 	require_once('include/items.php');
 	require_once('include/Contact.php');
 	require_once('include/email.php');

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;