Changeset 501 for trunk/Modules/Portal

Timestamp:

Mar 10, 2013, 8:15:46 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: FormManager pro objektové řešení zrušení vazeb na třídu System. FormManager nyní obsluhuje existující formulářové typy a třídy formulářů.
• Přidáno: Formulářový typ FileContent zajistí načtení obsahu souboru. Typ File pak zajistí i uložení do databáze a přiřazení Id do tabulky File.
• Odstraněno: Adresář docs obsahoval staré dokumenty. Ty musí být přesunuty do adresáře files a registrovány do databáze.
• Upraveno: Třídy Database nyní bude hlásit chyby přes výjimky PHP.

File:

• trunk/Modules/Portal/Portal.php (modified) (15 diffs)

trunk/Modules/Portal/Portal.php

@@ -1 +1 @@
 <?php
 
-include_once('Common/Global.php');
+include_once(dirname(__FILE__).'/../../Common/Global.php');
 
 class PagePortal extends Page
@@ -45 +45 @@
     $TotalUser = $DbRow[0];
 
-    $DbResult = $this->Database->query('SELECT COUNT(DISTINCT(Member)) FROM NetworkDevice LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDeviceType.ShowOnline = 1 AND NetworkDevice.Online = 1');
+    $DbResult = $this->Database->query('SELECT COUNT(DISTINCT(Member)) FROM NetworkDevice '.
+      'LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type '.
+      'WHERE NetworkDeviceType.ShowOnline = 1 AND NetworkDevice.Online = 1');
     $DbRow = $DbResult->fetch_array();
     $OnlineUser = $DbRow[0];
