Fixed bug #15870: bug More instances of split() (Thanks to Jigal van Hemert)
authorSteffen Kamper <info@sk-typo3.de>
Fri, 8 Oct 2010 22:23:33 +0000 (22:23 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Fri, 8 Oct 2010 22:23:33 +0000 (22:23 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9010 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php
typo3/sysext/statictemplates/media/scripts/fe_adminLib.inc

index a76ed0b..236da0c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-09  Steffen Kamper  <steffen@typo3.org>
+
+       * Fixed bug #15870: bug More instances of split() (Thanks to Jigal van Hemert)
+
 2010-10-08  Susanne Moog  <typo3@susanne-moog.de>
 
        * Fixed bug #15580: Add calls to logDeprecatedFunction() for more deprecated functions and adjust log messages
index 7df14dc..4a3ac68 100644 (file)
@@ -598,7 +598,7 @@ class tx_felogin_pi1 extends tslib_pibase {
                                                                if (preg_match('/^http://([[:alnum:]._-]+)//', $url, $match)) {
                                                                        $redirect_domain = $match[1];
                                                                        $found = false;
-                                                                       foreach(split(',', $this->conf['domains']) as $d) {
+                                                                       foreach(t3lib_div::trimExplode(',', $this->conf['domains'], TRUE) as $d) {
                                                                                if (preg_match('/(^|\.)/'.$d.'$', $redirect_domain)) {
                                                                                        $found = true;
                                                                                        break;
index a642a0c..acbd265 100644 (file)
@@ -401,7 +401,7 @@ class user_feAdmin  {
                        foreach ($this->conf['parseValues.'] as $theField => $theValue) {
                                $listOfCommands = t3lib_div::trimExplode(',',$theValue,1);
                                foreach ($listOfCommands as $cmd) {
-                                       $cmdParts = split('\[|\]',$cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
+                                       $cmdParts = preg_split('/\[|\]/', $cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
                                        $theCmd=trim($cmdParts[0]);
                                        switch($theCmd) {
                                                case 'int':
@@ -653,7 +653,7 @@ class user_feAdmin  {
                        foreach ($this->conf[$this->cmdKey.'.']['evalValues.'] as $theField => $theValue) {
                                $listOfCommands = t3lib_div::trimExplode(',',$theValue,1);
                                foreach ($listOfCommands as $cmd) {
-                                       $cmdParts = split('\[|\]',$cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
+                                       $cmdParts = preg_split('/\[|\]/', $cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
                                        $theCmd = trim($cmdParts[0]);
                                        switch($theCmd) {
                                                case 'uniqueGlobal':
@@ -1207,7 +1207,7 @@ class user_feAdmin        {
                        foreach ($this->conf[$this->cmdKey.'.']['evalValues.'] as $theField => $theValue) {
                                $listOfCommands = t3lib_div::trimExplode(',',$theValue,1);
                                foreach ($listOfCommands as $cmd) {
-                                       $cmdParts = split('\[|\]',$cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
+                                       $cmdParts = preg_split('/\[|\]/', $cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
                                        $theCmd = trim($cmdParts[0]);
                                        switch($theCmd) {
                                                case 'twice':
@@ -1226,7 +1226,7 @@ class user_feAdmin        {
                        foreach ($this->conf['parseValues.'] as $theField => $theValue) {
                                $listOfCommands = t3lib_div::trimExplode(',',$theValue,1);
                                foreach ($listOfCommands as $cmd) {
-                                       $cmdParts = split('\[|\]',$cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
+                                       $cmdParts = preg_split('/\[|\]/', $cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
                                        $theCmd = trim($cmdParts[0]);
                                        switch($theCmd) {
                                                case 'multiple':