Changeset 8 for branches

Timestamp:

May 9, 2008, 10:39:00 AM (16 years ago)

Author:

george

Message:

Přidáno: Oprávnění pro čtení a zápis k rolím a operacím.
Přidáno: Zobrazení matice oprávnění.
Přidáno: Uživatelské menu s proměnným obsahem podle role uživatele.
Upraveno: Rozdělení importu na import z mangosu a import ze staré databáze.

Location:

branches/2

Files:

• database.php (modified) (1 diff)
• frontend.php (modified) (7 diffs)
• mangos_import.php (modified) (2 diffs)
• style.css (modified) (3 diffs)
• translation.php (modified) (3 diffs)
• user.php (modified) (5 diffs)

branches/2/database.php

@@ -9 +9 @@
   var $LastQuery = '';
   
+  function query($Query)
+  {
+    $this->LastQuery = $Query; 
+    return(parent::query($Query));  
+  }
+
   function select($Table, $What = '*', $Condition = 1)
   {

branches/2/frontend.php

@@ -34 +34 @@
   function Login()
   {
+    $Output = $this->System->Modules['User']->Login($_POST['Username'], $_POST['Password']);
+    $this->System->Modules['User']->Check();
+    return($Output);
+  }
+
+  function Logout()
+  {
+    $Output = $this->System->Modules['User']->Logout();
+    $this->System->Modules['User']->Check();
+    return($Output);
+  }
+
+  function ShowText($TranslationGroupId)
+  {
     
-    return($this->System->Modules['User']->Login($_POST['Username'], $_POST['Password']));
-  }
-
-  function Logout()
-  {
-    
-    return($this->System->Modules['User']->Logout());
-  }
-
-  function TranslationGroupEdit($TranslationGroupId)
-  {
-    $Output = '<strong>Překlad textů:</strong><br /><table class="TranslationTable">';
-    foreach($this->System->Modules['Translation']->GetTextList($TranslationGroupId) as $GroupItem)
-    {
-      $Output .= '<tr><th>'.$GroupItem['Name'].'</th><td>'.$GroupItem['Text'].'</td><td><div><textarea name="GroupItem'.$GroupItem['Id'].'">'.$GroupItem['Text'].'</textarea></div></td></tr>';
-    }
-    $Output .= '</table>';
+    $TextList = $this->System->Modules['Translation']->GetMultipleText($TranslationGroupId, $_GET['Index']);
+    if(count($TextList) == 0)
+    {
+      // Edit new text
+      $Output = '<strong>Překlad textů:</strong><table class="TranslationTable">';
+      foreach($this->System->Modules['Translation']->GetTextList($TranslationGroupId) as $GroupItem)
+      {
+        $Output .= '<tr><th>'.$GroupItem['Name'].'</th><td>'.$GroupItem['Text'].'</td><td><div><textarea name="GroupItem'.$GroupItem['Id'].'">'.$GroupItem['Text'].'</textarea></div></td></tr>';
+      }
+      $Output .= '</table>';
+    }
+    else if(count($TextList) == 1)
+    {
+      // Show only one
+      $Output = '<strong>Zobrazení textu:</strong><table class="TranslationTable">';
+      foreach($this->System->Modules['Translation']->GetTextList($TranslationGroupId) as $GroupItem)
+      {
+        $Output .= '<tr><th>'.$GroupItem['Name'].'</th><td>'.$GroupItem['Text'].'</td><td>'.$GroupItem['Text'].'</td></tr>';
+      }
+      $Output .= '</table>';
+    } else 
+    { 
+      // Show multiple possibilites
+      $Output = '<strong>Více překladů jednoho textu:</strong><table class="TranslationTable">'.
+       '<tr><th>ID</th><th>Titulek</th></tr>';
+      foreach($TextList as $Text)
+      {
+        $Output .= '<tr><td>'.$Text['Index'].'</td><td><a href="?Action=ShowText&amp;GroupId='.$Text['Id'].'">'.$Text['Text'].'</a></td></tr>';
+      }
+      $Output .= '</table>';
+    }
     return($Output);
   }
@@ -59 +87 @@
     $ItemPerPage = 30;
     if(array_key_exists('Page', $_GET)) $Page = $_GET['Page']; else $Page = 0;
-    $Output = '<strong>Seznam textů:</strong><br/>';
+    $Output = '<strong>Seznam textů:</strong><table>'.
+    '<tr><th>ID</th><th>Titulek</th><th>Překladů</th></tr>';
     foreach($this->System->Modules['Translation']->GetTextGroupList($GroupId, 1, 1, $Page, $ItemPerPage) as $Translation)
     {
       if(strlen($Translation['Text']) > 30) $Translation['Text'] = substr($Translation['Text'], 0, 30).'...';
-      $Output .= $Translation['Index'].'. <a href="?Action=TranslationGroupEdit&amp;GroupId='.$Translation['Id'].'">'.$Translation['Text'].'</a><br />';
-    }
-    $Output .= $this->System->PagesList('?Action=TextGroupList&amp;GroupId='.$GroupId.'&amp;Page=', $Page, $this->System->Modules['Translation']->GetTextGroupListCount($GroupId, 1, 1), $ItemPerPage);
+      $Output .= '<tr><td>'.$Translation['Index'].'</td><td><a href="?Action=ShowText&amp;GroupId='.$Translation['Id'].'&amp;Index='.$Translation['Index'].'">'.$Translation['Text'].'</a></td><td>'.($Translation['TextCount'] - 1).'</td></tr>';
+    }
+    $Output .= '</table>'.$this->System->PagesList('?Action=TextGroupList&amp;GroupId='.$GroupId.'&amp;Page=', $Page, $this->System->Modules['Translation']->GetTextGroupListCount($GroupId, 1, 1), $ItemPerPage);
     return($Output);
   }
