[4628] trunk/htdocs/system/classes/adminhandler.php: Revert r4625, which added an options section for configuring the proxy support for remote request .

[svn-N...@habariproject.org]

Revision

4628

Author

chrismeller

Date

2010-11-27 02:59:32 +0000 (Sat, 27 Nov 2010)

Log Message

Revert r4625, which added an options section for configuring the proxy support for remote request. Most users will never need this and it causes problems with InstallHandler (where Options are not available during install), so we're moving it into a config file tweak instead.

Modified Paths

• trunk/htdocs/system/classes/adminhandler.php

Diff

Modified: trunk/htdocs/system/classes/adminhandler.php (4627 => 4628)

--- trunk/htdocs/system/classes/adminhandler.php	2010-11-25 17:52:08 UTC (rev 4627)
+++ trunk/htdocs/system/classes/adminhandler.php	2010-11-27 02:59:32 UTC (rev 4628)
@@ -277,42 +277,6 @@
 				'helptext' => _t( 'The appropriate locale code for your server' ),
 			),
 		);
-		
-		$option_items[ _t( 'Remote Request Proxy') ] = array(
-			'proxy_server' => array(
-				'label' => _t( 'Proxy Server' ),
-				'type' => 'text',
-				'helptext' => '',
-			),
-			'proxy_port' => array(  // TODO: We need to validate this as you can't have a server without a port.
-				'label' => _t( 'Proxy Port' ),
-				'type' => 'text',
-				'helptext' => '',
-			),
-			'proxy_username' => array(
-				'label' => _t( 'Proxy Username' ),
-				'type' => 'text',
-				'helptext' => _t( "Leave this blank if you don't need a username to use your proxy." ),
-			),
-			'proxy_password' => array(
-				'label' => _t( 'Proxy Password' ),
-				'type' => 'password',
-				'helptext' => _t( "Leave this blank if you don't need a password to use your proxy." ),
-			),
-			'proxy_exceptions' => array(
-				'label' => _t( 'Exceptions' ),
-				'type' => 'text',
-				'helptext' => _t( 'Comma separated list of hosts that do not need to be accessed via the proxy.' ) . " localhost, 127.0.0.1, {$_SERVER['SERVER_NAME']} and {$_SERVER['SERVER_ADDR']} " . _t( 'are already excluded.' ),
-			),
-			/* TODO: We only need this, if and when we implement other proxy authentication schemes in socketrequestprocessor.php - curl already has support for most schemes.
-			 * For the moment, it's Basic only.
-			'proxy_auth_scheme' => array(
-				'label' => _t( 'Proxy Authentication Scheme' ),
-				'type' => 'select',
-				'selectarray' => array( 'Basic' => _t( 'Basic' ), 'Digest' => _t( 'Digest' ) ), 
-				'helptext' => _t( 'If in doubt, select "Basic".' ),
-			), */
-		);
 
 		$option_items[_t( 'Troubleshooting' )] = array(
 			'log_min_severity' => array(