archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r3477 from branch 2.0 to trunk

Browse source 
Bug 964 fixed and more

+ ?&lang=en_UK" => ?lang=en_UK"
+ =&lang=en_UK" => &lang=en_UK"
+ Works for any combinations of
$conf['question_mark_in_urls']
$conf['php_extension_in_urls']
=> BUT force a return to home in some cases.
+ Full technical code review







git-svn-id: http://piwigo.org/svn/trunk@3479 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
vdigital 2009-06-30 21:24:55 +00:00
commit 731cb8940c
3 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plugins/language_switch/language_switch.inc.php
View file

@ -60,21 +60,18 @@ class language_controler {
global $user, $template, $conf;
$available_lang = get_languages();
if ( isset($conf['no_flag_languages']) )
$available_lang = array_diff_key($available_lang, array_flip($conf['no_flag_languages']));
$url_starting = $_SERVER['REQUEST_URI'];
if ( isset( $_GET['lang']) ) {
$pos = stripos ( $url_starting , '&lang=' );
if (is_numeric($pos) and $pos > 0) $url_starting = substr($url_starting, 0, $pos);
}
$pos = stripos($url_starting, script_basename());
if (is_numeric($pos)) $url_starting = substr($url_starting, $pos);
$available_lang =
array_diff_key($available_lang, array_flip($conf['no_flag_languages']));
$url_starting = get_query_string_diff(array('lang'));
foreach ( $available_lang as $code => $displayname ) {
$qlc = array (
'url' => add_url_params( $url_starting, array('lang'=> $code) ),
'url' => str_replace(array('=&','?&'),array('&','?'),
add_url_params( $url_starting, array('lang'=> $code) )),
'alt' => ucwords( $displayname ),
'img' => 'plugins/language_switch/icons/' . $code . '.jpg',
'img' => get_root_url().'plugins/language_switch/icons/' . $code . '.jpg',
);
if ( $code !== $user['language'] and file_exists(PHPWG_ROOT_PATH.$qlc['img']) )
if ( $code !== $user['language'] and
file_exists(dirname(__FILE__) . '/icons/' . $code . '.jpg') )
$lsw['flags'][$code] = $qlc ;
else $lsw['Active'] = $qlc;
}
@ -87,7 +84,6 @@ class language_controler {
$flags = $template->parse('language_flags',true);
$template->clear_assign('lang_switch');
$template->concat( 'PLUGIN_INDEX_ACTIONS', $flags);
// TODO : Try to cache $flags and $user['language'] in $_SESSION for performance
}
}
/* {html_head} usage function */