CRM-15168 whitespace only
authorEileen McNaughton <eileen@fuzion.co.nz>
Sun, 24 Aug 2014 21:42:50 +0000 (09:42 +1200)
committerEileen McNaughton <eileen@fuzion.co.nz>
Sun, 24 Aug 2014 21:42:50 +0000 (09:42 +1200)
33 files changed:
xml/schema/Mailing/BouncePattern.xml
xml/schema/Mailing/BounceType.xml
xml/schema/Mailing/Component.xml
xml/schema/Mailing/Event/Bounce.xml
xml/schema/Mailing/Event/Confirm.xml
xml/schema/Mailing/Event/Delivered.xml
xml/schema/Mailing/Event/Forward.xml
xml/schema/Mailing/Event/Opened.xml
xml/schema/Mailing/Event/Queue.xml
xml/schema/Mailing/Event/Reply.xml
xml/schema/Mailing/Event/Subscribe.xml
xml/schema/Mailing/Event/TrackableURLOpen.xml
xml/schema/Mailing/Event/Unsubscribe.xml
xml/schema/Mailing/Mailing.xml
xml/schema/Mailing/MailingGroup.xml
xml/schema/Mailing/MailingJob.xml
xml/schema/Mailing/Recipients.xml
xml/schema/Mailing/Spool.xml
xml/schema/Mailing/TrackableURL.xml
xml/schema/Member/Membership.xml
xml/schema/Member/MembershipBlock.xml
xml/schema/Member/MembershipLog.xml
xml/schema/Member/MembershipPayment.xml
xml/schema/Member/MembershipStatus.xml
xml/schema/Price/LineItem.xml
xml/schema/Price/PriceField.xml
xml/schema/Price/PriceFieldValue.xml
xml/schema/Price/PriceSetEntity.xml
xml/schema/Report/ReportInstance.xml
xml/schema/SMS/History.xml
xml/schema/SMS/Provider.xml
xml/schema/Standalone/OpenID/Associations.xml
xml/schema/Standalone/OpenID/Nonce.xml

index 88060e311cdb1a2ad7864d57abc05b585556e2b2..d5b4c784af341c7939b435c52b7450d48a95aa74 100644 (file)
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing</base>
-    <class>BouncePattern</class>
-    <name>civicrm_mailing_bounce_pattern</name>
-    <comment>Pseudo-constant table of patterns for bounce classification</comment>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>bounce_type_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>Type of bounce</comment>
-    </field>
-    <foreignKey>
-        <name>bounce_type_id</name>
-        <table>civicrm_mailing_bounce_type</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>pattern</name>
-        <type>varchar</type>
-        <length>255</length>
-        <comment>A regexp to match a message to a bounce type</comment>
-    </field>
+  <base>CRM/Mailing</base>
+  <class>BouncePattern</class>
+  <name>civicrm_mailing_bounce_pattern</name>
+  <comment>Pseudo-constant table of patterns for bounce classification</comment>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>bounce_type_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Type of bounce</comment>
+  </field>
+  <foreignKey>
+    <name>bounce_type_id</name>
+    <table>civicrm_mailing_bounce_type</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>pattern</name>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>A regexp to match a message to a bounce type</comment>
+  </field>
 </table>
index 392cc9169b44850673a9d333c4b8a89266496412..3279d2d30fd0790de9ebe5d6e682cf5d454d65c7 100644 (file)
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing</base>
-    <class>BounceType</class>
-    <name>civicrm_mailing_bounce_type</name>
-    <comment>Table to index the various bounce types and their properties</comment>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>name</name>
-        <type>varchar</type>
-        <length>8</length>
-        <required>true</required>
-        <comment>Type of bounce</comment>
-    </field>
-    <field>
-        <name>description</name>
-        <type>varchar</type>
-        <length>255</length>
-        <comment>A description of this bounce type</comment>
-    </field>
-    <field>
-        <name>hold_threshold</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>Number of bounces of this type required before the email address is put on bounce hold</comment>
-    </field>
+  <base>CRM/Mailing</base>
+  <class>BounceType</class>
+  <name>civicrm_mailing_bounce_type</name>
+  <comment>Table to index the various bounce types and their properties</comment>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>name</name>
+    <type>varchar</type>
+    <length>8</length>
+    <required>true</required>
+    <comment>Type of bounce</comment>
+  </field>
+  <field>
+    <name>description</name>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>A description of this bounce type</comment>
+  </field>
+  <field>
+    <name>hold_threshold</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Number of bounces of this type required before the email address is put on bounce hold</comment>
+  </field>
 </table>
index 9ff4b2accd586badfd59fd90a76b8aff6d9de9f5..9de2ef1fba144aa1e6771dd2b7b82a0a23614d11 100644 (file)
@@ -6,67 +6,67 @@
   <name>civicrm_mailing_component</name>
   <comment>Stores information about the mailing components (header/footer).</comment>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-       <name>name</name>
-       <title>Component Name</title>
-       <type>varchar</type>
-       <length>64</length>
-       <comment>The name of this component</comment>
+    <name>name</name>
+    <title>Component Name</title>
+    <type>varchar</type>
+    <length>64</length>
+    <comment>The name of this component</comment>
   </field>
   <field>
-       <name>component_type</name>
-       <type>varchar</type>
-       <length>12</length>
-       <comment>Type of Component.</comment>
-       <pseudoconstant>
-         <callback>CRM_Core_SelectValues::mailingComponents</callback>
-       </pseudoconstant>
-       <html>
-         <type>Select</type>
-       </html>
+    <name>component_type</name>
+    <type>varchar</type>
+    <length>12</length>
+    <comment>Type of Component.</comment>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::mailingComponents</callback>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <field>
-       <name>subject</name>
-       <type>varchar</type>
-       <length>255</length>
+    <name>subject</name>
+    <type>varchar</type>
+    <length>255</length>
   </field>
   <field>
-       <name>body_html</name>
-       <type>text</type>
-       <comment>Body of the component in html format.</comment>
-       <html>
-         <type>TextArea</type>
-         <rows>8</rows>
-         <cols>80</cols>
-       </html>
-       </field>
+    <name>body_html</name>
+    <type>text</type>
+    <comment>Body of the component in html format.</comment>
+    <html>
+      <type>TextArea</type>
+      <rows>8</rows>
+      <cols>80</cols>
+    </html>
+  </field>
   <field>
-       <name>body_text</name>
-       <type>text</type>
-       <comment>Body of the component in text format.</comment>
-       <html>
-         <type>TextArea</type>
-         <rows>8</rows>
-         <cols>80</cols>
-       </html>
-       </field>
+    <name>body_text</name>
+    <type>text</type>
+    <comment>Body of the component in text format.</comment>
+    <html>
+      <type>TextArea</type>
+      <rows>8</rows>
+      <cols>80</cols>
+    </html>
+  </field>
   <field>
-       <name>is_default</name>
-       <type>boolean</type>
-       <default>0</default>
-       <comment>Is this the default component for this component_type?</comment>
+    <name>is_default</name>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is this the default component for this component_type?</comment>
   </field>
   <field>
-       <name>is_active</name>
-       <type>boolean</type>
-       <comment>Is this property active?</comment>
+    <name>is_active</name>
+    <type>boolean</type>
+    <comment>Is this property active?</comment>
   </field>
 </table>
index e634ac8b00771a66eba01a6776254e16250b7d77..5842e95102788aa3121c14d7391bf5cf7d00179d 100644 (file)
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing/Event</base>
-    <class>Bounce</class>
-    <name>civicrm_mailing_event_bounce</name>
-    <comment>Tracks when and why an email bounced.</comment>
-    <archive>true</archive>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>event_queue_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to EventQueue</comment>
-    </field>
-    <foreignKey>
-        <name>event_queue_id</name>
-        <table>civicrm_mailing_event_queue</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-      <name>bounce_type_id</name>
-      <type>int unsigned</type>
-      <comment>What type of bounce was it?</comment>
-      <pseudoconstant>
-        <table>civicrm_mailing_bounce_type</table>
-        <keyColumn>id</keyColumn>
-        <labelColumn>name</labelColumn>
-      </pseudoconstant>
-      <html>
-        <type>Select</type>
-      </html>
-    </field>
-    <field>
-        <name>bounce_reason</name>
-        <type>varchar</type>
-        <length>255</length>
-        <comment>The reason the email bounced.</comment>
-    </field>
-    <field>
-        <name>time_stamp</name>
-        <type>datetime</type>
-        <required>true</required>
-        <comment>When this bounce event occurred.</comment>
-    </field>
+  <base>CRM/Mailing/Event</base>
+  <class>Bounce</class>
+  <name>civicrm_mailing_event_bounce</name>
+  <comment>Tracks when and why an email bounced.</comment>
+  <archive>true</archive>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>event_queue_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to EventQueue</comment>
+  </field>
+  <foreignKey>
+    <name>event_queue_id</name>
+    <table>civicrm_mailing_event_queue</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>bounce_type_id</name>
+    <type>int unsigned</type>
+    <comment>What type of bounce was it?</comment>
+    <pseudoconstant>
+      <table>civicrm_mailing_bounce_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
+  </field>
+  <field>
+    <name>bounce_reason</name>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>The reason the email bounced.</comment>
+  </field>
+  <field>
+    <name>time_stamp</name>
+    <type>datetime</type>
+    <required>true</required>
+    <comment>When this bounce event occurred.</comment>
+  </field>
 </table>
index c054d16ad3864d3b5fc0d5abddf63467ac951f9d..093941f211dd89d527cf6458780617030c8d500a 100644 (file)
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing/Event</base>
-    <class>Confirm</class>
-    <name>civicrm_mailing_event_confirm</name>
-    <comment>Tracks when a subscription event is confirmed by email</comment>
-    <archive>true</archive>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>event_subscribe_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to civicrm_mailing_event_subscribe</comment>
-    </field>
-    <foreignKey>
-        <name>event_subscribe_id</name>
-        <table>civicrm_mailing_event_subscribe</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>time_stamp</name>
-        <type>datetime</type>
-        <required>true</required>
-        <comment>When this confirmation event occurred.</comment>
-    </field>
+  <base>CRM/Mailing/Event</base>
+  <class>Confirm</class>
+  <name>civicrm_mailing_event_confirm</name>
+  <comment>Tracks when a subscription event is confirmed by email</comment>
+  <archive>true</archive>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>event_subscribe_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to civicrm_mailing_event_subscribe</comment>
+  </field>
+  <foreignKey>
+    <name>event_subscribe_id</name>
+    <table>civicrm_mailing_event_subscribe</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>time_stamp</name>
+    <type>datetime</type>
+    <required>true</required>
+    <comment>When this confirmation event occurred.</comment>
+  </field>
 </table>
index 931c56810fe9e9a9ec32fbcf9133c5988d7ffeda..8eff1e1f84574933fda8e3c7a50ef545de4d9694 100644 (file)
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing/Event</base>
-    <class>Delivered</class>
-    <name>civicrm_mailing_event_delivered</name>
-    <comment>Tracks when a queued email is actually delivered to the MTA</comment>
-    <archive>true</archive>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>event_queue_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to EventQueue</comment>
-    </field>
-    <foreignKey>
-        <name>event_queue_id</name>
-        <table>civicrm_mailing_event_queue</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>time_stamp</name>
-        <type>datetime</type>
-        <required>true</required>
-        <comment>When this delivery event occurred.</comment>
-    </field>
+  <base>CRM/Mailing/Event</base>
+  <class>Delivered</class>
+  <name>civicrm_mailing_event_delivered</name>
+  <comment>Tracks when a queued email is actually delivered to the MTA</comment>
+  <archive>true</archive>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>event_queue_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to EventQueue</comment>
+  </field>
+  <foreignKey>
+    <name>event_queue_id</name>
+    <table>civicrm_mailing_event_queue</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>time_stamp</name>
+    <type>datetime</type>
+    <required>true</required>
+    <comment>When this delivery event occurred.</comment>
+  </field>
 </table>
index 813abd255ceb52db18343b838cf5f64b1a69b919..1535bed82af878e0efc7b7daac4f004fdae2ffb9 100644 (file)
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing/Event</base>
-    <class>Forward</class>
-    <name>civicrm_mailing_event_forward</name>
-    <comment>Tracks when a contact forwards a mailing to a (new) contact</comment>
-    <archive>true</archive>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>event_queue_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to EventQueue</comment>
-    </field>
-    <foreignKey>
-        <name>event_queue_id</name>
-        <table>civicrm_mailing_event_queue</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>dest_queue_id</name>
-        <type>int unsigned</type>
-        <comment>FK to EventQueue for destination</comment>
-    </field>
-    <foreignKey>
-        <name>dest_queue_id</name>
-        <table>civicrm_mailing_event_queue</table>
-        <key>id</key>
-        <onDelete>SET NULL</onDelete>
-    </foreignKey>
-    <field>
-        <name>time_stamp</name>
-        <type>datetime</type>
-        <required>true</required>
-        <comment>When this forward event occurred.</comment>
-    </field>
+  <base>CRM/Mailing/Event</base>
+  <class>Forward</class>
+  <name>civicrm_mailing_event_forward</name>
+  <comment>Tracks when a contact forwards a mailing to a (new) contact</comment>
+  <archive>true</archive>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>event_queue_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to EventQueue</comment>
+  </field>
+  <foreignKey>
+    <name>event_queue_id</name>
+    <table>civicrm_mailing_event_queue</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>dest_queue_id</name>
+    <type>int unsigned</type>
+    <comment>FK to EventQueue for destination</comment>
+  </field>
+  <foreignKey>
+    <name>dest_queue_id</name>
+    <table>civicrm_mailing_event_queue</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
+  </foreignKey>
+  <field>
+    <name>time_stamp</name>
+    <type>datetime</type>
+    <required>true</required>
+    <comment>When this forward event occurred.</comment>
+  </field>
 </table>
index be9f42d6f7c5d7dce6e328852d9b4b2a351c1f12..8367148a563de55aef0e39378bde5de893067620 100644 (file)
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing/Event</base>
-    <class>Opened</class>
-    <name>civicrm_mailing_event_opened</name>
-    <comment>Tracks when a delivered email is opened by the recipient</comment>
-    <archive>true</archive>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>event_queue_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to EventQueue</comment>
-    </field>
-    <foreignKey>
-        <name>event_queue_id</name>
-        <table>civicrm_mailing_event_queue</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>time_stamp</name>
-        <type>datetime</type>
-        <required>true</required>
-        <comment>When this open event occurred.</comment>
-    </field>
+  <base>CRM/Mailing/Event</base>
+  <class>Opened</class>
+  <name>civicrm_mailing_event_opened</name>
+  <comment>Tracks when a delivered email is opened by the recipient</comment>
+  <archive>true</archive>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>event_queue_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to EventQueue</comment>
+  </field>
+  <foreignKey>
+    <name>event_queue_id</name>
+    <table>civicrm_mailing_event_queue</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>time_stamp</name>
+    <type>datetime</type>
+    <required>true</required>
+    <comment>When this open event occurred.</comment>
+  </field>
 </table>
index 13c8d775d822954b5eded6463343d4d6197df7cf..44fef4f0442cba0954fabcbc451d2b332c7bd8a6 100644 (file)
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing/Event</base>
-    <class>Queue</class>
-    <name>civicrm_mailing_event_queue</name>
-    <comment>A collection of all intended recipients of a job</comment>
-    <archive>true</archive>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>job_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to Job</comment>
-    </field>
-    <foreignKey>
-        <name>job_id</name>
-        <table>civicrm_mailing_job</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>email_id</name>
-        <type>int unsigned</type>
-  <default>NULL</default>
-        <comment>FK to Email</comment>
-    </field>
-    <foreignKey>
-        <name>email_id</name>
-        <table>civicrm_email</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>contact_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to Contact</comment>
-    </field>
-    <foreignKey>
-        <name>contact_id</name>
-        <table>civicrm_contact</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>hash</name>
-        <type>varchar</type>
-        <length>255</length>
-        <required>true</required>
-        <comment>Security hash</comment>
-    </field>
-    <field>
-        <name>phone_id</name>
-        <type>int unsigned</type>
-        <default>NULL</default>
-        <comment>FK to Phone</comment>
-    </field>
-    <foreignKey>
-        <name>phone_id</name>
-        <table>civicrm_phone</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
+  <base>CRM/Mailing/Event</base>
+  <class>Queue</class>
+  <name>civicrm_mailing_event_queue</name>
+  <comment>A collection of all intended recipients of a job</comment>
+  <archive>true</archive>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>job_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to Job</comment>
+  </field>
+  <foreignKey>
+    <name>job_id</name>
+    <table>civicrm_mailing_job</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>email_id</name>
+    <type>int unsigned</type>
+    <default>NULL</default>
+    <comment>FK to Email</comment>
+  </field>
+  <foreignKey>
+    <name>email_id</name>
+    <table>civicrm_email</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>contact_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to Contact</comment>
+  </field>
+  <foreignKey>
+    <name>contact_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>hash</name>
+    <type>varchar</type>
+    <length>255</length>
+    <required>true</required>
+    <comment>Security hash</comment>
+  </field>
+  <field>
+    <name>phone_id</name>
+    <type>int unsigned</type>
+    <default>NULL</default>
+    <comment>FK to Phone</comment>
+  </field>
+  <foreignKey>
+    <name>phone_id</name>
+    <table>civicrm_phone</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
 </table>
index a964447e30d8bc5f60078c6cc6587d8f5049608a..0fe33e555844bb9cf3fe3c6ce54dacaddae9822d 100644 (file)
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing/Event</base>
-    <class>Reply</class>
-    <name>civicrm_mailing_event_reply</name>
-    <comment>Tracks when a contact replies to a mailing</comment>
-    <archive>true</archive>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>event_queue_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to EventQueue</comment>
-    </field>
-    <foreignKey>
-        <name>event_queue_id</name>
-        <table>civicrm_mailing_event_queue</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>time_stamp</name>
-        <type>datetime</type>
-        <required>true</required>
-        <comment>When this reply event occurred.</comment>
-    </field>
+  <base>CRM/Mailing/Event</base>
+  <class>Reply</class>
+  <name>civicrm_mailing_event_reply</name>
+  <comment>Tracks when a contact replies to a mailing</comment>
+  <archive>true</archive>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>event_queue_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to EventQueue</comment>
+  </field>
+  <foreignKey>
+    <name>event_queue_id</name>
+    <table>civicrm_mailing_event_queue</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>time_stamp</name>
+    <type>datetime</type>
+    <required>true</required>
+    <comment>When this reply event occurred.</comment>
+  </field>
 </table>
index 21fe0f5794c8a5286d540f51380426546e42b8cc..5e9299de197f9d1d25dbd96da339b6902d4cdcb5 100644 (file)
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing/Event</base>
-    <class>Subscribe</class>
-    <name>civicrm_mailing_event_subscribe</name>
-    <comment>Tracks when a (new) contact subscribes to a group by email</comment>
-    <archive>true</archive>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-      <name>group_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>FK to Group</comment>
-      <pseudoconstant>
-        <table>civicrm_group</table>
-        <keyColumn>id</keyColumn>
-        <labelColumn>title</labelColumn>
-      </pseudoconstant>
-      <html>
-        <type>Select</type>
-      </html>
-    </field>
-    <foreignKey>
-        <name>group_id</name>
-        <table>civicrm_group</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>contact_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to Contact</comment>
-    </field>
-    <foreignKey>
-        <name>contact_id</name>
-        <table>civicrm_contact</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>hash</name>
-        <type>varchar</type>
-        <length>255</length>
-        <required>true</required>
-        <comment>Security hash</comment>
-    </field>
-    <field>
-        <name>time_stamp</name>
-        <type>datetime</type>
-        <required>true</required>
-        <comment>When this subscription event occurred.</comment>
-    </field>
+  <base>CRM/Mailing/Event</base>
+  <class>Subscribe</class>
+  <name>civicrm_mailing_event_subscribe</name>
+  <comment>Tracks when a (new) contact subscribes to a group by email</comment>
+  <archive>true</archive>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>group_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to Group</comment>
+    <pseudoconstant>
+      <table>civicrm_group</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>title</labelColumn>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
+  </field>
+  <foreignKey>
+    <name>group_id</name>
+    <table>civicrm_group</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>contact_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to Contact</comment>
+  </field>
+  <foreignKey>
+    <name>contact_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>hash</name>
+    <type>varchar</type>
+    <length>255</length>
+    <required>true</required>
+    <comment>Security hash</comment>
+  </field>
+  <field>
+    <name>time_stamp</name>
+    <type>datetime</type>
+    <required>true</required>
+    <comment>When this subscription event occurred.</comment>
+  </field>
 </table>
index 1f574b308c0484b474e314f76dbbe836a39ecc9e..575c7885d2e05bd9631a34d631466d49819ca23d 100644 (file)
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing/Event</base>
-    <class>TrackableURLOpen</class>
-    <name>civicrm_mailing_event_trackable_url_open</name>
-    <comment>Tracks when a TrackableURL is clicked by a recipient.</comment>
-    <archive>true</archive>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>event_queue_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to EventQueue</comment>
-    </field>
-    <foreignKey>
-        <name>event_queue_id</name>
-        <table>civicrm_mailing_event_queue</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>trackable_url_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to TrackableURL</comment>
-    </field>
-    <foreignKey>
-        <name>trackable_url_id</name>
-        <table>civicrm_mailing_trackable_url</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>time_stamp</name>
-        <type>datetime</type>
-        <required>true</required>
-        <comment>When this trackable URL open occurred.</comment>
-    </field>
+  <base>CRM/Mailing/Event</base>
+  <class>TrackableURLOpen</class>
+  <name>civicrm_mailing_event_trackable_url_open</name>
+  <comment>Tracks when a TrackableURL is clicked by a recipient.</comment>
+  <archive>true</archive>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>event_queue_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to EventQueue</comment>
+  </field>
+  <foreignKey>
+    <name>event_queue_id</name>
+    <table>civicrm_mailing_event_queue</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>trackable_url_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to TrackableURL</comment>
+  </field>
+  <foreignKey>
+    <name>trackable_url_id</name>
+    <table>civicrm_mailing_trackable_url</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>time_stamp</name>
+    <type>datetime</type>
+    <required>true</required>
+    <comment>When this trackable URL open occurred.</comment>
+  </field>
 </table>
index 871453924d402a175686265beffef0a7d7e4e0ae..9309bc6b48f4f31fcb8eb19f66e011a15b394041 100644 (file)
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing/Event</base>
-    <class>Unsubscribe</class>
-    <name>civicrm_mailing_event_unsubscribe</name>
-    <comment>Tracks when a recipient unsubscribes from a group/domain</comment>
-    <archive>true</archive>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>event_queue_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to EventQueue</comment>
-    </field>
-    <foreignKey>
-        <name>event_queue_id</name>
-        <table>civicrm_mailing_event_queue</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
-    <field>
-        <name>org_unsubscribe</name>
-        <type>boolean</type>
-        <required>true</required>
-        <comment>Unsubscribe at org- or group-level</comment>
-    </field>
-    <field>
-        <name>time_stamp</name>
-        <type>datetime</type>
-        <required>true</required>
-        <comment>When this delivery event occurred.</comment>
-    </field>
+  <base>CRM/Mailing/Event</base>
+  <class>Unsubscribe</class>
+  <name>civicrm_mailing_event_unsubscribe</name>
+  <comment>Tracks when a recipient unsubscribes from a group/domain</comment>
+  <archive>true</archive>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>event_queue_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to EventQueue</comment>
+  </field>
+  <foreignKey>
+    <name>event_queue_id</name>
+    <table>civicrm_mailing_event_queue</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+  <field>
+    <name>org_unsubscribe</name>
+    <type>boolean</type>
+    <required>true</required>
+    <comment>Unsubscribe at org- or group-level</comment>
+  </field>
+  <field>
+    <name>time_stamp</name>
+    <type>datetime</type>
+    <required>true</required>
+    <comment>When this delivery event occurred.</comment>
+  </field>
 </table>
index 182f7b34dd69aa2592032054667134b44c081a41..b861ff62553225035118d1c9236403381d25251d 100644 (file)
   <comment>Stores information about a mailing.</comment>
   <archive>true</archive>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>domain_id</name>
-      <type>int unsigned</type>
-      <pseudoconstant>
-          <table>civicrm_domain</table>
-          <keyColumn>id</keyColumn>
-          <labelColumn>name</labelColumn>
-      </pseudoconstant>
-      <comment>Which site is this mailing for</comment>
-      <add>3.4</add>
+    <name>domain_id</name>
+    <type>int unsigned</type>
+    <pseudoconstant>
+      <table>civicrm_domain</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
+    <comment>Which site is this mailing for</comment>
+    <add>3.4</add>
   </field>
   <foreignKey>
-       <name>domain_id</name>
-       <table>civicrm_domain</table>
-       <key>id</key>
-       <onDelete>SET NULL</onDelete>
-       <add>3.4</add>
+    <name>domain_id</name>
+    <table>civicrm_domain</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
+    <add>3.4</add>
   </foreignKey>
   <field>
-      <name>header_id</name>
-      <type>int unsigned</type>
-      <comment>FK to the header component.</comment>
+    <name>header_id</name>
+    <type>int unsigned</type>
+    <comment>FK to the header component.</comment>
   </field>
   <foreignKey>
-       <name>header_id</name>
-       <table>civicrm_mailing_component</table>
-       <key>id</key>
-       <onDelete>SET NULL</onDelete>
+    <name>header_id</name>
+    <table>civicrm_mailing_component</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-      <name>footer_id</name>
-      <type>int unsigned</type>
-      <comment>FK to the footer component.</comment>
+    <name>footer_id</name>
+    <type>int unsigned</type>
+    <comment>FK to the footer component.</comment>
   </field>
   <foreignKey>
-       <name>footer_id</name>
-       <table>civicrm_mailing_component</table>
-       <key>id</key>
-       <onDelete>SET NULL</onDelete>
+    <name>footer_id</name>
+    <table>civicrm_mailing_component</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-        <name>reply_id</name>
-        <type>int unsigned</type>
-        <comment>FK to the auto-responder component.</comment>
+    <name>reply_id</name>
+    <type>int unsigned</type>
+    <comment>FK to the auto-responder component.</comment>
   </field>
   <foreignKey>
-        <name>reply_id</name>
-        <table>civicrm_mailing_component</table>
-        <key>id</key>
-        <onDelete>SET NULL</onDelete>
+    <name>reply_id</name>
+    <table>civicrm_mailing_component</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-        <name>unsubscribe_id</name>
-        <type>int unsigned</type>
-        <comment>FK to the unsubscribe component.</comment>
+    <name>unsubscribe_id</name>
+    <type>int unsigned</type>
+    <comment>FK to the unsubscribe component.</comment>
   </field>
   <foreignKey>
-        <name>unsubscribe_id</name>
-        <table>civicrm_mailing_component</table>
-        <key>id</key>
-        <onDelete>SET NULL</onDelete>
+    <name>unsubscribe_id</name>
+    <table>civicrm_mailing_component</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-        <name>resubscribe_id</name>
-        <type>int unsigned</type>
+    <name>resubscribe_id</name>
+    <type>int unsigned</type>
   </field>
   <foreignKey>
-        <name>optout_id</name>
-        <table>civicrm_mailing_component</table>
-        <key>id</key>
-        <onDelete>SET NULL</onDelete>
+    <name>optout_id</name>
+    <table>civicrm_mailing_component</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-        <name>optout_id</name>
-        <type>int unsigned</type>
-        <comment>FK to the opt-out component.</comment>
+    <name>optout_id</name>
+    <type>int unsigned</type>
+    <comment>FK to the opt-out component.</comment>
   </field>
   <foreignKey>
