From 816cdfb7ee28912908557e07741a2cd803252159 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 22 Jan 2009 14:33:02 +0100 Subject: [PATCH] move magpie to lib/ --- functions.php | 4 ++-- {magpierss => lib/magpierss}/AUTHORS | 0 {magpierss => lib/magpierss}/README | 0 {magpierss => lib/magpierss}/extlib/Snoopy.class.inc | 0 {magpierss => lib/magpierss}/rss_cache.inc | 0 {magpierss => lib/magpierss}/rss_fetch.inc | 0 {magpierss => lib/magpierss}/rss_parse.inc | 0 {magpierss => lib/magpierss}/rss_utils.inc | 0 update_daemon.php | 3 --- update_daemon2.php | 2 +- update_daemon_loop.php | 2 +- 11 files changed, 4 insertions(+), 7 deletions(-) rename {magpierss => lib/magpierss}/AUTHORS (100%) rename {magpierss => lib/magpierss}/README (100%) rename {magpierss => lib/magpierss}/extlib/Snoopy.class.inc (100%) rename {magpierss => lib/magpierss}/rss_cache.inc (100%) rename {magpierss => lib/magpierss}/rss_fetch.inc (100%) rename {magpierss => lib/magpierss}/rss_parse.inc (100%) rename {magpierss => lib/magpierss}/rss_utils.inc (100%) diff --git a/functions.php b/functions.php index f9ae442c..8f207cbd 100644 --- a/functions.php +++ b/functions.php @@ -103,8 +103,8 @@ define('MAGPIE_CACHE_AGE', 60*15); // 15 minutes require_once "lib/simplepie/simplepie.inc"; - require_once "magpierss/rss_fetch.inc"; - require_once 'magpierss/rss_utils.inc'; + require_once "lib/magpierss/rss_fetch.inc"; + require_once 'lib/magpierss/rss_utils.inc'; /** * Print a timestamped debug message. diff --git a/magpierss/AUTHORS b/lib/magpierss/AUTHORS similarity index 100% rename from magpierss/AUTHORS rename to lib/magpierss/AUTHORS diff --git a/magpierss/README b/lib/magpierss/README similarity index 100% rename from magpierss/README rename to lib/magpierss/README diff --git a/magpierss/extlib/Snoopy.class.inc b/lib/magpierss/extlib/Snoopy.class.inc similarity index 100% rename from magpierss/extlib/Snoopy.class.inc rename to lib/magpierss/extlib/Snoopy.class.inc diff --git a/magpierss/rss_cache.inc b/lib/magpierss/rss_cache.inc similarity index 100% rename from magpierss/rss_cache.inc rename to lib/magpierss/rss_cache.inc diff --git a/magpierss/rss_fetch.inc b/lib/magpierss/rss_fetch.inc similarity index 100% rename from magpierss/rss_fetch.inc rename to lib/magpierss/rss_fetch.inc diff --git a/magpierss/rss_parse.inc b/lib/magpierss/rss_parse.inc similarity index 100% rename from magpierss/rss_parse.inc rename to lib/magpierss/rss_parse.inc diff --git a/magpierss/rss_utils.inc b/lib/magpierss/rss_utils.inc similarity index 100% rename from magpierss/rss_utils.inc rename to lib/magpierss/rss_utils.inc diff --git a/update_daemon.php b/update_daemon.php index 35177edd..b2bae956 100644 --- a/update_daemon.php +++ b/update_daemon.php @@ -8,8 +8,6 @@ declare(ticks = 1); - define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon'); - define('SIMPLEPIE_CACHE_DIR', '/var/tmp/simplepie-ttrss-cache-daemon'); define('DISABLE_SESSIONS', true); require_once "version.php"; @@ -34,7 +32,6 @@ require_once "db.php"; require_once "db-prefs.php"; require_once "functions.php"; - require_once "magpierss/rss_fetch.inc"; error_reporting(DEFAULT_ERROR_LEVEL); diff --git a/update_daemon2.php b/update_daemon2.php index 777b835a..a8eb48d4 100644 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -34,7 +34,7 @@ require_once "db.php"; require_once "db-prefs.php"; require_once "functions.php"; - require_once "magpierss/rss_fetch.inc"; + require_once "lib/magpierss/rss_fetch.inc"; error_reporting(DEFAULT_ERROR_LEVEL); diff --git a/update_daemon_loop.php b/update_daemon_loop.php index 56b3839a..064a904d 100644 --- a/update_daemon_loop.php +++ b/update_daemon_loop.php @@ -34,7 +34,7 @@ require_once "db.php"; require_once "db-prefs.php"; require_once "functions.php"; - require_once "magpierss/rss_fetch.inc"; + require_once "lib/magpierss/rss_fetch.inc"; error_reporting(DEFAULT_ERROR_LEVEL); -- 2.39.5