Changeset 107

Timestamp:

Sep 14, 2008, 5:54:37 PM (16 years ago)

Author:

george

Message:

• Přidáno: Skripty pro import aktualit ze stránek zdechov.cz.
• Upraveno: Doplněno generování oprávnění v prvotním transformačním skriptu.
• Upraveno: Názvy položek oprávnění.

Location:

devel/www

Files:

• aktuality/import_zdechov_cz_aktuality.php (added)
• aktuality/import_zdechov_cz_zapisy.php (added)
• config.sample.php (modified) (1 diff)
• finance/bill.php (modified) (1 diff)
• finance/bills.php (modified) (8 diffs)
• finance/clenove.php (modified) (1 diff)
• finance/index.php (modified) (1 diff)
• finance/user_state.php (modified) (2 diffs)
• index.php (modified) (2 diffs)
• is/restart.php (modified) (1 diff)
• network/dostupnost.php (modified) (1 diff)
• page.php (modified) (1 diff)
• temp/transform.php (modified) (2 diffs)
• user.php (modified) (2 diffs)

devel/www/config.sample.php

@@ -27 +27 @@
     ),
   ),
+  'Finance' => array(
+    'MainUserId' => 1,
+  ),
   'Network' => array(
     'MaxSubnetCount' => 7,

devel/www/finance/bill.php

@@ -3 +3 @@
 include('../global.php');
 
-$InvoiceGenerator->ShowStoredBill($_GET['id']);
+$System->Modules['Bill']->ShowStoredBill($_GET['Id']);
 
 ?>

devel/www/finance/bills.php

@@ -1 +1 @@
 <?php
-//include_once('global.php');
 
 class Bill extends Module
@@ -8 +7 @@
   function GenerateInvoice($BillId)
   {
-    global $SpecificSymbol;
+    global $SpecificSymbol, $Config;
 
     $DbResult = $this->Database->select('finance_bills', '*', 'id='.$BillId);
     $Bill = $DbResult->fetch_array();
- 
+
     $DbResult = $this->Database->select('users', '*', 'id='.$Bill['user_id']);
     $User = $DbResult->fetch_array();
+    $DbResult = $this->Database->select('users', '*', 'id='.$Config['Finance']['MainUserId']);
+    $MainUser = $DbResult->fetch_array();
 
     $Dodavka = array();
@@ -20 +21 @@
     while($Item = $DbResult->fetch_array())
     {
-      $Dodavka[$Item['id']] = $Item; 
+      $Dodavka[$Item['id']] = $Item;
     }
 
@@ -27 +28 @@
       '<hr></td></tr>'.
       '<tr><td valign="top" width="50%"><strong>Dodavatel:</strong><br>'.
-      'Ing. Jiří Hajda<br>'.
-      'Zděchov 208<br>'.
-      '75607 Zděchov<br>'.
-      'IČO: 75904535<br>'.
-      'DIČ: CZ8303255884<br>'.
+      $MainUser['subject_name'].'<br>'.
+      $MainUser['street'].'<br>'.
+      $MainUser['psc'].' '.$User['town'].'<br>'.
+      'IČO: '.$MainUser['ico'].'<br>'.
+      'DIČ: '.$MainUser['dic'].'<br>'.
       'Účet: 218098370 / 0300<br>'.
       'Nejsem plátce DPH<br>'.
@@ -50 +51 @@
       'Specifický symbol: '.$this->SpecificSymbol.'<br>'.
       'Konstantní symbol:<br>'.
-      'Způsob úhrady: převodem'.
+      'Doporučený způsob úhrady: převodem'.
       '</td><td valign="top">'.
       '<br>'.
@@ -96 +97 @@
     }
 
-    $Output = '<table width="100%"><tr><td colspan="2">'.
-      '<font size="6"><div align="center">Faktura - daňový doklad</font></div>'.
-      '<hr></td></tr>'.
-      '<tr><td valign="top" width="50%"><strong>Dodavatel:</strong><br>'.
+    $Output = '<table width="100%"><tr><td>'.
+      '<td valign="top" width="50%"><strong>Firma:</strong><br>'.
       'Ing. Jiří Hajda<br>'.
       'Zděchov 208<br>'.
@@ -105 +104 @@
       'IČO: 75904535<br>'.
       'DIČ: CZ8303255884<br>'.
-      'Účet: 218098370 / 0300<br>'.
       'Nejsem plátce DPH<br>'.
       '</td><td valign="top">'.
+      '<font size="6"><div align="center">JEDNODUCHÝ PŘIJMOVÝ POKLADNÍ DOKLAD č.</font></div>'.
+      'Datum vystavení: '.HumanDate($Bill['time_create']).'<br></td>'.
+      'Přijato od: <br>'.
+
+
       '<strong>Odběratel:</strong><br>'.
       $User['subject_name'].'<br>'.
@@ -126 +129 @@
       '</td><td valign="top">'.
       '<br>'.
-      'Datum vystavení: '.HumanDate($Bill['time_create']).'<br>'.
       'Datum splatnosti: '.HumanDate($Bill['time_due']).'<br>'.
       'Fakturované období: '.HumanDate($Bill['time_from']).' - '.HumanDate($Bill['time_to']).'<br>'.

devel/www/finance/clenove.php

@@ -13 +13 @@
     global $Tarify;
 
-    if($this->System->Modules['User']->CheckPermission('Finance', 'UserList'))
+    if($this->System->Modules['User']->CheckPermission('Finance', 'SubjectList'))
     {
       // Seznam členů

devel/www/finance/index.php

@@ -16 +16 @@
     $Output .= '<table><tr><td width="30%">';
     $Output .= '<a href="zarizeni.php">Výpis zařízení</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Finance', 'UserList')) $Output .= '<a href="clenove.php">Seznam členů</a><br />';
