From: <Jy...@us...> - 2009-02-28 21:14:47
|
Revision: 17008 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17008&view=rev Author: Jyhem Date: 2009-02-28 21:14:43 +0000 (Sat, 28 Feb 2009) Log Message: ----------- [FIX] If installation happens in https, the default suggestion for https config needs to be https compatible Modified Paths: -------------- trunk/installer/tiki-installer.php trunk/lang/fr/language.php trunk/templates/tiki-install.tpl Modified: trunk/installer/tiki-installer.php =================================================================== --- trunk/installer/tiki-installer.php 2009-02-28 20:25:46 UTC (rev 17007) +++ trunk/installer/tiki-installer.php 2009-02-28 21:14:43 UTC (rev 17008) @@ -809,6 +809,7 @@ $smarty->assign('install_step', $install_step); $smarty->assign('install_type', $install_type); $smarty->assign_by_ref('prefs', $prefs); +$smarty->assign('detected_https',$_SERVER["HTTPS"]); $mid_data = $smarty->fetch('tiki-install.tpl'); Modified: trunk/lang/fr/language.php =================================================================== --- trunk/lang/fr/language.php 2009-02-28 20:25:46 UTC (rev 17007) +++ trunk/lang/fr/language.php 2009-02-28 21:14:43 UTC (rev 17008) @@ -1723,6 +1723,8 @@ "Install Profile" => "Installer un profil", "Support Forums" => "Forums de support", "TikiWiki Web Site" => "Site web TikiWiki", +"Upgrade complete" => "Mise à jour terminée", +"Installation complete" => "Installation terminée", // "You can also use {literal}{content label=x}{/literal}, where x is the label of the content block" => "You can also use {literal}{content label=x}{/literal}, where x is the label of the content block", // "Edit content block" => "Edit content block", // "Create content block" => "Create content block", Modified: trunk/templates/tiki-install.tpl =================================================================== --- trunk/templates/tiki-install.tpl 2009-02-28 20:25:46 UTC (rev 17007) +++ trunk/templates/tiki-install.tpl 2009-02-28 21:14:43 UTC (rev 17008) @@ -328,7 +328,7 @@ {elseif $install_step eq '5' or ($dbdone ne 'n')} <h1>{tr}Review the{/tr} {if isset($smarty.post.update)}{tr}Upgrade{/tr}{else}{tr}Installation{/tr}{/if}</h1> <div style="margin: 10px 0 5px 0; border: solid 1px #000; padding: 5px; background: #a9ff9b;"> - <p style="text-align:center; font-size: large;">{if isset($smarty.post.update)}{tr}Upgrade{/tr}{else}{tr}Installation{/tr}{/if} {tr}complete{/tr}.</p> + <p style="text-align:center; font-size: large;">{if isset($smarty.post.update)}{tr}Upgrade complete{/tr}{else}{tr}Installation complete{/tr}{/if}.</p> <p>{tr}Your database has been configured and Tikiwiki is ready to run!{/tr} {if isset($smarty.post.scratch)} {tr}If this is your first install, your admin password is <strong>admin</strong>.{/tr} @@ -402,16 +402,16 @@ </fieldset> <br /> <fieldset><legend>{tr}Secure Login{/tr} <a href="http://doc.tikiwiki.org/login+config&bl=y" target="_blank" title="{tr}Help{/tr}"><img src="pics/icons/help.png" alt="{tr}Help{/tr}" /></a></legend> - <div style="padding:5px;clear:both"><label for="https_login">{tr}HTTPS login{/tr}:</label> + <div style="padding:5px;clear:both"><label for="https_login">{tr}HTTPS login{/tr}:'{$prefs.https_login}'</label> <select name="https_login" id="https_login" onchange="hidedisabled('httpsoptions',this.value);"> <option value="disabled"{if $prefs.https_login eq 'disabled'} selected="selected"{/if}>{tr}Disabled{/tr}</option> <option value="allowed"{if $prefs.https_login eq 'allowed'} selected="selected"{/if}>{tr}Allow secure (https) login{/tr}</option> - <option value="encouraged"{if $prefs.https_login eq 'encouraged'} selected="selected"{/if}>{tr}Encourage secure (https) login{/tr}</option> + <option value="encouraged"{if $prefs.https_login eq 'encouraged' or ($prefs.https_login eq '' and $detected_https eq 'on' ) } selected="selected"{/if}>{tr}Encourage secure (https) login{/tr}</option> <option value="force_nocheck"{if $prefs.https_login eq 'force_nocheck'} selected="selected"{/if}>{tr}Consider we are always in HTTPS, but do not check{/tr}</option> <option value="required"{if $prefs.https_login eq 'required'} selected="selected"{/if}>{tr}Require secure (https) login{/tr}</option> </select> </div> -<div id="httpsoptions" style="display:{if $prefs.https_login eq 'disabled' or $prefs.https_login eq ''}none{else}block{/if};"> +<div id="httpsoptions" style="display:{if $prefs.https_login eq 'disabled' or ( $prefs.https_login eq '' and $detected_https eq '') }none{else}block{/if};"> <div style="padding:5px"> <label for="https_port">{tr}HTTPS port{/tr}:</label> <input type="text" name="https_port" id="https_port" size="5" value="{$prefs.https_port|escape}" /> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |