[Perfparse-cvs] _perfparse-phpgui/smarty_extensions modifier.difftime.php, 1.1, 1.2

[Florian G. <re...@us...>]

Update of /cvsroot/perfparse/_perfparse-phpgui/smarty_extensions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28828/phpgui/smarty_extensions

Modified Files:
	modifier.difftime.php 
Log Message:
more on policy ui


Index: modifier.difftime.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/smarty_extensions/modifier.difftime.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** modifier.difftime.php	29 Dec 2006 00:27:07 -0000	1.1
--- modifier.difftime.php	6 Sep 2007 22:59:50 -0000	1.2
***************
*** 4,14 ****
--- 4,21 ----
   * Smarty Plugin
   * $Id$
+  * Usage: $smarty_var_in_seconds|difftime
   */
  
  function smarty_modifier_difftime($seconds) {
+   if($seconds=="" || $seconds==NULL) {
+     return "";
+   }
    $seconds=(int) $seconds;
    if($seconds == 0) {
      return "deleted immediately";
    }
+   if($seconds < 0) {
+     return "never deleted";
+   }
    $o_sec=$seconds % 60;
    $seconds=floor($seconds/60);
***************
*** 20,24 ****
    $seconds=floor($seconds/24);
    // $seconds are now days
!   if($seconds > 365) {
      $o_y=floor($seconds / 365);
      $seconds=$seconds-($o_y*365);
--- 27,31 ----
    $seconds=floor($seconds/24);
    // $seconds are now days
!   if($seconds >= 365) {
      $o_y=floor($seconds / 365);
      $seconds=$seconds-($o_y*365);
***************
*** 43,50 ****
    // debug
    // $output="o_y=$o_y o_mon=$o_mon o_week=$o_week o_days=$o_days o_h=$o_h o_min=$o_min o_sec=$o_sec result: ";
!   $o_y=($o_y==0)?'':"$o_y a ";
    $o_mon=($o_mon==0)?'':"$o_mon months ";
    $o_week=($o_week==0)?'':"$o_week weeks ";
!   $o_days=($o_days==0)?'':"$o_days d ";
    $output=$output.$o_y.$o_mon.$o_week.$o_days;
    if($o_h != 0 || $o_min != 0 || $o_sec !=0) {
--- 50,57 ----
    // debug
    // $output="o_y=$o_y o_mon=$o_mon o_week=$o_week o_days=$o_days o_h=$o_h o_min=$o_min o_sec=$o_sec result: ";
!   $o_y=($o_y==0)?'':"$o_y year ";
    $o_mon=($o_mon==0)?'':"$o_mon months ";
    $o_week=($o_week==0)?'':"$o_week weeks ";
!   $o_days=($o_days==0)?'':"$o_days days ";
    $output=$output.$o_y.$o_mon.$o_week.$o_days;
    if($o_h != 0 || $o_min != 0 || $o_sec !=0) {