Changeset 953 for trunk

Timestamp:

Aug 11, 2023, 11:17:28 AM (17 months ago)

Author:

chronos

Message:

• Added: News can be set as intranet only.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Common/Global.php (modified) (1 diff)
• Modules/News/News.php (modified) (4 diffs)
• Modules/News/NewsPage.php (modified) (11 diffs)
• Modules/News/NewsSource.php (modified) (1 diff)

trunk/Application/UpdateTrace.php

@@ -2232 +2232 @@
 {
   $Manager->Execute('ALTER TABLE `News` CHANGE `IP` `IP` VARCHAR(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;');
+}
+
+function UpdateTo953(UpdateManager $Manager): void
+{
+  $Manager->Execute('ALTER TABLE `News` ADD `Intranet` INT NOT NULL DEFAULT "0" AFTER `Link`;');
 }
 
@@ -2343 +2348 @@
       911 => array('Revision' => 921, 'Function' => 'UpdateTo921'),
       921 => array('Revision' => 933, 'Function' => 'UpdateTo933'),
-      933 => array('Revision' => 939, 'Function' => 'UpdateTo939'),
+      933 => array('Revision' => 939, 'Function' => 'UpdateTo939'),      
       939 => array('Revision' => 948, 'Function' => 'UpdateTo948'),
+      948 => array('Revision' => 953, 'Function' => 'UpdateTo953'),
     );
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 948; // Subversion revision
-$DatabaseRevision = 948; // SQL structure revision
-$ReleaseTime = strtotime('2022-12-06');
+$Revision = 953; // Subversion revision
+$DatabaseRevision = 953; // SQL structure revision
+$ReleaseTime = strtotime('2023-08-11');

trunk/Common/Global.php

@@ -275 +275 @@
   $Result = true;
   $RemoteAddr = GetRemoteAddress();
-  foreach (array_merge($Config['Web']['IntranetSubnets']) as $Subnet)
+  foreach ($Config['Web']['IntranetSubnets'] as $Subnet)
   {
     if (substr($RemoteAddr, 0, strlen($Subnet)) == $Subnet)

trunk/Modules/News/News.php

@@ -16 +16 @@
   public int $NewsCountPerCategory = 3;
   public string $UploadedFilesFolder = 'files/news/';
+  public array $NewsSetting;
 
   function __construct(System $System)
@@ -86 +87 @@
   }
 
+  function GetIntranetCondition(): string
+  {
+    if (IsInternetAddr()) return ' AND (`Intranet`=0)';
+      else return '';
+  }
+
   function ShowNews(string $Category, int $ItemCount, int $DaysAgo): string
   {
@@ -97 +104 @@
       $Output .= ' <a href="aktuality/?action=add&amp;category='.$Category.'">Přidat</a>';
     $Output .= '</div></div><div class="Content">';
-    $DbResult = $this->Database->query('SELECT `News`.*, `User`.`Name` FROM `News` LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE (`News`.`Category`='.$Category.') AND (DATE_SUB(NOW(), INTERVAL '.$DaysAgo.' DAY) < `News`.`Date`) ORDER BY `News`.`Date` DESC LIMIT 0,'.$ItemCount);
+    $DbResult = $this->Database->query('SELECT `News`.*, `User`.`Name` FROM `News` LEFT JOIN `User` ON `User`.`Id`=`News`.`User`'.
+      ' WHERE (`News`.`Category`='.$Category.') AND (DATE_SUB(NOW(), INTERVAL '.$DaysAgo.' DAY) < `News`.`Date`)'.$this->GetIntranetCondition().
+      ' ORDER BY `News`.`Date` DESC LIMIT 0,'.$ItemCount);
 
     $Index = 0;
@@ -162 +171 @@
   {
     $Output = '';
-
+    
     $this->LoadSettingsFromCookies();
 

trunk/Modules/News/NewsPage.php

@@ -11 +11 @@
   }
 
+  function GetIntranetCondition(): string
+  {
+    if (IsInternetAddr()) return ' AND (`Intranet`=0)';
+      else return '';
+  }
+
   function ShowView(): string
   {
@@ -20 +26 @@
       if (array_key_exists('id', $_GET)) $Id = $_GET['id'] * 1;
       $DbResult = $this->Database->query('SELECT `News`.*, `User`.`Name` FROM `News` '.
-        'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE `News`.`Id`='.$Id);
+        'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE (`News`.`Id`='.$Id.')'.$this->GetIntranetCondition());
       if ($DbResult->num_rows > 0)
       {
@@ -80 +86 @@
         'Obsah:<br /><textarea name="content" rows="20" cols="40"></textarea><br />'.
         'Odkaz:<br /><input type="text" size="54" name="link"><br />'.
+        'Viditelné jen z vnitřní sítě: <input type="checkbox" name="intranet"/><br />'.
         'Přílohy (Max. velikost souboru 1 MB):<br /><input type="hidden" name="MAX_FILE_SIZE" value="1000000">'.
         '<input name="enclosure1" size="38" type="file"><br />'.
@@ -116 +123 @@
         }
         $Enclosures = substr($Enclosures, 1);
+        if (array_key_exists('intranet', $_POST)) $Intranet = 1;
+          else $Intranet = 0;
 
         $this->Database->insert('News', array('Category' => $Category['Id'], 'Title' => $_POST['title'],
           'Content' => $_POST['content'], 'Date' => 'NOW()', 'IP' => $RemoteAddr,
           'Enclosure' => $Enclosures, 'Author' => $User->User['Name'],
-          'User' => $User->User['Id'], 'Link' => $_POST['link']));
+          'User' => $User->User['Id'], 'Link' => $_POST['link'], 'Intranet' => $Intranet));
         $Output .= 'Aktualita přidána!<br />Pokud budete chtít vaši aktualitu smazat, klikněte na odkaz Smazat v seznamu všech aktualit v kategorii.<br /><br />';
         $Output .= '<a href="?category='.$_POST['category'].'">Zpět na seznam aktualit</a>';
