Changeset 38

Timestamp:

Nov 25, 2008, 5:12:10 PM (16 years ago)

Author:

maron

Message:

Struktura databáze

Location:

branches/3

Files:

• class/translation.php (modified) (2 diffs)
• class/user.php (modified) (8 diffs)
• database (added)
• frontend.php (modified) (4 diffs)

branches/3/class/translation.php

@@ -7 +7 @@
   
         // constructor
-        function translation($id, $database, $GetText = true)
+        function translation($id, $database, $Gettext = true)
         { // BEGIN constructor
                 $this->id = $id;
                 $this->database = $database;
                 $this->GetData();
-                if ($GetText and isset($this->data)) $this->GetText();
+                if ($Gettext and isset($this->data)) $this->Gettext();
         } // END constructor
         
         function GetData()
     { // BEGIN function GetData
-      $Query = $this->database->query('SELECT *,(SELECT Id FROM `TextGroup` WHERE
+      $Query = $this->database->query('SELECT *,(SELECT Id FROM `textGroup` WHERE
        `Index` = `cz`.`Index` AND `Group` = `cz`.`Group` AND `Language` = 1)
-        as en_Id FROM TextGroup as cz WHERE Id="'.$this->id.'"');
+        as en_Id FROM textGroup as cz WHERE Id="'.$this->id.'"');
       if($Query->num_rows > 0) {
         $Row = $Query->fetch_array();
@@ -34 +34 @@
     } // END function SetData
         
-        function GetText()
-    { // BEGIN function GetText
-        $Query = $this->database->query("SELECT `Text`,`Translation`.`Name`, `Translation`.`MangosColumn` FROM `Text`
-JOIN `Translation` ON `Translation`.`Id` = `Text`.`GroupItem`
- WHERE `TranslationGroup` = ".$this->id."");
+        function Gettext()
+    { // BEGIN function Gettext
+        $Query = $this->database->query("SELECT `text`,`translation`.`Name`, `translation`.`MangosColumn` FROM `text`
+JOIN `translation` ON `translation`.`Id` = `text`.`GroupItem`
+ WHERE `translationGroup` = ".$this->id."");
         while ($Row = $Query->fetch_array()) {
-                $this->text[$Row['Name']] = $Row['Text'];
+                $this->text[$Row['Name']] = $Row['text'];
         }        
         $this->data['text'] = $this->text;
-    } // END function GetText
+    } // END function Gettext
         
   } // END class translation

branches/3/class/user.php

@@ -2 +2 @@
 
   class user
-  { // BEGIN class User
+  { // BEGIN class user
         // variables
         var $ID,$user,$Database;
-          var $AnonymousUserId = 0;
+          var $AnonymoususerId = 0;
         var $DefaultRole = 2;
         var $IPAddress = ' ';
@@ -22 +22 @@
     $this->IPAddress = gethostbyaddr($_SERVER['REMOTE_ADDR']).' '.$_SERVER['REMOTE_ADDR'];
     // Lookup user record
-    $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
+    $Query = $this->Database->select('useronline', '*', 'SessionId="'.$SID.'"');
     if($this->Database->LastDataSet)
     {
       // Refresh time of last access
-      $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('Time' => 'NOW()','IpAddress' => $this->IPAddress));
+      $this->Database->update('useronline', 'SessionId="'.$SID.'"', array('Time' => 'NOW()','IpAddress' => $this->IPAddress));
     } else {
-     $this->Database->insert('UserOnline', array('SessionId' => $SID, 'User' => $this->AnonymousUserId, 'Time' => 'NOW()', 'IpAddress' => $this->IPAddress));  
+     $this->Database->insert('useronline', array('SessionId' => $SID, 'user' => $this->AnonymoususerId, 'Time' => 'NOW()', 'IpAddress' => $this->IPAddress));  
     }
     // Odeber neaktivní uživatele
-    $this->Database->delete('UserOnline', 'Time < DATE_SUB(NOW(), INTERVAL '.USER_TIMEOUT.' SECOND)');
+    $this->Database->delete('useronline', 'Time < DATE_SUB(NOW(), INTERVAL '.USER_TIMEOUT.' SECOND)');
 
     // Zkontroluj přihlášení
-    $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
+    $Query = $this->Database->select('useronline', '*', 'SessionId="'.$SID.'"');
     $Row = $Query->fetch_array();
-    if($Row['User'] != $this->AnonymousUserId) 
+    if($Row['user'] != $this->AnonymoususerId) 
     {
-      $Query = $this->Database->select('User', '*', "Id=".$Row['User']."");
+      $Query = $this->Database->select('user', '*', "Id=".$Row['user']."");
       $this->user = $Query->fetch_array();
       $Result = USER_LOGGED;
       $this->LoadPermission($this->user['Permission']);
     } else {
-      $Query = $this->Database->select('User', '*', "Id=".$this->AnonymousUserId);
+      $Query = $this->Database->select('user', '*', "Id=".$this->AnonymoususerId);
       $this->user = $Query->fetch_array();
       $Result = USER_NOT_LOGGED;
@@ -60 +60 @@
     {
       // Je uživatel registrován?
-      $Query = $this->Database->select('User', '*', 'Name = "'.$Data['Nick'].'"');
+      $Query = $this->Database->select('user', '*', 'Name = "'.$Data['Nick'].'"');
       if($this->Database->LastDataSet) $Result = NICK_USED;
       else 
       {
-        $this->Database->insert('User', array('Name' => addslashes($Data['Nick']), 'FullName' => addslashes($Data['FullName']), 'Password' => addslashes($Data['Password']), 'Email' => htmlspecialchars($Data['Email']), 'Permission' => $this->DefaultRole, 'TranslationLanguage' => $Data['Language'], 'LastIpAddress' => $this->IPAddress, 'LastLoginTime' => 'NOW()'));
+        $this->Database->insert('user', array('Name' => addslashes($Data['Nick']), 'FullName' => addslashes($Data['FullName']), 'Password' => addslashes($Data['Password']), 'Email' => htmlspecialchars($Data['Email']), 'Permission' => $this->DefaultRole, 'TranslationLanguage' => $Data['Language'], 'LastIpAddress' => $this->IPAddress, 'LastLoginTime' => 'NOW()'));
       //echo $this->Database->LastQuery;
         $Result = USER_REGISTRATED;
@@ -76 +76 @@
     $SID = session_id();
     // Je uživatel registrován?
-    $Query = $this->Database->select('User', '*', 'Name="'.$Data['Nick'].'"');
+    $Query = $this->Database->select('user', '*', 'Name="'.$Data['Nick'].'"');
     if($Query->num_rows > 0)
     {
@@ -83 +83 @@
       else 
       {
-        $this->Database->update('User', 'Id='.$Row['Id'], array('LastLoginTime' => 'NOW()', 'LastIpAddress' => $this->IPAddress));    
-        $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $Row['Id']));
+        $this->Database->update('user', 'Id='.$Row['Id'], array('LastLoginTime' => 'NOW()', 'LastIpAddress' => $this->IPAddress));    
+        $this->Database->update('useronline', 'SessionId="'.$SID.'"', array('user' => $Row['Id']));
         // načtení stavu stromu
         $Result = USER_LOGGED_IN;    
@@ -97 +97 @@
   {
     $SID = session_id();
-    $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $this->AnonymousUserId));
+    $this->Database->update('useronline', 'SessionId="'.$SID.'"', array('user' => $this->AnonymoususerId));
     $this->Check();
     return(USER_LOGGED_OUT);
@@ -105 +105 @@
   {
     $this->user['Permission'] = array();
-    $DbResult = $this->Database->select('Permission','*','ID='.$Permission);
+    $DbResult = $this->Database->select('permission','*','ID='.$Permission);
     if($this->Database->LastDataSet)
     while($DbRow = $DbResult->fetch_array())
@@ -121 +121 @@
   } // END function Permission
   
-  } // END class User
+  } // END class user
   
 ?>

branches/3/frontend.php

@@ -28 +28 @@
                 echo '<li><a class="verticalmenua" href="'.$value[2].'" title="'.$value[1].'">'.$value[0].'</a></li>';
           };
-          WriteTranslationGroup();
+          Writetranslationgroup();
           echo '</ul>';
           if ($user->Permission() > 1) {
@@ -51 +51 @@
   } // END function ShowFoodter
   
-  function WriteTranslationGroup()
+  function Writetranslationgroup()
   { // BEGIN function WriteTranslatedGroups
         global $database;
-      $Query = $database->select('TranslationGroup', '*');
+      $Query = $database->select('translationgroup', '*');
       while($DbRow = $Query->fetch_array())
       { 
-        echo '<li><a class="verticalmenua" href="?TranslationGroup='.$DbRow['Id'].'" title="'.TRANSLATION_GROUP_TITLE.$DbRow['Name'].'">'.$DbRow['Name'].'</a></li>';
+        echo '<li><a class="verticalmenua" href="?translationgroup='.$DbRow['Id'].'" title="'.TRANSLATION_GROUP_TITLE.$DbRow['Name'].'">'.$DbRow['Name'].'</a></li>';
       }
   } // END function WriteTranslatedGroups
@@ -70 +70 @@
   { // BEGIN function WriteOnlineUsers
         global $database;
-    $Query = $database->select('UserOnline', '*, (SELECT Name FROM User WHERE User.Id = UserOnline.User) as Name');
+    $Query = $database->select('useronline', '*, (SELECT Name FROM user WHERE user.Id = useronline.User) as Name');
     if ($database->LastDataSet) {
       echo '<p>'.ONLINE_USERS.$database->LastNumRows.'<br />';
@@ -93 +93 @@
     <tr><td>'.REGISTRATION_PAGE_FULLNAME.'</td><td><input name="FullName" type="text" /></td></tr>
     <tr><td>'.REGISTRATION_PAGE_LANGUAGE.'</td><td><select name="Language">';
-      $Query = $database->select('Language', '*');
+      $Query = $database->select('language', '*');
       while($DbRow = $Query->fetch_array())
       { if ($DbRow['Id'] == 2)