Follow-up to feature #9625: Fixed regular expression
[Packages/TYPO3.CMS.git] / t3lib / class.t3lib_admin.php
index 9f90858..17679e5 100644 (file)
@@ -1,22 +1,22 @@
 <?php
 /***************************************************************
 *  Copyright notice
-*  
-*  (c) 1999-2003 Kasper Skaarhoj (kasper@typo3.com)
+*
+*  (c) 1999-2008 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
-*  This script is part of the TYPO3 project. The TYPO3 project is 
+*  This script is part of the TYPO3 project. The TYPO3 project is
 *  free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
-* 
+*
 *  The GNU General Public License can be found at
 *  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license 
+*  A copy is found in the textfile GPL.txt and important notices to the license
 *  from the author is found in LICENSE.txt distributed with these scripts.
 *
-* 
+*
 *  This script is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
-/** 
+/**
  * Contains a class for evaluation of database integrity according to $TCA
+ * Most of these functions are considered obsolete!
  *
  * $Id$
  * Revised for TYPO3 3.6 July/2003 by Kasper Skaarhoj
  * XHTML compliant
  *
- * @author     Kasper Skaarhoj <kasper@typo3.com>
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
  */
 /**
  * [CLASS/FUNCTION INDEX of SCRIPT]
  *
  *
  *
- *   90: class t3lib_admin 
- *  116:     function genTree($theID, $depthData)      
- *  150:     function lostRecords($pid_list)   
- *  179:     function fixLostRecord($table,$uid)       
- *  197:     function countRecords($pid_list)  
- *  227:     function getGroupFields($mode)    
- *  261:     function getFileFields($uploadfolder)     
- *  284:     function getDBFields($theSearchTable)     
- *  312:     function selectNonEmptyRecordsWithFkeys($fkey_arrays)     
- *  387:     function testFileRefs ()  
- *  438:     function testDBRefs($theArray)    
- *  477:     function whereIsRecordReferenced($searchTable,$id)        
- *  511:     function whereIsFileReferenced($uploadfolder,$filename)   
+ *   93: class t3lib_admin
+ *  128:     function genTree($theID, $depthData, $versions=FALSE)
+ *  217:     function genTree_records($theID, $depthData, $table='', $versions=FALSE)
+ *  292:     function genTreeStatus()
+ *  315:     function lostRecords($pid_list)
+ *  346:     function fixLostRecord($table,$uid)
+ *  367:     function countRecords($pid_list)
+ *  395:     function getGroupFields($mode)
+ *  429:     function getFileFields($uploadfolder)
+ *  452:     function getDBFields($theSearchTable)
+ *  480:     function selectNonEmptyRecordsWithFkeys($fkey_arrays)
+ *  569:     function testFileRefs ()
+ *  620:     function testDBRefs($theArray)
+ *  658:     function whereIsRecordReferenced($searchTable,$id)
+ *  695:     function whereIsFileReferenced($uploadfolder,$filename)
  *
- * TOTAL FUNCTIONS: 12
+ * TOTAL FUNCTIONS: 14
  * (This index is automatically created/updated by the extension "extdeveval")
  *
  */
 
 /**
  * This class holds functions used by the TYPO3 backend to check the integrity of the database (The DBint module, 'lowlevel' extension)
- * 
+ *
  * Depends on:         Depends on loaddbgroup from t3lib/
- * 
+ *
  * @todo       Need to really extend this class when the tcemain library has been updated and the whole API is better defined. There are some known bugs in this library. Further it would be nice with a facility to not only analyze but also clean up!
  * @see SC_mod_tools_dbint_index::func_relations(), SC_mod_tools_dbint_index::func_records()
- * @author     Kasper Skaarhoj <kasper@typo3.com>
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage t3lib
  */
 class t3lib_admin {
-       var $genTree_includeDeleted = 1;        // if set, genTree() includes deleted pages. This is default.
-       var $perms_clause='';           // extra where-clauses for the tree-selection
+       var $genTree_includeDeleted = TRUE;             // if set, genTree() includes deleted pages. This is default.
+       var $genTree_includeVersions = TRUE;            // if set, genTree() includes verisonized pages/records. This is default.
+       var $genTree_includeRecords = FALSE;            // if set, genTree() includes records from pages.
+       var $perms_clause = '';                         // extra where-clauses for the tree-selection
        var $genTree_makeHTML = 0;                      // if set, genTree() generates HTML, that visualizes the tree.
+
                // internal
-       var $genTree_idlist = '';       // Will hold the id-list from genTree()
-       var $getTree_HTML = '';         // Will hold the HTML-code visualising the tree. genTree()
-       var $backPath='';       
+       var $page_idArray = Array();            // Will hod id/rec pais from genTree()
+       var $rec_idArray = Array();
+       var $getTree_HTML = '';                 // Will hold the HTML-code visualising the tree. genTree()
+       var $backPath = '';
 
                // internal
        var $checkFileRefs = Array();
        var $checkSelectDBRefs = Array();       // From the select-fields
        var $checkGroupDBRefs = Array();        // From the group-fields
 
-       var $page_idArray=Array();
-       var $recStat = Array();
+       var $recStats = Array(
+               'allValid' => array(),
+               'published_versions' => array(),
+               'deleted' => array(),
+       );
        var $lRecords = Array();
        var $lostPagesList = '';
 
+
        /**
         * Generates a list of Page-uid's that corresponds to the tables in the tree. This list should ideally include all records in the pages-table.
-        * 
+        *
         * @param       integer         a pid (page-record id) from which to start making the tree
         * @param       string          HTML-code (image-tags) used when this function calls itself recursively.
-        * @return      integer         Number of mysql_num_rows (most recent query)
+        * @param       boolean         Internal variable, don't set from outside!
+        * @return      void
         */
-       function genTree($theID, $depthData)    {
-               $res = mysql(TYPO3_db, 'SELECT uid,title,doktype,deleted'.(t3lib_extMgm::isLoaded('cms')?',hidden':'').' FROM pages WHERE pid="'.$theID.'" '.((!$this->genTree_includeDeleted)?'AND NOT deleted':'').$this->perms_clause.' ORDER BY sorting');
-               $a=0;
-               $c=mysql_num_rows($res);
-               while ($row = mysql_fetch_assoc($res))  {
+       function genTree($theID, $depthData, $versions=FALSE)   {
+
+               if ($versions)  {
+                       $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                               'uid,title,doktype,deleted,t3ver_wsid,t3ver_id,t3ver_count,t3ver_swapmode'.(t3lib_extMgm::isLoaded('cms')?',hidden':''),
+                               'pages',
+                               'pid=-1 AND t3ver_oid='.intval($theID).' '.((!$this->genTree_includeDeleted)?'AND deleted=0':'').$this->perms_clause,
+                               '',
+                               'sorting'
+                       );
+               } else {
+                       $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                               'uid,title,doktype,deleted'.(t3lib_extMgm::isLoaded('cms')?',hidden':''),
+                               'pages',
+                               'pid='.intval($theID).' '.((!$this->genTree_includeDeleted)?'AND deleted=0':'').$this->perms_clause,
+                               '',
+                               'sorting'
+                       );
+               }
+
+                       // Traverse the records selected:
+               $a = 0;
+               $c = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
+               while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))      {
+
+                               // Prepare the additional label used in the HTML output in case of versions:
+                       if ($versions)  {
+                               $versionLabel = '[v1.'.$row['t3ver_id'].'; WS#'.$row['t3ver_wsid'].']';
+                       } else $versionLabel='';
+
                        $a++;
-                       $newID =$row['uid'];
-                       if ($this->genTree_makeHTML)    {       
-                               $this->genTree_HTML.=chr(10).'<div><nobr>';
+                       $newID = $row['uid'];
+
+                               // Build HTML output:
+                       if ($this->genTree_makeHTML)    {
+                               $this->genTree_HTML.=chr(10).'<div><span class="nobr">';
                                $PM = 'join';
                                $LN = ($a==$c)?'blank':'line';
                                $BTM = ($a==$c)?'bottom':'';
-                               $this->genTree_HTML.= $depthData.'<img src="'.$this->backPath.'t3lib/gfx/ol/'.$PM.$BTM.'.gif" width="18" height="16" align="top" alt="" /><img src="'.$this->backPath.t3lib_iconWorks::getIcon('pages',$row).'" width="18" height="16" align="top" alt="" />'.htmlspecialchars($row['uid'].': '.t3lib_div::fixed_lgd(strip_tags($row['title']),50)).'</nobr></div>';
+                               $this->genTree_HTML.= $depthData.
+                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.$PM.$BTM.'.gif','width="18" height="16"').' align="top" alt="" />'.
+                                       $versionLabel.
+                                       t3lib_iconWorks::getIconImage('pages',$row,$this->backPath,'align="top"').
+                                       htmlspecialchars($row['uid'].': '.t3lib_div::fixed_lgd_cs(strip_tags($row['title']),50)).'</span></div>';
                        }
 
-                       if (isset($page_idlist[$newID]))        {
-                               $this->recStat['doublePageID'][]=$newID;
+                               // Register various data for this item:
+                       $this->page_idArray[$newID]=$row;
+
+                       $this->recStats['all_valid']['pages'][$newID] = $newID;
+#                      if ($versions)  $this->recStats['versions']['pages'][$newID] = $newID;
+                       if ($row['deleted'])    $this->recStats['deleted']['pages'][$newID] = $newID;
+                       if ($versions && $row['t3ver_count']>=1) {
+                               $this->recStats['published_versions']['pages'][$newID] = $newID;
                        }
-                       $this->page_idArray[$newID]=$newID;
+
                        if ($row['deleted']) {$this->recStat['deleted']++;}
                        if ($row['hidden']) {$this->recStat['hidden']++;}
                        $this->recStat['doktype'][$row['doktype']]++;
-                       
-                       $this->genTree($newID,$this->genTree_HTML ? $depthData.'<img src="'.$this->backPath.'t3lib/gfx/ol/'.$LN.'.gif" width="18" height="16" align="top" alt="" />'  : '');
+
+                               // Create the HTML code prefix for recursive call:
+                       $genHTML =  $depthData.'<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.$LN.'.gif','width="18" height="16"').' align="top" alt="" />'.$versionLabel;
+
+                               // If all records should be shown, do so:
+                       if ($this->genTree_includeRecords)      {
+                               foreach($GLOBALS['TCA'] as $tableName => $cfg)  {
+                                       if ($tableName!='pages') {
+                                               $this->genTree_records($newID, $this->genTree_HTML ? $genHTML : '', $tableName);
+                                       }
+                               }
+                       }
+
+                               // Add sub pages:
+                       $this->genTree($newID, $this->genTree_HTML ? $genHTML : '');
+
+                               // If versions are included in the tree, add those now:
+                       if ($this->genTree_includeVersions)     {
+                               $this->genTree($newID, $this->genTree_HTML ? $genHTML : '', TRUE);
+                       }
                }
-               return (mysql_num_rows($res));
        }
