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 2021-12-15 08:40:37 +01:00
commit 5ec5bab294
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -216,6 +216,8 @@
--------------------------------------------------------------------------------
Changes in version 5.1.25
--------------------------------------------------------------------------------
- certain fields in configuration can be disabled for editing, also works for
configuration fields of extensions
--------------------------------------------------------------------------------
Changes in version 5.1.24

11
op/op.Settings.php
View File

@ -310,13 +310,16 @@ if ($action == "saveSettings")
}
// SETTINGS - EXTENSIONS
if(isset($_POST['extensions']) && !in_array('extensions', $settings->_hiddenConfFields)) {
if(isset($_POST['extensions'])) {
foreach($_POST['extensions'] as $extname=>$conf) {
if(!in_array('extensions|'.$extname, $settings->_hiddenConfFields)) {
$settings->_extensions[$extname] = $conf;
if(!in_array($extname.'|', $settings->_hiddenConfFields)) {
foreach($conf as $confname=>$confval) {
if(!in_array($extname.'|'.$confname, $settings->_hiddenConfFields)) {
$settings->_extensions[$extname][$confname] = $confval;
}
}
}
}
// $settings->_extensions = isset($_POST["extensions"]) ? $_POST["extensions"] : array();
}
// -------------------------------------------------------------------------

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

@ -573,10 +573,12 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
if($this->hasHook('processConfig'))
$extconf = $this->callHook('processConfig', $extname, $extconf);
if($extconf['config']) {
$this->showRawConfigHeadline("<a name=\"".$extname."\"></a>".'<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" /><i class="fa fa-circle'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? ' disabled' : ' enabled').'"></i> <span title="'.$extname.'">'.$extconf['title'].'</span>');
foreach($extconf['config'] as $confkey=>$conf) {
ob_start();
if($this->isVisible($extname.'|')) {
if($extconf['config']) {
$this->showRawConfigHeadline("<a name=\"".$extname."\"></a>".'<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" /><i class="fa fa-circle'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? ' disabled' : ' enabled').'"></i> <span title="'.$extname.'">'.$extconf['title'].'</span>');
foreach($extconf['config'] as $confkey=>$conf) {
ob_start();
if($this->isVisible($extname.'|'.$confkey)) {
switch($conf['type']) {
case 'checkbox':
?>
@ -692,15 +694,19 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
default:
$this->showTextField("extensions[".$extname."][".$confkey."]", isset($settings->_extensions[$extname][$confkey]) ? $settings->_extensions[$extname][$confkey] : '', isset($conf['type']) ? $conf['type'] : '', isset($conf['placeholder']) ? $conf['placeholder'] : '');
}
$html = ob_get_clean();
$this->showConfigPlain($conf['title'], isset($conf['help']) ? $conf['help'] : '', $html);
} else {
echo getMLText('settings_conf_field_not_editable');
}
} else {
/* Even no configuration exists, output the input field to enable/disable
* the extension. Otherwise it will be enabled each time the config is
* saved.
*/
echo '<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" />'."\n";
$html = ob_get_clean();
$this->showConfigPlain($conf['title'], isset($conf['help']) ? $conf['help'] : '', $html);
}
} else {
/* Even no configuration exists, output the input field to enable/disable
* the extension. Otherwise it will be enabled each time the config is
* saved.
*/
echo '<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" />'."\n";
}
}
}
$this->showEndPaneContent('extensions', $currenttab);