Working Copy
authorwunschtacho <wunschtacho@735d13b6-9817-0410-8766-e36946ffe9aa>
Wed, 17 Oct 2012 12:13:29 +0000 (12:13 +0000)
committerwunschtacho <wunschtacho@735d13b6-9817-0410-8766-e36946ffe9aa>
Wed, 17 Oct 2012 12:13:29 +0000 (12:13 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/powermail_cond/trunk@67183 735d13b6-9817-0410-8766-e36946ffe9aa

.idea/workspace.xml
Classes/Utility/Div.php
Classes/Utility/EidReadSession.php [new file with mode: 0644]
Classes/Utility/EidSaveInSession.php
Resources/Public/Js/PowermailCond.js
ext_localconf.php

index 4c0d653..a42bc16 100644 (file)
@@ -2,11 +2,11 @@
 <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$/Classes/Utility/EidSaveInSession.php" />\r
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Classes/Utility/EidReadSession.php" />\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/EidGetFieldlist.php" afterPath="$PROJECT_DIR$/Classes/Utility/EidGetFieldlist.php" />\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/EidSaveInSession.php" afterPath="$PROJECT_DIR$/Classes/Utility/EidSaveInSession.php" />\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_emconf.php" afterPath="$PROJECT_DIR$/ext_emconf.php" />\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
       <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="16" column="0" selection-start="968" selection-end="968" vertical-scroll-proportion="0.0">\r
+            <state line="9" column="12" selection-start="455" selection-end="455" vertical-scroll-proportion="0.0">\r
               <folding />\r
             </state>\r
           </provider>\r
         </entry>\r
       </file>\r
-      <file leaf-file-name="ext_localconf.php" pinned="false" current="false" current-in-tab="false">\r
-        <entry file="file://$PROJECT_DIR$/ext_localconf.php">\r
+      <file leaf-file-name="EidSaveInSession.php" pinned="false" current="false" current-in-tab="false">\r
+        <entry file="file://$PROJECT_DIR$/Classes/Utility/EidSaveInSession.php">\r
           <provider selected="true" editor-type-id="text-editor">\r
-            <state line="15" column="77" selection-start="368" selection-end="395" vertical-scroll-proportion="-9.807693">\r
-              <folding />\r
+            <state line="68" column="65" selection-start="2082" selection-end="2140" vertical-scroll-proportion="-8.269231">\r
+              <folding>\r
+                <element signature="e#1285#1516#0" expanded="false" />\r
+              </folding>\r
             </state>\r
           </provider>\r
         </entry>\r
       </file>\r
-      <file leaf-file-name="EidSaveInSession.php" pinned="false" current="true" current-in-tab="true">\r
-        <entry file="file://$PROJECT_DIR$/Classes/Utility/EidSaveInSession.php">\r
+      <file leaf-file-name="EidReadSession.php" pinned="false" current="true" current-in-tab="true">\r
+        <entry file="file://$PROJECT_DIR$/Classes/Utility/EidReadSession.php">\r
           <provider selected="true" editor-type-id="text-editor">\r
-            <state line="72" column="40" selection-start="2199" selection-end="2199" vertical-scroll-proportion="0.33333334">\r
-              <folding>\r
-                <element signature="e#1285#1516#0" expanded="false" />\r
-              </folding>\r
+            <state line="65" column="0" selection-start="2074" selection-end="2074" vertical-scroll-proportion="0.57127196">\r
+              <folding />\r
             </state>\r
           </provider>\r
         </entry>\r
       </file>\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
+      <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="39" column="46" selection-start="1616" selection-end="1656" vertical-scroll-proportion="-25.5">\r
+            <state line="85" column="9" selection-start="2563" selection-end="2563" vertical-scroll-proportion="-22.0">\r
               <folding>\r
                 <element signature="e#6#984#0" expanded="true" />\r
               </folding>\r
@@ -79,7 +79,6 @@
   <component name="IdeDocumentHistory">\r
     <option name="changedFiles">\r
       <list>\r
-        <option value="$PROJECT_DIR$/ext_tables.sql" />\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$/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$/Classes/Utility/Div.php" />\r
         <option value="$PROJECT_DIR$/Classes/Utility/EidGetFieldlist.php" />\r
         <option value="$PROJECT_DIR$/ext_emconf.php" />\r
-        <option value="$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js" />\r
-        <option value="$PROJECT_DIR$/ext_localconf.php" />\r
         <option value="$PROJECT_DIR$/Classes/Utility/EidSaveInSession.php" />\r
+        <option value="$PROJECT_DIR$/ext_localconf.php" />\r
+        <option value="$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js" />\r
+        <option value="$PROJECT_DIR$/Classes/Utility/Div.php" />\r
+        <option value="$PROJECT_DIR$/Classes/Utility/EidReadSession.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="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_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="Icons" />\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="oldLib" />\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="myItemId" value="oldFiles" />\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="Configuration" />\r
+              <option name="myItemId" value="oldFiles" />\r
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
             </PATH_ELEMENT>\r
             <PATH_ELEMENT>\r
-              <option name="myItemId" value="TCA" />\r
+              <option name="myItemId" value="js" />\r
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />\r
             </PATH_ELEMENT>\r
           </PATH>\r
       <created>1350460050102</created>\r
       <updated>1350460050102</updated>\r
     </task>\r
-    <option name="localTasksCounter" value="6" />\r
+    <task id="LOCAL-00006" summary="Working Copy">\r
+      <created>1350471950102</created>\r
+      <updated>1350471950102</updated>\r
+    </task>\r
+    <option name="localTasksCounter" value="7" />\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.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="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="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.25" sideWeight="0.5" order="1" side_tool="true" 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="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.14727855" sideWeight="0.67082036" 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="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="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="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.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.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.14727855" sideWeight="0.67082036" order="0" side_tool="false" content_ui="combo" />\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="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.33" 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.33" 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
     <breakpoint-manager />\r
   </component>\r
   <component name="editorHistoryManager">\r
-    <entry file="file://$PROJECT_DIR$/oldFiles/static/setup.txt">\r
-      <provider selected="true" editor-type-id="text-editor">\r
-        <state line="4" column="39" selection-start="0" selection-end="300" vertical-scroll-proportion="0.089709766" />\r
-      </provider>\r
-    </entry>\r
     <entry file="file://$PROJECT_DIR$/ext_tables.php">\r
       <provider selected="true" editor-type-id="text-editor">\r
         <state line="11" column="63" selection-start="318" selection-end="318" vertical-scroll-proportion="0.26008344" />\r
         <state line="0" column="0" selection-start="0" selection-end="30724" vertical-scroll-proportion="0.0" />\r
       </provider>\r
     </entry>\r
-    <entry file="file://$PROJECT_DIR$/Classes/Utility/Div.php">\r
-      <provider selected="true" editor-type-id="text-editor">\r
-        <state line="32" column="34" selection-start="1188" selection-end="1216" vertical-scroll-proportion="0.37280703">\r
-          <folding>\r
-            <element signature="e#6#984#0" expanded="true" />\r
-          </folding>\r
-        </state>\r
-      </provider>\r
-    </entry>\r
     <entry file="file://$PROJECT_DIR$/oldLib/class.tx_powermailcond_div.php">\r
       <provider selected="true" editor-type-id="text-editor">\r
         <state line="106" column="5" selection-start="1219" selection-end="3352" vertical-scroll-proportion="0.7576754" />\r
         </state>\r
       </provider>\r
     </entry>\r
-    <entry file="file://$PROJECT_DIR$/oldFiles/js/powermail_cond.js">\r
-      <provider selected="true" editor-type-id="text-editor">\r
-        <state line="19" column="16" selection-start="1027" selection-end="1031" vertical-scroll-proportion="0.35377875">\r
-          <folding />\r
-        </state>\r
-      </provider>\r
-    </entry>\r
     <entry file="file://$PROJECT_DIR$/oldLib/class.tx_powermailcond_ajaxWriteInSession_eid.php">\r
       <provider selected="true" editor-type-id="text-editor">\r
         <state line="0" column="0" selection-start="0" selection-end="5031" vertical-scroll-proportion="0.0">\r
         </state>\r
       </provider>\r
     </entry>\r
-    <entry file="file://$PROJECT_DIR$/Resources/Public/Js/PowermailCond.js">\r
+    <entry file="file://$PROJECT_DIR$/oldFiles/js/powermail_cond.js">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="16" column="0" selection-start="968" selection-end="968" vertical-scroll-proportion="0.0">\r
+        <state line="0" column="17" selection-start="17" selection-end="17" vertical-scroll-proportion="0.0">\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="39" column="46" selection-start="1616" selection-end="1656" vertical-scroll-proportion="-25.5">\r
+        <state line="74" column="36" selection-start="2518" selection-end="2518" vertical-scroll-proportion="0.2246941">\r
           <folding>\r
             <element signature="e#6#984#0" expanded="true" />\r
           </folding>\r
     </entry>\r
     <entry file="file://$PROJECT_DIR$/ext_localconf.php">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="15" column="77" selection-start="368" selection-end="395" vertical-scroll-proportion="-9.807693">\r
+        <state line="21" column="75" selection-start="787" selection-end="812" vertical-scroll-proportion="0.39144737">\r
+          <folding />\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="9" column="12" selection-start="455" selection-end="455" vertical-scroll-proportion="0.0">\r
           <folding />\r
         </state>\r
       </provider>\r
     </entry>\r
     <entry file="file://$PROJECT_DIR$/Classes/Utility/EidSaveInSession.php">\r
       <provider selected="true" editor-type-id="text-editor">\r
-        <state line="72" column="40" selection-start="2199" selection-end="2199" vertical-scroll-proportion="0.33333334">\r
+        <state line="68" column="65" selection-start="2082" selection-end="2140" vertical-scroll-proportion="-8.269231">\r
           <folding>\r
             <element signature="e#1285#1516#0" expanded="false" />\r
           </folding>\r
         </state>\r
       </provider>\r
     </entry>\r
+    <entry file="file://$PROJECT_DIR$/Classes/Utility/Div.php">\r
+      <provider selected="true" editor-type-id="text-editor">\r
+        <state line="85" column="9" selection-start="2563" selection-end="2563" vertical-scroll-proportion="-22.0">\r
+          <folding>\r
+            <element signature="e#6#984#0" expanded="true" />\r
+          </folding>\r
+        </state>\r
+      </provider>\r
+    </entry>\r
+    <entry file="file://$PROJECT_DIR$/Classes/Utility/EidReadSession.php">\r
+      <provider selected="true" editor-type-id="text-editor">\r
+        <state line="65" column="0" selection-start="2074" selection-end="2074" vertical-scroll-proportion="0.57127196">\r
+          <folding />\r
+        </state>\r
+      </provider>\r
+    </entry>\r
   </component>\r
 </project>\r
 \r
index 99a3147..2421d4f 100644 (file)
@@ -47,61 +47,48 @@ class Tx_PowermailCond_Utility_Div {
        public $prefixId = 'tx_powermailcond_pi1';
 
        /**
-        * Write values to session
+        * Save value to session and respect old entries
         *
-        * @param       array   $array: Array for session store
-        * @param       string  $sesName: Session name
-        * @return      void
+        * @param string $value         Value to store
+        * @param int $form                     Form uid
+        * @param int $field            Field uid
+        * @return void
         */
-       public function saveInSession($array, $sesName) {
-               // get current stored values from session
-               $oldArray = $GLOBALS['TSFE']->fe_user->getKey('ses', $sesName);
+       public function saveValueToSession($value, $form, $field) {
+               // get old session
+               $oldArray = $GLOBALS['TSFE']->fe_user->getKey('ses', $this->extKey);
 
-               // merge old with new values
-               $array = array_merge((array) $oldArray, (array) $array);
+               // merge old and new
+               $array = array(
+                       'form_' . $form => array(
+                               'field_' . $field => $value
+                       )
+               );
+               $array['form_' . $form] = array_merge((array) $oldArray['form_' . $form], (array) $array['form_' . $form]);
 
-               // store new session
-               $GLOBALS['TSFE']->fe_user->setKey('ses', $sesName, $array); // Generate Session with piVars array
+               // save new array
+               $GLOBALS['TSFE']->fe_user->setKey('ses', $this->extKey, $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
+        * @param int $form                     Form Uid
+        * @return array $array         with session values
         */
-       public function getAllSessionValues($sesName) {
+       public function getAllSessionValuesFromForm($form = null) {
                // get current stored values from session
-               $array = $GLOBALS['TSFE']->fe_user->getKey('ses', $sesName);
-               return $array;
-       }
+               $array = $GLOBALS['TSFE']->fe_user->getKey('ses', $this->extKey);
 
-       /**
-        * 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;
+               if (isset($array['form_' . $form])) {
+                       return $array['form_' . $form];
                }
-
-               $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-               return $row['uid'];
+               return $array;
        }
 
        /**
-        * Write values to session
+        * Get Startfields
         *
         * @param       array   $conf: Configuration Array
         * @return      array   $array: With all Startfields
diff --git a/Classes/Utility/EidReadSession.php b/Classes/Utility/EidReadSession.php
new file mode 100644 (file)
index 0000000..13c04d7
--- /dev/null
@@ -0,0 +1,98 @@
+<?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') . 'Classes/Utility/Div.php');
+
+/**
+ * This class is for reading values from session
+ *
+ * @author     Alex Kellner <alexander.kellner@in2code.de>, in2code.
+ * @package    TYPO3
+ * @subpackage Tx_PowermailCond_Utility_EidReadSession
+ */
+class Tx_PowermailCond_Utility_EidReadSession extends tslib_pibase {
+
+       /**
+        * The extension key
+        *
+        * @var string
+        */
+       public $extKey = 'powermail_cond'; // Extension key
+
+       /**
+        * Prefix Id
+        *
+        * @var string
+        */
+       public $prefixId = 'tx_powermailcond_pi1';
+
+       /**
+        * Read values from session - example: 18:braun;17:rot;12:xd;11:fc;
+        *
+        * @return      void
+        */
+       public function main() {
+               // config
+               $this->getCObj(); // enable TSFE globals
+               $piVars = t3lib_div::_GP($this->prefixId); // GET param
+               $array = $this->div->getAllSessionValuesFromForm($piVars['form']);
+
+               $content = '';
+               foreach ((array) $array as $key => $value) {
+                       $content .= str_replace('field_', '', $key) . ':' . $value . ';';
+               }
+               return $content;
+       }
+
+       /**
+        * Initialize cObj and TSFE Globals
+        *
+        * @return      object  cObj
+        */
+       private function getCObj() {
+               $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, 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');
+       }
+
+}
+
+$SOBE = t3lib_div::makeInstance('Tx_PowermailCond_Utility_EidReadSession'); // make instance
+echo $SOBE->main(); // print content
+?>
\ No newline at end of file
index 45ff6f9..4ee897e 100644 (file)
@@ -64,61 +64,24 @@ class Tx_PowermailCond_Utility_EidSaveInSession extends tslib_pibase {
         * @return      void
         */
        public function main() {
-               return 'lalelu';
-               /*
                // 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
+
+               $uid = intval($piVars['uid']); // uid of current field
+               $form = intval($piVars['form']); // 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) {
+               if ($uid === 0 || $form === 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
-               }
+               $this->div->saveValueToSession($value, $form, $uid); // save single value in 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;
+                       t3lib_utility_Debug::debug($arr, 'powermail_' . $form);
                }
-
-               $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-               return $row['uid'];
        }
 
        /**
@@ -127,7 +90,7 @@ class Tx_PowermailCond_Utility_EidSaveInSession extends tslib_pibase {
         * @return      object  cObj
         */
        private function getCObj() {
-               $this->div = t3lib_div::makeInstance('tx_powermailcond_div'); // Create new instance for div class
+               $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, 32, 0, true);
index 9b4dd2b..f276dfc 100644 (file)
@@ -4,18 +4,29 @@ jQuery(document).ready(function() {
                checkConditions(0); // check if something should be changed
        }
 
+       // read values from session
+       var formUid = $('input[name="tx_powermail_pi1[form]"]').val(); // form uid
+       var url = base + '/index.php?eID=powermailcond_readSession&tx_powermailcond_pi1[form]=' + formUid;
+       $.ajax({
+               url: url, // send to this url
+               cache: false, // disable cache (for ie)
+               success: function(data) { // return values
+                       if (data) { // if there is a response
+                               $('form.powermail_form').append(data);
+                       }
+               }
+       });
+
        // save values via ajax to session
        $('.powermail_input, .powermail_textarea, .powermail_select, .powermail_radio, .powermail_checkbox').change(function() {
                $this = $(this); // caching
-               var pid = 5; // TODO
+               var formUid = $('input[name="tx_powermail_pi1[form]"]').val(); // form uid
                var url = base + '/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.closest('.powermail_fieldwrap').attr('id').substr(20); // current field uid (without "uid")
                var name = $this.attr('name');
-               var params = 'eID=' + 'powermailcond_saveToSession' + '&id=' + pid + '&tx_powermailcond_pi1[uid]=' + uid + '&tx_powermailcond_pi1[value]=' + value + '&ts=' + timestamp;
-
-               /*
+               var params = 'eID=' + 'powermailcond_saveToSession' + '&tx_powermailcond_pi1[form]=' + formUid + '&tx_powermailcond_pi1[uid]=' + uid + '&tx_powermailcond_pi1[value]=' + value + '&ts=' + timestamp;
 
                $.ajax({
                        type: 'GET', // type
@@ -24,13 +35,11 @@ jQuery(document).ready(function() {
                        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);
+                                       $('form.powermail_form').append('Error in powermail_cond.js in change function:' + data);
                                }
                                checkConditions(uid); // check if something should be changed
                        }
                });
-               */
        });
 });
 
index 142908c..e6c0e7f 100644 (file)
@@ -12,10 +12,13 @@ $TYPO3_CONF_VARS['EXTCONF']['cms']['db_layout']['addTables']['tx_powermailcond_c
 
 ##### EID Services #####
 
+// EID for telling jQuery which values are allowed and which not (via AJAX)
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['powermailcond_getFieldStatus'] = 'EXT:powermail_cond/Classes/Utility/EidGetFieldlist.php';
+
 // EID for storing values in the session (via AJAX)
 $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['powermailcond_saveToSession'] = 'EXT:powermail_cond/Classes/Utility/EidSaveInSession.php';
 
-// EID for telling jQuery which values are allowed and which not (via AJAX)
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['powermailcond_getFieldStatus'] = 'EXT:powermail_cond/Classes/Utility/EidGetFieldlist.php';
+// EID for reading existing values from session (via AJAX)
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['powermailcond_readSession'] = 'EXT:powermail_cond/Classes/Utility/EidReadSession.php';
 
 ?>
\ No newline at end of file