Changeset 183 for trunk

Timestamp:

Mar 26, 2009, 8:51:40 PM (16 years ago)

Author:

george

Message:

• Přidáno: Uživatelské nastavení domácnosti v hlavním menu uživatele. Možnost nastavit fakturační údaje, počet osob v domácnosti, periodu fakturace či internetový tarif.
• Přidáno: Generování záznamů systému do RSS kanálu.
• Opraveno: Při ukládání nastavení zobraz znovu formulář pro nastavení s znovu načtenými údaji z databáze.
• Opraveno: Uchovávej pevné jméno autora aktuality pro případnou pozdější změnu jména uživatele.

Location:

trunk

Files:

• LogShow.php (modified) (3 diffs)
• aktuality/index.php (modified) (6 diffs)
• aktuality/news.php (modified) (3 diffs)
• aktuality/rss.php (modified) (1 diff)
• aktuality/rss_generator.php (modified) (1 diff)
• form_classes.php (modified) (3 diffs)
• forms.php (modified) (2 diffs)
• index.php (modified) (3 diffs)
• page.php (modified) (1 diff)
• sql/updates/183.sql (added)

trunk/LogShow.php

@@ -1 +1 @@
 <?php
-include_once('global.php');
+include('global.php');
+include('aktuality/rss_generator.php');
 
 class LogShow extends Page
@@ -18 +19 @@
     $Output = '<div align="center"><table class="WideTable" style="font-size: small;">';
     $Output .= '<tr><th>Čas</th><th>Uživatel</th><th>Modul</th><th>Operace</th><th>Hodnota</th></tr>';
-    $DbResult = $this->Database->query('SELECT *, `User`.`Name` as UserName FROM `is`.`Log` LEFT JOIN `is`.`User` ON `User`.`Id` = `Log`.`User` ORDER BY Time DESC LIMIT '.$Page * $this->RowPerPage.','.$this->RowPerPage);
-    while($DbRow = $DbResult->fetch_array())
+    $DbResult = $this->Database->query('SELECT Log.*, `User`.`Name` as UserName FROM `Log` LEFT JOIN `User` ON `User`.`Id` = `Log`.`User` ORDER BY Time DESC LIMIT '.$Page * $this->RowPerPage.','.$this->RowPerPage);
+    while($DbRow = $DbResult->fetch_assoc())
     {
       $Output .= '<tr><td>'.$DbRow['Time'].'</td><td>'.$DbRow['UserName'].'</td><td>'.$DbRow['Module'].'</td><td>'.$DbRow['Operation'].'</td><td>'.$DbRow['Value'].'</td></tr>';
@@ -30 +31 @@
 }
 
-$System->AddModule(new LogShow());
-$System->Modules['LogShow']->GetOutput();
+if(array_key_exists('Action', $_GET))
+{
+  if($_GET['Action'] == 'rss')
+  {
+    $DbResult = $Database->query('SELECT UNIX_TIMESTAMP(Time), Log.*, `User`.`Name` as UserName FROM `Log` LEFT JOIN `User` ON `User`.`Id` = `Log`.`User` ORDER BY Time DESC LIMIT 0, 50');
+    while($Row = $DbResult->fetch_assoc())
+    {
+      $Info = $Row['UserName'].': '.$Row['Module'].' '.$Row['Operation'].' '.$Row['Value'];
+      $Items[] = array
+      (
+        'Title' => $Info,
+        'Link' => 'http://'.$Config['Web']['Host'].'/',
+        'Description' => $Info,
+        'Time' => $Row['UNIX_TIMESTAMP(Time)'],
+      );
+    }
+    echo(GenerateRSS(array(
+      'Title' => $Config['Web']['Title'].' - Záznamy operací',
+      'Link' => 'http://'.$Config['Web']['Host'].'/',
+      'Description' => 'Záznamy operací',
+      'WebmasterEmail' => $Config['Web']['AdminEmail'],
+      'Items' => $Items)));
+  } else
+  {
+    $System->AddModule(new LogShow());
+    $System->Modules['LogShow']->GetOutput();
+  }
+} else
+{
+  $System->AddModule(new LogShow());
+  $System->Modules['LogShow']->GetOutput();
+}
 
 ?>

trunk/aktuality/index.php