-        <name>optout_id</name>
-        <table>civicrm_mailing_component</table>
-        <key>id</key>
-        <onDelete>SET NULL</onDelete>
+    <name>optout_id</name>
+    <table>civicrm_mailing_component</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-       <name>name</name>
-       <type>varchar</type>
-       <length>128</length>
-       <comment>Mailing Name.</comment>
-       <html>
-         <type>Text</type>
-       </html>
+    <name>name</name>
+    <type>varchar</type>
+    <length>128</length>
+    <comment>Mailing Name.</comment>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <field>
-       <name>from_name</name>
-       <type>varchar</type>
-       <length>128</length>
-       <comment>From Header of mailing</comment>
-       <html>
-         <type>Text</type>
-       </html>
+    <name>from_name</name>
+    <type>varchar</type>
+    <length>128</length>
+    <comment>From Header of mailing</comment>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <field>
-       <name>from_email</name>
-       <type>varchar</type>
-       <length>128</length>
-       <comment>From Email of mailing</comment>
-       <html>
-         <type>Text</type>
-       </html>
+    <name>from_email</name>
+    <type>varchar</type>
+    <length>128</length>
+    <comment>From Email of mailing</comment>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <field>
-       <name>replyto_email</name>
-       <type>varchar</type>
-       <length>128</length>
-       <comment>Reply-To Email of mailing</comment>
-       <html>
-         <type>Text</type>
-       </html>
+    <name>replyto_email</name>
+    <type>varchar</type>
+    <length>128</length>
+    <comment>Reply-To Email of mailing</comment>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <field>
-       <name>subject</name>
-       <type>varchar</type>
-       <length>128</length>
-       <comment>Subject of mailing</comment>
-       <html>
-         <type>Text</type>
-       </html>
+    <name>subject</name>
+    <type>varchar</type>
+    <length>128</length>
+    <comment>Subject of mailing</comment>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <field>
-       <name>body_text</name>
-       <type>longtext</type>
-       <comment>Body of the mailing in text format.</comment>
+    <name>body_text</name>
+    <type>longtext</type>
+    <comment>Body of the mailing in text format.</comment>
   </field>
   <field>
-       <name>body_html</name>
-       <type>longtext</type>
-       <comment>Body of the mailing in html format.</comment>
+    <name>body_html</name>
+    <type>longtext</type>
+    <comment>Body of the mailing in html format.</comment>
   </field>
   <field>
-       <name>url_tracking</name>
-       <type>boolean</type>
-       <comment>Should we track URL click-throughs for this mailing?</comment>
-       <html>
-         <type>CheckBox</type>
-       </html>
+    <name>url_tracking</name>
+    <type>boolean</type>
+    <comment>Should we track URL click-throughs for this mailing?</comment>
+    <html>
+      <type>CheckBox</type>
+    </html>
   </field>
   <field>
-       <name>forward_replies</name>
-       <type>boolean</type>
-       <comment>Should we forward replies back to the author?</comment>
-       <html>
-         <type>CheckBox</type>
-       </html>
+    <name>forward_replies</name>
+    <type>boolean</type>
+    <comment>Should we forward replies back to the author?</comment>
+    <html>
+      <type>CheckBox</type>
+    </html>
   </field>
   <field>
-        <name>auto_responder</name>
-        <type>boolean</type>
-        <comment>Should we enable the auto-responder?</comment>
-        <html>
-          <type>CheckBox</type>
-        </html>
+    <name>auto_responder</name>
+    <type>boolean</type>
+    <comment>Should we enable the auto-responder?</comment>
+    <html>
+      <type>CheckBox</type>
+    </html>
   </field>
   <field>
-       <name>open_tracking</name>
-       <type>boolean</type>
-       <comment>Should we track when recipients open/read this mailing?</comment>
+    <name>open_tracking</name>
+    <type>boolean</type>
+    <comment>Should we track when recipients open/read this mailing?</comment>
   </field>
   <field>
-       <name>is_completed</name>
-       <type>boolean</type>
-       <comment>Has at least one job associated with this mailing finished?</comment>
-       <html>
-         <type>CheckBox</type>
-       </html>
+    <name>is_completed</name>
+    <type>boolean</type>
+    <comment>Has at least one job associated with this mailing finished?</comment>
+    <html>
+      <type>CheckBox</type>
+    </html>
   </field>
   <field>
-      <name>msg_template_id</name>
-      <type>int unsigned</type>
-      <comment>FK to the message template.</comment>
+    <name>msg_template_id</name>
+    <type>int unsigned</type>
+    <comment>FK to the message template.</comment>
   </field>
   <foreignKey>
-       <name>msg_template_id</name>
-       <table>civicrm_msg_template</table>
-       <key>id</key>
-       <onDelete>SET NULL</onDelete>
+    <name>msg_template_id</name>
+    <table>civicrm_msg_template</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-      <name>override_verp</name>
-      <type>boolean</type>
-      <default>0</default>
-      <add>2.2</add>
-      <comment>Should we overrite VERP address in Reply-To</comment>
-      <html>
-         <type>CheckBox</type>
-      </html>
+    <name>override_verp</name>
+    <type>boolean</type>
+    <default>0</default>
+    <add>2.2</add>
+    <comment>Should we overrite VERP address in Reply-To</comment>
+    <html>
+      <type>CheckBox</type>
+    </html>
   </field>
   <field>
-      <name>created_id</name>
-      <type>int unsigned</type>
-      <comment>FK to Contact ID who first created this mailing</comment>
+    <name>created_id</name>
+    <type>int unsigned</type>
+    <comment>FK to Contact ID who first created this mailing</comment>
   </field>
   <foreignKey>
-       <name>created_id</name>
-       <table>civicrm_contact</table>
-       <key>id</key>
-       <onDelete>SET NULL</onDelete>
+    <name>created_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-      <name>created_date</name>
-      <type>datetime</type>
-      <title>Mailing Created Date</title>
-      <comment>Date and time this mailing was created.</comment>
-      <add>3.0</add>
-      <html>
-        <type>Select Date</type>
-      </html>
+    <name>created_date</name>
+    <type>datetime</type>
+    <title>Mailing Created Date</title>
+    <comment>Date and time this mailing was created.</comment>
+    <add>3.0</add>
+    <html>
+      <type>Select Date</type>
+    </html>
   </field>
   <field>
-      <name>scheduled_id</name>
-      <type>int unsigned</type>
-      <comment>FK to Contact ID who scheduled this mailing</comment>
+    <name>scheduled_id</name>
+    <type>int unsigned</type>
+    <comment>FK to Contact ID who scheduled this mailing</comment>
   </field>
   <foreignKey>
-       <name>scheduled_id</name>
-       <table>civicrm_contact</table>
-       <key>id</key>
-       <onDelete>SET NULL</onDelete>
+    <name>scheduled_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-      <name>scheduled_date</name>
-      <type>datetime</type>
-      <title>Mailing Scheduled Date</title>
-      <comment>Date and time this mailing was scheduled.</comment>
-      <add>3.3</add>
+    <name>scheduled_date</name>
+    <type>datetime</type>
+    <title>Mailing Scheduled Date</title>
+    <comment>Date and time this mailing was scheduled.</comment>
+    <add>3.3</add>
   </field>
   <field>
-      <name>approver_id</name>
-      <type>int unsigned</type>
-      <comment>FK to Contact ID who approved this mailing</comment>
+    <name>approver_id</name>
+    <type>int unsigned</type>
+    <comment>FK to Contact ID who approved this mailing</comment>
   </field>
   <foreignKey>
-       <name>approver_id</name>
-       <table>civicrm_contact</table>
-       <key>id</key>
-       <onDelete>SET NULL</onDelete>
+    <name>approver_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-      <name>approval_date</name>
-      <type>datetime</type>
-      <title>Mailing Approved Date</title>
-      <comment>Date and time this mailing was approved.</comment>
-      <add>3.3</add>
-  </field>
-  <field>
-      <name>approval_status_id</name>
-      <type>int unsigned</type>
-      <title>Approval Status</title>
-      <comment>The status of this mailing. Values: none, approved, rejected</comment>
-      <pseudoconstant>
-        <optionGroupName>mail_approval_status</optionGroupName>
-      </pseudoconstant>
-      <html>
-        <type>Select</type>
-      </html>
-      <add>3.3</add>
-  </field>
-  <field>
-      <name>approval_note</name>
-      <type>longtext</type>
-      <title>Approval Note</title>
-      <comment>Note behind the decision.</comment>
-      <add>3.3</add>
-      <html>
-         <type>TextArea</type>
-       </html>
-  </field>
-  <field>
-       <name>is_archived</name>
-       <type>boolean</type>
-       <default>0</default>
-       <comment>Is this mailing archived?</comment>
-       <html>
-         <type>CheckBox</type>
-       </html>
-       <add>2.2</add>
-  </field>
-  <field>
-       <name>visibility</name>
-       <type>varchar</type>
-       <length>40</length>
-       <default>'Public Pages'</default>
-       <comment>In what context(s) is the mailing contents visible (online viewing)</comment>
-       <pseudoconstant>
-         <callback>CRM_Core_SelectValues::groupVisibility</callback>
-       </pseudoconstant>
-       <add>3.3</add>
-       <html>
-         <type>Select</type>
-       </html>
-  </field>
-  <field>
-       <name>campaign_id</name>
-       <type>int unsigned</type>
-       <comment>The campaign for which this mailing has been initiated.</comment>
-       <pseudoconstant>
-          <table>civicrm_campaign</table>
-          <keyColumn>id</keyColumn>
-          <labelColumn>title</labelColumn>
-       </pseudoconstant>
-       <add>3.4</add>
-       <html>
-          <type>Select</type>
-        </html>
+    <name>approval_date</name>
+    <type>datetime</type>
+    <title>Mailing Approved Date</title>
+    <comment>Date and time this mailing was approved.</comment>
+    <add>3.3</add>
+  </field>
+  <field>
+    <name>approval_status_id</name>
+    <type>int unsigned</type>
+    <title>Approval Status</title>
+    <comment>The status of this mailing. Values: none, approved, rejected</comment>
+    <pseudoconstant>
+      <optionGroupName>mail_approval_status</optionGroupName>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
+    <add>3.3</add>
+  </field>
+  <field>
+    <name>approval_note</name>
+    <type>longtext</type>
+    <title>Approval Note</title>
+    <comment>Note behind the decision.</comment>
+    <add>3.3</add>
+    <html>
+      <type>TextArea</type>
+    </html>
+  </field>
+  <field>
+    <name>is_archived</name>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is this mailing archived?</comment>
+    <html>
+      <type>CheckBox</type>
+    </html>
+    <add>2.2</add>
+  </field>
+  <field>
+    <name>visibility</name>
+    <type>varchar</type>
+    <length>40</length>
+    <default>'Public Pages'</default>
+    <comment>In what context(s) is the mailing contents visible (online viewing)</comment>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::groupVisibility</callback>
+    </pseudoconstant>
+    <add>3.3</add>
+    <html>
+      <type>Select</type>
+    </html>
+  </field>
+  <field>
+    <name>campaign_id</name>
+    <type>int unsigned</type>
+    <comment>The campaign for which this mailing has been initiated.</comment>
+    <pseudoconstant>
+      <table>civicrm_campaign</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>title</labelColumn>
+    </pseudoconstant>
+    <add>3.4</add>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <foreignKey>
-       <name>campaign_id</name>
-       <table>civicrm_campaign</table>
-       <key>id</key>
-       <onDelete>SET NULL</onDelete>
+    <name>campaign_id</name>
+    <table>civicrm_campaign</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-      <name>dedupe_email</name>
-      <type>boolean</type>
-      <default>0</default>
-      <add>4.1</add>
-      <comment>Remove duplicate emails?</comment>
-      <html>
-         <type>CheckBox</type>
-       </html>
+    <name>dedupe_email</name>
+    <type>boolean</type>
+    <default>0</default>
+    <add>4.1</add>
+    <comment>Remove duplicate emails?</comment>
+    <html>
+      <type>CheckBox</type>
+    </html>
   </field>
   <field>
-       <name>sms_provider_id</name>
-       <type>int unsigned</type>
-       <add>4.2</add>
-       <html>
-         <type>Select</type>
-       </html>
+    <name>sms_provider_id</name>
+    <type>int unsigned</type>
+    <add>4.2</add>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <foreignKey>
-       <name>sms_provider_id</name>
-       <table>civicrm_sms_provider</table>
-       <key>id</key>
-       <onDelete>SET NULL</onDelete>
-       <add>4.2</add>
+    <name>sms_provider_id</name>
+    <table>civicrm_sms_provider</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
+    <add>4.2</add>
   </foreignKey>
   <field>
-      <name>hash</name>
-      <title>Mailing Hash</title>
-      <type>varchar</type>
-      <length>16</length>
-      <comment>Key for validating requests related to this mailing.</comment>
-      <add>4.5</add>
+    <name>hash</name>
+    <title>Mailing Hash</title>
+    <type>varchar</type>
+    <length>16</length>
+    <comment>Key for validating requests related to this mailing.</comment>
+    <add>4.5</add>
   </field>
   <index>
-       <name>index_hash</name>
-       <fieldName>hash</fieldName>
-       <add>4.5</add>
+    <name>index_hash</name>
+    <fieldName>hash</fieldName>
+    <add>4.5</add>
   </index>
 </table>
index 0d4553681809e7a0de4b70496441dbcff6fd39bc..7109333c636902a0ae5bcfc518044eb530828f67 100644 (file)
@@ -7,63 +7,63 @@
   <comment>Stores information about the groups that participate in this mailing..</comment>
   <archive>true</archive>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>mailing_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>The ID of a previous mailing to include/exclude recipients.</comment>
+    <name>mailing_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>The ID of a previous mailing to include/exclude recipients.</comment>
   </field>
   <foreignKey>
-       <name>mailing_id</name>
-       <table>civicrm_mailing</table>
-       <key>id</key>
-       <onDelete>CASCADE</onDelete>
+    <name>mailing_id</name>
+    <table>civicrm_mailing</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-       <name>group_type</name>
-       <type>varchar</type>
-       <length>8</length>
-       <comment>Are the members of the group included or excluded?.</comment>
-       <pseudoconstant>
-         <callback>CRM_Core_SelectValues::getMailingGroupTypes</callback>
-       </pseudoconstant>
-       <html>
-         <type>Select</type>
-       </html>
+    <name>group_type</name>
+    <type>varchar</type>
+    <length>8</length>
+    <comment>Are the members of the group included or excluded?.</comment>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::getMailingGroupTypes</callback>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <field>
-       <name>entity_table</name>
-       <type>varchar</type>
-       <length>64</length>
-       <required>true</required>
-       <comment>Name of table where item being referenced is stored.</comment>
+    <name>entity_table</name>
+    <type>varchar</type>
+    <length>64</length>
+    <required>true</required>
+    <comment>Name of table where item being referenced is stored.</comment>
   </field>
   <field>
