Changeset 848 for trunk/includes

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/includes

Files:

• Global.php (moved) (moved from trunk/includes/global.php ) (2 diffs)
• System.php (moved) (moved from trunk/includes/system.php ) (1 diff)

trunk/includes/Global.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
-include_once(dirname(__FILE__).'/system.php');
+include_once(dirname(__FILE__).'/System.php');
 include_once(dirname(__FILE__).'/Update.php');
 include_once(dirname(__FILE__).'/PageEdit.php');
-if(file_exists(dirname(__FILE__).'/config.php'))
-  include_once(dirname(__FILE__).'/config.php');
-include_once(dirname(__FILE__).'/Version.php');
+if(file_exists(dirname(__FILE__).'/../Config/Config.php'))
+  include_once(dirname(__FILE__).'/../Config/Config.php');
+include_once(dirname(__FILE__).'/../Application/Version.php');
 include_once(dirname(__FILE__).'/Locale.php');
 require_once(dirname(__FILE__).'/../HTML/BBCodeParser2.php');
@@ -314 +314 @@
   if($Selected == '')
     $Output .= ' selected="selected"';
-  $Output .= '>Žádná</option>';
+  $Output .= '>'.T('None').'</option>';
   while($ClientVersion = $DbResult->fetch_assoc())
   {

trunk/includes/System.php

@@ -99 +99 @@
     $UpdateManager->Database = $this->Database;
     $UpdateManager->Revision = $DatabaseRevision;
-    if(!$UpdateManager->IsInstalled()) die('Systém vyžaduje instalaci databáze.');
-    if(!$UpdateManager->IsUpToDate()) die('Systém vyžaduje aktualizaci databáze.');
+    if(!$UpdateManager->IsInstalled()) die('Systém vyžaduje instalaci databáze. Pokračujte <a href="'.$this->Link('/Application/install.php').'">zde</a>');
+    if(!$UpdateManager->IsUpToDate()) die('Systém vyžaduje aktualizaci databáze. Pokračujte <a href="'.$this->Link('/Application/install.php').'">zde</a>');
 
     // SQL injection hack protection