PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

# Conflicts:
#	workflow/engine/classes/WsBase.php
This commit is contained in:
Roly Rudy Gutierrez Pinto
2019-07-22 11:24:00 -04:00
parent 7355bd3522
commit 7f55e951fa
27 changed files with 2210 additions and 501 deletions

View File

@@ -81,6 +81,12 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
*/
protected $abe_action_field = '';
/**
* The value for the abe_action_body_field field.
* @var string
*/
protected $abe_action_body_field = '';
/**
* The value for the abe_case_note_in_response field.
* @var int
@@ -129,6 +135,12 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
*/
protected $abe_email_server_uid = '';
/**
* The value for the abe_email_server_receiver_uid field.
* @var string
*/
protected $abe_email_server_receiver_uid = '';
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -242,6 +254,17 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
return $this->abe_action_field;
}
/**
* Get the [abe_action_body_field] column value.
*
* @return string
*/
public function getAbeActionBodyField()
{
return $this->abe_action_body_field;
}
/**
* Get the [abe_case_note_in_response] column value.
*
@@ -372,6 +395,17 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
return $this->abe_email_server_uid;
}
/**
* Get the [abe_email_server_receiver_uid] column value.
*
* @return string
*/
public function getAbeEmailServerReceiverUid()
{
return $this->abe_email_server_receiver_uid;
}
/**
* Set the value of [abe_uid] column.
*
@@ -570,6 +604,28 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
} // setAbeActionField()
/**
* Set the value of [abe_action_body_field] column.
*
* @param string $v new value
* @return void
*/
public function setAbeActionBodyField($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->abe_action_body_field !== $v || $v === '') {
$this->abe_action_body_field = $v;
$this->modifiedColumns[] = AbeConfigurationPeer::ABE_ACTION_BODY_FIELD;
}
} // setAbeActionBodyField()
/**
* Set the value of [abe_case_note_in_response] column.
*
@@ -760,6 +816,28 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
} // setAbeEmailServerUid()
/**
* Set the value of [abe_email_server_receiver_uid] column.
*
* @param string $v new value
* @return void
*/
public function setAbeEmailServerReceiverUid($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->abe_email_server_receiver_uid !== $v || $v === '') {
$this->abe_email_server_receiver_uid = $v;
$this->modifiedColumns[] = AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID;
}
} // setAbeEmailServerReceiverUid()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -795,28 +873,32 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$this->abe_action_field = $rs->getString($startcol + 8);
$this->abe_case_note_in_response = $rs->getInt($startcol + 9);
$this->abe_action_body_field = $rs->getString($startcol + 9);
$this->abe_force_login = $rs->getInt($startcol + 10);
$this->abe_case_note_in_response = $rs->getInt($startcol + 10);
$this->abe_create_date = $rs->getTimestamp($startcol + 11, null);
$this->abe_force_login = $rs->getInt($startcol + 11);
$this->abe_update_date = $rs->getTimestamp($startcol + 12, null);
$this->abe_create_date = $rs->getTimestamp($startcol + 12, null);
$this->abe_subject_field = $rs->getString($startcol + 13);
$this->abe_update_date = $rs->getTimestamp($startcol + 13, null);
$this->abe_mailserver_or_mailcurrent = $rs->getInt($startcol + 14);
$this->abe_subject_field = $rs->getString($startcol + 14);
$this->abe_custom_grid = $rs->getString($startcol + 15);
$this->abe_mailserver_or_mailcurrent = $rs->getInt($startcol + 15);
$this->abe_email_server_uid = $rs->getString($startcol + 16);
$this->abe_custom_grid = $rs->getString($startcol + 16);
$this->abe_email_server_uid = $rs->getString($startcol + 17);
$this->abe_email_server_receiver_uid = $rs->getString($startcol + 18);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 17; // 17 = AbeConfigurationPeer::NUM_COLUMNS - AbeConfigurationPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 19; // 19 = AbeConfigurationPeer::NUM_COLUMNS - AbeConfigurationPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating AbeConfiguration object", $e);
@@ -1048,29 +1130,35 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
return $this->getAbeActionField();
break;
case 9:
return $this->getAbeCaseNoteInResponse();
return $this->getAbeActionBodyField();
break;
case 10:
return $this->getAbeForceLogin();
return $this->getAbeCaseNoteInResponse();
break;
case 11:
return $this->getAbeCreateDate();
return $this->getAbeForceLogin();
break;
case 12:
return $this->getAbeUpdateDate();
return $this->getAbeCreateDate();
break;
case 13:
return $this->getAbeSubjectField();
return $this->getAbeUpdateDate();
break;
case 14:
return $this->getAbeMailserverOrMailcurrent();
return $this->getAbeSubjectField();
break;
case 15:
return $this->getAbeCustomGrid();
return $this->getAbeMailserverOrMailcurrent();
break;
case 16:
return $this->getAbeCustomGrid();
break;
case 17:
return $this->getAbeEmailServerUid();
break;
case 18:
return $this->getAbeEmailServerReceiverUid();
break;
default:
return null;
break;
@@ -1100,14 +1188,16 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$keys[6] => $this->getDynUid(),
$keys[7] => $this->getAbeEmailField(),
$keys[8] => $this->getAbeActionField(),
$keys[9] => $this->getAbeCaseNoteInResponse(),
$keys[10] => $this->getAbeForceLogin(),
$keys[11] => $this->getAbeCreateDate(),
$keys[12] => $this->getAbeUpdateDate(),
$keys[13] => $this->getAbeSubjectField(),
$keys[14] => $this->getAbeMailserverOrMailcurrent(),
$keys[15] => $this->getAbeCustomGrid(),
$keys[16] => $this->getAbeEmailServerUid(),
$keys[9] => $this->getAbeActionBodyField(),
$keys[10] => $this->getAbeCaseNoteInResponse(),
$keys[11] => $this->getAbeForceLogin(),
$keys[12] => $this->getAbeCreateDate(),
$keys[13] => $this->getAbeUpdateDate(),
$keys[14] => $this->getAbeSubjectField(),
$keys[15] => $this->getAbeMailserverOrMailcurrent(),
$keys[16] => $this->getAbeCustomGrid(),
$keys[17] => $this->getAbeEmailServerUid(),
$keys[18] => $this->getAbeEmailServerReceiverUid(),
);
return $result;
}
@@ -1167,29 +1257,35 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$this->setAbeActionField($value);
break;
case 9:
$this->setAbeCaseNoteInResponse($value);
$this->setAbeActionBodyField($value);
break;
case 10:
$this->setAbeForceLogin($value);
$this->setAbeCaseNoteInResponse($value);
break;
case 11:
$this->setAbeCreateDate($value);
$this->setAbeForceLogin($value);
break;
case 12:
$this->setAbeUpdateDate($value);
$this->setAbeCreateDate($value);
break;
case 13:
$this->setAbeSubjectField($value);
$this->setAbeUpdateDate($value);
break;
case 14:
$this->setAbeMailserverOrMailcurrent($value);
$this->setAbeSubjectField($value);
break;
case 15:
$this->setAbeCustomGrid($value);
$this->setAbeMailserverOrMailcurrent($value);
break;
case 16:
$this->setAbeCustomGrid($value);
break;
case 17:
$this->setAbeEmailServerUid($value);
break;
case 18:
$this->setAbeEmailServerReceiverUid($value);
break;
} // switch()
}
@@ -1250,35 +1346,43 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
}
if (array_key_exists($keys[9], $arr)) {
$this->setAbeCaseNoteInResponse($arr[$keys[9]]);
$this->setAbeActionBodyField($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
$this->setAbeForceLogin($arr[$keys[10]]);
$this->setAbeCaseNoteInResponse($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
$this->setAbeCreateDate($arr[$keys[11]]);
$this->setAbeForceLogin($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
$this->setAbeUpdateDate($arr[$keys[12]]);
$this->setAbeCreateDate($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
$this->setAbeSubjectField($arr[$keys[13]]);
$this->setAbeUpdateDate($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
$this->setAbeMailserverOrMailcurrent($arr[$keys[14]]);
$this->setAbeSubjectField($arr[$keys[14]]);
}
if (array_key_exists($keys[15], $arr)) {
$this->setAbeCustomGrid($arr[$keys[15]]);
$this->setAbeMailserverOrMailcurrent($arr[$keys[15]]);
}
if (array_key_exists($keys[16], $arr)) {
$this->setAbeEmailServerUid($arr[$keys[16]]);
$this->setAbeCustomGrid($arr[$keys[16]]);
}
if (array_key_exists($keys[17], $arr)) {
$this->setAbeEmailServerUid($arr[$keys[17]]);
}
if (array_key_exists($keys[18], $arr)) {
$this->setAbeEmailServerReceiverUid($arr[$keys[18]]);
}
}
@@ -1328,6 +1432,10 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$criteria->add(AbeConfigurationPeer::ABE_ACTION_FIELD, $this->abe_action_field);
}
if ($this->isColumnModified(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD)) {
$criteria->add(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD, $this->abe_action_body_field);
}
if ($this->isColumnModified(AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE)) {
$criteria->add(AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, $this->abe_case_note_in_response);
}
@@ -1360,6 +1468,10 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$criteria->add(AbeConfigurationPeer::ABE_EMAIL_SERVER_UID, $this->abe_email_server_uid);
}
if ($this->isColumnModified(AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID)) {
$criteria->add(AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID, $this->abe_email_server_receiver_uid);
}
return $criteria;
}
@@ -1430,6 +1542,8 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$copyObj->setAbeActionField($this->abe_action_field);
$copyObj->setAbeActionBodyField($this->abe_action_body_field);
$copyObj->setAbeCaseNoteInResponse($this->abe_case_note_in_response);
$copyObj->setAbeForceLogin($this->abe_force_login);
@@ -1446,6 +1560,8 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$copyObj->setAbeEmailServerUid($this->abe_email_server_uid);
$copyObj->setAbeEmailServerReceiverUid($this->abe_email_server_receiver_uid);
$copyObj->setNew(true);

View File

@@ -25,7 +25,7 @@ abstract class BaseAbeConfigurationPeer
const CLASS_DEFAULT = 'classes.model.AbeConfiguration';
/** The total number of columns. */
const NUM_COLUMNS = 17;
const NUM_COLUMNS = 19;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -58,6 +58,9 @@ abstract class BaseAbeConfigurationPeer
/** the column name for the ABE_ACTION_FIELD field */
const ABE_ACTION_FIELD = 'ABE_CONFIGURATION.ABE_ACTION_FIELD';
/** the column name for the ABE_ACTION_BODY_FIELD field */
const ABE_ACTION_BODY_FIELD = 'ABE_CONFIGURATION.ABE_ACTION_BODY_FIELD';
/** the column name for the ABE_CASE_NOTE_IN_RESPONSE field */
const ABE_CASE_NOTE_IN_RESPONSE = 'ABE_CONFIGURATION.ABE_CASE_NOTE_IN_RESPONSE';
@@ -82,6 +85,9 @@ abstract class BaseAbeConfigurationPeer
/** the column name for the ABE_EMAIL_SERVER_UID field */
const ABE_EMAIL_SERVER_UID = 'ABE_CONFIGURATION.ABE_EMAIL_SERVER_UID';
/** the column name for the ABE_EMAIL_SERVER_RECEIVER_UID field */
const ABE_EMAIL_SERVER_RECEIVER_UID = 'ABE_CONFIGURATION.ABE_EMAIL_SERVER_RECEIVER_UID';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -93,10 +99,10 @@ abstract class BaseAbeConfigurationPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('AbeUid', 'ProUid', 'TasUid', 'AbeType', 'AbeTemplate', 'AbeDynType', 'DynUid', 'AbeEmailField', 'AbeActionField', 'AbeCaseNoteInResponse', 'AbeForceLogin', 'AbeCreateDate', 'AbeUpdateDate', 'AbeSubjectField', 'AbeMailserverOrMailcurrent', 'AbeCustomGrid', 'AbeEmailServerUid', ),
BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID, AbeConfigurationPeer::PRO_UID, AbeConfigurationPeer::TAS_UID, AbeConfigurationPeer::ABE_TYPE, AbeConfigurationPeer::ABE_TEMPLATE, AbeConfigurationPeer::ABE_DYN_TYPE, AbeConfigurationPeer::DYN_UID, AbeConfigurationPeer::ABE_EMAIL_FIELD, AbeConfigurationPeer::ABE_ACTION_FIELD, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, AbeConfigurationPeer::ABE_FORCE_LOGIN, AbeConfigurationPeer::ABE_CREATE_DATE, AbeConfigurationPeer::ABE_UPDATE_DATE, AbeConfigurationPeer::ABE_SUBJECT_FIELD, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT, AbeConfigurationPeer::ABE_CUSTOM_GRID, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID, ),
BasePeer::TYPE_FIELDNAME => array ('ABE_UID', 'PRO_UID', 'TAS_UID', 'ABE_TYPE', 'ABE_TEMPLATE', 'ABE_DYN_TYPE', 'DYN_UID', 'ABE_EMAIL_FIELD', 'ABE_ACTION_FIELD', 'ABE_CASE_NOTE_IN_RESPONSE', 'ABE_FORCE_LOGIN', 'ABE_CREATE_DATE', 'ABE_UPDATE_DATE', 'ABE_SUBJECT_FIELD', 'ABE_MAILSERVER_OR_MAILCURRENT', 'ABE_CUSTOM_GRID', 'ABE_EMAIL_SERVER_UID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
BasePeer::TYPE_PHPNAME => array ('AbeUid', 'ProUid', 'TasUid', 'AbeType', 'AbeTemplate', 'AbeDynType', 'DynUid', 'AbeEmailField', 'AbeActionField', 'AbeActionBodyField', 'AbeCaseNoteInResponse', 'AbeForceLogin', 'AbeCreateDate', 'AbeUpdateDate', 'AbeSubjectField', 'AbeMailserverOrMailcurrent', 'AbeCustomGrid', 'AbeEmailServerUid', 'AbeEmailServerReceiverUid', ),
BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID, AbeConfigurationPeer::PRO_UID, AbeConfigurationPeer::TAS_UID, AbeConfigurationPeer::ABE_TYPE, AbeConfigurationPeer::ABE_TEMPLATE, AbeConfigurationPeer::ABE_DYN_TYPE, AbeConfigurationPeer::DYN_UID, AbeConfigurationPeer::ABE_EMAIL_FIELD, AbeConfigurationPeer::ABE_ACTION_FIELD, AbeConfigurationPeer::ABE_ACTION_BODY_FIELD, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, AbeConfigurationPeer::ABE_FORCE_LOGIN, AbeConfigurationPeer::ABE_CREATE_DATE, AbeConfigurationPeer::ABE_UPDATE_DATE, AbeConfigurationPeer::ABE_SUBJECT_FIELD, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT, AbeConfigurationPeer::ABE_CUSTOM_GRID, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID, AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID, ),
BasePeer::TYPE_FIELDNAME => array ('ABE_UID', 'PRO_UID', 'TAS_UID', 'ABE_TYPE', 'ABE_TEMPLATE', 'ABE_DYN_TYPE', 'DYN_UID', 'ABE_EMAIL_FIELD', 'ABE_ACTION_FIELD', 'ABE_ACTION_BODY_FIELD', 'ABE_CASE_NOTE_IN_RESPONSE', 'ABE_FORCE_LOGIN', 'ABE_CREATE_DATE', 'ABE_UPDATE_DATE', 'ABE_SUBJECT_FIELD', 'ABE_MAILSERVER_OR_MAILCURRENT', 'ABE_CUSTOM_GRID', 'ABE_EMAIL_SERVER_UID', 'ABE_EMAIL_SERVER_RECEIVER_UID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
);
/**
@@ -106,10 +112,10 @@ abstract class BaseAbeConfigurationPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AbeUid' => 0, 'ProUid' => 1, 'TasUid' => 2, 'AbeType' => 3, 'AbeTemplate' => 4, 'AbeDynType' => 5, 'DynUid' => 6, 'AbeEmailField' => 7, 'AbeActionField' => 8, 'AbeCaseNoteInResponse' => 9, 'AbeForceLogin' => 10, 'AbeCreateDate' => 11, 'AbeUpdateDate' => 12, 'AbeSubjectField' => 13, 'AbeMailserverOrMailcurrent' => 14, 'AbeCustomGrid' => 15, 'AbeEmailServerUid' => 16, ),
BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID => 0, AbeConfigurationPeer::PRO_UID => 1, AbeConfigurationPeer::TAS_UID => 2, AbeConfigurationPeer::ABE_TYPE => 3, AbeConfigurationPeer::ABE_TEMPLATE => 4, AbeConfigurationPeer::ABE_DYN_TYPE => 5, AbeConfigurationPeer::DYN_UID => 6, AbeConfigurationPeer::ABE_EMAIL_FIELD => 7, AbeConfigurationPeer::ABE_ACTION_FIELD => 8, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE => 9, AbeConfigurationPeer::ABE_FORCE_LOGIN => 10, AbeConfigurationPeer::ABE_CREATE_DATE => 11, AbeConfigurationPeer::ABE_UPDATE_DATE => 12, AbeConfigurationPeer::ABE_SUBJECT_FIELD => 13, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT => 14, AbeConfigurationPeer::ABE_CUSTOM_GRID => 15, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID => 16, ),
BasePeer::TYPE_FIELDNAME => array ('ABE_UID' => 0, 'PRO_UID' => 1, 'TAS_UID' => 2, 'ABE_TYPE' => 3, 'ABE_TEMPLATE' => 4, 'ABE_DYN_TYPE' => 5, 'DYN_UID' => 6, 'ABE_EMAIL_FIELD' => 7, 'ABE_ACTION_FIELD' => 8, 'ABE_CASE_NOTE_IN_RESPONSE' => 9, 'ABE_FORCE_LOGIN' => 10, 'ABE_CREATE_DATE' => 11, 'ABE_UPDATE_DATE' => 12, 'ABE_SUBJECT_FIELD' => 13, 'ABE_MAILSERVER_OR_MAILCURRENT' => 14, 'ABE_CUSTOM_GRID' => 15, 'ABE_EMAIL_SERVER_UID' => 16, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
BasePeer::TYPE_PHPNAME => array ('AbeUid' => 0, 'ProUid' => 1, 'TasUid' => 2, 'AbeType' => 3, 'AbeTemplate' => 4, 'AbeDynType' => 5, 'DynUid' => 6, 'AbeEmailField' => 7, 'AbeActionField' => 8, 'AbeActionBodyField' => 9, 'AbeCaseNoteInResponse' => 10, 'AbeForceLogin' => 11, 'AbeCreateDate' => 12, 'AbeUpdateDate' => 13, 'AbeSubjectField' => 14, 'AbeMailserverOrMailcurrent' => 15, 'AbeCustomGrid' => 16, 'AbeEmailServerUid' => 17, 'AbeEmailServerReceiverUid' => 18, ),
BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID => 0, AbeConfigurationPeer::PRO_UID => 1, AbeConfigurationPeer::TAS_UID => 2, AbeConfigurationPeer::ABE_TYPE => 3, AbeConfigurationPeer::ABE_TEMPLATE => 4, AbeConfigurationPeer::ABE_DYN_TYPE => 5, AbeConfigurationPeer::DYN_UID => 6, AbeConfigurationPeer::ABE_EMAIL_FIELD => 7, AbeConfigurationPeer::ABE_ACTION_FIELD => 8, AbeConfigurationPeer::ABE_ACTION_BODY_FIELD => 9, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE => 10, AbeConfigurationPeer::ABE_FORCE_LOGIN => 11, AbeConfigurationPeer::ABE_CREATE_DATE => 12, AbeConfigurationPeer::ABE_UPDATE_DATE => 13, AbeConfigurationPeer::ABE_SUBJECT_FIELD => 14, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT => 15, AbeConfigurationPeer::ABE_CUSTOM_GRID => 16, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID => 17, AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID => 18, ),
BasePeer::TYPE_FIELDNAME => array ('ABE_UID' => 0, 'PRO_UID' => 1, 'TAS_UID' => 2, 'ABE_TYPE' => 3, 'ABE_TEMPLATE' => 4, 'ABE_DYN_TYPE' => 5, 'DYN_UID' => 6, 'ABE_EMAIL_FIELD' => 7, 'ABE_ACTION_FIELD' => 8, 'ABE_ACTION_BODY_FIELD' => 9, 'ABE_CASE_NOTE_IN_RESPONSE' => 10, 'ABE_FORCE_LOGIN' => 11, 'ABE_CREATE_DATE' => 12, 'ABE_UPDATE_DATE' => 13, 'ABE_SUBJECT_FIELD' => 14, 'ABE_MAILSERVER_OR_MAILCURRENT' => 15, 'ABE_CUSTOM_GRID' => 16, 'ABE_EMAIL_SERVER_UID' => 17, 'ABE_EMAIL_SERVER_RECEIVER_UID' => 18, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
);
/**
@@ -228,6 +234,8 @@ abstract class BaseAbeConfigurationPeer
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_FIELD);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_FORCE_LOGIN);
@@ -244,6 +252,8 @@ abstract class BaseAbeConfigurationPeer
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_EMAIL_SERVER_UID);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID);
}
const COUNT = 'COUNT(ABE_CONFIGURATION.ABE_UID)';

View File

@@ -51,6 +51,18 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
*/
protected $mess_port = 0;
/**
* The value for the mess_incoming_server field.
* @var string
*/
protected $mess_incoming_server = '';
/**
* The value for the mess_incoming_port field.
* @var int
*/
protected $mess_incoming_port = 0;
/**
* The value for the mess_rauth field.
* @var int
@@ -163,6 +175,28 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
return $this->mess_port;
}
/**
* Get the [mess_incoming_server] column value.
*
* @return string
*/
public function getMessIncomingServer()
{
return $this->mess_incoming_server;
}
/**
* Get the [mess_incoming_port] column value.
*
* @return int
*/
public function getMessIncomingPort()
{
return $this->mess_incoming_port;
}
/**
* Get the [mess_rauth] column value.
*
@@ -350,6 +384,50 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
} // setMessPort()
/**
* Set the value of [mess_incoming_server] column.
*
* @param string $v new value
* @return void
*/
public function setMessIncomingServer($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->mess_incoming_server !== $v || $v === '') {
$this->mess_incoming_server = $v;
$this->modifiedColumns[] = EmailServerPeer::MESS_INCOMING_SERVER;
}
} // setMessIncomingServer()
/**
* Set the value of [mess_incoming_port] column.
*
* @param int $v new value
* @return void
*/
public function setMessIncomingPort($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->mess_incoming_port !== $v || $v === 0) {
$this->mess_incoming_port = $v;
$this->modifiedColumns[] = EmailServerPeer::MESS_INCOMING_PORT;
}
} // setMessIncomingPort()
/**
* Set the value of [mess_rauth] column.
*
@@ -573,30 +651,34 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
$this->mess_port = $rs->getInt($startcol + 3);
$this->mess_rauth = $rs->getInt($startcol + 4);
$this->mess_incoming_server = $rs->getString($startcol + 4);
$this->mess_account = $rs->getString($startcol + 5);
$this->mess_incoming_port = $rs->getInt($startcol + 5);
$this->mess_password = $rs->getString($startcol + 6);
$this->mess_rauth = $rs->getInt($startcol + 6);
$this->mess_from_mail = $rs->getString($startcol + 7);
$this->mess_account = $rs->getString($startcol + 7);
$this->mess_from_name = $rs->getString($startcol + 8);
$this->mess_password = $rs->getString($startcol + 8);
$this->smtpsecure = $rs->getString($startcol + 9);
$this->mess_from_mail = $rs->getString($startcol + 9);
$this->mess_try_send_inmediatly = $rs->getInt($startcol + 10);
$this->mess_from_name = $rs->getString($startcol + 10);
$this->mail_to = $rs->getString($startcol + 11);
$this->smtpsecure = $rs->getString($startcol + 11);
$this->mess_default = $rs->getInt($startcol + 12);
$this->mess_try_send_inmediatly = $rs->getInt($startcol + 12);
$this->mail_to = $rs->getString($startcol + 13);
$this->mess_default = $rs->getInt($startcol + 14);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 13; // 13 = EmailServerPeer::NUM_COLUMNS - EmailServerPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 15; // 15 = EmailServerPeer::NUM_COLUMNS - EmailServerPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating EmailServer object", $e);
@@ -813,30 +895,36 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
return $this->getMessPort();
break;
case 4:
return $this->getMessRauth();
return $this->getMessIncomingServer();
break;
case 5:
return $this->getMessAccount();
return $this->getMessIncomingPort();
break;
case 6:
return $this->getMessPassword();
return $this->getMessRauth();
break;
case 7:
return $this->getMessFromMail();
return $this->getMessAccount();
break;
case 8:
return $this->getMessFromName();
return $this->getMessPassword();
break;
case 9:
return $this->getSmtpsecure();
return $this->getMessFromMail();
break;
case 10:
return $this->getMessTrySendInmediatly();
return $this->getMessFromName();
break;
case 11:
return $this->getMailTo();
return $this->getSmtpsecure();
break;
case 12:
return $this->getMessTrySendInmediatly();
break;
case 13:
return $this->getMailTo();
break;
case 14:
return $this->getMessDefault();
break;
default:
@@ -863,15 +951,17 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
$keys[1] => $this->getMessEngine(),
$keys[2] => $this->getMessServer(),
$keys[3] => $this->getMessPort(),
$keys[4] => $this->getMessRauth(),
$keys[5] => $this->getMessAccount(),
$keys[6] => $this->getMessPassword(),
$keys[7] => $this->getMessFromMail(),
$keys[8] => $this->getMessFromName(),
$keys[9] => $this->getSmtpsecure(),
$keys[10] => $this->getMessTrySendInmediatly(),
$keys[11] => $this->getMailTo(),
$keys[12] => $this->getMessDefault(),
$keys[4] => $this->getMessIncomingServer(),
$keys[5] => $this->getMessIncomingPort(),
$keys[6] => $this->getMessRauth(),
$keys[7] => $this->getMessAccount(),
$keys[8] => $this->getMessPassword(),
$keys[9] => $this->getMessFromMail(),
$keys[10] => $this->getMessFromName(),
$keys[11] => $this->getSmtpsecure(),
$keys[12] => $this->getMessTrySendInmediatly(),
$keys[13] => $this->getMailTo(),
$keys[14] => $this->getMessDefault(),
);
return $result;
}
@@ -916,30 +1006,36 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
$this->setMessPort($value);
break;
case 4:
$this->setMessRauth($value);
$this->setMessIncomingServer($value);
break;
case 5:
$this->setMessAccount($value);
$this->setMessIncomingPort($value);
break;
case 6:
$this->setMessPassword($value);
$this->setMessRauth($value);
break;
case 7:
$this->setMessFromMail($value);
$this->setMessAccount($value);
break;
case 8:
$this->setMessFromName($value);
$this->setMessPassword($value);
break;
case 9:
$this->setSmtpsecure($value);
$this->setMessFromMail($value);
break;
case 10:
$this->setMessTrySendInmediatly($value);
$this->setMessFromName($value);
break;
case 11:
$this->setMailTo($value);
$this->setSmtpsecure($value);
break;
case 12:
$this->setMessTrySendInmediatly($value);
break;
case 13:
$this->setMailTo($value);
break;
case 14:
$this->setMessDefault($value);
break;
} // switch()
@@ -982,39 +1078,47 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
}
if (array_key_exists($keys[4], $arr)) {
$this->setMessRauth($arr[$keys[4]]);
$this->setMessIncomingServer($arr[$keys[4]]);
}
if (array_key_exists($keys[5], $arr)) {
$this->setMessAccount($arr[$keys[5]]);
$this->setMessIncomingPort($arr[$keys[5]]);
}
if (array_key_exists($keys[6], $arr)) {
$this->setMessPassword($arr[$keys[6]]);
$this->setMessRauth($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
$this->setMessFromMail($arr[$keys[7]]);
$this->setMessAccount($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
$this->setMessFromName($arr[$keys[8]]);
$this->setMessPassword($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
$this->setSmtpsecure($arr[$keys[9]]);
$this->setMessFromMail($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
$this->setMessTrySendInmediatly($arr[$keys[10]]);
$this->setMessFromName($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
$this->setMailTo($arr[$keys[11]]);
$this->setSmtpsecure($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
$this->setMessDefault($arr[$keys[12]]);
$this->setMessTrySendInmediatly($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
$this->setMailTo($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
$this->setMessDefault($arr[$keys[14]]);
}
}
@@ -1044,6 +1148,14 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
$criteria->add(EmailServerPeer::MESS_PORT, $this->mess_port);
}
if ($this->isColumnModified(EmailServerPeer::MESS_INCOMING_SERVER)) {
$criteria->add(EmailServerPeer::MESS_INCOMING_SERVER, $this->mess_incoming_server);
}
if ($this->isColumnModified(EmailServerPeer::MESS_INCOMING_PORT)) {
$criteria->add(EmailServerPeer::MESS_INCOMING_PORT, $this->mess_incoming_port);
}
if ($this->isColumnModified(EmailServerPeer::MESS_RAUTH)) {
$criteria->add(EmailServerPeer::MESS_RAUTH, $this->mess_rauth);
}
@@ -1140,6 +1252,10 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
$copyObj->setMessPort($this->mess_port);
$copyObj->setMessIncomingServer($this->mess_incoming_server);
$copyObj->setMessIncomingPort($this->mess_incoming_port);
$copyObj->setMessRauth($this->mess_rauth);
$copyObj->setMessAccount($this->mess_account);

View File

@@ -25,7 +25,7 @@ abstract class BaseEmailServerPeer
const CLASS_DEFAULT = 'classes.model.EmailServer';
/** The total number of columns. */
const NUM_COLUMNS = 13;
const NUM_COLUMNS = 15;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -43,6 +43,12 @@ abstract class BaseEmailServerPeer
/** the column name for the MESS_PORT field */
const MESS_PORT = 'EMAIL_SERVER.MESS_PORT';
/** the column name for the MESS_INCOMING_SERVER field */
const MESS_INCOMING_SERVER = 'EMAIL_SERVER.MESS_INCOMING_SERVER';
/** the column name for the MESS_INCOMING_PORT field */
const MESS_INCOMING_PORT = 'EMAIL_SERVER.MESS_INCOMING_PORT';
/** the column name for the MESS_RAUTH field */
const MESS_RAUTH = 'EMAIL_SERVER.MESS_RAUTH';
@@ -81,10 +87,10 @@ abstract class BaseEmailServerPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('MessUid', 'MessEngine', 'MessServer', 'MessPort', 'MessRauth', 'MessAccount', 'MessPassword', 'MessFromMail', 'MessFromName', 'Smtpsecure', 'MessTrySendInmediatly', 'MailTo', 'MessDefault', ),
BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID, EmailServerPeer::MESS_ENGINE, EmailServerPeer::MESS_SERVER, EmailServerPeer::MESS_PORT, EmailServerPeer::MESS_RAUTH, EmailServerPeer::MESS_ACCOUNT, EmailServerPeer::MESS_PASSWORD, EmailServerPeer::MESS_FROM_MAIL, EmailServerPeer::MESS_FROM_NAME, EmailServerPeer::SMTPSECURE, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY, EmailServerPeer::MAIL_TO, EmailServerPeer::MESS_DEFAULT, ),
BasePeer::TYPE_FIELDNAME => array ('MESS_UID', 'MESS_ENGINE', 'MESS_SERVER', 'MESS_PORT', 'MESS_RAUTH', 'MESS_ACCOUNT', 'MESS_PASSWORD', 'MESS_FROM_MAIL', 'MESS_FROM_NAME', 'SMTPSECURE', 'MESS_TRY_SEND_INMEDIATLY', 'MAIL_TO', 'MESS_DEFAULT', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
BasePeer::TYPE_PHPNAME => array ('MessUid', 'MessEngine', 'MessServer', 'MessPort', 'MessIncomingServer', 'MessIncomingPort', 'MessRauth', 'MessAccount', 'MessPassword', 'MessFromMail', 'MessFromName', 'Smtpsecure', 'MessTrySendInmediatly', 'MailTo', 'MessDefault', ),
BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID, EmailServerPeer::MESS_ENGINE, EmailServerPeer::MESS_SERVER, EmailServerPeer::MESS_PORT, EmailServerPeer::MESS_INCOMING_SERVER, EmailServerPeer::MESS_INCOMING_PORT, EmailServerPeer::MESS_RAUTH, EmailServerPeer::MESS_ACCOUNT, EmailServerPeer::MESS_PASSWORD, EmailServerPeer::MESS_FROM_MAIL, EmailServerPeer::MESS_FROM_NAME, EmailServerPeer::SMTPSECURE, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY, EmailServerPeer::MAIL_TO, EmailServerPeer::MESS_DEFAULT, ),
BasePeer::TYPE_FIELDNAME => array ('MESS_UID', 'MESS_ENGINE', 'MESS_SERVER', 'MESS_PORT', 'MESS_INCOMING_SERVER', 'MESS_INCOMING_PORT', 'MESS_RAUTH', 'MESS_ACCOUNT', 'MESS_PASSWORD', 'MESS_FROM_MAIL', 'MESS_FROM_NAME', 'SMTPSECURE', 'MESS_TRY_SEND_INMEDIATLY', 'MAIL_TO', 'MESS_DEFAULT', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
);
/**
@@ -94,10 +100,10 @@ abstract class BaseEmailServerPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('MessUid' => 0, 'MessEngine' => 1, 'MessServer' => 2, 'MessPort' => 3, 'MessRauth' => 4, 'MessAccount' => 5, 'MessPassword' => 6, 'MessFromMail' => 7, 'MessFromName' => 8, 'Smtpsecure' => 9, 'MessTrySendInmediatly' => 10, 'MailTo' => 11, 'MessDefault' => 12, ),
BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID => 0, EmailServerPeer::MESS_ENGINE => 1, EmailServerPeer::MESS_SERVER => 2, EmailServerPeer::MESS_PORT => 3, EmailServerPeer::MESS_RAUTH => 4, EmailServerPeer::MESS_ACCOUNT => 5, EmailServerPeer::MESS_PASSWORD => 6, EmailServerPeer::MESS_FROM_MAIL => 7, EmailServerPeer::MESS_FROM_NAME => 8, EmailServerPeer::SMTPSECURE => 9, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY => 10, EmailServerPeer::MAIL_TO => 11, EmailServerPeer::MESS_DEFAULT => 12, ),
BasePeer::TYPE_FIELDNAME => array ('MESS_UID' => 0, 'MESS_ENGINE' => 1, 'MESS_SERVER' => 2, 'MESS_PORT' => 3, 'MESS_RAUTH' => 4, 'MESS_ACCOUNT' => 5, 'MESS_PASSWORD' => 6, 'MESS_FROM_MAIL' => 7, 'MESS_FROM_NAME' => 8, 'SMTPSECURE' => 9, 'MESS_TRY_SEND_INMEDIATLY' => 10, 'MAIL_TO' => 11, 'MESS_DEFAULT' => 12, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
BasePeer::TYPE_PHPNAME => array ('MessUid' => 0, 'MessEngine' => 1, 'MessServer' => 2, 'MessPort' => 3, 'MessIncomingServer' => 4, 'MessIncomingPort' => 5, 'MessRauth' => 6, 'MessAccount' => 7, 'MessPassword' => 8, 'MessFromMail' => 9, 'MessFromName' => 10, 'Smtpsecure' => 11, 'MessTrySendInmediatly' => 12, 'MailTo' => 13, 'MessDefault' => 14, ),
BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID => 0, EmailServerPeer::MESS_ENGINE => 1, EmailServerPeer::MESS_SERVER => 2, EmailServerPeer::MESS_PORT => 3, EmailServerPeer::MESS_INCOMING_SERVER => 4, EmailServerPeer::MESS_INCOMING_PORT => 5, EmailServerPeer::MESS_RAUTH => 6, EmailServerPeer::MESS_ACCOUNT => 7, EmailServerPeer::MESS_PASSWORD => 8, EmailServerPeer::MESS_FROM_MAIL => 9, EmailServerPeer::MESS_FROM_NAME => 10, EmailServerPeer::SMTPSECURE => 11, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY => 12, EmailServerPeer::MAIL_TO => 13, EmailServerPeer::MESS_DEFAULT => 14, ),
BasePeer::TYPE_FIELDNAME => array ('MESS_UID' => 0, 'MESS_ENGINE' => 1, 'MESS_SERVER' => 2, 'MESS_PORT' => 3, 'MESS_INCOMING_SERVER' => 4, 'MESS_INCOMING_PORT' => 5, 'MESS_RAUTH' => 6, 'MESS_ACCOUNT' => 7, 'MESS_PASSWORD' => 8, 'MESS_FROM_MAIL' => 9, 'MESS_FROM_NAME' => 10, 'SMTPSECURE' => 11, 'MESS_TRY_SEND_INMEDIATLY' => 12, 'MAIL_TO' => 13, 'MESS_DEFAULT' => 14, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
);
/**
@@ -206,6 +212,10 @@ abstract class BaseEmailServerPeer
$criteria->addSelectColumn(EmailServerPeer::MESS_PORT);
$criteria->addSelectColumn(EmailServerPeer::MESS_INCOMING_SERVER);
$criteria->addSelectColumn(EmailServerPeer::MESS_INCOMING_PORT);
$criteria->addSelectColumn(EmailServerPeer::MESS_RAUTH);
$criteria->addSelectColumn(EmailServerPeer::MESS_ACCOUNT);