-       <name>entity_id</name>
-       <type>int unsigned</type>
-       <required>true</required>
-       <comment>Foreign key to the referenced item.</comment>
+    <name>entity_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Foreign key to the referenced item.</comment>
   </field>
   <dynamicForeignKey>
-       <idColumn>entity_id</idColumn>
-       <typeColumn>entity_table</typeColumn>
+    <idColumn>entity_id</idColumn>
+    <typeColumn>entity_table</typeColumn>
   </dynamicForeignKey>
   <field>
-        <name>search_id</name>
-        <type>int</type>
-        <comment>The filtering search. custom search id or -1 for civicrm api search</comment>
+    <name>search_id</name>
+    <type>int</type>
+    <comment>The filtering search. custom search id or -1 for civicrm api search</comment>
   </field>
   <field>
-        <name>search_args</name>
-        <type>text</type>
-        <comment>The arguments to be sent to the search function</comment>
+    <name>search_args</name>
+    <type>text</type>
+    <comment>The arguments to be sent to the search function</comment>
   </field>
 </table>
index 244efea68a06999d920453593146cdb1920e5dab..b0467700ce5b7d0601a88955186352e9ea9839c5 100644 (file)
@@ -7,92 +7,92 @@
   <comment>Stores information about the job that executes this mailing</comment>
   <archive>true</archive>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>mailing_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>The ID of the mailing this Job will send.</comment>
+    <name>mailing_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>The ID of the mailing this Job will send.</comment>
   </field>
   <foreignKey>
-       <name>mailing_id</name>
-       <table>civicrm_mailing</table>
-       <key>id</key>
-       <onDelete>CASCADE</onDelete>
+    <name>mailing_id</name>
+    <table>civicrm_mailing</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>scheduled_date</name>
-      <type>datetime</type>
-      <comment>date on which this job was scheduled.</comment>
+    <name>scheduled_date</name>
+    <type>datetime</type>
+    <comment>date on which this job was scheduled.</comment>
   </field>
   <field>
-      <name>start_date</name>
-      <type>datetime</type>
-      <comment>date on which this job was started.</comment>
+    <name>start_date</name>
+    <type>datetime</type>
+    <comment>date on which this job was started.</comment>
   </field>
   <field>
-      <name>end_date</name>
-      <type>datetime</type>
-      <comment>date on which this job ended.</comment>
+    <name>end_date</name>
+    <type>datetime</type>
+    <comment>date on which this job ended.</comment>
   </field>
   <field>
-      <name>status</name>
-      <type>varchar</type>
-      <length>12</length>
-      <comment>The state of this job</comment>
-      <pseudoconstant>
-        <callback>CRM_Core_SelectValues::getMailingJobStatus</callback>
-      </pseudoconstant>
-      <html>
-        <type>Select</type>
-      </html>
+    <name>status</name>
+    <type>varchar</type>
+    <length>12</length>
+    <comment>The state of this job</comment>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::getMailingJobStatus</callback>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <field>
-      <name>is_test</name>
-      <type>boolean</type>
-      <default>0</default>
-      <comment>Is this job for a test mail?</comment>
-      <add>1.9</add>
+    <name>is_test</name>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is this job for a test mail?</comment>
+    <add>1.9</add>
   </field>
   <field>
-      <name>job_type</name>
-      <type>varchar</type>
-      <length>255</length>
-      <comment>Type of mailling job: null | child </comment>
-      <add>3.3</add>
+    <name>job_type</name>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>Type of mailling job: null | child </comment>
+    <add>3.3</add>
   </field>
   <field>
-      <name>parent_id</name>
-      <type>int unsigned</type>
-      <comment>Parent job id</comment>
-      <default>NULL</default>
-      <add>3.3</add>
+    <name>parent_id</name>
+    <type>int unsigned</type>
+    <comment>Parent job id</comment>
+    <default>NULL</default>
+    <add>3.3</add>
   </field>
   <foreignKey>
-       <name>parent_id</name>
-       <table>civicrm_mailing_job</table>
-       <key>id</key>
-       <onDelete>CASCADE</onDelete>
+    <name>parent_id</name>
+    <table>civicrm_mailing_job</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>job_offset</name>
-      <type>int</type>
-      <comment>Offset of the child job</comment>
-      <default>0</default>
-      <add>3.3</add>
+    <name>job_offset</name>
+    <type>int</type>
+    <comment>Offset of the child job</comment>
+    <default>0</default>
+    <add>3.3</add>
   </field>
   <field>
-      <name>job_limit</name>
-      <type>int</type>
-      <comment>Queue size limit for each child job</comment>
-      <default>0</default>
-      <add>3.3</add>
+    <name>job_limit</name>
+    <type>int</type>
+    <comment>Queue size limit for each child job</comment>
+    <default>0</default>
+    <add>3.3</add>
   </field>
 </table>
index 95b143626aea38a8e799a67389b007131a183c5e..f53a7d241acdfeb0d9e744050dd4c6a9fe4197f8 100644 (file)
@@ -7,60 +7,60 @@
   <comment>Stores information about the recipients of a mailing.</comment>
   <archive>true</archive>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
   </field>
   <primaryKey>
-      <name>id</name>
-      <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>mailing_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>The ID of the mailing this Job will send.</comment>
+    <name>mailing_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>The ID of the mailing this Job will send.</comment>
   </field>
   <foreignKey>
-      <name>mailing_id</name>
-      <table>civicrm_mailing</table>
-      <key>id</key>
-      <onDelete>CASCADE</onDelete>
+    <name>mailing_id</name>
+    <table>civicrm_mailing</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>contact_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>FK to Contact</comment>
+    <name>contact_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to Contact</comment>
   </field>
   <foreignKey>
-      <name>contact_id</name>
-      <table>civicrm_contact</table>
-      <key>id</key>
-      <onDelete>CASCADE</onDelete>
+    <name>contact_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>email_id</name>
-      <type>int unsigned</type>
-      <default>NULL</default>
-      <comment>FK to Email</comment>
+    <name>email_id</name>
+    <type>int unsigned</type>
+    <default>NULL</default>
+    <comment>FK to Email</comment>
   </field>
   <foreignKey>
-      <name>email_id</name>
-      <table>civicrm_email</table>
-      <key>id</key>
-      <onDelete>CASCADE</onDelete>
+    <name>email_id</name>
+    <table>civicrm_email</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>phone_id</name>
-      <type>int unsigned</type>
-      <default>NULL</default>
-      <comment>FK to Phone</comment>
+    <name>phone_id</name>
+    <type>int unsigned</type>
+    <default>NULL</default>
+    <comment>FK to Phone</comment>
   </field>
   <foreignKey>
-      <name>phone_id</name>
-      <table>civicrm_phone</table>
-      <key>id</key>
-      <onDelete>CASCADE</onDelete>
+    <name>phone_id</name>
+    <table>civicrm_phone</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
 </table>
index c820ef33ff51360efe1af74f3108843baaaee314..505de09fee49498905590f7a50ff1dd234901d00 100644 (file)
@@ -6,49 +6,49 @@
   <name>civicrm_mailing_spool</name>
   <comment>Stores the outbond mails</comment>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>job_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>The ID of the Job .</comment>
+    <name>job_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>The ID of the Job .</comment>
   </field>
   <foreignKey>
-       <name>job_id</name>
-       <table>civicrm_mailing_job</table>
-       <key>id</key>
-       <onDelete>CASCADE</onDelete>
+    <name>job_id</name>
+    <table>civicrm_mailing_job</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>recipient_email</name>
-      <type>text</type>
-      <comment>The email of the receipients this mail is to be sent.</comment>
+    <name>recipient_email</name>
+    <type>text</type>
+    <comment>The email of the receipients this mail is to be sent.</comment>
   </field>
   <field>
-      <name>headers</name>
-      <type>text</type>
-      <comment>The header information of this mailing .</comment>
+    <name>headers</name>
+    <type>text</type>
+    <comment>The header information of this mailing .</comment>
   </field>
   <field>
-      <name>body</name>
-      <type>text</type>
-      <comment>The body of this mailing.</comment>
+    <name>body</name>
+    <type>text</type>
+    <comment>The body of this mailing.</comment>
   </field>
   <field>
-      <name>added_at</name>
-      <type>datetime</type>
-      <comment>date on which this job was added.</comment>
+    <name>added_at</name>
+    <type>datetime</type>
+    <comment>date on which this job was added.</comment>
   </field>
   <field>
-      <name>removed_at</name>
-      <type>datetime</type>
-      <comment>date on which this job was removed.</comment>
+    <name>removed_at</name>
+    <type>datetime</type>
+    <comment>date on which this job was removed.</comment>
   </field>
 </table>
index 5c95a7a54a9a6dbc29de9e4c9a50ff33796e73fe..92fb4353abd295feb01e4c125202e23b62951812 100644 (file)
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/Mailing</base>
-    <class>TrackableURL</class>
-    <name>civicrm_mailing_trackable_url</name>
-    <comment>Stores URLs for which we should track click-throughs from mailings</comment>
-    <archive>true</archive>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>url</name>
-        <type>varchar</type>
-        <length>255</length>
-        <required>true</required>
-        <comment>The URL to be tracked.</comment>
-    </field>
-    <field>
-        <name>mailing_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>FK to the mailing</comment>
-    </field>
-    <foreignKey>
-        <name>mailing_id</name>
-        <table>civicrm_mailing</table>
-        <key>id</key>
-        <onDelete>CASCADE</onDelete>
-    </foreignKey>
+  <base>CRM/Mailing</base>
+  <class>TrackableURL</class>
+  <name>civicrm_mailing_trackable_url</name>
+  <comment>Stores URLs for which we should track click-throughs from mailings</comment>
+  <archive>true</archive>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>url</name>
+    <type>varchar</type>
+    <length>255</length>
+    <required>true</required>
+    <comment>The URL to be tracked.</comment>
+  </field>
+  <field>
+    <name>mailing_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to the mailing</comment>
+  </field>
+  <foreignKey>
+    <name>mailing_id</name>
+    <table>civicrm_mailing</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
 </table>
index 9abca1d4246ee8f0ec865ba395bf795a0f2673e4..b37292db17ed0642393c7d58abd90d8a5a0695fb 100644 (file)
   <add>1.5</add>
   <log>true</log>
   <field>
-      <name>id</name>
-      <uniqueName>membership_id</uniqueName>
-      <type>int unsigned</type>
-      <required>true</required>
-      <import>true</import>
-      <title>Membership ID</title>
-      <headerPattern>/^(m(embership\s)?id)$/i</headerPattern>
-      <comment>Membership Id</comment>
-      <add>1.5</add>
+    <name>id</name>
+    <uniqueName>membership_id</uniqueName>
+    <type>int unsigned</type>
+    <required>true</required>
+    <import>true</import>
+    <title>Membership ID</title>
+    <headerPattern>/^(m(embership\s)?id)$/i</headerPattern>
+    <comment>Membership Id</comment>
+    <add>1.5</add>
   </field>
   <primaryKey>
-      <name>id</name>
-      <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
 
   <field>
-      <name>contact_id</name>
-      <uniqueName>membership_contact_id</uniqueName>
-      <type>int unsigned</type>
-      <required>true</required>
-      <title>Contact ID</title>
-      <headerPattern>/contact(.?id)?/i</headerPattern>
-      <dataPattern>/^\d+$/</dataPattern>
-      <import>true</import>
-      <comment>FK to Contact ID</comment>
-      <add>1.5</add>
-      <html>
-       <type>Autocomplete-Select</type>
-     </html>
+    <name>contact_id</name>
+    <uniqueName>membership_contact_id</uniqueName>
+    <type>int unsigned</type>
+    <required>true</required>
+    <title>Contact ID</title>
+    <headerPattern>/contact(.?id)?/i</headerPattern>
+    <dataPattern>/^\d+$/</dataPattern>
+    <import>true</import>
+    <comment>FK to Contact ID</comment>
+    <add>1.5</add>
+    <html>
+      <type>Autocomplete-Select</type>
+    </html>
   </field>
   <foreignKey>
-      <name>contact_id</name>
-      <table>civicrm_contact</table>
-      <key>id</key>
-      <add>1.5</add>
-      <onDelete>CASCADE</onDelete>
+    <name>contact_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <add>1.5</add>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>membership_type_id</name>
-      <type>int unsigned</type>
-      <title>Membership Type Id</title>
-      <import>true</import>
-      <headerPattern>/^(m(embership\s)?type)$/i</headerPattern>
-      <export>false</export>
-      <required>true</required>
-      <comment>FK to Membership Type</comment>
-      <pseudoconstant>
-        <table>civicrm_membership_type</table>
-        <keyColumn>id</keyColumn>
-        <labelColumn>name</labelColumn>
-      </pseudoconstant>
-      <html>
-        <type>Select</type>
-      </html>
-      <add>1.5</add>
+    <name>membership_type_id</name>
+    <type>int unsigned</type>
+    <title>Membership Type Id</title>
+    <import>true</import>
+    <headerPattern>/^(m(embership\s)?type)$/i</headerPattern>
+    <export>false</export>
+    <required>true</required>
+    <comment>FK to Membership Type</comment>
+    <pseudoconstant>
+      <table>civicrm_membership_type</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
+    <add>1.5</add>
   </field>
   <foreignKey>
-      <name>membership_type_id</name>
-      <table>civicrm_membership_type</table>
-      <key>id</key>
-      <add>1.5</add>
-      <onDelete>CASCADE</onDelete>
+    <name>membership_type_id</name>
+    <table>civicrm_membership_type</table>
+    <key>id</key>
+    <add>1.5</add>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>join_date</name>
-      <title>Member Since</title>
-      <type>date</type>
-      <import>true</import>
-      <headerPattern>/^join|(j(oin\s)?date)$/i</headerPattern>
-      <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
-      <comment>Beginning of initial membership period (member since...).</comment>
-      <add>1.5</add>
-      <html>
-        <type>Select Date</type>
-      </html>
+    <name>join_date</name>
+    <title>Member Since</title>
+    <type>date</type>
+    <import>true</import>
+    <headerPattern>/^join|(j(oin\s)?date)$/i</headerPattern>
+    <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
+    <comment>Beginning of initial membership period (member since...).</comment>
+    <add>1.5</add>
+    <html>
+      <type>Select Date</type>
+    </html>
   </field>
   <field>
