[BUGFIX] Use validEmail() instead of deprecated checkEmail() 89/29489/2
authorStefan Neufeind <typo3.neufeind@speedpartner.de>
Tue, 15 Apr 2014 09:51:36 +0000 (11:51 +0200)
committerStefan Neufeind <typo3.neufeind@speedpartner.de>
Tue, 15 Apr 2014 16:29:12 +0000 (18:29 +0200)
Change-Id: I72aa69adc75820cf513bb87cf2af6ea1b50a2fc7
Resolves: #57934
Releases: 4.5
Reviewed-on: https://review.typo3.org/29489
Reviewed-by: Oliver Klee
Reviewed-by: Stefan Neufeind
Tested-by: Stefan Neufeind
typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc
typo3/sysext/statictemplates/media/scripts/fe_adminLib.inc

index 8ad415b..2d66582 100755 (executable)
@@ -677,7 +677,7 @@ class user_feAdmin  {
                                                        }
                                                break;
                                                case 'email':
-                                                       if (!$this->cObj->checkEmail($this->dataArr[$theField]))        {
+                                                       if (!t3lib_div::validEmail($this->dataArr[$theField]))  {
                                                                $tempArr[]=$theField;
                                                                $this->failureMsg[$theField][] = $this->getFailure($theField, $theCmd, 'You must enter a valid email address');
                                                        }
@@ -1363,7 +1363,7 @@ class user_feAdmin        {
                                if (is_array($DBrows))  {
                                        $recipient = $DBrows[0][$this->conf['email.']['field']];
                                        $this->compileMail($config['label'], $DBrows, $recipient, $this->conf['setfixed.']);
-                               } elseif ($this->cObj->checkEmail($fetch)) {
+                               } elseif (t3lib_div::validEmail($fetch)) {
                                        $this->sendMail($fetch, '', trim($this->cObj->getSubpart($this->templateCode, '###'.$this->emailMarkPrefix.'NORECORD###')));
                                }
 
index 40a7543..1af9028 100644 (file)
@@ -679,7 +679,7 @@ class user_feAdmin  {
                                                        }
                                                break;
                                                case 'email':
-                                                       if (!$this->cObj->checkEmail($this->dataArr[$theField]))        {
+                                                       if (!t3lib_div::validEmail($this->dataArr[$theField]))  {
                                                                $tempArr[]=$theField;
                                                                $this->failureMsg[$theField][] = $this->getFailure($theField, $theCmd, 'You must enter a valid email address');
                                                        }
@@ -1365,7 +1365,7 @@ class user_feAdmin        {
                                if (is_array($DBrows))  {
                                        $recipient = $DBrows[0][$this->conf['email.']['field']];
                                        $this->compileMail($config['label'], $DBrows, $recipient, $this->conf['setfixed.']);
-                               } elseif ($this->cObj->checkEmail($fetch)) {
+                               } elseif (t3lib_div::validEmail($fetch)) {
                                        $this->sendMail($fetch, '', trim($this->cObj->getSubpart($this->templateCode, '###'.$this->emailMarkPrefix.'NORECORD###')));
                                }