minor changes

This commit is contained in:
tomas 2005-04-28 00:45:34 +00:00
parent ecf5284a5c
commit 71f930feef
3 changed files with 11 additions and 11 deletions

View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ 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 $ 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 * Core of LiveSupport file storage module
* *
* @author $Author: tomas $ * @author $Author: tomas $
* @version $Revision: 1.47 $ * @version $Revision: 1.48 $
* @see Alib * @see Alib
*/ */
class BasicStor extends Alib{ class BasicStor extends Alib{
@ -1335,13 +1335,13 @@ class BasicStor extends Alib{
$this->deleteData(); $this->deleteData();
$this->testData(); $this->testData();
if($this->config['useTrash']){ if($this->config['useTrash']){
$trash = "{$this->config['TrashName']}\n "; $trash = "\n {$this->config['TrashName']}";
}else{ }else{
$trash = ""; $trash = "";
} }
if(!$this->config['isArchive']){ if(!$this->config['isArchive']){
$this->test_correct = " StorageRoot $this->test_correct = " StorageRoot
{$trash}root root
test1 test1
file1.mp3 file1.mp3
public public
@ -1356,11 +1356,11 @@ class BasicStor extends Alib{
test3 test3
public public
test4 test4
public public{$trash}
"; ";
}else{ }else{
$this->test_correct = " StorageRoot $this->test_correct = " StorageRoot
{$trash}root root
test1 test1
file1.mp3 file1.mp3
test1_folder1 test1_folder1
@ -1371,7 +1371,7 @@ class BasicStor extends Alib{
test2 test2
test2_folder1 test2_folder1
test3 test3
test4 test4{$trash}
"; ";
} }
$this->test_dump = $this->dumpTree($this->storId, ' ', ' ', '{name}'); $this->test_dump = $this->dumpTree($this->storId, ' ', ' ', '{name}');

View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ 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 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -80,7 +80,7 @@ $config = array(
'authCookieName'=> 'lssid', 'authCookieName'=> 'lssid',
'StationPrefsGr'=> 'StationPrefs', 'StationPrefsGr'=> 'StationPrefs',
'AllGr' => 'All', 'AllGr' => 'All',
'TrashName' => '.trash', 'TrashName' => 'trash_',
'storageDir' => dirname(__FILE__).'/../../storageServer/var/stor', 'storageDir' => dirname(__FILE__).'/../../storageServer/var/stor',
'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer', 'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer',
'transDir' => dirname(__FILE__).'/../../storageServer/var/trans', 'transDir' => dirname(__FILE__).'/../../storageServer/var/trans',

View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ 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 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php.template,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -80,7 +80,7 @@ $config = array(
'authCookieName'=> 'lssid', 'authCookieName'=> 'lssid',
'StationPrefsGr'=> 'StationPrefs', 'StationPrefsGr'=> 'StationPrefs',
'AllGr' => 'All', 'AllGr' => 'All',
'TrashName' => '.trash', 'TrashName' => 'trash_',
'storageDir' => dirname(__FILE__).'/../../storageServer/var/stor', 'storageDir' => dirname(__FILE__).'/../../storageServer/var/stor',
'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer', 'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer',
'transDir' => dirname(__FILE__).'/../../storageServer/var/trans', 'transDir' => dirname(__FILE__).'/../../storageServer/var/trans',