Changeset 577 for trunk/Modules/User

Timestamp:

Sep 11, 2013, 10:37:54 PM (11 years ago)

Author:

chronos

Message:

• Modified: Moved some code from global to system file. System class is now serving as main application class. Now old files which still use ShowPage function need system initialization with $InitSystem = true; before global.php inclusion.
• Modified: Get rid of some global reference to $System, $Config and $User variables.
• Modified: Search result functionality moved to application module from action.php file.

Location:

trunk/Modules/User

Files:

• Options.php (modified) (4 diffs)
• Profile.php (modified) (2 diffs)
• User.php (modified) (2 diffs)
• UserList.php (modified) (1 diff)

trunk/Modules/User/Options.php

@@ -5 +5 @@
         function UserOptionsFrom()
         {
-                global $User;
-        
                 $Output = '<form action="Options.php?action=save" method="post">
                 <fieldset><legend>Nastavení uživatele</legend>
                 <table>
-                <tr><td>Email:</td><td><input type="text" name="Email" value="'.$User->Email.'" /></td></tr>
+                <tr><td>Email:</td><td><input type="text" name="Email" value="'.$this->System->User->Email.'" /></td></tr>
                 <tr><td>Původní heslo:</td><td><input type="password" name="OldPass" /></td></tr>
                 <tr><td>Nové heslo:</td><td><input type="password" name="NewPass" /></td></tr>
                 <tr><td>Nové heslo pro potvrzení: </td><td><input type="password" name="NewPass2" /></td></tr>
-                <tr><td>Normálně budu překládat do: </td><td>'.WriteLanguages($User->Language).'</td></tr>
+                <tr><td>Normálně budu překládat do: </td><td>'.WriteLanguages($this->System->User->Language).'</td></tr>
                 <tr><td>Po uložení překladu přesměrovat: </td><td>';
                 $Output .= '<select name="redirecting">'.
                                 '<option value="0">Nikam</option>'.
                                 '<option value="1"';
-                if($User->Redirecting == '1') $Output .= ' selected="selected"';
+                if($this->System->User->Redirecting == '1') $Output .= ' selected="selected"';
                 $Output .= '>Na nepřeložené</option>';
                 $Output .= '<option value="2"';
-                if($User->Redirecting == '2') $Output .= ' selected="selected"';
+                if($this->System->User->Redirecting == '2') $Output .= ' selected="selected"';
                 $Output .= '>Na další překlad</option>';
                 $Output .= '<option value="3"';
-                if($User->Redirecting == '3') $Output .= ' selected="selected"';
+                if($this->System->User->Redirecting == '3') $Output .= ' selected="selected"';
                 $Output .= '>Na předchozí překlad</option>';
                 $Output .= '</select>';
         
                 $Output .= '</td></tr>'.
-                                '<tr><td>Upřednostněná verze klienta: </td><td>'.ClientVersionSelection($User->PreferredVersion).'</td></tr>'.
+                                '<tr><td>Upřednostněná verze klienta: </td><td>'.ClientVersionSelection($this->System->User->PreferredVersion).'</td></tr>'.
                                 '<tr><td>Veřejný text profilu:</td><td>'.
-                                '<textarea name="info" cols="60" rows="10">'.$User->Info.'</textarea></td></tr>'.
+                                '<textarea name="info" cols="60" rows="10">'.$this->System->User->Info.'</textarea></td></tr>'.
                                 '<tr><td colspan="2"><input type="submit" value="Uložit" /></td></tr>'.
                                 '</table></fieldset>'.
@@ -47 +45 @@
                 {
                         $Output .= '<option value="'.$LineTeam['Id'].'"';
-                        if ($LineTeam['Id'] == $User->Team) $Output .= ' selected="selected"';
+                        if ($LineTeam['Id'] == $this->System->User->Team) $Output .= ' selected="selected"';
                         $Output .= '>'.$LineTeam['Name'].'</option>';
                 }
@@ -58 +56 @@
         function UserOptionsSave()
         {
-                global $User;
-        
                 $Output = '';
                 if(array_key_exists('Email', $_POST))
@@ -78 +74 @@
                                 if($NewPass == $NewPass2)
                                 {
-                                        $DbResult = $System->Database->query('SELECT `Pass`, '.$User->CryptPasswordSQL('"'.$OldPass.'"', '`Salt`').' AS `Hash` FROM `User` WHERE `ID`= '.$User->Id);
+                                        $DbResult = $System->Database->query('SELECT `Pass`, '.$this->System->User->CryptPasswordSQL('"'.$OldPass.'"', '`Salt`').' AS `Hash` FROM `User` WHERE `ID`= '.$this->System->User->Id);
                                         $DbRow = $DbResult->fetch_assoc();
                                         if($DbRow['Hash'] == $DbRow['Pass'])
                                         {
                                                 // Update password
-                                                $Salt = $User->GetPasswordSalt();
-                                                $this->Database->query('UPDATE `User` SET `Pass` = '.$User->CryptPasswordSQL('"'.$NewPass.'"', '"'.$Salt.'"').', `Salt`="'.$Salt.'" WHERE `ID` = '.$User->Id);
+                                                $Salt = $this->System->User->GetPasswordSalt();
+                                                $this->Database->query('UPDATE `User` SET `Pass` = '.$this->System->User->CryptPasswordSQL('"'.$NewPass.'"', '"'.$Salt.'"').', `Salt`="'.$Salt.'" WHERE `ID` = '.$this->System->User->Id);
                                                 $Output .= ShowMessage('Heslo změněno.');
                                         } else $Output .= ShowMessage('Staré heslo neodpovídá.', MESSAGE_CRITICAL);
                                 } else $Output .= ShowMessage('Hesla se neshodují.', MESSAGE_CRITICAL);
                         }
-                        $this->Database->update('User', '`ID` = '.$User->Id, array('Email' => $Email,
-                                        'Language' => $Language, 'Redirecting' => $Redirecting, 'Info' => $Info,
-                                        'PreferredVersion' => $PreferredVersion));
-                        $Output .= ShowMessage('Úprava nastavení proběhla v pořádku, Email: <b>'.$Email.'</b> Uživatel: <b>'.$User->Name.'</b>');
+                        $this->Database->update('User', '`ID` = '.$this->System->User->Id, array('Email' => $Email,
+                          'Language' => $Language, 'Redirecting' => $Redirecting, 'Info' => $Info,
+                          'PreferredVersion' => $PreferredVersion));
+                        $Output .= ShowMessage('Úprava nastavení proběhla v pořádku, Email: <b>'.$Email.'</b> Uživatel: <b>'.$this->System->User->Name.'</b>');
                         WriteLog('Úprava nastavení!', LOG_TYPE_USER);
-                        $User->Load();
+                        $this->System->User->Load();
                 } else $Output .= ShowMessage('Nezadány údaje.', MESSAGE_CRITICAL);
                 return($Output);

