Changeset 893 for trunk/Modules/User/Profile.php

Timestamp:

Mar 6, 2023, 1:48:45 AM (22 months ago)

Author:

chronos

Message:

• Fixed: Class types casting for better type checking.
• Fixed: XML direct export.
• Modified: User class instance moved from Core class to ModuleUser class.

File:

• trunk/Modules/User/Profile.php (modified) (8 diffs)

trunk/Modules/User/Profile.php

@@ -5 +5 @@
   function SendMail()
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $Output = '';
     if (array_key_exists('text', $_POST))
-    if ($this->System->User->Licence(LICENCE_ADMIN))
+    if ($User->Licence(LICENCE_ADMIN))
     {
       $Text = $_POST['text'];
@@ -16 +17 @@
         'Text: <strong>'.$Text.'</strong><br />';
 
-      if (@mail($Email, $Subject, $Text, 'From: '.$this->System->Config['Web']['AdminEmail'].
-        '\nReply-To: '.$this->System->Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
+      if (@mail($Email, $Subject, $Text, 'From: '.Core::Cast($this->System)->Config['Web']['AdminEmail'].
+        '\nReply-To: '.Core::Cast($this->System)->Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
       {
         $Output .= ShowMessage(T('Message was sent'));
@@ -29 +30 @@
   {
     $Output = '';
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $Filter = ' WHERE `Export`.`User` = '.($_GET['user'] * 1);
     $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` '.$Filter);
@@ -61 +63 @@
       $Action = '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=0').'">'.T('Show').'</a> '.
         '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=7').'">'.T('Export').'</a>';
-      if ($Export['User'] == $this->System->User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Really remove item?').'\');">'.T('Remove').'</a>';
-      if ($this->System->User->Id != null) $Action .= ' <a href="'.$this->System->Link('/export/?Action=Clone&amp;ExportId='.$Export['Id']).'" onclick="return confirmAction(\''.T('Really clone item?').'\');">'.T('Clone').'</a>';
+      if ($Export['User'] == $User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Really remove item?').'\');">'.T('Remove').'</a>';
+      if ($User->Id != null) $Action .= ' <a href="'.$this->System->Link('/export/?Action=Clone&amp;ExportId='.$Export['Id']).'" onclick="return confirmAction(\''.T('Really clone item?').'\');">'.T('Clone').'</a>';
       $Output .= '<tr><td>'.HumanDate($Export['TimeCreate']).'</td>'.
         '<td>'.htmlspecialchars($Export['Title']).'</td>'.
@@ -95 +97 @@
           $DbRow['TablePrefix'].'` AS `T` '.
           'WHERE (`T`.`Complete` = 1) AND '.
-          '(`T`.`Language` != '.$this->System->Config['OriginalLanguage'].') AND '.
+          '(`T`.`Language` != '.Core::Cast($this->System)->Config['OriginalLanguage'].') AND '.
           '(`T`.`User` = '.($_GET['user'] * 1).') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
           $Count.') AS `T`';
@@ -139 +141 @@
   {
     $Output = '';
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $Query = 'SELECT `User`.`Name`, `UserTrace`.`LastLogin`, `UserTrace`.`LastIP`, '.
       '`User`.`Email`, `UserTrace`.`UserAgent`, `User`.`PreferredVersion`, '.
@@ -190 +193 @@
         '</tr></table>';
       $Output .= '<br />'.$this->ShowLastForum().'<br />';
-      if ($this->System->User->Licence(LICENCE_MODERATOR))
+      if ($User->Licence(LICENCE_MODERATOR))
       {
         $Output .= '<fieldset><legend>Moderování</legend>';
@@ -239 +242 @@
           '<input type="text" name="email" value="'.$UserLine['Email'].'" /><br/>'.
           'Předmět:'.
-          '<input type="text" name="subject" value="'.$this->System->Config['Web']['Title'].'" />'.
+          '<input type="text" name="subject" value="'.Core::Cast($this->System)->Config['Web']['Title'].'" />'.
           '<br />'.
           '<textarea name="text" rows="20" cols="62">'.
           ''."\n".
-          'S pozdravem '.$this->System->User->Name."\n".
+          'S pozdravem '.$User->Name."\n".
           '--------------------------------------------------------'."\n".
-          $this->System->Config['Web']['Title'].' '.$this->System->Config['Web']['Host'].$this->System->Link('/')."\n".
+          Core::Cast($this->System)->Config['Web']['Title'].' '.Core::Cast($this->System)->Config['Web']['Host'].$this->System->Link('/')."\n".
           '</textarea><br/>'.
           '<input type="submit" value="Odeslat" />'.