From 71f930feef0217c4795fd9358adcea376c17d8e6 Mon Sep 17 00:00:00 2001
From: tomas <tomas@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Thu, 28 Apr 2005 00:45:34 +0000
Subject: [PATCH] minor changes

---
 .../modules/storageServer/var/BasicStor.php        | 14 +++++++-------
 livesupport/modules/storageServer/var/conf.php     |  4 ++--
 .../modules/storageServer/var/conf.php.template    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/livesupport/modules/storageServer/var/BasicStor.php b/livesupport/modules/storageServer/var/BasicStor.php
index 0fa4062fb..d3b6bd291 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.47 $
+    Version  : $Revision: 1.48 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/BasicStor.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -53,7 +53,7 @@ require_once "Transport.php";
  *  Core of LiveSupport file storage module
  *
  *  @author  $Author: tomas $
- *  @version $Revision: 1.47 $
+ *  @version $Revision: 1.48 $
  *  @see Alib
  */
 class BasicStor extends Alib{
@@ -1335,13 +1335,13 @@ class BasicStor extends Alib{
         $this->deleteData();
         $this->testData();
         if($this->config['useTrash']){
-            $trash = "{$this->config['TrashName']}\n        ";
+            $trash = "\n        {$this->config['TrashName']}";
         }else{
             $trash = "";
         }
         if(!$this->config['isArchive']){
             $this->test_correct = "    StorageRoot
-        {$trash}root
+        root
         test1
             file1.mp3
             public
@@ -1356,11 +1356,11 @@ class BasicStor extends Alib{
         test3
             public
         test4
-            public
+            public{$trash}
 ";
         }else{
             $this->test_correct = "    StorageRoot
-        {$trash}root
+        root
         test1
             file1.mp3
             test1_folder1
@@ -1371,7 +1371,7 @@ class BasicStor extends Alib{
         test2
             test2_folder1
         test3
-        test4
+        test4{$trash}
 ";
         }
         $this->test_dump = $this->dumpTree($this->storId, '    ', '    ', '{name}');
diff --git a/livesupport/modules/storageServer/var/conf.php b/livesupport/modules/storageServer/var/conf.php
index 9a44839f0..8d63810df 100644
--- a/livesupport/modules/storageServer/var/conf.php
+++ b/livesupport/modules/storageServer/var/conf.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.19 $
+    Version  : $Revision: 1.20 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -80,7 +80,7 @@ $config = array(
     'authCookieName'=> 'lssid',
     'StationPrefsGr'=> 'StationPrefs',
     'AllGr'         => 'All',
-    'TrashName'     => '.trash',
+    'TrashName'     => 'trash_',
     'storageDir'    =>  dirname(__FILE__).'/../../storageServer/var/stor',
     'bufferDir'     =>  dirname(__FILE__).'/../../storageServer/var/stor/buffer',
     'transDir'      =>  dirname(__FILE__).'/../../storageServer/var/trans',
diff --git a/livesupport/modules/storageServer/var/conf.php.template b/livesupport/modules/storageServer/var/conf.php.template
index f5010db69..0cf193f88 100644
--- a/livesupport/modules/storageServer/var/conf.php.template
+++ b/livesupport/modules/storageServer/var/conf.php.template
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php.template,v $
 
 ------------------------------------------------------------------------------*/
@@ -80,7 +80,7 @@ $config = array(
     'authCookieName'=> 'lssid',
     'StationPrefsGr'=> 'StationPrefs',
     'AllGr'         => 'All',
-    'TrashName'     => '.trash',
+    'TrashName'     => 'trash_',
     'storageDir'    =>  dirname(__FILE__).'/../../storageServer/var/stor',
     'bufferDir'     =>  dirname(__FILE__).'/../../storageServer/var/stor/buffer',
     'transDir'      =>  dirname(__FILE__).'/../../storageServer/var/trans',