Changeset 871 for trunk/Common/Form/Types

Timestamp:

Apr 6, 2020, 9:19:50 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Show DateTime form field type with null value as unchecked checkbox.
• Fixed: Add form action error for fields with default null value.
• Added: Show Service form field NetworkSubnet.
• Modified: Code formatting.

File:

• trunk/Common/Form/Types/DateTime.php (modified) (8 diffs)

trunk/Common/Form/Types/DateTime.php

@@ -11 +11 @@
     global $MonthNames;
 
-    if($Item['Value'] == 0) return('');
-    if((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == '')) $Item['Value'] = time();
+    if ($Item['Value'] == 0) return '';
+    if ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == '')) $Item['Value'] = time();
     $Parts = getdate($Item['Value']);
     $Output = $Parts['mday'].'.'.$Parts['mon'].'.'.$Parts['year'].' '.
       sprintf('%02d', $Parts['hours']).':'.sprintf('%02d', $Parts['minutes']).':'.sprintf('%02d', $Parts['seconds']);
-    return($Output);
+    return $Output;
   }
 
@@ -23 +23 @@
     global $MonthNames;
 
-    if(($Item['Value'] !== null) and ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == ''))) $Item['Value'] = time();
+    if (($Item['Value'] == null) or (($Item['Value'] !== null) and ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == ''))))
+    {
+      $Item['Value'] = time();
+      $IsNull = true;
+    } else $IsNull = false;
     $Parts = getdate($Item['Value']);
 
     $Output = '';
     $Style = '';
-    if(array_key_exists('Null', $Item) and $Item['Null'])
+    if (array_key_exists('Null', $Item) and $Item['Null'])
     {
-      if($Item['Value'] != null)
+      if (!$IsNull)
       {
         $Checked = ' checked="1"';
@@ -46 +50 @@
     // Hour
     $Output .= '<select name="'.$Item['Name'].'-hour" id="'.$Item['Name'].'-hour" '.$Style.'>';
-    for($I = 1; $I <= 24; $I++)
+    for ($I = 1; $I <= 24; $I++)
     {
-      if($Parts['hours'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['hours'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -54 +58 @@
     // Minute
     $Output .= '<select name="'.$Item['Name'].'-minute" id="'.$Item['Name'].'-minute" '.$Style.'>';
-    for($I = 1; $I <= 60; $I++)
+    for ($I = 1; $I <= 60; $I++)
     {
-      if($Parts['minutes'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['minutes'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -62 +66 @@
     // Second
     $Output .= '<select name="'.$Item['Name'].'-second" id="'.$Item['Name'].'-second" '.$Style.'>';
-    for($I = 1; $I <= 60; $I++)
+    for ($I = 1; $I <= 60; $I++)
     {
-      if($Parts['seconds'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['seconds'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -70 +74 @@
     // Day
     $Output .= ' <select name="'.$Item['Name'].'-day" id="'.$Item['Name'].'-day" '.$Style.'>';
-    for($I = 1; $I <= 31; $I++)
+    for ($I = 1; $I <= 31; $I++)
     {
-      if($Parts['mday'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['mday'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -78 +82 @@
     // Month
     $Output .= '<select name="'.$Item['Name'].'-month"  id="'.$Item['Name'].'-month" '.$Style.'>';
-    for($I = 1; $I <= 12; $I++)
+    for ($I = 1; $I <= 12; $I++)
     {
-      if($Parts['mon'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['mon'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$MonthNames[$I].'</option>';
     }
@@ -86 +90 @@
     // Year
     $Output .= '<select name="'.$Item['Name'].'-year" id="'.$Item['Name'].'-year" '.$Style.'>';
-    for($I = 1900; $I < 2100; $I++)
+    for ($I = 1900; $I < 2100; $I++)
     {
-      if($Parts['year'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['year'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
     $Output .= '</select>';
-    return($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    if(!array_key_exists($Item['Name'].'-null', $_POST) and array_key_exists('Null', $Item) and ($Item['Null'] == true)) return(null);
-      else return(mktime($_POST[$Item['Name'].'-hour'], $_POST[$Item['Name'].'-minute'], $_POST[$Item['Name'].'-second'],
-        $_POST[$Item['Name'].'-month'], $_POST[$Item['Name'].'-day'], $_POST[$Item['Name'].'-year']));
+    if (!array_key_exists($Item['Name'].'-null', $_POST) and array_key_exists('Null', $Item) and ($Item['Null'] == true)) return null;
+      else return mktime($_POST[$Item['Name'].'-hour'], $_POST[$Item['Name'].'-minute'], $_POST[$Item['Name'].'-second'],
+        $_POST[$Item['Name'].'-month'], $_POST[$Item['Name'].'-day'], $_POST[$Item['Name'].'-year']);
   }
 
   function OnLoadDb($Item)
   {
-    return(MysqlDateTimeToTime($Item['Value']));
+    return MysqlDateTimeToTime($Item['Value']);
   }
 
   function OnSaveDb($Item)
   {
-    if($Item['Value'] == null) return(null);
-      else return(date('Y-m-d H:i:s', $Item['Value']));
+    if ($Item['Value'] == null) return null;
+      else return date('Y-m-d H:i:s', $Item['Value']);
   }
 
   function DatabaseEscape($Value)
   {
-    return('"'.addslashes($Value).'"');
+    return '"'.addslashes($Value).'"';
   }
 }