-      <name>start_date</name>
-      <uniqueName>membership_start_date</uniqueName>
-      <title>Membership Start Date</title>
-      <type>date</type>
-      <import>true</import>
-      <headerPattern>/(member(ship)?.)?start(s)?(.date$)?/i</headerPattern>
-      <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
-      <comment>Beginning of current uninterrupted membership period.</comment>
-      <add>1.5</add>
-      <html>
-        <type>Select Date</type>
-      </html>
+    <name>start_date</name>
+    <uniqueName>membership_start_date</uniqueName>
+    <title>Membership Start Date</title>
+    <type>date</type>
+    <import>true</import>
+    <headerPattern>/(member(ship)?.)?start(s)?(.date$)?/i</headerPattern>
+    <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
+    <comment>Beginning of current uninterrupted membership period.</comment>
+    <add>1.5</add>
+    <html>
+      <type>Select Date</type>
+    </html>
   </field>
   <field>
-      <name>end_date</name>
-      <uniqueName>membership_end_date</uniqueName>
-      <title>Membership Expiration Date</title>
-      <type>date</type>
-      <import>true</import>
-      <headerPattern>/(member(ship)?.)?end(s)?(.date$)?/i</headerPattern>
-      <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
-      <comment>Current membership period expire date.</comment>
-      <add>1.5</add>
-      <html>
-        <type>Select Date</type>
-      </html>
+    <name>end_date</name>
+    <uniqueName>membership_end_date</uniqueName>
+    <title>Membership Expiration Date</title>
+    <type>date</type>
+    <import>true</import>
+    <headerPattern>/(member(ship)?.)?end(s)?(.date$)?/i</headerPattern>
+    <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
+    <comment>Current membership period expire date.</comment>
+    <add>1.5</add>
+    <html>
+      <type>Select Date</type>
+    </html>
   </field>
   <field>
-      <name>source</name>
-      <uniqueName>membership_source</uniqueName>
-      <title>Source</title>
-      <import>true</import>
-       <headerPattern>/^(member(ship?))?source$/i</headerPattern>
-      <type>varchar</type>
-      <length>128</length>
-      <add>1.5</add>
-      <html>
-         <type>Text</type>
-       </html>
+    <name>source</name>
+    <uniqueName>membership_source</uniqueName>
+    <title>Source</title>
+    <import>true</import>
+    <headerPattern>/^(member(ship?))?source$/i</headerPattern>
+    <type>varchar</type>
+    <length>128</length>
+    <add>1.5</add>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <field>
-      <name>status_id</name>
-      <title>Membership Status Id</title>
-      <import>true</import>
-      <headerPattern>/(member(ship|).)?(status)$/i</headerPattern>
-      <type>int unsigned</type>
-      <export>false</export>
-      <required>true</required>
-      <comment>FK to Membership Status</comment>
-      <pseudoconstant>
-        <table>civicrm_membership_status</table>
-        <keyColumn>id</keyColumn>
-        <labelColumn>label</labelColumn>
-      </pseudoconstant>
-      <html>
-        <type>Select</type>
-      </html>
-      <add>1.5</add>
+    <name>status_id</name>
+    <title>Membership Status Id</title>
+    <import>true</import>
+    <headerPattern>/(member(ship|).)?(status)$/i</headerPattern>
+    <type>int unsigned</type>
+    <export>false</export>
+    <required>true</required>
+    <comment>FK to Membership Status</comment>
+    <pseudoconstant>
+      <table>civicrm_membership_status</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>label</labelColumn>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
+    <add>1.5</add>
   </field>
   <foreignKey>
-      <name>status_id</name>
-      <table>civicrm_membership_status</table>
-      <key>id</key>
-      <add>1.5</add>
-      <onDelete>CASCADE</onDelete>
+    <name>status_id</name>
+    <table>civicrm_membership_status</table>
+    <key>id</key>
+    <add>1.5</add>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>is_override</name>
-      <title>Status Override</title>
-      <import>true</import>
-      <headerPattern>/override$/i</headerPattern>
-      <type>boolean</type>
-      <comment>Admin users may set a manual status which overrides the calculated status. When this flag is true, automated status update scripts should NOT modify status for the record.</comment>
-      <html>
-         <type>CheckBox</type>
-       </html>
-      <add>1.5</add>
+    <name>is_override</name>
+    <title>Status Override</title>
+    <import>true</import>
+    <headerPattern>/override$/i</headerPattern>
+    <type>boolean</type>
+    <comment>Admin users may set a manual status which overrides the calculated status. When this flag is true, automated status update scripts should NOT modify status for the record.</comment>
+    <html>
+      <type>CheckBox</type>
+    </html>
+    <add>1.5</add>
   </field>
   <field>
-      <name>owner_membership_id</name>
-      <type>int unsigned</type>
+    <name>owner_membership_id</name>
+    <type>int unsigned</type>
     <title>Primary Member ID</title>
-      <comment>Optional FK to Parent Membership.</comment>
-      <export>true</export>
-      <add>1.7</add>
+    <comment>Optional FK to Parent Membership.</comment>
+    <export>true</export>
+    <add>1.7</add>
   </field>
   <foreignKey>
-       <name>owner_membership_id</name>
-       <table>civicrm_membership</table>
-       <key>id</key>
-       <add>1.7</add>
-       <onDelete>SET NULL</onDelete>
+    <name>owner_membership_id</name>
+    <table>civicrm_membership</table>
+    <key>id</key>
+    <add>1.7</add>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <index>
     <name>index_owner_membership_id</name>
     <add>1.7</add>
   </index>
   <field>
-      <name>max_related</name>
-      <type>int</type>
-      <comment>Maximum number of related memberships (membership_type override).</comment>
-      <add>4.3</add>
-      <html>
-         <type>Text</type>
-       </html>
+    <name>max_related</name>
+    <type>int</type>
+    <comment>Maximum number of related memberships (membership_type override).</comment>
+    <add>4.3</add>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <field>
-      <name>is_test</name>
-      <title>Test</title>
-      <uniqueName>member_is_test</uniqueName>
-      <type>boolean</type>
-      <default>0</default>
-      <import>true</import>
-      <headerPattern>/(is.)?test(.member(ship)?)?/i</headerPattern>
-      <html>
-         <type>CheckBox</type>
-       </html>
+    <name>is_test</name>
+    <title>Test</title>
+    <uniqueName>member_is_test</uniqueName>
+    <type>boolean</type>
+    <default>0</default>
+    <import>true</import>
+    <headerPattern>/(is.)?test(.member(ship)?)?/i</headerPattern>
+    <html>
+      <type>CheckBox</type>
+    </html>
   </field>
   <field>
-      <name>is_pay_later</name>
-      <uniqueName>member_is_pay_later</uniqueName>
-      <title>Is Pay Later</title>
-      <type>boolean</type>
-      <default>0</default>
-      <import>true</import>
-      <headerPattern>/(is.)?(pay(.)?later)$/i</headerPattern>
-      <add>2.1</add>
-      <html>
-         <type>CheckBox</type>
-       </html>
+    <name>is_pay_later</name>
+    <uniqueName>member_is_pay_later</uniqueName>
+    <title>Is Pay Later</title>
+    <type>boolean</type>
+    <default>0</default>
+    <import>true</import>
+    <headerPattern>/(is.)?(pay(.)?later)$/i</headerPattern>
+    <add>2.1</add>
+    <html>
+      <type>CheckBox</type>
+    </html>
   </field>
   <field>
     <name>contribution_recur_id</name>
index ef1d5a1dd88ffe52883568709875049eb6543d98..6a4ca68ba65f74fe84b2fe3ec49eb64dad374377 100644 (file)
   <add>1.5</add>
   <log>true</log>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Membership Id</comment>
-      <add>1.5</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Membership Id</comment>
+    <add>1.5</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-       <name>entity_table</name>
-       <type>varchar</type>
-       <length>64</length>
-       <comment>Name for Membership Status</comment>
-       <add>1.5</add>
+    <name>entity_table</name>
+    <type>varchar</type>
+    <length>64</length>
+    <comment>Name for Membership Status</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>entity_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>FK to civicrm_contribution_page.id</comment>
-      <add>1.5</add>
+    <name>entity_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to civicrm_contribution_page.id</comment>
+    <add>1.5</add>
   </field>
   <foreignKey>
-      <name>entity_id</name>
-      <table>civicrm_contribution_page</table>
-      <key>id</key>
-      <add>1.5</add>
+    <name>entity_id</name>
+    <table>civicrm_contribution_page</table>
+    <key>id</key>
+    <add>1.5</add>
   </foreignKey>
   <field>
-       <name>membership_types</name>
-       <type>varchar</type>
-       <length>255</length>
-       <comment>Membership types to be exposed by this block</comment>
-       <add>1.5</add>
+    <name>membership_types</name>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>Membership types to be exposed by this block</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>membership_type_default</name>
-      <type>int unsigned</type>
-      <comment>Optional foreign key to membership_type</comment>
-      <add>1.5</add>
+    <name>membership_type_default</name>
+    <type>int unsigned</type>
+    <comment>Optional foreign key to membership_type</comment>
+    <add>1.5</add>
   </field>
- <foreignKey>
-      <name>membership_type_default</name>
-      <table>civicrm_membership_type</table>
-      <key>id</key>
-      <add>1.5</add>
 <foreignKey>
+    <name>membership_type_default</name>
+    <table>civicrm_membership_type</table>
+    <key>id</key>
+    <add>1.5</add>
   </foreignKey>
   <field>
-      <name>display_min_fee</name>
-      <type>boolean</type>
-      <default>1</default>
-      <comment>Display minimum membership fee</comment>
-      <add>1.5</add>
+    <name>display_min_fee</name>
+    <type>boolean</type>
+    <default>1</default>
+    <comment>Display minimum membership fee</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>is_separate_payment</name>
-      <type>boolean</type>
-      <default>1</default>
-      <comment>Should membership transactions be processed separately</comment>
-      <add>1.5</add>
+    <name>is_separate_payment</name>
+    <type>boolean</type>
+    <default>1</default>
+    <comment>Should membership transactions be processed separately</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>new_title</name>
-      <type>varchar</type>
-      <length>255</length>
-      <localizable>true</localizable>
-      <comment>Title to display at top of block</comment>
-      <add>1.5</add>
+    <name>new_title</name>
+    <type>varchar</type>
+    <length>255</length>
+    <localizable>true</localizable>
+    <comment>Title to display at top of block</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>new_text</name>
-      <type>text</type>
-      <localizable>true</localizable>
-      <comment>Text to display below title</comment>
-      <add>1.5</add>
+    <name>new_text</name>
+    <type>text</type>
+    <localizable>true</localizable>
+    <comment>Text to display below title</comment>
+    <add>1.5</add>
   </field>
-<field>
-      <name>renewal_title</name>
-      <type>varchar</type>
-      <length>255</length>
-      <localizable>true</localizable>
-      <comment>Title for renewal</comment>
-      <add>1.5</add>
+  <field>
+    <name>renewal_title</name>
+    <type>varchar</type>
+    <length>255</length>
+    <localizable>true</localizable>
+    <comment>Title for renewal</comment>
+    <add>1.5</add>
   </field>
-<field>
-      <name>renewal_text</name>
-      <type>text</type>
-      <localizable>true</localizable>
-      <comment>Text to display for member renewal</comment>
-      <add>1.5</add>
+  <field>
+    <name>renewal_text</name>
+    <type>text</type>
+    <localizable>true</localizable>
+    <comment>Text to display for member renewal</comment>
+    <add>1.5</add>
   </field>
- <field>
-      <name>is_required</name>
-      <title>Is Required</title>
-      <type>boolean</type>
-      <default>0</default>
-      <comment>Is membership sign up optional</comment>
-      <add>1.5</add>
 <field>
+    <name>is_required</name>
+    <title>Is Required</title>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is membership sign up optional</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>is_active</name>
-      <title>Is Active</title>
-      <type>boolean</type>
-      <default>1</default>
-      <comment>Is this membership_block enabled</comment>
-      <add>1.5</add>
+    <name>is_active</name>
+    <title>Is Active</title>
+    <type>boolean</type>
+    <default>1</default>
+    <comment>Is this membership_block enabled</comment>
+    <add>1.5</add>
   </field>
 </table>
index 1c092bc14cb897cfeb594b5ae4b2b8c85d9889c0..8310ec41d132c26668466c693e4417f8494d11c6 100644 (file)
@@ -8,21 +8,21 @@
   <comment>Logs actions which affect a Membership record (signup, status override, renewal, etc.)</comment>
   <add>1.5</add>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <add>1.5</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <add>1.5</add>
   </field>
   <primaryKey>
-      <name>id</name>
-      <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>membership_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>FK to Membership table</comment>
-      <add>1.5</add>
+    <name>membership_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to Membership table</comment>
+    <add>1.5</add>
   </field>
   <foreignKey>
     <name>membership_id</name>
     <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>status_id</name>
-      <title>Membership Status</title>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>New status assigned to membership by this action. FK to Membership Status</comment>
-      <add>1.5</add>
+    <name>status_id</name>
+    <title>Membership Status</title>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>New status assigned to membership by this action. FK to Membership Status</comment>
+    <add>1.5</add>
   </field>
   <foreignKey>
-      <name>status_id</name>
-      <table>civicrm_membership_status</table>
-      <key>id</key>
-      <add>1.5</add>
-      <onDelete>CASCADE</onDelete>
+    <name>status_id</name>
+    <table>civicrm_membership_status</table>
+    <key>id</key>
+    <add>1.5</add>
+    <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>start_date</name>
-      <type>date</type>
-      <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
-      <comment>New membership period start date</comment>
-      <add>1.5</add>
+    <name>start_date</name>
+    <type>date</type>
+    <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
+    <comment>New membership period start date</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>end_date</name>
-      <type>date</type>
-      <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
-      <comment>New membership period expiration date.</comment>
-      <add>1.5</add>
+    <name>end_date</name>
+    <type>date</type>
+    <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
+    <comment>New membership period expiration date.</comment>
+    <add>1.5</add>
   </field>
   <field>