@@ -31 +31 @@
         {
           if(array_key_exists('id', $_GET)) $Id = $_GET['id'] * 1;
-          $DbResult = $this->Database->query('SELECT `news`.*, `User`.`Name` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE  `news`.`id`='.$Id);
+          $DbResult = $this->Database->query('SELECT `news`.*, `User`.`Nick` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE  `news`.`id`='.$Id);
           if($DbResult->num_rows > 0)
           {
             $Row = $DbResult->fetch_array();
-            $Output .= '<div style="border: thin dotted #97ADFF;        background: #F6F7FF; margin-top: 5px; padding: 0px 5px 5px 5px;"><div style="padding-bottom: 1px; border-bottom-width: 1; border-bottom-style: solid; border-bottom-color: silver;"><strong>'.$Row['title'].' ('.HumanDate($Row['date']).', '.$Row['Name'].$Row['author'].')</strong>';
+            if($Row['Nick'] == '') $Author = $Row['author'];
+              else $Author = $Row['Nick'];
+            $Output .= '<div style="border: thin dotted #97ADFF;        background: #F6F7FF; margin-top: 5px; padding: 0px 5px 5px 5px;"><div style="padding-bottom: 1px; border-bottom-width: 1; border-bottom-style: solid; border-bottom-color: silver;"><strong>'.$Row['title'].' ('.HumanDate($Row['date']).', '.$Author.')</strong>';
             if($this->System->Modules['User']->User['Id'] == $Row['User'])
             { 
@@ -56 +58 @@
         break;
       case 'add':
-          $Output .= '<strong>Vložení nové aktuality:</strong><br />';
-          if($Category == 2) $Output .= 'U inzerátů uvádějte co nejvíce informací ať případný zájemce ví co kupuje. Uvádějte kontaktní údaje jako Jméno, email, tel. číslo, ICQ. Dále navrženou cenu, detajlní popis předmětu nejlépe s odkazem na stránky výrobce. Pokud váš inzerát již není platný, připište do něj např. "Prodáno" pomocí editace.';
-          $Output .= '<form enctype="multipart/form-data" action="?action=add2" method="post">'.
+        $Output .= '<strong>Vložení nové aktuality:</strong><br />';
+        if($Category == 2) $Output .= 'U inzerátů uvádějte co nejvíce informací ať případný zájemce ví co kupuje. Uvádějte kontaktní údaje jako Jméno, email, tel. číslo, ICQ. Dále navrženou cenu, detajlní popis předmětu nejlépe s odkazem na stránky výrobce. Pokud váš inzerát již není platný, připište do něj např. "Prodáno" pomocí editace.';
+        $Output .= '<form enctype="multipart/form-data" action="?action=add2" method="post">'.
     'Kategorie: <select name="category">';
-    $DbResult = $this->Database->select('news_category', '*');
-    while($DbRow = $DbResult->fetch_array()) 
-    {
-      if($this->System->Modules['User']->CheckPermission('News', 'Insert', 'Group', $DbRow['id']))
-      {
-        if($DbRow['id'] == $Category) $Selected = ' selected="1"'; else $Selected = '';
-        $Output .= '<option value="'.$DbRow['id'].'"'.$Selected.'>'.$DbRow['caption'].'</option>';
-      }
-    }
-    $Output .= '</select><br />'.
+        $DbResult = $this->Database->select('news_category', '*');
+        while($DbRow = $DbResult->fetch_array()) 
+        {
+          if($this->System->Modules['User']->CheckPermission('News', 'Insert', 'Group', $DbRow['id']))
+          {
+            if($DbRow['id'] == $Category) $Selected = ' selected="1"'; else $Selected = '';
+            $Output .= '<option value="'.$DbRow['id'].'"'.$Selected.'>'.$DbRow['caption'].'</option>';
+          }
+        }
+        $Output .= '</select><br />'.
     'Nadpis:<br /><input type="text" size="54" name="title"><br />
     Obsah:<br /><textarea name="content" rows="20" cols="40"></textarea><br />
@@ -103 +105 @@
 
           $_POST['content'] = str_replace("\n",'<br />',$_POST['content']);
-          $this->Database->insert('news',array('category' => $Category, 'title' => $_POST['title'], 'content' => $_POST['content'], 'date' => 'NOW()', 'ip' => $RemoteAddr, 'enclosure' => $Enclosures, 'User' => $this->System->Modules['User']->User['Id']));
+          $this->Database->insert('news',array('category' => $Category, 'title' => $_POST['title'], 'content' => $_POST['content'], 'date' => 'NOW()', 'ip' => $RemoteAddr, 'enclosure' => $Enclosures, 'author' => $this->System->Modules['User']->User['Nick'], 'User' => $this->System->Modules['User']->User['Id']));
           $Output .= 'Aktualita přidána!<br />Pokud budete chtít vaši aktualitu smazat, klikněte na odkaz Smazat v seznamu všech aktualit v kategorii.<br /><br />';
           $Output .= '<a href="index.php?category='.$_POST['category'].'">Zpět na seznam aktualit</a>';
@@ -150 +152 @@
             $Output .= '<br />Přílohy: ';
             $Enclosures = explode(';', $Row['enclosure']);
-            foreach($Enclosures as $Enclosure)
-            {
-              if(file_exists($this->UploadedFilesFolder.$Enclosure)) unlink($this->UploadedFilesFolder.$Enclosure);
-            }
+                  foreach($Enclosures as $Enclosure)
+                  {
+                    if(file_exists($this->UploadedFilesFolder.$Enclosure)) unlink($this->UploadedFilesFolder.$Enclosure);
+                  }
           }
           $this->Database->query('DELETE FROM news WHERE id='.$_GET['id']);
@@ -171 +173 @@
 
           //echo(GetRemoteAddress().','.$_SERVER['HTTP_X_FORWARDED_FOR'].'<br />');
-          $DbResult = $this->Database->query('SELECT `news`.*, `User`.`Name` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE `category`='.$Category.' ORDER BY `news`.`id` DESC LIMIT '.($Page * $PerPage).','.$PerPage);
+          $DbResult = $this->Database->query('SELECT `news`.*, `User`.`Nick` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE `category`='.$Category.' ORDER BY `news`.`id` DESC LIMIT '.($Page * $PerPage).','.$PerPage);
           while($Row = $DbResult->fetch_array())
           {
-            $Output .= '<div style="border: thin dotted #97ADFF; background: #F6F7FF; margin-top: 5px; padding: 0px 5px 5px 5px;"><div style="padding-bottom: 1px; border-bottom-width: 1; border-bottom-style: solid; border-bottom-color: silver;"><strong><a href="?action=view&id='.$Row['id'].'">'.$Row['title'].'</a> ('.HumanDate($Row['date']).', '.$Row['Name'].$Row['author'].')</strong>';
+            if($Row['Nick'] == '') $Author = $Row['author'];
+              else $Author = $Row['Nick'];
+            $Output .= '<div style="border: thin dotted #97ADFF; background: #F6F7FF; margin-top: 5px; padding: 0px 5px 5px 5px;"><div style="padding-bottom: 1px; border-bottom-width: 1; border-bottom-style: solid; border-bottom-color: silver;"><strong><a href="?action=view&id='.$Row['id'].'">'.$Row['title'].'</a> ('.HumanDate($Row['date']).', '.$Author.')</strong>';
             if($this->System->Modules['User']->User['Id'] == $Row['User'])
             {
@@ -185 +189 @@
               $Output .= '<br />Přílohy: ';
               $Enclosures = explode(';', $Row['enclosure']);
-              foreach($Enclosures as $Enclosure)
+                    foreach($Enclosures as $Enclosure)
               {
-                if(file_exists($this->UploadedFilesFolder.$Enclosure)) $Output .= ' <a href="'.$this->UploadedFilesFolder.$Enclosure.'">'.$Enclosure.'</a>';
-              }
+                if(file_exists($this->UploadedFilesFolder.$Enclosure)) $Output .= ' <a href="'.$this->UploadedFilesFolder.$Enclosure.'">'.$Enclosure.'</a>';
+                    }
             }
             $Output .= '</div>';

trunk/aktuality/news.php

@@ -27 +27 @@
       $Output .= '<a href="aktuality/index.php?action=add&amp;category='.$Category.'">Přidat aktualitu</a>&nbsp;';
     $Output .= '</td></tr><tr><td colspan="2">';
-    $DbResult = $Database->query('SELECT `news`.*, `User`.`Name` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE (`news`.`category`='.$Category.') AND (DATE_SUB(NOW(), INTERVAL '.$DaysAgo.' DAY) < `news`.`date`) ORDER BY `news`.`date` DESC LIMIT 0,'.$ItemCount);
+    $DbResult = $Database->query('SELECT `news`.*, `User`.`Nick` FROM `news` LEFT JOIN `User` ON `User`.`Id`=`news`.`User` WHERE (`news`.`category`='.$Category.') AND (DATE_SUB(NOW(), INTERVAL '.$DaysAgo.' DAY) < `news`.`date`) ORDER BY `news`.`date` DESC LIMIT 0,'.$ItemCount);
     //echo($Database->error.'<br />');
     //echo($Database->LastQuery.'<br />');
@@ -38 +38 @@
       while($Row = $DbResult->fetch_array())
       {
-        $Output .= '<tr><td onclick="window.location=\'aktuality/index.php?action=view&amp;id='.$Row['id'].'\'" onmouseover="zobraz('."'new".$Category.$Index."'".')" style="cursor: pointer; margin: 0px;"><table cellspacing="0" cellpadding="0" style="padding: 0px; margin: 0px; font-size: small; color: red;" width="100%"><tr><td style="font-size: '.$FontSize.'pt"><strong>'.$Row['title'].'</strong></td><td align="right" style="font-size: '.$FontSize.'pt">'.$Row['Name'].$Row['author'].' ('.HumanDate($Row['date']).')</td></tr></table>';
+        if($Row['Nick'] == '') $Author = $Row['author'];
+          else $Author = $Row['Nick'];
+        $Output .= '<tr><td onclick="window.location=\'aktuality/index.php?action=view&amp;id='.$Row['id'].'\'" onmouseover="zobraz('."'new".$Category.$Index."'".')" style="cursor: pointer; margin: 0px;"><table cellspacing="0" cellpadding="0" style="padding: 0px; margin: 0px; font-size: small; color: red;" width="100%"><tr><td style="font-size: '.$FontSize.'pt"><strong>'.$Row['title'].'</strong></td><td align="right" style="font-size: '.$FontSize.'pt">'.$Author.' ('.HumanDate($Row['date']).')</td></tr></table>';
         $Output .= '<div id="new'.$Category.$Index.'" class="NewsTableItem">'.$Row['content'];
 
@@ -45 +47 @@
           $Output .= '<br />Přílohy: ';
           $Enclosures = explode(';', $Row['enclosure']);
-           foreach($Enclosures as $Enclosure)
-           {
-            if(file_exists($UploadedFilesFolder.$Enclosure)) $Output .= ' <a href="'.$UploadedFilesFolder.$Enclosure.'">'.$Enclosure.'</a>';
-          }
+                foreach($Enclosures as $Enclosure)
+                {
+                  if(file_exists($UploadedFilesFolder.$Enclosure)) $Output .= ' <a href="'.$UploadedFilesFolder.$Enclosure.'">'.$Enclosure.'</a>';
+              }
         }
-
-      $Output .= '</div></td></tr>';
-      $Index = $Index + 1;    
-      $FontSize = $FontSize - 1;
-    }
-    $Output .= '</table>';
+        $Output .= '</div></td></tr>';
+        $Index = $Index + 1;    
+        $FontSize = $FontSize - 1;
+      }
+      $Output .= '</table>';
     }
     $Output .= '</td></tr></table>'."\n\n";

