[TASK] Sync TER and Git 22/33622/2
authorIvan Kartolo <ivan.kartolo@gmail.com>
Thu, 30 Oct 2014 15:37:16 +0000 (16:37 +0100)
committerIvan Dharma Kartolo <ivan.kartolo@gmail.com>
Thu, 30 Oct 2014 15:39:24 +0000 (16:39 +0100)
sync the last version from TER into Git.

Resolves: #62566
Releases: 2.0
Change-Id: Ia11fec2c71be69d439a04ed928b1049b03ce0fac
Reviewed-on: http://review.typo3.org/33622
Reviewed-by: Ivan Dharma Kartolo <ivan.kartolo@gmail.com>
Tested-by: Ivan Dharma Kartolo <ivan.kartolo@gmail.com>
ext_emconf.php
fe_adminLib.inc

index c8957e3..4660559 100644 (file)
@@ -1,22 +1,22 @@
 <?php
 
-########################################################################
-# Extension Manager/Repository config file for ext "direct_mail_subscription".
-#
-# Auto generated 06-06-2012 18:34
-#
-# Manual updates:
-# Only the data in the array - everything else is removed by next
-# writing. "version" and "dependencies" must not be touched!
-########################################################################
+/***************************************************************
+ * Extension Manager/Repository config file for ext "direct_mail_subscription".
+ *
+ * Auto generated 30-10-2014 16:15
+ *
+ * Manual updates:
+ * Only the data in the array - everything else is removed by next
+ * writing. "version" and "dependencies" must not be touched!
+ ***************************************************************/
 
 $EM_CONF[$_EXTKEY] = array(
        'title' => 'Direct Mail Subscription',
        'description' => 'Adds a plugin for subscription to direct mail newsletters (collecting subscriptions in the tt_address table)',
        'category' => 'plugin',
        'shy' => 0,
-       'version' => '2.0.0',
-       'dependencies' => 'tt_address',
+       'version' => '2.0.1',
+       'dependencies' => '',
        'conflicts' => '',
        'priority' => '',
        'loadOrder' => '',
@@ -35,16 +35,14 @@ $EM_CONF[$_EXTKEY] = array(
        'constraints' => array(
                'depends' => array(
                        'tt_address' => '',
-                       'typo3' => '4.5.0-0.0.0',
+                       'typo3' => '4.5.0-6.2.99',
                ),
                'conflicts' => array(
                ),
                'suggests' => array(
                ),
        ),
-       '_md5_values_when_last_written' => 'a:13:{s:9:"ChangeLog";s:4:"2578";s:10:"README.txt";s:4:"e4af";s:12:"ext_icon.gif";s:4:"8d58";s:14:"ext_tables.php";s:4:"8517";s:14:"ext_tables.sql";s:4:"1e8e";s:15:"fe_adminLib.inc";s:4:"a5f6";s:13:"locallang.php";s:4:"1ab3";s:16:"locallang_db.xml";s:4:"f6d4";s:27:"pi/class.dmailsubscribe.php";s:4:"44f7";s:30:"pi/fe_admin_dmailsubscrip.tmpl";s:4:"a4dd";s:16:"pi/locallang.xml";s:4:"c842";s:20:"static/constants.txt";s:4:"3daf";s:16:"static/setup.txt";s:4:"e9a2";}',
-       'suggests' => array(
-       ),
+       '_md5_values_when_last_written' => 'a:13:{s:9:"ChangeLog";s:4:"2578";s:12:"ext_icon.gif";s:4:"8d58";s:14:"ext_tables.php";s:4:"8517";s:14:"ext_tables.sql";s:4:"1e8e";s:15:"fe_adminLib.inc";s:4:"715e";s:13:"locallang.php";s:4:"1ab3";s:16:"locallang_db.xml";s:4:"f6d4";s:10:"README.txt";s:4:"e4af";s:27:"pi/class.dmailsubscribe.php";s:4:"44f7";s:30:"pi/fe_admin_dmailsubscrip.tmpl";s:4:"a4dd";s:16:"pi/locallang.xml";s:4:"c842";s:20:"static/constants.txt";s:4:"3daf";s:16:"static/setup.txt";s:4:"e9a2";}',
 );
 
 ?>
\ No newline at end of file
index d4d1204..7236c2b 100644 (file)
@@ -1143,13 +1143,20 @@ class user_feAdmin      {
                        $fD = t3lib_div::_GP('fD');
                        $sFK = t3lib_div::_GP('sFK');
 
+                       $valuesConfiguredInTypoScript = isset($this->conf['setfixed.'][$sFK . '.']) ? $this->conf['setfixed.'][$sFK . '.'] : array();
+                       $fields = $valuesConfiguredInTypoScript;
+                       unset($fields['_FIELDLIST']);
+                       $fields = array_keys($fields);
+                       if (isset($valuesConfiguredInTypoScript['_FIELDLIST'])) {
+                               $fields = array_merge($fields, t3lib_div::trimExplode(',', $valuesConfiguredInTypoScript['_FIELDLIST']));
+                       }
+                       $valuesConfiguredInTypoScript['_FIELDLIST'] = implode(',', array_unique($fields));
+
                        $fieldArr=array();
-                       if (is_array($fD) || $sFK=='DELETE')    {
-                               if (is_array($fD))      {
-                                       foreach ($fD as $field => $value) {
-                                               $origArr[$field]=$value;
-                                               $fieldArr[]=$field;
-                                       }
+                       if (!empty($valuesConfiguredInTypoScript) || $sFK == 'DELETE') {
+                               foreach ($valuesConfiguredInTypoScript as $field => $value) {
+                                       $origArr[$field] = $value;
+                                       $fieldArr[] = $field;
                                }
                                $theCode = $this->setfixedHash($origArr,$origArr['_FIELDLIST']);
                                if (!strcmp($this->authCode,$theCode))  {
@@ -1157,7 +1164,9 @@ class user_feAdmin        {
                                                $this->cObj->DBgetDelete($this->theTable, $theUid, TRUE);
                                        } else {
                                                $newFieldList = implode(',',array_intersect(t3lib_div::trimExplode(',',$this->fieldList),t3lib_div::trimExplode(',',implode($fieldArr,','),1)));
-                                               $this->cObj->DBgetUpdate($this->theTable, $theUid, $fD, $newFieldList, TRUE);
+                                               unset($valuesConfiguredInTypoScript['_FIELDLIST']);
+                                               $this->cObj->DBgetUpdate($this->theTable, $theUid, $valuesConfiguredInTypoScript, $newFieldList, TRUE);
+
                                                $this->currentArr = $GLOBALS['TSFE']->sys_page->getRawRecord($this->theTable,$theUid);
                                                $this->userProcess_alt($this->conf['setfixed.']['userFunc_afterSave'],$this->conf['setfixed.']['userFunc_afterSave.'],array('rec'=>$this->currentArr, 'origRec'=>$origArr));
                                        }
@@ -1665,6 +1674,14 @@ class user_feAdmin       {
                                        $markerArray['###SYS_SETFIXED_DELETE###'] = $string;
                                        $markerArray['###SYS_SETFIXED_HSC_DELETE###'] = htmlspecialchars($string);
                                } elseif (strstr($theKey,'.'))  {
+                                       $fields = $data;
+                                       unset($fields['_FIELDLIST']);
+                                       $fields = array_keys($fields);
+                                       if (isset($data['_FIELDLIST'])) {
+                                               $fields = array_merge($fields, t3lib_div::trimExplode(',', $data['_FIELDLIST']));
+                                       }
+                                       $data['_FIELDLIST'] = implode(',', array_unique($fields));
+
                                        $theKey = substr($theKey,0,-1);
                                        if (is_array($data))    {
                                                $recCopy = $r;