Merge lp:~t7-vla7-lz/psiphon/psiphon into lp:psiphon

[Vlad]

[e.fryntov (e-fryntov)]

Looks fine to me

review: Approve

[lp:~t7-vla7-lz/psiphon/psiphon]

345. By e-fryntov on 2014-06-27

Merged Vlad's date changes

=== added file 'trunk/sql/upgrades/upgrade-2.7.015.sql'
--- trunk/sql/upgrades/upgrade-2.7.015.sql	1970-01-01 00:00:00 +0000
+++ trunk/sql/upgrades/upgrade-2.7.015.sql	2014-06-27 19:39:57 +0000
@@ -0,0 +1,29 @@
+alter table stat_account_created add column date_old int after date;
+update stat_account_created set date_old=date;
+update stat_account_created set date=from_unixtime(date_old, "%Y%m%d");
+alter table stat_account_created change date date date;
+alter table stat_account_created drop column date_old;
+
+alter table stat_blue_bar_submit add column date_old int after date;
+update stat_blue_bar_submit set date_old=date;
+update stat_blue_bar_submit set date=from_unixtime(date_old, "%Y%m%d");
+alter table stat_blue_bar_submit change date date date;
+alter table stat_blue_bar_submit drop column date_old;
+
+alter table stat_client_download add column date_old int after date;
+update stat_client_download set date_old=date;
+update stat_client_download set date=from_unixtime(date_old, "%Y%m%d");
+alter table stat_client_download change date date date;
+alter table stat_client_download drop column date_old;
+
+alter table stat_region add column date_old int after date;
+update stat_region set date_old=date;
+update stat_region set date=from_unixtime(date_old, "%Y%m%d");
+alter table stat_region change date date date;
+alter table stat_region drop column date_old;
+
+alter table stat_site add column date_old int after date;
+update stat_site set date_old=date;
+update stat_site set date=from_unixtime(date_old, "%Y%m%d");
+alter table stat_site change date date date;
+alter table stat_site drop column date_old;
 
=== modified file 'trunk/www/admin/summary_report.php'
--- trunk/www/admin/summary_report.php	2011-09-23 16:53:03 +0000
+++ trunk/www/admin/summary_report.php	2014-06-27 19:39:57 +0000
@@ -150,7 +150,7 @@
             $common_where_clause .= " AND ";
         }
 
-        $common_date_from_clause = "(date >= UNIX_TIMESTAMP(DATE(:filter_date_from)))";
+        $common_date_from_clause = "(date >= :filter_date_from)";
         $common_where_clause .= $common_date_from_clause;
         $common_where_clause_params[':filter_date_from'] = $filter_date_from;
     }
@@ -162,7 +162,7 @@
             $common_where_clause .= " AND ";
         }
 
-        $common_date_to_clause = "(date < UNIX_TIMESTAMP(DATE(:filter_date_to)))";
+        $common_date_to_clause = "(date <= :filter_date_to)";
         $common_where_clause .= $common_date_to_clause;
         $common_where_clause_params[':filter_date_to'] = $filter_date_to;
     }
 
=== modified file 'trunk/www/admin/usage_report.php'
--- trunk/www/admin/usage_report.php	2011-09-23 16:53:03 +0000
+++ trunk/www/admin/usage_report.php	2014-06-27 19:39:57 +0000
@@ -92,7 +92,7 @@
             $common_where_clause .= " AND ";
         }
 
-        $common_date_from_clause = "FROM_UNIXTIME(date, '%Y-%m') >= :filter_date_from";
+        $common_date_from_clause = "DATE_FORMAT(date, '%Y-%m') >= :filter_date_from";
         $common_where_clause .= $common_date_from_clause;
         $common_where_clause_params[':filter_date_from'] = $filter_date_from;
     }
@@ -104,7 +104,7 @@
             $common_where_clause .= " AND ";
         }
 
