mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

Issue #2407, #2474 Remove SSL pref confusion.

Browse Source
This commit is contained in:
Cameron 2017-03-13 11:22:52 -07:00
parent 17abb6a08a
commit 4ba577e37d
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
e107_admin/prefs.php
View File

@ -1274,19 +1274,28 @@ $text .= "
</colgroup>
<tbody>";
if(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') // Only allow if an SSL login has been made.
{
$text .="
<tr>
<td><label for='ssl-enabled'>".PRFLAN_60."</label></td>
<td>
".$frm->radio_switch('ssl_enabled', $pref['ssl_enabled'])."
<div class='field-help'>".PRFLAN_61."</div>
<td>";
if(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') // Only allow if an SSL login has been made.
{
$text .= $frm->radio_switch('ssl_enabled', $pref['ssl_enabled']);
$text .= "<div class='field-help'>".PRFLAN_61."</div>";
}
else
{
$text .= "<div class='label label-primary e-tip' title=\"".PRFLAN_61."\">".PRFLAN_275."</div>";
}
$text .= "
</td>
</tr>
";
}
// Secure Image/ Captcha
$secureImage = array('signcode'=>PRFLAN_76, 'logcode'=>PRFLAN_81, "fpwcode"=>PRFLAN_138,'admincode'=>PRFLAN_222);

1
e107_languages/English/admin/lan_prefs.php
View File

@ -293,3 +293,4 @@ define("PRFLAN_271", "Ignore form submissions containing these words or phrases.
define("PRFLAN_272", "Session Lifetime");
define("PRFLAN_273", "Lifetime in seconds. 0 = until the browser is closed. ");
define("PRFLAN_274", "Contact form will only be visible to this userclass group.");
define("PRFLAN_275", "View this page using https (SSL) to modify this option");