-       <name>modified_id</name>
-       <type>int unsigned</type>
-       <comment>FK to Contact ID of person under whose credentials this data modification was made.</comment>
-       <add>1.5</add>
+    <name>modified_id</name>
+    <type>int unsigned</type>
+    <comment>FK to Contact ID of person under whose credentials this data modification was made.</comment>
+    <add>1.5</add>
   </field>
   <foreignKey>
-       <name>modified_id</name>
-       <table>civicrm_contact</table>
-       <key>id</key>
-       <add>1.5</add>
-       <onDelete>SET NULL</onDelete>
+    <name>modified_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <add>1.5</add>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-      <name>modified_date</name>
-      <title>Membership Change Date</title>
-      <type>date</type>
-      <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
-      <comment>Date this membership modification action was logged.</comment>
-      <add>1.5</add>
+    <name>modified_date</name>
+    <title>Membership Change Date</title>
+    <type>date</type>
+    <dataPattern>/\d{4}-?\d{2}-?\d{2}/</dataPattern>
+    <comment>Date this membership modification action was logged.</comment>
+    <add>1.5</add>
   </field>
   <field>
-       <name>membership_type_id</name>
-       <type>int unsigned</type>
-       <comment>FK to Membership Type.</comment>
-       <add>3.4</add>
+    <name>membership_type_id</name>
+    <type>int unsigned</type>
+    <comment>FK to Membership Type.</comment>
+    <add>3.4</add>
   </field>
   <foreignKey>
-       <name>membership_type_id</name>
-       <table>civicrm_membership_type</table>
-       <key>id</key>
-       <add>3.4</add>
-       <onDelete>SET NULL</onDelete>
+    <name>membership_type_id</name>
+    <table>civicrm_membership_type</table>
+    <key>id</key>
+    <add>3.4</add>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-       <name>max_related</name>
-       <type>int</type>
-       <comment>Maximum number of related memberships.</comment>
-       <add>4.3</add>
+    <name>max_related</name>
+    <type>int</type>
+    <comment>Maximum number of related memberships.</comment>
+    <add>4.3</add>
   </field>
 </table>
index 8d5ff2b7a6ee21185f186ed94d27af33ed190654..dec458571fe020b08ebf7dbaa38da785d53dcd66 100644 (file)
@@ -8,21 +8,21 @@
   <add>1.5</add>
   <log>true</log>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <add>1.5</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <add>1.5</add>
   </field>
   <primaryKey>
-      <name>id</name>
-      <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>membership_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>FK to Membership table</comment>
-      <add>1.5</add>
+    <name>membership_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to Membership table</comment>
+    <add>1.5</add>
   </field>
   <foreignKey>
     <name>membership_id</name>
     <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>
-      <name>contribution_id</name>
-      <type>int unsigned</type>
-      <comment>FK to contribution table.</comment>
-      <add>2.0</add>
+    <name>contribution_id</name>
+    <type>int unsigned</type>
+    <comment>FK to contribution table.</comment>
+    <add>2.0</add>
   </field>
   <foreignKey>
     <name>contribution_id</name>
index 3033319ca5078b055d37b12dbfae1a0c7a0306c2..14ae53aa4c6bba6557b1072bd1486c640c4ebcb5 100644 (file)
   <add>1.5</add>
   <log>true</log>
   <field>
-      <name>id</name>
+    <name>id</name>
     <title>Membership Status ID</title>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Membership Id</comment>
-      <add>1.5</add>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Membership Id</comment>
+    <add>1.5</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-       <name>name</name>
-       <uniqueName>membership_status</uniqueName>
-       <title>Membership Status</title>
-       <type>varchar</type>
-       <import>true</import>
-       <length>128</length>
-       <comment>Name for Membership Status</comment>
-       <add>1.5</add>
+    <name>name</name>
+    <uniqueName>membership_status</uniqueName>
+    <title>Membership Status</title>
+    <type>varchar</type>
+    <import>true</import>
+    <length>128</length>
+    <comment>Name for Membership Status</comment>
+    <add>1.5</add>
   </field>
   <field>
-       <name>label</name>
-       <type>varchar</type>
-       <length>128</length>
-       <localizable>true</localizable>
-       <comment>Label for Membership Status</comment>
-       <add>3.2</add>
+    <name>label</name>
+    <type>varchar</type>
+    <length>128</length>
+    <localizable>true</localizable>
+    <comment>Label for Membership Status</comment>
+    <add>3.2</add>
   </field>
   <field>
-       <name>start_event</name>
-       <type>varchar</type>
-       <length>12</length>
-       <comment>Event when this status starts.</comment>
-       <pseudoconstant>
-         <callback>CRM_Core_SelectValues::eventDate</callback>
-       </pseudoconstant>
-       <add>1.5</add>
-       <html>
-         <type>Select</type>
-       </html>
+    <name>start_event</name>
+    <type>varchar</type>
+    <length>12</length>
+    <comment>Event when this status starts.</comment>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::eventDate</callback>
+    </pseudoconstant>
+    <add>1.5</add>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <field>
-      <name>start_event_adjust_unit</name>
-      <type>varchar</type>
-      <length>8</length>
-      <comment>Unit used for adjusting from start_event.</comment>
-      <pseudoconstant>
-        <callback>CRM_Core_SelectValues::unitList</callback>
-      </pseudoconstant>
-      <add>1.5</add>
-      <html>
-        <type>Select</type>
-      </html>
+    <name>start_event_adjust_unit</name>
+    <type>varchar</type>
+    <length>8</length>
+    <comment>Unit used for adjusting from start_event.</comment>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::unitList</callback>
+    </pseudoconstant>
+    <add>1.5</add>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <field>
-      <name>start_event_adjust_interval</name>
-      <type>int</type>
-      <comment>Status range begins this many units from start_event.</comment>
-      <add>1.5</add>
+    <name>start_event_adjust_interval</name>
+    <type>int</type>
+    <comment>Status range begins this many units from start_event.</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>end_event</name>
-      <type>varchar</type>
-      <length>12</length>
-      <comment>Event after which this status ends.</comment>
-      <pseudoconstant>
-        <callback>CRM_Core_SelectValues::eventDate</callback>
-      </pseudoconstant>
-      <add>1.5</add>
-      <html>
-        <type>Select</type>
-      </html>
+    <name>end_event</name>
+    <type>varchar</type>
+    <length>12</length>
+    <comment>Event after which this status ends.</comment>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::eventDate</callback>
+    </pseudoconstant>
+    <add>1.5</add>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <field>
-      <name>end_event_adjust_unit</name>
-      <type>varchar</type>
-      <length>8</length>
-      <comment>Unit used for adjusting from the ending event.</comment>
-      <pseudoconstant>
-        <callback>CRM_Core_SelectValues::unitList</callback>
-      </pseudoconstant>
-      <add>1.5</add>
-      <html>
-        <type>Select</type>
-      </html>
+    <name>end_event_adjust_unit</name>
+    <type>varchar</type>
+    <length>8</length>
+    <comment>Unit used for adjusting from the ending event.</comment>
+    <pseudoconstant>
+      <callback>CRM_Core_SelectValues::unitList</callback>
+    </pseudoconstant>
+    <add>1.5</add>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
- <field>
-      <name>end_event_adjust_interval</name>
-      <type>int</type>
-      <comment>Status range ends this many units from end_event.</comment>
-      <add>1.5</add>
 <field>
+    <name>end_event_adjust_interval</name>
+    <type>int</type>
+    <comment>Status range ends this many units from end_event.</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>is_current_member</name>
-      <title>Current Membership?</title>
-      <type>boolean</type>
-      <comment>Does this status aggregate to current members (e.g. New, Renewed, Grace might all be TRUE... while Unrenewed, Lapsed, Inactive would be FALSE).</comment>
-      <add>1.5</add>
+    <name>is_current_member</name>
+    <title>Current Membership?</title>
+    <type>boolean</type>
+    <comment>Does this status aggregate to current members (e.g. New, Renewed, Grace might all be TRUE... while Unrenewed, Lapsed, Inactive would be FALSE).</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>is_admin</name>
-      <title>Admin Assigned Only?</title>
-      <type>boolean</type>
-      <comment>Is this status for admin/manual assignment only.</comment>
-      <add>1.5</add>
+    <name>is_admin</name>
+    <title>Admin Assigned Only?</title>
+    <type>boolean</type>
+    <comment>Is this status for admin/manual assignment only.</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>weight</name>
-      <title>Weight</title>
-      <type>int</type>
-      <add>1.5</add>
+    <name>weight</name>
+    <title>Weight</title>
+    <type>int</type>
+    <add>1.5</add>
   </field>
   <field>
-      <name>is_default</name>
-      <title>Default Status?</title>
-      <type>boolean</type>
-      <comment>Assign this status to a membership record if no other status match is found.</comment>
-      <add>1.5</add>
+    <name>is_default</name>
+    <title>Default Status?</title>
+    <type>boolean</type>
+    <comment>Assign this status to a membership record if no other status match is found.</comment>
+    <add>1.5</add>
   </field>
   <field>
-      <name>is_active</name>
-      <title>Is Active</title>
-      <type>boolean</type>
-      <default>1</default>
-      <comment>Is this membership_status enabled.</comment>
-      <add>1.5</add>
+    <name>is_active</name>
+    <title>Is Active</title>
+    <type>boolean</type>
+    <default>1</default>
+    <comment>Is this membership_status enabled.</comment>
+    <add>1.5</add>
   </field>
- <field>
-      <name>is_reserved</name>
-      <title>Is Reserved</title>
-      <type>boolean</type>
-      <default>0</default>
-      <comment>Is this membership_status reserved.</comment>
-      <add>2.1</add>
 <field>
+    <name>is_reserved</name>
+    <title>Is Reserved</title>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Is this membership_status reserved.</comment>
+    <add>2.1</add>
   </field>
 </table>
index ae740f441c68c4175b59db465235370f444000f6..1b57fb445c5027380bbdf16175af7c7581b3c2ec 100644 (file)
     <type>int unsigned</type>
     <default>NULL</default>
     <comment>Participant count for fiel
-    <html>
-      <type>Text</type>
-    </html>d</comment>
+      <html>
+        <type>Text</type>
+      </html>d</comment>
     <add>3.2</add>
 
   </field>
index 37ef91f5c3c454ea9af89cb977ace0f85ca2a2bf..5ff8825f6b826b99bd84b59ab2ec9306c94606b1 100644 (file)
   <add>1.8</add>
   <log>true</log>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Price Field</comment>
-      <add>1.8</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Price Field</comment>
+    <add>1.8</add>
   </field>
   <primaryKey>
-      <name>id</name>
-      <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>price_set_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>FK to civicrm_price_set</comment>
-      <add>1.8</add>
+    <name>price_set_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to civicrm_price_set</comment>
+    <add>1.8</add>
   </field>
   <foreignKey>
-      <name>price_set_id</name>
-      <table>civicrm_price_set</table>
-      <key>id</key>
-      <add>1.8</add>
+    <name>price_set_id</name>
+    <table>civicrm_price_set</table>
+    <key>id</key>
+    <add>1.8</add>
   </foreignKey>
   <field>
-      <name>name</name>
-      <type>varchar</type>
-      <title>Name</title>
-      <length>255</length>
-      <required>true</required>
-      <comment>Variable name/programmatic handle for this field.</comment>
-      <add>1.8</add>
-      <html>
-        <type>Text</type>
-      </html>
+    <name>name</name>
+    <type>varchar</type>
+    <title>Name</title>
+    <length>255</length>
+    <required>true</required>
+    <comment>Variable name/programmatic handle for this field.</comment>
+    <add>1.8</add>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <index>
-      <name>index_name</name>
-      <fieldName>name</fieldName>
-      <add>1.8</add>
+    <name>index_name</name>
+    <fieldName>name</fieldName>
+    <add>1.8</add>
   </index>
   <field>
