Changeset 563 for trunk

Timestamp:

Aug 14, 2013, 12:08:56 AM (11 years ago)

Author:

chronos

Message:

• Fixed: On user profile show last translated texts and exports for displayed user instead of logged user.
• Modified: Show time of last user appearence on profile page.

Location:

trunk

Files:

• Modules/User/Profile.php (modified) (3 diffs)
• Modules/User/User.php (modified) (1 diff)
• action.php (modified) (2 diffs)
• includes/Page.php (modified) (3 diffs)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (1 diff)

trunk/Modules/User/Profile.php

@@ -30 +30 @@
         {
                 $Output = '';
-                $Filter = ' WHERE `Export`.`User` = '.$this->System->User->Id;
+                $Filter = ' WHERE `Export`.`User` = '.($_GET['user'] * 1);
                 $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` '.$Filter);
                 $DbRow = $DbResult->fetch_row();
@@ -86 +86 @@
                                 'WHERE (`T`.`Complete` = 1) AND '.
                                 '(`T`.`Language` != '.$this->System->Config['OriginalLanguage'].') AND '.
-                                '(`T`.`User` = '.$this->System->User->Id.') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
+                                '(`T`.`User` = '.($_GET['user'] * 1).') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
                                 $Count.') AS `T`';
                 }
@@ -130 +130 @@
                 'Výchozí jazyk: <strong>'.$UserLine['LanguageName'].'</strong><br />'.
                 'Výchozí verze klienta: <strong>'.$UserLine['Version'].'</strong><br />'.
-                'Poslední připojení: <strong>'.$UserLine['LastLogin'].'</strong><br />'.
+                'Poslední připojení: <strong>'.HumanDateTime($UserLine['LastLogin']).'</strong><br />'.
                 'Počet přeložených: <a href="TranslationList.php?user='.$UserLine['ID'].'&amp;state=2&group=0" title="Zobrazit Všechny jeho přeložené texty"><strong>'.$UserLine['TranslatedCount'].'</strong></a><br />';
                 if($UserLine['TeamName'] != '')

trunk/Modules/User/User.php

@@ -34 +34 @@
     ), 0);
         }
+        
+        function ShowOnlineList()
+        {
+                $Output = 'Online překladatelé:<br />';
+                $DbResult = $this->System->Database->query('SELECT `Name`, `GM`, `User`.`ID` AS `ID` FROM `User` '.
+                                'LEFT JOIN `UserTrace` ON `UserTrace`.`User` = `User`.`Id` '.
+                                'WHERE (`LastLogin` >= NOW() - 300) AND ((`LastLogout` < `LastLogin`) OR (ISNULL(`LastLogout`)))');
+                while($DbUser = $DbResult->fetch_assoc())
+                {
+                        $Name = '<a href="'.$this->System->Link('/user.php?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
+                        $Output .= '<strong>'.$Name.'</strong><br />';
+                }
+                return($Output);
+        }       
 }
 

trunk/action.php

@@ -184 +184 @@
 }
 
-
 if(array_key_exists('group', $_GET)) $GroupId = LoadGroupIdParameter();
   else $GroupId = 1;
@@ -191 +190 @@
 if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
 
-else if($Action == 'search') $Output = Search();
+if($Action == 'search') $Output = Search();
 else if($Action == 'dbkit') $Output = DatabaseKit();
 else $Output = ShowMessage('Nebyla zadána žádná akce.', MESSAGE_CRITICAL);

trunk/includes/Page.php

@@ -3 +3 @@
 function ShowTopBar()
 {
-  global $Config, $System, $User, $System;
+  global $Config, $System, $User;
   
   $Output = '<div class="Menu">';
@@ -125 +125 @@
 }
 
-function ShowOnlineUserList()
-{
-  global $System, $Moderators, $User;
-  
-  $Output = 'Online překladatelé:<br />';
-  $DbResult = $System->Database->query('SELECT `Name`, `GM`, `User`.`ID` AS `ID` FROM `User` '.
-    'LEFT JOIN `UserTrace` ON `UserTrace`.`User` = `User`.`Id` '.
-    'WHERE (`LastLogin` >= NOW() - 300) AND ((`LastLogout` < `LastLogin`) OR (ISNULL(`LastLogout`)))');
-  while($DbUser = $DbResult->fetch_assoc())
-  {
-    $Name = '<a href="'.$System->Link('/user.php?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
-    $Output .= '<strong>'.$Name.'</strong><br />';
-  }
-  return($Output);
-}
-
 function ShowHeader()
 {
-  global $User, $RSSChannels, $System;  
+  global $User, $System;  
   
   $Output = '<?xml version="1.0" encoding="'.$System->Config['Web']['Charset'].'"?>
@@ -168 +152 @@
   $Output .= '<table class="page"><tr><td class="menu">';
   $Output .= ShowMainMenu();
-  $Output .= ShowOnlineUserList();
+  $Output .= $System->ModuleManager->Modules['User']->ShowOnlineList();
   $Output .= '<br />';
   $Output .= ShowSearchBox();

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 562; // Subversion revision
+$Revision = 563; // Subversion revision
 $DatabaseRevision = 543; // Database structure revision 
 $ReleaseTime = '2013-08-13';

trunk/includes/global.php

@@ -356 +356 @@
 }
 
+function HumanDateTime($SQLDateTime)
+{
+  $DateTimeParts = explode(' ', $SQLDateTime);
+  if($DateTimeParts[0] != '0000-00-00')
+  {
+    $DateParts = explode('-', $DateTimeParts[0]);
+    $Output = ($DateParts[2] * 1).'.'.($DateParts[1] * 1).'.'.($DateParts[0] * 1);
+  } else $Output = ' ';
+  if(count($DateTimeParts) > 1)
+  if($DateTimeParts[1] != '00:00:00')
+  {
+    $TimeParts = explode(':', $DateTimeParts[1]);
+    $Output .= ' '.($TimeParts[0] * 1).':'.($TimeParts[1] * 1).':'.($TimeParts[2] * 1);
+  };
+  return($Output);
+}
+
 function FollowingTran($TextID, $Table, $GroupId, $Prev = false) 
 {