backup dir can be set

This commit is contained in:
Uwe Steinmann 2015-07-28 07:29:08 +02:00
parent b520bfece0
commit ff53a3e3e5
3 changed files with 17 additions and 8 deletions

View File

@ -85,6 +85,8 @@ class Settings { /* {{{ */
var $_luceneDir = null; var $_luceneDir = null;
// Where the drop folders are located // Where the drop folders are located
var $_dropFolderDir = null; var $_dropFolderDir = null;
// Where the backup directory is located
var $_backupDir = null;
// Where the library folder is located // Where the library folder is located
var $_libraryFolder = 1; var $_libraryFolder = 1;
// Where the checked out files are located // Where the checked out files are located
@ -390,6 +392,7 @@ class Settings { /* {{{ */
$this->_stagingDir = strval($tab["stagingDir"]); $this->_stagingDir = strval($tab["stagingDir"]);
$this->_luceneDir = strval($tab["luceneDir"]); $this->_luceneDir = strval($tab["luceneDir"]);
$this->_dropFolderDir = strval($tab["dropFolderDir"]); $this->_dropFolderDir = strval($tab["dropFolderDir"]);
$this->_backupDir = strval($tab["backupDir"]);
$this->_checkOutDir = strval($tab["checkOutDir"]); $this->_checkOutDir = strval($tab["checkOutDir"]);
$this->_createCheckOutDir = Settings::boolVal($tab["createCheckOutDir"]); $this->_createCheckOutDir = Settings::boolVal($tab["createCheckOutDir"]);
$this->_logFileEnable = Settings::boolVal($tab["logFileEnable"]); $this->_logFileEnable = Settings::boolVal($tab["logFileEnable"]);
@ -698,6 +701,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "stagingDir", $this->_stagingDir); $this->setXMLAttributValue($node, "stagingDir", $this->_stagingDir);
$this->setXMLAttributValue($node, "luceneDir", $this->_luceneDir); $this->setXMLAttributValue($node, "luceneDir", $this->_luceneDir);
$this->setXMLAttributValue($node, "dropFolderDir", $this->_dropFolderDir); $this->setXMLAttributValue($node, "dropFolderDir", $this->_dropFolderDir);
$this->setXMLAttributValue($node, "backupDir", $this->_backupDir);
$this->setXMLAttributValue($node, "checkOutDir", $this->_checkOutDir); $this->setXMLAttributValue($node, "checkOutDir", $this->_checkOutDir);
$this->setXMLAttributValue($node, "createCheckOutDir", $this->_createCheckOutDir); $this->setXMLAttributValue($node, "createCheckOutDir", $this->_createCheckOutDir);
$this->setXMLAttributValue($node, "logFileEnable", $this->_logFileEnable); $this->setXMLAttributValue($node, "logFileEnable", $this->_logFileEnable);

View File

@ -89,15 +89,16 @@ if ($action == "saveSettings")
$settings->_firstDayOfWeek = intval($_POST["firstDayOfWeek"]); $settings->_firstDayOfWeek = intval($_POST["firstDayOfWeek"]);
// SETTINGS - SYSTEM - SERVER // SETTINGS - SYSTEM - SERVER
$settings->_rootDir = $_POST["rootDir"]; $settings->_rootDir = addDirSep($_POST["rootDir"]);
$settings->_httpRoot = $_POST["httpRoot"]; $settings->_httpRoot = $_POST["httpRoot"];
$settings->_contentDir = $_POST["contentDir"]; $settings->_contentDir = addDirSep($_POST["contentDir"]);
$settings->_cacheDir = $_POST["cacheDir"]; $settings->_cacheDir = addDirSep($_POST["cacheDir"]);
$settings->_stagingDir = $_POST["stagingDir"]; $settings->_stagingDir = addDirSep($_POST["stagingDir"]);
$settings->_luceneDir = $_POST["luceneDir"]; $settings->_luceneDir = addDirSep($_POST["luceneDir"]);
$settings->_extraPath = $_POST["extraPath"]; $settings->_extraPath = addDirSep($_POST["extraPath"]);
$settings->_dropFolderDir = $_POST["dropFolderDir"]; $settings->_dropFolderDir = addDirSep($_POST["dropFolderDir"]);
$settings->_checkOutDir = $_POST["checkOutDir"]; $settings->_backupDir = addDirSep($_POST["backupDir"]);
$settings->_checkOutDir = addDirSep($_POST["checkOutDir"]);
$settings->_createCheckOutDir = getBoolValue("createCheckOutDir"); $settings->_createCheckOutDir = getBoolValue("createCheckOutDir");
$settings->_logFileEnable = getBoolValue("logFileEnable"); $settings->_logFileEnable = getBoolValue("logFileEnable");
$settings->_logFileRotation = $_POST["logFileRotation"]; $settings->_logFileRotation = $_POST["logFileRotation"];

View File

@ -282,6 +282,10 @@ if(!is_writeable($settings->_configFilePath)) {
<td><?php printMLText("settings_contentDir");?>:</td> <td><?php printMLText("settings_contentDir");?>:</td>
<td><input type="text" name="contentDir" value="<?php echo $settings->_contentDir ?>" size="100" /></td> <td><input type="text" name="contentDir" value="<?php echo $settings->_contentDir ?>" size="100" /></td>
</tr> </tr>
<tr title="<?php printMLText("settings_backupDir_desc");?>">
<td><?php printMLText("settings_backupDir");?>:</td>
<td><input type="text" name="backupDir" value="<?php echo $settings->_backupDir ?>" size="100" /></td>
</tr>
<tr title="<?php printMLText("settings_cacheDir_desc");?>"> <tr title="<?php printMLText("settings_cacheDir_desc");?>">
<td><?php printMLText("settings_cacheDir");?>:</td> <td><?php printMLText("settings_cacheDir");?>:</td>
<td><input type="text" name="cacheDir" value="<?php echo $settings->_cacheDir ?>" size="100" /></td> <td><input type="text" name="cacheDir" value="<?php echo $settings->_cacheDir ?>" size="100" /></td>