-      <name>label</name>
-      <type>varchar</type>
-      <title>Label</title>
-      <length>255</length>
-      <required>true</required>
-      <localizable>true</localizable>
-      <comment>Text for form field label (also friendly name for administering this field).</comment>
-      <html>
-        <type>Text</type>
-      </html>
-      <add>1.8</add>
-  </field>
-  <field>
-      <name>html_type</name>
-      <type>varchar</type>
-      <length>12</length>
-      <required>true</required>
-      <pseudoconstant>
-        <callback>CRM_Price_BAO_PriceField::htmlTypes</callback>
-      </pseudoconstant>
-      <add>1.8</add>
-      <html>
-        <type>Select</type>
-      </html>
-  </field>
-  <field>
-      <name>is_enter_qty</name>
-      <type>boolean</type>
-      <default>0</default>
-      <comment>Enter a quantity for this field?</comment>
-      <add>1.8</add>
-      <html>
-         <type>CheckBox</type>
-       </html>
-  </field>
-  <field>
-      <name>help_pre</name>
-      <type>text</type>
-      <localizable>true</localizable>
-      <comment>Description and/or help text to display before this field.</comment>
-      <html>
-        <type>TextArea</type>
-        <rows>4</rows>
-        <cols>80</cols>
-      </html>
-      <add>1.8</add>
-  </field>
-  <field>
-      <name>help_post</name>
-      <type>text</type>
-      <localizable>true</localizable>
-      <comment>Description and/or help text to display after this field.</comment>
-      <html>
-        <type>TextArea</type>
-        <rows>4</rows>
-        <cols>80</cols>
-      </html>
-      <add>1.8</add>
-  </field>
-  <field>
-      <name>weight</name>
-      <type>int</type>
-      <default>1</default>
-      <comment>Order in which the fields should appear</comment>
-      <add>1.8</add>
-      <html>
-        <type>Select</type>
-      </html>
-  </field>
-  <field>
-      <name>is_display_amounts</name>
-      <type>boolean</type>
-      <default>1</default>
-      <comment>Should the price be displayed next to the label for each option?</comment>
-      <html>
-         <type>CheckBox</type>
-       </html>
-  </field>
-  <field>
-      <name>options_per_line</name>
-      <type>int unsigned</type>
-      <default>1</default>
-      <comment>number of options per line for checkbox and radio</comment>
-      <add>1.8</add>
-      <html>
-        <type>Text</type>
-      </html>
-  </field>
-  <field>
-      <name>is_active</name>
-      <type>boolean</type>
-      <comment>Is this price field active</comment>
-      <default>1</default>
-      <add>1.8</add>
-      <html>
-         <type>CheckBox</type>
-       </html>
-  </field>
-  <field>
-      <name>is_required</name>
-      <type>boolean</type>
-      <comment>Is this price field required (value must be > 1)</comment>
-      <default>1</default>
-      <add>1.8</add>
-      <html>
-         <type>CheckBox</type>
-       </html>
-  </field>
-  <field>
-      <name>active_on</name>
-      <type>datetime</type>
-      <default>NULL</default>
-      <comment>If non-zero, do not show this field before the date specified</comment>
-      <add>1.8</add>
-      <html>
-         <type>CheckBox</type>
-       </html>
-  </field>
-  <field>
-      <name>expire_on</name>
-      <type>datetime</type>
-      <default>NULL</default>
-      <comment>If non-zero, do not show this field after the date specified</comment>
-      <add>1.8</add>
-      <html>
-        <type>Select Date</type>
+    <name>label</name>
+    <type>varchar</type>
+    <title>Label</title>
+    <length>255</length>
+    <required>true</required>
+    <localizable>true</localizable>
+    <comment>Text for form field label (also friendly name for administering this field).</comment>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>1.8</add>
+  </field>
+  <field>
+    <name>html_type</name>
+    <type>varchar</type>
+    <length>12</length>
+    <required>true</required>
+    <pseudoconstant>
+      <callback>CRM_Price_BAO_PriceField::htmlTypes</callback>
+    </pseudoconstant>
+    <add>1.8</add>
+    <html>
+      <type>Select</type>
+    </html>
+  </field>
+  <field>
+    <name>is_enter_qty</name>
+    <type>boolean</type>
+    <default>0</default>
+    <comment>Enter a quantity for this field?</comment>
+    <add>1.8</add>
+    <html>
+      <type>CheckBox</type>
+    </html>
+  </field>
+  <field>
+    <name>help_pre</name>
+    <type>text</type>
+    <localizable>true</localizable>
+    <comment>Description and/or help text to display before this field.</comment>
+    <html>
+      <type>TextArea</type>
+      <rows>4</rows>
+      <cols>80</cols>
+    </html>
+    <add>1.8</add>
+  </field>
+  <field>
+    <name>help_post</name>
+    <type>text</type>
+    <localizable>true</localizable>
+    <comment>Description and/or help text to display after this field.</comment>
+    <html>
+      <type>TextArea</type>
+      <rows>4</rows>
+      <cols>80</cols>
+    </html>
+    <add>1.8</add>
+  </field>
+  <field>
+    <name>weight</name>
+    <type>int</type>
+    <default>1</default>
+    <comment>Order in which the fields should appear</comment>
+    <add>1.8</add>
+    <html>
+      <type>Select</type>
+    </html>
+  </field>
+  <field>
+    <name>is_display_amounts</name>
+    <type>boolean</type>
+    <default>1</default>
+    <comment>Should the price be displayed next to the label for each option?</comment>
+    <html>
+      <type>CheckBox</type>
+    </html>
+  </field>
+  <field>
+    <name>options_per_line</name>
+    <type>int unsigned</type>
+    <default>1</default>
+    <comment>number of options per line for checkbox and radio</comment>
+    <add>1.8</add>
+    <html>
+      <type>Text</type>
     </html>
   </field>
   <field>
-      <name>javascript</name>
-      <type>varchar</type>
-      <length>255</length>
-      <comment>Optional scripting attributes for field</comment>
-      <add>1.8</add>
-      <html>
-        <type>Text</type>
-      </html>
-  </field>
-  <field>
-      <name>visibility_id</name>
-      <type>int unsigned</type>
-      <default>1</default>
-      <comment>Implicit FK to civicrm_option_group with name = \'visibility\'</comment>
-      <add>3.2</add>
-      <pseudoconstant>
-        <optionGroupName>visibility</optionGroupName>
-      </pseudoconstant>
-      <html>
-        <type>Select</type>
-      </html>
-   </field>
-   <field>
-      <name>count</name>
-      <type>int unsigned</type>
-      <default>NULL</default>
-      <comment>Number of Participants Per field</comment>
-      <add>3.2</add>
-      <drop>3.3</drop>
-   </field>
+    <name>is_active</name>
+    <type>boolean</type>
+    <comment>Is this price field active</comment>
+    <default>1</default>
+    <add>1.8</add>
+    <html>
+      <type>CheckBox</type>
+    </html>
+  </field>
+  <field>
+    <name>is_required</name>
+    <type>boolean</type>
+    <comment>Is this price field required (value must be > 1)</comment>
+    <default>1</default>
+    <add>1.8</add>
+    <html>
+      <type>CheckBox</type>
+    </html>
+  </field>
+  <field>
+    <name>active_on</name>
+    <type>datetime</type>
+    <default>NULL</default>
+    <comment>If non-zero, do not show this field before the date specified</comment>
+    <add>1.8</add>
+    <html>
+      <type>CheckBox</type>
+    </html>
+  </field>
+  <field>
+    <name>expire_on</name>
+    <type>datetime</type>
+    <default>NULL</default>
+    <comment>If non-zero, do not show this field after the date specified</comment>
+    <add>1.8</add>
+    <html>
+      <type>Select Date</type>
+    </html>
+  </field>
+  <field>
+    <name>javascript</name>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>Optional scripting attributes for field</comment>
+    <add>1.8</add>
+    <html>
+      <type>Text</type>
+    </html>
+  </field>
+  <field>
+    <name>visibility_id</name>
+    <type>int unsigned</type>
+    <default>1</default>
+    <comment>Implicit FK to civicrm_option_group with name = \'visibility\'</comment>
+    <add>3.2</add>
+    <pseudoconstant>
+      <optionGroupName>visibility</optionGroupName>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
+  </field>
+  <field>
+    <name>count</name>
+    <type>int unsigned</type>
+    <default>NULL</default>
+    <comment>Number of Participants Per field</comment>
+    <add>3.2</add>
+    <drop>3.3</drop>
+  </field>
 </table>
 
index 096d6e9b338e3909725d9725182446307acf7a4b..19a89947e1aeee72da7d620593828f0a291663e4 100644 (file)
@@ -58,7 +58,7 @@
     <html>
       <type>TextArea</type>
       <rows>2</rows>
-    <cols>60</cols>
+      <cols>60</cols>
     </html>
     <default>NULL</default>
     <localizable>true</localizable>
index 4614eb7722b9459218541fb3f980fa9ebb7870d7..a6ec3c2713aade824751e960d81b49a9cf96ed26 100644 (file)
@@ -7,54 +7,54 @@
   <add>1.8</add>
   <log>true</log>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Price Set Entity</comment>
-      <add>1.8</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Price Set Entity</comment>
+    <add>1.8</add>
   </field>
   <primaryKey>
-      <name>id</name>
-      <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>entity_table</name>
-      <type>varchar</type>
-      <length>64</length>
-      <required>true</required>
-      <comment>Table which uses this price set</comment>
-      <add>1.8</add>
+    <name>entity_table</name>
+    <type>varchar</type>
+    <length>64</length>
+    <required>true</required>
+    <comment>Table which uses this price set</comment>
+    <add>1.8</add>
   </field>
   <field>
-      <name>entity_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Item in table</comment>
-      <add>1.8</add>
+    <name>entity_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Item in table</comment>
+    <add>1.8</add>
   </field>
   <dynamicForeignKey>
-      <idColumn>entity_id</idColumn>
-      <typeColumn>entity_table</typeColumn>
-      <add>1.8</add>
+    <idColumn>entity_id</idColumn>
+    <typeColumn>entity_table</typeColumn>
+    <add>1.8</add>
   </dynamicForeignKey>
   <field>
-      <name>price_set_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>price set being used</comment>
-      <add>1.8</add>
+    <name>price_set_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>price set being used</comment>
+    <add>1.8</add>
   </field>
   <foreignKey>
-      <name>price_set_id</name>
-      <table>civicrm_price_set</table>
-      <key>id</key>
+    <name>price_set_id</name>
+    <table>civicrm_price_set</table>
+    <key>id</key>
   </foreignKey>
   <index>
-      <name>UI_entity</name>
-      <fieldName>entity_table</fieldName>
-      <fieldName>entity_id</fieldName>
-      <unique>true</unique>
-      <add>1.8</add>
+    <name>UI_entity</name>
+    <fieldName>entity_table</fieldName>
+    <fieldName>entity_id</fieldName>
+    <unique>true</unique>
+    <add>1.8</add>
   </index>
 </table>
 
index 22afdffe57594122b5d6a296f1505d0466a15e23..461a94fed0faa27e290eb9b27ff5dc4a36b5cdc9 100644 (file)
   <comment>Users can save their report instance and put in a cron tab etc.</comment>
   <add>2.2</add>
   <field>
-      <name>id</name>
-      <title>Report Instance ID</title>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>Report Instance ID</comment>
-       <add>2.2</add>
+    <name>id</name>
+    <title>Report Instance ID</title>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Report Instance ID</comment>
+    <add>2.2</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>false</autoincrement>
+    <name>id</name>
+    <autoincrement>false</autoincrement>
   </primaryKey>
   <field>
-      <name>domain_id</name>
-      <title>Report Instance Domain ID</title>
-      <type>int unsigned</type>
-      <pseudoconstant>
-        <table>civicrm_domain</table>
-        <keyColumn>id</keyColumn>
-        <labelColumn>name</labelColumn>
-      </pseudoconstant>
-      <required>true</required>
-      <comment>Which Domain is this instance for</comment>
-      <add>3.1</add>
+    <name>domain_id</name>
+    <title>Report Instance Domain ID</title>
+    <type>int unsigned</type>
+    <pseudoconstant>
+      <table>civicrm_domain</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
+    <required>true</required>
+    <comment>Which Domain is this instance for</comment>
+    <add>3.1</add>
   </field>
   <foreignKey>
-       <name>domain_id</name>
-       <table>civicrm_domain</table>
-       <key>id</key>
-       <add>3.1</add>
+    <name>domain_id</name>
+    <table>civicrm_domain</table>
+    <key>id</key>
+    <add>3.1</add>
   </foreignKey>
   <field>
-       <name>title</name>
-       <title>Report Instance Title</title>
-       <type>varchar</type>
-       <length>255</length>
-       <comment>Report Instance Title.</comment>
-       <html>
-        <type>Text</type>
-      </html>
-       <add>2.2</add>
-  </field>
-  <field>
-      <name>report_id</name>
-      <title>Report template ID</title>
-      <type>varchar</type>
-      <length>64</length>
-      <required>true</required>
-      <comment>FK to civicrm_option_value for the report template</comment>
-      <html>
-        <type>Select</type>
-      </html>
-      <add>2.2</add>
-  </field>
-  <field>
-      <name>name</name>
-      <title>Report instance Name</title>
-      <type>varchar</type>
-      <length>255</length>
-      <comment>when combined with report_id/template uniquely identifies the instance</comment>
-      <html>
-        <type>Text</type>
-      </html>
-      <add>3.2</add>
-  </field>
-  <field>
-      <name>args</name>
-      <title>Report Instance Arguments</title>
-      <type>varchar</type>
-      <length>255</length>
-      <comment>arguments that are passed in the url when invoking the instance</comment>
-      <add>3.2</add>
-      <html>
-        <type>Text</type>
-      </html>
-  </field>
-  <field>
-       <name>description</name>
-       <title>Report Instance description</title>
-       <type>varchar</type>
-       <length>255</length>
-       <comment>Report Instance description.</comment>
-       <html>
-        <type>Text</type>
-      </html>
-       <add>2.2</add>
-  </field>
-  <field>
-       <name>permission</name>
-       <title>Report Instance Permissions</title>
-       <type>varchar</type>
-       <length>255</length>
-       <comment>permission required to be able to run this instance</comment>
-       <html>
-        <type>Text</type>
-      </html>
-       <add>2.2</add>
-  </field>
-  <field>
-       <name>grouprole</name>
-       <title>Report Instance Assigned to Roles</title>
-       <type>varchar</type>
-       <length>1024</length>
-       <comment>role required to be able to run this instance</comment>
-       <add>4.1</add>
-       <html>
-        <type>Text</type>
-      </html>
-  </field>
-  <field>
-       <name>form_values</name>
-       <title>Submitted Form Values</title>
-       <type>text</type>
-       <import>true</import>
-       <comment>Submitted form values for this report</comment>
-       <add>2.2</add>
-  </field>
-  <field>
-       <name>is_active</name>
-       <title>Report Instance is Active</title>
-       <type>boolean</type>
-       <comment>Is this entry active?</comment>
-       <html>
-         <type>CheckBox</type>
-       </html>
-       <add>2.2</add>
-  </field>
-  <field>
-       <name>email_subject</name>
-       <title>Report Instance email Subject</title>
-       <type>varchar</type>
-       <length>255</length>
-       <comment>Subject of email</comment>
-       <html>
-         <type>Text</type>
-       </html>
-  </field>
-  <field>
-      <name>email_to</name>
-      <title>Email Report Instance To</title>
-      <type>text</type>
-      <comment>comma-separated list of email addresses to send the report to</comment>
-      <html>
-        <type>Text</type>
-      </html>
-      <add>2.2</add>
-  </field>
-  <field>
-      <name>email_cc</name>
-      <title>cc Email Report Instance To</title>
-      <type>text</type>
-      <comment>comma-separated list of email addresses to send the report to</comment>
-      <html>
-        <type>Text</type>
-      </html>
-      <add>2.2</add>
-  </field>
-  <field>
-      <name>header</name>
-      <title>Report Instance Header</title>
-      <type>text</type>
-      <comment>comma-separated list of email addresses to send the report to</comment>
-      <html>
-        <type>TextArea</type>
-        <rows>4</rows>
-        <cols>60</cols>
-      </html>
-      <add>2.2</add>
-  </field>
-  <field>
-      <name>footer</name>
-      <title>Report Instance Footer</title>
-      <type>text</type>
-      <comment>comma-separated list of email addresses to send the report to</comment>
-      <html>
-        <type>TextArea</type>
-        <rows>4</rows>
-        <cols>60</cols>
-      </html>
-      <add>2.2</add>
-  </field>
-  <field>
-      <name>navigation_id</name>
-      <title>Navigation ID</title>
-      <type>int unsigned</type>
-      <import>true</import>
-      <comment>FK to navigation ID</comment>
-      <add>3.0</add>
+    <name>title</name>
+    <title>Report Instance Title</title>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>Report Instance Title.</comment>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>2.2</add>
+  </field>
+  <field>
+    <name>report_id</name>
+    <title>Report template ID</title>
+    <type>varchar</type>
+    <length>64</length>
+    <required>true</required>
+    <comment>FK to civicrm_option_value for the report template</comment>
+    <html>
+      <type>Select</type>
+    </html>
+    <add>2.2</add>
+  </field>
+  <field>
+    <name>name</name>
+    <title>Report instance Name</title>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>when combined with report_id/template uniquely identifies the instance</comment>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>3.2</add>
+  </field>
+  <field>
+    <name>args</name>
+    <title>Report Instance Arguments</title>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>arguments that are passed in the url when invoking the instance</comment>
+    <add>3.2</add>
+    <html>
+      <type>Text</type>
+    </html>
+  </field>
+  <field>
+    <name>description</name>
+    <title>Report Instance description</title>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>Report Instance description.</comment>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>2.2</add>
+  </field>
+  <field>
+    <name>permission</name>
+    <title>Report Instance Permissions</title>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>permission required to be able to run this instance</comment>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>2.2</add>
+  </field>
+  <field>
+    <name>grouprole</name>
+    <title>Report Instance Assigned to Roles</title>
+    <type>varchar</type>
+    <length>1024</length>
+    <comment>role required to be able to run this instance</comment>
+    <add>4.1</add>
+    <html>
+      <type>Text</type>
+    </html>
+  </field>
+  <field>
+    <name>form_values</name>
+    <title>Submitted Form Values</title>
+    <type>text</type>
+    <import>true</import>
+    <comment>Submitted form values for this report</comment>
+    <add>2.2</add>
+  </field>
+  <field>
+    <name>is_active</name>
+    <title>Report Instance is Active</title>
+    <type>boolean</type>
+    <comment>Is this entry active?</comment>
+    <html>
+      <type>CheckBox</type>
+    </html>
+    <add>2.2</add>
+  </field>
+  <field>
+    <name>email_subject</name>
+    <title>Report Instance email Subject</title>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>Subject of email</comment>
+    <html>
+      <type>Text</type>
+    </html>
+  </field>
+  <field>
+    <name>email_to</name>
+    <title>Email Report Instance To</title>
+    <type>text</type>
+    <comment>comma-separated list of email addresses to send the report to</comment>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>2.2</add>
+  </field>
+  <field>
+    <name>email_cc</name>
+    <title>cc Email Report Instance To</title>
+    <type>text</type>
+    <comment>comma-separated list of email addresses to send the report to</comment>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>2.2</add>
+  </field>
+  <field>
+    <name>header</name>
+    <title>Report Instance Header</title>
+    <type>text</type>
+    <comment>comma-separated list of email addresses to send the report to</comment>
+    <html>
+      <type>TextArea</type>
+      <rows>4</rows>
+      <cols>60</cols>
+    </html>
+    <add>2.2</add>
+  </field>
+  <field>
+    <name>footer</name>
+    <title>Report Instance Footer</title>
+    <type>text</type>
+    <comment>comma-separated list of email addresses to send the report to</comment>
+    <html>
+      <type>TextArea</type>
+      <rows>4</rows>
+      <cols>60</cols>
+    </html>
+    <add>2.2</add>
+  </field>
+  <field>
+    <name>navigation_id</name>
+    <title>Navigation ID</title>
+    <type>int unsigned</type>
+    <import>true</import>
+    <comment>FK to navigation ID</comment>
+    <add>3.0</add>
   </field>
   <foreignKey>