+    if($this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) $Output .= '<a href="clenove.php">Seznam členů</a><br />';
     $Output .= '<a href="spotreba.php">Spotřeba energie</a><br />';
     $Output .= '<a href="'.$Config['Web']['RootFolder'].'/aktuality/index.php?category=9">Investice v síti</a><br />';

devel/www/finance/user_state.php

@@ -14 +14 @@
     global $Tarify, $Sprava;
 
-    if(!$this->System->Modules['User']->CheckPermission('Finance', 'UserState')) return('Nemáte oprávnění');
+    if(!$this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) return('Nemáte oprávnění');
 
     $UserId = $this->System->Modules['User']->User['Id'];
@@ -25 +25 @@
     // Tabulka operaci
     $Output .= 'Výpis operací pro účastníka '.$Row2['fullname'].':<br>';
-    $Output .= '<table style="font-size: smaller;" border="1" cellspacing="0" cellpadding="3"><tr><th>Datum</th><th>Popis</th><th>Doklad</th><th>Komentář</th></tr>';
+    $Output .= '<table style="font-size: smaller;" border="1" cellspacing="0" cellpadding="3"><tr><th>Datum</th><th>Popis</th><th>Částka</th><th>Doklad</th></tr>';
     $Operations = array();
     $DbResult = $this->Database->query('(SELECT Time, Value, Text, Bill FROM FinanceCashFlow WHERE Subject='.$UserId.') UNION ALL '.
-      '(SELECT TimeCreation as Time, (-Value) as Value, Text, Bill FROM FinanceClaimsLiabilities WHERE Subject='.$UserId.') ORDER BY Time DESC');
+      '(SELECT TimeCreation as Time, -Value as Value, Text, Bill FROM FinanceClaimsLiabilities WHERE Subject='.$UserId.') ORDER BY Time DESC');
     while($DbRow = $DbResult->fetch_array())
       $Operations[] = $DbRow;
     foreach($Operations as $Row)
     {
+      if($Row['Value'] == -0) $Row['Value'] = 0;
       if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
-      if($Row['Bill'] > 0) $Invoice = '<a href="?show=bill&amp;id='.$Row['Bill'].'">PDF</a>'; else $Invoice = '&nbsp;';
-      $Output .= '<tr><td align="right">'.HumanDate($Row['Time']).'</td><td>'.$Row['Text'].'</td><td>'.$Row['Value'].'</td><td>'.$Invoice.'</td></tr>';
+      if($Row['Bill'] > 0) $Invoice = '<a href="bill.php?Id='.$Row['Bill'].'">PDF</a>'; else $Invoice = '&nbsp;';
+      $Output .= '<tr><td align="right">'.HumanDate($Row['Time']).'</td><td>'.$Row['Text'].'</td><td style="text-align: right;">'.$Row['Value'].'</td><td style="text-align: center;">'.$Invoice.'</td></tr>';
     }
     //echo('<tr><td>&nbsp;</td><td>-'.$Row2['network_device'].'</td><td>Proměnná cena za zařízení</td></tr>

devel/www/index.php

