mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-06-03 17:34:59 +02:00
Code Issues Releases Wiki Activity

Bugfix - Login was failing when using parked domains with subdomain language-redirection enabled.

Browse Source
This commit is contained in:
CaMer0n 2007-03-31 01:18:33 +00:00
parent caf28296ff
commit a3958232ef
4 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
class2.php
View File

@ -1,4 +1,4 @@
<?php
<?php
/*
+ ----------------------------------------------------------------------------+
| e107 website system
@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/class2.php,v $
| $Revision: 1.16 $
| $Date: 2007-03-04 21:47:15 $
| $Author: mrpete $
| $Revision: 1.17 $
| $Date: 2007-03-31 01:18:33 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
//
@ -111,8 +111,23 @@ if(isset($retrieve_prefs) && is_array($retrieve_prefs)) {
}
define("MAGIC_QUOTES_GPC", (ini_get('magic_quotes_gpc') ? TRUE : FALSE));
// Define the domain name and subdomain name.
if(is_numeric(str_replace(".","",$_SERVER['HTTP_HOST']))){
$srvtmp = ""; // Host is an IP address.
}else{
$srvtmp = explode(".",$_SERVER['HTTP_HOST']);
}
define("e_SUBDOMAIN", (count($srvtmp)>2 && $srvtmp[2] ? $srvtmp[0] : FALSE)); // needs to be available to e107_config.
$domrep = array("www.");
if(e_SUBDOMAIN){
$domrep[] = e_SUBDOMAIN.".";
}
define("e_DOMAIN",($srvtmp != "" ? str_replace($domrep,"",$_SERVER['HTTP_HOST']) : FALSE)); // if it's an IP it must be set to FALSE.
unset($srvtmp,$domrep);
// Ensure thet '.' is the first part of the include path
$inc_path = explode(PATH_SEPARATOR, ini_get('include_path'));
@ -179,7 +194,7 @@ $tp = new e_parse;
//define("e_QUERY", $matches[2]);
//define("e_QUERY", $_SERVER['QUERY_STRING']);
$e_QUERY = $tp->post_toForm($e_QUERY);
$e_QUERY = str_replace("&","&amp;",$tp->post_toForm($e_QUERY));
define("e_QUERY", $e_QUERY);
//$e_QUERY = e_QUERY;
@ -342,8 +357,9 @@ define("SITEURLBASE", ($pref['ssl_enabled'] == '1' ? "https://" : "http://").$_S
define("SITEURL", SITEURLBASE.e_HTTP);
// let the subdomain determine the language (when enabled).
if(isset($pref['multilanguage_subdomain']) && $pref['multilanguage_subdomain'] && ($pref['user_tracking'] == "session")){
e107_ini_set("session.cookie_domain",$pref['multilanguage_subdomain']);
if(isset($pref['multilanguage_subdomain']) && $pref['multilanguage_subdomain'] && ($pref['user_tracking'] == "session") && e_DOMAIN){
e107_ini_set("session.cookie_domain",".".e_DOMAIN);
require_once(e_HANDLER."language_class.php");
$lng = new language;
if(e_SUBDOMAIN == "www"){

20
e107_admin/language.php
View File

@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/language.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:33:23 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2007-03-31 01:18:33 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
require_once("../class2.php");
@ -44,12 +44,7 @@ if (e_QUERY) {
if (isset($_POST['submit_prefs']) && isset($_POST['mainsitelanguage'])) {
$pref['multilanguage'] = $_POST['multilanguage'];
if($_POST['multilanguage_subdomain']){
$pref['multilanguage_subdomain'] = ".".$_POST['multilanguage_subdomain'];
}else{
$pref['multilanguage_subdomain'] = "";
}
$pref['multilanguage_subdomain'] = $_POST['multilanguage_subdomain'];
$pref['sitelanguage'] = $_POST['mainsitelanguage'];
save_prefs();
@ -229,9 +224,10 @@ function multilang_prefs() {
$text .= "
<tr>
<td style='width:80%' class='forumheader3'>".LANG_LAN_18."<br />
<span class='smalltext'>".LANG_LAN_19."<br />".LANG_LAN_20."</span></td>
<td style='width:20%;text-align:center' class='forumheader3'>www.";
$text .= "<input class='tbox' type='text' name='multilanguage_subdomain' value=\"".substr($pref['multilanguage_subdomain'],1)."\" />
<span class='smalltext'>".LANG_LAN_19."<br /></span></td>
<td style='width:20%;text-align:center' class='forumheader3'>";
$checked_m = ($pref['multilanguage_subdomain']) ? "checked='checked'" : "";
$text .= "<input type='checkbox' name='multilanguage_subdomain' value='1' $checked_m />
</td>
</tr>
";

6
e107_handlers/language_class.php
View File

@ -4,8 +4,8 @@
| e107 website system - Language Class.
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/language_class.php,v $
| $Revision: 1.3 $
| $Date: 2007-01-01 15:31:54 $
| $Revision: 1.4 $
| $Date: 2007-03-31 01:18:33 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@ -235,7 +235,7 @@ class language{
{
global $pref;
$codelnk = ($language == $pref['sitelanguage']) ? "www" : $this->convert($language);
$urlval = str_replace($_SERVER['HTTP_HOST'],$codelnk.$pref['multilanguage_subdomain'],e_SELF);
$urlval = str_replace($_SERVER['HTTP_HOST'],$codelnk.".".e_DOMAIN,e_SELF);
return $urlval;
}

8
e107_languages/English/admin/lan_language.php
View File

@ -4,9 +4,9 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_language.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:34:40 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2007-03-31 01:18:33 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@ -29,7 +29,7 @@ define("LANG_LAN_16", "Multi-language Database Usage");
define("LANG_LAN_17", "Default Language - No additional tables required.");
define("LANG_LAN_18", "Use Parked Subdomains to set Language:");
define("LANG_LAN_19", "e.g. fr.mydomain.com to set the language to French.");
define("LANG_LAN_20", "Enter the main domain name to enable. e.g. mydomain.com");
define("LANG_LAN_21", "Language Tools");