gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 17:05:46 +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 2022-06-02 17:37:21 +02:00
commit 38dd38d7c6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SeedDMS_Core/Core/inc.DBAccessPDO.php
View File

@ -227,7 +227,7 @@ class SeedDMS_Core_DatabaseAccess {
if($this->_logfile) {
$this->_logfp = fopen($this->_logfile, 'a+');
if($this->_logfp)
fwrite($this->_logfp, microtime()." BEGIN ------------------------------------------\n");
fwrite($this->_logfp, microtime()." BEGIN ".$_SERVER['REQUEST_URI']." ------------------------------------------\n");
} else
$this->_logfp = null;
// $tt*****id is a hack to ensure that we do not try to create the

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

@ -117,7 +117,7 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
$settings = $this->params['settings'];
?>
<tr title="<?= getMLText($title."_desc") ?>">
<td><?= getMLText($title) ?>:</td>
<td><?= getMLText($title) ?></td>
<?php
if($type === 'array')
$value = $settings->arrayToString($settings->{"_".$name});
@ -144,7 +144,7 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
$settings = $this->params['settings'];
?>
<tr title="<?= htmlspecialchars($title_desc) ?>">
<td><?= $title ?>:</td>
<td><?= $title ?></td>
<td><?= $rawdata ?></td>
</tr>
<?php
@ -160,7 +160,7 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
$settings = $this->params['settings'];
?>
<tr title="<?= getMLText($title."_desc") ?>">
<td><?= getMLText($title) ?>:</td>
<td><?= getMLText($title) ?></td>
<td><input name="<?= $name ?>" type="checkbox" <?php if ($settings->{"_".$name}) echo "checked" ?> /></td>
</tr>
<?php
@ -173,7 +173,7 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
// echo $isass ? 'asso' : 'indexed';
?>
<tr title="<?= getMLText($title."_desc") ?>">
<td><?= getMLText($title) ?>:</td>
<td><?= getMLText($title) ?></td>
<td>
<?php if($multiple) { ?>
<select class="form-control" name="<?= $name ?>[]" multiple>
@ -199,7 +199,7 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
$dms = $this->params['dms'];
?>
<tr title="<?= getMLText($title."_desc") ?>">
<td><?= getMLText($title) ?>:</td>
<td><?= getMLText($title) ?></td>
<td>
<?php
$users = $dms->getAllUsers();