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

15 files changed:
.idea/workspace.xml
Classes/Utility/Div.php
Classes/Utility/EidGetFieldlist.php
Configuration/TypoScript/setup.txt
Resources/Public/Css/PowermailCond.css [new file with mode: 0644]
Resources/Public/Js/PowermailCond.js
ext_localconf.php
oldFiles/js/powermail_cond.js [deleted file]
oldFiles/static/constants.txt [deleted file]
oldFiles/static/setup.txt [deleted file]
oldLib/class.tx_powermailcond_ajaxFieldList_eid.php [deleted file]
oldLib/class.tx_powermailcond_ajaxWriteInSession_eid.php [deleted file]
oldLib/class.tx_powermailcond_div.php [deleted file]
oldLib/class.tx_powermailcond_fields_be.php [deleted file]
oldLib/class.tx_powermailcond_pidContainer.php [deleted file]

index 241818c..cabb8a1 100644 (file)
@@ -2,17 +2,26 @@
 <project version="4">\r
   <component name="ChangeListManager">\r
     <list default="true" readonly="true" id="500e5988-e13b-4ba1-8a60-e63a97f737a1" name="Default" comment="">\r
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Resources/Public/Css" />\r
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Resources/Public/Css/PowermailCond.css" />\r
       <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldFiles\js\powermail_cond.js" afterPath="" />\r
       <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldFiles\static\constants.txt" afterPath="" />\r
       <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldFiles\static\setup.txt" afterPath="" />\r
       <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldLib\class.tx_powermailcond_ajaxFieldList_eid.php" afterPath="" />\r
+      <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldLib\class.tx_powermailcond_ajaxWriteInSession_eid.php" afterPath="" />\r
       <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldLib\class.tx_powermailcond_div.php" afterPath="" />\r
+      <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldLib\class.tx_powermailcond_fields_be.php" afterPath="" />\r
       <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldLib\class.tx_powermailcond_pidContainer.php" afterPath="" />\r
       <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldFiles\js" afterPath="" />\r
       <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldFiles\static" afterPath="" />\r
+      <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldFiles" afterPath="" />\r
+      <change type="DELETED" beforePath="C:\Users\einpraegsam\PhpstormProjects\powermail_cond@powermailt347.in2code.de\oldLib" afterPath="" />\r
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />\r
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Classes/Utility/Div.php" afterPath="$PROJECT_DIR$/Classes/Utility/Div.php" />\r
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Classes/Utility/EidGetFieldlist.php" afterPath="$PROJECT_DIR$/Classes/Utility/EidGetFieldlist.php" />\r
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Configuration/TypoScript/setup.txt" afterPath="$PROJECT_DIR$/Configuration/TypoScript/setup.txt" />\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$/ext_localconf.php" afterPath="$PROJECT_DIR$/ext_localconf.php" />\r
     </list>\r
     <ignored path="powermail_cond@powermailt347.in2code.de.iws" />\r
     <ignored path=".idea/workspace.xml" />\r
       <file leaf-file-name="PowermailCond.js" pinned="false" current="false" current-in-tab="false">\r
         <entry file="file://$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js">\r
           <provider selected="true" editor-type-id="text-editor">\r
-            <state line="71" column="9" selection-start="2776" selection-end="2776" vertical-scroll-proportion="0.0">\r
+            <state line="3" column="8" selection-start="177" selection-end="177" vertical-scroll-proportion="-2.04">\r
+              <folding />\r
+            </state>\r
+          </provider>\r
+        </entry>\r
+      </file>\r
+      <file leaf-file-name="setup.txt" pinned="false" current="false" current-in-tab="false">\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
+          </provider>\r
+        </entry>\r
+      </file>\r
+      <file leaf-file-name="PowermailCond.css" pinned="false" current="true" current-in-tab="true">\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.044854883">\r
               <folding />\r
             </state>\r
           </provider>\r
       <file leaf-file-name="EidGetFieldlist.php" pinned="false" current="false" current-in-tab="false">\r
         <entry file="file://$PROJECT_DIR$/Classes/Utility/EidGetFieldlist.php">\r
           <provider selected="true" editor-type-id="text-editor">\r
-            <state line="282" column="5" selection-start="10071" selection-end="10071" vertical-scroll-proportion="-8.137255">\r
-              <folding>\r
-                <element signature="e#6#984#0" expanded="true" />\r
-              </folding>\r
+            <state line="134" column="21" selection-start="4430" selection-end="4430" vertical-scroll-proportion="-10.666667">\r
+              <folding />\r
             </state>\r
           </provider>\r
         </entry>\r
       </file>\r
-      <file leaf-file-name="Div.php" pinned="false" current="true" current-in-tab="true">\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="115" column="73" selection-start="3354" selection-end="3354" vertical-scroll-proportion="0.34016395">\r
-              <folding>\r
-                <element signature="e#6#984#0" expanded="true" />\r
-              </folding>\r
+            <state line="44" column="18" selection-start="1343" selection-end="1343" vertical-scroll-proportion="16.666666">\r
+              <folding />\r
             </state>\r
           </provider>\r
         </entry>\r
@@ -75,7 +98,6 @@
   <component name="IdeDocumentHistory">\r
     <option name="changedFiles">\r
       <list>\r
-        <option value="$PROJECT_DIR$/Configuration/TCA/Condition.php" />\r
         <option value="$PROJECT_DIR$/Resources/Private/Language/locallang_db.xml" />\r
         <option value="$PROJECT_DIR$/Configuration/TCA/Rule.php" />\r
         <option value="$PROJECT_DIR$/Classes/Utility/FieldlistingBackend.php" />\r
         <option value="$PROJECT_DIR$/Configuration/TypoScript/PowermailCond.js" />\r
         <option value="$PROJECT_DIR$/oldFiles/static/setup.txt" />\r
         <option value="$PROJECT_DIR$/ext_tables.php" />\r
-        <option value="$PROJECT_DIR$/Configuration/TypoScript/setup.txt" />\r
         <option value="$PROJECT_DIR$/ext_emconf.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/EidReadSession.php" />\r
-        <option value="$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js" />\r
-        <option value="$PROJECT_DIR$/Classes/Utility/EidGetFieldlist.php" />\r
         <option value="$PROJECT_DIR$/Classes/Utility/Div.php" />\r
+        <option value="$PROJECT_DIR$/Classes/Utility/EidGetFieldlist.php" />\r
+        <option value="$PROJECT_DIR$/ext_localconf.php" />\r
+        <option value="$PROJECT_DIR$/Resources/Public/Css/PowermailCond.css" />\r
+        <option value="$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js" />\r
+        <option value="$PROJECT_DIR$/Configuration/TypoScript/setup.txt" />\r
       </list>\r
     </option>\r
   </component>\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="Css" />\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="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="Configuration" />\r
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
+            </PATH_ELEMENT>\r
+            <PATH_ELEMENT>\r
+              <option name="myItemId" value="TypoScript" />\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="Configuration" />\r
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
+            </PATH_ELEMENT>\r
           </PATH>\r
           <PATH>\r
             <PATH_ELEMENT>\r
   <component name="PropertiesComponent">\r
     <property name="options.splitter.main.proportions" value="0.3" />\r
     <property name="WebServerToolWindowFactoryState" value="true" />\r