@@ -71 +100 @@
   function TranslationGroupList()
   {
-    $Output = '<strong>Seznam skupin:</strong><br/>';
+    $Output = '<strong>Seznam skupin:</strong><table>'.
+    '<tr><th>Skupina textů</th><th>Počet textů</th></tr>';
     foreach($this->System->Modules['Translation']->GetTranslationGroupList() as $Group)
     {
-      $Output .= '<a href="?Action=TextGroupList&amp;GroupId='.$Group['Id'].'">'.$Group['Name'].'</a><br />';
+      $Output .= '<tr><td><a href="?Action=TextGroupList&amp;GroupId='.$Group['Id'].'">'.$Group['Name'].'</a></td><td>'.$Group['TextCount'].'</td></tr>';
     }
     return($Output);
@@ -84 +114 @@
     '<a href="?">Uvodní stránka</a><br />'.
     '<a href="?Action=TranslationGroupList">Seznam skupin</a><br />'.
-    '<a href="?Action=MangosImport">Import z MaNGOSu</a><br />'.
     '<br />';
     return($Output);
@@ -92 +121 @@
   {
     $Output = 'Uživatel: '.$this->System->Modules['User']->User['Name'].' ';
-    if($this->System->Modules['User']->User['Id'] == 0) $Output .= '<a href="?Action=LoginDialog">Přihlásit</a>';
+    if($this->System->Modules['User']->User['Id'] == 1) $Output .= '<a href="?Action=LoginDialog">Přihlásit</a>';
       else $Output .= '<a href="?Action=Logout">Odhlásit</a>';
    
     return($Output.'<br />');
   }
-
+  
+  function UserMenu()
+  {
+    $Output = '<strong>Uživatelské menu</strong><br />';
+    $Permission = &$this->System->Modules['User']->User['Permission'];
+    if($Permission[9]['Read']) $Output .= '<a href="?Action=PermissionMatrix">Tabulka oprávnění</a><br />';
+    if($Permission[4]['Read']) $Output .= '<a href="?Action=UserOptions">Nastavení účtu</a><br />';
+    if($Permission[2]['Read']) $Output .= '<a href="?Action=UserTextList">Přeložené texty</a><br />';
+    if($Permission[3]['Read']) $Output .= '<a href="?Action=UserNewText">Nový překlad</a><br />';
+    if($Permission[5]['Read']) $Output .= '<a href="?Action=Import">Import</a><br />';
+    return($Output.'<br />');
+  }
+
+  function UserOptions()
+  {
+    $Output = '';
+    return($Output);
+  }
+
+  function PermissionMatrix()
+  {
+     $Output = '<table>';
+     $Matrix = $this->System->Modules['User']->PermissionMatrix();
+     $ShowHeader = 1;
+     foreach($Matrix as $RowIndex => $Row)
+     {
+       if($ShowHeader == 1)
+       {
+         $Output .= '<tr><th>&nbsp;</th>';
+         foreach($Row as $ColumnIndex => $Column) 
+           $Output .= '<th>'.$ColumnIndex.'</th>';
+         $Output .= '</tr>';
+         $ShowHeader = 0;
+       }
+       $Output .= '<tr><th>'.$RowIndex.'</th>';
+       foreach($Row as $ColumnIndex => $Column) 
+         $Output .= '<td>'.$Column.'</td>';
+       $Output .= '</tr>';
+     }
+     $Output .= '</table>';
+     return($Output); 
+  }
+
+  function UserTextList($GroupId)
+  {
+    $ItemPerPage = 30;
+    if(array_key_exists('Page', $_GET)) $Page = $_GET['Page']; else $Page = 0;
+    $Output = '<strong>Seznam vašich textů:</strong><br/>';
+    foreach($this->System->Modules['Translation']->GetTextGroupList($GroupId, $this->System->Modules['User']->User['Id'], 1, $Page, $ItemPerPage) as $Translation)
+    {
+      if(strlen($Translation['Text']) > 30) $Translation['Text'] = substr($Translation['Text'], 0, 30).'...';
+      $Output .= $Translation['Index'].'. <a href="?Action=TranslationGroupEdit&amp;GroupId='.$Translation['Id'].'">'.$Translation['Text'].'</a><br />';
+    }
+    $Output .= $this->System->PagesList('?Action=TextGroupList&amp;GroupId='.$GroupId.'&amp;Page=', $Page, $this->System->Modules['Translation']->GetTextGroupListCount($GroupId, 1, 1), $ItemPerPage);
+    return($Output);
+  }
+  
+  function Import()
+  {
+    return('<a href="?Action=ImportMangos">Import z Mangosu</a><br />'. 
+    '<a href="?Action=ImportOldSystem">Import ze starého systému</a><br />');
+  }
 
   function Output()
@@ -114 +204 @@
         $Output = $this->Logout();
         break;
-      case 'TranslationGroupEdit':
-        $Output = $this->TranslationGroupEdit($_GET['GroupId']);
+      case 'ShowText':
+        $Output = $this->ShowText($_GET['GroupId']);
         break;
       case 'TextGroupList':
@@ -123 +213 @@
         $Output = $this->TranslationGroupList(); 
         break;
-      case 'MangosImport':
-        $Output = $this->System->Modules['MangosImport']->FullImport();
+      case 'PermissionMatrix':
+        $Output = $this->PermissionMatrix();
+        break;
+      case 'UserOptions':
+        $Output = $this->UserOptions();
+        break;
+      case 'UserTextList':
+        $Output = $this->UserTextList();
+        break;
+      case 'Import':
+        $Output = $this->Import();
+        break;
+      case 'ImportMangos':
+        $Output = $this->System->Modules['MangosImport']->ImportFromMangos();
+        break;
+      case 'ImportOldSystem':
+        $Output = $this->System->Modules['MangosImport']->ImportOldMangos();
         break;
     } 
     else $Output = '';
