Changeset 17067

Timestamp:

Jul 25, 2012, 10:24:24 PM (12 years ago)

Author:

mistic100

Message:

-works with Additional Pages
-clean indentation

File:

• extensions/language_switch_menubar/main.inc.php (modified) (3 diffs)

extensions/language_switch_menubar/main.inc.php

@@ -31 +31 @@
 */
 
-    if (!defined('PHPWG_ROOT_PATH'))
-    {
-      die('Hacking attempt!');
-    }
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
 
 define('LSM_DIR' , basename(dirname(__FILE__)));
@@ -53 +53 @@
 function lsm_apply($menu_ref_arr)
 {
-  global $template, $user, $template, $conf;
+  global $template, $user, $template, $conf, $page;
 
- $menu = & $menu_ref_arr[0];
+  $menu = & $menu_ref_arr[0];
  
-load_language('plugin.lang', LSM_PATH);
-            $template->assign(
-                array   (
-        'LSMTITLE'     => l10n('Language'),
-                                ));
-   
-    if (($block = $menu->get_block( 'mbLSM' )) != null) {
-        $template->set_template_dir(LSM_PATH.'template/');
-        $block->template = 'flags.tpl';
+  load_language('plugin.lang', LSM_PATH);
+        $template->assign(
+    array       (
+      'LSMTITLE' => l10n('Language'),
+      )
+    );
+ 
+  if (($block = $menu->get_block( 'mbLSM' )) != null)
+  {
+    $template->set_template_dir(LSM_PATH.'template/');
+    $block->template = 'flags.tpl';
+  }
+  
+  if ($page['section'] == 'additional_page' and isset($page['additional_page']))
+  {
+    $base_url = make_index_url(array('section'=>'page')).'/'.(isset($page['additional_page']['permalink']) ? $page['additional_page']['permalink'] : $page['additional_page']['id']);
+  }
+  else
+  {
+    $base_url = duplicate_index_url();
+  }
+ 
+  $available_lang = get_languages();
+  foreach ($available_lang as $code => $displayname)
+  {
+    $qlc = array (
+      'url' => add_url_params($base_url, array('lang'=> $code)),
+      'alt' => ucwords($displayname),
+      'img' => get_root_url().'language/'.$code.'/'.$code.'.jpg',
+      );
+    
+    $lsw['flags'][$code] = $qlc ;
+    
+    if ($code == $user['language'])
+    {
+      $lsw['Active'] = $qlc;
     }
-   
-    $available_lang = get_languages();
-    foreach ($available_lang as $code => $displayname)
-    {
-      $qlc = array (
-        'url' => add_url_params(duplicate_index_url(), array('lang'=> $code)),
-        'alt' => ucwords($displayname),
-        'img' => get_root_url().'language/'.$code.'/'.$code.'.jpg',
-        );
-      
-      $lsw['flags'][$code] = $qlc ;
-      
-      if ($code == $user['language'])
-      {
-        $lsw['Active'] = $qlc;
-      }
-    }
+  }
 
-    $lsw['side'] = ceil(sqrt(count($available_lang)));
-    $template->clear_assign('lang_switch');   
-    $template->assign(
-      array(
-        'lang_switch'=> $lsw,
-        'LSM_PATH' => LSM_PATH,
-        )
-      );
+  $lsw['side'] = ceil(sqrt(count($available_lang)));
+  $template->clear_assign('lang_switch');   
+  $template->assign(
+    array(
+      'lang_switch'=> $lsw,
+      'LSM_PATH' => LSM_PATH,
+      )
+    );
 }
 
@@ -98 +109 @@
 {
   global $user;
-     $same = $user['language'];   
+  $same = $user['language'];   
  
-    if (isset($_GET['lang']))
+  if (isset($_GET['lang']))
+  {
+    if (!empty($_GET['lang']) and file_exists(PHPWG_ROOT_PATH.'language/'.$_GET['lang'].'/common.lang.php'))
     {
-      if (!empty($_GET['lang']) and file_exists(PHPWG_ROOT_PATH.'language/'.$_GET['lang'].'/common.lang.php'))
+      if (is_a_guest() or is_generic())
       {
-        if (is_a_guest() or is_generic())
-        {
-          pwg_set_session_var('lang_switch', $_GET['lang']);
-        }
-        else
-        {
-          $query = '
+        pwg_set_session_var('lang_switch', $_GET['lang']);
+      }
+      else
+      {
+        $query = '
 UPDATE '.USER_INFOS_TABLE.'
   SET language = \''.$_GET['lang'].'\'
   WHERE user_id = '.$user['id'].'
 ;';
-          pwg_query($query);
-        }
-        $user['language'] = $_GET['lang'];
+        pwg_query($query);
       }
+      $user['language'] = $_GET['lang'];
     }
-    elseif ((is_a_guest() or is_generic()))
-    {
-      $user['language'] = pwg_get_session_var('lang_switch', $user['language']);
-    }
+  }
+  elseif ((is_a_guest() or is_generic()))
+  {
+    $user['language'] = pwg_get_session_var('lang_switch', $user['language']);
+  }
+  
+  if ( $same !== $user['language'])
+  {
+    load_language('common.lang', '', array('language'=>$user['language']));
     
-    if ( $same !== $user['language'])
-    {
-      load_language('common.lang', '', array('language'=>$user['language']));
-      
-      load_language(
-        'lang',
-        PHPWG_ROOT_PATH.PWG_LOCAL_DIR,
-        array(
-          'language' => $user['language'],
-          'no_fallback' => true,
-          'local' => true
-          )
-        );}
-      
-      if (defined('IN_ADMIN') and IN_ADMIN)
-      {
-        load_language('admin.lang', '', array('language'=>$user['language']));
-      }
-
+    load_language(
+      'lang',
+      PHPWG_ROOT_PATH.PWG_LOCAL_DIR,
+      array(
+        'language' => $user['language'],
+        'no_fallback' => true,
+        'local' => true
+        )
+      );
+  }
+    
+  if (defined('IN_ADMIN') and IN_ADMIN)
+  {
+    load_language('admin.lang', '', array('language'=>$user['language']));
+  }
 }