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

11 years ago · 0b221e8945
397 changed files with 30 additions and 30 deletions
--- 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);

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

--- 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);
--- 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');
--- 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;
--- a/library/cropper/cropper.css
+++ b/library/cropper/cropper.css
--- a/library/cropper/cropper.html
+++ b/library/cropper/cropper.html
--- a/library/cropper/cropper.js
+++ b/library/cropper/cropper.js
--- a/library/cropper/cropper.uncompressed.js
+++ b/library/cropper/cropper.uncompressed.js
--- a/library/cropper/lib/builder.js
+++ b/library/cropper/lib/builder.js
--- a/library/cropper/lib/controls.js
+++ b/library/cropper/lib/controls.js
--- a/library/cropper/lib/dragdrop.js
+++ b/library/cropper/lib/dragdrop.js
--- a/library/cropper/lib/effects.js
+++ b/library/cropper/lib/effects.js
--- a/library/cropper/lib/prototype.js
+++ b/library/cropper/lib/prototype.js
--- a/library/cropper/lib/scriptaculous.js
+++ b/library/cropper/lib/scriptaculous.js
--- a/library/cropper/lib/slider.js
+++ b/library/cropper/lib/slider.js
--- a/library/cropper/lib/unittest.js
+++ b/library/cropper/lib/unittest.js
--- a/library/cropper/licence.txt
+++ b/library/cropper/licence.txt
--- a/library/cropper/marqueeHoriz.gif
+++ b/library/cropper/marqueeHoriz.gif
--- a/library/cropper/marqueeVert.gif
+++ b/library/cropper/marqueeVert.gif
--- a/library/cropper/tests/castle.jpg
+++ b/library/cropper/tests/castle.jpg
--- a/library/cropper/tests/castleMed.jpg
+++ b/library/cropper/tests/castleMed.jpg
--- a/library/cropper/tests/example-Basic.htm
+++ b/library/cropper/tests/example-Basic.htm
--- a/library/cropper/tests/example-CSS-Absolute.htm
+++ b/library/cropper/tests/example-CSS-Absolute.htm
--- a/library/cropper/tests/example-CSS-Float.htm
+++ b/library/cropper/tests/example-CSS-Float.htm
--- a/library/cropper/tests/example-CSS-Relative.htm
+++ b/library/cropper/tests/example-CSS-Relative.htm
--- a/library/cropper/tests/example-CoordsOnLoad.htm
+++ b/library/cropper/tests/example-CoordsOnLoad.htm
--- a/library/cropper/tests/example-CoordsOnLoadWithRatio.htm
+++ b/library/cropper/tests/example-CoordsOnLoadWithRatio.htm
--- a/library/cropper/tests/example-Dimensions.htm
+++ b/library/cropper/tests/example-Dimensions.htm
--- a/library/cropper/tests/example-DynamicImage.htm
+++ b/library/cropper/tests/example-DynamicImage.htm
--- a/library/cropper/tests/example-FixedRatio.htm
+++ b/library/cropper/tests/example-FixedRatio.htm
--- a/library/cropper/tests/example-MinimumDimensions.htm
+++ b/library/cropper/tests/example-MinimumDimensions.htm
--- a/library/cropper/tests/example-MinimumWidth.htm
+++ b/library/cropper/tests/example-MinimumWidth.htm
--- a/library/cropper/tests/example-Preview.htm
+++ b/library/cropper/tests/example-Preview.htm
--- a/library/cropper/tests/poppy.jpg
+++ b/library/cropper/tests/poppy.jpg
--- a/library/cropper/tests/staticHTMLStructure.htm
+++ b/library/cropper/tests/staticHTMLStructure.htm
--- a/library/phpsec/Crypt/AES.php
+++ b/library/phpsec/Crypt/AES.php
--- a/library/phpsec/Crypt/DES.php
+++ b/library/phpsec/Crypt/DES.php
--- a/library/phpsec/Crypt/Hash.php
+++ b/library/phpsec/Crypt/Hash.php
--- a/library/phpsec/Crypt/RC4.php
+++ b/library/phpsec/Crypt/RC4.php
--- a/library/phpsec/Crypt/RSA.php
+++ b/library/phpsec/Crypt/RSA.php
--- a/library/phpsec/Crypt/Random.php
+++ b/library/phpsec/Crypt/Random.php
--- a/library/phpsec/Crypt/Rijndael.php
+++ b/library/phpsec/Crypt/Rijndael.php
--- a/library/phpsec/Crypt/TripleDES.php
+++ b/library/phpsec/Crypt/TripleDES.php
--- a/library/phpsec/Math/BigInteger.php
+++ b/library/phpsec/Math/BigInteger.php
--- a/library/phpsec/Net/SFTP.php
+++ b/library/phpsec/Net/SFTP.php
--- a/library/phpsec/Net/SSH1.php
+++ b/library/phpsec/Net/SSH1.php
--- a/library/phpsec/Net/SSH2.php
+++ b/library/phpsec/Net/SSH2.php
--- a/library/phpsec/PHP/Compat/Function/array_fill.php
+++ b/library/phpsec/PHP/Compat/Function/array_fill.php
--- a/library/phpsec/PHP/Compat/Function/bcpowmod.php
+++ b/library/phpsec/PHP/Compat/Function/bcpowmod.php
--- a/library/phpsec/PHP/Compat/Function/str_split.php
+++ b/library/phpsec/PHP/Compat/Function/str_split.php
--- a/library/phpsec/crypt.html
+++ b/library/phpsec/crypt.html
--- a/library/phpsec/docbook.css
+++ b/library/phpsec/docbook.css
--- a/library/phpsec/index.html
+++ b/library/phpsec/index.html
--- a/library/phpsec/intro.html
+++ b/library/phpsec/intro.html
--- a/library/phpsec/math.html
+++ b/library/phpsec/math.html
--- a/library/phpsec/misc_crypt.html
+++ b/library/phpsec/misc_crypt.html
--- a/library/phpsec/net.html
+++ b/library/phpsec/net.html
--- a/library/phpsec/sym_crypt.html
+++ b/library/phpsec/sym_crypt.html
--- a/library/simplepie/LICENSE.txt
+++ b/library/simplepie/LICENSE.txt
--- a/library/simplepie/README.markdown
+++ b/library/simplepie/README.markdown
--- a/library/simplepie/compatibility_test/COMPATIBILITY
+++ b/library/simplepie/compatibility_test/COMPATIBILITY
--- a/library/simplepie/compatibility_test/sp_compatibility_test.php
+++ b/library/simplepie/compatibility_test/sp_compatibility_test.php
--- a/library/simplepie/create.php
+++ b/library/simplepie/create.php
--- a/library/simplepie/db.sql
+++ b/library/simplepie/db.sql
--- a/library/simplepie/demo/cli_test.php
+++ b/library/simplepie/demo/cli_test.php
--- a/library/simplepie/demo/for_the_demo/alternate_favicon.png
+++ b/library/simplepie/demo/for_the_demo/alternate_favicon.png
--- a/library/simplepie/demo/for_the_demo/background_blockquote.png
+++ b/library/simplepie/demo/for_the_demo/background_blockquote.png
--- a/library/simplepie/demo/for_the_demo/background_menuitem.gif
+++ b/library/simplepie/demo/for_the_demo/background_menuitem.gif
--- a/library/simplepie/demo/for_the_demo/background_menuitem_off.gif
+++ b/library/simplepie/demo/for_the_demo/background_menuitem_off.gif
--- a/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif
+++ b/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif
--- a/library/simplepie/demo/for_the_demo/favicons/alternate.png
+++ b/library/simplepie/demo/for_the_demo/favicons/alternate.png
--- a/library/simplepie/demo/for_the_demo/favicons/blinklist.png
+++ b/library/simplepie/demo/for_the_demo/favicons/blinklist.png
--- a/library/simplepie/demo/for_the_demo/favicons/blogmarks.png
+++ b/library/simplepie/demo/for_the_demo/favicons/blogmarks.png
--- a/library/simplepie/demo/for_the_demo/favicons/delicious.png
+++ b/library/simplepie/demo/for_the_demo/favicons/delicious.png
--- a/library/simplepie/demo/for_the_demo/favicons/digg.png
+++ b/library/simplepie/demo/for_the_demo/favicons/digg.png
--- a/library/simplepie/demo/for_the_demo/favicons/magnolia.png
+++ b/library/simplepie/demo/for_the_demo/favicons/magnolia.png
--- a/library/simplepie/demo/for_the_demo/favicons/myweb2.png
+++ b/library/simplepie/demo/for_the_demo/favicons/myweb2.png
--- a/library/simplepie/demo/for_the_demo/favicons/newsvine.png
+++ b/library/simplepie/demo/for_the_demo/favicons/newsvine.png
--- a/library/simplepie/demo/for_the_demo/favicons/reddit.png
+++ b/library/simplepie/demo/for_the_demo/favicons/reddit.png
--- a/library/simplepie/demo/for_the_demo/favicons/segnalo.png
+++ b/library/simplepie/demo/for_the_demo/favicons/segnalo.png
--- a/library/simplepie/demo/for_the_demo/favicons/simpy.png
+++ b/library/simplepie/demo/for_the_demo/favicons/simpy.png
--- a/library/simplepie/demo/for_the_demo/favicons/spurl.png
+++ b/library/simplepie/demo/for_the_demo/favicons/spurl.png
--- a/library/simplepie/demo/for_the_demo/favicons/technorati.png
+++ b/library/simplepie/demo/for_the_demo/favicons/technorati.png
--- a/library/simplepie/demo/for_the_demo/favicons/wists.png
+++ b/library/simplepie/demo/for_the_demo/favicons/wists.png
--- a/library/simplepie/demo/for_the_demo/feed.png
+++ b/library/simplepie/demo/for_the_demo/feed.png
--- a/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png
+++ b/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png
--- a/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf
+++ b/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf
--- a/library/simplepie/demo/for_the_demo/mediaplayer.swf
+++ b/library/simplepie/demo/for_the_demo/mediaplayer.swf
--- a/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
+++ b/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
--- a/library/simplepie/demo/for_the_demo/mini_podcast.png
+++ b/library/simplepie/demo/for_the_demo/mini_podcast.png
--- a/library/simplepie/demo/for_the_demo/place_audio.png
+++ b/library/simplepie/demo/for_the_demo/place_audio.png
--- a/library/simplepie/demo/for_the_demo/place_video.png
+++ b/library/simplepie/demo/for_the_demo/place_video.png
--- a/library/simplepie/demo/for_the_demo/sIFR-print.css
+++ b/library/simplepie/demo/for_the_demo/sIFR-print.css
--- a/library/simplepie/demo/for_the_demo/sIFR-screen.css
+++ b/library/simplepie/demo/for_the_demo/sIFR-screen.css
--- a/library/simplepie/demo/for_the_demo/sifr-config.js
+++ b/library/simplepie/demo/for_the_demo/sifr-config.js
--- a/library/simplepie/demo/for_the_demo/sifr.js
+++ b/library/simplepie/demo/for_the_demo/sifr.js
--- a/library/simplepie/demo/for_the_demo/simplepie.css
+++ b/library/simplepie/demo/for_the_demo/simplepie.css
--- a/library/simplepie/demo/for_the_demo/sleight.js
+++ b/library/simplepie/demo/for_the_demo/sleight.js
--- a/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png
+++ b/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png
--- a/Show More
+++ b/Show More