@@ -154 +163 @@
     if ($User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
     {
-      $DbResult = $this->Database->query('SELECT * FROM `News` WHERE `Id`='.$_GET['id']);
+      $DbResult = $this->Database->query('SELECT * FROM `News` WHERE (`Id`='.$_GET['id'].')'.$this->GetIntranetCondition());
       $Row = $DbResult->fetch_assoc();
       if (($User->User['Id'] == $Row['User']))
       {
+        if ($Row['Intranet'] == 1) $IntranetChecked = ' checked="1"';
+          else $IntranetChecked = 0;
         $this->System->PageHeaders[] = array($this, 'GetPageHeader');
         $Output .= '<strong>Editace aktuality v kategorii '.$Category['Caption'].':</strong><br />';
@@ -165 +176 @@
         'Obsah:<br /><textarea name="content" rows="20" cols="40" style="width: 50%">'.$Row['Content'].'</textarea><br />'.
         'Odkaz:<br /><input type="text" size="54" name="link" value="'.$Row['Link'].'"><br />'.
+        'Viditelné jen z vnitřní sítě: <input type="checkbox" name="intranet" '.$IntranetChecked.'/><br />'.
         '<input type="hidden" name="category" value="'.$Category['Id'].'"><br />'.
         '<input type="submit" value="Uložit">'.
@@ -182 +194 @@
     {
       $_POST['id'] = $_POST['id'] * 1;
-      $DbResult = $this->Database->select('News', '*', '`Id`='.$_POST['id']);
+      $DbResult = $this->Database->select('News', '*', '(`Id`='.$_POST['id'].')'.$this->GetIntranetCondition());
       if ($DbResult->num_rows > 0)
       {
@@ -188 +200 @@
         if ($User->User['Id'] == $Row['User'])
         {
+          if (array_key_exists('intranet', $_POST)) $Intranet = 1;
+            else $Intranet = 0;
+          
           $this->Database->update('News', 'Id='.$_POST['id'], array('Title' => $_POST['title'],
-            'Content' => $_POST['content'], 'Link' => $_POST['link']));
+            'Content' => $_POST['content'], 'Link' => $_POST['link'], 'Intranet' => $Intranet));
           $Output .= 'Aktualita uložena!<br />';
           $Output .= '<a href="?category='.$Category['Id'].'">Zpět na seznam aktualit</a>';
@@ -205 +220 @@
     if ($User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
     {
-      $DbResult = $this->Database->query('SELECT * FROM `News` WHERE `Id`='.$_GET['id']);
+      $DbResult = $this->Database->query('SELECT * FROM `News` WHERE (`Id`='.$_GET['id'].')'.$this->GetIntranetCondition());
       $Row = $DbResult->fetch_assoc();
       if ($User->User['Id'] == $Row['User'])
@@ -234 +249 @@
     {
       $PerPage = 20;
-      $DbResult = $this->Database->select('News', 'COUNT(*)', ' `Category`='.$Category['Id']);
+      $DbResult = $this->Database->select('News', 'COUNT(*)', '(`Category`='.$Category['Id'].')'.$this->GetIntranetCondition());
       $RowTotal = $DbResult->fetch_array();
       $PageMax = $RowTotal[0];
@@ -243 +258 @@
 
       $DbResult = $this->Database->query('SELECT `News`.*, `User`.`Name` FROM `News` '.
-        'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE `Category`='.$Category['Id'].' ORDER BY `News`.`Id` DESC LIMIT '.($Page * $PerPage).','.$PerPage);
+        'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE (`Category`='.$Category['Id'].')'.$this->GetIntranetCondition().
+        ' ORDER BY `News`.`Id` DESC LIMIT '.($Page * $PerPage).','.$PerPage);
       while ($Row = $DbResult->fetch_assoc())
       {

trunk/Modules/News/NewsSource.php

@@ -64 +64 @@
 {
   public Database $Database;
+  public array $Items;
 
   function Parse($Id = null)