From 4675c785dba9cc11823180c792c233a823ae1d9d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 21 Feb 2020 10:01:09 +0100 Subject: [PATCH] set configuration for http proxy --- inc/inc.ClassSettings.php | 6 ++++++ op/op.Settings.php | 3 +++ views/bootstrap/class.Settings.php | 3 +++ 3 files changed, 12 insertions(+) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index c6d226963..7efe05413 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -96,6 +96,12 @@ class Settings { /* {{{ */ var $_backupDir = null; // Where the repository for extensions is located var $_repositoryUrl = null; + // URL of proxy + var $_proxyUrl = null; + // User of proxy + var $_proxyUser = null; + // Password of proxy + var $_proxyPassword = null; // enable removal of file from dropfolder after success import var $_removeFromDropFolder = false; // Where the stop word file is located diff --git a/op/op.Settings.php b/op/op.Settings.php index be279b10f..fd2ff9a34 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -127,6 +127,9 @@ if ($action == "saveSettings") $settings->_dropFolderDir = addDirSep($_POST["dropFolderDir"]); $settings->_backupDir = addDirSep($_POST["backupDir"]); $settings->_repositoryUrl = addDirSep($_POST["repositoryUrl"]); + $settings->_proxyUrl = addDirSep($_POST["proxyUrl"]); + $settings->_proxyUser = addDirSep($_POST["proxyUser"]); + $settings->_proxyPassword = addDirSep($_POST["proxyPassword"]); $settings->_logFileEnable = getBoolValue("logFileEnable"); $settings->_logFileRotation = $_POST["logFileRotation"]; $settings->_enableLargeFileUpload = getBoolValue("enableLargeFileUpload"); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 36eb97863..9d12d62fa 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -348,6 +348,9 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); showConfigText('settings_luceneDir', 'luceneDir'); ?> showConfigText('settings_dropFolderDir', 'dropFolderDir'); ?> showConfigText('settings_repositoryUrl', 'repositoryUrl'); ?> +showConfigText('settings_proxyUrl', 'proxyUrl'); ?> +showConfigText('settings_proxyUser', 'proxyUser'); ?> +showConfigText('settings_proxyUPassword', 'proxyPassword', 'password'); ?> showConfigCheckbox('settings_logFileEnable', 'logFileEnable'); ?> showConfigOption('settings_logFileRotation', 'logFileRotation', array('h'=>'hourly', 'd'=>'daily', 'm'=>'monthly'), false, true); ?> showConfigCheckbox('settings_enableLargeFileUpload', 'enableLargeFileUpload'); ?>