From 43b4bc94ab4dcd5d85a1be230b7b4d73c5f511c5 Mon Sep 17 00:00:00 2001
From: Ivan Borzenkov <ivan1986@list.ru>
Date: Sun, 7 Mar 2010 22:38:11 +0300
Subject: [PATCH] reverting "use XMPPHP/ folder instead of dirname(__FILE__)
 which is inefficient" method whis relative path not work for lib - random
 current dir dirname faster and not need change include_path

more info on
http://stackoverflow.com/questions/2220443/whats-better-of-requiredirname-file-myparent-php-than-just-require
---
 XMPPHP/BOSH.php                       | 2 +-
 XMPPHP/XMLStream.php                  | 6 +++---
 XMPPHP/XMPP.php                       | 4 ++--
 XMPPHP/XMPP_Old.php                   | 2 +-
 examples/cli_longrun_example.php      | 2 +-
 examples/cli_longrun_example_bosh.php | 2 +-
 examples/sendmessage_example.php      | 2 +-
 examples/webclient_example.php        | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/XMPPHP/BOSH.php b/XMPPHP/BOSH.php
index dacb3b4..49e977d 100644
--- a/XMPPHP/BOSH.php
+++ b/XMPPHP/BOSH.php
@@ -27,7 +27,7 @@
  */
 
 /** XMPPHP_XMLStream */
-require_once 'XMPPHP/XMPP.php';
+require_once dirname(__FILE__) . '/XMPP.php';
 
 /**
  * XMPPHP Main Class
diff --git a/XMPPHP/XMLStream.php b/XMPPHP/XMLStream.php
index a39e12e..cd03c96 100644
--- a/XMPPHP/XMLStream.php
+++ b/XMPPHP/XMLStream.php
@@ -27,13 +27,13 @@
  */
 
 /** XMPPHP_Exception */
-require_once 'XMPPHP/Exception.php';
+require_once dirname(__FILE__) . '/Exception.php';
 
 /** XMPPHP_XMLObj */
-require_once 'XMPPHP/XMLObj.php';
+require_once dirname(__FILE__) . '/XMLObj.php';
 
 /** XMPPHP_Log */
-require_once 'XMPPHP/Log.php';
+require_once dirname(__FILE__) . '/Log.php';
 
 /**
  * XMPPHP XML Stream
diff --git a/XMPPHP/XMPP.php b/XMPPHP/XMPP.php
index ffd9340..76a26ba 100644
--- a/XMPPHP/XMPP.php
+++ b/XMPPHP/XMPP.php
@@ -27,8 +27,8 @@
  */
 
 /** XMPPHP_XMLStream */
-require_once 'XMPPHP/XMLStream.php';
-require_once 'XMPPHP/Roster.php';
+require_once dirname(__FILE__) . '/XMLStream.php';
+require_once dirname(__FILE__) . '/Roster.php';
 
 /**
  * XMPPHP Main Class
diff --git a/XMPPHP/XMPP_Old.php b/XMPPHP/XMPP_Old.php
index 43f56b1..6083dad 100644
--- a/XMPPHP/XMPP_Old.php
+++ b/XMPPHP/XMPP_Old.php
@@ -33,7 +33,7 @@
  * The old Jabber protocol wasn't standardized, so use at your own risk.
  *
  */
-require_once "XMPP.php";
+require_once dirname(__FILE__) . '/XMPP.php';
 
 	class XMPPHP_XMPPOld extends XMPPHP_XMPP {
 		/**
diff --git a/examples/cli_longrun_example.php b/examples/cli_longrun_example.php
index 59bb29d..e15b924 100644
--- a/examples/cli_longrun_example.php
+++ b/examples/cli_longrun_example.php
@@ -3,7 +3,7 @@
 // activate full error reporting
 //error_reporting(E_ALL & E_STRICT);
 
-include 'XMPPHP/XMPP.php';
+include dirname(dirname(__FILE__)).'/XMPPHP/XMPP.php';
 
 #Use XMPPHP_Log::LEVEL_VERBOSE to get more logging for error reports
 #If this doesn't work, are you running 64-bit PHP with < 5.2.6?
diff --git a/examples/cli_longrun_example_bosh.php b/examples/cli_longrun_example_bosh.php
index 21b63f1..80da540 100644
--- a/examples/cli_longrun_example_bosh.php
+++ b/examples/cli_longrun_example_bosh.php
@@ -3,7 +3,7 @@
 // activate full error reporting
 //error_reporting(E_ALL & E_STRICT);
 
-include 'XMPPHP/BOSH.php';
+include dirname(dirname(__FILE__)).'/XMPPHP/BOSH.php';
 
 #Use XMPPHP_Log::LEVEL_VERBOSE to get more logging for error reports
 #If this doesn't work, are you running 64-bit PHP with < 5.2.6?
diff --git a/examples/sendmessage_example.php b/examples/sendmessage_example.php
index e506130..60d5e6f 100644
--- a/examples/sendmessage_example.php
+++ b/examples/sendmessage_example.php
@@ -3,7 +3,7 @@
 // activate full error reporting
 //error_reporting(E_ALL & E_STRICT);
 
-include 'XMPPHP/XMPP.php';
+include dirname(dirname(__FILE__)).'/XMPPHP/XMPP.php';
 
 #Use XMPPHP_Log::LEVEL_VERBOSE to get more logging for error reports
 #If this doesn't work, are you running 64-bit PHP with < 5.2.6?
diff --git a/examples/webclient_example.php b/examples/webclient_example.php
index eb40e82..fa04f7a 100644
--- a/examples/webclient_example.php
+++ b/examples/webclient_example.php
@@ -4,7 +4,7 @@ header('content-type', 'plain/text');
 // activate full error reporting
 //error_reporting(E_ALL & E_STRICT);
 
-include 'XMPPHP/BOSH.php';
+include dirname(dirname(__FILE__)).'/XMPPHP/BOSH.php';
 print "<pre>";
 
 #Use XMPPHP_Log::LEVEL_VERBOSE to get more logging for error reports