-       
+
+       /**
+        * @param       [type]          $theID: ...
+        * @param       [type]          $depthData: ...
+        * @param       [type]          $table: ...
+        * @param       [type]          $versions: ...
+        * @return      [type]          ...
+        */
+       function genTree_records($theID, $depthData, $table='', $versions=FALSE)        {
+               global $TCA;
+
+               if ($versions)  {
+                               // Select all records from table pointing to this page:
+                       $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                               t3lib_BEfunc::getCommonSelectFields($table),
+                               $table,
+                               'pid=-1 AND t3ver_oid='.intval($theID).
+                                       (!$this->genTree_includeDeleted?t3lib_BEfunc::deleteClause($table):'')
+                       );
+               } else {
+                               // Select all records from table pointing to this page:
+                       $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                               t3lib_BEfunc::getCommonSelectFields($table),
+                               $table,
+                               'pid='.intval($theID).
+                                       (!$this->genTree_includeDeleted?t3lib_BEfunc::deleteClause($table):'')
+                       );
+               }
+
+                       // Traverse selected:
+               $a = 0;
+               $c = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
+               while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))      {
+
+                               // Prepare the additional label used in the HTML output in case of versions:
+                       if ($versions)  {
+                               $versionLabel = '[v1.'.$row['t3ver_id'].'; WS#'.$row['t3ver_wsid'].']';
+                       } else $versionLabel='';
+
+                       $a++;
+                       $newID = $row['uid'];
+
+                               // Build HTML output:
+                       if ($this->genTree_makeHTML)    {
+                               $this->genTree_HTML.=chr(10).'<div><span class="nobr">';
+                               $PM = 'join';
+                               $LN = ($a==$c)?'blank':'line';
+                               $BTM = ($a==$c)?'bottom':'';
+                               $this->genTree_HTML.= $depthData.
+                                       '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.$PM.$BTM.'.gif','width="18" height="16"').' align="top" alt="" />'.
+                                       $versionLabel.
+                                       t3lib_iconWorks::getIconImage($table,$row,$this->backPath,'align="top" title="'.$table.'"').htmlspecialchars($row['uid'].': '.t3lib_BEfunc::getRecordTitle($table,$row)).'</span></div>';
+                       }
+
+                               // Register various data for this item:
+                       $this->rec_idArray[$table][$newID]=$row;
+
+                       $this->recStats['all_valid'][$table][$newID] = $newID;
+#                      $this->recStats[$versions?'versions':'live'][$table][$newID] = $newID;
+                       if ($row['deleted'])    $this->recStats['deleted'][$table][$newID] = $newID;
+                       if ($versions && $row['t3ver_count']>=1 && $row['t3ver_wsid']==0) {
+                               $this->recStats['published_versions'][$table][$newID] = $newID;
+                       }
+
+#                      if ($row['deleted']) {$this->recStat['deleted']++;}
+#                      if ($row['hidden']) {$this->recStat['hidden']++;}
+
+
+
+                               // Select all versions of this record:
+                       if ($this->genTree_includeVersions && $TCA[$table]['ctrl']['versioningWS']) {
+                               $genHTML =  $depthData.'<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.$LN.'.gif','width="18" height="16"').' align="top" alt="" />';
+
+                               $this->genTree_records($newID, $genHTML, $table, TRUE);
+                       }
+               }
+       }
+
+       /**
+        * [Describe function...]
+        *
+        * @return      [type]          ...
+        */
+       function genTreeStatus($root=0) {
+               $this->genTree_includeDeleted = TRUE;           // if set, genTree() includes deleted pages. This is default.
+               $this->genTree_includeVersions = TRUE;          // if set, genTree() includes verisonized pages/records. This is default.
+               $this->genTree_includeRecords = TRUE;           // if set, genTree() includes records from pages.
+               $this->perms_clause = '';                                       // extra where-clauses for the tree-selection
+               $this->genTree_makeHTML = 0;                            // if set, genTree() generates HTML, that visualizes the tree.
+
+               $this->genTree($root,'');
+
+               return $this->recStats;
+       }
+
+
+
+
+
+
        /**
         * Fills $this->lRecords with the records from all tc-tables that are not attached to a PID in the pid-list.
-        * 
+        *
         * @param       string          list of pid's (page-record uid's). This list is probably made by genTree()
-        * @return      void            
+        * @return      void
         */
        function lostRecords($pid_list) {
                global $TCA;
@@ -154,16 +319,25 @@ class t3lib_admin {
                if ($pid_list)  {
                        while (list($table)=each($TCA)) {
                                t3lib_div::loadTCA($table);
-                               $query = 'SELECT uid,pid,'.$TCA[$table]['ctrl']['label'].' FROM '.$table.' WHERE pid NOT IN ('.$pid_list.')';
-                               $garbage = mysql(TYPO3_db,$query);
-                               echo mysql_error();
-                               $lostIdList=Array();
-                               while ($row = mysql_fetch_assoc($garbage))      {
+
+                               $pid_list_tmp = $pid_list;
+                               if (!isset($TCA[$table]['ctrl']['versioningWS']) || !$TCA[$table]['ctrl']['versioningWS'])      {
+                                               // Remove preceding "-1," for non-versioned tables
+                                       $pid_list_tmp = preg_replace('/^\-1,/','',$pid_list_tmp);
+                               }
+
+                               $garbage = $GLOBALS['TYPO3_DB']->exec_SELECTquery (
+                                                               'uid,pid,'.$TCA[$table]['ctrl']['label'],
+                                                               $table,
+                                                               'pid NOT IN ('.$pid_list_tmp.')'
+                                                       );
+                               $lostIdList = array();
+                               while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($garbage))  {
                                        $this->lRecords[$table][$row['uid']]=Array('uid'=>$row['uid'], 'pid'=>$row['pid'], 'title'=> strip_tags($row[$TCA[$table]['ctrl']['label']]) );
                                        $lostIdList[]=$row['uid'];
                                }
                                if ($table=='pages')    {
-                                       $this->lostPagesList=implode($lostIdList,',');
+                                       $this->lostPagesList=implode(',',$lostIdList);
                                }
                        }
                }
@@ -171,26 +345,29 @@ class t3lib_admin {
 
        /**
         * Fixes lost record from $table with uid $uid by setting the PID to zero. If there is a disabled column for the record that will be set as well.
-        * 
-        * @param       string          Tablename
+        *
+        * @param       string          Database tablename
         * @param       integer         The uid of the record which will have the PID value set to 0 (zero)
         * @return      boolean         True if done.
         */
        function fixLostRecord($table,$uid)     {
                if ($table && $GLOBALS['TCA'][$table] && $uid && is_array($this->lRecords[$table][$uid]) && $GLOBALS['BE_USER']->user['admin']) {
-                       $extra='';
+
+                       $updateFields = array();
+                       $updateFields['pid'] = 0;
                        if ($GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled'])       {       // If possible a lost record restored is hidden as default
-                               $extra.=','.$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled'].'=1';
+                               $updateFields[$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled']] = 1;
                        }
-                       $fixQuery = 'UPDATE '.$table.' SET pid=0'.$extra.' WHERE uid="'.$uid.'"';
-                       $fixQ = mysql(TYPO3_db,$fixQuery);
-                       return true;
-               } else return false;
+
+                       $GLOBALS['TYPO3_DB']->exec_UPDATEquery($table, 'uid='.intval($uid), $updateFields);
+
+                       return TRUE;
+               } else return FALSE;
        }
 
        /**
         * Counts records from $TCA-tables that ARE attached to an existing page.
-        * 
+        *
         * @param       string          list of pid's (page-record uid's). This list is probably made by genTree()
         * @return      array           an array with the number of records from all $TCA-tables that are attached to a PID in the pid-list.
         */
@@ -202,15 +379,20 @@ class t3lib_admin {
                if ($pid_list)  {
                        while (list($table)=each($TCA)) {
                                t3lib_div::loadTCA($table);
-                               $query = 'SELECT count(*) FROM '.$table.' WHERE pid IN ('.$pid_list.')';
-                               $count = mysql(TYPO3_db,$query);
-                               if ($row = mysql_fetch_row($count))     {
+
+                               $pid_list_tmp = $pid_list;
+                               if (!isset($TCA[$table]['ctrl']['versioningWS']) || !$TCA[$table]['ctrl']['versioningWS'])      {
+                                               // Remove preceding "-1," for non-versioned tables
+                                       $pid_list_tmp = preg_replace('/^\-1,/','',$pid_list_tmp);
+                               }
+
+                               $count = $GLOBALS['TYPO3_DB']->exec_SELECTquery('count(*)', $table, 'pid IN ('.$pid_list_tmp.')');
+                               if ($row = $GLOBALS['TYPO3_DB']->sql_fetch_row($count)) {
                                        $list[$table]=$row[0];
                                }
 
-                               $query = 'SELECT count(*) FROM '.$table.' WHERE pid IN ('.$pid_list.')'.t3lib_BEfunc::deleteClause($table);
-                               $count = mysql(TYPO3_db,$query);
-                               if ($row = mysql_fetch_row($count))     {
+                               $count = $GLOBALS['TYPO3_DB']->exec_SELECTquery('count(*)', $table, 'pid IN ('.$pid_list_tmp.')'.t3lib_BEfunc::deleteClause($table));
+                               if ($row = $GLOBALS['TYPO3_DB']->sql_fetch_row($count)) {
                                        $list_n[$table]=$row[0];
                                }
                        }
@@ -220,7 +402,7 @@ class t3lib_admin {
 
        /**
         * Finding relations in database based on type 'group' (files or database-uid's in a list)
-        * 
+        *
         * @param       string          $mode = file, $mode = db, $mode = '' (all...)
         * @return      array           An array with all fields listed that somehow are references to other records (foreign-keys) or files
         */
@@ -235,7 +417,7 @@ class t3lib_admin {
                        while (list($field,$config)=each($cols))        {
                                if ($config['config']['type']=='group') {
                                        if (
-                                               ((!$mode||$mode=='file') && $config['config']['internal_type']=='file') || 
+                                               ((!$mode||$mode=='file') && $config['config']['internal_type']=='file') ||
                                                ((!$mode||$mode=='db') && $config['config']['internal_type']=='db')
                                                )       {
                                                $result[$table][]=$field;
@@ -254,7 +436,7 @@ class t3lib_admin {
 
        /**
         * Finds all fields that hold filenames from uploadfolder
-        * 
+        *
         * @param       string          Path to uploadfolder
         * @return      array           An array with all fields listed that have references to files in the $uploadfolder
         */
@@ -277,9 +459,9 @@ class t3lib_admin {
 
        /**
         * Returns an array with arrays of table/field pairs which are allowed to hold references to the input table name - according to $TCA
-        * 
+        *
         * @param       string          Table name
-        * @return      array           
+        * @return      array
         */
        function getDBFields($theSearchTable)   {
                global $TCA;
@@ -304,9 +486,9 @@ class t3lib_admin {
 
        /**
         * This selects non-empty-records from the tables/fields in the fkey_array generated by getGroupFields()
-        * 
-        * @param       array           
-        * @return      void            
+        *
+        * @param       array           Array with tables/fields generated by getGroupFields()
+        * @return      void
         * @see getGroupFields()
         */
        function selectNonEmptyRecordsWithFkeys($fkey_arrays)   {
@@ -317,11 +499,25 @@ class t3lib_admin {
                                if ($TCA[$table] && trim($field_list))  {
                                        t3lib_div::loadTCA($table);
                                        $fieldArr = explode(',',$field_list);
+
+                                       if(t3lib_extMgm::isLoaded('dbal')) {
+                                               $fields = $GLOBALS['TYPO3_DB']->admin_get_fields($table);
+                                               reset($fields);
+                                               list(,$field)=each($fieldArr);
+                                               $cl_fl = ($GLOBALS['TYPO3_DB']->MetaType($fields[$field]['type'],$table) == 'I' || $GLOBALS['TYPO3_DB']->MetaType($fields[$field]['type'],$table) == 'N' || $GLOBALS['TYPO3_DB']->MetaType($fields[$field]['type'],$table) == 'R') ?
+                                               $field.'!=0' : $field.'!=\'\'';
+                                               while (list(,$field)=each($fieldArr))   {
+                                                       $cl_fl .= ($GLOBALS['TYPO3_DB']->MetaType($fields[$field]['type'],$table) == 'I' || $GLOBALS['TYPO3_DB']->MetaType($fields[$field]['type'],$table) == 'N' || $GLOBALS['TYPO3_DB']->MetaType($fields[$field]['type'],$table) == 'R') ?
+                                                       ' OR '.$field.'!=0' : ' OR '.$field.'!=\'\'';
+                                               }
+                                               unset($fields);
+                                       }
+                                       else {
                                        $cl_fl = implode ('!="" OR ',$fieldArr). '!=""';
-                                       $query = 'SELECT uid,'.$field_list.' FROM '.$table.' WHERE '.$cl_fl;
-                                       $mres = mysql(TYPO3_db,$query);
-                                       echo mysql_error();
-                                       while ($row=mysql_fetch_assoc($mres))   {
+                                       }
+
+                                       $mres = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid,'.$field_list, $table, $cl_fl);
+                                       while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($mres))     {
                                                reset($fieldArr);
                                                while (list(,$field)=each($fieldArr))   {
                                                        if (trim($row[$field]))         {
@@ -353,7 +549,7 @@ class t3lib_admin {
                                                                        if ($fieldConf['internal_type']=='db')  {
                                                                                // dbs - group
                                                                                $dbAnalysis = t3lib_div::makeInstance('t3lib_loadDBGroup');
-                                                                               $dbAnalysis->start($row[$field],$fieldConf['allowed'],$fieldConf['MM'],$row['uid']);
+                                                                               $dbAnalysis->start($row[$field],$fieldConf['allowed'],$fieldConf['MM'],$row['uid'], $table, $fieldConf);
                                                                                reset($dbAnalysis->itemArray);
                                                                                while (list(,$tempArr)=each($dbAnalysis->itemArray))    {
                                                                                        $this->checkGroupDBRefs[$tempArr['table']][$tempArr['id']]+=1;
@@ -363,7 +559,7 @@ class t3lib_admin {
                                                                if ($fieldConf['type']=='select' && $fieldConf['foreign_table'])        {
                                                                        // dbs - select
                                                                        $dbAnalysis = t3lib_div::makeInstance('t3lib_loadDBGroup');
-                                                                       $dbAnalysis->start($row[$field],$fieldConf['foreign_table'],$fieldConf['MM'],$row['uid']);
+                                                                       $dbAnalysis->start($row[$field],$fieldConf['foreign_table'],$fieldConf['MM'],$row['uid'], $table, $fieldConf);
                                                                        reset($dbAnalysis->itemArray);
                                                                        while (list(,$tempArr)=each($dbAnalysis->itemArray))    {
                                                                                if ($tempArr['id']>0)   {
@@ -381,7 +577,7 @@ class t3lib_admin {
 
        /**
         * Depends on selectNonEmpty.... to be executed first!!
-        * 
+        *
         * @return      array           Report over files; keys are "moreReferences", "noReferences", "noFile", "error"
         */
        function testFileRefs ()        {
@@ -431,7 +627,7 @@ class t3lib_admin {
 
        /**
         * Depends on selectNonEmpty.... to be executed first!!
-        * 
+        *
         * @param       array           Table with key/value pairs being table names and arrays with uid numbers
         * @return      string          HTML Error message
         */
@@ -444,11 +640,10 @@ class t3lib_admin {
                                while(list($id,)=each($dbArr))  {
                                        $idlist[]=$id;
                                }
-                               $theList = implode($idlist,',');
+                               $theList = implode(',',$idlist);
                                if ($theList)   {
-                                       $query='SELECT uid FROM '.$table.' WHERE uid IN ('.$theList.') '.t3lib_BEfunc::deleteClause($table);
-                                       $mres = mysql(TYPO3_db,$query);
-                                       while($row=mysql_fetch_assoc($mres))    {
+                                       $mres = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid', $table, 'uid IN ('.$theList.')'.t3lib_BEfunc::deleteClause($table));
+                                       while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($mres))      {
                                                if (isset($dbArr[$row['uid']])) {
                                                        unset ($dbArr[$row['uid']]);
                                                } else {
@@ -469,27 +664,30 @@ class t3lib_admin {
 
        /**
         * Finding all references to record based on table/uid
-        * 
+        *
         * @param       string          Table name
-        * @param       integer         Uid
+        * @param       integer         Uid of database record
         * @return      array           Array with other arrays containing information about where references was found
         */
        function whereIsRecordReferenced($searchTable,$id)      {
                global $TCA;
                $fileFields = $this->getDBFields($searchTable); // Gets tables / Fields that reference to files...
-               $theRecordList=Array(); 
+               $theRecordList=Array();
                while (list(,$info)=each($fileFields))  {
                        $table=$info[0];        $field=$info[1];
                        t3lib_div::loadTCA($table);
-                       $query = 'SELECT uid,pid,'.$TCA[$table]['ctrl']['label'].','.$field.' FROM '.$table.' WHERE '.$field.' LIKE "%'.addSlashes($id).'%"';
-                       $mres = mysql(TYPO3_db,$query);
-                       while ($row = mysql_fetch_assoc($mres)) {
+                       $mres = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                                                       'uid,pid,'.$TCA[$table]['ctrl']['label'].','.$field,
+                                                       $table,
+                                                       $field.' LIKE \'%'.$GLOBALS['TYPO3_DB']->quoteStr($id, $table).'%\''
+                                               );
+                       while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($mres))     {
                                        // Now this is the field, where the reference COULD come from. But we're not garanteed, so we must carefully examine the data.
                                $fieldConf = $TCA[$table]['columns'][$field]['config'];
                                $allowedTables = ($fieldConf['type']=='group') ? $fieldConf['allowed'] : $fieldConf['foreign_table'];
-                       
+
                                $dbAnalysis = t3lib_div::makeInstance('t3lib_loadDBGroup');
-                               $dbAnalysis->start($row[$field],$allowedTables,$fieldConf['MM'],$row['uid']);
+                               $dbAnalysis->start($row[$field],$allowedTables,$fieldConf['MM'],$row['uid'], $table, $fieldConf);
                                reset($dbAnalysis->itemArray);
                                while (list(,$tempArr)=each($dbAnalysis->itemArray))    {
                                        if ($tempArr['table']==$searchTable && $tempArr['id']==$id)     {
@@ -503,20 +701,23 @@ class t3lib_admin {
 
        /**
         * Finding all references to file based on uploadfolder / filename
-        * 
+        *
         * @param       string          Upload folder where file is found
-        * @param       string          filename
+        * @param       string          Filename to search for
         * @return      array           Array with other arrays containing information about where references was found
         */
        function whereIsFileReferenced($uploadfolder,$filename) {
                global $TCA;
                $fileFields = $this->getFileFields($uploadfolder);      // Gets tables / Fields that reference to files...
-               $theRecordList=Array(); 
+               $theRecordList=Array();
                while (list(,$info)=each($fileFields))  {
                        $table=$info[0];        $field=$info[1];
-                       $query = 'SELECT uid,pid,'.$TCA[$table]['ctrl']['label'].','.$field.' FROM '.$table.' WHERE '.$field.' LIKE "%'.addSlashes($filename).'%"';
-                       $mres = mysql(TYPO3_db,$query);
-                       while ($row = mysql_fetch_assoc($mres)) {
+                       $mres = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                                                       'uid,pid,'.$TCA[$table]['ctrl']['label'].','.$field,
+                                                       $table,
+                                                       $field.' LIKE \'%'.$GLOBALS['TYPO3_DB']->quoteStr($filename, $table).'%\''
+                                               );
+                       while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($mres))     {
                                // Now this is the field, where the reference COULD come from. But we're not garanteed, so we must carefully examine the data.
                                $tempArr = explode(',',trim($row[$field]));
                                while (list(,$file)=each($tempArr))     {