-       <name>navigation_id</name>
-       <table>civicrm_navigation</table>
-       <key>id</key>
-       <add>3.0</add>
-       <onDelete>SET NULL</onDelete>
+    <name>navigation_id</name>
+    <table>civicrm_navigation</table>
+    <key>id</key>
+    <add>3.0</add>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
-      <name>drilldown_id</name>
-      <title>Drilldown Report ID</title>
-      <type>int unsigned</type>
-      <import>true</import>
-      <comment>FK to instance ID drilldown to</comment>
-      <add>4.3</add>
+    <name>drilldown_id</name>
+    <title>Drilldown Report ID</title>
+    <type>int unsigned</type>
+    <import>true</import>
+    <comment>FK to instance ID drilldown to</comment>
+    <add>4.3</add>
   </field>
   <foreignKey>
-       <name>drilldown_id</name>
-       <table>civicrm_report_instance</table>
-       <key>id</key>
-       <add>4.3</add>
-       <onDelete>SET NULL</onDelete>
+    <name>drilldown_id</name>
+    <table>civicrm_report_instance</table>
+    <key>id</key>
+    <add>4.3</add>
+    <onDelete>SET NULL</onDelete>
   </foreignKey>
   <field>
     <name>is_reserved</name>
index c5713abffe3baa890df3d53f09c555a8aa8983f6..550b4b8a2c2e42911d3fbb02554f2459e954040e 100644 (file)
@@ -8,47 +8,47 @@
   <add>1.4</add>
   <drop>2.0</drop>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>SMS History ID</comment>
-       <add>1.4</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>SMS History ID</comment>
+    <add>1.4</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-       <name>message</name>
-       <type>text</type>
-       <comment>Contents of the SMS.</comment>
-       <html>
-         <type>TextArea</type>
-         <rows>5</rows>
-         <cols>80</cols>
-       </html>
-       <add>1.4</add>
+    <name>message</name>
+    <type>text</type>
+    <comment>Contents of the SMS.</comment>
+    <html>
+      <type>TextArea</type>
+      <rows>5</rows>
+      <cols>80</cols>
+    </html>
+    <add>1.4</add>
   </field>
   <field>
-      <name>contact_id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>FK to Contact who is sending this SMS</comment>
-       <add>1.4</add>
-       <html>
-         <type>Autocomplete-Select</type>
-       </html>
+    <name>contact_id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>FK to Contact who is sending this SMS</comment>
+    <add>1.4</add>
+    <html>
+      <type>Autocomplete-Select</type>
+    </html>
   </field>
   <foreignKey>
-       <name>contact_id</name>
-       <table>civicrm_contact</table>
-       <key>id</key>
-       <add>1.4</add>
+    <name>contact_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <add>1.4</add>
   </foreignKey>
   <field>
-       <name>sent_date</name>
-       <type>date</type>
-       <comment>When was this SMS sent</comment>
-       <add>1.4</add>
+    <name>sent_date</name>
+    <type>date</type>
+    <comment>When was this SMS sent</comment>
+    <add>1.4</add>
   </field>
 </table>
index b6db936a55c15059d8f231fc03a984a43b23ca1f..ed2e7976874e80a594ad48b6b41664e8a5e5569a 100644 (file)
@@ -7,95 +7,95 @@
   <comment>Table to add different sms providers </comment>
   <add>4.2</add>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <comment>SMS Provider ID</comment>
-      <add>4.2</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>SMS Provider ID</comment>
+    <add>4.2</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-       <name>name</name>
-       <type>varchar</type>
-       <length>64</length>
-       <comment>Provider internal name points to option_value of option_group sms_provider_name</comment>
-       <add>4.2</add>
+    <name>name</name>
+    <type>varchar</type>
+    <length>64</length>
+    <comment>Provider internal name points to option_value of option_group sms_provider_name</comment>
+    <add>4.2</add>
   </field>
   <field>
-       <name>title</name>
-       <type>varchar</type>
-       <length>64</length>
-       <comment>Provider name visible to user</comment>
-       <html>
-         <type>Text</type>
-       </html>
-       <add>4.2</add>
+    <name>title</name>
+    <type>varchar</type>
+    <length>64</length>
+    <comment>Provider name visible to user</comment>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>4.2</add>
   </field>
   <field>
-       <name>username</name>
-       <type>varchar</type>
-       <length>255</length>
-       <html>
-          <type>Text</type>
-       </html>
-       <add>4.2</add>
+    <name>username</name>
+    <type>varchar</type>
+    <length>255</length>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>4.2</add>
   </field>
   <field>
-       <name>password</name>
-       <type>varchar</type>
-       <length>255</length>
-       <html>
-          <type>Text</type>
-       </html>
-       <add>4.2</add>
+    <name>password</name>
+    <type>varchar</type>
+    <length>255</length>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>4.2</add>
   </field>
   <field>
-       <name>api_type</name>
-       <type>int unsigned</type>
-       <required>true</required>
-       <comment>points to value in civicrm_option_value for group sms_api_type</comment>
-       <html>
-         <type>Select</type>
-       </html>
-       <add>4.2</add>
+    <name>api_type</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>points to value in civicrm_option_value for group sms_api_type</comment>
+    <html>
+      <type>Select</type>
+    </html>
+    <add>4.2</add>
   </field>
   <field>
-       <name>api_url</name>
-       <type>varchar</type>
-       <length>128</length>
-       <html>
-          <type>Text</type>
-       </html>
-       <add>4.2</add>
+    <name>api_url</name>
+    <type>varchar</type>
+    <length>128</length>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>4.2</add>
   </field>
   <field>
-       <name>api_params</name>
-       <type>text</type>
-       <comment>the api params in xml, http or smtp format</comment>
-       <html>
-          <type>Text</type>
-       </html>
-       <add>4.2</add>
+    <name>api_params</name>
+    <type>text</type>
+    <comment>the api params in xml, http or smtp format</comment>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>4.2</add>
   </field>
-   <field>
-       <name>is_default</name>
-       <type>boolean</type>
-       <default>0</default>
-       <add>4.2</add>
-       <html>
-         <type>CheckBox</type>
-       </html>
+  <field>
+    <name>is_default</name>
+    <type>boolean</type>
+    <default>0</default>
+    <add>4.2</add>
+    <html>
+      <type>CheckBox</type>
+    </html>
   </field>
-   <field>
-       <name>is_active</name>
-       <type>boolean</type>
-       <default>0</default>
-       <add>4.2</add>
-       <html>
-         <type>CheckBox</type>
-       </html>       
+  <field>
+    <name>is_active</name>
+    <type>boolean</type>
+    <default>0</default>
+    <add>4.2</add>
+    <html>
+      <type>CheckBox</type>
+    </html>
   </field>
 </table>
index 07a379bbe9da8d82b6a88b9e41c0d2f9d9216b8d..b4f693fbe9c93c216f4acf5af0306b353781d015 100644 (file)
@@ -7,58 +7,58 @@
   <comment>The OpenID associations store for standalone login.</comment>
   <add>2.0</add>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <add>2.0</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <add>2.0</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>server_url</name>
-      <type>blob</type>
-      <add>2.0</add>
+    <name>server_url</name>
+    <type>blob</type>
+    <add>2.0</add>
   </field>
   <field>
-       <name>handle</name>
-       <type>varchar</type>
-       <length>255</length>
-       <html>
-          <type>Text</type>
-       </html>
-       <add>2.0</add>
+    <name>handle</name>
+    <type>varchar</type>
+    <length>255</length>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>2.0</add>
   </field>
   <field>
-      <name>secret</name>
-      <type>blob</type>
-      <add>2.0</add>
+    <name>secret</name>
+    <type>blob</type>
+    <add>2.0</add>
   </field>
   <field>
-      <name>issued</name>
-      <type>int</type>
-      <add>2.0</add>
+    <name>issued</name>
+    <type>int</type>
+    <add>2.0</add>
   </field>
   <field>
-      <name>lifetime</name>
-      <type>int</type>
-      <add>2.0</add>
+    <name>lifetime</name>
+    <type>int</type>
+    <add>2.0</add>
   </field>
   <field>
-      <name>assoc_type</name>
-      <type>varchar</type>
-      <length>64</length>
-      <html>
-          <type>Text</type>
-       </html>
-      <add>2.0</add>
+    <name>assoc_type</name>
+    <type>varchar</type>
+    <length>64</length>
+    <html>
+      <type>Text</type>
+    </html>
+    <add>2.0</add>
   </field>
   <index>
-      <name>server_url_handle_index</name>
-      <fieldName length="166">server_url</fieldName>
-      <fieldName length="166">handle</fieldName>
-      <unique>true</unique>
-      <add>2.0</add>
+    <name>server_url_handle_index</name>
+    <fieldName length="166">server_url</fieldName>
+    <fieldName length="166">handle</fieldName>
+    <unique>true</unique>
+    <add>2.0</add>
   </index>
 </table>
index 9023c97ae08b52a5e6bc56d08d61c66c2e18557e..60b502a1e29d3eddb0206e3d471c20d61e7245e4 100644 (file)
@@ -7,37 +7,37 @@
   <comment>The OpenID nonce store for standalone login.</comment>
   <add>2.0</add>
   <field>
-      <name>id</name>
-      <type>int unsigned</type>
-      <required>true</required>
-      <add>2.0</add>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <add>2.0</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-      <name>server_url</name>
-      <type>blob</type>
-      <add>2.0</add>
+    <name>server_url</name>
+    <type>blob</type>
+    <add>2.0</add>
   </field>
   <field>
-       <name>timestamp</name>
-       <type>int</type>
-       <add>2.0</add>
+    <name>timestamp</name>
+    <type>int</type>
+    <add>2.0</add>
   </field>
   <field>
-       <name>salt</name>
-       <type>char</type>
-       <length>40</length>
-       <add>2.0</add>
+    <name>salt</name>
+    <type>char</type>
+    <length>40</length>
+    <add>2.0</add>
   </field>
   <index>
-       <name>nonce_index</name>
-       <fieldName length="255">server_url</fieldName>
-       <fieldName>timestamp</fieldName>
-       <fieldName>salt</fieldName>
-       <unique>true</unique>
-       <add>2.0</add>
+    <name>nonce_index</name>
+    <fieldName length="255">server_url</fieldName>
+    <fieldName>timestamp</fieldName>
+    <fieldName>salt</fieldName>
+    <unique>true</unique>
+    <add>2.0</add>
   </index>
-</table>
\ No newline at end of file
+</table>