L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-36950 Make mdeploy.php accept proxy related settings

Browse Source
This commit is contained in:
David Mudrák
2012-11-30 16:11:52 +01:00
parent 333048e06b
commit 42c6731c9f
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mdeploy.php
+24
View File
@@ -171,6 +171,9 @@ class input_manager extends singleton_pattern {
$supportedoptions = array(
array('', 'passfile', input_manager::TYPE_FILE, 'File name of the passphrase file (HTTP access only)'),
array('', 'password', input_manager::TYPE_RAW, 'Session passphrase (HTTP access only)'),
array('', 'proxy', input_manager::TYPE_RAW, 'HTTP proxy host and port (e.g. \'our.proxy.edu:8888\')'),
array('', 'proxytype', input_manager::TYPE_RAW, 'Proxy type (HTTP or SOCKS5)'),
array('', 'proxyuserpwd', input_manager::TYPE_RAW, 'Proxy username and password (e.g. \'username:password\')'),
array('', 'returnurl', input_manager::TYPE_URL, 'Return URL (HTTP access only)'),
array('d', 'dataroot', input_manager::TYPE_PATH, 'Full path to the dataroot (moodledata) directory'),
array('h', 'help', input_manager::TYPE_FLAG, 'Prints usage information'),
@@ -979,6 +982,27 @@ class worker extends singleton_pattern {
curl_setopt($ch, CURLOPT_CAINFO, $cacertfile);
}
$proxy = $this->input->get_option('proxy', false);
if (!empty($proxy)) {
curl_setopt($ch, CURLOPT_PROXY, $proxy);
$proxytype = $this->input->get_option('proxytype', false);
if (strtoupper($proxytype) === 'SOCKS5') {
$this->log('Using SOCKS5 proxy');
curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
} else if (!empty($proxytype)) {
$this->log('Using HTTP proxy');
curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, false);
}
$proxyuserpwd = $this->input->get_option('proxyuserpwd', false);
if (!empty($proxyuserpwd)) {
curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxyuserpwd);
curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC | CURLAUTH_NTLM);
}
}
$targetfile = fopen($target, 'w');
if (!$targetfile) {