trunk/aktuality/rss.php

@@ -88 +88 @@
 
 echo(GenerateRSS(array(
-  'Title' => 'ZděchovNET - Aktuality',
-  'Link' => 'http://centrala.zdechov.net/',
+  'Title' => $Config['Web']['Title'].' - Aktuality',
+  'Link' => 'http://'.$Config['Web']['Host'].'/',
   'Description' => 'Aktuality komunitní počítačové sítě ZděchovNET',
-  'WebmasterEmail' => 'robie@centrum.cz',
+  'WebmasterEmail' => $Config['Web']['AdminEmail'],
   'Items' => $Items)));
 ?>

trunk/aktuality/rss_generator.php

@@ -1 +1 @@
 <?php
-
-include_once('../global.php');
 
 function GenerateRSS($Data)

trunk/form_classes.php

@@ -54 +54 @@
       'Name' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => ''),
       'Password' => array('Type' => 'Password', 'Caption' => 'Heslo', 'Default' => ''),
+      'Nick' => array('Type' => 'String', 'Caption' => 'Zobrazované jméno', 'Default' => ''),
       'FirstName' => array('Type' => 'String', 'Caption' => 'Křestní jméno', 'Default' => ''),
       'SecondName' => array('Type' => 'String', 'Caption' => 'Přijmení jméno', 'Default' => ''),
