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

[Vlad]

www/psiphon3/www/index.php: stats date format updated from integer to "yyyy-mm-dd"

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

347. By e-fryntov on 2014-07-23

Vlad 2014-07-23 Stats date format updated from unixtime to yyyy-mm-dd

[e.fryntov (e-fryntov)]

pushed & built on the test server

On Wed, Jul 23, 2014 at 3:20 PM, Vlad <[e-mail]> wrote:

> Vlad has proposed merging lp:~t7-vla7-lz/psiphon/psiphon into lp:psiphon.
>
> Requested reviews:
> Psiphon Inc. (psiphon-inc)
>
> For more details, see:
> https://code.launchpad.net/~t7-vla7-lz/psiphon/psiphon/+merge/227982
>
> www/psiphon3/www/index.php: stats date format updated from integer to
> "yyyy-mm-dd"
> --
> https://code.launchpad.net/~t7-vla7-lz/psiphon/psiphon/+merge/227982
> Your team Psiphon Inc. is requested to review the proposed merge of
> lp:~t7-vla7-lz/psiphon/psiphon into lp:psiphon.
>
> === modified file 'trunk/www/psiphon3/www/index.php'
> --- trunk/www/psiphon3/www/index.php 2011-09-08 18:35:50 +0000
> +++ trunk/www/psiphon3/www/index.php 2014-07-23 19:19:22 +0000
> @@ -63,7 +63,7 @@
>
> $region = lookup_region($config);
> $proxy_id = $proxy_record['id'];
> - $date = mktime(0, 0, 1, date("m"), date("j"), date("Y"));
> + $date = strftime("%Y-%m-%d");
>
> $params = convert_null_array(array(
> ":date" => $date,
>
>
>

=== modified file 'trunk/www/psiphon3/www/index.php'
--- trunk/www/psiphon3/www/index.php	2011-09-08 18:35:50 +0000
+++ trunk/www/psiphon3/www/index.php	2014-07-23 19:19:22 +0000
@@ -63,7 +63,7 @@
 
     $region = lookup_region($config);
     $proxy_id = $proxy_record['id'];
-    $date = mktime(0, 0, 1, date("m"), date("j"), date("Y"));
+    $date = strftime("%Y-%m-%d");
 
     $params = convert_null_array(array(
                     ":date" => $date,