-        $common_date_to_clause = "FROM_UNIXTIME(date, '%Y-%m') <= :filter_date_to";
+        $common_date_to_clause = "DATE_FORMAT(date, '%Y-%m') <= :filter_date_to";
         $common_where_clause .= $common_date_to_clause;
         $common_where_clause_params[':filter_date_to'] = $filter_date_to;
     }
@@ -113,15 +113,15 @@
     $all_days_in_range =
         get_seq_dates(
             $config,
-            "(SELECT FROM_UNIXTIME(MIN(date), '%Y-%m-%d') FROM stat_region ".(strlen($common_date_from_clause) ? " WHERE ".$common_date_from_clause : "").")",
-            "(SELECT FROM_UNIXTIME(MAX(date), '%Y-%m-%d') FROM stat_region ".(strlen($common_date_to_clause) ? " WHERE ".$common_date_to_clause : "").")",
+            "(SELECT DATE_FORMAT(MIN(date), '%Y-%m-%d') FROM stat_region ".(strlen($common_date_from_clause) ? " WHERE ".$common_date_from_clause : "").")",
+            "(SELECT DATE_FORMAT(MAX(date), '%Y-%m-%d') FROM stat_region ".(strlen($common_date_to_clause) ? " WHERE ".$common_date_to_clause : "").")",
             strlen($common_date_from_clause) ? $common_where_clause_params : array(),
             false);
     $all_months_in_range =
         get_seq_dates(
             $config,
-            "(SELECT FROM_UNIXTIME(MIN(date), '%Y-%m-%d') FROM stat_region ".(strlen($common_date_from_clause) ? " WHERE ".$common_date_from_clause : "").")",
-            "(SELECT FROM_UNIXTIME(MAX(date), '%Y-%m-%d') FROM stat_region ".(strlen($common_date_to_clause) ? " WHERE ".$common_date_to_clause : "").")",
+            "(SELECT DATE_FORMAT(MIN(date), '%Y-%m-%d') FROM stat_region ".(strlen($common_date_from_clause) ? " WHERE ".$common_date_from_clause : "").")",
+            "(SELECT DATE_FORMAT(MAX(date), '%Y-%m-%d') FROM stat_region ".(strlen($common_date_to_clause) ? " WHERE ".$common_date_to_clause : "").")",
             strlen($common_date_from_clause) ? $common_where_clause_params : array(),
             true);
 
@@ -134,7 +134,7 @@
     $query =
         "SELECT MAX(count) AS count, DATE_FORMAT(day, '%Y-%m') AS month, region FROM (".
             "SELECT ".
-                "FROM_UNIXTIME(date, '%Y-%m-%d') AS day, ".
+                "DATE_FORMAT(date, '%Y-%m-%d') AS day, ".
                 "SUM(COALESCE(cnt, 0)) AS count, ".
                 "region ".
             "FROM stat_region ".
@@ -155,7 +155,7 @@
     
     $query =
         "SELECT ".
-            "FROM_UNIXTIME(date, '%Y-%m-%d') AS day, ".
+            "DATE_FORMAT(date, '%Y-%m-%d') AS day, ".
             "SUM(COALESCE(cnt, 0)) AS count, ".
             "region ".
         "FROM stat_region ".
@@ -175,7 +175,7 @@
     $query =
         "SELECT SUM(count) AS count, DATE_FORMAT(day, '%Y-%m') AS month, region FROM (".
             "SELECT ".
-                "FROM_UNIXTIME(date, '%Y-%m-%d') AS day, ".
+                "DATE_FORMAT(date, '%Y-%m-%d') AS day, ".
                 "SUM(COALESCE(cnt, 0)) AS count, ".
                 "region ".
             "FROM stat_region ".
@@ -197,7 +197,7 @@
     $query =
         "SELECT SUM(count) AS count, DATE_FORMAT(day, '%Y-%m') AS month, region FROM (".
             "SELECT ".
