Changeset 42 for trunk/Base/Types

Timestamp:

Nov 24, 2009, 9:13:38 AM (15 years ago)

Author:

george

Message:

• Upraveno: Přepracován základový webový systém

Location:

trunk/Base/Types

Files:

• Base.php (modified) (1 diff)
• Boolean.php (modified) (3 diffs)
• Date.php (modified) (1 diff)
• DateTime.php (modified) (1 diff)
• Enumeration.php (modified) (3 diffs)
• Float.php (modified) (2 diffs)
• GPS.php (modified) (2 diffs)
• Hidden.php (modified) (2 diffs)
• Hyperlink.php (modified) (2 diffs)
• IPv4Address.php (modified) (2 diffs)
• Include.php (deleted)
• Integer.php (modified) (2 diffs)
• Password.php (modified) (2 diffs)
• PointerOneToMany.php (modified) (1 diff)
• PointerOneToOne.php (modified) (3 diffs)
• String.php (modified) (2 diffs)
• Text.php (modified) (1 diff)
• Time.php (modified) (1 diff)
• Type.php (added)

trunk/Base/Types/Base.php

@@ -1 +1 @@
 <?php
 
-class TypeBase extends Module
+class TypeBase
 {
+  var $System;
   var $DatabaseCompareOperators = array();
+
+  function __construct($System)
+  {
+    $this->System = $System;
+  }
 
   function OnView($Item)

trunk/Base/Types/Boolean.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeBoolean extends TypeBase
@@ -8 +10 @@
   {
     if($Item['Value'] == 1) $Checked = ' checked="1"'; else $Checked = '';
-    return('<input type="checkbox" name="'.$Item['Name'].'" disabled="1"'.$Checked.'>');
+    return('<input type="checkbox" name="'.$Item['Name'].'" disabled="1"'.$Checked.'/>');
   }
 
@@ -14 +16 @@
   {
     if($Item['Value'] == 1) $Checked = ' checked="1"'; else $Checked = '';
-    return('<input type="checkbox" name="'.$Item['Name'].'"'.$Checked.'>');
+    return('<input type="checkbox" name="'.$Item['Name'].'"'.$Checked.'/>');
   }
 

trunk/Base/Types/Date.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeDate extends TypeBase

trunk/Base/Types/DateTime.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeDateTime extends TypeBase

trunk/Base/Types/Enumeration.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeEnumeration extends TypeBase
@@ -5 +7 @@
   function OnView($Item)
   {
-    $Type = GetTypeDefinition($Item['Type']);
-    $Output = $Type['Parameters'][$Item['Value']];
+    $Type = $this->System->Type->GetTypeDefinition($Item['Type']);
+    if(array_key_exists($Item['Value'], $Type['Parameters']))
+      $Output = $Type['Parameters'][$Item['Value']];
+      else $Output = $Item['Value'];
     return($Output);
   }
@@ -12 +16 @@
   function OnEdit($Item)
   {
-    $Type = GetTypeDefinition($Item['Type']);
+    $Type = $this->System->Type->GetTypeDefinition($Item['Type']);
     $Output = '<select name="'.$Item['Name'].'">';
     foreach($Type['Parameters'] as $Index => $StateName)

trunk/Base/Types/Float.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeFloat extends TypeBase
@@ -13 +15 @@
   function OnEdit($Item)
   {
-    $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'">';
+    $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
     return($Output);
   }

trunk/Base/Types/GPS.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeGPS extends TypeBase
@@ -31 +33 @@
     } else $DbRow = array('Longitude' => 0, 'Latitude' => 0);
     $Value = $this->Explode($DbRow['Latitude']);
-    $Output = '<input type="text" size="3" name="'.$Item['Name'].'-lat-deg" value="'.$Value[0].'">°';
-    $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lat-min" value="'.$Value[1].'">\'';
-    $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lat-sec" value="'.$Value[2].'">"<br />';
+    $Output = '<input type="text" size="3" name="'.$Item['Name'].'-lat-deg" value="'.$Value[0].'"/>°';
+    $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lat-min" value="'.$Value[1].'"/>\'';
+    $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lat-sec" value="'.$Value[2].'"/>"<br />';
     $Value = $this->Explode($DbRow['Longitude']);
-    $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lon-deg" value="'.$Value[0].'">°';
-    $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lon-min" value="'.$Value[1].'">\'';
-    $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lon-sec" value="'.$Value[2].'">"';
+    $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lon-deg" value="'.$Value[0].'"/>°';
+    $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lon-min" value="'.$Value[1].'"/>\'';
+    $Output .= '<input type="text" size="3" name="'.$Item['Name'].'-lon-sec" value="'.$Value[2].'"/>"';
     return($Output);
   }

