diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index adf8c8049..a4be47637 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -130,7 +130,7 @@ class UI extends UI_Default { /* Set some configuration parameters */ $view->setParam('accessobject', new SeedDMS_AccessOperation($dms, $user, $settings)); $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('theme', $theme); $view->setParam('class', $class); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 9971ab39a..9538d086e 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -115,7 +115,11 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style { /** * 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 $type can be 'password', 'array' * @param string $placeholder placeholder for input field @@ -132,7 +136,7 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style { $value = $settings->{"_".$name}; echo " "; 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 echo getMLText('settings_conf_field_not_editable'); echo "\n"; @@ -476,7 +480,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk)) --> showConfigHeadline('settings_Server'); ?> showConfigText('settings_rootDir', 'rootDir'); ?> -showConfigText('settings_baseUrl', 'baseUrl'); ?> +showConfigText('settings_baseUrl', 'baseUrl', '', getBaseUrl()); ?> showConfigText('settings_httpRoot', 'httpRoot'); ?> showConfigText('settings_contentDir', 'contentDir'); ?> showConfigText('settings_backupDir', 'backupDir'); ?> @@ -868,4 +872,13 @@ if(is_writeable($settings->_configFilePath)) { $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 + */