-                "FROM_UNIXTIME(date, '%Y-%m-%d') AS day, ".
+                "DATE_FORMAT(date, '%Y-%m-%d') AS day, ".
                 "SUM(COALESCE(cnt, 0)) AS count, ".
                 "region ".
             "FROM stat_site ".
 
=== modified file 'trunk/www/download.php'
--- trunk/www/download.php	2011-08-18 19:27:14 +0000
+++ trunk/www/download.php	2014-06-27 19:39:57 +0000
@@ -46,7 +46,7 @@
 // existing record is found for that key, the counter is incremented.  Otherwise, a new
 // record is created.
 
-$date = mktime(0, 0, 1, date("m"), date("j"), date("Y"));
+$date = strftime("%Y-%m-%d");
 
 $region = lookup_region($config);
 
 
=== modified file 'trunk/www/includes/geoip_helpers.php'
--- trunk/www/includes/geoip_helpers.php	2013-01-16 18:47:58 +0000
+++ trunk/www/includes/geoip_helpers.php	2014-06-27 19:39:57 +0000
@@ -74,7 +74,7 @@
     // matching will reflect the keywords in place on the day of the event.  Note
     // the COALESCE as certain users may not have a valid assigned proxy id.
 
-    $date = mktime(0, 0, 1, date("m"), date("j"), date("Y"));
+    $date = strftime("%Y-%m-%d");
 
     $query = "UPDATE stat_region JOIN proxy ON stat_region.proxy = proxy.id " .
              "SET cnt=cnt+1, ".
@@ -106,7 +106,7 @@
     //
     // See comment above.  Has an additional key attribute, the site visited.
 
-    $date = mktime(0, 0, 1, date("m"), date("j"), date("Y"));
+    $date = strftime("%Y-%m-%d");
 
     $query = "UPDATE stat_site JOIN proxy ON stat_site.proxy = proxy.id " .
              "SET cnt=cnt+1, ".
@@ -135,7 +135,7 @@
     //
     // See comment above.  Has an additional key attribute, the site visited.
 
-    $date = mktime(0, 0, 1, date("m"), date("j"), date("Y"));
+    $date = strftime("%Y-%m-%d");
 
     $query = "UPDATE stat_blue_bar_submit JOIN proxy ON stat_blue_bar_submit.proxy = proxy.id " .
              "SET cnt=cnt+1, ".
@@ -164,7 +164,7 @@
     //
     // See comment above.
 
-    $date = mktime(0, 0, 1, date("m"), date("j"), date("Y"));
+    $date = strftime("%Y-%m-%d");
 
     $query = "UPDATE stat_account_created JOIN proxy ON stat_account_created.proxy = proxy.id " .
              "SET cnt=cnt+1, ".
 
=== modified file 'trunk/www/includes/html_helpers.php'
--- trunk/www/includes/html_helpers.php	2011-09-23 17:03:34 +0000
+++ trunk/www/includes/html_helpers.php	2014-06-27 19:39:57 +0000
@@ -58,7 +58,7 @@
 
         if (($selected_value !== Null) && ($selected_value == $value))
         {
-            echo "selected=1";
+            echo " selected";
         }
 
         if ($transform_func)
 
=== modified file 'trunk/www/reports.php'
--- trunk/www/reports.php	2011-03-31 22:05:47 +0000
+++ trunk/www/reports.php	2014-06-27 19:39:57 +0000
@@ -26,20 +26,20 @@
     include($_SERVER[DOCUMENT_ROOT]."/http-errors/403.php");
 }
 
