Changeset 841 for trunk

Timestamp:

Jan 12, 2016, 10:33:43 PM (9 years ago)

Author:

chronos

Message:

• Modified: Improved language switching using language code in URL. This is more search engine friendly as each language have own fixed URL.

Location:

trunk

Files:

• Modules/Dictionary/Dictionary.php (modified) (2 diffs)
• Modules/Export/Page.php (modified) (1 diff)
• includes/Locale.php (modified) (4 diffs)
• includes/Version.php (modified) (1 diff)
• includes/system.php (modified) (8 diffs)

trunk/Modules/Dictionary/Dictionary.php

@@ -28 +28 @@
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('dictionary',
       T('Dictionary'), array('Text', 'Description'),
-     '(SELECT * FROM `Dictionary` WHERE `Language` = '.$this->System->Config['OriginalLanguage'].') AS `T`', $this->System->Link('/dictionary/?search='));
+     '(SELECT * FROM `Dictionary` WHERE `Language` = '.$this->System->Config['OriginalLanguage'].') AS `T`',
+        $this->System->Link('/dictionary/?search='));
   }
 }
@@ -291 +292 @@
       if(!is_numeric($_SESSION['language'])) $Output .= '<td>'.$Line['LangName'].'</td>';
       $Output .= '<td>'.$Line['Description'].'</td>'.
-        '<td><a href="'.$this->System->Link('/user.php?user='.$Line['UserId']).'">'.$Line['UserName'].'</a></td>';
+        '<td><a href="'.$this->System->Link('/user.php?user='.$Line['UserId']).'">'.
+        $Line['UserName'].'</a></td>';
       if($this->System->User->Licence(LICENCE_USER))
       {
         if($Line['UserId'] == $this->System->User->Id)
-          $Output .= '<td><a href="?action=remove&amp;id='.$Line['Id'].'" onclick="return confirmAction(\''.T('Do you really want to delete item?').'\');">'.T('Delete').'</a>'.
+          $Output .= '<td><a href="?action=remove&amp;id='.$Line['Id'].
+            '" onclick="return confirmAction(\''.T('Do you really want to delete item?').'\');">'.T('Delete').'</a>'.
             ' <a href="?action=modify&amp;id='.$Line['Id'].'">'.T('Modify').'</a></td>';
           else $Output .= '<td></td>';

trunk/Modules/Export/Page.php

@@ -287 +287 @@
         else $WithDiacritic = 0;
         if (array_key_exists('Featured', $_POST)) $Export['Featured'] = 1;
-        $this->System->Database->query('UPDATE `Export` SET `Title`="'.$_POST['Title'].'", `Featured`='.$Export['Featured'].', `Description`="'.$_POST['Description'].'", `WithDiacritic`='.$WithDiacritic.' WHERE Id='.$Export['Id']);
+        $this->System->Database->query('UPDATE `Export` SET `Title`="'.$_POST['Title'].
+          '", `Featured`='.$Export['Featured'].', `Description`="'.$_POST['Description'].
+          '", `WithDiacritic`='.$WithDiacritic.' WHERE `Id`='.$Export['Id']);
         $Export['Title'] = $_POST['Title'];
         $Export['Description'] = $_POST['Description'];

trunk/includes/Locale.php

@@ -162 +162 @@
   var $Codes;
   var $Dir;
+  var $LangCode;
+  var $DefaultLangCode;
+  var $Available;
 
   function __construct(System $System)
@@ -168 +171 @@
     $this->Codes = array('en');
     $this->CurrentLocale = new LocaleFile($System);
+    $this->LangCode = 'en';
+    $this->DefaultLangCode = 'en';
+    $this->Available = array();
   }
 
@@ -218 +224 @@
   function LoadLocale($Code)
   {
-    $this->CurrentLocale->Dir = $this->Dir;
-    $this->CurrentLocale->Load($Code);
+    if(array_key_exists($Code, $this->Available))
+    {
+      $this->CurrentLocale->Dir = $this->Dir;
+      $this->CurrentLocale->Load($Code);
+    } else throw new Exception('Unsupported locale code '.$Code);
   }
 }
