add proxy step to ezpublish install #65
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| {* DO NOT EDIT THIS FILE! Use an override template instead. *} | ||
| {*?template charset=latin1?*} | ||
| <div align="center"> | ||
| <h1>{"Proxy settings"|i18n("design/standard/setup/init")}</h1> | ||
| </div> | ||
|
|
||
| <p> | ||
| {"This section is used to configure how eZ Publish is connect to internet."|i18n("design/standard/setup/init")} | ||
| </p> | ||
|
|
||
| <p> | ||
| <form method="post" action="{$script}"> | ||
| <fieldset> | ||
| <legend>{"Proxy"|i18n("design/standard/setup/init")}:</legend> | ||
| <table cellspacing="3" cellpadding="0" border="0"> | ||
| <tr> | ||
| <td></td><td class="normal"><label for="eZSetupPROXYServer" class="textfield">{"Server name: "|i18n("design/standard/setup/init")}</label></td> | ||
|
There was a problem hiding this comment. Should be marked as optional And, the default value of all fields is empty, this means that if you go back in the installer steps, the form will be empty (see for instance the mail settings template for instance) |
||
| <td class="normal"><input type="text" size="25" id="eZSetupPROXYServer" name="eZSetupPROXYServer" value=""></td> | ||
| </tr> | ||
| <tr> | ||
| <td></td><td class="normal"><label for="eZSetupPROXYUser" class="textfield">{"Username (optional): "|i18n("design/standard/setup/init")}</label></td> | ||
| <td class="normal"><input type="text" size="25" id="eZSetupPROXYUser" name="eZSetupPROXYUser" value=""></td> | ||
| </tr> | ||
| <tr> | ||
| <td></td><td class="normal"><label for="eZSetupPROXYPassword" class="textfield">{"Password (optional): "|i18n("design/standard/setup/init")}</label></td> | ||
| <td class="normal"><input type="password" size="25" id="eZSetupPROXYPassword" name="eZSetupPROXYPassword" value=""></td> | ||
| </tr> | ||
| </table> | ||
| </fieldset> | ||
| {include uri='design:setup/init/navigation.tpl'} | ||
| {include uri='design:setup/persistence.tpl'} | ||
| </form> | ||
|
|
||
| </p> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| {* DO NOT EDIT THIS FILE! Use an override template instead. *} | ||
| {"The eZ Publish system can use proxy server to connect to Internet."|i18n("design/standard/setup/init")} | ||
| <p></p> | ||
| {"That is the help chapter about proxy."|i18n("design/standard/setup/init")} | ||
| <p></p> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| <?php | ||
| /** | ||
| * File containing the eZStepProxySettings class. | ||
| * | ||
| * @copyright Copyright (C) 1999-2011 eZ Systems AS. All rights reserved. | ||
| * @license http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2 | ||
| * @version 2011.5 | ||
| * @package kernel | ||
| */ | ||
|
|
||
| /*! | ||
| \class eZStepProxySettings ezstep_proxy_settings.php | ||
| \brief The class eZStepProxySettings does | ||
|
|
||
| */ | ||
|
|
||
| class eZStepProxySettings extends eZStepInstaller | ||
| { | ||
| /*! | ||
| Constructor | ||
| */ | ||
| function eZStepProxySettings( $tpl, $http, $ini, &$persistenceList ) | ||
| { | ||
| $this->eZStepInstaller( $tpl, $http, $ini, $persistenceList, | ||
| 'proxy_settings', 'Proxy settings' ); | ||
| } | ||
|
|
||
| function processPostData() | ||
| { | ||
| if ( $this->Http->hasPostVariable( 'eZSetupPROXYServer' ) ) | ||
| { | ||
| $this->PersistenceList['proxy_info']['server'] = $this->Http->postVariable( 'eZSetupPROXYServer' ); | ||
| $this->PersistenceList['proxy_info']['user'] = $this->Http->postVariable( 'eZSetupPROXYUser' ); | ||
| $this->PersistenceList['proxy_info']['password'] = $this->Http->postVariable( 'eZSetupPROXYPassword' ); | ||
| $siteINI = eZINI::instance( 'site.ini.append', 'settings/override', null, null, false, true ); | ||
| $siteINI->setVariable( 'ProxySettings', 'ProxyServer', $this->PersistenceList['proxy_info']['server'] ); | ||
| $siteINI->setVariable( 'ProxySettings', 'User', $this->PersistenceList['proxy_info']['user'] ); | ||
| $siteINI->setVariable( 'ProxySettings', 'Password', $this->PersistenceList['proxy_info']['password'] ); | ||
| $siteINI->save( 'site.ini.append', '.php', false, false ); | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| function init() | ||
| { | ||
| if ( $this->hasKickstartData() ) | ||
| { | ||
| $data = $this->kickstartData(); | ||
| $this->PersistenceList['proxy_info']['server'] = $data['Server']; | ||
| $this->PersistenceList['proxy_info']['user'] = $data['User']; | ||
| $this->PersistenceList['proxy_info']['password'] = $data['Password']; | ||
| eZSetupMergePersistenceList( $this->PersistenceList, $persistenceData ); | ||
| return $this->kickstartContinueNextStep(); | ||
| } | ||
| return false; // Always display proxy settings | ||
| } | ||
|
|
||
| function display() | ||
| { | ||
| $proxyInfo = array( 'server' => false, | ||
| 'user' => false, | ||
| 'password' => false ); | ||
| if ( isset( $this->PersistenceList['proxy_info'] ) ) | ||
| $proxyInfo = array_merge( $proxyInfo, $this->PersistenceList['proxy_info'] ); | ||
| if ( $proxyInfo['server'] and | ||
| $this->Ini->variable( 'ProxySettings', 'ProxyServer' ) ) | ||
| $proxyInfo['server'] = $this->Ini->variable( 'ProxySettings', 'ProxyServer' ); | ||
| if ( $proxyInfo['user'] and | ||
| $this->Ini->variable( 'ProxySettings', 'TransportUser' ) ) | ||
| $proxyInfo['user'] = $this->Ini->variable( 'ProxySettings', 'User' ); | ||
| if ( $proxyInfo['password'] and | ||
| $this->Ini->variable( 'ProxySettings', 'TransportPassword' ) ) | ||
| $proxyInfo['password'] = $this->Ini->variable( 'ProxySettings', 'Password' ); | ||
| $this->Tpl->setVariable( 'proxy_info', $proxyInfo ); | ||
| $this->Tpl->setVariable( 'setup_previous_step', 'EmailSettings' ); | ||
| $this->Tpl->setVariable( 'setup_next_step', 'DatabaseCreate' ); | ||
|
|
||
| $result = array(); | ||
| // Display template | ||
| $result['content'] = $this->Tpl->fetch( "design:setup/init/proxy_settings.tpl" ); | ||
| $result['path'] = array( array( 'text' => ezpI18n::tr( 'design/standard/setup/init', | ||
| 'proxy settings' ), | ||
| 'url' => false ) ); | ||
| return $result; | ||
|
|
||
| } | ||
| } | ||
|
|
||
| ?> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should probably be "This section is used to configure how eZ Publish connects to the Internet. This step is only needed if the server where eZ Publish will be installed needs to use a proxy to connect to Internet, otherwise you can ignore this step." The second sentence can/should also be put in the help too.