@@ -41 +41 @@
     'search' => array('Vyhledávání',
       array('Google', 'http://www.google.cz/', 'www_google_com.gif'),
-      array('Morfeo', 'http://morfeo.centrum.cz', 'morfeo.png'),
-      array('Centrum', 'http://www.centrum.cz', 'www_centrum_cz.gif'),
-      array('Seznam', 'http://www.seznam.cz', 'www_seznam_cz.gif'),
-      array('Atlas', 'http://www.atlas.cz', 'www_atlas_cz.gif'),
-      array('Tiscali', 'http://www.tiscali.cz', 'www_tiscali_cz.gif'),
+      array('Morfeo', 'http://morfeo.centrum.cz/', 'morfeo.png'),
+      array('Centrum', 'http://www.centrum.cz/', 'www_centrum_cz.gif'),
+      array('Seznam', 'http://www.seznam.cz/', 'www_seznam_cz.gif'),
+      array('Atlas', 'http://www.atlas.cz/', 'www_atlas_cz.gif'),
+      array('Tiscali', 'http://www.tiscali.cz/', 'www_tiscali_cz.gif'),
     ),
     'usefull' => array('Užitečné',
@@ -115 +115 @@
     //$Output .= 'Server běží: '.$this->GetServerUptime().'      ';
 
-    if($this->System->Modules['User']->CheckPermission('Finance', 'UserState'))
+    if($this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState'))
     {
       $DbResult = $this->Database->select('users', 'cash', 'User='.$this->System->Modules['User']->User['Id']);

devel/www/is/restart.php

@@ -12 +12 @@
   function Show()
   {
-    if(!$this->System->Modules['User']->CheckPermission('Network', 'RestartService')) return('Nemáte oprávnění');
+    if(!$this->System->Modules['User']->CheckPermission('Network', 'Administration')) return('Nemáte oprávnění');
 
     if(array_key_exists('set', $_POST))

devel/www/network/dostupnost.php

@@ -16 +16 @@
     $Output .= '<br /><table style="font-size: small;" cellspacing="0" cellpadding="3" border="1">';
     $Output .= '<tr><th>Jméno</th><th>Hodina [%]</th><th>Den [%]</th><th>Týden [%]</th><th>Měsíc [%]</th><th>Year [%]</th></tr>';
-    $DbResult = $this->Database->query('SELECT hosts.name, PeriodHour.Percent as Hour, PeriodDay.Percent as Day, PeriodWeek.Percent as Week, PeriodMonth.Percent as Month, PeriodYear.Percent as Year FROM hosts LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 1 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 1 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodHour ON PeriodHour.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodDay ON PeriodDay.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 7 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 7 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodWeek ON PeriodWeek.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 30 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 30 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodMonth ON PeriodMonth.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 365 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 365 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodYear ON PeriodYear.host_id=hosts.id WHERE hosts.used=1 AND hosts.show_online=0');
+    $DbResult = $this->Database->query('SELECT hosts.name, PeriodHour.Percent as Hour, PeriodDay.Percent as Day, PeriodWeek.Percent as Week, PeriodMonth.Percent as Month, PeriodYear.Percent as Year FROM hosts LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 1 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 1 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodHour ON PeriodHour.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodDay ON PeriodDay.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 7 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 7 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodWeek ON PeriodWeek.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 30 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 30 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodMonth ON PeriodMonth.host_id=hosts.id LEFT JOIN (SELECT stat_hosts.host_id, (SUM(stat_hosts.count) / 24 / 365 / 60 * 100) as Percent FROM stat_hosts WHERE (time > DATE_SUB(DATE_SUB(NOW(), INTERVAL 1 HOUR), INTERVAL 24 * 365 HOUR)) AND (time< DATE_SUB(NOW(), INTERVAL 1 HOUR)) GROUP BY host_id) as PeriodYear ON PeriodYear.host_id=hosts.id WHERE hosts.used=1 AND hosts.show_online=0 GROUP BY hosts.IP ORDER BY name');
     echo($this->Database->error);
     while($Row = $DbResult->fetch_array())

devel/www/page.php

@@ -22 +22 @@
     'map' => array('',
       'index.php' => 'Mapa',
+    ),
+    'network' => array('',
+      'dostupnost.php' => 'Dostupnost zařízení',
     ),
     'nabidky_pripojeni.php' => 'Nabídky připojení',

devel/www/temp/transform.php

@@ -129 +129 @@
     $Output = '';
 
-    // Init User table from users
+    // Clear previous content
+    $this->Database->query('TRUNCATE TABLE PermissionOperation');
+    $this->Database->query('TRUNCATE TABLE PermissionGroup');
+    $this->Database->query('TRUNCATE TABLE PermissionGroupAssignment');
+    $this->Database->query('TRUNCATE TABLE PermissionUserAssignment');
     $this->Database->query('TRUNCATE TABLE User');
     $this->Database->query('TRUNCATE TABLE Subject');
 
+    // Init permission groups
+    $this->Database->insert('PermissionGroup', array('Description' => 'Ostatní'));
+    $PermissionGroupOthers = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroup', array('Description' => 'Členové sítě'));
+    $PermissionGroupMembers = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupMembers, 'GroupOrOperation' => $PermissionGroupOthers, 'Type' => 'Group'));
+echo($this->Database->LastQuery);
+    $this->Database->insert('PermissionGroup', array('Description' => 'Zástupci za domácnost'));
+    $PermissionGroupSubjects = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupSubjects, 'GroupOrOperation' => $PermissionGroupMembers, 'Type' => 'Group'));
+$this->Database->insert('PermissionGroup', array('Description' => 'Správci sítě'));
+    $PermissionGroupNetworkAdmins = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupNetworkAdmins, 'GroupOrOperation' => $PermissionGroupSubjects, 'Type' => 'Group'));
+    $this->Database->insert('PermissionGroup', array('Description' => 'Systémoví administrátoři'));
+    $PermissionGroupAdmin = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupAdmin, 'GroupOrOperation' => $PermissionGroupNetworkAdmins, 'Type' => 'Group'));
+
+    // Init permission operations
+    $this->Database->insert('PermissionOperation', array('Module' => 'News', 'Operation' => 'Display', 'Item' => 'Item'));
+    $OperationId = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupOthers, 'GroupOrOperation' => $OperationId, 'Type' => 'Operation'));
+
+    $DbResult = $this->Database->select('news_category', 'id, permission');
+    while($DbRow = $DbResult->fetch_array())
+    {
+      $this->Database->insert('PermissionOperation', array('Module' => 'News', 'Operation' => 'Insert', 'Item' => 'Group', 'ItemId' => $DbRow['id']));
+      $OperationIdInsert = $this->Database->insert_id;
+      $this->Database->insert('PermissionOperation', array('Module' => 'News', 'Operation' => 'Display', 'Item' => 'Group', 'ItemId' => $DbRow['id']));
+      $OperationIdDisplay = $this->Database->insert_id;
+      $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupOthers, 'GroupOrOperation' => $OperationIdDisplay, 'Type' => 'Operation'));
+      if($DbRow['permission'] == 1)
+      {
+        $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupNetworkAdmins, 'GroupOrOoperation' => $OperationIdInsert, 'Type' => 'Operation'));
+      } else
+      {
+        $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupOthers, 'GroupOrOperation' => $OperationIdInsert, 'Type' => 'Operation'));
+      }
+    }
+
+    $this->Database->insert('PermissionOperation', array('Module' => 'Chat', 'Operation' => 'Display'));
+    $OperationId = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupOthers, 'GroupOrOperation' => $OperationId, 'Type' => 'Operation'));
+
+    $this->Database->insert('PermissionOperation', array('Module' => 'Share', 'Operation' => 'Display'));
+    $OperationId = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupMembers, 'GroupOrOperation' => $OperationId, 'Type' => 'Operation'));
+
+    $this->Database->insert('PermissionOperation', array('Module' => 'Finance', 'Operation' => 'DisplaySubjectState'));
+    $OperationId = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupSubjects, 'GroupOrOperation' => $OperationId, 'Type' => 'Operation'));
+
+    $this->Database->insert('PermissionOperation', array('Module' => 'EatingPlace', 'Operation' => 'Edit'));
+    $OperationId = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupMembers, 'GroupOrOperation' => $OperationId, 'Type' => 'Operation'));
+
+    $this->Database->insert('PermissionOperation', array('Module' => 'Finance', 'Operation' => 'Manage'));
+    $OperationId = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupNetworkAdmins, 'GroupOrOperation' => $OperationId, 'Type' => 'Operation'));
+
+    $this->Database->insert('PermissionOperation', array('Module' => 'Network', 'Operation' => 'Edit'));
+    $OperationId = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupNetworkAdmins, 'GroupOrOperation' => $OperationId, 'Type' => 'Operation'));
+
+    $this->Database->insert('PermissionOperation', array('Module' => 'Finance', 'Operation' => 'SubjectList'));
+    $OperationId = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupNetworkAdmins, 'GroupOrOperation' => $OperationId, 'Type' => 'Operation'));
+
+    $this->Database->insert('PermissionOperation', array('Module' => 'Log', 'Operation' => 'Show'));
+    $OperationId = $this->Database->insert_id;
+    $this->Database->insert('PermissionGroupAssignment', array('Group' => $PermissionGroupNetworkAdmins, 'GroupOrOperation' => $OperationId, 'Type' => 'Operation'));
+
+    // Init User table from users
     $DbResult = $this->Database->select('users', '*');
     while($DbRow = $DbResult->fetch_array())
     {
       $this->Database->insert('User', array('Id' => $DbRow['id'], 'Name' => $DbRow['nick'], 'FirstName' => $DbRow['first_name'], 'SecondName' => $DbRow['second_name'], 'PhoneNumber' => $DbRow['phone'], 'Password' => substr(sha1(strtoupper($DbRow['nick'])), 0, 7), 'ICQ' => $DbRow['icq'], 'Email' => $DbRow['email'], 'Locked' => 0));
+      $UserId = $this->Database->insert_id;
+      if($DbRow['id'] == 1) 
+      {
+        $this->Database->insert('PermissionUserAssignment', array('User' => $UserId, 'GroupOrOperation' => $PermissionGroupAdmin, 'Type' => 'Group'));
+      } else
       if($DbRow['role'] == 2)
       {
         $this->Database->insert('Subject', array('Id' => $DbRow['id'], 'Name' => $DbRow['subject_name'], 'AddressStreet' => $DbRow['street'], 'AddressTown' => $DbRow['town'], 'AddressPSC' => $DbRow['psc'], 'IC' => $DbRow['ico'], 'DIC' => $DbRow['dic'], 'FamilyMemberCount' => $DbRow['family'], 'MapPositionX' => $DbRow['PositionX'], 'MapPositionY' => $DbRow['PositionY'], 'NetworkSegment' => $DbRow['network_segment'], 'InternetTariffCurrentMonth' => $DbRow['inet_tarif_now'], 'InternetTariffNextMonth' => $DbRow['inet_tarif_next'], 'MembershipDate' => $DbRow['membership_date']));
-      }
+        $this->Database->insert('PermissionUserAssignment', array('User' => $UserId, 'GroupOrOperation' => $PermissionGroupSubjects, 'Type' => 'Group'));
+      } else
+        $this->Database->insert('PermissionUserAssignment', array('User' => $UserId, 'GroupOrOperation' => $PermissionGroupMembers, 'Type' => 'Group'));
     }
 
