Changeset 383 for trunk

Timestamp:

Jan 23, 2012, 10:37:31 AM (13 years ago)

Author:

chronos

Message:

• Přidáno: Kostra základního systémového modulu System.
• Přidáno: Obsluha datových typů pro HTML kód a HTTP protokol.
• Upraveno: Do ViewList zkopírování generování tabulky se stránkováním a řazením.

Location:

trunk

Files:

• .htaccess (modified) (2 diffs)
• Common/Global.php (modified) (4 diffs)
• Common/Module.php (modified) (4 diffs)
• Common/PageList.php (modified) (1 diff)
• Common/TableHeader.php (modified) (2 diffs)
• Common/Types (added)
• Common/Types/Base.php (added)
• Common/Types/Boolean.php (added)
• Common/Types/Color.php (added)
• Common/Types/Date.php (added)
• Common/Types/DateTime.php (added)
• Common/Types/Enumeration.php (added)
• Common/Types/File (added)
• Common/Types/File/File.php (added)
• Common/Types/File/FileDownload.php (added)
• Common/Types/Float.php (added)
• Common/Types/GPS.php (added)
• Common/Types/Hidden.php (added)
• Common/Types/Hyperlink.php (added)
• Common/Types/IPv4Address.php (added)
• Common/Types/Integer.php (added)
• Common/Types/Password.php (added)
• Common/Types/PointerOneToMany.php (added)
• Common/Types/PointerOneToOne.php (added)
• Common/Types/String.php (added)
• Common/Types/Text.php (added)
• Common/Types/Time.php (added)
• Common/Types/Type.php (added)
• Common/URL.php (added)
• Common/View.php (modified) (2 diffs)
• Common/ViewForm.php (modified) (1 diff)
• Common/ViewList.php (modified) (1 diff)
• Modules/FrontPage/FrontPage.php (modified) (13 diffs)
• Modules/Log/Log.php (modified) (1 diff)
• Modules/NetworkConfig/NetworkConfig.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php (modified) (1 diff)
• Modules/News/News.php (modified) (1 diff)
• Modules/Project/Project.php (modified) (2 diffs)
• Modules/System (added)
• Modules/System/System.php (added)
• Modules/User/User.php (modified) (1 diff)

trunk/.htaccess

@@ -5 +5 @@
 
 RewriteEngine On
-#RewriteBase /
+RewriteBase /
 
 # Pretty urls on localhost with alias
@@ -11 +11 @@
 RewriteCond  %{REQUEST_FILENAME}  !-f
 RewriteCond  %{REQUEST_FILENAME}  !-d
-#RewriteRule   ^(.*)$ centrala/index.php?$1
-RewriteRule   ^(.*)$ index.php?$1
+RewriteRule   ^(.*)$ centrala/index.php?$1
+#RewriteRule   ^(.*)$ index.php?$1
 
 # Pretty urls 

trunk/Common/Global.php

@@ -18 +18 @@
 include_once('HTML.php');
 include_once('XHTML.php');
+include_once('URL.php');
 include_once('PageList.php');
 include_once('TableHeader.php');
@@ -23 +24 @@
 include_once('ViewList.php');
 include_once('ViewForm.php');
+include_once('Types/Type.php');
   
 
@@ -28 +30 @@
 {  
   var $Pages = array();
+  var $Type;
+  
+  function __construct($Database)
+  {
+    parent::__construct($Database);
+    $this->Type = new Type($this); 
+  }
   
   function HumanDate($Time)
@@ -39 +48 @@
    
     return($Config['Web']['RootFolder'].$Target);
-  } 
+  }     
 }
 

trunk/Common/Module.php

@@ -77 +77 @@
   var $Modules = array();
   var $Models = array();
+  var $Menu = array();
   
   function __construct($Database)
@@ -92 +93 @@
     //DebugLog('Loading modules...');
     $this->Modules = array();
-    $Query = 'SELECT `Id`, `Name` FROM `SystemModule`';
+    $Query = 'SELECT `Id`, `Name`,`Installed` FROM `SystemModule`';
     if($Installed) $Query .= ' WHERE `Installed`=1';
-      else $Query .= ' WHERE `Installed`=0';
+      else $Query .= ''; // WHERE `Installed`=0';
     $DbResult = $this->Database->query($Query);
     while($Module = $DbResult->fetch_array())