trunk/Base/Types/Hidden.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeHidden extends TypeBase
@@ -11 +13 @@
   function OnEdit($Item)
   {
-    $Output = '<input type="hidden" name="'.$Item['Name'].'" value="'.$Item['Value'].'">';
+    $Output = '<input type="hidden" name="'.$Item['Name'].'" value="'.$Item['Value'].'" />';
     return($Output);
   }

trunk/Base/Types/Hyperlink.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeHyperlink extends TypeBase
@@ -11 +13 @@
   function OnEdit($Item)
   {
-    $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'">';
+    $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
     return($Output);
   }

trunk/Base/Types/IPv4Address.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeIPv4Address extends TypeBase
@@ -11 +13 @@
   function OnEdit($Item)
   {
-    $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'">';
+    $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
     return($Output);
   }

trunk/Base/Types/Integer.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeInteger extends TypeBase
@@ -13 +15 @@
   function OnEdit($Item)
   {
-    $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'">';
+    $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
     return($Output);
   }

trunk/Base/Types/Password.php

@@ -2 +2 @@
 
 // SHA1 hash used
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypePassword extends TypeBase
@@ -15 +17 @@
   function OnEdit($Item)
   {
-    $Output = '<input type="password" name="'.$Item['Name'].'" value="">';
+    $Output = '<input type="password" name="'.$Item['Name'].'" value=""/>';
     return($Output);
   }

trunk/Base/Types/PointerOneToMany.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypePointerOneToMany extends TypeBase

trunk/Base/Types/PointerOneToOne.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypePointerOneToOne extends TypeBase
@@ -5 +7 @@
   function OnView($Item)
   {
-    global $TypeDefinitionList;
-
-    $Type = $TypeDefinitionList[$Item['Type']];
-    $DbResult = $this->Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name FROM `'.$Type['Parameters']['Table'].'` WHERE `'.$Type['Parameters']['Id'].'`='.$Item['Value']);
+    $Type = $this->System->Type->TypeDefinitionList[$Item['Type']];
+    $DbResult = $this->System->Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name FROM `'.$Type['Parameters']['Table'].'` WHERE `'.$Type['Parameters']['Id'].'`='.$Item['Value']);
     $DbRow = $DbResult->fetch_assoc();
-    $Output = $DbRow['Name'];
-    
-/*    $Type = GetTypeDefinition($Item['Type']);
-    $List = GetListDefinition($Type['Parameters'][0]);
-    $TargetTable = $Type['Parameters'][0];
-    $TargetName = $this->GetTablePointerName($Type, $Item);
-    if($TargetName != '') $Output = '<a href="?Action=ViewItem&amp;Table='.$TargetTable.'&amp;Item='.$TargetName[$List['IdName']].'">'.$TargetName['Name'].'</a>';
-    else $Output = '';
-    */
+    if($this->System->Modules['Permission']->Check('Corporation', 'Show'))
+      $Output = $this->System->HTML->MakeLink($DbRow['Name'], $this->System->MakeLink($Type['Parameters']['Table'], 'Show', array('Id' => $Item['Value'])));
+      else $Output = $DbRow['Name'];
     return($Output);
   }
@@ -24 +18 @@
   function OnEdit($Item)
   {
-    global $TypeDefinitionList;
-
     $Output = '<select name="'.$Item['Name'].'">';
-    $Type = $TypeDefinitionList[$Item['Type']];
+    $Type = $this->System->Type->TypeDefinitionList[$Item['Type']];
     if(array_key_exists('Condition', $Type['Parameters'])) $Where = ' WHERE '.$Type['Parameters']['Condition'];
       else $Where = '';
-    $DbResult = $this->Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name,'.$Type['Parameters']['Id'].' AS Id FROM `'.$Type['Parameters']['Table'].'`'.$Where.' ORDER BY Name DESC');
+    $DbResult = $this->System->Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name,'.$Type['Parameters']['Id'].' AS Id FROM `'.$Type['Parameters']['Table'].'`'.$Where.' ORDER BY Name DESC');
     while($DbRow = $DbResult->fetch_assoc())
     {

trunk/Base/Types/String.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeString extends TypeBase
@@ -13 +15 @@
   function OnEdit($Item)
   {
-    $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'">';
+    $Output = '<input type="text" name="'.$Item['Name'].'" value="'.$Item['Value'].'"/>';
     return($Output);
   }

trunk/Base/Types/Text.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeText extends TypeBase

trunk/Base/Types/Time.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Base.php');
 
 class TypeTime extends TypeBase