Working Copy
authorwunschtacho <wunschtacho@735d13b6-9817-0410-8766-e36946ffe9aa>
Thu, 18 Oct 2012 14:07:04 +0000 (14:07 +0000)
committerwunschtacho <wunschtacho@735d13b6-9817-0410-8766-e36946ffe9aa>
Thu, 18 Oct 2012 14:07:04 +0000 (14:07 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/powermail_cond/trunk@67285 735d13b6-9817-0410-8766-e36946ffe9aa

.idea/workspace.xml
Classes/Utility/FieldlistingBackend.php
Configuration/TCA/Condition.php

index f1c525b..2e4ac16 100644 (file)
@@ -3,7 +3,8 @@
   <component name="ChangeListManager">\r
     <list default="true" readonly="true" id="500e5988-e13b-4ba1-8a60-e63a97f737a1" name="Default" comment="">\r
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />\r
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js" afterPath="$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js" />\r
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php" afterPath="$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php" />\r
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Configuration/TCA/Condition.php" afterPath="$PROJECT_DIR$/Configuration/TCA/Condition.php" />\r
     </list>\r
     <ignored path="powermail_cond@powermailt347.in2code.de.iws" />\r
     <ignored path=".idea/workspace.xml" />\r
   </component>\r
   <component name="FileEditorManager">\r
     <leaf>\r
-      <file leaf-file-name="PowermailCond.js" pinned="false" current="true" current-in-tab="true">\r
-        <entry file="file://$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js">\r
+      <file leaf-file-name="Condition.php" pinned="false" current="true" current-in-tab="true">\r
+        <entry file="file://$PROJECT_DIR$/Configuration/TCA/Condition.php">\r
           <provider selected="true" editor-type-id="text-editor">\r
-            <state line="8" column="19" selection-start="307" selection-end="307" vertical-scroll-proportion="0.14498934">\r
+            <state line="155" column="37" selection-start="5786" selection-end="5786" vertical-scroll-proportion="0.4705228">\r
               <folding />\r
             </state>\r
           </provider>\r
         </entry>\r
       </file>\r
-      <file leaf-file-name="EidClearSession.php" pinned="false" current="false" current-in-tab="false">\r
-        <entry file="file://$PROJECT_DIR$/Classes/Utility/EidClearSession.php">\r
+      <file leaf-file-name="FieldlistingBackend.php" pinned="false" current="false" current-in-tab="false">\r
+        <entry file="file://$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php">\r
           <provider selected="true" editor-type-id="text-editor">\r
-            <state line="63" column="64" selection-start="2085" selection-end="2085" vertical-scroll-proportion="-17.653847">\r
-              <folding>\r
-                <element signature="e#1285#1472#0" expanded="false" />\r
-              </folding>\r
-            </state>\r
-          </provider>\r
-        </entry>\r
-      </file>\r
-      <file leaf-file-name="Div.php" pinned="false" current="false" current-in-tab="false">\r
-        <entry file="file://$PROJECT_DIR$/Classes/Utility/Div.php">\r
-          <provider selected="true" editor-type-id="text-editor">\r
-            <state line="157" column="43" selection-start="4687" selection-end="4687" vertical-scroll-proportion="-33.76923">\r
+            <state line="160" column="42" selection-start="5616" selection-end="5616" vertical-scroll-proportion="-29.846153">\r
               <folding />\r
             </state>\r
           </provider>\r
@@ -64,7 +54,6 @@
   <component name="IdeDocumentHistory">\r
     <option name="changedFiles">\r
       <list>\r
-        <option value="$PROJECT_DIR$/Configuration/TCA/Rule.php" />\r
         <option value="$PROJECT_DIR$/oldFiles/js/powermail_cond.js" />\r
         <option value="$PROJECT_DIR$/Configuration/TypoScript/PowermailCond.js" />\r
         <option value="$PROJECT_DIR$/oldFiles/static/setup.txt" />\r
         <option value="$PROJECT_DIR$/Classes/Utility/EidGetFieldlist.php" />\r
         <option value="$PROJECT_DIR$/Resources/Public/Css/PowermailCond.css" />\r
         <option value="$PROJECT_DIR$/Configuration/TypoScript/setup.txt" />\r
-        <option value="$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php" />\r
         <option value="$PROJECT_DIR$/Classes/Utility/EidSaveInSession.php" />\r
         <option value="$PROJECT_DIR$/ext_localconf.php" />\r
         <option value="$PROJECT_DIR$/Classes/Utility/EidClearSession.php" />\r
         <option value="$PROJECT_DIR$/Classes/Utility/Div.php" />\r
         <option value="$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js" />\r
+        <option value="$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php" />\r
+        <option value="$PROJECT_DIR$/Configuration/TCA/Condition.php" />\r
       </list>\r
     </option>\r
   </component>\r
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
             </PATH_ELEMENT>\r
             <PATH_ELEMENT>\r
-              <option name="myItemId" value="Resources" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Public" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Js" />\r
+              <option name="myItemId" value="Configuration" />\r
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
             </PATH_ELEMENT>\r
           </PATH>\r
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
             </PATH_ELEMENT>\r
             <PATH_ELEMENT>\r
-              <option name="myItemId" value="Resources" />\r
+              <option name="myItemId" value="Configuration" />\r
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
             </PATH_ELEMENT>\r
             <PATH_ELEMENT>\r
-              <option name="myItemId" value="Public" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-          </PATH>\r
-          <PATH>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="powermail_cond@powermailt347.in2code.de" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="powermail_cond@powermailt347.in2code.de" />\r
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
-            </PATH_ELEMENT>\r
-            <PATH_ELEMENT>\r
-              <option name="myItemId" value="Resources" />\r
+              <option name="myItemId" value="TCA" />\r
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
             </PATH_ELEMENT>\r
           </PATH>\r
     <property name="options.splitter.main.proportions" value="0.3" />\r
     <property name="WebServerToolWindowFactoryState" value="true" />\r
     <property name="options.lastSelected" value="web.server" />\r
-    <property name="options.splitter.details.proportions" value="0.2" />\r
     <property name="options.searchVisible" value="true" />\r
+    <property name="options.splitter.details.proportions" value="0.2" />\r
   </component>\r
   <component name="PublishConfig" serverName="in2code" serverId="3ca6b370-8a73-4525-bbbd-e6d3cdda1d7f" autoUpload="true" autoUploadExternalChanges="true">\r
     <servers>\r
       <created>1350567622106</created>\r
       <updated>1350567622106</updated>\r
     </task>\r
-    <option name="localTasksCounter" value="15" />\r
+    <task id="LOCAL-00015" summary="Working Copy">\r
+      <created>1350568250101</created>\r
+      <updated>1350568250101</updated>\r
+    </task>\r
+    <option name="localTasksCounter" value="16" />\r
     <servers />\r
   </component>\r
   <component name="ToolWindowManager">\r
     <frame x="1592" y="-262" width="1936" height="1096" extended-state="6" />\r
     <editor active="true" />\r
     <layout>\r
+      <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3281412" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />\r
       <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />\r
-      <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32822478" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />\r
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />\r
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />\r
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15048026" sideWeight="0.3271028" order="1" side_tool="true" content_ui="tabs" />\r
       <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />\r
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.12753469" sideWeight="0.6718588" order="0" side_tool="false" content_ui="combo" />\r
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />\r
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />\r
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />\r
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />\r
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32917964" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />\r
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />\r
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15048026" sideWeight="0.3271028" order="1" side_tool="true" content_ui="tabs" />\r
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.12646745" sideWeight="0.6717752" order="0" side_tool="false" content_ui="combo" />\r
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />\r
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />\r
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />\r
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />\r
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />\r
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />\r
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32917964" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />\r
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32917964" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />\r
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />\r
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />\r
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />\r
         </state>\r
       </provider>\r
     </entry>\r
-    <entry file="file://$PROJECT_DIR$/ext_tables.sql">\r
-      <provider selected="true" editor-type-id="text-editor">\r
-        <state line="1" column="68" selection-start="31" selection-end="70" vertical-scroll-proportion="0.018123668" />\r
-      </provider>\r
-    </entry>\r
     <entry file="file://$PROJECT_DIR$/Classes/Utility/EidGetFieldlist.php">\r
       <provider selected="true" editor-type-id="text-editor">\r
         <state line="134" column="21" selection-start="4430" selection-end="4430" vertical-scroll-proportion="-10.666667">\r
     </entry>\r
     <entry file="file://$PROJECT_DIR$/Configuration/TypoScript/setup.txt">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="7" column="51" selection-start="352" selection-end="352" vertical-scroll-proportion="0.0">\r
-          <folding />\r
-        </state>\r
+        <state line="7" column="51" selection-start="352" selection-end="352" vertical-scroll-proportion="0.0" />\r
       </provider>\r
     </entry>\r
     <entry file="file://$PROJECT_DIR$/Resources/Public/Css/PowermailCond.css">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="2" column="11" selection-start="50" selection-end="50" vertical-scroll-proportion="0.0">\r
-          <folding />\r
-        </state>\r
-      </provider>\r
-    </entry>\r
-    <entry file="file://$PROJECT_DIR$/Configuration/TCA/Condition.php">\r
-      <provider selected="true" editor-type-id="text-editor">\r
-        <state line="103" column="30" selection-start="3295" selection-end="3295" vertical-scroll-proportion="0.02364395">\r
-          <folding />\r
-        </state>\r
-      </provider>\r
-    </entry>\r
-    <entry file="file://$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php">\r
-      <provider selected="true" editor-type-id="text-editor">\r
-        <state line="85" column="6" selection-start="3255" selection-end="3255" vertical-scroll-proportion="0.023224045">\r
-          <folding />\r
-        </state>\r
+        <state line="2" column="11" selection-start="50" selection-end="50" vertical-scroll-proportion="0.0" />\r
       </provider>\r
     </entry>\r
     <entry file="file://$PROJECT_DIR$/Classes/Utility/EidSaveInSession.php">\r
         </state>\r
       </provider>\r
     </entry>\r
+    <entry file="file://$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js">\r
+      <provider selected="true" editor-type-id="text-editor">\r
+        <state line="8" column="19" selection-start="307" selection-end="307" vertical-scroll-proportion="0.14498934">\r
+          <folding />\r
+        </state>\r
+      </provider>\r
+    </entry>\r
     <entry file="file://$PROJECT_DIR$/Classes/Utility/EidClearSession.php">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="63" column="64" selection-start="2085" selection-end="2085" vertical-scroll-proportion="-17.653847">\r
+        <state line="63" column="64" selection-start="2085" selection-end="2085" vertical-scroll-proportion="0.50328946">\r
           <folding>\r
             <element signature="e#1285#1472#0" expanded="false" />\r
           </folding>\r
     </entry>\r
     <entry file="file://$PROJECT_DIR$/Classes/Utility/Div.php">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="157" column="43" selection-start="4687" selection-end="4687" vertical-scroll-proportion="-33.76923">\r
+        <state line="157" column="43" selection-start="4687" selection-end="4687" vertical-scroll-proportion="0.9627193">\r
           <folding />\r
         </state>\r
       </provider>\r
     </entry>\r
-    <entry file="file://$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js">\r
+    <entry file="file://$PROJECT_DIR$/ext_tables.sql">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="8" column="19" selection-start="307" selection-end="307" vertical-scroll-proportion="0.14498934">\r
+        <state line="1" column="68" selection-start="31" selection-end="70" vertical-scroll-proportion="0.018123668" />\r
+      </provider>\r
+    </entry>\r
+    <entry file="file://$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php">\r
+      <provider selected="true" editor-type-id="text-editor">\r
+        <state line="160" column="42" selection-start="5616" selection-end="5616" vertical-scroll-proportion="-29.846153">\r
+          <folding />\r
+        </state>\r
+      </provider>\r
+    </entry>\r
+    <entry file="file://$PROJECT_DIR$/Configuration/TCA/Condition.php">\r
+      <provider selected="true" editor-type-id="text-editor">\r
+        <state line="155" column="37" selection-start="5786" selection-end="5786" vertical-scroll-proportion="0.4705228">\r
           <folding />\r
         </state>\r
       </provider>\r
index 700c61e..0b8b335 100644 (file)
@@ -91,7 +91,7 @@ class Tx_PowermailCond_Utility_FieldlistingBackend {
                $arr = array();
                $select = 'uid, title';
                $from = 'tx_powermail_domain_model_pages';
-               $where .= 'forms = ' . intval($formUid) . ' AND hidden = 0 AND deleted = 0';
+               $where = 'forms = ' . intval($formUid) . ' AND hidden = 0 AND deleted = 0';
                $groupBy = '';
                $orderBy = 'sorting';
                $limit = '';
@@ -126,82 +126,25 @@ class Tx_PowermailCond_Utility_FieldlistingBackend {
        }
 
        /**
-        * show all fields in the backend
-        *
-        * @param       array   $params: Params
-        * @param       object  $pObj: Parent Object
-        * @return      void
-        */
-       public function oldFieldname(&$params, $pObj) {
-               $where = '1';
-               if (isset($params['config']['itemsProcFuncValue'])) { // additional where clause
-                       $where = 'formtype IN (' . $params['config']['itemsProcFuncValue'] . ')';
-               }
-               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                       $select = 'uid, title',
-                       $from = 'tx_powermail_fields',
-                       $where .= ' AND pid = ' . intval($params['row']['pid']) . ' AND hidden = 0 AND deleted = 0',
-                       $groupBy = '',
-                       $orderBy = 'sorting',
-                       $limit = ''
-               );
-               if ($res) {
-                       $params['items'][] = array('powermail Fields', '--div--');
-                       while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
-                               $params['items'][] = array($pObj->sL($row['title']) . ' (' . $row['uid'] . ')', $row['uid']);
-                       }
-               }
-
-               if (isset($params['config']['itemsProcFunc_addFieldsets'])) { // add fieldsets to selection
-                       $params['items'] = array_merge((array) $params['items'], $this->getFieldsets($params['row']['pid'])); // add some fieldsets
-               }
-       }
-
-       /**
-        * give me all fieldsets in an array
-        *
-        * @param       integer $pid: Page ID
-        * @return      array   $arr: all fieldsets with its name and the fieldset uid
-        */
-       public function oldGetFieldsets($pid) {
-               $arr = array();
-               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                       $select = 'uid, title',
-                       $from = 'tx_powermail_fieldsets',
-                       $where .= 'pid = ' . intval($pid) . ' AND hidden = 0 AND deleted = 0',
-                       $groupBy = '',
-                       $orderBy = 'sorting',
-                       $limit = ''
-               );
-               if ($res) {
-                       $arr[] = array('powermail Fieldsets', '--div--');
-                       while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
-                               $arr[] = array($row['title'] . ' (' . $row['uid'] . ')', 'fieldset:' . $row['uid']);
-                       }
-               }
-               return $arr;
-       }
-
-       /**
         * List values of a powermail selectorbox
         *
         * @param       array   $params: Params
         * @param       object  $pObj: Parent Object
         * @return      void
         */
