Add BUNDLE_NOTICE files on where to replace inclusion files.

We need to ensure that always our bundled files get included and
we don't rely on PEAR installations on the user's server.

diff --git a/bundled-libs/Cache/BUNDLE_NOTICE b/bundled-libs/Cache/BUNDLE_NOTICE
new file mode 100644 (file)
index 0000000..2fab53a
--- /dev/null
+++ b/bundled-libs/Cache/BUNDLE_NOTICE
@@ -0,0 +1,8 @@
+- Replace: 
+Lite.php:
+include_once('PEAR.php');
+include_once dirname(__FILE__) . '/../../PEAR.php';
+
+Output.php, Function.php:
+require_once('Cache/Lite.php');
+require_once(dirname(__FILE__) . '/../Lite.php';
\ No newline at end of file

diff --git a/bundled-libs/Cache/Lite.php b/bundled-libs/Cache/Lite.php
index 34e5bcd0284c0f4e8c5cd602d10afe7c642e7162..b8d47f4e8375662168a42ea5793b0a9c80078f40 100644 (file)
--- a/bundled-libs/Cache/Lite.php
+++ b/bundled-libs/Cache/Lite.php
@@ -494,7 +494,7 @@ class Cache_Lite
     */
     function raiseError($msg, $code)
     {
-        include_once('PEAR.php');
+        include_once(dirname(__FILE__) . '/../../PEAR.php');
         PEAR::raiseError($msg, $code, $this->_pearErrorMode);
     }
     

diff --git a/bundled-libs/Cache/Lite/Function.php b/bundled-libs/Cache/Lite/Function.php
index 0d69e22bfd61475b0e13d7e6be43bdfb084b8079..0ed15fb89c7e32ba5f8f3bc9c01378fbe52fe72a 100644 (file)
--- a/bundled-libs/Cache/Lite/Function.php
+++ b/bundled-libs/Cache/Lite/Function.php
@@ -16,7 +16,7 @@
 * @author Fabien MARTY <fab@php.net>
 */
  
-require_once('Cache/Lite.php');
+require_once(dirname(__FILE__) . '/../Lite.php');
 
 class Cache_Lite_Function extends Cache_Lite
 {

diff --git a/bundled-libs/HTTP/BUNDLE_NOTICE b/bundled-libs/HTTP/BUNDLE_NOTICE
new file mode 100644 (file)
index 0000000..b8129a7
--- /dev/null
+++ b/bundled-libs/HTTP/BUNDLE_NOTICE
@@ -0,0 +1,10 @@
+- Replace: 
+Request.php:
+require_once('PEAR.php');
+require_once(dirname(__FILE__) . '/../PEAR.php';
+
+require_once('Net/Socket.php');
+require_once(dirname(__FILE__) . '/../Net/Socket.php';
+
+require_once('Net/URL.php');
+require_once(dirname(__FILE__) . '/../Net/URL.php';
\ No newline at end of file

diff --git a/bundled-libs/HTTP/Request.php b/bundled-libs/HTTP/Request.php
index 581dbc6607b6d4bb22d3de7d8192376e2a8abb67..bad6d99ae050c8ccab622fe906c62e5eb8cc1737 100644 (file)
--- a/bundled-libs/HTTP/Request.php
+++ b/bundled-libs/HTTP/Request.php
@@ -43,9 +43,9 @@
 // echo $a->getResponseBody();
 //
 
-require_once 'PEAR.php';
-require_once 'Net/Socket.php';
-require_once 'Net/URL.php';
+require_once(dirname(__FILE__) . '/../PEAR.php';
+require_once(dirname(__FILE__) . '/../Net/Socket.php';
+require_once(dirname(__FILE__) . '/../Net/URL.php';
 
 define('HTTP_REQUEST_METHOD_GET',     'GET',     true);
 define('HTTP_REQUEST_METHOD_HEAD',    'HEAD',    true);

diff --git a/bundled-libs/Net/BUNDLE_NOTICE b/bundled-libs/Net/BUNDLE_NOTICE
new file mode 100644 (file)
index 0000000..7ab1c97
--- /dev/null
+++ b/bundled-libs/Net/BUNDLE_NOTICE
@@ -0,0 +1,9 @@
+- Replace: 
+DNSBL.php
+require_once 'Net/CheckIP.php';
+require_once dirname(__FILE__) . '/CheckIP.php';
+
+Socket.php
+require_once('PEAR.php');
+require_once(dirname(__FILE__) . '/../PEAR.php';
+

diff --git a/bundled-libs/Net/DNSBL.php b/bundled-libs/Net/DNSBL.php
index ce6837bd41a3198807c1ed0be0db284768234c41..3091dab358a306ba32e4883fd226d3b8890f7756 100644 (file)
--- a/bundled-libs/Net/DNSBL.php
+++ b/bundled-libs/Net/DNSBL.php
@@ -32,7 +32,7 @@
  * @license http://www.php.net/license/3_0.txt
  * @version 0.5.3
  */
-require_once 'Net/CheckIP.php';
+require_once dirname(__FILE__) . '/CheckIP.php';
 
 class Net_DNSBL {
 

diff --git a/bundled-libs/Net/DNSBL/BUNDLE_NOTICE b/bundled-libs/Net/DNSBL/BUNDLE_NOTICE
new file mode 100644 (file)
index 0000000..b175048
--- /dev/null
+++ b/bundled-libs/Net/DNSBL/BUNDLE_NOTICE
@@ -0,0 +1,13 @@
+- Replace: 
+SURBL.php
+require_once 'Cache/Lite.php';
+require_once dirname(__FILE__) . '/../../Cache/Lite.php';
+
+require_once 'HTTP/Request.php';
+require_once dirname(__FILE__) . '/../../HTTP/Request.php';
+
+require_once 'Net/CheckIP.php';
+require_once dirname(__FILE__) . '/../CheckIP.php';
+
+require_once 'Net/DNSBL.php';
+require_once dirname(__FILE__) . '/../DNSBL.php';
\ No newline at end of file

diff --git a/bundled-libs/Net/DNSBL/SURBL.php b/bundled-libs/Net/DNSBL/SURBL.php
index d239fd51de1ede08cc328cc40cccb2af9e2a0674..9ffd7866458a949a1cdd4bbc558877f1a4866d01 100644 (file)
--- a/bundled-libs/Net/DNSBL/SURBL.php
+++ b/bundled-libs/Net/DNSBL/SURBL.php
@@ -31,10 +31,10 @@
  * @license http://www.php.net/license/3_0.txt
  * @version 0.5.4
  */
-require_once 'Cache/Lite.php';
-require_once 'HTTP/Request.php';
-require_once 'Net/CheckIP.php';
-require_once 'Net/DNSBL.php';
+require_once dirname(__FILE__) . '/../../Cache/Lite.php';
+require_once dirname(__FILE__) . '/../../HTTP/Request.php';
+require_once dirname(__FILE__) . '/../CheckIP.php';
+require_once dirname(__FILE__) . '/../DNSBL.php';
 
 class Net_DNSBL_SURBL extends Net_DNSBL {
 

diff --git a/bundled-libs/Net/Socket.php b/bundled-libs/Net/Socket.php
index 7c4ff1d4e21646ce33507dce2ad2a78e5c13831b..8e39feaad2d6de7390cdd47f938b870fd1756f3a 100644 (file)
--- a/bundled-libs/Net/Socket.php
+++ b/bundled-libs/Net/Socket.php
@@ -19,7 +19,7 @@
 //
 // $Id: Socket.php,v 1.24 2005/02/03 20:40:16 chagenbu Exp $
 
-require_once 'PEAR.php';
+require_once(dirname(__FILE__) . '/../PEAR.php';
 
 define('NET_SOCKET_READ',  1);
 define('NET_SOCKET_WRITE', 2);

diff --git a/bundled-libs/XML/BUNDLE_NOTICE b/bundled-libs/XML/BUNDLE_NOTICE
new file mode 100644 (file)
index 0000000..ebdcc64
--- /dev/null
+++ b/bundled-libs/XML/BUNDLE_NOTICE
@@ -0,0 +1,8 @@
+- Replace: 
+RPC.php:
+include_once 'PEAR.php'
+include_once dirname(__FILE__) . '/../../PEAR.php';
+
+RPC/Server.php:
+require_once 'RPC/RPC.php';
+require_once dirname(__FILE__) . '/../RPC.php';
\ No newline at end of file

diff --git a/bundled-libs/XML/RPC.php b/bundled-libs/XML/RPC.php
index 2a0b652c6abe2f3995e0d6a65755e2d1f294adfa..7f4f0222e4830408a7561985f7c3d10a6afa10c4 100644 (file)
--- a/bundled-libs/XML/RPC.php
+++ b/bundled-libs/XML/RPC.php
@@ -468,7 +468,7 @@ class XML_RPC_Base {
      */
     function raiseError($msg, $code)
     {
-        include_once 'PEAR.php';
+        include_once dirname(__FILE__) . '/../PEAR.php';
         if (is_object(@$this)) {
             return PEAR::raiseError(get_class($this) . ': ' . $msg, $code);
         } else {

diff --git a/bundled-libs/XML/RPC/BUNDLE_NOTICE b/bundled-libs/XML/RPC/BUNDLE_NOTICE
deleted file mode 100644 (file)
index eddabc1..0000000
--- a/bundled-libs/XML/RPC/BUNDLE_NOTICE
+++ /dev/null
@@ -1,4 +0,0 @@
-- Replace in XML/RPC/Server.php:
-    require_once 'RPC/RPC.php';
-  with
-    require_once dirname(__FILE__) . '/../RPC.php';