trunk/Modules/User/Profile.php

@@ -5 +5 @@
         function SendMail()
         {
-                global $Config, $User;
-        
                 $Output = '';
                 if(array_key_exists('text', $_POST))
-                if($User->Licence(LICENCE_ADMIN))
+                if($this->System->User->Licence(LICENCE_ADMIN))
                 {
                         $Text = $_POST['text'];
@@ -18 +16 @@
                                         'Text: <strong>'.$Text.'</strong><br />';
         
-                        if(@mail($Email, $Subject, $Text, 'From: '.$Config['Web']['AdminEmail'].'\nReply-To: '.$Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
+                        if(@mail($Email, $Subject, $Text, 'From: '.$this->System->Config['Web']['AdminEmail'].'\nReply-To: '.$this->System->Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
                         {
                                 $Output .= ShowMessage('Zpráva byla odeslána.');

trunk/Modules/User/User.php

@@ -21 +21 @@
         function Start()
         {
+                global $User;
+                
                 $this->System->User = new User($this->System);
-                $this->System->RegisterPage('userlist.php', 'PageUserList');
+    $this->System->RegisterPage('userlist.php', 'PageUserList');
                 $this->System->RegisterPage('Options.php', 'PageUserOptions');
                 $this->System->RegisterPage('registrace.php', 'PageUserRegistration');
@@ -87 +89 @@
       $this->Id = $User['ID'];      
       $this->Load();
-      WriteLog('Login: '.$Name, LOG_TYPE_USER);
+      $this->System->ModuleManager->Modules['Log']->WriteLog('Login: '.$Name, LOG_TYPE_USER);
       $this->UpdateState();
     } else $this->Role = LICENCE_ANONYMOUS;

trunk/Modules/User/UserList.php

@@ -1 +1 @@
 <?php
 
-
-include_once('img_level.php');
+include_once(dirname(__FILE__).'/../../img_level.php');
 
 class PageUserList extends Page