Changeset 626 for trunk/Modules/Team

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.

File:

• trunk/Modules/Team/Team.php (modified) (3 diffs)

trunk/Modules/Team/Team.php

@@ -20 +20 @@
       'Title' => T('Teams'),
       'Hint' => T('List of translating teams'), 
-      'Link' => $this->System->Link('/team/?search='),
+      'Link' => $this->System->Link('/team/'),
       'Permission' => LICENCE_ANONYMOUS, 
       'Icon' => '', 
     ), 1);
+    if(array_key_exists('Search', $this->System->ModuleManager->Modules))
+      $this->System->ModuleManager->Modules['Search']->RegisterSearch('team',
+      T('Teams'), array('Name'), '`Team`', $this->System->Link('/team/?search='));
   }
 }
@@ -36 +39 @@
                 $Output .= 'Týmy jsou seskupení překladatelů, kteří se hlásí k něčemu společnému jako např. WoW serveru, způsobu překladu, ke stejnému hernímu spolku, aj. Být členem týmu samo o sobě nemá žádný zásadní důsledek a spíše to může pomoci se lépe orientovat mezi překladateli někomu, kdo sestavuje export.<br/>';
 
-    if($this->System->User->Licence(LICENCE_USER))
+    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($this->System->User->Licence(LICENCE_USER))
                   $Output .= '<br /><div style="text-align: center;"><a href="?action=create">'.T('Create translating team').'</a></div><br/>';
+                if($_SESSION['search'] != '')
+                {
+                        $SearchQuery = ' AND ((`Name` LIKE "%'.$_SESSION['search'].'%") OR (`Description` LIKE "%'.$_SESSION['search'].'%"))'; 
+                        $Output .= '<div><a href="?search=">'.sprintf(T('Disable filter "%s"'), $_SESSION['search']).'</a></div>';
+                } else $SearchQuery = '';               
                 
-          $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team`');
+          $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE 1'.$SearchQuery);
                 $DbRow = $DbResult->fetch_row();
                 $PageList = GetPageList($DbRow[0]);
@@ -56 +68 @@
         
                 $Order = GetOrderTableHeader($TableColumns, 'NumberUser', 1);
-                $Output .= $Order['Output'];
-        
-                if(array_key_exists('search', $_GET)) $_SESSION['search'] = ' WHERE `Name` LIKE "%'.$_GET['search'].'%" OR `Description` LIKE "%'.$_GET['search'].'%"';
-                else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
-                if (array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
+                $Output .= $Order['Output'];    
         
                 $DbResult = $this->Database->query('SELECT *, (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) AS `NumberUser`, '.
                         '(SELECT `Name` FROM `User` WHERE `User`.`ID`=`Team`.`Leader`) AS `LeaderName` '.
-                        'FROM `Team` '.$_SESSION['search'].$Order['SQL'].$PageList['SQLLimit']);
+                        'FROM `Team` WHERE 1'.$SearchQuery.$Order['SQL'].$PageList['SQLLimit']);
                 while($Team = $DbResult->fetch_assoc())
                 {