@@ -71 +72 @@
       'FirstName' => array('Type' => 'String', 'Caption' => 'Křestní jméno', 'Default' => ''),
       'SecondName' => array('Type' => 'String', 'Caption' => 'Přijmení jméno', 'Default' => ''),
+    ),
+  ),
+  'MemberOptions' => array(
+    'Title' => 'Nastavení domácnosti',
+    'Table' => '(SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject)',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Fakturační jméno', 'Default' => ''),
+      'AddressStreet' => array('Type' => 'String', 'Caption' => 'Ulice', 'Default' => 'Zděchov'),
+      'AddressTown' => array('Type' => 'String', 'Caption' => 'Město', 'Default' => 'Zděchov'),
+      'AddressPSC' => array('Type' => 'String', 'Caption' => 'PSČ', 'Default' => '75607'),
+      'IC' => array('Type' => 'String', 'Caption' => 'IČ', 'Default' => ''),
+      'DIC' => array('Type' => 'String', 'Caption' => 'DIČ', 'Default' => ''),
+      'FamilyMemberCount' => array('Type' => 'Integer', 'Caption' => 'Počet osob v domácnosti', 'Default' => ''),
+      'BillingPeriodNext' => array('Type' => 'TFinanceBillingPeriod', 'Caption' => 'Požadované fakturované období', 'Default' => ''),
+      'InternetTariffNextMonth' => array('Type' => 'TFinanceTariff', 'Caption' => 'Tarif internetu od dalšího období', 'Default' => 2),
     ),
   ),