-    return($this->Header().'<table class="MainLayout"><tr><td id="LeftPanel">'.$this->User().$this->Menu().'</td><td>'.$Output.'</td></tr></table>'.$this->Footer());
+    return($this->Header().'<table class="MainLayout"><tr><td id="LeftPanel">'.$this->User().$this->Menu().$this->UserMenu().'</td><td class="MainLayoutTd">'.$Output.'</td></tr></table>'.$this->Footer());
   }  
 }

branches/2/mangos_import.php

@@ -3 +3 @@
 class MangosImport extends Module
 {
-  function FullImport()
+  function ImportFromMangos()
   {
     $Output = '';
@@ -44 +44 @@
     return($Output);
   }
+
+  function ImportOldSystem()
+  {
+  }
 }
 

branches/2/style.css

@@ -24 +24 @@
 }
 
+table
+{
+  border-width: 1px; 
+  border-style: solid;
+  border-color: black;
+  border-spacing: 0px;
+}
+
+table td
+{
+  border-width: 1px; 
+  border-style: solid;
+  border-color: black;
+  padding: 2px 5px 2px 5px;
+}
+
+table th
+{
+  border-width: 1px; 
+  border-style: solid;
+  border-color: black;
+  padding: 2px 5px 2px 5px;
+}
+
 textarea
 {
@@ -37 +61 @@
 }
 
