Changeset 963 for trunk

Timestamp:

Feb 3, 2024, 11:21:34 PM (11 months ago)

Author:

chronos

Message:

• Fixed: RSS channel generation error.
• Fixed: Show error message instead of generation of empty RSS channel.
• Fixed: Wait minimum time if user not logged correctly.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/News/NewsPage.php (modified) (2 diffs)
• Modules/User/UserModel.php (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 960; // Subversion revision
+$Revision = 963; // Subversion revision
 $DatabaseRevision = 957; // SQL structure revision
-$ReleaseTime = strtotime('2023-12-29');
+$ReleaseTime = strtotime('2024-02-03');

trunk/Modules/News/NewsPage.php

@@ -361 +361 @@
         if (substr($Index, 0, 8) == 'category') $Select .= '-'.substr($Index, 8);
       }
-      $Select = Core::Cast($this->System)->Config['Web']['RootFolder'].'/aktuality/rss/?select='.substr($Select, 1);
-      $Output = 'Výsledný RSS kanál: <a href="'.$Select.'">'.$Select.'</a>';
+      if ($Select != '')
+      {
+        $Select = Core::Cast($this->System)->Config['Web']['RootFolder'].'/aktuality/rss/?select='.substr($Select, 1);
+        $Output = 'Výsledný RSS kanál: <a href="'.$Select.'">'.$Select.'</a>';
+      } else 
+      {
+        $Output = 'Nevybrána žádná kategorie pro vytvoření RSS kanálu.';
+      }
     } else
     {
@@ -409 +415 @@
     {
       $Where = '';
-      $Parts = explode('-', $_GET['select']);
-      foreach ($Parts as $Part)
-      {
-        if (is_numeric($Part)) $Where .= 'OR (`Category`='.($Part * 1).')';
-      }
-      $Where = substr($Where, 2);
+      $Parts = array_filter(explode('-', $_GET['select']));
+      if (count($Parts) > 0)
+      {
+        foreach ($Parts as $Part)
+        {
+          if (is_numeric($Part)) $Where .= 'OR (`Category`='.($Part * 1).')';
+        }
+        if (strlen($Where) > 2) $Where = substr($Where, 2);
+          else $Where = 1;
+      } else $Where = 1;      
     } else $Where = 1;
 

trunk/Modules/User/UserModel.php

@@ -245 +245 @@
           setcookie('LoginUserId', $Row['Id'], time()+365*24*60*60, $this->System->Link('/'));
           setcookie('LoginHash', sha1($Row['Id'].$StayLoggedSalt), time()+365*24*60*60, $this->System->Link('/'));
-        } else {
+        } else 
+        {
           setcookie('LoginUserId', '', time() - 3600, $this->System->Link('/'));
           setcookie('LoginHash', '', time() - 3600, $this->System->Link('/'));
@@ -255 +256 @@
       }
     } else $Result = USER_NOT_REGISTRED;
+    
+    // Wait some minimal time if not able to log in to avoid brute forcing passwords
+    if ($Result != USER_LOGGED_IN) sleep(1);
+
     return $Result;
   }