From 01d3c65b3f4181c1bff82982857bd4604596041f Mon Sep 17 00:00:00 2001
From: Jerry Jalava <jerry.jalava@gmail.com>
Date: Tue, 22 Apr 2008 10:05:58 +0300
Subject: [PATCH] Renamed date helper methods. Added some more helpers

---
 plugins/ajatus/actions/archive.php   |  2 +-
 plugins/ajatus/actions/delete.php    |  2 +-
 plugins/ajatus/actions/unarchive.php |  2 +-
 plugins/ajatus/actions/undelete.php  |  2 +-
 plugins/ajatus/helpers/date.php      | 65 +++++++++++++++++++++++++++++++++---
 5 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/plugins/ajatus/actions/archive.php b/plugins/ajatus/actions/archive.php
index 15958f0..fef98ac 100644
--- a/plugins/ajatus/actions/archive.php
+++ b/plugins/ajatus/actions/archive.php
@@ -56,7 +56,7 @@ class ajatus_actions_archive
         
         $metadata = new ajatus_helpers_metadata(&$object->value->metadata);
         $metadata->update('archived', true);
-        $metadata->update('revised', ajatus_helpers_date::time_to_js_date());
+        $metadata->update('revised', ajatus_helpers_date::unixtime_to_jsdatetime());
         $metadata->update('revisor', $GLOBALS['ajatus']->user['email']);
         
         return $object->save();
diff --git a/plugins/ajatus/actions/delete.php b/plugins/ajatus/actions/delete.php
index d95d444..d2a405f 100644
--- a/plugins/ajatus/actions/delete.php
+++ b/plugins/ajatus/actions/delete.php
@@ -56,7 +56,7 @@ class ajatus_actions_delete
         
         $metadata = new ajatus_helpers_metadata(&$object->value->metadata);
         $metadata->update('deleted', true);
-        $metadata->update('revised', ajatus_helpers_date::time_to_js_date());
+        $metadata->update('revised', ajatus_helpers_date::unixtime_to_jsdatetime());
         $metadata->update('revisor', $GLOBALS['ajatus']->user['email']);
         
         return $object->save();
diff --git a/plugins/ajatus/actions/unarchive.php b/plugins/ajatus/actions/unarchive.php
index 16dd986..0eb86bc 100644
--- a/plugins/ajatus/actions/unarchive.php
+++ b/plugins/ajatus/actions/unarchive.php
@@ -56,7 +56,7 @@ class ajatus_actions_unarchive
 
         $metadata = new ajatus_helpers_metadata(&$object->value->metadata);
         $metadata->update('archived', false);
-        $metadata->update('revised', ajatus_helpers_date::time_to_js_date());
+        $metadata->update('revised', ajatus_helpers_date::unixtime_to_jsdatetime());
         $metadata->update('revisor', $GLOBALS['ajatus']->user['email']);
         
         return $object->save();
diff --git a/plugins/ajatus/actions/undelete.php b/plugins/ajatus/actions/undelete.php
index 007ffd3..99a4e40 100644
--- a/plugins/ajatus/actions/undelete.php
+++ b/plugins/ajatus/actions/undelete.php
@@ -56,7 +56,7 @@ class ajatus_actions_undelete
         
         $metadata = new ajatus_helpers_metadata(&$object->value->metadata);
         $metadata->update('deleted', false);
-        $metadata->update('revised', ajatus_helpers_date::time_to_js_date());
+        $metadata->update('revised', ajatus_helpers_date::unixtime_to_jsdatetime());
         $metadata->update('revisor', $GLOBALS['ajatus']->user['email']);
         
         return $object->save();
diff --git a/plugins/ajatus/helpers/date.php b/plugins/ajatus/helpers/date.php
index e963f0b..3c2d7fc 100644
--- a/plugins/ajatus/helpers/date.php
+++ b/plugins/ajatus/helpers/date.php
@@ -13,7 +13,7 @@
 
 class ajatus_helpers_date
 {
-    static function time_to_js_date($unixtime=false)
+    static function unixtime_to_jsdatetime($unixtime=false)
     {        
         if ($unixtime === false)
         {
@@ -26,25 +26,80 @@ class ajatus_helpers_date
         $date = new DateTime(strftime("%x %X", $unixtime));
         $date_str = $date->format(DATE_ISO8601);
         $parts = explode('+', $date_str);
-        $js_date = $parts[0];
+        $jsdatetime = $parts[0];
         
         date_default_timezone_set($orig_tz);
         
-        return $js_date;
+        return $jsdatetime;
     }
     
-    static function js_date_to_time($js_date)
+    static function jsdatetime_to_unixtime($jsdatetime)
     {
         $orig_tz = date_default_timezone_get();
         date_default_timezone_set('UTC');
         
-        $date = new DateTime($js_date);
+        $date = new DateTime($jsdatetime);
         $unixtime = $date->format("U");
         
         date_default_timezone_set($orig_tz);
         
         return $unixtime;
     }
+    
+    static function jsdate_to_unixtime($jsdate)
+    {
+        $orig_tz = date_default_timezone_get();
+        date_default_timezone_set('UTC');
+        
+        $date = new DateTime($jsdatetime);
+        $unixtime = $date->format("U");
+        
+        date_default_timezone_set($orig_tz);        
+        
+        return $unixtime;
+    }
+    
+    static function unixtime_to_jsdate($unixtime=false)
+    {
+        if (   $unixtime === false
+            || !is_numeric($unixtime))
+        {
+            $unixtime = time();
+        }        
+        
+        $orig_tz = date_default_timezone_get();
+        date_default_timezone_set('UTC');
+        
+        $date = new DateTime(strftime("%x %X", $unixtime));
+        $date_str = $date->format(DATE_ISO8601);
+        $parts = explode('T', $date_str);
+        $jsdate = $parts[0];
+        
+        date_default_timezone_set($orig_tz);
+        
+        return $jsdate;
+    }
+    
+    static function unixtime_to_jstime($unixtime=false)
+    {        
+        if ($unixtime === false)
+        {
+            $unixtime = time();
+        }
+        
+        $orig_tz = date_default_timezone_get();
+        date_default_timezone_set('UTC');
+        
+        $date = new DateTime(strftime("%x %X", $unixtime));
+        $date_str = $date->format(DATE_ISO8601);
+        $parts = explode('T', $date_str);
+        $parts = explode('+', $parts[1]);
+        $jsdate = $parts[0];
+        
+        date_default_timezone_set($orig_tz);
+        
+        return $jsdate;
+    }
 }
 
 ?>
\ No newline at end of file
-- 
2.11.4.GIT