* Fixed bug #7052 (revisited): Permission problem of htmlArea RTE images, using t3lib...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3113 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index a721897..5e2a6ed 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        * Fixed bug #7419: htmlArea RTE: Localization error in Remove Format plugin
        * Fixed bug #7421: htmlArea RTE: typographical error in localization file
        * Fixed bug #7052: Permission problem of htmlArea RTE images
+       * Fixed bug #7052 (revisited): Permission problem of htmlArea RTE images, using t3lib_div::fixPermissions
 
 2008-02-05  Oliver Hader  <oh@inpublica.de>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 7cf47bc..298edab 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -2,12 +2,13 @@
 
        * Fixed bug #7419: htmlArea RTE: Localization error in Remove Format plugin
        * Fixed bug #7421: htmlArea RTE: typographical error in localization file
+       * Fixed bug #7052: Permission problem of htmlArea RTE images
+       * Fixed bug #7052 (revisited): Permission problem of htmlArea RTE images, using t3lib_div::fixPermissions
 
 2008-02-04  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 
        * Fixed bug: htmlArea RTE calling t3lib_div::getUserObj() with an empty string
        * Fixed bug: htmlArea RTE: incorrect configuration of TYPO3HtmlParser plugin
-       * Fixed bug #7052: Permission problem of htmlArea RTE images
 
 2008-02-01  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_dam_browse_media.php b/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_dam_browse_media.php
index 7ea20fd..729dbe4 100644 (file)
--- a/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_dam_browse_media.php
+++ b/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_dam_browse_media.php
@@ -290,10 +290,7 @@ class tx_rtehtmlarea_dam_browse_media extends tx_dam_browse_media {
                                                if (@is_dir($destPath)) {
                                                        $destName = $fileFunc->getUniqueName($basename,$destPath);
                                                        @copy($imgInfo[3],$destName);
-                                                       if (isset($TYPO3_CONF_VARS['BE']['fileCreateMask'])) {
-                                                               @chmod($destName, octdec($TYPO3_CONF_VARS['BE']['fileCreateMask']));
-                                                       }
-                                                       
+                                                       t3lib_div::fixPermissions($destName);
                                                        $cWidth = t3lib_div::intInRange(t3lib_div::_GP('cWidth'),0,$this->magicMaxWidth);
                                                        $cHeight = t3lib_div::intInRange(t3lib_div::_GP('cHeight'),0,$this->magicMaxHeight);
                                                        if (!$cWidth)   $cWidth = $this->magicMaxWidth;
@@ -305,9 +302,7 @@ class tx_rtehtmlarea_dam_browse_media extends tx_dam_browse_media {
                                                                $mainBase='RTEmagicC_'.substr(basename($destName),10).'.'.$fI['extension'];
                                                                $destName = $fileFunc->getUniqueName($mainBase,$destPath);
                                                                @copy($imgI[3],$destName);
-                                                               if (isset($TYPO3_CONF_VARS['BE']['fileCreateMask'])) {
-                                                                       @chmod($destName, octdec($TYPO3_CONF_VARS['BE']['fileCreateMask']));
-                                                               }
+                                                               t3lib_div::fixPermissions($destName);
                                                                $iurl = $this->siteUrl.substr($destName,strlen(PATH_site));
                                                                $this->imageInsertJS($iurl,$imgI[0],$imgI[1],$imgMetaData['alt_text'],$imgMetaData[$this->imgTitleDAMColumn],substr($imgInfo[3],strlen(PATH_site)));
                                                        }

diff --git a/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php b/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php
index 5b3dd55..ebba0df 100644 (file)
--- a/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php
+++ b/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php
@@ -293,10 +293,7 @@ class tx_rtehtmlarea_select_image extends browse_links {
                                if (@is_dir($destPath)) {
                                        $destName = $fileFunc->getUniqueName($basename,$destPath);
                                        @copy($imgInfo[3],$destName);
-                                       if (isset($TYPO3_CONF_VARS['BE']['fileCreateMask'])) {
-                                               @chmod($destName, octdec($TYPO3_CONF_VARS['BE']['fileCreateMask']));
-                                       }
-                                       
+                                       t3lib_div::fixPermissions($destName);
                                        $cWidth = t3lib_div::intInRange(t3lib_div::_GP('cWidth'),0,$this->magicMaxWidth);
                                        $cHeight = t3lib_div::intInRange(t3lib_div::_GP('cHeight'),0,$this->magicMaxHeight);
                                        if (!$cWidth)   $cWidth = $this->magicMaxWidth;
@@ -308,10 +305,7 @@ class tx_rtehtmlarea_select_image extends browse_links {
                                                $mainBase='RTEmagicC_'.substr(basename($destName),10).'.'.$fI['extension'];
                                                $destName = $fileFunc->getUniqueName($mainBase,$destPath);
                                                @copy($imgI[3],$destName);
-                                               if (isset($TYPO3_CONF_VARS['BE']['fileCreateMask'])) {
-                                                       @chmod($destName, octdec($TYPO3_CONF_VARS['BE']['fileCreateMask']));
-                                               }
-                                               
+                                               t3lib_div::fixPermissions($destName);
                                                $destName = dirname($destName).'/'.rawurlencode(basename($destName));
                                                $iurl = $this->siteUrl.substr($destName,strlen(PATH_site));
                                                echo'