-    <property name="options.lastSelected" value="reference.settings.deploy.options" />\r
+    <property name="options.lastSelected" value="web.server" />\r
     <property name="options.searchVisible" value="true" />\r
     <property name="options.splitter.details.proportions" value="0.2" />\r
   </component>\r
           </mappings>\r
         </serverdata>\r
       </server>\r
+      <server id="e7ae033f-60d4-485a-8ca7-9a56fea1d48f">\r
+        <serverdata>\r
+          <mappings>\r
+            <mapping local="$PROJECT_DIR$" />\r
+          </mappings>\r
+          <excludedPaths>\r
+            <ExcludedPath>\r
+              <option name="path" value="/subdomains/hiestandde/typo3conf/l10n" />\r
+            </ExcludedPath>\r
+            <ExcludedPath>\r
+              <option name="path" value="/subdomains/hiestandde/typo3conf/piwik" />\r
+            </ExcludedPath>\r
+            <ExcludedPath>\r
+              <option name="path" value="/subdomains/hiestandde/typo3conf/rsatemp" />\r
+            </ExcludedPath>\r
+            <ExcludedPath>\r
+              <option name="path" value="/" />\r
+            </ExcludedPath>\r
+          </excludedPaths>\r
+        </serverdata>\r
+      </server>\r
       <server id="fae71899-6969-4972-a4d4-323f242fa671">\r
         <serverdata>\r
           <mappings>\r
       <created>1350479766102</created>\r
       <updated>1350479766102</updated>\r
     </task>\r
-    <option name="localTasksCounter" value="9" />\r
+    <task id="LOCAL-00009" summary="Working Copy">\r
+      <created>1350486110104</created>\r
+      <updated>1350486110104</updated>\r
+    </task>\r
+    <option name="localTasksCounter" value="10" />\r
     <servers />\r
   </component>\r
   <component name="ToolWindowManager">\r
     <frame x="-8" y="-8" width="1616" height="916" extended-state="6" />\r
     <editor active="true" />\r
     <layout>\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.32917964" 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="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="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="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="true" weight="0.18146718" sideWeight="0.32694763" 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.18146718" sideWeight="0.6641124" 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.25" sideWeight="0.5" 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.17760618" sideWeight="0.67082036" 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_localconf.php">\r
+    <entry file="file://$PROJECT_DIR$/Classes/Utility/Div.php">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="15" column="78" selection-start="392" selection-end="420" vertical-scroll-proportion="0.27960527">\r
+        <state line="44" column="18" selection-start="1343" selection-end="1343" vertical-scroll-proportion="16.666666">\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="71" column="9" selection-start="2776" selection-end="2776" vertical-scroll-proportion="0.0">\r
+        <state line="1" column="68" selection-start="31" selection-end="70" vertical-scroll-proportion="0.018123668">\r
           <folding />\r
         </state>\r
       </provider>\r
     </entry>\r
-    <entry file="file://$PROJECT_DIR$/ext_tables.sql">\r
+    <entry file="file://$PROJECT_DIR$/ext_localconf.php">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="33" column="63" selection-start="957" selection-end="991" vertical-scroll-proportion="0.49253732">\r
+        <state line="6" column="101" selection-start="194" selection-end="194" vertical-scroll-proportion="0.1118421">\r
           <folding />\r
         </state>\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="282" column="5" selection-start="10071" selection-end="10071" vertical-scroll-proportion="-8.137255">\r
-          <folding>\r
-            <element signature="e#6#984#0" expanded="true" />\r
-          </folding>\r
+        <state line="134" column="21" selection-start="4430" selection-end="4430" vertical-scroll-proportion="-10.666667">\r
+          <folding />\r
         </state>\r
       </provider>\r
     </entry>\r
-    <entry file="file://$PROJECT_DIR$/Classes/Utility/Div.php">\r
+    <entry file="file://$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="115" column="73" selection-start="3354" selection-end="3354" vertical-scroll-proportion="0.34016395">\r
-          <folding>\r
-            <element signature="e#6#984#0" expanded="true" />\r
-          </folding>\r
+        <state line="3" column="8" selection-start="177" selection-end="177" vertical-scroll-proportion="-2.04">\r
+          <folding />\r
+        </state>\r
+      </provider>\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
+      </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.044854883">\r
+          <folding />\r
         </state>\r
       </provider>\r
     </entry>\r
