gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-04-11 17:37:04 +02:00
commit c9bdac8d33
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/inc.ClassSettings.php
View File

@ -205,7 +205,7 @@ class Settings { /* {{{ */
// enable/disable list of tasks in main menu
var $_enableMenuTasks = true;
// enable/disable display of the session list
var $_enableSessionList = true;
var $_enableSessionList = false;
// enable/disable display of the drop zone for file upload
var $_enableDropUpload = true;
// enable/disable display of the folder tree
@ -759,7 +759,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "enableConverting", $this->_enableConverting);
$this->setXMLAttributValue($node, "enableEmail", $this->_enableEmail);
$this->setXMLAttributValue($node, "enableUsersView", $this->_enableUsersView);
$this->setXMLAttributValue($node, "enableClipboard", $this->_enableSessionList);
$this->setXMLAttributValue($node, "enableSessionList", $this->_enableSessionList);
$this->setXMLAttributValue($node, "enableClipboard", $this->_enableClipboard);
$this->setXMLAttributValue($node, "enableMenuTasks", $this->_enableMenuTasks);
$this->setXMLAttributValue($node, "enableDropUpload", $this->_enableDropUpload);

2
views/bootstrap/class.Settings.php
View File

@ -275,7 +275,7 @@ if(!is_writeable($settings->_configFilePath)) {
</tr>
<tr title="<?php printMLText("settings_enableSessionList_desc");?>">
<td><?php printMLText("settings_enableSessionList");?>:</td>
<td><input name="enableSessionList" type="checkbox" <?php if ($settings->_enableClipboard) echo "checked" ?> /></td>
<td><input name="enableSessionList" type="checkbox" <?php if ($settings->_enableSessionList) echo "checked" ?> /></td>
</tr>
<tr title="<?php printMLText("settings_enableDropUpload_desc");?>">
<td><?php printMLText("settings_enableDropUpload");?>:</td>