Changeset 848 for trunk/Application

Timestamp:

Jan 17, 2016, 12:10:35 PM (9 years ago)

Author:

chronos

Message:

• Renamed: .htaccess file is different for each installation so provide just example in .htacces.sample file.
• Renamed: File global.php and system.php to first uppercase letter for naming unification.
• Modified: More translatable strings.
• Added: Translation group items translatable.
• Renamed: admin directory is not Application directory where all application related files should be placed.

This is different to includes directory where just general libraries should be placed.
Version.php file should be located in Application directory.

Location:

trunk/Application

Files:

• . (moved) (moved from trunk/admin )
• UpdateTrace.php (modified) (3 diffs)
• Version.php (moved) (moved from trunk/includes/Version.php ) (1 diff)
• install.php (modified) (3 diffs)

trunk/Application/UpdateTrace.php

@@ -2818 +2818 @@
 function UpdateTo846($Manager)
 {
+  // Languages
   $Manager->Execute('UPDATE `Language` SET `Name` = "English", `Code` = "en" WHERE `Language`.`Name` = "Angličtina";');
   $Manager->Execute('UPDATE `Language` SET `Name` = "Czech" WHERE `Language`.`Name` = "Čeština";');
   $Manager->Execute('UPDATE `Language` SET `Name` = "Slovak" WHERE `Language`.`Name` = "Slovenština";');
 
+  // Group names
   $Manager->Execute('UPDATE `Group` SET `Name` = "Quests" WHERE `Group`.`Name` = "Výpravy"');
   $Manager->Execute('UPDATE `Group` SET `Name` = "Books" WHERE `Group`.`Name` = "Knížky"');
@@ -2859 +2861 @@
 }
 
+function UpdateTo848($Manager)
+{
+  // Group item names
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Title" WHERE `GroupItem`.`Name` = "Titulek"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Details" WHERE `GroupItem`.`Name` = "Podrobnosti"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Objectives" WHERE `GroupItem`.`Name` = "Úkol"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Offered reward text" WHERE `GroupItem`.`Name` = "Text slíbené odměny"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Request items text" WHERE `GroupItem`.`Name` = "Popis požadovaných předmětů"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "End text" WHERE `GroupItem`.`Name` = "Závěrečný text"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Objective text 1" WHERE `GroupItem`.`Name` = "Text úkolu 1"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Objective text 2" WHERE `GroupItem`.`Name` = "Text úkolu 2"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Objective text 3" WHERE `GroupItem`.`Name` = "Text úkolu 3"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Objective text 4" WHERE `GroupItem`.`Name` = "Text úkolu 4"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Content" WHERE `GroupItem`.`Name` = "Obsah"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Name" WHERE `GroupItem`.`Name` = "Jméno"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Description" WHERE `GroupItem`.`Name` = "Popis"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Castbar caption" WHERE `GroupItem`.`Name` = "Popisek"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Subname" WHERE `GroupItem`.`Name` = "Druhé jméno"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Subname" WHERE `GroupItem`.`Name` = "Druhé jméno"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Help" WHERE `GroupItem`.`Name` = "Nápověda"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Default content" WHERE `GroupItem`.`Name` = "Výchozí obsah"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Comment" WHERE `GroupItem`.`Name` = "Komentář"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Rank" WHERE `GroupItem`.`Name` = "Hodnost"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Shortcut" WHERE `GroupItem`.`Name` = "Zkratka"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Option text" WHERE `GroupItem`.`Name` = "Text možnosti"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Title" WHERE `GroupItem`.`Name` = "Název"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Reward" WHERE `GroupItem`.`Name` = "Odměna"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Criteria" WHERE `GroupItem`.`Name` = "Kritérium"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Location" WHERE `GroupItem`.`Name` = "Umístění"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Location 2" WHERE `GroupItem`.`Name` = "Umístění 2"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "State" WHERE `GroupItem`.`Name` = "Stav"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Short name" WHERE `GroupItem`.`Name` = "Zkrácené jméno"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Comprimed name" WHERE `GroupItem`.`Name` = "Zhuštěný název"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Facial 1" WHERE `GroupItem`.`Name` = "Vzhled 1"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Facial 2" WHERE `GroupItem`.`Name` = "Vzhled 2"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Facial 3" WHERE `GroupItem`.`Name` = "Vzhled 3"');
+  $Manager->Execute('UPDATE `GroupItem` SET `Name` = "Unified" WHERE `GroupItem`.`Name` = "Jednotné"');
+}
+
 $Updates = array(
   498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
@@ -2888 +2929 @@
   803 => array('Revision' => 811, 'Function' => 'UpdateTo811'),
   811 => array('Revision' => 846, 'Function' => 'UpdateTo846'),
+  846 => array('Revision' => 848, 'Function' => 'UpdateTo848'),
 );

trunk/Application/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 847; // Subversion revision
-$DatabaseRevision = 846; // Database structure revision
-$ReleaseTime = '2016-01-15';
+$Revision = 848; // Subversion revision
+$DatabaseRevision = 848; // Database structure revision
+$ReleaseTime = '2016-01-17';

trunk/Application/install.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
-include_once(dirname(__FILE__).'/../includes/global.php');
-include_once(dirname(__FILE__).'/../includes/system.php');
+include_once(dirname(__FILE__).'/../includes/Global.php');
+include_once(dirname(__FILE__).'/../includes/System.php');
 include_once(dirname(__FILE__).'/../includes/Update.php');
-if(file_exists(dirname(__FILE__).'/../includes/config.php'))
-  include_once(dirname(__FILE__).'/../includes/config.php');
+if(file_exists(dirname(__FILE__).'/../Config/Config.php'))
+  include_once(dirname(__FILE__).'/../Config/Config.php');
 include_once(dirname(__FILE__).'/UpdateTrace.php');
 include_once(dirname(__FILE__).'/DefaultConfig.php');
-include_once(dirname(__FILE__).'/../includes/Version.php');
+include_once(dirname(__FILE__).'/../Version.php');
 include_once(dirname(__FILE__).'/../includes/Locale.php');
 
@@ -39 +39 @@
 {
   $Output = '';
-  if(!file_exists('../includes/config.php') and !is_writable('../includes'))
+  if(!file_exists('../Config/Config.php') and !is_writable('../Config'))
     $Output .= 'Varování: Konfigurační soubor nebude možné zapsat, protože složka includes není povolená pro zápis!';
-  if(file_exists('../includes/config.php') and !is_writable('../includes/config.php'))
+  if(file_exists('../Config/Config.php') and !is_writable('../Config/Config.php'))
     $Output .= 'Varování: Konfigurační soubor nebude možné zapsat, protože soubor config.php není povolen pro zápis!';
   $Output .= '<h3>Nastavení systému</h3>'.
@@ -81 +81 @@
   if(array_key_exists('ItemsPerPage', $_POST)) $Config['Web']['ItemsPerPage'] = $_POST['ItemsPerPage'];
   $ConfigText = CreateConfig($Config);
-  file_put_contents('../includes/config.php', $ConfigText);
+  file_put_contents('../Config/Config.php', $ConfigText);
   $Output .= 'Konfigurace nastavena<br/>';
   return($Output);