mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Admin language-select fix

Browse Source
This commit is contained in:
Cameron
2014-02-07 17:57:55 -08:00
parent ef4ced985a
commit baaacf5c4b
4 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/language.php
View File

@@ -67,6 +67,8 @@ if (isset($_POST['submit_prefs']) && isset($_POST['mainsitelanguage']) && getper
e107::getConfig()->setPref($temp)->save(true); e107::getConfig()->setPref($temp)->save(true);
e107::getSession()->clear('e_language');
// if ($admin_log->logArrayDiffs($temp, $pref, 'LANG_01')) // if ($admin_log->logArrayDiffs($temp, $pref, 'LANG_01'))
{ {

13
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -1661,10 +1661,17 @@ Inverse 10 <span class="badge badge-inverse">10</span>
{ {
$slng = e107::getLanguage(); $slng = e107::getLanguage();
$languages = $slng->installed();//array('English','French'); $languages = $slng->installed();//array('English','French');
$multiDoms = array();
$langSubs = explode("\n", e107::getPref('multilanguage_subdomain')); if($langSubs = explode("\n", e107::getPref('multilanguage_subdomain')))
{
// print_a($langSubs); foreach($langSubs as $v)
{
$multiDoms[] = trim($v);
}
}
if(count($languages) > 1) if(count($languages) > 1)
{ {
@@ -1679,7 +1686,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$checked = $tp->toGlyph('ok')." "; $checked = $tp->toGlyph('ok')." ";
$link = '#'; $link = '#';
} }
elseif(!empty($langSubs) && in_array(e_DOMAIN,$langSubs)) elseif(in_array(e_DOMAIN,$multiDoms))
{ {
$code = ($lng == e107::getPref('sitelanguage')) ? 'www' : $code; $code = ($lng == e107::getPref('sitelanguage')) ? 'www' : $code;
$link = str_replace($_SERVER['HTTP_HOST'], $code.'.'.e_DOMAIN, e_REQUEST_URL); // includes query string $link = str_replace($_SERVER['HTTP_HOST'], $code.'.'.e_DOMAIN, e_REQUEST_URL); // includes query string

19
e107_handlers/e107_class.php
View File

@@ -2295,6 +2295,13 @@ class e107
} }
} }
$adminLanguage = self::getPref('adminlanguage');
if(e_ADMIN_AREA && vartrue($adminLanguage))
{
$path = str_replace(e_LANGUAGE, $adminLanguage, $path);
}
$ret = ($force) ? include($path) : include_once($path); $ret = ($force) ? include($path) : include_once($path);
return (isset($ret)) ? $ret : ""; return (isset($ret)) ? $ret : "";
} }
@@ -2546,11 +2553,13 @@ class e107
break; break;
case 'admin' : case 'admin' :
$searchPath[1] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'_admin_'.$unitName.'.php'; $adminLan = vartrue(self::getPref('adminlanguage'), e_LANGUAGE);
$searchPath[2] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'/'.'admin_'.$unitName.'.php';
$searchPath[3] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'/admin/'.e_LANGUAGE.'.php'; $searchPath[1] = e_PLUGIN.$unitName.'/languages/'.$adminLan.'_admin_'.$unitName.'.php';
$searchPath[4] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'/'.e_LANGUAGE.'_admin.php'; // Preferred. $searchPath[2] = e_PLUGIN.$unitName.'/languages/'.$adminLan.'/'.'admin_'.$unitName.'.php';
$searchPath[5] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'_admin.php'; // consistent with English_global.php, English_log.php etc. $searchPath[3] = e_PLUGIN.$unitName.'/languages/'.$adminLan.'/admin/'.$adminLan.'.php';
$searchPath[4] = e_PLUGIN.$unitName.'/languages/'.$adminLan.'/'.$adminLan.'_admin.php'; // Preferred.
$searchPath[5] = e_PLUGIN.$unitName.'/languages/'.$adminLan.'_admin.php'; // consistent with English_global.php, English_log.php etc.
break; break;
case 'theme' : case 'theme' :

3
e107_handlers/language_class.php
View File

@@ -535,7 +535,8 @@ class language{
} }
else else
{ {
$user_language = (e_ADMIN_AREA && vartrue($pref['adminlanguage'])) ? $pref['adminlanguage'] : $pref['sitelanguage'];
$user_language = $pref['sitelanguage'];
if($session->is('e_language')) if($session->is('e_language'))
{ {