-.MainLayout td
+.MainLayoutTd
 {
+  border: 0;
   vertical-align: top;
 }
@@ -44 +69 @@
 .MainLayout #LeftPanel
 {
+  border: 0;
   width: 200px;
+  vertical-align: top; 
 }

branches/2/translation.php

@@ -6 +6 @@
   {
     $Result = array();
-    $DbResult = $this->Database->select('TranslationGroup', '*');
+    $DbResult = $this->Database->query('SELECT `TranslationGroup`.*, (SELECT COUNT(*) FROM `TextGroup` WHERE `TextGroup`.`Group` = `TranslationGroup`.`Id`) AS `TextCount` FROM `TranslationGroup`');
     while($DbRow = $DbResult->fetch_array())
     {
@@ -44 +44 @@
   {
     $Result = array();
-    $DbResult = $this->Database->query('SELECT `TextGroup`.*, (SELECT `Text` FROM `Text` WHERE `Text`.`TranslationGroup` = `TextGroup`.`Id` LIMIT 1) as `Text` FROM `TextGroup`  WHERE `TextGroup`.`Group`='.$GroupId.' AND `TextGroup`.`User`='.$UserId.' AND `TextGroup`.`Language`='.$Language.' LIMIT '.($Page * $ItemPerPage).','.$ItemPerPage);
+    $DbResult = $this->Database->query('SELECT `TextGroup`.*, (SELECT `Text` FROM `Text` WHERE `Text`.`TranslationGroup` = `TextGroup`.`Id` LIMIT 1) as `Text`, (SELECT COUNT(`TextGroup2`.`User`) FROM `TextGroup` AS `TextGroup2` WHERE `TextGroup2`.`Id` = `TextGroup`.`Id`) as `TextCount` FROM `TextGroup` WHERE `TextGroup`.`Group`='.$GroupId.' AND `TextGroup`.`User`='.$UserId.' AND `TextGroup`.`Language`='.$Language.' LIMIT '.($Page * $ItemPerPage).','.$ItemPerPage);
     //echo($this->Database->LastQuery);
     if($DbResult->num_rows > 0)
@@ -62 +62 @@
     return($DbRow[0]);
   }
+
+  function GetMultipleText($GroupId, $Index)
+  {
+    $Result = array();
+    $DbResult = $this->Database->query('SELECT `TextGroup`.*, (SELECT `Text` FROM `Text` WHERE `Text`.`TranslationGroup` = `TextGroup`.`Id` LIMIT 1) as `Text` FROM `TextGroup` WHERE `TextGroup`.`Group`='.$GroupId.' AND `TextGroup`.`Index` = '.$Index.' AND `TextGroup`.`Language` != 1');
+    //echo($this->Database->LastQuery);
+    if($DbResult->num_rows > 0)
+    while($DbRow = $DbResult->fetch_array())
+    {
+      $Result[] = $DbRow;
+    }
+    return($Result);
+  }
 }
 

branches/2/user.php

@@ -16 +16 @@
 class User extends Module
 {
-  var $Roles = array('Člen', 'Uživatel', 'Administrator');
+  var $Roles = array();
   var $User = array();
+  var $DefaultRole = 2;
   
   function Check()
   {
     $SID = session_id();
+
     // Lookup user record
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
@@ -28 +30 @@
       // Refresh time of last access
       $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('Time' => 'NOW()'));
-    } else $this->Database->insert('UserOnline', array('SessionId' => $SID, 'User' => 0, 'Time' => 'NOW()', 'IpAddress' => (gethostbyaddr(GetRemoteAddress()).' '.GetRemoteAddress())));  
+    } else $this->Database->insert('UserOnline', array('SessionId' => $SID, 'User' => 1, 'Time' => 'NOW()', 'IpAddress' => (gethostbyaddr(GetRemoteAddress()).' '.GetRemoteAddress())));  
 
     // Odeber neaktivní uživatele
