Changeset 484 for trunk/Common/Forms.php

Timestamp:

Feb 10, 2013, 11:31:12 AM (12 years ago)

Author:

chronos

Message:

• Přidáno: Formulářový typ RandomHash pro zajištění funkčnosti generování vlastnosti Salt pro generování hesel.
• Opraveno: Změna hesla uživatele nyní funguje správně i přes obecnou Správu dat.

File:

• trunk/Common/Forms.php (modified) (9 diffs)

trunk/Common/Forms.php

@@ -40 +40 @@
         } else $UseType = $Item['Type'];            
       $Edit = $System->Type->ExecuteTypeEvent($UseType, 'OnView', 
-        array('Value' => $this->Values[$Index], 'Name' => $Index, 'Type' => $Item['Type']));
+        array('Value' => $this->Values[$Index], 'Name' => $Index, 
+        'Type' => $Item['Type'], 'Values' => $this->Values));
       if(array_key_exists('Suffix', $Item)) $Edit .= ' '.$Item['Suffix'];
-      array_push($Table['Rows'], array($Item['Caption'].':', $Edit));
+      if(!$System->Type->IsHidden($UseType))
+        array_push($Table['Rows'], array($Item['Caption'].':', $Edit));
     }
     $Output = '<fieldset><legend>'.$this->Definition['Title'].'</legend>'.Table($Table).
@@ -62 +64 @@
     global $Database, $FormTypes, $System;
 
+    $Hidden = '';
+    $IsHidden = false;
     $Table = array(
       //'Header' => array('Položka', 'Hodnota'),
@@ -76 +80 @@
       if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
         $Parameters = array('Value' => $this->Values[$Index], 'Name' => $Index, 
-            'Type' => $Item['Type']);
+            'Type' => $Item['Type'], 'Values' => $this->Values);
         if(array_key_exists('Null', $Item)) $Parameters['Null'] = $Item['Null'];
           else unset($Parameters['Null']);
@@ -94 +98 @@
         if(array_key_exists('Suffix', $Item)) $Edit .= $Item['Suffix'];
 
-      array_push($Table['Rows'], array($Item['Caption'].':', $Edit));
+      if(!$System->Type->IsHidden($UseType))
+          array_push($Table['Rows'], array($Item['Caption'].':', $Edit));
+      else $Hidden .= $Edit;
     }
     }
     $Output = '<fieldset><legend>'.$this->Definition['Title'].'</legend>'.Table($Table).
-    '</fieldset>';
+    $Hidden.'</fieldset>';
     return($Output); 
   }
@@ -125 +131 @@
         $this->Values[$Index] = $System->Type->ExecuteTypeEvent($UseType, 'OnLoadDb', 
             array('Value' => $DbRow[$Index], 'Name' => $Index, 
-            'Type' => $Item['Type']));
+            'Type' => $Item['Type'], 'Values' => $this->Values));
         
         //echo($DbRow[$Index].'='.$this->Values[$Index].'<br/>');
@@ -142 +148 @@
       if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
       $Parameters = array('Value' => $this->Values[$Index], 'Name' => $Index, 
-          'Type' => $Item['Type']);
+          'Type' => $Item['Type'], 'Values' => $this->Values);
       
         if(array_key_exists($Item['Type'], $FormTypes))
@@ -157 +163 @@
         } else $UseType = $Item['Type'];
         $Values[$Index] = $System->Type->ExecuteTypeEvent($UseType, 'OnSaveDb', $Parameters);
+        if(($Item['Type'] == 'Password') and ($Values[$Index] == '')) unset($Values[$Index]);
         
         //echo($DbRow[$Index].'='.$this->Values[$Index].'<br/>');
@@ -181 +188 @@
     $Values = array();
     foreach($this->Definition['Items'] as $Index => $Item)
-    if(!array_key_exists($Item['Type'], $FormTypes) or 
-    (array_key_exists($Item['Type'], $FormTypes) and ($FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
+    if((!array_key_exists($Item['Type'], $FormTypes) or 
+    (array_key_exists($Item['Type'], $FormTypes) and
+    ($FormTypes[$Item['Type']]['Type'] != 'ManyToOne'))) and
+    (!array_key_exists('ReadOnly', $Item) or 
+    (array_key_exists('ReadOnly', $Item) and
+    ($Item['ReadOnly'] != true))))
     {
       //if(array_key_exists($Context.$Index, $_POST))
@@ -196 +207 @@
         } else $UseType = $Item['Type'];
         $Values[$Index] = $System->Type->ExecuteTypeEvent($UseType, 'OnLoad', 
-          array('Name' => $Index, 'Type' => $Item['Type']));
+          array('Name' => $Index, 'Type' => $Item['Type'], 'Values' => $this->Values));
     }
     return($Values);