Changeset 22

Timestamp:

Jun 12, 2009, 8:56:03 PM (15 years ago)

Author:

george

Message:

• Opraveno: Obnovena funkčnost formulářové položky typu PointerOneToOne a možnost volby databáze serveru.

Location:

trunk/www

Files:

• form_classes.php (modified) (3 diffs)
• page.php (modified) (1 diff)
• task.php (modified) (1 diff)
• types/PointerOneToOne.php (modified) (3 diffs)
• user.php (modified) (1 diff)

trunk/www/form_classes.php

@@ -80 +80 @@
     'Items' => array(
       'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
-      'UserName' => array('Type' => 'String', 'Caption' => 'Správce', 'Default' => ''),
       'NetworkPortRealmd' => array('Type' => 'Integer', 'Caption' => 'Realmlist', 'Default' => ''),
       'Version' => array('Type' => 'Integer', 'Caption' => 'Verze', 'Default' => 0),
@@ -87 +86 @@
       'AccountCount' => array('Type' => 'Integer', 'Caption' => 'Účtů', 'Default' => 0),
       'CharacterCount' => array('Type' => 'Integer', 'Caption' => 'Postav', 0),
+      'UserName' => array('Type' => 'String', 'Caption' => 'Správce', 'Default' => ''),
     ),
   ),
@@ -117 +117 @@
 RegisterType('ServerType', 'Enumeration', array('Normální', 'PvP', 'RP', 'RPPvP'));
 RegisterType('OnlineState', 'Enumeration', array('Neaktivní', 'Aktivní'));
-
-//RegisterType('Database', 'PointerOneToOne', array('Table' => 'Database', 'Id' => 'Id', 'Name' => 'CONCAT(Name, " ", Version, " r", Revision)'));
+RegisterType('Database', 'PointerOneToOne', array('Table' => 'Database', 'Id' => 'Id', 'Name' => 'CONCAT(Name, " ", Version, " r", Revision)'));
 
 ?>

trunk/www/page.php

@@ -57 +57 @@
     $Time = round(GetMicrotime() - $ScriptTimeStart, 2);
     $Output = '<div id="Footer">
-   <i>| Projekt: WoW hosting | Správce: '.$this->System->Config['Web']['Admin'].' | E-mail: '.$this->System->Config['Web']['AdminEmail'].' | <a href="http://svn.zdechov.net/trac/wowhosting/browser">Zdrojové kódy</a> |';
+   <i>| Projekt: WoW hosting | Správce: '.$this->System->Config['Web']['Admin'].' | E-mail: '.$this->System->Config['Web']['AdminEmail'].' | <a href="http://svn.zdechov.net/trac/wowhosting/browser">Zdrojové kódy</a> | <a href="http://svn.zdechov.net/trac/wowhosting/log?verbose=on">Změny</a>|';
     if($this->System->Config['Web']['ShowRuntimeInfo'] == true) $Output .= ' Doba generování: '.$Time.' s / '.ini_get('max_execution_time').' s | Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B |';
         $Output .= '</i></div></body></html>';

trunk/www/task.php