@@ -38 +40 @@
     if($Row['User'] != 0) 
     {
-      $Query = $this->Database->select('User', '*', "Id='".$Row['User']."'");
+      $Query = $this->Database->select('User', '*', "Id=".$Row['User']."");
       $this->User = $Query->fetch_array();
       $Result = USER_LOGGED;
     } else {
-      $this->User = array('FullName' => 'Návštěvník', 'Id' => 0, 'Name' => 'Anonym');
+      $Query = $this->Database->select('User', '*', "Id=1");
+      $this->User = $Query->fetch_array();
       $Result = USER_NOT_LOGGED;
     }
+    $this->LoadPermission($this->User['Role']);
+
+    // Role and permission
+    $this->LoadRoles();
+    
   }
 
@@ -59 +67 @@
       else 
       {
-        $this->Database->insert('User', array('Name' => addslashes($Nick), 'FullName' => addslashes($FullName), 'Password' => addslashes($Password), 'Email' => htmlspecialchars($Email), 'Permission' => 1));
+        $this->Database->insert('User', array('Name' => addslashes($Nick), 'FullName' => addslashes($FullName), 'Password' => addslashes($Password), 'Email' => htmlspecialchars($Email), 'Role' => $this->DefaultRole));
         $Result = USER_REGISTRATED;
       }
@@ -89 +97 @@
   {
     $SID = session_id();
-    $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => 0));
+    $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => 1));
     return(USER_LOGGED_OUT);
+  }
+
+  function LoadRoles()
+  {
+    $this->Roles = array();
+    $DbResult = $this->Database->select('UserRole', '*');
+    while($DbRow = $DbResult->fetch_array())
+      $this->Roles[] = $DbRow;
+  }
+
+  function LoadPermission($Role)
+  {
+    $this->User['Permission'] = array();
+    $DbResult = $this->Database->query('SELECT `UserRolePermission`.*, `PermissionOperation`.`Description` FROM `UserRolePermission` JOIN `PermissionOperation` ON `PermissionOperation`.`Id` = `UserRolePermission`.`Operation` WHERE `UserRolePermission`.`Role` = '.$Role);
+    if($DbResult->num_rows > 0)
+    while($DbRow = $DbResult->fetch_array())
+      $this->User['Permission'][$DbRow['Operation']] = $DbRow;
+  }
+
+  function PermissionMatrix()
+  {
+    $Result = array();
+    $DbResult = $this->Database->query('SELECT `UserRolePermission`.*, `PermissionOperation`.`Description`, `UserRole`.`Title` FROM `UserRolePermission` LEFT JOIN `PermissionOperation` ON `PermissionOperation`.`Id` = `UserRolePermission`.`Operation` LEFT JOIN `UserRole` ON `UserRole`.`Id` = `UserRolePermission`.`Role`');
+    while($DbRow = $DbResult->fetch_array())
+    {
+      $Value = '';
+      if($DbRow['Read']) $Value .= 'R';
+      if($DbRow['Write']) $Value .= 'W';
+      $Result[$DbRow['Description']][$DbRow['Title']] = $Value;
+    }   
+    return($Result);
   }
 }