Fixed bug #12117: Added use of flash messages to the Extension Manager

[Packages/TYPO3.CMS.git] / typo3 / mod / tools / em / class.em_xmlhandler.php

diff --git a/typo3/mod/tools/em/class.em_xmlhandler.php b/typo3/mod/tools/em/class.em_xmlhandler.php
index 06a90df..2a9404d 100644 (file)
--- a/typo3/mod/tools/em/class.em_xmlhandler.php
+++ b/typo3/mod/tools/em/class.em_xmlhandler.php
@@ -2,7 +2,7 @@
 /* **************************************************************
 *  Copyright notice
 *
-*  (c) 2006-2008 Karsten Dambekalns <karsten@typo3.org>
+*  (c) 2006-2009 Karsten Dambekalns <karsten@typo3.org>
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -59,18 +59,21 @@ class SC_mod_tools_em_xmlhandler {
        /**
         * Reduces the entries in $this->extensionsXML to the latest version per extension and removes entries not matching the search parameter
         *
-        * @param       string          $search The list of extensions is reduced to entries matching this. If empty, the full list is returned.
-        * @param       string          $owner  If set only extensions of that user are fetched
-        * @param       string          $order  A field to order the result by
-        * @param       boolean         $allExt If set also unreviewed and obsolete extensions are shown
-        * @param       boolean         $allVer If set returns all version of an extension, otherwise only the last
-        * @param       integer         $offset Offset to return result from (goes into LIMIT clause)
-        * @param       integer         $limit  Maximum number of entries to return (goes into LIMIT clause)
+        * @param       string          $search     The list of extensions is reduced to entries matching this. If empty, the full list is returned.
+        * @param       string          $owner      If set only extensions of that user are fetched
+        * @param       string          $order      A field to order the result by
+        * @param       boolean         $allExt     If set also unreviewed and obsolete extensions are shown
+        * @param       boolean         $allVer     If set returns all version of an extension, otherwise only the last
+        * @param       integer         $offset     Offset to return result from (goes into LIMIT clause)
+        * @param       integer         $limit      Maximum number of entries to return (goes into LIMIT clause)
+        * @param       boolean         $exactMatch If set search is done for exact matches of extension keys only
         * @return      void
         */
-       function searchExtensionsXML($search, $owner='', $order='', $allExt=false, $allVer=false, $offset=0, $limit=500)        {
+       function searchExtensionsXML($search, $owner='', $order='', $allExt=false, $allVer=false, $offset=0, $limit=500, $exactMatch=false)     {
                $where = '1=1';
-               if ($search)    {
+               if ($search && $exactMatch)     {
+                       $where.= ' AND extkey=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($search, 'cache_extensions');
+               } elseif($search) {
                        $where.= ' AND extkey LIKE \'%'.$GLOBALS['TYPO3_DB']->quoteStr($GLOBALS['TYPO3_DB']->escapeStrForLike($search, 'cache_extensions'), 'cache_extensions').'%\'';
                }
                if ($owner)     {
@@ -120,10 +123,8 @@ class SC_mod_tools_em_xmlhandler {
                }
 
                        // Fetch count
-               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('count(*) as cnt', 'cache_extensions', $where);
-               $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-               $this->matchingCount = $row['cnt'];
-               $GLOBALS['TYPO3_DB']->sql_free_result($res);
+               $count = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows('*', 'cache_extensions', $where);
+               $this->matchingCount = $count;
 
                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'cache_extensions', $where, '', $order, $offset.','.$limit);
                $this->extensionsXML = array();
@@ -144,6 +145,23 @@ class SC_mod_tools_em_xmlhandler {
                $GLOBALS['TYPO3_DB']->sql_free_result($res);
        }
 
+       /**
+        * Reduces the entries in $this->extensionsXML to the latest version per extension and removes entries not matching the search parameter
+        * The extension key has to be a valid one as search is done for exact matches only.
+        *
+        * @param       string          $search The list of extensions is reduced to entries with exactely this extension key. If empty, the full list is returned.
+        * @param       string          $owner  If set only extensions of that user are fetched
+        * @param       string          $order  A field to order the result by
+        * @param       boolean         $allExt If set also unreviewed and obsolete extensions are shown
+        * @param       boolean         $allVer If set returns all version of an extension, otherwise only the last
+        * @param       integer         $offset Offset to return result from (goes into LIMIT clause)
+        * @param       integer         $limit  Maximum number of entries to return (goes into LIMIT clause)
+        * @return      void
+        */
+       function searchExtensionsXMLExact($search, $owner='', $order='', $allExt=false, $allVer=false, $offset=0, $limit=500)   {
+               $this->searchExtensionsXML($search, $owner, $order, $allExt, $allVer, $offset, $limit, true);
+       }
+
        function countExtensions() {
                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('extkey', 'cache_extensions', '1=1', 'extkey');
                $cnt = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
@@ -384,7 +402,12 @@ class SC_mod_tools_em_xmlhandler {
                gzclose($fp);
 
                if(!$error) {
-                       $content.= '<p>The extensions list has been updated and now contains '.$extcount.' extension entries.</p>';
+                       $flashMessage = t3lib_div::makeInstance(
+                               't3lib_FlashMessage',
+                               sprintf($GLOBALS['LANG']->getLL('ext_import_extlist_updated'), $extcount),
+                               $GLOBALS['LANG']->getLL('ext_import_extlist_updated_header')
+                       );
+                       $content .= $flashMessage->render();
                }
 
                return $content;