-       public function oldValuesFromPowermailSelectbox(&$params, $pObj) {
+       public function valuesFromPowermailSelectbox(&$params, $pObj) {
                // Get targetField UID
                $gParams = t3lib_div::_GET('edit');
-               $gParams2 = $gParams['tx_powermailcond_conditions'];
+               $gParams2 = $gParams['tx_powermailcond_domain_model_condition'];
                foreach ((array) $gParams2 as $uid => $actions) {
                        $thisConditionsUid = $uid;
                }
-               $targetField = $pObj->cachedTSconfig['tx_powermailcond_conditions:' . $thisConditionsUid]['_THIS_ROW']['targetField'];
+               $targetField = $pObj->cachedTSconfig['tx_powermailcond_domain_model_condition:' . $thisConditionsUid]['_THIS_ROW']['targetField'];
 
                // Read values from powermail
                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                       $select = 'flexform',
-                       $from = 'tx_powermail_fields',
+                       $select = 'settings',
+                       $from = 'tx_powermail_domain_model_fields',
                        $where = 'uid = ' . intval($targetField),
                        $groupBy = '',
                        $orderBy = '',
@@ -210,15 +153,14 @@ class Tx_PowermailCond_Utility_FieldlistingBackend {
                if ($res) {
                        $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
                }
-
-               // Change xml to a readable format
-               $arr = (array) t3lib_div::xml2array($row['flexform']);
-               $optionlist = $arr['data']['sDEF']['lDEF']['options']['vDEF'];
-               $options = t3lib_div::trimExplode("\n", $optionlist, 1);
+               $options = t3lib_div::trimExplode("\n", $row['settings'], 1);
 
                // write params
                foreach ((array) $options as $option) {
-                       $params['items'][] = array(htmlspecialchars($option), htmlspecialchars($option));
+                       $params['items'][] = array(
+                               htmlspecialchars($option),
+                               htmlspecialchars($option)
+                       );
                }
        }
 }
\ No newline at end of file
index 3a9186e..89fb872 100644 (file)
@@ -148,10 +148,12 @@ $TCA['tx_powermailcond_domain_model_condition'] = array (
                                'type' => 'select',
                                'items' => Array (
                                ),
-                               'itemsProcFunc' => 'tx_powermailcond_fields_be->valuesFromPowermailSelectbox',
+                               'itemsProcFunc' => 'Tx_PowermailCond_Utility_FieldlistingBackend->valuesFromPowermailSelectbox',
                                'size' => 4,
-                               'maxitems' => 1000
+                               'maxitems' => 1000,
+                               'allowNonIdValues' => '1'
                        ),
+                       'allowNonIdValues' => '1',
                        'displayCond' => 'FIELD:actions:IN:2,FIELD:form:>:0' // show only if ops value is greater than 1
                ),
                'rules' => Array (