Changeset 524 for trunk/Modules/Portal

Timestamp:

Apr 20, 2013, 8:51:15 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Definice třída User přesunuta do modulu User. Existuje aplikační modul System->ModuleManager->ModulesUser a samotná instance třídy System->User.
• Upraveno: Zbylá inicializace starého modulového systému třídy Module přesunuta do startovní části aplikačních modulů.
• Upraveno: Třída System přesunuta ze souboru Common/Global do samostatného souboru Common/System.

File:

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

trunk/Modules/Portal/Portal.php

@@ -16 +16 @@
       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->Modules['User']->Modules['User']->CheckPermission($HyperLink['PermissionModule'], $HyperLink['PermissionOperation'])))        
+        if(($HyperLink['PermissionModule'] == '') or (($HyperLink['PermissionModule'] != '') and $this->System->User->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 />';
     }
@@ -55 +55 @@
     //$Output .= 'Server běží: '.$this->GetServerUptime().' &nbsp;  &nbsp; ';
 
-    if($this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState'))
-    {
-      $DbResult = $this->Database->select('MemberPayment', 'Cash', 'Member=(SELECT Customer FROM UserCustomerRel WHERE Id='.$this->System->Modules['User']->User['Id'].')');
+    if($this->System->User->CheckPermission('Finance', 'DisplaySubjectState'))
+    {
+      $DbResult = $this->Database->select('MemberPayment', 'Cash', 'Member=(SELECT Customer FROM UserCustomerRel WHERE Id='.$this->System->User->User['Id'].')');
       if($DbResult->num_rows > 0)
       {
@@ -72 +72 @@
   {
     $Output = '<a href="'.$this->System->Link('/?Action=UserOptions').'">Profil</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Finance', 'MemberOptions')) 
+    if($this->System->User->CheckPermission('Finance', 'MemberOptions')) 
       $Output .= '<a href="'.$this->System->Link('/?Action=MemberOptions').'">Domácnost</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) 
+    if($this->System->User->CheckPermission('Finance', 'DisplaySubjectState')) 
       $Output .= '<a href="'.$this->System->Link('/finance/platby/').'">Finance</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Network', 'RegistredHostList')) 
+    if($this->System->User->CheckPermission('Network', 'RegistredHostList')) 
       $Output .= '<a href="'.$this->System->Link('/network/user-hosts/').'">Počítače</a><br />';
-    if($this->System->Modules['User']->CheckPermission('News', 'Insert')) 
+    if($this->System->User->CheckPermission('News', 'Insert')) 
       $Output .= '<a href="'.$this->System->Link('/aktuality/?action=add').'">Vložení aktuality</a><br />';
-    if($this->System->Modules['User']->CheckPermission('EatingPlace', 'Edit'))
+    if($this->System->User->CheckPermission('EatingPlace', 'Edit'))
       $Output .= '<a href="'.$this->System->Link('/jidelna/menuedit.php').'">Úprava jídelníčků</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Finance', 'Manage'))
+    if($this->System->User->CheckPermission('Finance', 'Manage'))
       $Output .= '<a href="'.$this->System->Link('/finance/sprava/').'">Správa financí</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Network', 'Administration'))
+    if($this->System->User->CheckPermission('Network', 'Administration'))
       $Output .= '<a href="'.$this->System->Link('/network/administration/').'">Správa sítě</a><br />';
-    if($this->System->Modules['User']->CheckPermission('IS', 'Manage'))
+    if($this->System->User->CheckPermission('IS', 'Manage'))
       $Output .= '<a href="'.$this->System->Link('/is/').'">Správa dat</a><br />';
     return($Output);
@@ -156 +156 @@
         $Form->SetClass('UserLogin');
         $Form->OnSubmit = '?Action=Login';
-        $Result = $this->System->Modules['User']->Login($_POST['Username'], $_POST['Password']);
+        $Result = $this->System->User->Login($_POST['Username'], $_POST['Password']);
         $Output .= $this->SystemMessage('Přihlášení', $Result);
         if($Result <> USER_LOGGED_IN)