+    // Insert anonymous user
     $this->Database->insert('User', array('Name' => 'Anonym', 'Password' => 'dsafafdfadfs', 'Locked' => 0));
-    $Output .=  $this->Database->insert_id;
-
+    $Output .=  'Anonymní uživatel: '.$this->Database->insert_id.'</ br>';
+    $AnonymousUserId = $this->Database->insert_id;
+    $this->Database->insert('PermissionUserAssignment', array('User' => $AnonymousUserId, 'GroupOrOperation' => $PermissionGroupOthers, 'Type' => 'Group'));
+
+    // Init subjects open time
     $this->SubjectOpenTime();
 
@@ -151 +238 @@
     //$this->Database->query('TRUNCATE TABLE ChatHistory');
     //$this->Database->query('INSERT INTO ChatHistory (SELECT id as Id, nick as Nick, text as Text, time as Time, color as Color, roomname as RoomName, roomtype as RoomType, "" as Host FROM `sunrisechat_history`)');
+
+
     return($Output);
   }

devel/www/user.php

@@ -91 +91 @@
         else
         {
-          $this->Database->insert('User', array('Name' => $Nick, 'FirstName' => $FirstName, 'SecondName' => $SecondName, 'Password' => sha1($Password), 'Email' => $Email, 'RegistrationTime' => 'NOW()'));
+          $this->Database->insert('User', array('Name' => $Nick, 'FirstName' => $FirstName, 'SecondName' => $SecondName, 'Password' => sha1($Password), 'Email' => $Email, 'RegistrationTime' => 'NOW()', 'Locked' => 1));
           $UserId = $this->Database->insert_id;
           
@@ -251 +251 @@
       if(($NewPassword == $NewPassword2) and ($Hash == $Row['Password']))
       {
-        $this->Database->update('User', 'Id='.$Row['Id'], array('Password' => sha1($NewPassword)));
+        $this->Database->update('User', 'Id='.$Row['Id'], array('Password' => sha1($NewPassword), 'Locked' => 0));
         $Output = USER_PASSWORD_RECOVERY_CONFIRMED;
         $this->System->Modules['Log']->NewRecord('User', 'PasswordRecoveryConfirm', 'Username='.$Row['Name']);