Merge pull request #1 from civicrm/master

[civicrm-core.git] / CRM / Core / DAO / MailSettings.php

diff --git a/CRM/Core/DAO/MailSettings.php b/CRM/Core/DAO/MailSettings.php
index 3c28b4d19ca9de8e819b557e27da9fbc1bbbcc0f..7657ad3a7262c4bb57ad2018df640930dd334b17 100644 (file)
--- a/CRM/Core/DAO/MailSettings.php
+++ b/CRM/Core/DAO/MailSettings.php
@@ -19,14 +19,14 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
    *
    * @var string
    */
-  static $_tableName = 'civicrm_mail_settings';
+  public static $_tableName = 'civicrm_mail_settings';
 
   /**
    * Should CiviCRM log any modifications to this table in the civicrm_log table.
    *
    * @var bool
    */
-  static $_log = FALSE;
+  public static $_log = FALSE;
 
   /**
    * primary key
@@ -149,7 +149,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
    */
   public static function getReferenceColumns() {
     if (!isset(Civi::$statics[__CLASS__]['links'])) {
-      Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__);
+      Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__);
       Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'domain_id', 'civicrm_domain', 'id');
       CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']);
     }
@@ -170,6 +170,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'title' => ts('Mail Settings ID'),
           'description' => ts('primary key'),
           'required' => TRUE,
+          'where' => 'civicrm_mail_settings.id',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -181,6 +182,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'title' => ts('Mail Settings Domain'),
           'description' => ts('Which Domain is this match entry for'),
           'required' => TRUE,
+          'where' => 'civicrm_mail_settings.domain_id',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -199,6 +201,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'description' => ts('name of this group of settings'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_mail_settings.name',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -209,6 +212,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Default Mail Settings?'),
           'description' => ts('whether this is the default set of settings for this domain'),
+          'where' => 'civicrm_mail_settings.is_default',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -221,6 +225,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'description' => ts('email address domain (the part after @)'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_mail_settings.domain',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -233,6 +238,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'description' => ts('optional local part (like civimail+ for addresses like civimail+s.1.2@example.com)'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_mail_settings.localpart',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -245,6 +251,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'description' => ts('contents of the Return-Path header'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_mail_settings.return_path',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -257,6 +264,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'description' => ts('name of the protocol to use for polling (like IMAP, POP3 or Maildir)'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_mail_settings.protocol',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -276,6 +284,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'description' => ts('server to use when polling'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_mail_settings.server',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -286,6 +295,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_INT,
           'title' => ts('Mail Port'),
           'description' => ts('port to use when polling'),
+          'where' => 'civicrm_mail_settings.port',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -298,6 +308,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'description' => ts('username to use when polling'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_mail_settings.username',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -310,6 +321,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'description' => ts('password to use when polling'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_mail_settings.password',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -320,6 +332,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Mail Account Uses SSL'),
           'description' => ts('whether to use SSL or not'),
+          'where' => 'civicrm_mail_settings.is_ssl',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -332,6 +345,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'description' => ts('folder to poll from when using IMAP, path to poll from when using Maildir, etc.'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_mail_settings.source',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -344,6 +358,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'description' => ts('Name of status to use when creating email to activity.'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_mail_settings.activity_status',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',