Changeset 626 for trunk/Modules/User

Timestamp:

Dec 4, 2013, 9:50:16 PM (11 years ago)

Author:

chronos

Message:

• Modified: Search page generalized as dynamic configurable list. Other modules can register their search ability.
• Modified: If sarch is invoked on some module then filter is added to table. Filter have to be disabled to view all items again.
• Added: Shoutbox can be searched.

Location:

trunk/Modules/User

Files:

• User.php (modified) (1 diff)
• UserList.php (modified) (3 diffs)

trunk/Modules/User/User.php

@@ -29 +29 @@
         'Title' => T('Translators'),
         'Hint' => 'Seznam registrovaných uživatelů',
-        'Link' => $this->System->Link('/userlist.php?action=nofilter'),
+        'Link' => $this->System->Link('/userlist.php'),
         'Permission' => LICENCE_ANONYMOUS,
         'Icon' => '',
     ), 0);
+    if(array_key_exists('Search', $this->System->ModuleManager->Modules))
+      $this->System->ModuleManager->Modules['Search']->RegisterSearch('user',
+      T('Translators'), array('Name'), '`User`', $this->System->Link('/userlist.php?search='));
         }
         

trunk/Modules/User/UserList.php

@@ -10 +10 @@
         
                 $Output = '';
-                if(array_key_exists('search', $_GET))
+                if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
+                else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
+                if(array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
+                if($_SESSION['search'] != '')
                 {
-                        $_SESSION['Where'] = ' WHERE `User`.`Name` LIKE "%'.$_GET['search'].'%"';
-                }
+                        $SearchQuery = ' AND (`User`.`Name` LIKE "%'.$_SESSION['search'].'%")';
+                        $Output .= '<div><a href="?search=">'.sprintf(T('Disable filter "%s"'), $_SESSION['search']).'</a></div>';
+                } else $SearchQuery = '';                       
+
+    $TeamFilter = '';
                 if(array_key_exists('team', $_GET))
                 {
@@ -20 +26 @@
                         {
                                 $Team = $DbResult->fetch_assoc();
-                                $Output .= '<h3>Seznam uživatelů v týmu '.$Team['Name'].'</h3>';
-                                $_SESSION['Where'] = ' WHERE `Team`='.$_GET['team'];
-                                if($_GET['team'] == '') $_SESSION['Where'] = '';
+                                $Output .= '<h3>'.sprintf(T('Users in team %s'), $Team['Name']).'</h3>';
+                                $TeamFilter = ' AND (`Team`='.$_GET['team'].')';
                         } else {
-                  $Output .= ShowMessage('Tým '.$_GET['team'].' nenalezen', MESSAGE_CRITICAL);
-                  $_SESSION['Where'] = ' WHERE FALSE';
+                  $Output .= ShowMessage('Tým '.$_GET['team'].' nenalezen', MESSAGE_CRITICAL);
                         }
                 } else
                 {
-                        $Output .= '<h3>Seznam uživatelů</h3>';
-                        if(!array_key_exists('Where', $_SESSION)) $_SESSION['Where'] = '';
+                        $Output .= '<h3>'.T('User list').'</h3>';
                 }
         
-                if(array_key_exists('action', $_GET))
-                {
-                        if($_GET['action'] == 'nofilter') $_SESSION['Where'] = '';
-                }
-                //if($_SESSION['Where'] <> '') $Output .= ' <a href="?action=nofilter">Zrušit filtr uživatelů</a><br />';
-        
-                $DbResult = $this->Database->query('SELECT COUNT(*) FROM `User`'.$_SESSION['Where']);
+                $DbResult = $this->Database->query('SELECT COUNT(*) FROM `User` WHERE 1'.$SearchQuery.$TeamFilter);
                 $DbRow = $DbResult->fetch_row();
                 $PageList = GetPageList($DbRow[0]);
@@ -56 +53 @@
                 );
                 $Order = GetOrderTableHeader($TableColumns, 'TranslatedCount', 1);
-                $Output .= $Order['Output'];
-        
+                $Output .= $Order['Output'];    
         
                 $Query = 'SELECT `User`.`ID`, `User`.`Name`, `LastLogin`, `GM`, `XP`, `TranslatedCount`, `RegistrationTime` '.
                                 'FROM `User` '.
                                 'LEFT JOIN `UserTrace` ON `UserTrace`.`User` = `User`.`Id` '.
-                                $_SESSION['Where'].$Order['SQL'].$PageList['SQLLimit'];
+                                'WHERE 1'.$SearchQuery.$TeamFilter.$Order['SQL'].$PageList['SQLLimit'];
         
                 $DbResult = $this->Database->query($Query);