-if (!$_GET["mf"]) {
-    $_GET["mf"]=date("n"); $_GET["df"]=date("d"); $_GET["yf"]=date("Y");
-    $_GET["mt"]=date("n"); $_GET["dt"]=date("d"); $_GET["yt"]=date("Y");
+if (!isset($_GET["rep"])) {
+    $_GET["df"]=strftime("%Y-%m-%d");
+    $_GET["dt"]=strftime("%Y-%m-%d");
     $_GET["ord"]=0;
     $_GET["proxy"]=0;
     }
 else {
-    foreach (array("mf", "df", "yf", "mt", "dt", "yt", "rep", "ord", "proxy") as $var) {
+    foreach (array("rep", "ord", "proxy") as $var) {
         $_GET[$var]=(int)$_GET[$var];
         }
     // current report query
     $q="rep={$_GET["rep"]}&amp;".
-    $q.="mf={$_GET["mf"]}&amp;df={$_GET["df"]}&amp;yf={$_GET["yf"]}&amp;";
-    $q.="mt={$_GET["mt"]}&amp;dt={$_GET["dt"]}&amp;yt={$_GET["yt"]}&amp;";
+    $q.="df={$_GET["df"]}&amp;";
+    $q.="dt={$_GET["dt"]}&amp;";
     $q.="proxy={$_GET["proxy"]}";
     }
 
@@ -47,11 +47,11 @@
 
 $sql_params = array();
 
-$from = mktime( 0, 0, 0,$_GET["mf"],$_GET["df"],$_GET["yf"]);
-$to   = mktime(23,59,59,$_GET["mt"],$_GET["dt"],$_GET["yt"]);
+$from = $_GET["df"];
+$to   = $_GET["dt"];
 
 // Don't use "date" in the param name, since there's a str_replace done on that string below.
-$date_cond = "date > :dt_from AND date < :dt_to";
+$date_cond = "date >= :dt_from AND date <= :dt_to";
 $sql_params[':dt_from'] = $from;
 $sql_params[':dt_to'] = $to;
 
@@ -91,84 +91,86 @@
 
 // Handle group 4, Anonymous Users
 // The default_sort_field is a 1-based index.
+/*
 array(
     "report_title" => ___("Last logins"),
-    "query" => "SELECT IF(grp = '".get_anonymous_user_class_id()."', '".get_user_class_name(get_anonymous_user_class_id())."', uname) AS report_01_0, IF(last, FROM_UNIXTIME(last, \"%Y-%m-%d %H:%i:%S\"), \"-\") as report_01_1 from user LEFT OUTER JOIN userproxy ON user.id = userproxy.userid where ".str_replace("date", "last", $date_cond)." and {$user_table_proxy_cond} GROUP BY uname",
+    "query" => "SELECT IF(grp = '".get_anonymous_user_class_id()."', '".get_user_class_name(get_anonymous_user_class_id())."', uname) AS report_01_0, IF(last, DATE_FORMAT(last, \"%Y-%m-%d\"), \"-\") as report_01_1 from user LEFT OUTER JOIN userproxy ON user.id = userproxy.userid where ".str_replace("date", "last", $date_cond)." and {$user_table_proxy_cond} GROUP BY uname",
     "default_sort_field" => "2",
     "total_field_count" => "2"),
+*/
 
 array(
     "report_title" => ___("Region logins by day"),
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y-%m-%d') AS report_02_0, region AS report_02_1, SUM(cnt) AS report_02_2 FROM stat_region WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_02_0, region",
+    "query" => "SELECT DATE_FORMAT(date, '%Y-%m-%d') AS report_02_0, region AS report_02_1, SUM(cnt) AS report_02_2 FROM stat_region WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_02_0, region",
     "default_sort_field" => "1",
     "total_field_count" => "3"),
 
 array(
     "report_title" => ___("Region logins by month"),
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y-%m') AS report_02_0, region AS report_02_1, SUM(cnt) AS report_02_2 FROM stat_region WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_02_0, region",
+    "query" => "SELECT DATE_FORMAT(date, '%Y-%m') AS report_02_0, region AS report_02_1, SUM(cnt) AS report_02_2 FROM stat_region WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_02_0, region",
     "default_sort_field" => "1",
     "total_field_count" => "3"),
 
 array(
     "report_title" => ___("Region logins by year"), 
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y') AS report_02_0, region AS report_02_1, SUM(cnt) AS report_02_2 FROM stat_region WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_02_0, region",
+    "query" => "SELECT DATE_FORMAT(date, '%Y') AS report_02_0, region AS report_02_1, SUM(cnt) AS report_02_2 FROM stat_region WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_02_0, region",
     "default_sort_field" => "1",
     "total_field_count" => "3"),
 
 
 array(
     "report_title" => ___("Sites by day"), 
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y-%m-%d') AS report_03_0, domain AS report_03_1, SUM(cnt) AS report_03_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_03_0, domain",
+    "query" => "SELECT DATE_FORMAT(date, '%Y-%m-%d') AS report_03_0, domain AS report_03_1, SUM(cnt) AS report_03_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_03_0, domain",
     "default_sort_field" => "1",
     "total_field_count" => "3"),
 
 array(
     "report_title" => ___("Sites by month"), 
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y-%m') AS report_03_0, domain AS report_03_1, SUM(cnt) AS report_03_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_03_0, domain",
+    "query" => "SELECT DATE_FORMAT(date, '%Y-%m') AS report_03_0, domain AS report_03_1, SUM(cnt) AS report_03_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_03_0, domain",
     "default_sort_field" => "1",
     "total_field_count" => "3"),
 
 array(
     "report_title" => ___("Sites by year"), 
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y') AS report_03_0, domain AS report_03_1, SUM(cnt) AS report_03_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_03_0, domain",
+    "query" => "SELECT DATE_FORMAT(date, '%Y') AS report_03_0, domain AS report_03_1, SUM(cnt) AS report_03_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_03_0, domain",
     "default_sort_field" => "1",
     "total_field_count" => "3"),
 
 
 array(
     "report_title" => ___("Site, region by day"), 
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y-%m-%d') AS report_04_0, domain AS report_04_1, region AS report_04_2, SUM(cnt) AS report_04_3 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_04_0, domain, region",
+    "query" => "SELECT DATE_FORMAT(date, '%Y-%m-%d') AS report_04_0, domain AS report_04_1, region AS report_04_2, SUM(cnt) AS report_04_3 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_04_0, domain, region",
     "default_sort_field" => "1",
     "total_field_count" => "4"),
 
 array(
     "report_title" => ___("Site, region by month"), 
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y-%m') AS report_04_0, domain AS report_04_1, region AS report_04_2, SUM(cnt) AS report_04_3 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_04_0, domain, region",
+    "query" => "SELECT DATE_FORMAT(date, '%Y-%m') AS report_04_0, domain AS report_04_1, region AS report_04_2, SUM(cnt) AS report_04_3 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_04_0, domain, region",
     "default_sort_field" => "1",
     "total_field_count" => "4"),
 
 array(
     "report_title" => ___("Site, region by year"), 
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y') AS report_04_0, domain AS report_04_1, region AS report_04_2, SUM(cnt) AS report_04_3 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_04_0, domain, region",
+    "query" => "SELECT DATE_FORMAT(date, '%Y') AS report_04_0, domain AS report_04_1, region AS report_04_2, SUM(cnt) AS report_04_3 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_04_0, domain, region",
     "default_sort_field" => "1",
     "total_field_count" => "4"),
 
 
 array(
     "report_title" => ___("Requests by region per day"), 
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y-%m-%d') AS report_05_0, region AS report_05_1, SUM(cnt) AS report_05_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_05_0, region",
+    "query" => "SELECT DATE_FORMAT(date, '%Y-%m-%d') AS report_05_0, region AS report_05_1, SUM(cnt) AS report_05_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_05_0, region",
     "default_sort_field" => "1",
     "total_field_count" => "3"),
 
 array(
     "report_title" => ___("Requests by region per month"), 
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y-%m') AS report_05_0, region AS report_05_1, SUM(cnt) AS report_05_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_05_0, region",
+    "query" => "SELECT DATE_FORMAT(date, '%Y-%m') AS report_05_0, region AS report_05_1, SUM(cnt) AS report_05_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_05_0, region",
     "default_sort_field" => "1",
     "total_field_count" => "3"),
 
 array(
     "report_title" => ___("Requests by region per year"), 
-    "query" => "SELECT FROM_UNIXTIME(date, '%Y') AS report_05_0, region AS report_05_1, SUM(cnt) AS report_05_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_05_0, region",
+    "query" => "SELECT DATE_FORMAT(date, '%Y') AS report_05_0, region AS report_05_1, SUM(cnt) AS report_05_2 FROM stat_site WHERE {$date_cond} AND {$proxy_cond} GROUP BY report_05_0, region",
     "default_sort_field" => "1",
     "total_field_count" => "3"),
 
@@ -233,6 +235,7 @@
         $query.=" DESC";
     }
 
+//echo $query;
     $result = db_query_execute($config, $query, convert_null_array($sql_params));
 
     // Get the first record, so we'll know if there are results or not.
@@ -264,55 +267,17 @@
     echo_proxy_combo($config, "proxy", $_GET["proxy"], 1, ___("Any proxy"));
 
     echo ___("From")."\n";
-    echo "<select name=\"mf\">\n";
-    for ($j=1; $j<=12; $j++) {
-        echo "<option value=\"{$j}\"";
-        if ($_GET["mf"]==$j) echo " selected";
-        echo ">".strftime("%b",strtotime("{$j}/1/1970"))."</option>\n";
-        }
-    echo "</select> \n\n";
-
-    echo "<select name=\"df\">\n";
-    for ($j=1; $j<=31; $j++) {
-        echo "<option value=\"{$j}\"";
-        if ($_GET["df"]==$j) echo " selected";
-        echo ">{$j}</option>\n";
-        }
-    echo "</select>, \n\n";
-
-    echo "<select name=\"yf\">\n";
-    for ($j=date("Y")-4; $j<=date("Y"); $j++) {
-        echo "<option value=\"$j\"";
-        if ($_GET["yf"]==$j) echo " selected";
-        echo ">{$j}</option>\n";
-        }
-    echo "</select> \n\n";
+
+    echo "<input type=\"text\" size=\"7\" maxlength=\"10\" name=\"df\" title=\"YYYY-MM-DD\"";
+    echo isset($_GET["df"]) ? " value=\"".htmlentities($_GET["df"], ENT_QUOTES, get_lang_xtra("charset"))."\"" : "";
+    echo ">\n\n";
 
 
     echo ___("To")."\n";
-    echo "<select name=\"mt\">\n";
-    for ($j=1; $j<=12; $j++) {
-        echo "<option value=\"{$j}\"";
-        if ($_GET["mt"]==$j) echo " selected";
-        echo ">".strftime("%b",strtotime("{$j}/1/1970"))."</option>\n";
-        }
-    echo "</select> \n\n";
-
-    echo "<select name=\"dt\">\n";
-    for ($j=1; $j<=31; $j++) {
-        echo "<option value=\"{$j}\"";
-        if ($_GET["dt"]==$j) echo " selected";
-        echo ">{$j}</option>\n";
-        }
-    echo "</select>, \n\n";
-
-    echo "<select name=\"yt\">\n";
-    for ($j=date("Y")-4; $j<=date("Y"); $j++) {
-        echo "<option value=\"$j\"";
-        if ($_GET["yt"]==$j) echo " selected";
-        echo ">{$j}</option>\n";
-        }
-    echo "</select></b>\n\n";
+    echo "<input type=\"text\" size=\"7\" maxlength=\"10\" name=\"dt\" title=\"YYYY-MM-DD\"";
+    echo isset($_GET["dt"]) ? " value=\"".htmlentities($_GET["dt"], ENT_QUOTES, get_lang_xtra("charset"))."\"" : "";
+    echo ">\n</b>\n\n";
+
 
     echo "<input type=\"submit\" value=\"".___("Display")."\">\n";
     echo "</form>\n\n";