X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FDate.pm;h=355370adae4ed3498c1002bdf70dcb94a8e98690;hb=09ce724404f16e036cbdfeccb64a0955dafca99a;hp=8e9383fd733807cfb8a1f25a68ea968dcbe2398f;hpb=2dfda73eeb3eae2d4f894099754794ef07d060dd;p=freeside.git

diff --git a/rt/lib/RT/Date.pm b/rt/lib/RT/Date.pm
index 8e9383fd7..355370ada 100644
--- a/rt/lib/RT/Date.pm
+++ b/rt/lib/RT/Date.pm
@@ -1,14 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# BEGIN LICENSE BLOCK
 # 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 # 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
+# (Except where explictly superceded by other copyright notices)
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
@@ -20,31 +14,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
 # 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
 # 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Date - a simple Object Oriented date.
@@ -227,28 +203,23 @@ sub Set {
 
 # {{{ sub SetToMidnight 
 
-=head2 SetToMidnight [Timezone => 'utc']
+=head2 SetToMidnight
 
-Sets the date to midnight (at the beginning of the day).
+Sets the date to midnight (at the beginning of the day) GMT
 Returns the unixtime at midnight.
 
-Arguments:
-
-=over 4
-
-=item Timezone - Timezone context C<server> or C<UTC>
-
 =cut
 
 sub SetToMidnight {
     my $self = shift;
-    my %args = ( Timezone => 'UTC', @_ );
-    if ( lc $args{'Timezone'} eq 'server' ) {
-        $self->Unix( Time::Local::timelocal( 0,0,0,(localtime $self->Unix)[3..7] ) );
-    } else {
-        $self->Unix( Time::Local::timegm( 0,0,0,(gmtime $self->Unix)[3..7] ) );
-    }
+    
+    use Time::Local;
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday) = gmtime($self->Unix);
+    $self->Unix(timegm (0,0,0,$mday,$mon,$year,$wday,$yday));
+    
     return ($self->Unix);
+    
+    
 }
 
 
@@ -359,8 +330,7 @@ sub DurationAsString {
         $s         = int( $duration / $YEAR );
         $time_unit = $self->loc("years");
     }
-
-    if ($negative) {
+    if (0) { # For now, never display the "AGO" # $negative) {
         return $self->loc( "[_1] [_2] ago", $s, $time_unit );
     }
     else {
@@ -405,7 +375,6 @@ sub AsString {
 # }}}
 
 # {{{ GetWeekday
-
 =head2 GetWeekday DAY
 
 Takes an integer day of week and returns a localized string for that day of week
@@ -428,7 +397,6 @@ sub GetWeekday {
 # }}}
 
 # {{{ GetMonth
-
 =head2 GetMonth DAY
 
 Takes an integer month and returns a localized string for that month 
@@ -561,65 +529,8 @@ sub ISO {
 
 # }}}
 
-# {{{ sub Date
-
-=head2 Date
-
-Takes nothing
-
-Returns the object's date in yyyy-mm-dd format; this is the same as
-the ISO format without the time
-
-=cut
-
-sub Date {
-    my $self = shift;
-    my ($date, $time) = split ' ', $self->ISO;
-    return $date;
-}
-
-# }}}}
-
-# {{{ sub Time
-
-=head2 Time
-
-Takes nothing
-
-Returns the object's time in hh:mm:ss format; this is the same as
-the ISO format without the date
-
-=cut
-
-sub Time {
-    my $self = shift;
-    my ($date, $time) = split ' ', $self->ISO;
-    return $time;
-}
-
-# }}}}
-
-# {{{ sub W3CDTF
-
-=head2 W3CDTF
-
-Takes nothing
-
-Returns the object's date in W3C DTF format
-
-=cut
-
-sub W3CDTF {
-    my $self = shift;
-    my $date = $self->ISO . 'Z';
-    $date =~ s/ /T/;
-    return $date;
-};
-
-# }}}
 
 # {{{ sub LocalTimezone 
-
 =head2 LocalTimezone
 
   Returns the current timezone. For now, draws off a system timezone, RT::Timezone. Eventually, this may