From b1528afa1ba01ea00b813ca75f8bdfc3f95e5d8c Mon Sep 17 00:00:00 2001
From: tomas <tomas@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Wed, 25 May 2005 23:35:02 +0000
Subject: [PATCH] Require paths fixed.

---
 .../modules/storageServer/var/BasicStor.php      |  8 ++++----
 .../modules/storageServer/var/GreenBox.php       | 16 ++++++++--------
 .../modules/storageServer/var/StoredFile.php     |  4 ++--
 .../modules/storageServer/var/Validator.php      |  4 +---
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/livesupport/modules/storageServer/var/BasicStor.php b/livesupport/modules/storageServer/var/BasicStor.php
index f342c8d72..e1c7ad5fb 100644
--- a/livesupport/modules/storageServer/var/BasicStor.php
+++ b/livesupport/modules/storageServer/var/BasicStor.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.51 $
+    Version  : $Revision: 1.52 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/BasicStor.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -43,7 +43,7 @@ define('GBERR_LOCK', 52);
 
 define('GBERR_NOTIMPL', 69);
 
-require_once "../../../alib/var/alib.php";
+require_once dirname(__FILE__)."/../../alib/var/alib.php";
 require_once "StoredFile.php";
 require_once "Transport.php";
 
@@ -53,7 +53,7 @@ require_once "Transport.php";
  *  Core of LiveSupport file storage module
  *
  *  @author  $Author: tomas $
- *  @version $Revision: 1.51 $
+ *  @version $Revision: 1.52 $
  *  @see Alib
  */
 class BasicStor extends Alib{
@@ -1253,7 +1253,7 @@ class BasicStor extends Alib{
             $tr->resetData();
         }
         $rootHD = $this->getObjId('root', $this->storId);
-        include"../tests/sampleData.php";
+        include dirname(__FILE__)."/tests/sampleData.php";
         $res = array(
             'audioclips'=>array(), 'playlists'=>array(), 'webstreams'=>array()
         );
diff --git a/livesupport/modules/storageServer/var/GreenBox.php b/livesupport/modules/storageServer/var/GreenBox.php
index 231b668de..818ba5aa4 100644
--- a/livesupport/modules/storageServer/var/GreenBox.php
+++ b/livesupport/modules/storageServer/var/GreenBox.php
@@ -23,7 +23,7 @@
 
 
     Author   : $Author: tomas $
-    Version  : $Revision: 1.60 $
+    Version  : $Revision: 1.61 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/GreenBox.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -35,7 +35,7 @@ require_once "BasicStor.php";
  *  LiveSupport file storage module
  *
  *  @author  $Author: tomas $
- *  @version $Revision: 1.60 $
+ *  @version $Revision: 1.61 $
  *  @see BasicStor
  */
 class GreenBox extends BasicStor{
@@ -684,7 +684,7 @@ class GreenBox extends BasicStor{
      */
     function loadPref($sessid, $key)
     {
-        require_once '../../../storageServer/var/Prefs.php';
+        require_once 'Prefs.php';
         $pr =& new Prefs($this);
         $res = $pr->loadPref($sessid, $key);
         return $res;
@@ -700,7 +700,7 @@ class GreenBox extends BasicStor{
      */
     function savePref($sessid, $key, $value)
     {
-        require_once '../../../storageServer/var/Prefs.php';
+        require_once 'Prefs.php';
         $pr =& new Prefs($this);
         $res = $pr->savePref($sessid, $key, $value);
         return $res;
@@ -715,7 +715,7 @@ class GreenBox extends BasicStor{
      */
     function delPref($sessid, $key)
     {
-        require_once '../../../storageServer/var/Prefs.php';
+        require_once 'Prefs.php';
         $pr =& new Prefs($this);
         $res = $pr->delPref($sessid, $key);
         return $res;
@@ -731,7 +731,7 @@ class GreenBox extends BasicStor{
      */
     function loadGroupPref($sessid, $group, $key)
     {
-        require_once '../../../storageServer/var/Prefs.php';
+        require_once 'Prefs.php';
         $pr =& new Prefs($this);
         $res = $pr->loadGroupPref($sessid, $group, $key);
         return $res;
@@ -748,7 +748,7 @@ class GreenBox extends BasicStor{
      */
     function saveGroupPref($sessid, $group, $key, $value)
     {
-        require_once '../../../storageServer/var/Prefs.php';
+        require_once 'Prefs.php';
         $pr =& new Prefs($this);
         $res = $pr->saveGroupPref($sessid, $group, $key, $value);
         return $res;
@@ -764,7 +764,7 @@ class GreenBox extends BasicStor{
      */
     function delGroupPref($sessid, $group, $key)
     {
-        require_once '../../../storageServer/var/Prefs.php';
+        require_once 'Prefs.php';
         $pr =& new Prefs($this);
         $res = $pr->delGroupPref($sessid, $group, $key);
         return $res;
diff --git a/livesupport/modules/storageServer/var/StoredFile.php b/livesupport/modules/storageServer/var/StoredFile.php
index 281c348ed..00136af0c 100644
--- a/livesupport/modules/storageServer/var/StoredFile.php
+++ b/livesupport/modules/storageServer/var/StoredFile.php
@@ -23,13 +23,13 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.26 $
+    Version  : $Revision: 1.27 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/StoredFile.php,v $
 
 ------------------------------------------------------------------------------*/
 require_once "RawMediaData.php";
 require_once "MetaData.php";
-require_once "../../../getid3/var/getid3.php";
+require_once dirname(__FILE__)."/../../getid3/var/getid3.php";
  
 /**
  *  StoredFile class
diff --git a/livesupport/modules/storageServer/var/Validator.php b/livesupport/modules/storageServer/var/Validator.php
index df219a835..d2c654174 100644
--- a/livesupport/modules/storageServer/var/Validator.php
+++ b/livesupport/modules/storageServer/var/Validator.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.7 $
+    Version  : $Revision: 1.8 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/Validator.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -40,8 +40,6 @@ define('VAL_NOREQA', 119);
 define('VAL_ATTRIB', 120);
 define('VAL_PREDXML', 121);
 
-#require_once "";
-
 /**
  *  Simple XML validator against structure stored in PHP hash-array hierarchy.
  *