@@ -120 +136 @@
      'States' => array('Zakoupeno', 'Prodáno', 'Zařazeno do použití', 'Vyřazeno z použití', 'Zasláno do reklamace', 'Přijato z reklamace'),
   ),
+  'TFinanceTariff' => array(
+     'Type' => 'Enumeration',
+     'States' => array(6 => 'Zdarma', 0 => 'Pomalejší', 1 => 'Pomalý', 2 => 'Střední', 3 => 'Rychlý', 4 => 'Rychlejší'),
+  ),
+  'TFinanceBillingPeriod' => array(
+     'Type' => 'Enumeration',
+     'States' => array(2 => 'Měsíčně', 3 => 'Čtvrtletně', 4 => 'Pololetně', 5 => 'Ročně'),
+  ),
   'TFinanceSubject' => array(
     'Type' => 'Reference',

trunk/forms.php

@@ -80 +80 @@
                 $Edit = '<select name="'.$Context.$Index.'">';
                 foreach($FormTypes[$Item['Type']]['States'] as $StateIndex => $StateName)
-                  $Edit .= '<option value="'.$StateIndex.'">'.$StateName.'</option>';
+                {
+                  if($this->Values[$Index] == $StateIndex) $Selected = 'selected="selected"';
+                    else $Selected = '';
+                  $Edit .= '<option value="'.$StateIndex.'"'.$Selected.'>'.$StateName.'</option>';
+                }
                 $Edit .= '</select>';
                 break;
@@ -106 +110 @@
     global $Database;
 
-    $DbResult = $Database->query('SELECT * FROM '.$this->Definition['Table'].' WHERE Id='.$Id);
+    $DbResult = $Database->query('SELECT T.* FROM '.$this->Definition['Table'].' AS T WHERE T.Id='.$Id);
     $DbRow = $DbResult->fetch_array();
     foreach($this->Definition['Items'] as $Index => $Item)

trunk/index.php

@@ -142 +142 @@
   {
     $Output = '<div class="PanelTitle">Nabídka uživatele:</div>'.
-    '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení účtu</a><br />';
+    '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení uživatele</a><br />';
+    if($this->System->Modules['User']->CheckPermission('Finance', 'MemberOptions')) 
+            $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'?Action=MemberOptions">Nastavení domácnosti</a><br />';
     if($this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) 
-          $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/finance/user_state.php">Stav financí</a><br />';
+            $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/finance/user_state.php">Stav financí</a><br />';
     if($this->System->Modules['User']->CheckPermission('Network', 'RegistredHostList')) 
-          $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/network/user_hosts.php">Registrované počítače</a><br />';
+            $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/network/user_hosts.php">Registrované počítače</a><br />';
     if($this->System->Modules['User']->CheckPermission('News', 'Insert')) 
-          $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/aktuality/?action=add">Vložení aktuality</a><br />';
-    if($this->System->Modules['User']->CheckPermission('EatingPlace', 'Edit')) $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/jidelna/menuedit.php">Editace jídelníčků</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Finance', 'Manage')) $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/finance/manage.php">Správa financí</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Network', 'Administration')) $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/is/administration_page.php">Správa sítě</a><br />';
+            $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/aktuality/?action=add">Vložení aktuality</a><br />';
+    if($this->System->Modules['User']->CheckPermission('EatingPlace', 'Edit'))
+      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/jidelna/menuedit.php">Editace jídelníčků</a><br />';
+    if($this->System->Modules['User']->CheckPermission('Finance', 'Manage'))
+      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/finance/manage.php">Správa financí</a><br />';
+    if($this->System->Modules['User']->CheckPermission('Network', 'Administration'))
+      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/is/administration_page.php">Správa sítě</a><br />';
     return($Output);
   }
@@ -262 +267 @@
         $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->Modules['User']->User['Id']);