@@ -103 +104 @@
       $NewModule = new $ModuleClassName($this->Database, $this);      
       $NewModule->Id = $Module['Id'];
+      $NewModule->Installed = $Module['Installed'];
       $this->Modules[$Module['Name']] = $NewModule;
     }     
@@ -146 +148 @@
     $this->LoadModules(false);
     foreach($this->Modules as $Index => $Module)
-    {
+    {      
       $this->Modules[$Index]->Install();
     }

trunk/Common/PageList.php

@@ -72 +72 @@
         } 
       } 
-      if($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
+      if($PagesMax < ($PageCount - 1)) $this->Output .= ' ... ';
       if($this->Page < ($PageCount - 1)) 
       {

trunk/Common/TableHeader.php

@@ -13 +13 @@
   var $Columns;
   var $QueryString;
+  var $System;
 
   function __construct($System)
   {
-    parent::__construct($System);
+    //parent::__construct($System);
+    $this->System = &$System;
+    $this->Order = array();
     $this->OrderDirSQL = array('ASC', 'DESC');
     $this->OrderArrowImage = array('sort_asc.png', 'sort_desc.png');
@@ -99 +102 @@
       if(!array_key_exists('Title', $Column)) $Title = $ColumnName;
         else $Title = $Column['Title'];
-      if(strpos($Title, '<') === false) $Title = $this->System->Localization->Translate($Title);
+      //if(strpos($Title, '<') === false) $Title = $this->System->Localization->Translate($Title);
 
       // Create hyperlink

trunk/Common/View.php

@@ -23 +23 @@
 class View
 {
+  var $System;
   var $Database;
   var $Name;
@@ -29 +30 @@
   var $ModelName;
 
-  function __construct($Database)
+  function __construct($System)
   {
-    $this->Database = &$Database;    
+    $this->System = &$System;    
+    $this->Database = &$System->Database;    
   }
   

trunk/Common/ViewForm.php

@@ -7 +7 @@
   var $OnSubmit = '';
     
-  function __construct($Database)
-  {
-    $this->Database = &$Database;    
+  function __construct($System)
+  {
+    parent::__construct($System);
   }
   

trunk/Common/ViewList.php

@@ -3 +3 @@
 class ViewList extends View
 {
-  function __construct($Database)
+  var $DefaultOrder;
+  var $Columns;
+  var $SQL;
+  var $SQLJoin;
+  var $Rows;
+  var $Actions;
+  var $PageList;
+  var $TableHeader;
+  var $FilterColumn;
+  var $Module;
+  var $PanelAction;
+
+  function __construct($System)
   {
-    $this->Database = &$Database;    
+    parent::__construct($System);
+    $this->FilterColumn = '';
+    $this->FilterId = 0;
+    $this->PageList = new PageList($this->System);
+    $this->TableHeader = new TableHeader($this->System);
+    $this->Rows = array();
+    $this->PanelAction = 'ListPanel';
+    $this->DefaultOrder = array();
   }
 
+  function Show()
+  {
+    $Output = $this->PageList->Output;
+    $Output .= '<table class="WideTable">';
+    $Output .= $this->TableHeader->Output;
+    foreach($this->Rows as $Row2)
+    {
+      $Row = array();
+      foreach($Row2 as $Index => $Item)
+        $Row[$Index]['Value'] = $Item;
+      $Row = $this->ProcessRow($Row);
+
+      $Output .= '<tr>';
+      foreach($this->Columns as $ColumnName => $Column)
+      if($Column['Type'] != 'Hidden')
+      {
+        if(array_key_exists('Class', $Row[$ColumnName]) and ($Row[$ColumnName]['Class'] != ''))
+          $Style = ' class="'.$Row[$ColumnName]['Class'].'"'; else $Style ='';
+        $Output .= '<td'.$Style.'>';
+        $Output .= $this->System->Type->ExecuteTypeEvent($Column['Type'],
+          'OnView', array('Name' => $ColumnName, 'Value' => $Row[$ColumnName]['Value'], 'Type' => $Column['Type']));
+        $Output .= '</td>';
+      }
+      if(is_array($this->Actions))
+      {
+        $Output .= '<td>';
+        foreach($this->Actions as $Action)
+        {
+          if(array_key_exists('Confirm', $Action)) $Confirm = ' onclick="return confirmAction(\''.$this->System->Localization->Translate($Action['Confirm']).'\');"';
+            else $Confirm = '';
+          if(strpos($Action['Name'], '<') !== false) $ActionName = $Action['Name'];
+            else $ActionName = $this->System->Localization->Translate($Action['Name']);
+          $Output .= '<a'.$Confirm.' href="'.$this->System->Navigation->MakeLink($Action['Module'], $Action['Action'], array('Id' => $Row['Id']['Value'])).'">'.
+            $ActionName.'</a> ';
+        }
+        $Output .= '</td>';
+      }
+      $Output .= '</tr>';
+    }
+    $Output .= '</table>';
+    $Output .= $this->PageList->Output;
+    return($Output);
+  }
+
+  function LoadFromDatabase()
+  {
+    // Get total item count
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM '.$this->Name.
+      ' '.$this->SQLJoin);
+    $DbRow = $DbResult->fetch_row();
+    $this->PageList->TotalCount = $DbRow[0];
+    $this->PageList->HTMLId = $this->Module;
+    $this->PageList->QueryItems->Data['M'] = $this->Module;
+    $this->PageList->QueryItems->Data['A'] = $this->PanelAction;
+    $this->PageList->QueryItems->Data['FilterColumn'] = $this->FilterColumn;
+    $this->PageList->Process();
+
+    // Build table header and ordering
+    $this->TableHeader->QueryItems = $this->PageList->QueryItems;
+    $this->TableHeader->HTMLId = $this->Module;
+    $this->TableHeader->Columns = array();
+    foreach($this->Columns as $Item)
+    {
+      $this->TableHeader->Columns[$Item['Name']] = array('Title' => $Item['Title'], 
+        'Type' => $Item['Type'], 'SQL' => $Item['SQL']);
+    }
+    if(is_array($this->Actions))
+      $this->TableHeader->Columns['Actions'] = array('Type' => 'String', 'SQL' => '');
+    $this->TableHeader->DefaultOrder = $this->DefaultOrder;
+    $this->TableHeader->Process();
+
+    //$this->System->Navigation->UnsetParameter('Panel');
+
+    // Build column list
+    $Columns = $this->Name.'.Id';
+    foreach($this->Columns as $ColumnName => $Column)
+      $Columns .= ', '.$Column['SQL'].' AS `'.$ColumnName.'`';
+
+    $this->DbRows = array();
+    $DbResult = $this->System->Database->query('SELECT '.$Columns.' FROM '.$this->Name.
+      ' '.$this->SQLJoin.$this->TableHeader->SQL.$this->PageList->SQLLimit);
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      $this->Rows[] = $DbRow;
+    }
+  }
+
+  function ProcessRow($Row)
+  {
+    return($Row);
+  }
+  
   function AddItemString($Name, $Title)
   {
-    $this->Items[$Name] = array('Name' => $Name, 'Title' => $Title, 
-      'Type' => ViewItemTypeString);
-  } 
-  
+    $this->Columns[$Name] = array('Name' => $Name, 'Title' => $Title, 
+      'Type' => ViewItemTypeString, 'SQL' => $Name);
+  }   
 }
 

trunk/Modules/FrontPage/FrontPage.php

@@ -15 +15 @@
       if($HyperLink['IconFile'] == '') $HyperLink['IconFile'] = 'clear.png';
         if(substr($HyperLink['URL'], 0, 4) != 'http') $HyperLink['URL'] = $this->System->Config['Web']['RootFolder'].$HyperLink['URL'];
-        if(($HyperLink['PermissionModule'] == '') or (($HyperLink['PermissionModule'] != '') and $this->System->Models['User']->CheckPermission($HyperLink['PermissionModule'], $HyperLink['PermissionOperation'])))        
+        if(($HyperLink['PermissionModule'] == '') or (($HyperLink['PermissionModule'] != '') and $this->System->Modules['User']->Models['User']->CheckPermission($HyperLink['PermissionModule'], $HyperLink['PermissionOperation'])))        
         $Output .= '<img alt="'.$HyperLink['Name'].'" src="images/favicons/'.$HyperLink['IconFile'].'" width="16" height="16" /> <a href="'.$HyperLink['URL'].'">'.$HyperLink['Name'].'</a><br />';
     }
@@ -54 +54 @@
     //$Output .= 'Server běží: '.$this->GetServerUptime().' &nbsp;  &nbsp; ';
 
-    if($this->System->Models['User']->CheckPermission('Finance', 'DisplaySubjectState'))
-    {
-      $DbResult = $this->Database->select('Subject', 'Money', 'Id=(SELECT Subject FROM Member WHERE Id=(SELECT Member FROM User WHERE Id='.$this->System->Models['User']->User['Id'].'))');
+    if($this->System->Modules['User']->Models['User']->CheckPermission('Finance', 'DisplaySubjectState'))
+    {
+      $DbResult = $this->Database->select('Subject', 'Money', 'Id=(SELECT Subject FROM Member WHERE Id=(SELECT Member FROM User WHERE Id='.$this->System->Modules['User']->Models['User']->User['Id'].'))');
       if($DbResult->num_rows > 0)
       {
@@ -71 +71 @@
   {
     $Output = '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Profil</a><br />';
-    if($this->System->Models['User']->CheckPermission('Finance', 'MemberOptions')) 
+    if($this->System->Modules['User']->Models['User']->CheckPermission('Finance', 'MemberOptions')) 
       $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'?Action=MemberOptions">Domácnost</a><br />';
-    if($this->System->Models['User']->CheckPermission('Finance', 'DisplaySubjectState')) 
+    if($this->System->Modules['User']->Models['User']->CheckPermission('Finance', 'DisplaySubjectState')) 
       $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/finance/uzivatel/">Finance</a><br />';
-    if($this->System->Models['User']->CheckPermission('Network', 'RegistredHostList')) 
+    if($this->System->Modules['User']->Models['User']->CheckPermission('Network', 'RegistredHostList')) 
       $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/sit/registrovane-pocitace/">Počítače</a><br />';
-    if($this->System->Models['User']->CheckPermission('News', 'Insert')) 
+    if($this->System->Modules['User']->Models['User']->CheckPermission('News', 'Insert')) 
       $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/aktuality/?action=add">Vložení aktuality</a><br />';
-    if($this->System->Models['User']->CheckPermission('EatingPlace', 'Edit'))
+    if($this->System->Modules['User']->Models['User']->CheckPermission('EatingPlace', 'Edit'))
       $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/jidelna/edit/">Editace jídelníčků</a><br />';
-    if($this->System->Models['User']->CheckPermission('Finance', 'Manage'))
+    if($this->System->Modules['User']->Models['User']->CheckPermission('Finance', 'Manage'))
       $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/finance/sprava/">Správa financí</a><br />';
-    if($this->System->Models['User']->CheckPermission('Network', 'Administration'))
+    if($this->System->Modules['User']->Models['User']->CheckPermission('Network', 'Administration'))
       $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/sit/sprava/">Správa sítě</a><br />';
     return($Output);
@@ -149 +149 @@
         $Form = new UserLoginView($this->Database);
         $Form->OnSubmit = '?Action=Login';
-        $Result = $this->System->Models['User']->Login($_POST['Username'], $_POST['Password']);
+        $Result = $this->System->Modules['User']->Models['User']->Login($_POST['Username'], $_POST['Password']);
         $Output .= $this->SystemMessage('Přihlášení', $Result);
         if($Result <> USER_LOGGED_IN)
@@ -162 +162 @@
       if($_GET['Action'] == 'Logout')
       {
-        $Output .= $this->SystemMessage('Odhlášení', $this->System->Models['User']->Logout());
+        $Output .= $this->SystemMessage('Odhlášení', $this->System->Modules['User']->Models['User']->Logout());
       } else
       if($_GET['Action'] == 'UserOptions')
       { 
         $UserOptions = new UserOptionsView($this->Database);
-        $UserOptions->LoadValuesFromDatabase($this->System->Models['User']->User['Id']);
+        $UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->Models['User']->User['Id']);
         $UserOptions->OnSubmit = '?Action=UserOptionsSave';
         $Output .= $UserOptions->ShowEditForm();
@@ -175 +175 @@
         $UserOptions = new UserOptionsView($this->Dstabase, array());
         $UserOptions->LoadValuesFromForm();
-        $UserOptions->SaveValuesToDatabase($this->System->Models['User']->User['Id']);
+        $UserOptions->SaveValuesToDatabase($this->System->Modules['User']->Models['User']->User['Id']);
         $Output .= $this->SystemMessage('Nastavení', 'Nastavení uloženo.');
         $this->System->Modules['Log']->NewRecord('User', 'Nastavení uživatele změněno', $UserOptions->Values['Name']);
-        $UserOptions->LoadValuesFromDatabase($this->System->Models['User']->User['Id']);
+        $UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->Models['User']->User['Id']);
         $UserOptions->OnSubmit = '?Action=UserOptionsSave';
         $Output .= $UserOptions->ShowEditForm();
@@ -191 +191 @@
       if($_GET['Action'] == 'UserRegisterConfirm')
       {
-        $Output .= $this->SystemMessage('Potvrzení registrace', $this->System->Models['User']->RegisterConfirm($_GET['User'], $_GET['H']));
+        $Output .= $this->SystemMessage('Potvrzení registrace', $this->System->Modules['User']->Models['User']->RegisterConfirm($_GET['User'], $_GET['H']));
       } else
       if($_GET['Action'] == 'PasswordRecovery')
@@ -203 +203 @@
         $Form = new PasswordRecoveryView($this->Database);
         $Form->LoadValuesFromForm();
-        $Result = $this->System->Models['User']->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
+        $Result = $this->System->Modules['User']->Models['User']->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
         $Output .= $this->SystemMessage('Obnova hesla', $Result);
         if($Result <> USER_PASSWORD_RECOVERY_SUCCESS)
@@ -212 +212 @@
       if($_GET['Action'] == 'PasswordRecoveryConfirm')
       {
-        $Output .= $this->SystemMessage('Obnova hesla', $this->System->Models['User']->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
+        $Output .= $this->SystemMessage('Obnova hesla', $this->System->Modules['User']->Models['User']->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
       } else
       if($_GET['Action'] == 'UserRegisterSave')
@@ -218 +218 @@
         $Form = new UserRegisterView($this->Database, array());
         $Form->LoadValuesFromForm();
-        $Result = $this->System->Models['User']->Register($Form->Values['Login'], $Form->Values['Password'], $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name'], $Form->Values['PhoneNumber'], $Form->Values['ICQ']);
+        $Result = $this->System->Modules['User']->Models['User']->Register($Form->Values['Login'], $Form->Values['Password'], $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name'], $Form->Values['PhoneNumber'], $Form->Values['ICQ']);
         $Output .= $this->SystemMessage('Registrace nového účtu', $Result);
         if($Result <> USER_REGISTRATED) 
@@ -229 +229 @@
       {
         $UserOptions = new MemberOptionsView($this->Database);
-        $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Models['User']->User['Member']);
+        $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->Models['User']->User['Member']);
         $DbRow = $DbResult->fetch_array();
         foreach($UserOptions->Items as $Index => $Item)
@@ -247 +247 @@
           $UserOptions->Values['BillingPeriodNext'] = 2;
           
-        $DbResult = $this->Database->update('Member', 'Id='.$this->System->Models['User']->User['Member'], array('InternetTariffNextMonth' => $UserOptions->Values['InternetTariffNextMonth'], 'FamilyMemberCount' => $UserOptions->Values['FamilyMemberCount'], 'BillingPeriodNext' => $UserOptions->Values['BillingPeriodNext']));
-        $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$this->System->Models['User']->User['Member']);
+        $DbResult = $this->Database->update('Member', 'Id='.$this->System->Modules['User']->Models['User']->User['Member'], array('InternetTariffNextMonth' => $UserOptions->Values['InternetTariffNextMonth'], 'FamilyMemberCount' => $UserOptions->Values['FamilyMemberCount'], 'BillingPeriodNext' => $UserOptions->Values['BillingPeriodNext']));
+        $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$this->System->Modules['User']->Models['User']->User['Member']);
         $Member = $DbResult->fetch_assoc();
         $DbResult = $this->Database->update('Subject', 'Id='.$Member['Subject'], array('Name' => $UserOptions->Values['Name'], 'AddressStreet' => $UserOptions->Values['AddressStreet'], 'AddressTown' => $UserOptions->Values['AddressTown'], 'AddressPSC' => $UserOptions->Values['AddressPSC'], 'IC' => $UserOptions->Values['IC'], 'DIC' => $UserOptions->Values['DIC']));
         $Output .= $this->SystemMessage('Nastavení', 'Nastavení domácnosti uloženo.');
         $this->System->Modules['Log']->NewRecord('Member+Subject', 'Nastavení člena/subjektu změněno', $UserOptions->Values['Name']);
-        $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Models['User']->User['Member']);
+        $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->Models['User']->User['Member']);
         $DbRow = $DbResult->fetch_array();
         foreach($UserOptions->Items as $Index => $Item)
@@ -288 +288 @@
         else if($Panel['Module'] == 'UserOptions') 
         {
-          if($this->System->Models['User']->User['Id'] != $this->System->Models['User']->AnonymousUserId) 
+          if($this->System->Modules['User']->Models['User']->User['Id'] != $this->System->Modules['User']->Models['User']->AnonymousUserId) 
             $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
         } else

trunk/Modules/Log/Log.php

@@ -113 +113 @@
   {
     $this->Database->insert('Log', array('Time' => 'NOW()', 
-      'User' => $this->System->Models['User']->User['Id'], 'Module' => $Module, 
+      'User' => $this->System->Module['User']->Models['User']->User['Id'], 'Module' => $Module, 
       'Operation' => $Operation, 'Value' => $Value));
     //echo($this->Database->LastQuery);

trunk/Modules/NetworkConfig/NetworkConfig.php

@@ -27 +27 @@
     $this->Creator = 'Chronos';
     $this->License = 'GNU/GPL';
-    $this->Description = 'Mikrotik RouterOS configuration';
+    $this->Description = 'Network device remote configuration';
     $this->Dependencies = array('Network');
     $this->SupportedModels = array('NetworkConfiguration');

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -51 +51 @@
     $this->Dependencies = array('NetworkConfig');
     $this->SupportedModels = array('NetworkFirewall', 'NetworkMark', 
-      'NetworkMangeSubgroup');
+      'NetworkMangleSubgroup');
   }
   

trunk/Modules/News/News.php

@@ -130 +130 @@
     $Output = '<div class="NewsPanel"><div class="Title">'.$Row['Caption'];      
     $Output .= '<div class="Action"><a href="aktuality/?category='.$Category.'">Zobrazit</a>';
-    if($this->System->Models['User']->CheckPermission('News', 'Insert', 'Group', $Category))
+    if($this->System->Modules['User']->Models['User']->CheckPermission('News', 'Insert', 'Group', $Category))
       $Output .= ' <a href="aktuality/?action=add&amp;category='.$Category.'">Přidat</a>';
     $Output .= '</div></div><div class="Content">';

trunk/Modules/Project/Project.php

@@ -1 +1 @@
 <?php
+
+class ProjectPage extends Page
+{
+  var $FullTitle = 'Projekty';
+  var $ShortTitle = 'Projekty';
+
+  function Show()
+  {
+    $View = new ProjectView($this->System);
+    $View->LoadFromDatabase();
+    return($View->Show());
+  }
+}
+
+class ProjectView extends ViewList
+{
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'Project';
+    //$this->AddPropertyDateTime('TimeSchedule');
+    //$this->AddPropertyOneToMany('UserAssignedTo', 'User');
+    //$this->AddPropertyText('Description');
+    $this->AddItemString('Description', 'Description');
+  }
+}
 
 class Project extends Model
@@ -50 +76 @@
   function Init()
   {
+    $this->System->Pages['projekt'] = 'ProjectPage';
   }
 }

trunk/Modules/User/User.php

@@ -390 +390 @@
   {
     parent::Install();
-    $this->Database->insert('User', array('Id' => ANONYMOUS_ID, 'Login' => 'Anonymous', 'Name' => 'Anonymous', 
-      'Password' => ''));
+    if(!$this->Installed)
+    {
+      $this->Database->insert('User', array('Id' => ANONYMOUS_ID, 'Login' => 'Anonymous', 'Name' => 'Anonymous', 
+        'Password' => ''));
+    }
   }