Merge pull request #1782 from ikedas/issue-1751 by ikedas

Use browser's built-in "date" widget instead of jQuery UI Datepicker that is inaccessible using keyboard (#1751)
sympa-community · Feb 17, 2024 · 0031977 · 0031977
2 parents 2deda25 + 1b044b0
commit 0031977
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 132 deletions.
diff --git a/default/web_tt2/head_javascript.tt2 b/default/web_tt2/head_javascript.tt2
@@ -11,18 +11,13 @@
 [%# A few configuration settings and miscellaneous vars. ~%]
 var sympa = {
     backText:           '[%"Back"|loc|escape_cstr%]',
-    calendarButtonText: '[%"Calendar"|loc|escape_cstr%]',
-    calendarFirstDay:   0,
     closeText:          '[%"Close"|loc|escape_cstr%]',
     copiedText:         '[%"Copied!"|loc|escape_cstr%]',
     copyPermalinkText:  '[%"Copy permalink"|loc|escape_cstr%]',
-    dayNames:           '[%"Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday"|loc|escape_cstr%]'.split(":"),
-    dayNamesMin:        '[%"Su:Mo:Tu:We:Th:Fr:Sa"|loc|escape_cstr%]'.split(":"),
     home_url:           '[% path_cgi | escape_cstr %]/',
     icons_url:          '[% icons_url | escape_cstr %]',
     lang:               '[% lang | escape_cstr %]',
     loadingText:        '[%"Please Wait..."|loc|escape_cstr%]',
-    monthNamesShort:    '[%"Jan:Feb:Mar:Apr:May:Jun:Jul:Aug:Sep:Oct:Nov:Dec"|loc|escape_cstr%]'.split(":"),
     openInNewWinText:   '[%"Open in a new window"|loc|escape_cstr%]',
     resetText:          '[%"Reset"|loc|escape_cstr%]'
 };

diff --git a/default/web_tt2/suboptions.tt2 b/default/web_tt2/suboptions.tt2
@@ -118,14 +118,14 @@
 
         <div>
             <label for="date_deb">[%|loc%]From:[%END%] </label>
-            <input type="text" id="date_deb" name="date_deb" maxlength="10" size="10" style="display: inline-block; max-width: 40%"
-                   value="[% d_day %]" placeholder="[%|loc%]dd-mm-yyyy[%END%]" />
+            <input type="date" id="date_deb" name="date_deb"
+             style="display: inline-block; max-width: 40%"
+             value="[% d_day %]"
+             placeholder="[%|loc%]yyyy-mm-dd[%END%]" />
             <label for="date_fin">[%|loc%]To:[%END%] </label>
-            <input type="text" id="date_fin" name="date_fin" maxlength="10" size="10" style="display: inline-block; max-width: 40%"
-                   placeholder="[%|loc%]dd-mm-yyyy[%END%]" />
-            <noscript>
-                ([%|loc%]dd-mm-yyyy[%END%])
-            </noscript>
+            <input type="date" id="date_fin" name="date_fin"
+             style="display: inline-block; max-width: 40%"
+             placeholder="[%|loc%]yyyy-mm-dd[%END%]" />
             <input type="checkbox" name="indefinite" />
             [%|loc%]Suspend my membership indefinitely[%END%]
         </div>

diff --git a/default/web_tt2/suspend_request.tt2 b/default/web_tt2/suspend_request.tt2
@@ -88,14 +88,14 @@
             <input class="MainMenuLinks" type="submit" name="sub_action_suspendsave" value="[%|loc%]Suspend my subscriptions[%END%]"/>
             <div>
                 <label for="date_deb">[%|loc%]From:[%END%]</label>
-                <input type="text" id="date_deb" name="date_deb" maxlength="10" size="10"
+                <input type="date" id="date_deb" name="date_deb"
                        style="display: inline-block; max-width: 40%"
-                       value="[% d_day %]" placeholder="[%|loc%]dd-mm-yyyy[%END%]" />
+                       value="[% d_day %]"
+                       placeholder="[%|loc%]yyyy-mm-dd[%END%]" />
                 <label for="date_fin">[%|loc%]To:[%END%]</label>
-                <input type="text" id="date_fin" name="date_fin" maxlength="10" size="10"
+                <input type="date" id="date_fin" name="date_fin"
                        style="display: inline-block; max-width: 40%"
-                       placeholder="[%|loc%]dd-mm-yyyy[%END%]" />
-                <noscript>([%|loc%]dd-mm-yyyy[%END%])</noscript>
+                       placeholder="[%|loc%]yyyy-mm-dd[%END%]" />
                 <input type="checkbox" name="indefinite" /> [%|loc%]Suspend my membership indefinitely[%END%]
             </div>
             [% IF suspended %]

diff --git a/default/web_tt2/viewlogs.tt2 b/default/web_tt2/viewlogs.tt2
@@ -25,13 +25,15 @@
         </div>
         <div>
             <label for="date_from">[%|loc%]Search by date from:[%END%]</label>
-            <input type="text" id="date_from" name="date_from" maxlength="10" size="10"
+            <input type="date" id="date_from" name="date_from"
                    style="display: inline-block; max-width: 40%"
-                   value="[% date_from %]" placeholder="[%|loc%]dd-mm-yyyy[%END%]" />
+                   value="[% date_from %]"
+                   placeholder="[%|loc%]yyyy-mm-dd[%END%]" />
             <label for="date_to">[%|loc%]to:[%END%]</label>
-            <input type="text" id="date_to" name="date_to" maxlength="10" size="10"
+            <input type="date" id="date_to" name="date_to"
                    style="display: inline-block; max-width: 40%"
-                   value="[% date_to %]" placeholder="[%|loc%]dd-mm-yyyy[%END%]" />
+                   value="[% date_to %]"
+                   placeholder="[%|loc%]yyyy-mm-dd[%END%]" />
             <noscript>([%|loc%]ex: 24-05-2006[%END%])</noscript>
         </div>
         <div>

diff --git a/src/cgi/wwsympa.fcgi.in b/src/cgi/wwsympa.fcgi.in
@@ -9,9 +9,9 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2018, 2019, 2020, 2021, 2022 The Sympa Community. See the
-# AUTHORS.md file at the top-level directory of this distribution and at
-# <https://github.com/sympa-community/sympa.git>.
+# Copyright 2017, 2018, 2019, 2020, 2021, 2022, 2023 The Sympa Community.
+# See the AUTHORS.md file at the top-level directory of this distribution
+# and at <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -39,7 +39,6 @@ use IO::File qw();
 use MIME::EncWords;
 use MIME::Lite::HTML;
 use POSIX qw();
-use Time::Local qw();
 use URI;
 use Data::Dumper;    # tentative
 
@@ -4108,7 +4107,7 @@ sub do_my {
     wwslog('info', '');
 
     # Sets the date of the field "start date" to "today"
-    $param->{'d_day'} = POSIX::strftime('%d-%m-%Y', localtime time);
+    $param->{'d_day'} = POSIX::strftime('%Y-%m-%d', localtime time);
     _set_my_lists_info();
     return 1;
 }
@@ -8681,21 +8680,8 @@ sub do_latest_arc {
     return 1;
 }
 
-sub get_timelocal_from_date {
-    my ($mday, $mon, $yr, $hr, $min, $sec, $zone) = @_;
-    my ($time) = 0;
-
-    $yr -= 1900 if $yr >= 1900;    # if given full 4 digit year
-    $yr += 100 if $yr <= 37;       # in case of 2 digit years
-    if (($yr < 70) || ($yr > 137)) {
-        warn "Warning: Bad year (", $yr + 1900, ") using current\n";
-        $yr = (localtime(time))[5];
-    }
-
-    $time = Time::Local::timelocal($sec, $min, $hr, $mday, $mon, $yr);
-    return $time;
-
-}
+# No longer used.
+#sub get_timelocal_from_date;
 
 ####################################################
 #  do_remove_arc
@@ -13755,7 +13741,7 @@ sub do_suspend_request {
     wwslog('info', '');
 
     ## Sets the date of the field "start date" to "today"
-    $param->{'d_day'} = POSIX::strftime('%d-%m-%Y', localtime time);
+    $param->{'d_day'} = POSIX::strftime('%Y-%m-%d', localtime time);
     _set_my_lists_info();
 
     # Compatibility with Sympa <= 6.1b.1.
@@ -13937,6 +13923,12 @@ sub do_suspend_request_action {
 
     my $previous_action = $in{'previous_action'} || 'suspend_request';
 
+    # Compat. <= 6.2.72
+    $in{'date_deb'} =~ s/(\d\d)-(\d\d)-(\d\d\d\d)/$3-$2-$1/
+        if $in{'date_deb'};
+    $in{'date_fin'} =~ s/(\d\d)-(\d\d)-(\d\d\d\d)/$3-$2-$1/
+        if $in{'date_fin'};
+
     if ($in{'sub_action'} eq 'suspendsave') {
 
         # to retrieve the selected list
@@ -13961,59 +13953,23 @@ sub do_suspend_request_action {
             return $previous_action;
         }
 
-        if ($in{'date_deb'}) {
-            ($day1, $month1, $year1) = split(/\-/, $in{'date_deb'});
-            $month1 = $month1 - 1;
-
-            if (   ($day1 =~ /([0-9]*)/)
-                && ($month1 =~ /([0-9]*)/)
-                && ($year1 =~ /([0-9]*)/)) {
-                if (   ((1 <= $day1) && ($day1 <= 31))
-                    && ((0 <= $month1) && ($month1 <= 11))
-                    && (1900 <= $year1)) {
-                    ## Return an epoch date
-                    $data->{'startdate'} =
-                        Time::Local::timelocal(0, 0, 0, $day1, $month1,
-                        $year1);
-                } else {
-                    add_stash('user', 'missing_arg',
-                        {argument => 'Start Date doesn\'t exist.'});
-                    wwslog('info', 'Date doesn\'t exist');
-                    return $previous_action;
-                }
-            } else {
-                add_stash('user', 'missing_arg',
-                    {argument => 'Start Date doesn\'t exist.'});
-                wwslog('info', 'Date doesn\'t exist');
-                return $previous_action;
-            }
-            ## Case 1 : Start date & End date (without indefinite)
-            if (($in{'date_fin'}) && (!$in{'indefinite'})) {
-                ($day2, $month2, $year2) = split(/\-/, $in{'date_fin'});
-                $month2 = $month2 - 1;
-
-                if (   ($day2 =~ /([0-9]*)/)
-                    && ($month2 =~ /([0-9]*)/)
-                    && ($year2 =~ /([0-9]*)/)) {
-                    if (   ((1 <= $day2) && ($day2 <= 31))
-                        && ((0 <= $month2) && ($month2 <= 11))
-                        && (1900 <= $year2)) {
-                        ## Return an epoch date
-                        $data->{'enddate'} =
-                            Time::Local::timelocal(0, 0, 0, $day2, $month2,
-                            $year2);
-                    } else {
-                        add_stash('user', 'missing_arg',
-                            {argument => 'End Date doesn\'t exist.'});
-                        wwslog('info', 'Date doesn\'t exist');
-                        return $previous_action;
-                    }
-                } else {
-                    add_stash('user', 'missing_arg',
-                        {argument => 'End Date doesn\'t exist.'});
-                    wwslog('info', 'Date doesn\'t exist');
-                    return $previous_action;
-                }
+        my $html_date_re = Sympa::Regexps::html_date();
+        if (($in{'date_deb'} // '') =~ /\A$html_date_re\z/) {
+            ($year1, $month1, $day1) = split /-/, $in{'date_deb'};
+            # Return an epoch date
+            $data->{'startdate'} =
+                POSIX::mktime(0, 0, 0, $day1 + 0, $month1 - 1, $year1 - 1900);
+
+            if (($in{'date_fin'} // '') =~ /\A$html_date_re\z/
+                and not $in{'indefinite'}) {
+                # Case 1 : Start date & End date (without indefinite)
+                ($year2, $month2, $day2) = split /-/, $in{'date_fin'};
+                # Return an epoch date
+                $data->{'enddate'} = POSIX::mktime(
+                    0, 0, 0, $day2 + 0,
+                    $month2 - 1,
+                    $year2 - 1900
+                );
 
                 unless ($data->{'startdate'} <= $data->{'enddate'}) {
                     add_stash(
@@ -14027,27 +13983,27 @@ sub do_suspend_request_action {
                         'The start date must be less than the end date.');
                     return $previous_action;
                 }
-                ## Case 2 : Start date & without indefinite (without end date)
-            } elsif ((!$in{'date_fin'}) && ($in{'indefinite'})) {
+            } elsif ($in{'indefinite'}) {
+                # Case 2 : Start date & without indefinite (without end date)
                 $data->{'enddate'} = undef;
             } else {
                 add_stash(
                     'user',
                     'missing_arg',
                     {   argument =>
-                            'Choose end date (dd/mm/yyyy) or indefinite end date'
+                            'Choose end date (yyyy-mm-dd) or indefinite end date'
                     }
                 );
                 wwslog('info',
-                    'Missing argument for the end date or syntax error : dd/mm/yyyy or must choose a end date or indefinite end date'
+                    'Missing argument for the end date or syntax error : yyyy-mm-dd or must choose a end date or indefinite end date'
                 );
                 return $previous_action;
             }
         } else {
             add_stash('user', 'missing_arg',
-                {argument => 'Miss start date (dd/mm/yyyy)'});
+                {argument => 'Miss start date (yyyy-mm-dd)'});
             wwslog('info',
-                'Missing argument for the start date or syntax error : dd/mm/yyyy'
+                'Missing argument for the start date or syntax error : yyyy-mm-dd'
             );
             return $previous_action;
         }
@@ -15598,6 +15554,12 @@ sub do_viewlogs {
 
     $param->{'total_results'} = 0;
 
+    # Compat. <= 6.2.72
+    $in{'date_from'} =~ s/(\d\d)-(\d\d)-(\d\d\d\d)/$3-$2-$1/
+        if $in{'date_from'};
+    $in{'date_to'} =~ s/(\d\d)-(\d\d)-(\d\d\d\d)/$3-$2-$1/
+        if $in{'date_to'};
+
     my @dates = $log->get_log_date;
     ($param->{'date_from_formated'}, $param->{'date_to_formated'}) = @dates
         if @dates;

diff --git a/src/lib/Sympa/Log.pm b/src/lib/Sympa/Log.pm
@@ -8,7 +8,7 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2021 The Sympa Community. See the
+# Copyright 2017, 2021, 2023 The Sympa Community. See the
 # AUTHORS.md file at the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
@@ -35,6 +35,7 @@ use Scalar::Util;
 use Sys::Syslog qw();
 use Time::Local qw();
 
+use Sympa::Regexps;
 use Sympa::Tools::Time;
 
 use base qw(Class::Singleton);
@@ -490,24 +491,21 @@ sub get_first_db_log {
             @{$action_type{$select->{'type'}}};
     }
 
+    my $html_date_re = Sympa::Regexps::html_date();
     #if the search is between two date
-    if ($select->{'date_from'}) {
+    if (($select->{'date_from'} // '') =~ /\A$html_date_re\z/) {
         my ($yyyy, $mm, $dd) = split /[^\da-z]/i, $select->{'date_from'};
-        ($dd, $mm, $yyyy) = ($yyyy, $mm, $dd) if 31 < $dd;
-        $yyyy += ($yyyy < 50 ? 2000 : $yyyy < 100 ? 1900 : 0);
 
-        my $date_from = POSIX::mktime(0, 0, -1, $dd, $mm - 1, $yyyy - 1900);
-        unless ($select->{'date_to'}) {
+        my $date_from = POSIX::mktime(0, 0, -1, $dd + 0, $mm - 1, $yyyy - 1900);
+        unless (($select->{'date_to'} // '') =~ /\A$html_date_re\z/) {
             my $date_from2 =
-                POSIX::mktime(0, 0, 25, $dd, $mm - 1, $yyyy - 1900);
+                POSIX::mktime(0, 0, 25, $dd + 0, $mm - 1, $yyyy - 1900);
             $statement .= sprintf "AND date_logs >= %s AND date_logs <= %s ",
                 $date_from, $date_from2;
         } else {
             my ($yyyy, $mm, $dd) = split /[^\da-z]/i, $select->{'date_to'};
-            ($dd, $mm, $yyyy) = ($yyyy, $mm, $dd) if 31 < $dd;
-            $yyyy += ($yyyy < 50 ? 2000 : $yyyy < 100 ? 1900 : 0);
 
-            my $date_to = POSIX::mktime(0, 0, 25, $dd, $mm - 1, $yyyy - 1900);
+            my $date_to = POSIX::mktime(0, 0, 25, $dd + 0, $mm - 1, $yyyy - 1900);
             $statement .= sprintf "AND date_logs >= %s AND date_logs <= %s ",
                 $date_from, $date_to;
         }

diff --git a/src/lib/Sympa/Regexps.pm b/src/lib/Sympa/Regexps.pm
@@ -7,7 +7,7 @@
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2021, 2022 The Sympa Community. See the
+# Copyright 2017, 2021, 2022, 2023 The Sympa Community. See the
 # AUTHORS.md file at the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
@@ -54,6 +54,8 @@ use constant hostport => qr{(?:
       | [:0-9a-f]*:[:0-9a-f]*:[:0-9a-f]*
       | \[ [:0-9a-f]*:[:0-9a-f]*:[:0-9a-f]* \] (?::\d+)?
     )}ix;
+use constant html_date =>
+    qr'[0-9]{4}[0-9]*-(?:0[1-9]|1[0-2])-(?:0[1-9]|[12][0-9]|3[01])';
 use constant ipv6 => qr'[:0-9a-f]*:[:0-9a-f]*:[:0-9a-f]*'i;
 #FIXME: Cannot contain IPv6 address.
 use constant multiple_host_with_port =>

diff --git a/www/js/sympa.js b/www/js/sympa.js
@@ -156,26 +156,6 @@ $(function() {
     }
 });
 
-/* Loading jQuery-UI Datepicker Widget. */
-$(function() {
-    var options = {
-        buttonText:      sympa.calendarButtonText,
-        changeMonth:     true,
-        changeYear:      true,
-        dateFormat:      'dd-mm-yy',
-        dayNames:        sympa.dayNames,
-        dayNamesMin:     sympa.dayNamesMin,
-        firstDay:        sympa.calendarFirstDay,
-        monthNamesShort: sympa.monthNamesShort,
-        shortYearCutoff: 50,
-        showOn:          "button"
-    };
-    $('#date_deb').datepicker(options);
-    $('#date_from').datepicker(options);
-    $('#date_fin').datepicker(options);
-    $('#date_to').datepicker(options);
-});
-
 /* Emulates AJAX reveal modal button of Foundation 5. */
 /* The element specified by data-reveal-id is the container of content
  * specified by href attribute of the item which have data-reveal-ajax="true".