Changeset 878 for trunk

Timestamp:

Jun 25, 2020, 10:21:26 AM (4 years ago)

Author:

chronos

Message:

• Fixed: Import of news from zdechov.cz and obec-hovezi.cz.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/News/Import (added)
• Modules/News/Import/Vismo.php (added)
• Modules/News/ImportObecHovezi.php (deleted)
• Modules/News/ImportZdechovCzNews.php (deleted)
• Modules/News/ImportZdechovCzRecords.php (deleted)
• Modules/News/News.php (modified) (2 diffs)
• Modules/News/NewsPage.php (modified) (1 diff)
• Modules/News/NewsSource.php (added)
• Modules/User/UserModel.php (modified) (1 diff)

trunk/Application/UpdateTrace.php

@@ -2109 +2109 @@
   $Manager->Execute('UPDATE `NetworkSubnet` SET `MaskIPv6`=64 WHERE `AddressRangeIPv6` != ""');
   $Manager->Execute('UPDATE `NetworkSubnet` SET `AddressRangeIPv6` = REPLACE(`AddressRangeIPv6`, "/64", "")');
+}
+
+function UpdateTo878($Manager)
+{
+  $Manager->Execute('ALTER TABLE `NewsImport` ADD `Method` VARCHAR(255) NOT NULL AFTER `Category`;');
+  $Manager->Execute('ALTER TABLE `NewsImport` ADD PRIMARY KEY (`Id`);');
+  $Manager->Execute('ALTER TABLE `NewsImport` MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
 }
 
@@ -2211 +2218 @@
       867 => array('Revision' => 869, 'Function' => 'UpdateTo869'),
       869 => array('Revision' => 870, 'Function' => 'UpdateTo870'),
+      870 => array('Revision' => 878, 'Function' => 'UpdateTo878'),
     );
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 877; // Subversion revision
-$DatabaseRevision = 870; // SQL structure revision
-$ReleaseTime = strtotime('2020-04-25');
+$Revision = 878; // Subversion revision
+$DatabaseRevision = 878; // SQL structure revision
+$ReleaseTime = strtotime('2020-06-25');

trunk/Modules/News/News.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/NewsPage.php');
+include_once(dirname(__FILE__).'/NewsSource.php');
+include_once(dirname(__FILE__).'/Import/Vismo.php');
 
 function CategoryItemCompare($Item1, $Item2)
@@ -37 +39 @@
   {
     $this->System->RegisterPage('aktuality', 'PageNews');
+    $this->System->RegisterPage(array('aktuality', 'aktualizace'), 'PageNewsUpdate');
     $this->System->FormManager->RegisterClass('News', array(
       'Title' => 'Aktualita',

trunk/Modules/News/NewsPage.php

@@ -432 +432 @@
   }
 }
+
+class PageNewsUpdate extends Page
+{
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Aktualizace aktualit';
+    $this->ShortTitle = 'Aktualizace aktualit';
+    $this->ParentClass = 'PageNews';
+  }
+
+  function Show()
+  {
+    $NewsSources = new NewsSources();
+    $NewsSources->Database = $this->Database;
+    if (array_key_exists('i', $_GET)) $Output = $NewsSources->Parse($_GET['i']);
+      else $Output = $NewsSources->Parse();
+    return $Output;
+  }
+}
+

trunk/Modules/User/UserModel.php

@@ -283 +283 @@
     } else
     {
+      $this->PermissionGroupCache[$GroupId] = array();
+
       // If no permission combination exists in cache, do new check of database items
       $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '(`Group`="'.$GroupId.
         '") AND (`AssignedGroup` IS NOT NULL)');
-      $DbRow = array();
-      while ($DbRow[] = $DbResult->fetch_array());
-        $this->PermissionGroupCache[$GroupId] = $DbRow;
+      while ($DbRow = $DbResult->fetch_array())
+      {
+        $this->PermissionGroupCache[$GroupId][] = $DbRow;
+      }
       $PermissionExists = true;
     }