]> git.mxchange.org Git - friendica.git/commitdiff
The archive functionality is working again
authorMichael <heluecht@pirati.ca>
Wed, 15 Jan 2020 04:06:30 +0000 (04:06 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 15 Jan 2020 04:06:30 +0000 (04:06 +0000)
mod/network.php
src/Util/DateTimeFormat.php

index a2c20ba40ab36ef3d5c41e946bc164ae9917eaa3..59e3b80b5bdf3affa85b713da61c9de9455a5b5c 100644 (file)
@@ -54,7 +54,7 @@ function network_init(App $a)
 
        if ($a->argc > 1) {
                for ($x = 1; $x < $a->argc; $x ++) {
-                       if (DI::dtFormat()->isYearMonth($a->argv[$x])) {
+                       if (DI::dtFormat()->isYearMonthDay($a->argv[$x])) {
                                $is_a_date_query = true;
                                break;
                        }
@@ -440,7 +440,7 @@ function networkThreadedView(App $a, $update, $parent)
 
        if ($a->argc > 1) {
                for ($x = 1; $x < $a->argc; $x ++) {
-                       if (DI::dtFormat()->isYearMonth($a->argv[$x])) {
+                       if (DI::dtFormat()->isYearMonthDay($a->argv[$x])) {
                                if ($datequery) {
                                        $datequery2 = Strings::escapeHtml($a->argv[$x]);
                                } else {
index e29420e9ea41c272dcbbb63868bc0ffac6972b0a..1725a0e02dcdebe52fd413e4e424138e38947a17 100644 (file)
@@ -181,4 +181,25 @@ class DateTimeFormat
 
                return true;
        }
+
+       /**
+        * Checks, if the given string is a date with the pattern YYYY-MM-DD
+        *
+        * @param string $dateString The given date
+        *
+        * @return boolean True, if the date is a valid pattern
+        */
+       public function isYearMonthDay(string $dateString)
+       {
+               $date = DateTime::createFromFormat('Y-m-d', $dateString);
+               if (!$date) {
+                       return false;
+               }
+
+               if (DateTime::getLastErrors()['error_count'] || DateTime::getLastErrors()['warning_count']) {
+                       return false;
+               }
+
+               return true;
+       }
 }