+        $UserOptions->OnSubmit = '?Action=UserOptionsSave';
+        $Output .= $UserOptions->ShowEditForm();
       }
       if($_GET['Action'] == 'UserRegister')
@@ -295 +303 @@
         $UserRegister->LoadValuesFromForm();
         $Output .= $this->SystemMessage('Nastavení', $this->System->Modules['User']->Register($UserRegister->Values['Name'], $UserRegister->Values['Password'], $UserRegister->Values['Password2'], $UserRegister->Values['Email'], $UserRegister->Values['FirstName'], $UserRegister->Values['SecondName']));
+      } else
+      if($_GET['Action'] == 'MemberOptions')
+      {
+        $UserOptions = new Form('MemberOptions');
+        $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']->User['Member']);
+        $DbRow = $DbResult->fetch_array();
+        foreach($UserOptions->Definition['Items'] as $Index => $Item)
+        {
+          $UserOptions->Values[$Index] = $DbRow[$Index];
+        }
+        $UserOptions->OnSubmit = '?Action=MemberOptionsSave';
+        $Output .= $UserOptions->ShowEditForm();
+      } else
+      if($_GET['Action'] == 'MemberOptionsSave')
+      {
+        $UserOptions = new Form('MemberOptions');
+        $UserOptions->LoadValuesFromForm();
+        if($UserOptions->Values['FamilyMemberCount'] < 0)
+          $UserOptions->Values['FamilyMemberCount'] = 0;
+        if($UserOptions->Values['BillingPeriodNext'] < 2)
+          $UserOptions->Values['BillingPeriodNext'] = 2;
+          
+        $DbResult = $this->Database->update('Member', 'Id='.$this->System->Modules['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']->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->Modules['User']->User['Member']);
+        $DbRow = $DbResult->fetch_array();
+        foreach($UserOptions->Definition['Items'] as $Index => $Item)
+        {
+          $UserOptions->Values[$Index] = $DbRow[$Index];
+        }
+        $UserOptions->OnSubmit = '?Action=MemberOptionsSave';
+        $Output .= $UserOptions->ShowEditForm();
       }
     }

trunk/page.php

@@ -152 +152 @@
       if($this->System->Modules['User']->User['Id'] == $this->System->Modules['User']->AnonymousUserId)
         $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=LoginForm">Přihlášení</a> <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserRegister">Registrace</a>'; 
-        else $Output .= $this->System->Modules['User']->User['Name'].' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=Logout">Odhlásit</a>';
+        else $Output .= $this->System->Modules['User']->User['Nick'].' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=Logout">Odhlásit</a>';
    } else $Output .= '&nbsp;';
 // <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení</a>';