@@ -226 +235 @@
 function T($Text)
 {
-  global $LocaleManager;
-
-  if(isset($LocaleManager)) return($LocaleManager->CurrentLocale->Texts->Translate($Text));
+  global $GlobalLocaleManager;
+
+  if(isset($GlobalLocaleManager)) return($GlobalLocaleManager->CurrentLocale->Texts->Translate($Text));
     else return($Text);
 }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 840; // Subversion revision
+$Revision = 841; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
-$ReleaseTime = '2016-01-11';
+$ReleaseTime = '2016-01-12';

trunk/includes/system.php

@@ -23 +23 @@
   function Init()
   {
-    global $Config, $LocaleManager;
-
-    $this->Config = $Config;
+    global $GlobalLocaleManager;
+
     $this->Database->Connect($this->Config['Database']['Host'],
       $this->Config['Database']['User'], $this->Config['Database']['Password'],
@@ -34 +33 @@
     $this->Database->LogSQLQuery = $this->Config['Web']['LogSQLQuery'];
 
-    $this->PathItems = ProcessURL();
-    // Initialize locale
-    $LocaleManager = new LocaleManager($this);
-    $LocaleManager->Dir = dirname(dirname(__FILE__)).'/locale';
-    $LocaleManager->Available = array(
+    $this->LocaleManager = new LocaleManager($this);
+    $this->LocaleManager->Dir = dirname(dirname(__FILE__)).'/locale';
+    $this->LocaleManager->Available = array(
       'cs' => array('Code' => 'cs', 'Title' => 'Česky'),
       'en' => array('Code' => 'en', 'Title' => 'English'),
     );
-    $Code = $Config['Web']['Locale'];
-    if (isset($_SESSION))
-      if(array_key_exists('Locale', $_SESSION)) $Code = $_SESSION['Locale'];
-    if (isset($_GET))
-      if(array_key_exists('locale', $_GET)) $Code = $_GET['locale'];
-
-    //echo(phpinfo());
-    if(!array_key_exists($Code, $LocaleManager->Available)) $Code = 'en';
-    $_SESSION['Locale'] = $Code;
-    $LocaleManager->LoadLocale($Code);
+    $GlobalLocaleManager = $this->LocaleManager;
+    $this->LinkLocaleExceptions = array('images', 'style', 'tmp');
+
+    $this->PathItems = ProcessURL();
+
+    // Detect interface locale
+    $this->LocaleManager->DefaultLangCode = $this->Config['Web']['Locale'];
+    $this->LocaleManager->LangCode = $this->LocaleManager->DefaultLangCode;
+    if(count($this->PathItems) > 0)
+    {
+      $NewLangCode = $this->PathItems[0];
+      if(array_key_exists($NewLangCode, $this->LocaleManager->Available)) {
+        array_shift($this->PathItems);
+        $this->LocaleManager->LangCode = $NewLangCode;
+      }
+    }
+    $this->LocaleManager->LoadLocale($this->LocaleManager->LangCode);
 
     $this->Menu = array
@@ -103 +107 @@
   function Run()
   {
-    global $ScriptStartTime, $TranslationTree, $StopAfterUpdateManager,
-      $UpdateManager, $Config, $DatabaseRevision;
-
+    global $ScriptStartTime, $TranslationTree, $StopAfterUpdateManager, $Config,
+      $UpdateManager, $DatabaseRevision;
+
+    $this->Config = $Config;
     $ScriptStartTime = GetMicrotime();
 
     if(GetRemoteAddress() != '') session_start();
 
-    if(!isset($Config)) die('Systém není nainstalován. Pokračujte v instalaci <a href="admin/install.php">zde</a>.');
-    date_default_timezone_set($Config['Web']['Timezone']);
+    if(!isset($this->Config)) die('Systém není nainstalován. Pokračujte v instalaci <a href="admin/install.php">zde</a>.');
+    date_default_timezone_set($this->Config['Web']['Timezone']);
 
     $this->Init();
@@ -136 +141 @@
     // Initialize application modules
     $this->ModuleManager->RegisterModule(new ModuleError($this));
-    $this->ModuleManager->Modules['Error']->ErrorHandler->ShowError = $Config['Web']['ShowPHPError'];
+    $this->ModuleManager->Modules['Error']->ErrorHandler->ShowError = $this->Config['Web']['ShowPHPError'];
     $this->ModuleManager->RegisterModule(new ModuleLog($this));
     $this->ModuleManager->RegisterModule(new ModuleUser($this));
@@ -177 +182 @@
   function Link($Target)
   {
-    return($this->Config['Web']['BaseURL'].$Target);
+    $Remaining = substr($Target, count($this->Config['Web']['BaseURL']));
+    $TargetParts = explode('/', $Remaining);
+    if(count($TargetParts) > 0)
+    {
+      if(in_array($TargetParts[0], $this->LinkLocaleExceptions))
+      {
+        return($this->Config['Web']['BaseURL'].$Target);
+      }
+    }
+    return($this->LinkLocale($Target));
+  }
+
+  function LinkLocale($Target, $Locale = '')
+  {
+    if($Locale == '') $Locale = $this->LocaleManager->LangCode;
+    if($Locale == $this->LocaleManager->DefaultLangCode)
+      return($this->Config['Web']['BaseURL'].$Target);
+    return($this->Config['Web']['BaseURL'].'/'.$Locale.$Target);
   }
 
@@ -237 +259 @@
   {
     $Output = '';
+
     /* @var $Page Page */
     $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
@@ -265 +288 @@
   var $Title;
 
+  function ShowLocaleSelector()
+  {
+    //$Output .= ' <form action="?setlocale" method="get">';
+    $Output = ' <select onchange="window.location=this.value">';
+    foreach($this->System->LocaleManager->Available as $Locale)
+    {
+      $Remaining = substr($_SERVER["REQUEST_URI"], strlen($this->System->Config['Web']['BaseURL']));
+      if(substr($Remaining, 1, strlen($Locale['Code'].'/')) == $this->System->LocaleManager->LangCode.'/')
+        $Remaining = substr($Remaining, strlen('/'.$Locale['Code']));
+      if($Locale['Code'] == $this->System->LocaleManager->CurrentLocale->Texts->Code) $Selected = ' selected="selected"';
+        else $Selected = '';
+      $URL = $this->System->LinkLocale($Remaining, $Locale['Code']);
+      $Output .= '<option title="" value="'.$URL.'"'.$Selected.' onchange="this.form.submit()">'.$Locale['Title'].'</option>';
+    }
+    $Output .= '</select><noscript><span><input type="submit" value="Submit"/></span></noscript>';
+
+    return($Output);
+  }
+
   function ShowTopBar()
   {
-    global $LocaleManager;
-
     $Output = '<div class="Menu">';
     if(!$this->System->User->Licence(LICENCE_USER))
@@ -292 +332 @@
           '<a href="'.$this->System->Link('/registrace.php').'">'.T('Registration').'</a>';
     }
-    //$Output .= ' <form action="?setlocale" method="get">';
-    $Output .= ' <select onchange="window.location=\'?locale=\'+this.value">';
-    foreach($LocaleManager->Available as $Locale)
-    {
-      if($Locale['Code'] == $LocaleManager->CurrentLocale->Texts->Code) $Selected = ' selected="selected"';
-        else $Selected = '';
-      $Output .= '<option title="" value="'.$Locale['Code'].'"'.$Selected.' onchange="this.form.submit()">'.$Locale['Title'].'</option>';
-    }
-    $Output .= '</select><noscript><span><input type="submit" value="Submit"/></span></noscript>';
+    $Output .= $this->ShowLocaleSelector();
     //$Output .= '</form>';
     $Output .= '</span></div>';