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

bugfix: multilanguage-subdomain setting was messing with parked domains that don't use language selection. fixed.

Browse Source
This commit is contained in:
CaMer0n
2007-09-20 21:45:33 +00:00
parent 6bbe57074e
commit bab67e21a6
3 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
class2.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/class2.php,v $ | $Source: /cvs_backup/e107_0.8/class2.php,v $
| $Revision: 1.24 $ | $Revision: 1.25 $
| $Date: 2007-09-18 21:15:41 $ | $Date: 2007-09-20 21:45:33 $
| $Author: e107steved $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
// //
@@ -359,15 +359,22 @@ define("SITEURL", SITEURLBASE.e_HTTP);
// let the subdomain determine the language (when enabled). // let the subdomain determine the language (when enabled).
if(isset($pref['multilanguage_subdomain']) && $pref['multilanguage_subdomain'] && ($pref['user_tracking'] == "session") && e_DOMAIN && MULTILANG_SUBDOMAIN !== FALSE){ if(isset($pref['multilanguage_subdomain']) && $pref['multilanguage_subdomain'] && ($pref['user_tracking'] == "session") && e_DOMAIN && MULTILANG_SUBDOMAIN !== FALSE){
e107_ini_set("session.cookie_domain",".".e_DOMAIN);
require_once(e_HANDLER."language_class.php"); $mtmp = explode("\n",$pref['multilanguage_subdomain']);
$lng = new language;
if(e_SUBDOMAIN == "www"){ if(in_array(e_DOMAIN,$mtmp) || ($pref['multilanguage_subdomain'] ==1))
$GLOBALS['elan'] = $pref['sitelanguage'];
}
elseif($eln = $lng->convert(e_SUBDOMAIN))
{ {
$GLOBALS['elan'] = $eln; e107_ini_set("session.cookie_domain",".".e_DOMAIN);
require_once(e_HANDLER."language_class.php");
$lng = new language;
if(e_SUBDOMAIN == "www")
{
$GLOBALS['elan'] = $pref['sitelanguage'];
}
elseif($eln = $lng->convert(e_SUBDOMAIN))
{
$GLOBALS['elan'] = $eln;
}
} }
} }

13
e107_admin/language.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/language.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/language.php,v $
| $Revision: 1.4 $ | $Revision: 1.5 $
| $Date: 2007-05-01 19:50:55 $ | $Date: 2007-09-20 21:45:33 $
| $Author: lisa_ $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
require_once("../class2.php"); require_once("../class2.php");
@@ -235,10 +235,9 @@ function multilang_prefs() {
$text .= " $text .= "
<tr> <tr>
<td style='width:80%' class='forumheader3'>".LANG_LAN_18."<br /> <td style='width:80%' class='forumheader3'>".LANG_LAN_18."<br />
<span class='smalltext'>".LANG_LAN_19."<br /></span></td> <span class='smalltext'>".LANG_LAN_19."<br />".LANG_LAN_20."</span></td>
<td style='width:20%;text-align:center' class='forumheader3'>"; <td style='width:20%;text-align:center' class='forumheader3'>";
$checked_m = ($pref['multilanguage_subdomain']) ? "checked='checked'" : ""; $text .= "<textarea name='multilanguage_subdomain' rows='5' cols='15' style='width:80%'>".$pref['multilanguage_subdomain']."</textarea>
$text .= "<input type='checkbox' name='multilanguage_subdomain' value='1' $checked_m />
</td> </td>
</tr> </tr>
"; ";
@@ -574,4 +573,4 @@ function grab_lans($path,$language,$filter = "")
?> ?>

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

@@ -4,8 +4,8 @@
| e107 website system - Language File. | e107 website system - Language File.
| |
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_language.php,v $ | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_language.php,v $
| $Revision: 1.3 $ | $Revision: 1.4 $
| $Date: 2007-04-11 22:29:34 $ | $Date: 2007-09-20 21:45:33 $
| $Author: e107coders $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -27,9 +27,9 @@ define("LANG_LAN_14", "Default Site Language");
define("LANG_LAN_15", "Tick to copy data from the default language. (Useful for links, news-categories, etc.)"); define("LANG_LAN_15", "Tick to copy data from the default language. (Useful for links, news-categories, etc.)");
define("LANG_LAN_16", "Multi-language Database Usage"); define("LANG_LAN_16", "Multi-language Database Usage");
define("LANG_LAN_17", "Default Language - No additional tables required."); define("LANG_LAN_17", "Default Language - No additional tables required.");
define("LANG_LAN_18", "Use Parked Subdomains to set Language:"); define("LANG_LAN_18", "Use Parked Subdomains with these domains to set site Language:");
define("LANG_LAN_19", "e.g. fr.mydomain.com to set the language to French."); define("LANG_LAN_19", "e.g. The domain fr.mydomain.com would set the language to French.");
define("LANG_LAN_20", "Enter one domain per line. eg. mydomain.com etc. or leave blank to disable.");
define("LANG_LAN_21", "Language Tools"); define("LANG_LAN_21", "Language Tools");
define("LANG_LAN_22", "Language Pack created successfully."); define("LANG_LAN_22", "Language Pack created successfully.");
@@ -41,4 +41,4 @@ define("LANG_LAN_25", "Language-Pack Creation Status");
?> ?>