@@ -132 +134 @@
   function Show()
   {
-    global $Database, $Config, $User;
+    global $Config, $User;
 
     $Output = '';
@@ -143 +145 @@
       if($_GET['Action'] == 'LoginForm')
       {
-        $Form = new Form('UserLogin');
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('UserLogin');
         $Form->OnSubmit = '?Action=Login';
         $Output .= $Form->ShowEditForm();
@@ -153 +156 @@
         if(array_key_exists('Username', $_POST) and array_key_exists('Password', $_POST))
         {
-        $Form = new Form('UserLogin');
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('UserLogin');
         $Form->OnSubmit = '?Action=Login';
         $Result = $this->System->Modules['User']->Login($_POST['Username'], $_POST['Password']);
@@ -178 +182 @@
         if($this->System->Modules['User']->User['Id'] != null)
         {
-          $UserOptions = new Form('UserOptions');
+          $UserOptions = new Form($this->System->FormManager);
+          $UserOptions->SetClass('UserOptions');
           $UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);
           $UserOptions->OnSubmit = '?Action=UserOptionsSave';
@@ -186 +191 @@
       if($_GET['Action'] == 'UserOptionsSave')
       {
-        $UserOptions = new Form('UserOptions', array());
+        $UserOptions = new Form($this->System->FormManager);
+        $UserOptions->SetClass('UserOptions');
         $UserOptions->LoadValuesFromForm();
         $UserOptions->SaveValuesToDatabase($this->System->Modules['User']->User['Id']);
@@ -197 +203 @@
       if($_GET['Action'] == 'UserRegister')
       {
-        $Form = new Form('UserRegister');
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('UserRegister');
         //$Form->LoadValuesFromForm();
         $Form->OnSubmit = '?Action=UserRegisterSave';
@@ -209 +216 @@
       if($_GET['Action'] == 'PasswordRecovery')
       {
-        $Form = new Form('PasswordRecovery');
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('PasswordRecovery');
         $Form->OnSubmit = '?Action=PasswordRecovery2';
         $Output .= $Form->ShowEditForm();
@@ -215 +223 @@
       if($_GET['Action'] == 'PasswordRecovery2')
       {
-        $Form = new Form('PasswordRecovery');
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('PasswordRecovery');
         $Form->LoadValuesFromForm();
         $Result = $this->System->Modules['User']->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
@@ -230 +239 @@
       if($_GET['Action'] == 'UserRegisterSave')
       {
-        $Form = new Form('UserRegister', array());
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('UserRegister');
         $Form->LoadValuesFromForm();
         $Result = $this->System->Modules['User']->Register($Form->Values['Login'], $Form->Values['Password'], $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name'], $Form->Values['PhoneNumber'], $Form->Values['ICQ']);
@@ -242 +252 @@
       if($_GET['Action'] == 'MemberOptions')
       {
-        $UserOptions = new Form('MemberOptions');
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('MemberOptions');
         $DbResult = $this->Database->query('SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->Modules['User']->User['Id']);
         if($DbResult->num_rows > 0)
@@ -252 +263 @@
            'ON Subject.Id = Member.Subject WHERE Member.Id='.$CustomerUserRel['Customer']);        
           $DbRow = $DbResult->fetch_array();
-          foreach($UserOptions->Definition['Items'] as $Index => $Item)
+          foreach($Form->Definition['Items'] as $Index => $Item)
           {
-            $UserOptions->Values[$Index] = $DbRow[$Index];
+            $Form->Values[$Index] = $DbRow[$Index];
           }
-          $UserOptions->OnSubmit = '?Action=MemberOptionsSave';
-          $Output .= $UserOptions->ShowEditForm();
+          $Form->OnSubmit = '?Action=MemberOptionsSave';
+          $Output .= $Form->ShowEditForm();
         } else $Output .= $this->SystemMessage('Chyba', 'Nejste zákazníkem');
       } 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;
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('MemberOptions');
+        $Form->LoadValuesFromForm();
+        if($Form->Values['FamilyMemberCount'] < 0)
+          $Form->Values['FamilyMemberCount'] = 0;
+        if($Form->Values['BillingPeriodNext'] < 2)
+          $Form->Values['BillingPeriodNext'] = 2;
           
         $DbResult = $this->Database->update('Member', 'Id='.$this->System->Modules['User']->User['Member'], 
-           array('FamilyMemberCount' => $UserOptions->Values['FamilyMemberCount'], 
-           'BillingPeriodNext' => $UserOptions->Values['BillingPeriodNext']));
+           array('FamilyMemberCount' => $Form->Values['FamilyMemberCount'], 
+           'BillingPeriodNext' => $Form->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'], 'AddressCountry' => $UserOptions->Values['AddressCountry'],
-          'AddressPSC' => $UserOptions->Values['AddressPSC'], 'IC' => $UserOptions->Values['IC'], 
+          array('Name' => $Form->Values['Name'], 'AddressStreet' => $Form->Values['AddressStreet'], 
+          'AddressTown' => $Form->Values['AddressTown'], 'AddressCountry' => $Form->Values['AddressCountry'],
+          'AddressPSC' => $Form->Values['AddressPSC'], 'IC' => $Form->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.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
+        $this->System->Modules['Log']->NewRecord('Member+Subject', 'Nastavení člena/subjektu změněno', 
+          $Form->Values['Name']);
+        $DbResult = $this->Database->query('SELECT Member.Id, Member.FamilyMemberCount, Member.BillingPeriodNext, '.
+          'Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, '.
+          'Subject.AddressCountry, 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];
+        foreach($Form->Definition['Items'] as $Index => $Item)
+        {
+          $Form->Values[$Index] = $DbRow[$Index];
         }
-        $UserOptions->OnSubmit = '?Action=MemberOptionsSave';
-        $Output .= $UserOptions->ShowEditForm();
+        $Form->OnSubmit = '?Action=MemberOptionsSave';
+        $Output .= $Form->ShowEditForm();
       }
     }
 
-    $Database->select_db($Config['Database']['Database']);
-
-    $DbResult = $Database->query('SELECT * FROM `HyperlinkGroup`');
+    $this->Database->select_db($Config['Database']['Database']);
+
+    $DbResult = $this->Database->query('SELECT * FROM `HyperlinkGroup`');
     while($DbRow = $DbResult->fetch_assoc())
       $HyperlinkGroups[$DbRow['Id']] = $DbRow;
@@ -302 +318 @@
     //$Output .= $this->InfoBar();
     $Output .= '<table id="MainTable"><tr>';
-    $DbResult = $Database->select('PanelColumn', '*');
+    $DbResult = $this->Database->select('PanelColumn', '*');
     while($PanelColumn =  $DbResult->fetch_assoc())
     {
@@ -308 +324 @@
         else $Width = '';
       $Output .= '<td valign="top"'.$Width.'>';
-      $DbResult2 = $Database->query('SELECT * FROM `Panel` WHERE `PanelColumn`='.$PanelColumn['Id'].' ORDER BY `Order`');
+      $DbResult2 = $this->Database->query('SELECT * FROM `Panel` WHERE `PanelColumn`='.$PanelColumn['Id'].' ORDER BY `Order`');
       while($Panel = $DbResult2->fetch_assoc())
       {