Fixed issue #9285: Remove all @ in front of file_exists() calls
authorIngo Renner <ingo.renner@typo3.org>
Sun, 7 Sep 2008 22:00:49 +0000 (22:00 +0000)
committerIngo Renner <ingo.renner@typo3.org>
Sun, 7 Sep 2008 22:00:49 +0000 (22:00 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4069 709f56b5-9817-0410-a4d7-c38de5d9e867

21 files changed:
ChangeLog
t3lib/class.t3lib_basicfilefunc.php
t3lib/class.t3lib_clipboard.php
t3lib/class.t3lib_extfilefunc.php
t3lib/class.t3lib_formmail.php
t3lib/class.t3lib_iconworks.php
t3lib/class.t3lib_loadmodules.php
t3lib/class.t3lib_softrefproc.php
t3lib/class.t3lib_stdgraphic.php
t3lib/class.t3lib_tsparser_ext.php
t3lib/thumbs.php
typo3/alt_clickmenu.php
typo3/class.browse_links.php
typo3/file_edit.php
typo3/file_rename.php
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/class.tslib_gifbuilder.php
typo3/sysext/cms/tslib/class.tslib_menu.php
typo3/sysext/impexp/class.tx_impexp.php
typo3/sysext/install/mod/class.tx_install.php
typo3/sysext/tsconfig_help/mod1/index.php

index 7920819..16ffc6d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+2008-09-07  Ingo Renner  <ingo@typo3.org>
+
+       * Fixed issue #9285: Remove all @ in front of file_exists() calls
+
 2008-09-06  Dmitry Dulepov  <dmitry@typo3.org>
 
-       * Fixed bug #9302: Make functions in tslib_eidtools public static 
+       * Fixed bug #9302: Make functions in tslib_eidtools public static
 
 2008-09-04  Stanislas Rolland  <typo3@sjbr.ca>
 
index 020c987..57b7721 100644 (file)
@@ -292,7 +292,7 @@ class t3lib_basicFileFunctions      {
                                // Check if the file exists and if not - return the filename...
                        $fileInfo = $origFileInfo;
                        $theDestFile = $theDest.'/'.$fileInfo['file'];          // The destinations file
-                       if (!@file_exists($theDestFile) || $dontCheckForUnique)         {       // If the file does NOT exist we return this filename
+                       if (!file_exists($theDestFile) || $dontCheckForUnique)          {       // If the file does NOT exist we return this filename
                                return $theDestFile;
                        }
 
@@ -308,7 +308,7 @@ class t3lib_basicFileFunctions      {
                                }
                                $theTestFile = $theTempFileBody.$insert.$theOrigExt;
                                $theDestFile = $theDest.'/'.$theTestFile;               // The destinations file
-                               if (!@file_exists($theDestFile))                {       // If the file does NOT exist we return this filename
+                               if (!file_exists($theDestFile))         {       // If the file does NOT exist we return this filename
                                        return $theDestFile;
                                }
                        }
index 8542df2..d2f5cc6 100755 (executable)
@@ -431,7 +431,7 @@ class t3lib_clipboard {
                                        $bgColClass = ($table=='_FILE'&&$this->fileMode)||($table!='_FILE'&&!$this->fileMode) ? 'bgColor4-20' : 'bgColor4';
 
                                        if ($table=='_FILE')    {       // Rendering files/directories on the clipboard:
-                                               if (@file_exists($v) && t3lib_div::isAllowedAbsPath($v))        {
+                                               if (file_exists($v) && t3lib_div::isAllowedAbsPath($v)) {
                                                        $fI = pathinfo($v);
                                                        $icon = is_dir($v) ? 'folder.gif' : t3lib_BEfunc::getFileIcon(strtolower($fI['extension']));
                                                        $size = ' ('.t3lib_div::formatSize(filesize($v)).'bytes)';
@@ -517,7 +517,7 @@ class t3lib_clipboard {
                        } else {
                                $str='<a href="'.htmlspecialchars($this->backPath.'db_list.php?id='.$rec['pid']).'">'.$str.'</a>';
                        }
-               } elseif (@file_exists($rec))   {
+               } elseif (file_exists($rec))    {
                        if (!$this->fileMode)   {
                                $str=$GLOBALS['TBE_TEMPLATE']->dfw($str);
                        } else {
@@ -710,7 +710,7 @@ class t3lib_clipboard {
                                        list($table,$uid) = explode('|',$k);
 
                                        if ($table=='_FILE')    {       // Rendering files/directories on the clipboard:
-                                               if (@file_exists($v) && t3lib_div::isAllowedAbsPath($v))        {
+                                               if (file_exists($v) && t3lib_div::isAllowedAbsPath($v)) {
                                                        $params[] = 'tx_impexp['.(is_dir($v) ? 'dir' : 'file').'][]='.rawurlencode($v);
                                                }
                                        } else {        // Rendering records:
@@ -788,7 +788,7 @@ class t3lib_clipboard {
                                                $this->changed=1;
                                        }
                                } else {
-                                       if (!$v || !@file_exists($v))   {
+                                       if (!$v || !file_exists($v))    {
                                                unset($this->clipData[$this->current]['el'][$k]);
                                                $this->changed=1;
                                        }
index dae86ec..5a57f31 100755 (executable)
@@ -487,7 +487,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                        } else {
                                                $theDestFile = $theDest.'/'.$fI['file'];
                                        }
-                                       if ($theDestFile && !@file_exists($theDestFile))        {
+                                       if ($theDestFile && !file_exists($theDestFile)) {
                                                if ($this->checkIfAllowed($fI['fileext'], $theDest, $fI['file'])) {
                                                        if ($this->checkPathAgainstMounts($theDestFile) && $this->checkPathAgainstMounts($theFile))     {
                                                                if ($this->PHPFileFunctions)    {
@@ -520,7 +520,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                        } else {
                                                $theDestFile = $theDest.'/'.$fI['file'];
                                        }
-                                       if ($theDestFile && !@file_exists($theDestFile))        {
+                                       if ($theDestFile && !file_exists($theDestFile)) {
                                                if (!t3lib_div::isFirstPartOfStr($theDestFile.'/',$theFile.'/'))        {                       // Check if the one folder is inside the other or on the same level... to target/dest is the same?
                                                        if ($this->checkIfFullAccess($theDest) || $this->is_webPath($theDestFile)==$this->is_webPath($theFile)) {       // no copy of folders between spaces
                                                                if ($this->checkPathAgainstMounts($theDestFile) && $this->checkPathAgainstMounts($theFile))     {
@@ -578,7 +578,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                        } else {
                                                $theDestFile = $theDest.'/'.$fI['file'];
                                        }
-                                       if ($theDestFile && !@file_exists($theDestFile))        {
+                                       if ($theDestFile && !file_exists($theDestFile)) {
                                                if ($this->checkIfAllowed($fI['fileext'], $theDest, $fI['file'])) {
                                                        if ($this->checkPathAgainstMounts($theDestFile) && $this->checkPathAgainstMounts($theFile))     {
                                                                if ($this->PHPFileFunctions)    {
@@ -610,7 +610,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                        } else {
                                                $theDestFile = $theDest.'/'.$fI['file'];
                                        }
-                                       if ($theDestFile && !@file_exists($theDestFile))        {
+                                       if ($theDestFile && !file_exists($theDestFile)) {
                                                if (!t3lib_div::isFirstPartOfStr($theDestFile.'/',$theFile.'/'))        {                       // Check if the one folder is inside the other or on the same level... to target/dest is the same?
                                                        if ($this->checkIfFullAccess($theDest) || $this->is_webPath($theDestFile)==$this->is_webPath($theFile)) {       // // no moving of folders between spaces
                                                                if ($this->checkPathAgainstMounts($theDestFile) && $this->checkPathAgainstMounts($theFile))     {
@@ -659,7 +659,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                        if ($fileInfo['file']!=$theNewName)     {       // The name should be different from the current. And the filetype must be allowed
                                                $theRenameName = $fileInfo['path'].$theNewName;
                                                if ($this->checkPathAgainstMounts($fileInfo['path']))   {
-                                                       if (!@file_exists($theRenameName))      {
+                                                       if (!file_exists($theRenameName))       {
                                                                if ($type=='file')      {
                                                                        if ($this->actionPerms['renameFile'])   {
                                                                                $fI = t3lib_div::split_fileref($theRenameName);
@@ -703,7 +703,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                        if ($this->actionPerms['newFolder'])    {
                                                $theNewFolder = $theTarget.'/'.$theFolder;
                                                if ($this->checkPathAgainstMounts($theNewFolder))       {
-                                                       if (!@file_exists($theNewFolder))       {
+                                                       if (!file_exists($theNewFolder))        {
                                                                if (t3lib_div::mkdir($theNewFolder)){
                                                                        $this->writelog(6,0,1,'Directory "%s" created in "%s"',Array($theFolder,$theTarget.'/'));
                                                                        return $theNewFolder;
@@ -734,7 +734,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                        if ($this->actionPerms['newFile'])      {
                                                $theNewFile = $theTarget.'/'.$newName;
                                                if ($this->checkPathAgainstMounts($theNewFile)) {
-                                                       if (!@file_exists($theNewFile)) {
+                                                       if (!file_exists($theNewFile))  {
                                                                $fI = t3lib_div::split_fileref($theNewFile);
                                                                if ($this->checkIfAllowed($fI['fileext'], $fileInfo['path'], $fI['file'])) {
                                                                        if (t3lib_div::inList($extList, $fI['fileext']))        {
index 9ca223e..cb4c190 100644 (file)
@@ -172,7 +172,7 @@ class t3lib_formmail extends t3lib_htmlmail {
                                $theFile = t3lib_div::upload_to_tempfile($_FILES[$varname]['tmp_name']);
                                $theName = $_FILES[$varname]['name'];
 
-                               if ($theFile && @file_exists($theFile)) {
+                               if ($theFile && file_exists($theFile))  {
                                        if (filesize($theFile) < $GLOBALS['TYPO3_CONF_VARS']['FE']['formmailMaxAttachmentSize'])        {
                                                $this->addAttachment($theFile, $theName);
                                        }
index 428644d..896c060 100755 (executable)
@@ -369,12 +369,12 @@ final class t3lib_iconWorks       {
                $path = PATH_site.'typo3temp/'.$iconFileName;
 
 
-               if (@file_exists(PATH_typo3.'icons/'.$iconFileName))    {       // Returns if found in typo3/icons/
+               if (file_exists(PATH_typo3.'icons/'.$iconFileName))     {       // Returns if found in typo3/icons/
                        return 'icons/'.$iconFileName;
-               } elseif (@file_exists($path))  {       // Returns if found in ../typo3temp/icons/
+               } elseif (file_exists($path))   {       // Returns if found in ../typo3temp/icons/
                        return $mainpath;
                } else {        // Makes icon:
-                       if (@file_exists($absFile)) {
+                       if (file_exists($absFile)) {
                                if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['gdlib'])        {
 
                                                // Create image pointer, if possible
index f6d267f..9f9d609 100644 (file)
@@ -386,7 +386,7 @@ class t3lib_loadModules {
        function checkMod($name, $fullpath)     {
                $modconf=Array();
                $path = ereg_replace ('/[^/.]+/\.\./', '/', $fullpath); // because 'path/../path' does not work
-               if (@is_dir($path) && @file_exists($path.'/conf.php'))  {
+               if (@is_dir($path) && file_exists($path.'/conf.php'))   {
                        $MCONF = array();
                        $MLANG = array();
                        include($path.'/conf.php');     // The conf-file is included. This must be valid PHP.
@@ -434,7 +434,7 @@ class t3lib_loadModules {
                                        // Default script setup
                                if ($MCONF['script']==='_DISPATCH')     {
                                        $modconf['script'] = 'mod.php?M='.rawurlencode($name);
-                               } elseif ($MCONF['script'] && @file_exists($path.'/'.$MCONF['script'])) {
+                               } elseif ($MCONF['script'] && file_exists($path.'/'.$MCONF['script']))  {
                                        $modconf['script'] = $this->getRelativePath(PATH_typo3,$fullpath.'/'.$MCONF['script']);
                                } else {
                                        $modconf['script'] = 'dummy.php';
@@ -447,7 +447,7 @@ class t3lib_loadModules {
                                if ($MCONF['navFrameScript']) {
                                        $navFrameScript = explode('?', $MCONF['navFrameScript']);
                                        $navFrameScript = $navFrameScript[0];
-                                       if (@file_exists($path.'/'.$navFrameScript))    {
+                                       if (file_exists($path.'/'.$navFrameScript))     {
                                                $modconf['navFrameScript'] = $this->getRelativePath(PATH_typo3,$fullpath.'/'.$MCONF['navFrameScript']);
                                        }
                                }
index 7b02797..ad3ca1a 100755 (executable)
@@ -668,7 +668,7 @@ class t3lib_softrefproc {
                                $finalTagParts['url'] = $link_param;
                        } elseif ($containsSlash || $isLocalFile)       {       // file (internal)
                                $splitLinkParam = explode('?', $link_param);
-                               if (@file_exists(rawurldecode($splitLinkParam[0])) || $isLocalFile)     {
+                               if (file_exists(rawurldecode($splitLinkParam[0])) || $isLocalFile)      {
                                        $finalTagParts['LINK_TYPE'] = 'file';
                                        $finalTagParts['filepath'] = rawurldecode($splitLinkParam[0]);
                                        $finalTagParts['query'] = $splitLinkParam[1];
index 4419908..0f9adf0 100644 (file)
@@ -2203,7 +2203,7 @@ class t3lib_stdGraphic    {
                                if ($this->dontCheckForExistingTempFile || !$this->file_exists_typo3temp_file($output, $imagefile))     {
                                        $this->imageMagickExec($imagefile.$frame, $output, $command);
                                }
-                               if (@file_exists($output))      {
+                               if (file_exists($output))       {
                                        $info[3] = $output;
                                        $info[2] = $newExt;
                                        if ($params)    {       // params could realisticly change some imagedata!
@@ -2227,7 +2227,7 @@ class t3lib_stdGraphic    {
         */
        function getImageDimensions($imageFile) {
                ereg('([^\.]*)$',$imageFile,$reg);
-               if (@file_exists($imageFile) && t3lib_div::inList($this->imageFileExt,strtolower($reg[0])))     {
+               if (file_exists($imageFile) && t3lib_div::inList($this->imageFileExt,strtolower($reg[0])))      {
                        if ($returnArr = $this->getCachedImageDimensions($imageFile))   {
                                return $returnArr;
                        } else {
@@ -2419,7 +2419,7 @@ class t3lib_stdGraphic    {
         */
        function file_exists_typo3temp_file($output,$orig='')   {
                if ($this->enable_typo3temp_db_tracking)        {
-                       if (@file_exists($output))      {       // If file exists, then we return immediately
+                       if (file_exists($output))       {       // If file exists, then we return immediately
                                return 1;
                        } else {        // If not, we look up in the cache_typo3temp_log table to see if there is a image being rendered right now.
                                $md5Hash=md5($output);
@@ -2444,7 +2444,7 @@ class t3lib_stdGraphic    {
                                }
                        }
                } else {
-                       return @file_exists($output);
+                       return file_exists($output);
                }
        }
 
index 1cfc41b..38c7afa 100755 (executable)
@@ -617,7 +617,7 @@ class t3lib_tsparser_ext extends t3lib_TStemplate   {
                                $A_B = '';
                                $A_E = '';
                        }
-                       $HTML .= ($first ? '' : '<img src="' . $GLOBALS['BACK_PATH'] . 'gfx/ol/' . $PM . $BTM . '.gif" width="18" height="16" align="top" border="0" />') . 
+                       $HTML .= ($first ? '' : '<img src="' . $GLOBALS['BACK_PATH'] . 'gfx/ol/' . $PM . $BTM . '.gif" width="18" height="16" align="top" border="0" />') .
                                '<img ' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], $icon) . ' align="top" title="' . $alttext.'" /> ' .
                                $A_B . t3lib_div::fixed_lgd_cs($row['title'], $GLOBALS['BE_USER']->uc['titleLen']) . $A_E . '&nbsp;&nbsp;';
                        $RL = $this->ext_getRootlineNumber($row['pid']);
@@ -1088,7 +1088,7 @@ class t3lib_tsparser_ext extends t3lib_TStemplate {
                                while($entry=$d->read()) {
                                        if ($entry!='.' && $entry!='..')        {
                                                $wholePath = $path.'/'.$entry;          // Because of odd PHP-error where  <BR>-tag is sometimes placed after a filename!!
-                                               if (@file_exists($wholePath) && (!$type || filetype($wholePath)==$type))        {
+                                               if (file_exists($wholePath) && (!$type || filetype($wholePath)==$type)) {
                                                        $fI = t3lib_div::split_fileref($wholePath);
                                                        $this->dirResources[]=substr($wholePath,strlen(PATH_site));
                                                }
index 434af7c..7bea2fd 100755 (executable)
@@ -184,7 +184,7 @@ class SC_t3lib_thumbs {
                global $TYPO3_CONF_VARS;
 
                        // If file exists, we make a thumbsnail of the file.
-               if ($this->input && @file_exists($this->input)) {
+               if ($this->input && file_exists($this->input))  {
 
                                // Check file extension:
                        $reg = array();
@@ -222,7 +222,7 @@ class SC_t3lib_thumbs {
 
                        if ($TYPO3_CONF_VARS['GFX']['im'])      {
                                        // If thumbnail does not exist, we generate it
-                               if (!@file_exists($this->output))       {
+                               if (!file_exists($this->output))        {
 /*                                     if (strstr($this->input,' ') || strstr($this->output,' '))      {
                                                $this->errorGif('Spaces in','filepath',basename($this->input));
                                        }
@@ -235,7 +235,7 @@ class SC_t3lib_thumbs {
                                        $parameters = '-sample '.$this->size.' '.$colors.' '.$this->wrapFileName($this->input.'[0]').' '.$this->wrapFileName($this->output);
                                        $cmd = t3lib_div::imageMagickCommand('convert', $parameters);
                                        exec($cmd);
-                                       if (!@file_exists($this->output))       {
+                                       if (!file_exists($this->output))        {
                                                $this->errorGif('No thumb','generated!',basename($this->input));
                                        }
                                }
index e260ed2..09844b5 100755 (executable)
@@ -835,7 +835,7 @@ class clickMenu {
        function printFileClickMenu($path)      {
                $menuItems=array();
 
-               if (@file_exists($path) && t3lib_div::isAllowedAbsPath($path))  {
+               if (file_exists($path) && t3lib_div::isAllowedAbsPath($path))   {
                        $fI = pathinfo($path);
                        $icon = is_dir($path) ? 'folder.gif' : t3lib_BEfunc::getFileIcon(strtolower($fI['extension']));
                        $size=' ('.t3lib_div::formatSize(filesize($path)).'bytes)';
index 36d0838..4517b57 100755 (executable)
@@ -819,12 +819,12 @@ class browse_links {
                                'class'  => $currentLinkParts[2],
                                'title'  => $currentLinkParts[3],
                        );
-                       $this->curUrlArray = (is_array(t3lib_div::_GP('curUrl'))) ? 
-                               array_merge($initialCurUrlArray, t3lib_div::_GP('curUrl')) : 
+                       $this->curUrlArray = (is_array(t3lib_div::_GP('curUrl'))) ?
+                               array_merge($initialCurUrlArray, t3lib_div::_GP('curUrl')) :
                                $initialCurUrlArray;
                        $this->curUrlInfo = $this->parseCurUrl($this->siteURL.'?id='.$this->curUrlArray['href'], $this->siteURL);
                        if ($this->curUrlInfo['pageid'] == 0 && $this->curUrlArray['href']) { // pageid == 0 means that this is not an internal (page) link
-                               if (@file_exists(PATH_site.rawurldecode($this->curUrlArray['href'])))   { // check if this is a link to a file
+                               if (file_exists(PATH_site.rawurldecode($this->curUrlArray['href'])))    { // check if this is a link to a file
                                        if (t3lib_div::isFirstPartOfStr($this->curUrlArray['href'], PATH_site)) {
                                                $currentLinkParts[0] = substr($this->curUrlArray['href'], strlen(PATH_site));
                                        }
@@ -845,7 +845,7 @@ class browse_links {
                                $this->act = 'page';
                        } else {
                                $this->curUrlInfo = $this->parseCurUrl($this->siteURL.'?id='.$this->curUrlArray['href'], $this->siteURL);
-                       } 
+                       }
                } else {
                        $this->curUrlArray = t3lib_div::_GP('curUrl');
                        if ($this->curUrlArray['all'])  {
@@ -2580,7 +2580,7 @@ class browse_links {
                                $info['act']='spec';
                        } elseif (t3lib_div::isFirstPartOfStr($href,$siteUrl))  {       // If URL is on the current frontend website:
                                $rel = substr($href,strlen($siteUrl));
-                               if (@file_exists(PATH_site.rawurldecode($rel))) {       // URL is a file, which exists:
+                               if (file_exists(PATH_site.rawurldecode($rel)))  {       // URL is a file, which exists:
                                        $info['value']=rawurldecode($rel);
                                        if (@is_dir(PATH_site . $info['value'])) {
                                                $info['act'] = 'folder';
index 1cc695a..5949974 100755 (executable)
@@ -114,7 +114,7 @@ class SC_file_edit {
                $this->basicff->init($GLOBALS['FILEMOUNTS'],$TYPO3_CONF_VARS['BE']['fileExtensions']);
 
 
-               if (@file_exists($this->target))        {
+               if (file_exists($this->target)) {
                        $this->target=$this->basicff->cleanDirectoryName($this->target);                // Cleaning and checking target (file or dir)
                } else {
                        $this->target='';
index af90534..cdf79da 100755 (executable)
@@ -116,7 +116,7 @@ class SC_file_rename {
                $this->basicff->init($GLOBALS['FILEMOUNTS'],$TYPO3_CONF_VARS['BE']['fileExtensions']);
 
                        // Cleaning and checking target
-               if (@file_exists($this->target))        {
+               if (file_exists($this->target)) {
                        $this->target=$this->basicff->cleanDirectoryName($this->target);                // Cleaning and checking target (file or dir)
                } else {
                        $this->target='';
index 065669b..c9e36e2 100755 (executable)
@@ -2747,9 +2747,9 @@ class tslib_cObj {
                                        $a1='<a href="'.htmlspecialchars($url).'"'.$target.$GLOBALS['TSFE']->ATagParams.'>';
                                        $a2='</a>';
                                }
-                               
-                               $string = $this->stdWrap($string,$conf['stdWrap.']); 
-                               
+
+                               $string = $this->stdWrap($string,$conf['stdWrap.']);
+
                                $content=$a1.$string.$a2;
                        }
                }
@@ -3494,7 +3494,7 @@ class tslib_cObj {
                                        while($entry=$d->read()) {
                                                if ($entry!='.' && $entry!='..')        {
                                                        $wholePath = $path.'/'.$entry;          // Because of odd PHP-error where  <br />-tag is sometimes placed after a filename!!
-                                                       if (@file_exists($wholePath) && filetype($wholePath)=='file')   {
+                                                       if (file_exists($wholePath) && filetype($wholePath)=='file')    {
                                                                $info = t3lib_div::split_fileref($wholePath);
                                                                if (!$ext_list || t3lib_div::inList($ext_list,$info['fileext']))        {
                                                                        $items['files'][] = $info['file'];
@@ -4685,7 +4685,7 @@ class tslib_cObj {
                                                                $fI = t3lib_div::split_fileref($theImage);
                                                                $imgExt = (strtolower($fI['fileext'])==$gifCreator->gifExtension ? $gifCreator->gifExtension : 'jpg');
                                                                $dest = $gifCreator->tempPath.$hash.'.'.$imgExt;
-                                                               if (!@file_exists($dest))       {               // Generate!
+                                                               if (!file_exists($dest))        {               // Generate!
                                                                        $m_mask= $maskImages['m_mask'];
                                                                        $m_bgImg = $maskImages['m_bgImg'];
                                                                        if ($m_mask && $m_bgImg)        {
@@ -5224,7 +5224,7 @@ class tslib_cObj {
                                        $finalTagParts['TYPE']='url';
                                } elseif ($containsSlash || $isLocalFile)       {       // file (internal)
                                        $splitLinkParam = explode('?', $link_param);
-                                       if (@file_exists(rawurldecode($splitLinkParam[0])) || $isLocalFile)     {
+                                       if (file_exists(rawurldecode($splitLinkParam[0])) || $isLocalFile)      {
                                                if ($linktxt=='') $linktxt = rawurldecode($link_param);
                                                if ($GLOBALS['TSFE']->config['config']['jumpurl_enable'])       {
                                                        $this->lastTypoLinkUrl = $GLOBALS['TSFE']->absRefPrefix.$GLOBALS['TSFE']->config['mainScript'].$initP.'&jumpurl='.rawurlencode($link_param).$GLOBALS['TSFE']->getMethodUrlIdToken;
@@ -6916,7 +6916,7 @@ class tslib_cObj {
                // static_* tables are allowed to be fetched from root page
                if (substr($table,0,7)=='static_') {
                        $pid_uid_flag++;
-               }               
+               }
                if (trim($conf['pidInList']))   {
                        $listArr = t3lib_div::intExplode(',',str_replace('this',$GLOBALS['TSFE']->contentPid,$conf['pidInList']));      // str_replace instead of ereg_replace 020800
                                // removes all pages which are not visible for the user!
index 41805e5..f225581 100755 (executable)
@@ -318,7 +318,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
        function gifBuild()     {
                if ($this->setup)       {
                        $gifFileName = $this->fileName('GB/');  // Relative to PATH_site
-                       if (!@file_exists($gifFileName))        {               // File exists
+                       if (!file_exists($gifFileName)) {               // File exists
 
                                        // Create temporary directory if not done:
                                $this->createTempSubDir('GB/');
index e9a3b7c..b519ac9 100755 (executable)
@@ -2155,7 +2155,7 @@ class tslib_gmenu extends tslib_menu {
                        $this->result[$resKey][$key] = $conf[$key];
 
                                // Generation of image file:
-                       if (@file_exists($gifFileName)) {               // File exists
+                       if (file_exists($gifFileName))  {               // File exists
                                $info = @getimagesize($gifFileName);
                                $this->result[$resKey][$key]['output_w']=intval($info[0]);
                                $this->result[$resKey][$key]['output_h']=intval($info[1]);
@@ -2676,7 +2676,7 @@ class tslib_imgmenu extends tslib_menu {
                                $imgHash = md5($gifFileName);
                                $imgMap = $this->sys_page->getHash($imgHash, 0);
 
-                               if ($imgMap && @file_exists($gifFileName))      {               // File exists
+                               if ($imgMap && file_exists($gifFileName))       {               // File exists
                                        $info = @getimagesize($gifFileName);
                                        $w=$info[0];
                                        $h=$info[1];
index 813945b..9c833ac 100755 (executable)
@@ -2863,7 +2863,7 @@ class tx_impexp {
 
 
                                        // Check if file exists:
-                               if (@file_exists(PATH_site.$fI['relFileName'])) {
+                               if (file_exists(PATH_site.$fI['relFileName']))  {
                                        if ($this->update)      {
                                                $pInfo['updatePath'].= 'File exists.';
                                        } else {
index 36b5c2d..954ce7f 100755 (executable)
@@ -324,7 +324,7 @@ BTW: This Install Tool will only work if cookies are accepted by your web browse
         * Returns true if submitted password is ok. Else displays a form in which to enter password.
         *
         * @param       [type]          $uKey: ...
-        * @return      bool            whether the submitted password is ok 
+        * @return      bool            whether the submitted password is ok
         */
        function checkPassword($uKey)   {
                $p = t3lib_div::_GP('password');
@@ -1852,7 +1852,7 @@ From sub-directory:
                        reset($programs);
                        if (!ereg('[\\\/]$',$v)) $v.='/';
                        while(list(,$filename)=each($programs)) {
-                               if (ini_get('open_basedir') || (@file_exists($v)&&@is_file($v.$filename.$isExt))) {
+                               if (ini_get('open_basedir') || (file_exists($v)&&@is_file($v.$filename.$isExt))) {
                                        $version = $this->_checkImageMagick_getVersion($filename,$v);
                                        if($version > 0)        {
                                                if($filename=='gm')     {       // Assume GraphicsMagick
@@ -3808,7 +3808,7 @@ From sub-directory:
 
                                                                        $this->isBasicComplete($headCode);
 
-                                                                       if ($result) {                                  
+                                                                       if ($result) {
                                                                                $this->message($headCode,'User created','
                                                                                        Username: <strong>'.htmlspecialchars($username).'</strong><br />
                                                                                        Password: <strong>'.htmlspecialchars($pass).'</strong><br />',
index e261998..1fd0636 100644 (file)
@@ -281,7 +281,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
         * @return      string  contents
         */
        function getZIPFileContents($ZIPfile, $filename)        {
-               if (@file_exists($ZIPfile))     {
+               if (file_exists($ZIPfile))      {
                                // Unzipping SXW file, getting filelist:
                        $tempPath = PATH_site.'typo3temp/tx_tsconfighelp_ziptemp/';
                        t3lib_div::mkdir($tempPath);