@@ -170 +170 @@
       if($_GET['Action'] == 'Logout')
       {
-        if($this->System->Modules['User']->User['Id'] != null)
-        {
-          $Output .= $this->SystemMessage('Odhlášení', $this->System->Modules['User']->Logout());
+        if($this->System->User->User['Id'] != null)
+        {
+          $Output .= $this->SystemMessage('Odhlášení', $this->System->User->Logout());
         } else $Output .= $this->SystemMessage('Nastavení uživatele', 'Nejste přihlášen');
       } else
       if($_GET['Action'] == 'UserOptions')
       { 
-        if($this->System->Modules['User']->User['Id'] != null)
+        if($this->System->User->User['Id'] != null)
         {
           $UserOptions = new Form($this->System->FormManager);
           $UserOptions->SetClass('UserOptions');
-          $UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);
+          $UserOptions->LoadValuesFromDatabase($this->System->User->User['Id']);
           $UserOptions->OnSubmit = '?Action=UserOptionsSave';
           $Output .= $UserOptions->ShowEditForm();
@@ -191 +191 @@
         $UserOptions->SetClass('UserOptions');
         $UserOptions->LoadValuesFromForm();
-        $UserOptions->SaveValuesToDatabase($this->System->Modules['User']->User['Id']);
+        $UserOptions->SaveValuesToDatabase($this->System->User->User['Id']);
         $Output .= $this->SystemMessage('Nastavení', 'Nastavení uloženo.');
         $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Nastavení uživatele změněno', $UserOptions->Values['Name']);
-        $UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);
+        $UserOptions->LoadValuesFromDatabase($this->System->User->User['Id']);
         $UserOptions->OnSubmit = '?Action=UserOptionsSave';
         $Output .= $UserOptions->ShowEditForm();
@@ -209 +209 @@
       {
         $Output .= $this->SystemMessage('Potvrzení registrace', 
-          $this->System->Modules['User']->RegisterConfirm($_GET['User'], $_GET['H']));
+          $this->System->User->RegisterConfirm($_GET['User'], $_GET['H']));
       } else
       if($_GET['Action'] == 'PasswordRecovery')
@@ -223 +223 @@
         $Form->SetClass('PasswordRecovery');
         $Form->LoadValuesFromForm();
-        $Result = $this->System->Modules['User']->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
+        $Result = $this->System->User->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
         $Output .= $this->SystemMessage('Obnova hesla', $Result);
         if($Result <> USER_PASSWORD_RECOVERY_SUCCESS)
@@ -232 +232 @@
       if($_GET['Action'] == 'PasswordRecoveryConfirm')
       {
-        $Output .= $this->SystemMessage('Obnova hesla', $this->System->Modules['User']->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
+        $Output .= $this->SystemMessage('Obnova hesla', $this->System->User->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
       } else
       if($_GET['Action'] == 'UserRegisterSave')
@@ -239 +239 @@
         $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']);
+        $Result = $this->System->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) 
@@ -251 +251 @@
         $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']);
+        $DbResult = $this->Database->query('SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->User->User['Id']);
         if($DbResult->num_rows > 0)
         {
@@ -278 +278 @@
           $Form->Values['BillingPeriodNext'] = 2;
           
-        $DbResult = $this->Database->update('Member', 'Id='.$this->System->Modules['User']->User['Member'], 
+        $DbResult = $this->Database->update('Member', 'Id='.$this->System->User->User['Member'], 
            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']);
+        $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$this->System->User->User['Member']);
         $Member = $DbResult->fetch_assoc();
         $DbResult = $this->Database->update('Subject', 'Id='.$Member['Subject'], 
@@ -294 +294 @@
           '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']);
+          'ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->User->User['Member']);
         $DbRow = $DbResult->fetch_array();
         foreach($Form->Definition['Items'] as $Index => $Item)
@@ -326 +326 @@
         else if($Panel['Module'] == 'UserOptions') 
         {
-          if($this->System->Modules['User']->User['Id'] != null) $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
+          if($this->System->User->User['Id'] != null) $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
         } else
         if($Panel['Module'] == 'Webcam') $Output .= $this->Panel('Kamery', $this->WebcamPanel());