index eac74ae..d352a54 100644 (file)
@@ -55,6 +55,8 @@ class Tx_PowermailCond_Utility_Div {
         * @return void
         */
        public function saveValueToSession($value, $form, $field) {
+               $form = intval($form);
+
                // get old session
                $oldArray = $GLOBALS['TSFE']->fe_user->getKey('ses', $this->extKey);
 
@@ -113,7 +115,7 @@ class Tx_PowermailCond_Utility_Div {
         * @param       boolean $clearSession: Clear cache of each of this fields
         * @return      string  $list: Commaseparated List with field uids
         */
-       public function getFieldsFromFieldset($uid, $formUid, $clearSession = 0) {
+       public function getFieldsFromFieldset($uid, $formUid) {
                if (is_numeric($uid)) { // if this uid don't contains fs (for fs123)
                        return $uid;
                }
index e52f048..c134a18 100644 (file)
@@ -61,6 +61,13 @@ class Tx_PowermailCond_Utility_EidGetFieldlist extends tslib_pibase {
        public $piVars;
 
        /**
+        * Session Vars
+        *
+        * @var array
+        */
+       public $session;
+
+       /**
         * Return list with fields which are not allowed (should be hidden)
         *
         * @return      string  $content:       commaseparated field list (1,2,3)
@@ -101,16 +108,15 @@ class Tx_PowermailCond_Utility_EidGetFieldlist extends tslib_pibase {
                }
 
                foreach ((array) $conf as $key => $subconf) { // one loop for every rule of current target field
-                       $ttcontentUid = $this->div->getTtcontentUid($conf[$key]['startField']);
 
                        // special case: hide a field from the beginning
                        if ($conf[$key]['actions'] == 1) { // show
-                               $content .= $this->getFieldsFromFieldset($conf[$key]['targetField'], $ttcontentUid) . ',';
+                               $content .= $this->div->getFieldsFromFieldset($conf[$key]['targetField'], $this->piVars['formUid']) . ',';
                        }
 
                        // operations
                        $act = 0;
-                       $startFieldSession = $GLOBALS['TSFE']->fe_user->sesData['powermail_' . $ttcontentUid]['uid' . $conf[$key]['startField']]; // get startfield value from session
+                       $startFieldSession = $this->session['field_' . $conf[$key]['startField']];
                        if (is_array($startFieldSession)) { // if second level
                                $startFieldSession = implode(',', $startFieldSession); // get all values in a commaseparated list
                        }
@@ -172,7 +178,7 @@ class Tx_PowermailCond_Utility_EidGetFieldlist extends tslib_pibase {
                                        break;
 
                                case 8: // "contains value from field"
-                                       $comparisonFieldSession = $GLOBALS['TSFE']->fe_user->sesData['powermail_' . $ttcontentUid]['uid' . $conf[$key]['equalField']]; // get comparisonfield value from session
+                                       $comparisonFieldSession = $this->session['field_' . $conf[$key]['equalField']]; // get comparisonfield value from session
                                        if (stristr($comparisonFieldSession, $startFieldSession)) {
                                                $act = 1;
                                                $tmp_conf = $conf[$key];
@@ -180,7 +186,7 @@ class Tx_PowermailCond_Utility_EidGetFieldlist extends tslib_pibase {
                                        break;
 
                                case 9: // "contains not value from field"
-                                       $comparisonFieldSession = $GLOBALS['TSFE']->fe_user->sesData['powermail_' . $ttcontentUid]['uid' . $conf[$key]['equalField']]; // get comparisonfield value from session
+                                       $comparisonFieldSession = $this->session['field_' . $conf[$key]['equalField']]; // get comparisonfield value from session
                                        if (!stristr($comparisonFieldSession, $startFieldSession)) {
                                                $act = 1;
                                                $tmp_conf = $conf[$key];
@@ -191,7 +197,7 @@ class Tx_PowermailCond_Utility_EidGetFieldlist extends tslib_pibase {
                        $do = $this->setDo(($act ? 1 : 0), $do, $conf[$key]['conjunction']); // $do = 1;
                }
 
-               $content = $this->doAction($do, $content, $ttcontentUid, $tmp_conf); // add new field if needed
+               $content = $this->doAction($do, $content, $tmp_conf); // add new field if needed
                return rtrim($content, ','); // return commaseparated list
        }
 
@@ -200,23 +206,22 @@ class Tx_PowermailCond_Utility_EidGetFieldlist extends tslib_pibase {
         *
         * @param       boolean $do: If something should be done or not
         * @param       string  $content: List with all fields which should be hidden
-        * @param       integer $ttcontentUid: UID of this tt_content
         * @param       array   $conf: Configuration of current field
         * @return      string list
         */
-       public function doAction($do, $content, $ttcontentUid, $conf) {
+       public function doAction($do, $content, $conf) {
                if (!$do) {
                        return $content;
                }
 
                switch ($conf['actions']) {
                        case 0: // hide
-                               $this->div->saveInSession(array('uid' . $conf['targetField'] => ''), 'powermail_' . $ttcontentUid); // remove value from session of this field
-                               $content .= $this->getFieldsFromFieldset($conf['targetField'], $ttcontentUid, 1) . ','; // hide this field
+                               $this->div->saveValueToSession('', $this->piVars['formUid'], $conf['targetField']); // remove value from session of this field
+                               $content .= $this->getFieldsFromFieldset($conf['targetField'], $this->piVars['formUid']) . ','; // hide this field
                                break;
 
                        case 1: // show
-                               $content = t3lib_div::rmFromList($this->getFieldsFromFieldset($conf['targetField'], $ttcontentUid), $content); // remove from hidelist (show this field)
+                               $content = t3lib_div::rmFromList($this->div->getFieldsFromFieldset($conf['targetField'], $this->piVars['formUid']), $content); // remove from hidelist (show this field)
                                break;
 
                        case 2: // filter from selectbox
@@ -289,7 +294,6 @@ class Tx_PowermailCond_Utility_EidGetFieldlist extends tslib_pibase {
         */
        private function getCObj() {
                $this->piVars = t3lib_div::_GET($this->prefixId);
-               $this->div = t3lib_div::makeInstance('Tx_PowermailCond_Utility_Div'); // Create new instance for div class
                $userObj = tslib_eidtools::initFeUser();
                $temp_TSFEclassName = t3lib_div::makeInstance('tslib_fe');
                $GLOBALS['TSFE'] = new $temp_TSFEclassName($TYPO3_CONF_VARS, 0, 0, true);
@@ -302,6 +306,9 @@ class Tx_PowermailCond_Utility_EidGetFieldlist extends tslib_pibase {
                $GLOBALS['TSFE']->getConfigArray();
                $GLOBALS['TSFE']->includeTCA();
 
+               $this->div = t3lib_div::makeInstance('Tx_PowermailCond_Utility_Div'); // Create new instance for div class
+               $this->session = $this->div->getAllSessionValuesFromForm($this->piVars['formUid']);
+
                return t3lib_div::makeInstance('tslib_cObj');
        }
 
index f737824..8f44aa1 100644 (file)
@@ -4,4 +4,5 @@ page.headerData.3131.value (
        <meta http-equiv="cache-control" content="no-cache" />
        <meta http-equiv="pragma" content="no-cache" />
 )
-page.includeJSFooter.powermail_cond = EXT:powermail_cond/Resources/Public/Js/PowermailCond.js
\ No newline at end of file
+page.includeJSFooter.powermail_cond = EXT:powermail_cond/Resources/Public/Js/PowermailCond.js
+page.includeCSS.powermail_cond = EXT:powermail_cond/Resources/Public/Css/PowermailCond.css
\ No newline at end of file
diff --git a/Resources/Public/Css/PowermailCond.css b/Resources/Public/Css/PowermailCond.css
new file mode 100644 (file)
index 0000000..c112fbc
--- /dev/null
@@ -0,0 +1,6 @@
+form.powermail_form {
+       -moz-opacity: 0.1;
+       -webkit-opacity: 0.1;
+       opacity: 0.1;
+       filter: alpha(opacity=10);
+}
\ No newline at end of file
index 20aadf7..c510b17 100644 (file)
@@ -12,18 +12,18 @@ jQuery(document).ready(function() {
                cache: false, // disable cache (for ie)
                success: function(data) { // return values
                        if (data) { // if there is a response
-                               $('form.powermail_form').append(data);
                                var sets = data.split(';');
                                for (var i=0; i < sets.length; i++) { // for each field which should be filled
                                        var tmp_value = sets[i].split(':');
                                        fieldValue(tmp_value[0], tmp_value[1]);
                                }
                        }
+                       $('form.powermail_form').fadeTo('fast', 1);
                }
        });
 
        // save values via ajax to session
-       $('.powermail_input, .powermail_textarea, .powermail_select, .powermail_radio, .powermail_checkbox').change(function() {
+       $('.powermail_input, .powermail_textarea, .powermail_select, .powermail_radio, .powermail_checkbox').bind('change, keyup', function() {
                $this = $(this); // caching
                var formUid = $('input[name="tx_powermail_pi1[form]"]').val(); // form uid
                var url = base + '/index.php';
@@ -189,7 +189,7 @@ function showAll() {
 }
 
 /**
- * Clear value of an inputfield, set selectedIndex to 0 for selection and so on
+ * Clear value of an inputfield, set selectedIndex to 0 for selection, don't clear value of submit buttons
  *
  * @param      string  selection: selection for jQuery (e.g. input.powermail)
  * @return     void
@@ -198,7 +198,7 @@ function clearValue(selection) {
        if ($(selection).attr('type') == 'radio' || $(selection).attr('type') == 'checkbox') {
                $(selection).attr('checked', false);
        } else {
-               $(selection).val('');
+               $(selection).not(':submit').val('');
        }
 }
 
index e6c0e7f..542e087 100644 (file)
@@ -4,7 +4,7 @@ if (!defined ('TYPO3_MODE')) {
 }
 
 // Show Tables in Page View
-$TYPO3_CONF_VARS['EXTCONF']['cms']['db_layout']['addTables']['tx_powermailcond_conditions'][0] = array(
+$TYPO3_CONF_VARS['EXTCONF']['cms']['db_layout']['addTables']['tx_powermailcond_domain_model_condition'][0] = array(
        'fList' => 'title',
        'icon' => TRUE,
 );
diff --git a/oldFiles/js/powermail_cond.js b/oldFiles/js/powermail_cond.js
deleted file mode 100644 (file)
index 8a33d72..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-jQuery(document).ready(function() {
-       var fieldsOnChange = '.powermail_text, .powermail_textarea, .powermail_select, .powermail_radio, .powermail_check'; // all fields with events
-       if ($('form.tx_powermail_pi1_form').length > 0) { // only if the powermail form is on the page (not for confirmation page)
-               checkConditions(0); // check if something should be changed
-       }
-       
-       // save values via ajax to session
-       $(fieldsOnChange).change(function() {
-               //var url = self.location.href;
-               var pid = $('#powermail_cond_pid_container').val();
-               var url = '/index.php';
-               var timestamp = Number(new Date()); // timestamp is needed for a internet explorer workarround (always change a parameter)
-               var value = $(this).val(); // current value
-               var uid = $(this).attr('id').substr(3); // current uid (without "uid")
-               if ($(this).attr('type') == 'radio') { // if field is a radiobutton
-                       var tmp_uid = uid.split('_'); // split on _
-                       uid = tmp_uid[0]; // we want only the uid (not the subuid)
-               }
-               var name = $(this).attr('name');
-               if (this.type == 'checkbox' && this.checked == false) { // no checkbox workarround
-                       value = '';
-               }
-               if (name.indexOf('tx_powermail_pi1') == '-1') { // if checkbox workarround from powermail
-                       var value = $('#' + name.substr(6)).val();
-                       var uid = $('#' + name.substr(6)).attr('id').substr(3);
-               }
-               var params = 'eID=' + 'powermailcond_saveToSession' + '&id=' + pid + '&tx_powermailcond_pi1[uid]=' + uid + '&tx_powermailcond_pi1[value]=' + value + '&ts=' + timestamp;
-               
-               $.ajax({
-                       type: 'GET', // type
-                       url: url, // send to this url
-                       data: params, // add params
-                       cache: false, // disable cache (for ie)
-                       success: function(data) { // return values
-                               if (data != '') { // if there is a response
-                                       //alert(data); // alert the response
-                                       $('form.tx_powermail_pi1_form').append('Error in powermail_cond.js in change function:' + data);
-                               }
-                               checkConditions(uid); // check if something should be changed
-                       }
-               });
-       });
-       
-});
-
-/**
- * Main function to check conditions and do something (if necessary)
- *
- * @param      integer uid: Field uid (if available)
- * @return     void
- */
-function checkConditions(uid) {
-       //var url = self.location.href;
-       var pid = $('#powermail_cond_pid_container').val();
-       var url = '/index.php';
-       var params = '';
-       if (uid > 0) {
-               params += '&tx_powermailcond_pi1[uid]=' + uid;
-       }
-       $.ajax({
-               type: 'GET', // type
-               url: url, // send to this url
-               data: 'eID=' + 'powermailcond_getFieldStatus' + params + '&id=' + pid, // add params
-               cache: false, // disable cache (for ie)
-               beforeSend: function() {
-                       document.body.style.cursor = 'progress'; // change cursor to busy
-               },
-               complete: function() {
-                       document.body.style.cursor = 'auto'; // normal cursor
-               },
-               success: function(data) { // return values
-                       if (data != 'nochange') {
-                               $('.powermail_select option').show(); // show all options at the beginning
-                               $('.powermail_select option').removeAttr('disabled'); // enable all options at the beginning
-                               if (data != '') { // if there is a response
-                                       if (data.length < 500) { // stop if wrong result (maybe complete t3 page)
-                                               doAction(data); // hide all given fields
-                                       }
-                               } else { // if there is no response
-                                       $('.tx_powermail_pi1_fieldwrap_html').show(); // show all fields
-                                       $('.tx-powermail-pi1_fieldset').show(); // show all fieldsets at the beginning
-                               }
-                       }
-               },
-               error: function() {
-                       //alert("Error in powermail_cond.js:\n");
-                       $('form.tx_powermail_pi1_form').append('Error in powermail_cond.js in checkCondtions function by opening the url ' + url + '?' + data);
-               }
-       });
-}
-
-/**
- * Do some actions (hide and/or filter)
- *
- * @param      string  list: commaseparated list with uids (1,2,3)
- * @return     void
- */
-function doAction(list) {
-       $('.tx_powermail_pi1_fieldwrap_html').show(); // show all fields at the beginning
-       $('.tx-powermail-pi1_fieldset').show(); // show all fieldsets at the beginning
-       
-       var uid = list.split(',');
-       if (uid.length < 1) { 
-               return false; // stop process   
-       }
-       for (i=0; i<uid.length; i++) { // one loop for every affected field
-               if (uid[i].indexOf('fieldset:') != '-1') { // fieldset part
-                       hideFieldset(uid[i]);
-               } else if (uid[i].indexOf('filter:') != '-1') { // filter part
-                       filterSelection(uid[i]);
-               } else { // fields part
-                       hideField(uid[i]);
-               }
-       }
-}
-
-/**
- * Hide some fields and clear there value
- *
- * @param      string  string: mix of uid and values (fieldset:5:12;13;14)
- * @return     void
- */
-function hideFieldset(string) {
-       var params = string.split(':'); // filter / uid / values
-       var values = params[2].split(';'); // value1 / value2 / value3
-       $('fieldset.tx-powermail-pi1_fieldset_' + params[1]).hide(); // hide current fieldset
-       for (k=0; k<values.length; k++) { // one loop for every field inside the fieldset
-               clearValue('.powermail_uid' + values[k]); // clear value of current field
-       }
-}
-
-/**
- * Hide some fields and clear there value
- *
- * @param      integer uid: uid of the element
- * @return     void
- */
-function hideField(uid) {
-       $('div.tx_powermail_pi1_fieldwrap_html_' + uid).hide(); // hide current field
-       if ($('.powermail_uid' + uid).val() != '') { // only if value is not yet empty
-               clearValue('.powermail_uid' + uid); // clear value of current field
-               clearSession(uid); // clear value of current field
-       }
-}
-
-/**
- * Hide some fields and clear there value
- *
- * @param      string  string: mix of uid and values (filter:123:Value1;Value2;Value3)
- * @return     void
- */
-function filterSelection(string) {
-       var params = string.split(':'); // filter / uid / values
-       var values = params[2].split(';'); // value1 / value2 / value3
-       $('select.powermail_uid' + params[1] + ' option').hide(); // disable all options
-       $('select.powermail_uid' + params[1] + ' option').attr('disabled', 'disabled'); // disable all options
-       
-       for (j=0; j<values.length; j++) { // one loop for every option in select field
-               $('select.powermail_uid' + params[1] + ' option:contains(' + values[j] + ')').show(); // show this option
-               $('select.powermail_uid' + params[1] + ' option:contains(' + values[j] + ')').removeAttr('disabled'); // enable this option
-       }
-       
-       var valueSelected = $('select.powermail_uid' + params[1] + ' option:selected').val(); // give me the value of the selected option
-       if (params[2].indexOf(valueSelected) == '-1') { // if current selected value is one of the not allowed options
-               $('select.powermail_uid' + params[1]).get(0).selectedIndex = 0; // remove selection (because the selected option is not allowed)
-       }
-}
-
-/**
- * Clear value of an inputfield, set selectedIndex to 0 for selection and so on
- *
- * @param      string  selection: selection for jQuery (e.g. input.powermail)
- * @return     void
- */
-function clearValue(selection) {
-       if ($(selection).attr('type') == 'radio' || $(selection).attr('type') == 'checkbox') {
-               $(selection).attr('checked', false);
-       } else {
-               $(selection).val('');
-       }
-}
-
-/**
- * Clear session of a uid
- *
- * @param      integer uid: uid of the element
- * @return     void
- */
-function clearSession(uid) {
-       //var url = self.location.href;
-       var pid = $('#powermail_cond_pid_container').val();
-       var url = '/index.php';
-       var timestamp = Number(new Date()); // timestamp is needed for a internet explorer workarround (always change a parameter)
-       var params = 'eID=' + 'powermailcond_saveToSession' + '&id=' + pid + '&tx_powermailcond_pi1[uid]=' + uid + '&tx_powermailcond_pi1[value]=&ts=' + timestamp;
-       
-       $.ajax({
-               type: 'GET', // type
-               url: url, // send to this url
-               data: params, // add params
-               cache: false, // disable cache (for ie)
-               success: function(data) { // return values
-                       if (data != '') { // if there is a response
-                               //alert(data); // alert the response
-                               $('form.tx_powermail_pi1_form').append('Error in powermail_cond.js in clearSession function:' + data);
-                       }
-                       checkConditions(uid); // check if something should be changed
-               }
-       });
-};
\ No newline at end of file
diff --git a/oldFiles/static/constants.txt b/oldFiles/static/constants.txt
deleted file mode 100644 (file)
index 7840948..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Unbenanntes Dokument</title>
-</head>
-
-<body>
-</body>
-</html>
diff --git a/oldFiles/static/setup.txt b/oldFiles/static/setup.txt
deleted file mode 100644 (file)
index f737824..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-page.headerData.3131 = TEXT
-page.headerData.3131.value (
-       <meta http-equiv="expires" content="0" />
-       <meta http-equiv="cache-control" content="no-cache" />
-       <meta http-equiv="pragma" content="no-cache" />
-)
-page.includeJSFooter.powermail_cond = EXT:powermail_cond/Resources/Public/Js/PowermailCond.js
\ No newline at end of file
diff --git a/oldLib/class.tx_powermailcond_ajaxFieldList_eid.php b/oldLib/class.tx_powermailcond_ajaxFieldList_eid.php
deleted file mode 100644 (file)
index ccddd0b..0000000
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 Alexander Kellner <alexander.kellner@in2code.de>, in2code.
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
-require_once(PATH_t3lib . 'class.t3lib_befunc.php');
-require_once(PATH_t3lib . 'stddb/tables.php');
-require_once(t3lib_extMgm::extPath('cms', 'ext_tables.php'));
-require_once(PATH_tslib . 'class.tslib_pibase.php');
-require_once(PATH_tslib . 'class.tslib_fe.php');
-require_once(PATH_t3lib . 'class.t3lib_page.php');
-require_once(t3lib_extMgm::extPath('powermail_cond') . 'lib/class.tx_powermailcond_div.php'); // load div class
-
-/**
- * This class tells jQuery which field are allowed in which are not allowed
- *
- * @author     Alex Kellner <alexander.kellner@in2code.de>, in2code.
- * @package    TYPO3
- * @subpackage tx_powermailcond_ajaxWriteInSession_eid
- */
-class tx_powermailcond_ajaxFieldList_eid extends tslib_pibase {
-
-       public $extKey = 'powermail_cond'; // Extension key
-       public $prefixId = 'tx_powermailcond_pi1';
-       public $piVars;
-       private $content = '';
-       
-       /**
-        * Return list with fields which are not allowed (should be hidden)
-        *
-        * @return      string  $content:       commaseparated field list (1,2,3) 
-        *                                                              complex list could be:
-        *                                                              filter:12:option1;option2,12,13,fieldset:2:18;19 
-        *                                                              explanation - filter select.uid12, hide uid12, hide uid3, hide fieldset uid2 and clear uid18 and uid19
-        */
-    public function main() {
-               $this->cObj = $this->getCObj(); // enable TSFE globals
-               $conditions = $this->getConditionsFromThisPage(); // get conditions from database
-               $targetFields = $this->div->getStartFields($conditions); // get all startfields in an array
-               if ($this->piVars['uid'] > 0 && !in_array($this->piVars['uid'], $targetFields)) { // if current field uid given and this
-                       return 'nochange';
-               }
-               
-               foreach ((array) $conditions as $targetUid => $conf) { // one loop for every single target field
-                       $content .= $this->checkRules($conf) . ','; // add list to content object
-               }
-               
-               $content = t3lib_div::rm_endcomma($content); // remove last ,
-               $content = t3lib_div::uniqueList($content); // remove double values
-               
-               return $content;
-    }
-       
-       /**
-        * Preflight function checks the rules if there should be an action (show/hide) or not
-        *
-        * @param       array   $conf: Configuration of current field
-        * @return      boolean true:hide false:show(nothing)
-        */
-       public function checkRules($conf) {
-               $content = '';
-               $do = 0; // start with 0
-               if ($conf[0]['conjunction'] == 'AND') {
-                       $do = 1; // start with 1
-               }
-               
-               foreach ((array) $conf as $key => $subconf) { // one loop for every rule of current target field
-                       $ttcontentUid = $this->div->getTtcontentUid($conf[$key]['startField']);
-                       
-                       // special case: hide a field from the beginning
-                       if ($conf[$key]['actions'] == 1) { // show
-                               $content .= $this->getFieldsFromFieldset($conf[$key]['targetField'], $ttcontentUid) . ',';
-                       }
-                        
-                       // operations
-                       $act = 0;
-                       $startFieldSession = $GLOBALS['TSFE']->fe_user->sesData['powermail_' . $ttcontentUid]['uid' . $conf[$key]['startField']]; // get startfield value from session
-                       if (is_array($startFieldSession)) { // if second level
-                               $startFieldSession = implode(',', $startFieldSession); // get all values in a commaseparated list
-                       }
-                       switch ($conf[$key]['ops']) {
-                               case 0: // "not empty"
-                                       if ($startFieldSession != '') { // if start field value in session is not empty
-                                               $act = 1;
-                                               $tmp_conf = $conf[$key];
-                                       } 
-                                       break;
-                                       
-                               case 1: // "empty"
-                                       if ($startFieldSession == '') { // if start field value in session is empty
-                                               $act = 1;
-                                               $tmp_conf = $conf[$key];
-                                       } 
-                                       break;
-                                       
-                               case 2: // "contains"
-                                       if (stristr($startFieldSession, $conf[$key]['condstring'])) { // if start field value in session contains condstring
-                                               $act = 1;
-                                               $tmp_conf = $conf[$key];
-                                       } 
-                                       break;
-                                       
-                               case 3: // "not contains"
-                                       if (!stristr($startFieldSession, $conf[$key]['condstring'])) { // if start field value in session contains not condstring
-                                               $act = 1;
-                                               $tmp_conf = $conf[$key];
-                                       } 
-                                       break;
-                                       
-                               case 4: // "is"
-                                       if ($startFieldSession === $conf[$key]['condstring']) { // if start field value in session === condstring
-                                               $act = 1;
-                                               $tmp_conf = $conf[$key];
-                                       } 
-                                       break;
-                                       
-                               case 5: // "is not"
-                                       if ($startFieldSession !== $conf[$key]['condstring']) { // if start field value in session is not condstring
-                                               $act = 1;
-                                               $tmp_conf = $conf[$key];
-                                       } 
-                                       break;
-                                       
-                               case 6: // "is greater than"
-                                       if (intval($startFieldSession) > intval($conf[$key]['condstring'])) { // if start field value in session is greater than condstring
-                                               $act = 1;
-                                               $tmp_conf = $conf[$key];
-                                       } 
-                                       break;
-                                       
-                               case 7: // "is less than"
-                                       if (intval($startFieldSession) < intval($conf[$key]['condstring'])) { // if start field value in session is greater than condstring
-                                               $act = 1;
-                                               $tmp_conf = $conf[$key];
-                                       }
-                                       break;
-                                       
-                               case 8: // "contains value from field"
-                                       $comparisonFieldSession = $GLOBALS['TSFE']->fe_user->sesData['powermail_' . $ttcontentUid]['uid' . $conf[$key]['equalField']]; // get comparisonfield value from session
-                                       if (stristr($comparisonFieldSession, $startFieldSession)) {
-                                               $act = 1;
-                                               $tmp_conf = $conf[$key];
-                                       }
-                                       break;
-                                       
-                               case 9: // "contains not value from field"
-                                       $comparisonFieldSession = $GLOBALS['TSFE']->fe_user->sesData['powermail_' . $ttcontentUid]['uid' . $conf[$key]['equalField']]; // get comparisonfield value from session
-                                       if (!stristr($comparisonFieldSession, $startFieldSession)) {
-                                               $act = 1;
-                                               $tmp_conf = $conf[$key];
-                                       }
-                                       break;
-                       }
-                       
-                       $do = $this->setDo(($act ? 1 : 0), $do, $conf[$key]['conjunction']); // $do = 1;
-               }
-               
-               $content = $this->doAction($do, $content, $ttcontentUid, $tmp_conf); // add new field if needed
-               return t3lib_div::rm_endcomma($content); // return commaseparated list
-       }
-       
-       /**
-        * This function return current field uid if this field should be hidden (and removes value from session)
-        *
-        * @param       boolean $do: If something should be done or not
-        * @param       string  $content: List with all fields which should be hidden
-        * @param       integer $ttcontentUid: UID of this tt_content
-        * @param       array   $conf: Configuration of current field
-        * @return      string list
-        */
-       public function doAction($do, $content, $ttcontentUid, $conf) {
-               if (!$do) {
-                       return $content;
-               }
-               
-               switch ($conf['actions']) {
-                       case 0: // hide
-                               $this->div->saveInSession(array('uid' . $conf['targetField'] => ''), 'powermail_' . $ttcontentUid); // remove value from session of this field
-                               $content .= $this->getFieldsFromFieldset($conf['targetField'], $ttcontentUid, 1) . ','; // hide this field
-                               break;
-                               
-                       case 1: // show
-                               $content = t3lib_div::rmFromList($this->getFieldsFromFieldset($conf['targetField'], $ttcontentUid), $content); // remove from hidelist (show this field)
-                               break;
-                               
-                       case 2: // filter from selectbox
-                               $content .= 'filter:' . $conf['targetField'] . ':' . str_replace(',', ';', $conf['filterSelectField']);
-                               break;
-               }
-               
-               return $content;
-       }
-       
-       /**
-        * Set a value to 0 or 1 depending on previous value and on conjunction (AND/OR)
-        *
-        * @param       boolean $newStatus: New status
-        * @param       boolean $oldStatus: Old status
-        * @param       string  $conjunction: AND or OR
-        * @return      boolean
-        */
-       private function setDo($newStatus, $oldStatus = 0, $conjunction = 'OR') {
-               //t3lib_div::debug(array($newStatus, $oldStatus), $conjunction);
-               if ($conjunction == 'OR') {
-                       if ($newStatus || $oldStatus) {
-                               return 1;
-                       } else {
-                               return 0;
-                       }
-               } elseif ($conjunction == 'AND') {
-                       if ($newStatus && $oldStatus) {
-                               return 1;
-                       } else {
-                               return 0;
-                       }
-               }
-       }
-       
-       /**
-        * get condition as array from current page
-        *
-        * @return      array   $arr: Array with all conditions of the current page
-        */
-       private function getConditionsFromThisPage() {
-               $arr = array();
-               $pid = t3lib_div::_GET('id');
-               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery ( // Get all rules to current field
-                       'tx_powermailcond_conditions.targetField, tx_powermailcond_conditions.actions, tx_powermailcond_conditions.conjunction, tx_powermailcond_conditions.filterSelectField, tx_powermailcond_rules.startField, tx_powermailcond_rules.ops, tx_powermailcond_rules.condstring, tx_powermailcond_rules.equalField',
-                       'tx_powermailcond_conditions LEFT JOIN tx_powermailcond_rules ON tx_powermailcond_conditions.uid = tx_powermailcond_rules.conditions',
-                       $where_clause = (intval($pid) ? 'tx_powermailcond_conditions.pid = ' . intval($pid) : '1') . $this->cObj->enableFields('tx_powermailcond_conditions') . $this->cObj->enableFields('tx_powermailcond_rules'),
-                       $groupBy = 'tx_powermailcond_rules.uid',
-                       $orderBy = '',
-                       $limit = '1000'
-               );
-               if ($res) { // If there is a result
-                       while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) { // One loop for every rule on current page
-                               $arr[$row['targetField']][] = $row;
-                       }
-                       
-                       return $arr;
-               }
-       }
-       
-       /**
-        * Get all fields in a commaseparated list from a fieldset uid
-        *
-        * @param       integer $uid: Fieldset UID
-        * @param       integer $ttcontentUid: UID of this tt_content
-        * @param       boolean $clearSession: Clear cache of each of this fields
-        * @return      string  $list: Commaseparated List with field uids
-        */
-       private function getFieldsFromFieldset($uid, $ttcontentUid, $clearSession = 0) {
-               if (is_numeric($uid)) { // if this uid don't contains fs (for fs123)
-                       return $uid;
-               }
-               
-               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery (
-                       'tx_powermail_fields.uid',
-                       'tx_powermail_fieldsets LEFT JOIN tx_powermail_fields ON tx_powermail_fieldsets.uid = tx_powermail_fields.fieldset',
-                       $where = 'tx_powermail_fieldsets.uid = ' . intval(str_replace('fieldset:', '', $uid)),
-                       $groupBy = '',
-                       $orderBy = '',
-                       $limit = '1000'
-               );
-               if ($res) { // If there is a result
-                       $uids = '';
-                       while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) { // One loop for every field
-                               $uids .= $row['uid'] . ';';
-                               $this->div->saveInSession(array('uid' . $row['uid'] => ''), 'powermail_' . $ttcontentUid); // remove value from session of this field
-                       }
-               }
-               
-               if (!isset($uids)) {
-                       return $uid;
-               }
-               
-               return $uid . ':' . substr($uids, 0, -1); // return without last ;
-       }
-       
-       /**
-        * Initialize cObj and TSFE Globals
-        *
-        * @return      object  cObj
-        */
-       private function getCObj() {
-               $this->piVars = t3lib_div::_GET($this->prefixId);
-               $this->div = t3lib_div::makeInstance('tx_powermailcond_div'); // Create new instance for div class
-               $userObj = tslib_eidtools::initFeUser();                                            
-               $temp_TSFEclassName = t3lib_div::makeInstance('tslib_fe');
-               $GLOBALS['TSFE'] = new $temp_TSFEclassName($TYPO3_CONF_VARS, 0, 0, true);
-               $GLOBALS['TSFE']->connectToDB();
-               $GLOBALS['TSFE']->fe_user = $userObj;
-               $GLOBALS['TSFE']->id = t3lib_div::_GET('id');
-               $GLOBALS['TSFE']->determineId();
-               $GLOBALS['TSFE']->getCompressedTCarray();
-               $GLOBALS['TSFE']->initTemplate();
-               $GLOBALS['TSFE']->getConfigArray();
-               $GLOBALS['TSFE']->includeTCA();
-               
-               return t3lib_div::makeInstance('tslib_cObj');
-    }
-       
-}
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/powermail_cond/lib/class.tx_powermailcond_ajaxFieldList_eid.php'])    {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/powermail_cond/lib/class.tx_powermailcond_ajaxFieldList_eid.php']);
-}
-
-$SOBE = t3lib_div::makeInstance('tx_powermailcond_ajaxFieldList_eid'); // make instance
-echo $SOBE->main(); // print content
-?>
\ No newline at end of file
diff --git a/oldLib/class.tx_powermailcond_ajaxWriteInSession_eid.php b/oldLib/class.tx_powermailcond_ajaxWriteInSession_eid.php
deleted file mode 100644 (file)
index 1f8449b..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 Alexander Kellner <alexander.kellner@in2code.de>, in2code.
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
-require_once(PATH_t3lib . 'class.t3lib_befunc.php');
-require_once(PATH_t3lib . 'stddb/tables.php');
-require_once(t3lib_extMgm::extPath('cms', 'ext_tables.php'));
-require_once(PATH_tslib . 'class.tslib_pibase.php');
-require_once(t3lib_extMgm::extPath('powermail_cond') . 'lib/class.tx_powermailcond_div.php'); // load div class
-
-/**
- * This class is for storing values to the session on every fieldchange (via AJAX)
- *
- * @author     Alex Kellner <alexander.kellner@in2code.de>, in2code.
- * @package    TYPO3
- * @subpackage tx_powermailcond_ajaxWriteInSession_eid
- */
-class tx_powermailcond_ajaxWriteInSession_eid extends tslib_pibase {
-
-       public $extKey = 'powermail_cond'; // Extension key
-       public $prefixId = 'tx_powermailcond_pi1';
-       private $debug = false;
-       
-       /**
-        * Write values to session - main method called via AJAX
-        * Call this with index.php?id=97&eID=powermailcond_ajax&tx_powermailcond_pi1[uid]=5&tx_powermailcond_pi1[value]=test
-        *
-        * @return      void
-        */
-    public function main() {
-               // config
-               $this->getCObj(); // enable TSFE globals
-               $GLOBALS['TSFE']->sesData = tslib_eidtools::initFeUser();
-               $piVars = t3lib_div::_GP($this->prefixId); // GET param
-               $uids = t3lib_div::trimExplode('_', $piVars['uid']);
-               $uid = intval($uids[0]); // uid of current field
-               $value = htmlspecialchars($piVars['value']); // value from current field
-               $this->div = t3lib_div::makeInstance('tx_powermailcond_div'); // Create new instance for div class
-               $ttcontent_uid = $this->div->getTtcontentUid($uid); // get tt_content uid to current field
-               
-               // start
-               if ($uid == 0) {
-                       return false;
-               }
-               if (isset($uids[1])) { // second level
-                       $oldSession = array();
-                       $arr['uid' . $uid] = $GLOBALS['TSFE']->fe_user->sesData['powermail_' . $ttcontent_uid]['uid' . $uid];
-                       $arr['uid' . $uid][$uids[1]] = $value;
-                       $this->div->saveInSession($arr, 'powermail_' . $ttcontent_uid); // save values to session
-               } else { // first level
-                       $arr = array(
-                               'uid' . $uid => $value
-                       );
-                       $this->div->saveInSession($arr, 'powermail_' . $ttcontent_uid); // save values to session
-               }
-               
-               if ($this->debug) {
-                       t3lib_div::debug($arr, 'powermail_' . $ttcontent_uid);
-               }
-    }
-       
-       /**
-        * Get tt_content UID from field UID
-        *
-        * @param       integer $fuid: UID of tx_powermail_fields
-        * @return      integer $uid: tt_content UID
-        */
-       private function getTtcontentUid($fuid) {
-               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery ( // DB query
-                       'tt_content.uid',
-                       'tx_powermail_fieldsets LEFT JOIN tx_powermail_fields ON tx_powermail_fieldsets.uid = tx_powermail_fields.fieldset LEFT JOIN tt_content ON tx_powermail_fieldsets.tt_content = tt_content.uid',
-                       'tx_powermail_fields.uid = ' . intval($fuid),
-                       '',
-                       '',
-                       1
-               );
-               if (!$res) { // If there is a result
-                       return false;
-               }
-
-               $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-               return $row['uid'];
-       }
-       
-       /**
-        * Initialize cObj and TSFE Globals
-        *
-        * @return      object  cObj
-        */
-       private function getCObj() {
-               $this->div = t3lib_div::makeInstance('tx_powermailcond_div'); // Create new instance for div class
-               $userObj = tslib_eidtools::initFeUser();                                            
-               $temp_TSFEclassName = t3lib_div::makeInstance('tslib_fe');
-               $GLOBALS['TSFE'] = new $temp_TSFEclassName($TYPO3_CONF_VARS, 32, 0, true);
-               $GLOBALS['TSFE']->connectToDB();
-               $GLOBALS['TSFE']->fe_user = $userObj;
-               $GLOBALS['TSFE']->id = t3lib_div::_GET('id');
-               $GLOBALS['TSFE']->determineId();
-               $GLOBALS['TSFE']->getCompressedTCarray();
-               $GLOBALS['TSFE']->initTemplate();
-               $GLOBALS['TSFE']->getConfigArray();
-               $GLOBALS['TSFE']->includeTCA();
-               
-               return t3lib_div::makeInstance('tslib_cObj');
-    }
-       
-}
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/powermail_cond/lib/class.tx_powermailcond_ajaxWriteInSession_eid.php'])       {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/powermail_cond/lib/class.tx_powermailcond_ajaxWriteInSession_eid.php']);
-}
-
-$SOBE = t3lib_div::makeInstance('tx_powermailcond_ajaxWriteInSession_eid'); // make instance
-echo $SOBE->main(); // print content
-?>
\ No newline at end of file
diff --git a/oldLib/class.tx_powermailcond_div.php b/oldLib/class.tx_powermailcond_div.php
deleted file mode 100644 (file)
index 945b94f..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 Alexander Kellner <alexander.kellner@in2code.de>, in2code.
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
-/**
- * This class is for misc stuff and could be called from all other methods of this extension
- *
- * @author     Alex Kellner <alexander.kellner@in2code.de>, in2code.
- * @package    TYPO3
- * @subpackage tx_powermailcond_div
- */
-class tx_powermailcond_div {
-
-       public $extKey = 'powermail_cond'; // Extension key
-       public $prefixId = 'tx_powermailcond_pi1';
-       
-       /**
-        * Write values to session
-        *
-        * @param       array   $array: Array for session store
-        * @param       string  $sesName: Session name
-        * @return      void
-        */
-       public function saveInSession($array, $sesName) {
-               // get current stored values from session
-               $oldArray = $GLOBALS['TSFE']->fe_user->getKey('ses', $sesName);
-               
-               // merge old with new values
-               $array = array_merge((array) $oldArray, (array) $array);
-               
-               // store new session
-               $GLOBALS['TSFE']->fe_user->setKey('ses', $sesName, $array); // Generate Session with piVars array
-               $GLOBALS['TSFE']->storeSessionData(); // Save session
-       }
-       
-       /**
-        * Return all values from the session (could be used for debugging, etc..)
-        *
-        * @param       string  $sesName: Session name
-        * @return      array   $array: with session values
-        */
-       public function getAllSessionValues($sesName) {
-               // get current stored values from session
-               $array = $GLOBALS['TSFE']->fe_user->getKey('ses', $sesName);
-               return $array;
-       }
-       
-       /**
-        * Get tt_content UID from field UID
-        *
-        * @param       integer $fuid: UID of tx_powermail_fields
-        * @return      integer $uid: tt_content UID
-        */
-       public function getTtcontentUid($fuid) {
-               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery ( // DB query
-                       'tt_content.uid',
-                       'tx_powermail_fieldsets LEFT JOIN tx_powermail_fields ON tx_powermail_fieldsets.uid = tx_powermail_fields.fieldset LEFT JOIN tt_content ON tx_powermail_fieldsets.tt_content = tt_content.uid',
-                       'tx_powermail_fields.uid = ' . intval($fuid),
-                       '',
-                       '',
-                       1
-               );
-               if (!$res) { // If there is a result
-                       return false;
-               }
-
-               $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-               return $row['uid'];
-       }
-       
-       /**
-        * Write values to session
-        *
-        * @param       array   $conf: Configuration Array
-        * @return      array   $array: With all Startfields
-        */
-       public function getStartFields($conf) {
-               $array = array();
-               foreach ((array) $conf as $confLevel1) {
-                       foreach ((array) $confLevel1 as $confLevel2) {
-                               if (!empty($confLevel2['startField'])) {
-                                       $array[] = $confLevel2['startField'];
-                               }
-                       }
-               }
-               return $array;
-       }
-       
-}
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/powermail_cond/lib/class.tx_powermailcond_div.php'])  {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/powermail_cond/lib/class.tx_powermailcond_div.php']);
-}
-?>
\ No newline at end of file
diff --git a/oldLib/class.tx_powermailcond_fields_be.php b/oldLib/class.tx_powermailcond_fields_be.php
deleted file mode 100644 (file)
index e83d38e..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 Alex Kellner <alexander.kellner@in2code.de>, in2code.
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
-/**
- * Class/Function which manipulates the item-array for table/field tx_powermailcond_rules_fieldname.
- *
- * @author     Alex Kellner <alexander.kellner@in2code.de>, in2code.
- * @package    TYPO3
- * @subpackage tx_powermailcond_fields_be
- */
-class tx_powermailcond_fields_be {
-       
-       /**
-        * show all fields in the backend
-        *
-        * @param       array   $params: Params
-        * @param       object  $pObj: Parent Object
-        * @return      void
-        */
-       public function fieldname(&$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 getFieldsets($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 valuesFromPowermailSelectbox(&$params, $pObj) {
-               // Get targetField UID
-               $gParams = t3lib_div::_GET('edit');
-               $gParams2 = $gParams['tx_powermailcond_conditions'];
-               foreach ((array) $gParams2 as $uid => $actions) {
-                       $thisConditionsUid = $uid;
-               }
-               $targetField = $pObj->cachedTSconfig['tx_powermailcond_conditions:' . $thisConditionsUid]['_THIS_ROW']['targetField'];
-               
-               // Read values from powermail 
-               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                       $select = 'flexform',
-                       $from = 'tx_powermail_fields',
-                       $where = 'uid = ' . intval($targetField),
-                       $groupBy = '',
-                       $orderBy = '',
-                       $limit = '1'
-               );
-               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);
-               
-               // write params
-               foreach ((array) $options as $option) {
-                       $params['items'][] = array(htmlspecialchars($option), htmlspecialchars($option));
-               }
-       }
-}
-
-
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/powermail_cond/class.tx_powermailcond_fields_be.php'])        {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/powermail_cond/class.tx_powermailcond_fields_be.php']);
-}
-
-?>
\ No newline at end of file
diff --git a/oldLib/class.tx_powermailcond_pidContainer.php b/oldLib/class.tx_powermailcond_pidContainer.php
deleted file mode 100644 (file)
index 5bdd86b..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 2011 Alexander Kellner <alexander.kellner@in2code.de>, in2code.
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-
-/**
- * This class adds a pid container hidden field at the end of a powermail form
- *
- * @author     Alex Kellner <alexander.kellner@in2code.de>, in2code.
- * @package    TYPO3
- * @subpackage tx_powermailcond_pidContainer
- */
-class tx_powermailcond_pidContainer {
-
-       public $extKey = 'powermail_cond'; // Extension key
-       public $prefixId = 'tx_powermailcond_pi1';
-       
-       /**
-        * Return all values from the session (could be used for debugging, etc..)
-        *
-        * @param       array   Outer Marker Array
-        * @param       array   Subpart Array
-        * @param       array   TypoScript configuration
-        * @param       object  Parent object
-        * @return      void
-        */
-       public function PM_FormWrapMarkerHook($markerArray, &$subpartArray, $conf, $pObj) {
-               if (isset($subpartArray['###POWERMAIL_CONTENT###'])) {
-                       $subpartArray['###POWERMAIL_CONTENT###'] .= '<input type="hidden" id="powermail_cond_pid_container" name="powermail_cond_pid_container" value="' . intval($GLOBALS['TSFE']->id) . '" />';
-               }
-       }
-       
-}
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/powermail_cond/lib/class.tx_powermailcond_div.php'])  {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/powermail_cond/lib/class.tx_powermailcond_div.php']);
-}
-?>
\ No newline at end of file