Changeset 858

Timestamp:

May 8, 2019, 7:59:39 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Missing intialization of some variables.
• Fixed: Missing appmodule dependencies.

Location:

trunk

Files:

• Application/System.php (modified) (3 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/NetworkTopology/topologie2.php (modified) (1 diff)
• Modules/Portal/Portal.php (modified) (1 diff)
• Modules/User/User.php (modified) (1 diff)
• Packages/Common/AppModule.php (modified) (1 diff)
• Packages/Common/Database.php (modified) (1 diff)

trunk/Application/System.php

@@ -141 +141 @@
   {
     global $Database, $ScriptTimeStart, $ConfigFileName, $Mail, $Type,
-      $DatabaseRevision, $Config;
+      $DatabaseRevision, $Config, $GlobalLocaleManager;
 
     date_default_timezone_set('Europe/Prague');
@@ -171 +171 @@
       //$Output .= 'Nelze se připojit k databázi.';
     }
+
+    $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'),
+    );
+    $GlobalLocaleManager = $this->LocaleManager;
+    $this->LinkLocaleExceptions = array('images', 'style', 'files');
+
     if(isset($this->Config['Web']['RootFolder']))
       $this->RootURLFolder = $this->Config['Web']['RootFolder'];
@@ -195 +205 @@
     {
       $this->PathItems = ProcessURL();
+
+      // Detect interface locale
+      if(isset($this->Config['Web']['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;
+         }
+      }
+      if(array_key_exists($this->LocaleManager->LangCode, $this->LocaleManager->Available))
+        $this->LocaleManager->LoadLocale($this->LocaleManager->LangCode);
+
       $this->ShowPage();
     }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 855; // Subversion revision
+$Revision = 857; // Subversion revision
 $DatabaseRevision = 855; // SQL structure revision
-$ReleaseTime = strtotime('2018-04-08');
+$ReleaseTime = strtotime('2019-05-08');

trunk/Modules/Network/Network.php

@@ -142 +142 @@
     $this->System->RegisterPage(array('network', 'frequency-plan'), 'PageFrequencyPlan');
 
-    $this->System->RegisterCommandLine('config', array($this, 'ImportNetworkLog'));
+    $this->System->RegisterCommandLine('networklogimport', array($this, 'ImportNetworkLog'));
 
     $this->System->FormManager->RegisterClass('NetworkDomainAlias', array(

trunk/Modules/NetworkTopology/topologie2.php

@@ -119 +119 @@
       imageline($this->Image, $ParentHostPos['x'], $ParentHostPos['y'] + $this->HostHeight * 0.5, $HostPos['x'], $ParentHostPos['y']  + $this->HostHeight * 0.5, $this->LineColor);
       imageline($this->Image, $HostPos['x'], $ParentHostPos['y'] + $this->HostHeight * 0.5, $HostPos['x'], $HostPos['y'], $this->LineColor);
-      $this->DrawNode(&$Host['subitems'][$Index]);
+      $this->DrawNode($Host['subitems'][$Index]);
       imagecopy($this->Image, $this->ImageComputer, $HostPos['x'] - imagesx($this->ImageComputer) * 0.5, $HostPos['y'] - imagesy($this->ImageComputer) * 0.5, 0, 0, 30, 30);
       imagestring($this->Image, 2, $HostPos['x'] - (strlen($SubHost['name']) * imagefontwidth(2)) / 2, $HostPos['y'] + imagesy($this->ImageComputer) * 0.5, $SubHost['name'], $this->TextColor);

trunk/Modules/Portal/Portal.php

@@ -13 +13 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Community portal.';
-    $this->Dependencies = array('News');
+    $this->Dependencies = array('News', 'User');
   }
 

trunk/Modules/User/User.php

@@ -48 +48 @@
   `HostName` varchar(255) NOT NULL DEFAULT '',
   `ScriptName` varchar(255) NOT NULL,
+  `StayLogged` INT NOT NULL,
+  `StayLoggedHash` VARCHAR(40) NOT NULL,
   PRIMARY KEY (`Id`),
   KEY `User` (`User`)

trunk/Packages/Common/AppModule.php

@@ -69 +69 @@
     $this->License = '';
     $this->Version = '';
+    $this->Creator = '';
     $this->Description = '';
     $this->Dependencies = array();
     $this->Type = ModuleType::Normal;
   }
-  
+
   function Install()
   {

trunk/Packages/Common/Database.php

@@ -109 +109 @@
       $this->insert_id = $this->PDO->lastInsertId();
     } else
-    {
+    {     
       $this->Error = $this->PDO->errorInfo();
       $this->Error = $this->Error[2];