@@ -26 +26 @@
     {
       $this->Database->query('UPDATE Task SET State="Running" WHERE Id='.$Task['Id']);
-      echo('Provádím '.$Task['Title']."...\n");
+      echo('Provádím úlohu '.$Task['Id'].': '.$Task['Title']."...\n");
       $Task['CommandList'] = "#!/bin/sh\n".$Task['CommandList'];
       file_put_contents($this->TempScript, $Task['CommandList']);

trunk/www/types/PointerOneToOne.php

@@ -3 +3 @@
 class TypePointerOneToOne extends TypeBase
 {
-  function GetTablePointerName($Type, $Item)
-  {
-    global $Database;
-
-    //print_r($Item);
-    $Columns = '';
-    $List = GetListDefinition($Type['Parameters'][0]);
-    $TargetTable = $List['TableName'];
-    //echo($TargetTable.'<');
-    //print_r($List);
-    foreach($List['Items'] as $Index => $ListItem)
-    {
-      //echo('ListItem');
-      //print_r($ListItem);
-      $Type = GetTypeDefinition($ListItem['Type']);
-      if($ListItem['VisibleInPointer'] == 1)
-      {
-        if($Type['ParentType'] == TypePointerOneToOneId)
-        {
-          //print_r($Type);
-          $DbResult = $Database->select(array('Database' => $List['Database'], 'Table' => $List['TableName'], 'Condition' => $List['IdName'].'='.$Item['Value']));
-          $DbRow = $DbResult->fetch_assoc();
-          $DefinitionItem = array('Name' => $Index, 'Type' => $Item['Type'], 'Caption' => $Item['TextBefore'], 'Value' => $DbRow[$Index], 'SourceTable' => $List['Id'], 'SourceItemId' => 0);
-          $SubTarget = $this->GetTablePointerName($Type, $DefinitionItem);
-          $Columns .= '"'.$SubTarget['Name'].' ",';
-        } else $Columns .= '`'.$ListItem['Name'].'`," ",';
-      }
-    }
-    $Columns = substr($Columns, 0, -1);
-    if($Columns == '') $Columns = '`'.$List['IdName'].'` AS `Name`, `'.$List['IdName'].'`';
-      else $Columns = 'CONCAT('.$Columns.') AS `Name`, `'.$List['IdName'].'`';
-    $DbResult = $Database->select(array('Database' => $List['Database'], 'Table' => $TargetTable, 'Columns' => $Columns, 'Condition' => $List['IdName'].'='.$Item['Value']));
-    //echo($Database->LastQuery);
-    if($DbResult->num_rows > 0)
-    {
-      return($DbResult->fetch_assoc());
-    } else return('');
-  }
-
-  function GetTablePointerNameList($Type, $Item)
-  {
-    global $Database;
-
-    $Columns = '';
-    $List = GetListDefinition($Type['Parameters'][0]);
-    $TargetTable = $List['TableName'];
-    foreach($List['Items'] as $ListItem)
-      if($ListItem['VisibleInPointer'] == 1) $Columns .= '`'.$ListItem['Name'].'`," ",';
-    $Columns = 'CONCAT('.substr($Columns, 0, -1).') AS Name, `'.$List['IdName'].'`';
-    $DbResult = $Database->select(array('Database' => $List['Database'], 'Table' => $TargetTable, 'Columns' => $Columns));
-    //echo($Database->LastQuery);
-    if($DbResult->num_rows > 0)
-    {
-
-      $Result = array(array('Name' => 'Žádný', 'Id' => 0));
-      while($DbRow = $DbResult->fetch_assoc())
-        $Result[] = $DbRow;
-      return($Result);
-    } else return(array());
-  }
-
   function OnView($Item)
   {
-    global $Database;
+    global $Database, $TypeDefinitionList;
 
-    $Type = GetTypeDefinition($Item['Type']);
+    $Type = $TypeDefinitionList[$Item['Type']];
+    $DbResult = $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];
@@ -74 +18 @@
     if($TargetName != '') $Output = '<a href="?Action=ViewItem&amp;Table='.$TargetTable.'&amp;Item='.$TargetName[$List['IdName']].'">'.$TargetName['Name'].'</a>';
     else $Output = '';
+    */
     return($Output);
   }
@@ -79 +24 @@
   function OnEdit($Item)
   {
-    global $Database, $Types;
+    global $Database, $TypeDefinitionList;
 
-    $Type = $Types[$Item['Type']];
-    $List = GetListDefinition($Type['Parameters'][0]);
     $Output = '<select name="'.$Item['Name'].'">';
-    $TargetNameList = $this->GetTablePointerNameList($Type, $Item);
-    //echo($Database->LastQuery);
-    foreach($TargetNameList as $TargetName)
+    $Type = $TypeDefinitionList[$Item['Type']];
+    $DbResult = $Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name,'.$Type['Parameters']['Id'].' AS Id FROM `'.$Type['Parameters']['Table'].'`');
+    while($DbRow = $DbResult->fetch_assoc())
     {
-      if($Item['Value'] == $TargetName[$List['IdName']]) $Selected = ' selected="1"'; else $Selected = '';
-      $Output .= '<option value="'.$TargetName[$List['IdName']].'"'.$Selected.'>'.$TargetName['Name'].'</option>';
+      if($Item['Value'] == $DbRow['Id']) $Selected = ' selected="1"'; else $Selected = '';
+      $Output .= '<option value="'.$DbRow['Id'].'"'.$Selected.'>'.$DbRow['Name'].'</option>';
     }
     $Output .= '</select>';

trunk/www/user.php

@@ -102 +102 @@
           else
           {
-            $this->Database->insert('User', array('Name' => $Name, 'Login' => $Login, 'Password' => sha1($Password), 'Email' => $Email, 'RegistrationTime' => 'NOW()', 'Locked' => 1, 'Role' => 2));
+            $this->Database->insert('User', array('Name' => $Name, 'Login' => $Login, 'Password' => $Password, 'Email' => $Email, 'RegistrationTime' => 'NOW()', 'Locked' => 1, 'Role' => 2));
             $UserId = $this->Database->insert_id;
             
             $Subject = FromUTF8('Registrace nového účtu', 'iso2');
-            $Message = 'Provedli jste registraci nového účtu na serveru <a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'">http://'.$Config['Web']['Host'].$Config['Web']['RootFolder']."</a>.<br>\nPokud jste tak neučinili, měli by jste tento email ignorovat.<br><br>\n\nVáš účet je: ".$Login."\n<br>Pro dokončení registrace klikněte na tento odkaz: ".'<a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.sha1($Password).'">http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.sha1($Password).'</a>.'."\n<br> \n\n<br><br>Na tento email neodpovídejte.";
+            $Message = 'Provedli jste registraci nového účtu na serveru <a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/">http://'.$Config['Web']['Host'].$Config['Web']['RootFolder']."/</a>.<br>\nPokud jste tak neučinili, měli by jste tento email ignorovat.<br><br>\n\nVáš účet je: ".$Login."\n<br>Pro dokončení registrace klikněte na tento odkaz: ".'<a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.$Password.'">http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.$Password.'</a>.'."\n<br> \n\n<br><br>Na tento email neodpovídejte.";
             $AdditionalHeaders = "To: ".$Name." <".$Email.">\n"."From: ".FromUTF8($Config['Web']['Title'], 'iso2')." <noreplay@zdechov.net>\n"."MIME-Version: 1.0\n"."Content-type: text/html; charset=utf-8";
             mail($Email, $Subject, $Message, $AdditionalHeaders);