[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tep-commits
Subject:    [TEP-COMMIT] CVS: admin/admin/includes/functions general.php,1.129,1.130
From:       David Garcia Watkins <dgw_ () users ! sourceforge ! net>
Date:       2002-07-09 18:17:46
[Download RAW message or body]

Update of /cvsroot/tep/admin/admin/includes/functions
In directory usw-pr-cvs1:/tmp/cvs-serv4734

Modified Files:
	general.php 
Log Message:

type-casting is cleaner way to remove octals.

updated some functions that where not removing these octals.




Index: general.php
===================================================================
RCS file: /cvsroot/tep/admin/admin/includes/functions/general.php,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- general.php	1 Jul 2002 18:44:44 -0000	1.129
+++ general.php	9 Jul 2002 18:17:44 -0000	1.130
@@ -81,15 +81,16 @@
   }
 
   function tep_date_long($raw_date) {
-    if (strlen($raw_date) == 19) {
-      $date_formated = strftime(DATE_FORMAT_LONG, mktime(0,0,0,substr($raw_date, 5, \
                2),substr($raw_date, 8, 2),substr($raw_date, 0, 4)));
-    } elseif (strlen($raw_date) == 14) {
-      $date_formated = strftime(DATE_FORMAT_LONG, mktime(0,0,0,substr($raw_date, 4, \
                2),substr($raw_date, 6, 2),substr($raw_date, 0, 4)));
-    } else {
-      $date_formated = strftime(DATE_FORMAT_LONG, mktime(0,0,0,substr($raw_date, 4, \
                2),substr($raw_date, -2),substr($raw_date, 0, 4)));
-    }
+    if ( ($raw_date == '0000-00-00 00:00:00') || ($raw_date == '') ) return false;
 
-    return $date_formated;
+    $year = (int)substr($raw_date, 0, 4);
+    $month = (int)substr($raw_date, 5, 2);
+    $day = (int)substr($raw_date, 8, 2);
+    $hour = (int)substr($raw_date, 11, 2);
+    $minute = (int)substr($raw_date, 14, 2);
+    $second = (int)substr($raw_date, 17, 2);
+
+    return strftime(DATE_FORMAT_LONG, mktime($hour, $minute, $second, $month, $day, \
$year));  }
 
 ////
@@ -98,19 +99,27 @@
   function tep_date_short($raw_date) {
     if ( ($raw_date == '0000-00-00 00:00:00') || ($raw_date == '') ) return false;
 
-// remove the first digit if it is 0 - as php treats these as Octals
-    $year = substr($raw_date, 0, 4);
-    $month = substr($raw_date, 5, 2); if (substr($month, 0, 1) == '0') $month = \
                substr($month, 1);
-    $day = substr($raw_date, 8, 2); if (substr($day, 0, 1) == '0') $day =  \
                substr($day, 1);
-    $hour = substr($raw_date, 11, 2); if (substr($hour, 0, 1) == '0') $hour = \
                substr($hour, 1);
-    $minute = substr($raw_date, 14, 2); if (substr($minute, 0, 1) == '0') $minute = \
                substr($minute, 1);
-    $second = substr($raw_date, 17, 2); if (substr($second, 0, 1) == '0') $second = \
substr($second, 1); +    $year = (int)substr($raw_date, 0, 4);
+    $month = (int)substr($raw_date, 5, 2);
+    $day = (int)substr($raw_date, 8, 2);
+    $hour = (int)substr($raw_date, 11, 2);
+    $minute = (int)substr($raw_date, 14, 2);
+    $second = (int)substr($raw_date, 17, 2);
 
     return date(DATE_FORMAT, mktime($hour, $minute, $second, $month, $day, $year));
   }
 
   function tep_datetime_short($raw_datetime) {
-    return strftime(DATE_TIME_FORMAT, mktime(substr($raw_datetime, 11, \
2),substr($raw_datetime, 14, 2),substr($raw_datetime, 17, 2),substr($raw_datetime, 5, \
2),substr($raw_datetime, 8, 2),substr($raw_datetime, 0, 4))); +    if ( ($raw_date == \
'0000-00-00 00:00:00') || ($raw_date == '') ) return false; +
+    $year = (int)substr($raw_date, 0, 4);
+    $month = (int)substr($raw_date, 5, 2);
+    $day = (int)substr($raw_date, 8, 2);
+    $hour = (int)substr($raw_date, 11, 2);
+    $minute = (int)substr($raw_date, 14, 2);
+    $second = (int)substr($raw_date, 17, 2);
+
+    return strftime(DATE_TIME_FORMAT, mktime($hour, $minute, $second, $month, $day, \
$year));  }
 
   function tep_array_merge($array1, $array2, $array3 = '') {



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Stuff, things, and much much more.
http://thinkgeek.com/sf
_______________________________________________
Tep-commits mailing list
Tep-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tep-commits


[prev in list] [next in list] [prev in thread] [next in thread]