gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +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 2024-09-07 21:52:26 +02:00
commit 2d4d4c59a3
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/inc.ClassUI.php
View File

@ -130,7 +130,7 @@ class UI extends UI_Default {
/* Set some configuration parameters */ /* Set some configuration parameters */
$view->setParam('accessobject', new SeedDMS_AccessOperation($dms, $user, $settings)); $view->setParam('accessobject', new SeedDMS_AccessOperation($dms, $user, $settings));
$view->setParam('referer', isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''); $view->setParam('referer', isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '');
$view->setParam('refferer', $_SERVER['REQUEST_URI']); $view->setParam('requesturi', $_SERVER['REQUEST_URI']);
$view->setParam('absbaseprefix', $settings->_httpRoot.$httpbasedir); $view->setParam('absbaseprefix', $settings->_httpRoot.$httpbasedir);
$view->setParam('theme', $theme); $view->setParam('theme', $theme);
$view->setParam('class', $class); $view->setParam('class', $class);

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

@ -115,7 +115,11 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
/** /**
* Show a text input configuration option * Show a text input configuration option
* *
* @param string $title title of the option * The parameter $title is the key of the language phrase. {$title}_desc
* is the description and {$title}_placeholder will be used as placeholder,
* if $placeholder is not set.
*
* @param string $title title key of the option
* @param string $name name of html input field * @param string $name name of html input field
* @param string $type can be 'password', 'array' * @param string $type can be 'password', 'array'
* @param string $placeholder placeholder for input field * @param string $placeholder placeholder for input field
@ -132,7 +136,7 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
$value = $settings->{"_".$name}; $value = $settings->{"_".$name};
echo " <td>"; echo " <td>";
if($this->isVisible($name)) if($this->isVisible($name))
$this->showTextField($name, $value, ($type=='password' || $type=='textarea' ? $type : ''), $placeholder); $this->showTextField($name, $value, ($type=='password' || $type=='textarea' ? $type : ''), $placeholder ? $placeholder : getMLText($title."_placeholder", [], ""));
else else
echo getMLText('settings_conf_field_not_editable'); echo getMLText('settings_conf_field_not_editable');
echo "</td>\n"; echo "</td>\n";
@ -476,7 +480,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
--> -->
<?php $this->showConfigHeadline('settings_Server'); ?> <?php $this->showConfigHeadline('settings_Server'); ?>
<?php $this->showConfigText('settings_rootDir', 'rootDir'); ?> <?php $this->showConfigText('settings_rootDir', 'rootDir'); ?>
<?php $this->showConfigText('settings_baseUrl', 'baseUrl'); ?> <?php $this->showConfigText('settings_baseUrl', 'baseUrl', '', getBaseUrl()); ?>
<?php $this->showConfigText('settings_httpRoot', 'httpRoot'); ?> <?php $this->showConfigText('settings_httpRoot', 'httpRoot'); ?>
<?php $this->showConfigText('settings_contentDir', 'contentDir'); ?> <?php $this->showConfigText('settings_contentDir', 'contentDir'); ?>
<?php $this->showConfigText('settings_backupDir', 'backupDir'); ?> <?php $this->showConfigText('settings_backupDir', 'backupDir'); ?>
@ -868,4 +872,13 @@ if(is_writeable($settings->_configFilePath)) {
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */
} }
?>
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* indent-tabs-mode: t
* End:
* vim600: fdm=marker
* vim: noet sw=2 ts=2
*/