fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/bugfix/HOR-3670' into release/3.2.2

Browse Source
This commit is contained in:
David Callizaya
2017-08-15 10:07:12 -04:00
parent 98289a5cb0 c070a9b0bb
commit d25346e06e
326 changed files with 11383 additions and 24998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/classes/model/AddonsManager.php
View File

@@ -1,9 +1,9 @@
<?php
use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
require_once 'classes/model/om/BaseAddonsManager.php';
require_once PATH_CORE . 'classes' . PATH_SEP . 'class.enterpriseUtils.php';
if (!defined("BUFSIZE")) {
@@ -158,7 +158,7 @@ class AddonsManager extends BaseAddonsManager
public function getInstalledVersion()
{
if ($this->isCore()) {
return (EnterpriseUtils::pmVersion(PmSystem::getVersion()));
return (EnterpriseUtils::pmVersion(System::getVersion()));
} else {
if ($this->isPlugin()) {
if (!$this->isInstalled()) {
@@ -199,8 +199,6 @@ class AddonsManager extends BaseAddonsManager
*/
public function download()
{
require_once PATH_CORE . 'classes' . PATH_SEP . 'class.pmLicenseManager.php';
$this->setState("download");
///////
@@ -225,7 +223,7 @@ class AddonsManager extends BaseAddonsManager
}
///////
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
$activeLicense = $licenseManager->getActiveLicense();
$data = $data . "Content-Disposition: form-data; name=\"licenseFile\"; filename=\"" . $licenseManager->file . "\"\n";
@@ -246,7 +244,7 @@ class AddonsManager extends BaseAddonsManager
);
// Proxy settings
$sysConf = PmSystem::getSystemConfiguration();
$sysConf = System::getSystemConfiguration();
if ($sysConf['proxy_host'] != '') {
if (!is_array($option['http'])) {
$option['http'] = array();
@@ -388,7 +386,6 @@ class AddonsManager extends BaseAddonsManager
$this->setState();
} else {
if ($this->getAddonType() == "core") {
require_once PATH_CORE . 'classes' . PATH_SEP . 'class.Upgrade.php';
$upgrade = new Upgrade($this);
$upgrade->install();

21
workflow/engine/classes/model/AddonsStore.php
View File

@@ -1,5 +1,6 @@
<?php
use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
require_once 'classes/model/om/BaseAddonsStore.php';
@@ -33,10 +34,8 @@ class AddonsStore extends BaseAddonsStore
*/
public static function checkLicenseStore()
{
require_once PATH_CORE . 'classes' . PATH_SEP . 'class.pmLicenseManager.php';
//getting the licenseManager....
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
if (isset($licenseManager->id)) {
//Remove any license store that is not the active license
@@ -73,7 +72,7 @@ class AddonsStore extends BaseAddonsStore
AddonsStore::checkLicenseStore();
$licenseManager = &pmLicenseManager::getSingleton(); //Getting the licenseManager
$licenseManager = &PmLicenseManager::getSingleton(); //Getting the licenseManager
$result["store_errors"] = array();
list($stores, $errors) = AddonsStore::updateAll(false, $type);
@@ -185,7 +184,7 @@ class AddonsStore extends BaseAddonsStore
AddonsStore::checkLicenseStore();
$licenseManager = &pmLicenseManager::getSingleton(); //Getting the licenseManager
$licenseManager = &PmLicenseManager::getSingleton(); //Getting the licenseManager
$result["store_errors"] = array();
list($stores, $errors) = AddonsStore::updateAll(false);
@@ -331,12 +330,6 @@ class AddonsStore extends BaseAddonsStore
*/
public function update($force = false, $type = 'plugin')
{
require_once PATH_CORE . 'classes' . PATH_SEP . 'class.pmLicenseManager.php';
if (!class_exists('AddonsManagerPeer')) {
require_once ('classes/model/AddonsManager.php');
}
//If we have any addon that is installing or updating, don't update store
$criteria = new Criteria(AddonsManagerPeer::DATABASE_NAME);
$criteria->add(AddonsManagerPeer::ADDON_STATE, '', Criteria::NOT_EQUAL);
@@ -358,7 +351,7 @@ class AddonsStore extends BaseAddonsStore
$aPluginsPP = unserialize(trim(file_get_contents(PATH_DATA_SITE . 'ee')));
}
$pmLicenseManagerO = &pmLicenseManager::getSingleton();
$pmLicenseManagerO = &PmLicenseManager::getSingleton();
$localPlugins = array();
if ($type == 'plugin') {
@@ -497,7 +490,7 @@ class AddonsStore extends BaseAddonsStore
"header" => "Content-type: application/x-www-form-urlencoded\r\n",
"content" => http_build_query(
array(
"pmVersion" => PmSystem::getVersion(),
"pmVersion" => System::getVersion(),
"version" => STORE_VERSION
)
)
@@ -505,7 +498,7 @@ class AddonsStore extends BaseAddonsStore
);
// Proxy settings
$sysConf = PmSystem::getSystemConfiguration();
$sysConf = System::getSystemConfiguration();
if (isset($sysConf['proxy_host'])) {
if ($sysConf['proxy_host'] != '') {
if (!is_array($option['http'])) {

4
workflow/engine/classes/model/AppDelegation.php
View File

@@ -269,7 +269,7 @@ class AppDelegation extends BaseAppDelegation
$dataAbe = $resultAbe->getRow();
$flagActionsByEmail = false;
if($dataAbe['ABE_TYPE']!='' && $data->USR_UID!=''){
$actionsByEmail = new actionsByEmailCoreClass();
$actionsByEmail = new ActionsByEmailCoreClass();
$actionsByEmail->sendActionsByEmail($data, $dataAbe);
}
}
@@ -281,7 +281,7 @@ class AppDelegation extends BaseAppDelegation
$licensedFeatures = &PMLicensedFeatures::getSingleton ();
if ($licensedFeatures->verifyfeature ( '7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09' )) {
try{
$pmGoogle = new PMGoogleApi ();
$pmGoogle = new PmGoogleApi ();
if ($pmGoogle->getServiceGmailStatus()) {
$Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
$Pmgmail->gmailsForRouting($sUsrUid, $sTasUid, $sAppUid, $delIndex, $isSubprocess);

5
workflow/engine/classes/model/AppNotes.php
View File

@@ -1,6 +1,7 @@
<?php
//require_once 'classes/model/om/BaseAppNotes.php';
use ProcessMaker\Core\System;
/**
* Skeleton subclass for representing a row from the 'APP_NOTES' table.
@@ -148,7 +149,7 @@ class AppNotes extends BaseAppNotes
{
try {
$aConfiguration = PmSystem::getEmailConfiguration();
$aConfiguration = System::getEmailConfiguration();
$msgError = "";
if (! isset( $aConfiguration['MESS_ENABLED'] ) || $aConfiguration['MESS_ENABLED'] != '1') {
@@ -181,7 +182,7 @@ class AppNotes extends BaseAppNotes
$aUser = $oUser->load( $recipientUid );
$sTo = ((($aUser['USR_FIRSTNAME'] != '') || ($aUser['USR_LASTNAME'] != '')) ? $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' ' : '') . '<' . $aUser['USR_EMAIL'] . '>';
$oSpool = new spoolRun();
$oSpool = new SpoolRun();
$oSpool->setConfig($aConfiguration);
$oSpool->create(

36
workflow/engine/classes/model/AppSolrQueue.php
View File

@@ -86,31 +86,31 @@ class AppSolrQueue extends BaseAppSolrQueue
$updatedApplications = array ();
try {
$c = new Criteria();
$c->addSelectColumn(AppSolrQueuePeer::APP_UID);
$c->addSelectColumn(AppSolrQueuePeer::APP_CHANGE_DATE);
$c->addSelectColumn(AppSolrQueuePeer::APP_CHANGE_TRACE);
$c->addSelectColumn(AppSolrQueuePeer::APP_UPDATED);
//"WHERE
if($updated == true && $deleted == true){
$c->add(AppSolrQueuePeer::APP_UPDATED, 0, Criteria::NOT_EQUAL);
}
if($updated == true && $deleted == false){
$c->add(AppSolrQueuePeer::APP_UPDATED, 1, Criteria::EQUAL);
}
if($updated == false && $deleted == true){
$c->add(AppSolrQueuePeer::APP_UPDATED, 2, Criteria::EQUAL);
}
$rs = AppSolrQueuePeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
//"WHERE
if($updated == true && $deleted == true){
$c->add(AppSolrQueuePeer::APP_UPDATED, 0, Criteria::NOT_EQUAL);
}
if($updated == true && $deleted == false){
$c->add(AppSolrQueuePeer::APP_UPDATED, 1, Criteria::EQUAL);
}
if($updated == false && $deleted == true){
$c->add(AppSolrQueuePeer::APP_UPDATED, 2, Criteria::EQUAL);
}
$rs = AppSolrQueuePeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
//echo $c->toString();
$rs->next();
$row = $rs->getRow();
while (is_array( $row )) {
$appSolrQueue = Entity_AppSolrQueue::createEmpty();
$appSolrQueue = EntityAppSolrQueue::createEmpty();
$appSolrQueue->appUid = $row["APP_UID"];
$appSolrQueue->appChangeDate = $row["APP_CHANGE_DATE"];
$appSolrQueue->appChangeTrace = $row["APP_CHANGE_TRACE"];
@@ -119,11 +119,11 @@ class AppSolrQueue extends BaseAppSolrQueue
$rs->next();
$row = $rs->getRow();
}
return $updatedApplications;
} catch (Exception $e) {
$con->rollback();
throw ($e);
}
}
} // AppSolrQueue
} // AppSolrQueue

2
workflow/engine/classes/model/Content.php
View File

@@ -361,7 +361,7 @@ class Content extends BaseContent
FROM CONTENT
ORDER BY CON_ID, CON_CATEGORY, CON_PARENT, CON_LANG";
$workSpace = new workspaceTools( $workSpace );
$workSpace = new WorkspaceTools( $workSpace );
$workSpace->getDBInfo();
$link = @mysql_pconnect( $workSpace->dbHost, $workSpace->dbUser, $workSpace->dbPass) or die( "Could not connect" );

5
workflow/engine/classes/model/Language.php
View File

@@ -1,4 +1,7 @@
<?php
use ProcessMaker\Core\System;
class Language extends BaseLanguage
{
private static $arrayRecord = array();
@@ -355,7 +358,7 @@ class Language extends BaseLanguage
$sLanguage = $langRecord['LAN_NAME'];
//setting headers
$poFile->addHeader( 'Project-Id-Version', 'ProcessMaker ' . PmSystem::getVersion() );
$poFile->addHeader( 'Project-Id-Version', 'ProcessMaker ' . System::getVersion() );
$poFile->addHeader( 'POT-Creation-Date', '' );
$poFile->addHeader( 'PO-Revision-Date', date( 'Y-m-d H:i:s' ) );
$poFile->addHeader( 'Last-Translator', '' );

2
workflow/engine/classes/model/OutputDocument.php
View File

@@ -885,7 +885,7 @@ class OutputDocument extends BaseOutputDocument
$pdf->SetRightMargin($margins['right']);
$pdf->SetAutoPageBreak(true, $margins['bottom']);
$oServerConf = &serverConf::getSingleton();
$oServerConf = &ServerConf::getSingleton();
// set some language dependent data:
$lg = array();

8
workflow/engine/classes/model/map/PluginsRegistryMapBuilder.php
View File

@@ -63,9 +63,7 @@ class PluginsRegistryMapBuilder
$tMap = $this->dbMap->addTable('PLUGINS_REGISTRY');
$tMap->setPhpName('PluginsRegistry');
$tMap->setUseIdGenerator(true);
$tMap->addColumn('ID', 'Id', 'int', CreoleTypes::INTEGER, true, null);
$tMap->setUseIdGenerator(false);
$tMap->addPrimaryKey('PR_UID', 'PrUid', 'string', CreoleTypes::VARCHAR, true, 32);
@@ -89,9 +87,9 @@ class PluginsRegistryMapBuilder
$tMap->addColumn('PLUGIN_VERSION', 'PluginVersion', 'string', CreoleTypes::VARCHAR, false, 50);
$tMap->addColumn('PLUGIN_ENABLE', 'PluginEnable', 'boolean', CreoleTypes::BOOLEAN, false, null);
$tMap->addColumn('PLUGIN_ENABLE', 'PluginEnable', 'int', CreoleTypes::TINYINT, false, null);
$tMap->addColumn('PLUGIN_PRIVATE', 'PluginPrivate', 'boolean', CreoleTypes::BOOLEAN, false, null);
$tMap->addColumn('PLUGIN_PRIVATE', 'PluginPrivate', 'int', CreoleTypes::TINYINT, false, null);
$tMap->addColumn('PLUGIN_MENUS', 'PluginMenus', 'string', CreoleTypes::LONGVARCHAR, false, null);

318
workflow/engine/classes/model/om/BasePluginsRegistry.php
View File

@@ -27,12 +27,6 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
*/
protected static $peer;
/**
* The value for the id field.
* @var int
*/
protected $id;
/**
* The value for the pr_uid field.
* @var string
@@ -101,15 +95,15 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
/**
* The value for the plugin_enable field.
* @var boolean
* @var int
*/
protected $plugin_enable = false;
protected $plugin_enable = 0;
/**
* The value for the plugin_private field.
* @var boolean
* @var int
*/
protected $plugin_private = false;
protected $plugin_private = 0;
/**
* The value for the plugin_menus field.
@@ -185,17 +179,6 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
*/
protected $alreadyInValidation = false;
/**
* Get the [id] column value.
*
* @return int
*/
public function getId()
{
return $this->id;
}
/**
* Get the [pr_uid] column value.
*
@@ -320,7 +303,7 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
/**
* Get the [plugin_enable] column value.
*
* @return boolean
* @return int
*/
public function getPluginEnable()
{
@@ -331,7 +314,7 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
/**
* Get the [plugin_private] column value.
*
* @return boolean
* @return int
*/
public function getPluginPrivate()
{
@@ -449,28 +432,6 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
return $this->plugin_attributes;
}
/**
* Set the value of [id] column.
*
* @param int $v new value
* @return void
*/
public function setId($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->id !== $v) {
$this->id = $v;
$this->modifiedColumns[] = PluginsRegistryPeer::ID;
}
} // setId()
/**
* Set the value of [pr_uid] column.
*
@@ -716,13 +677,19 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
/**
* Set the value of [plugin_enable] column.
*
* @param boolean $v new value
* @param int $v new value
* @return void
*/
public function setPluginEnable($v)
{
if ($this->plugin_enable !== $v || $v === false) {
// 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->plugin_enable !== $v || $v === 0) {
$this->plugin_enable = $v;
$this->modifiedColumns[] = PluginsRegistryPeer::PLUGIN_ENABLE;
}
@@ -732,13 +699,19 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
/**
* Set the value of [plugin_private] column.
*
* @param boolean $v new value
* @param int $v new value
* @return void
*/
public function setPluginPrivate($v)
{
if ($this->plugin_private !== $v || $v === false) {
// 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->plugin_private !== $v || $v === 0) {
$this->plugin_private = $v;
$this->modifiedColumns[] = PluginsRegistryPeer::PLUGIN_PRIVATE;
}
@@ -982,60 +955,58 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
{
try {
$this->id = $rs->getInt($startcol + 0);
$this->pr_uid = $rs->getString($startcol + 0);
$this->pr_uid = $rs->getString($startcol + 1);
$this->plugin_namespace = $rs->getString($startcol + 1);
$this->plugin_namespace = $rs->getString($startcol + 2);
$this->plugin_description = $rs->getString($startcol + 2);
$this->plugin_description = $rs->getString($startcol + 3);
$this->plugin_class_name = $rs->getString($startcol + 3);
$this->plugin_class_name = $rs->getString($startcol + 4);
$this->plugin_friendly_name = $rs->getString($startcol + 4);
$this->plugin_friendly_name = $rs->getString($startcol + 5);
$this->plugin_file = $rs->getString($startcol + 5);
$this->plugin_file = $rs->getString($startcol + 6);
$this->plugin_folder = $rs->getString($startcol + 6);
$this->plugin_folder = $rs->getString($startcol + 7);
$this->plugin_setup_page = $rs->getString($startcol + 7);
$this->plugin_setup_page = $rs->getString($startcol + 8);
$this->plugin_company_logo = $rs->getString($startcol + 8);
$this->plugin_company_logo = $rs->getString($startcol + 9);
$this->plugin_workspaces = $rs->getString($startcol + 9);
$this->plugin_workspaces = $rs->getString($startcol + 10);
$this->plugin_version = $rs->getString($startcol + 10);
$this->plugin_version = $rs->getString($startcol + 11);
$this->plugin_enable = $rs->getInt($startcol + 11);
$this->plugin_enable = $rs->getBoolean($startcol + 12);
$this->plugin_private = $rs->getInt($startcol + 12);
$this->plugin_private = $rs->getBoolean($startcol + 13);
$this->plugin_menus = $rs->getString($startcol + 13);
$this->plugin_menus = $rs->getString($startcol + 14);
$this->plugin_folders = $rs->getString($startcol + 14);
$this->plugin_folders = $rs->getString($startcol + 15);
$this->plugin_triggers = $rs->getString($startcol + 15);
$this->plugin_triggers = $rs->getString($startcol + 16);
$this->plugin_pm_functions = $rs->getString($startcol + 16);
$this->plugin_pm_functions = $rs->getString($startcol + 17);
$this->plugin_redirect_login = $rs->getString($startcol + 17);
$this->plugin_redirect_login = $rs->getString($startcol + 18);
$this->plugin_steps = $rs->getString($startcol + 18);
$this->plugin_steps = $rs->getString($startcol + 19);
$this->plugin_css = $rs->getString($startcol + 19);
$this->plugin_css = $rs->getString($startcol + 20);
$this->plugin_js = $rs->getString($startcol + 20);
$this->plugin_js = $rs->getString($startcol + 21);
$this->plugin_rest_service = $rs->getString($startcol + 21);
$this->plugin_rest_service = $rs->getString($startcol + 22);
$this->plugin_attributes = $rs->getString($startcol + 23);
$this->plugin_attributes = $rs->getString($startcol + 22);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 24; // 24 = PluginsRegistryPeer::NUM_COLUMNS - PluginsRegistryPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 23; // 23 = PluginsRegistryPeer::NUM_COLUMNS - PluginsRegistryPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating PluginsRegistry object", $e);
@@ -1240,75 +1211,72 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
{
switch($pos) {
case 0:
return $this->getId();
break;
case 1:
return $this->getPrUid();
break;
case 2:
case 1:
return $this->getPluginNamespace();
break;
case 3:
case 2:
return $this->getPluginDescription();
break;
case 4:
case 3:
return $this->getPluginClassName();
break;
case 5:
case 4:
return $this->getPluginFriendlyName();
break;
case 6:
case 5:
return $this->getPluginFile();
break;
case 7:
case 6:
return $this->getPluginFolder();
break;
case 8:
case 7:
return $this->getPluginSetupPage();
break;
case 9:
case 8:
return $this->getPluginCompanyLogo();
break;
case 10:
case 9:
return $this->getPluginWorkspaces();
break;
case 11:
case 10:
return $this->getPluginVersion();
break;
case 12:
case 11:
return $this->getPluginEnable();
break;
case 13:
case 12:
return $this->getPluginPrivate();
break;
case 14:
case 13:
return $this->getPluginMenus();
break;
case 15:
case 14:
return $this->getPluginFolders();
break;
case 16:
case 15:
return $this->getPluginTriggers();
break;
case 17:
case 16:
return $this->getPluginPmFunctions();
break;
case 18:
case 17:
return $this->getPluginRedirectLogin();
break;
case 19:
case 18:
return $this->getPluginSteps();
break;
case 20:
case 19:
return $this->getPluginCss();
break;
case 21:
case 20:
return $this->getPluginJs();
break;
case 22:
case 21:
return $this->getPluginRestService();
break;
case 23:
case 22:
return $this->getPluginAttributes();
break;
default:
@@ -1331,30 +1299,29 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
{
$keys = PluginsRegistryPeer::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getId(),
$keys[1] => $this->getPrUid(),
$keys[2] => $this->getPluginNamespace(),
$keys[3] => $this->getPluginDescription(),
$keys[4] => $this->getPluginClassName(),
$keys[5] => $this->getPluginFriendlyName(),
$keys[6] => $this->getPluginFile(),
$keys[7] => $this->getPluginFolder(),
$keys[8] => $this->getPluginSetupPage(),
$keys[9] => $this->getPluginCompanyLogo(),
$keys[10] => $this->getPluginWorkspaces(),
$keys[11] => $this->getPluginVersion(),
$keys[12] => $this->getPluginEnable(),
$keys[13] => $this->getPluginPrivate(),
$keys[14] => $this->getPluginMenus(),
$keys[15] => $this->getPluginFolders(),
$keys[16] => $this->getPluginTriggers(),
$keys[17] => $this->getPluginPmFunctions(),
$keys[18] => $this->getPluginRedirectLogin(),
$keys[19] => $this->getPluginSteps(),
$keys[20] => $this->getPluginCss(),
$keys[21] => $this->getPluginJs(),
$keys[22] => $this->getPluginRestService(),
$keys[23] => $this->getPluginAttributes(),
$keys[0] => $this->getPrUid(),
$keys[1] => $this->getPluginNamespace(),
$keys[2] => $this->getPluginDescription(),
$keys[3] => $this->getPluginClassName(),
$keys[4] => $this->getPluginFriendlyName(),
$keys[5] => $this->getPluginFile(),
$keys[6] => $this->getPluginFolder(),
$keys[7] => $this->getPluginSetupPage(),
$keys[8] => $this->getPluginCompanyLogo(),
$keys[9] => $this->getPluginWorkspaces(),
$keys[10] => $this->getPluginVersion(),
$keys[11] => $this->getPluginEnable(),
$keys[12] => $this->getPluginPrivate(),
$keys[13] => $this->getPluginMenus(),
$keys[14] => $this->getPluginFolders(),
$keys[15] => $this->getPluginTriggers(),
$keys[16] => $this->getPluginPmFunctions(),
$keys[17] => $this->getPluginRedirectLogin(),
$keys[18] => $this->getPluginSteps(),
$keys[19] => $this->getPluginCss(),
$keys[20] => $this->getPluginJs(),
$keys[21] => $this->getPluginRestService(),
$keys[22] => $this->getPluginAttributes(),
);
return $result;
}
@@ -1387,75 +1354,72 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
{
switch($pos) {
case 0:
$this->setId($value);
break;
case 1:
$this->setPrUid($value);
break;
case 2:
case 1:
$this->setPluginNamespace($value);
break;
case 3:
case 2:
$this->setPluginDescription($value);
break;
case 4:
case 3:
$this->setPluginClassName($value);
break;
case 5:
case 4:
$this->setPluginFriendlyName($value);
break;
case 6:
case 5:
$this->setPluginFile($value);
break;
case 7:
case 6:
$this->setPluginFolder($value);
break;
case 8:
case 7:
$this->setPluginSetupPage($value);
break;
case 9:
case 8:
$this->setPluginCompanyLogo($value);
break;
case 10:
case 9:
$this->setPluginWorkspaces($value);
break;
case 11:
case 10:
$this->setPluginVersion($value);
break;
case 12:
case 11:
$this->setPluginEnable($value);
break;
case 13:
case 12:
$this->setPluginPrivate($value);
break;
case 14:
case 13:
$this->setPluginMenus($value);
break;
case 15:
case 14:
$this->setPluginFolders($value);
break;
case 16:
case 15:
$this->setPluginTriggers($value);
break;
case 17:
case 16:
$this->setPluginPmFunctions($value);
break;
case 18:
case 17:
$this->setPluginRedirectLogin($value);
break;
case 19:
case 18:
$this->setPluginSteps($value);
break;
case 20:
case 19:
$this->setPluginCss($value);
break;
case 21:
case 20:
$this->setPluginJs($value);
break;
case 22:
case 21:
$this->setPluginRestService($value);
break;
case 23:
case 22:
$this->setPluginAttributes($value);
break;
} // switch()
@@ -1482,99 +1446,95 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
$keys = PluginsRegistryPeer::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) {
$this->setId($arr[$keys[0]]);
$this->setPrUid($arr[$keys[0]]);
}
if (array_key_exists($keys[1], $arr)) {
$this->setPrUid($arr[$keys[1]]);
$this->setPluginNamespace($arr[$keys[1]]);
}
if (array_key_exists($keys[2], $arr)) {
$this->setPluginNamespace($arr[$keys[2]]);
$this->setPluginDescription($arr[$keys[2]]);
}
if (array_key_exists($keys[3], $arr)) {
$this->setPluginDescription($arr[$keys[3]]);
$this->setPluginClassName($arr[$keys[3]]);
}
if (array_key_exists($keys[4], $arr)) {
$this->setPluginClassName($arr[$keys[4]]);
$this->setPluginFriendlyName($arr[$keys[4]]);
}
if (array_key_exists($keys[5], $arr)) {
$this->setPluginFriendlyName($arr[$keys[5]]);
$this->setPluginFile($arr[$keys[5]]);
}
if (array_key_exists($keys[6], $arr)) {
$this->setPluginFile($arr[$keys[6]]);
$this->setPluginFolder($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
$this->setPluginFolder($arr[$keys[7]]);
$this->setPluginSetupPage($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
$this->setPluginSetupPage($arr[$keys[8]]);
$this->setPluginCompanyLogo($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
$this->setPluginCompanyLogo($arr[$keys[9]]);
$this->setPluginWorkspaces($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
$this->setPluginWorkspaces($arr[$keys[10]]);
$this->setPluginVersion($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
$this->setPluginVersion($arr[$keys[11]]);
$this->setPluginEnable($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
$this->setPluginEnable($arr[$keys[12]]);
$this->setPluginPrivate($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
$this->setPluginPrivate($arr[$keys[13]]);
$this->setPluginMenus($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
$this->setPluginMenus($arr[$keys[14]]);
$this->setPluginFolders($arr[$keys[14]]);
}
if (array_key_exists($keys[15], $arr)) {
$this->setPluginFolders($arr[$keys[15]]);
$this->setPluginTriggers($arr[$keys[15]]);
}
if (array_key_exists($keys[16], $arr)) {
$this->setPluginTriggers($arr[$keys[16]]);
$this->setPluginPmFunctions($arr[$keys[16]]);
}
if (array_key_exists($keys[17], $arr)) {
$this->setPluginPmFunctions($arr[$keys[17]]);
$this->setPluginRedirectLogin($arr[$keys[17]]);
}
if (array_key_exists($keys[18], $arr)) {
$this->setPluginRedirectLogin($arr[$keys[18]]);
$this->setPluginSteps($arr[$keys[18]]);
}
if (array_key_exists($keys[19], $arr)) {
$this->setPluginSteps($arr[$keys[19]]);
$this->setPluginCss($arr[$keys[19]]);
}
if (array_key_exists($keys[20], $arr)) {
$this->setPluginCss($arr[$keys[20]]);
$this->setPluginJs($arr[$keys[20]]);
}
if (array_key_exists($keys[21], $arr)) {
$this->setPluginJs($arr[$keys[21]]);
$this->setPluginRestService($arr[$keys[21]]);
}
if (array_key_exists($keys[22], $arr)) {
$this->setPluginRestService($arr[$keys[22]]);
}
if (array_key_exists($keys[23], $arr)) {
$this->setPluginAttributes($arr[$keys[23]]);
$this->setPluginAttributes($arr[$keys[22]]);
}
}
@@ -1588,10 +1548,6 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
{
$criteria = new Criteria(PluginsRegistryPeer::DATABASE_NAME);
if ($this->isColumnModified(PluginsRegistryPeer::ID)) {
$criteria->add(PluginsRegistryPeer::ID, $this->id);
}
if ($this->isColumnModified(PluginsRegistryPeer::PR_UID)) {
$criteria->add(PluginsRegistryPeer::PR_UID, $this->pr_uid);
}
@@ -1738,8 +1694,6 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false)
{
$copyObj->setId($this->id);
$copyObj->setPluginNamespace($this->plugin_namespace);
$copyObj->setPluginDescription($this->plugin_description);

23
workflow/engine/classes/model/om/BasePluginsRegistryPeer.php
View File

@@ -25,15 +25,12 @@ abstract class BasePluginsRegistryPeer
const CLASS_DEFAULT = 'classes.model.PluginsRegistry';
/** The total number of columns. */
const NUM_COLUMNS = 24;
const NUM_COLUMNS = 23;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
/** the column name for the ID field */
const ID = 'PLUGINS_REGISTRY.ID';
/** the column name for the PR_UID field */
const PR_UID = 'PLUGINS_REGISTRY.PR_UID';
@@ -114,10 +111,10 @@ abstract class BasePluginsRegistryPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('Id', 'PrUid', 'PluginNamespace', 'PluginDescription', 'PluginClassName', 'PluginFriendlyName', 'PluginFile', 'PluginFolder', 'PluginSetupPage', 'PluginCompanyLogo', 'PluginWorkspaces', 'PluginVersion', 'PluginEnable', 'PluginPrivate', 'PluginMenus', 'PluginFolders', 'PluginTriggers', 'PluginPmFunctions', 'PluginRedirectLogin', 'PluginSteps', 'PluginCss', 'PluginJs', 'PluginRestService', 'PluginAttributes', ),
BasePeer::TYPE_COLNAME => array (PluginsRegistryPeer::ID, PluginsRegistryPeer::PR_UID, PluginsRegistryPeer::PLUGIN_NAMESPACE, PluginsRegistryPeer::PLUGIN_DESCRIPTION, PluginsRegistryPeer::PLUGIN_CLASS_NAME, PluginsRegistryPeer::PLUGIN_FRIENDLY_NAME, PluginsRegistryPeer::PLUGIN_FILE, PluginsRegistryPeer::PLUGIN_FOLDER, PluginsRegistryPeer::PLUGIN_SETUP_PAGE, PluginsRegistryPeer::PLUGIN_COMPANY_LOGO, PluginsRegistryPeer::PLUGIN_WORKSPACES, PluginsRegistryPeer::PLUGIN_VERSION, PluginsRegistryPeer::PLUGIN_ENABLE, PluginsRegistryPeer::PLUGIN_PRIVATE, PluginsRegistryPeer::PLUGIN_MENUS, PluginsRegistryPeer::PLUGIN_FOLDERS, PluginsRegistryPeer::PLUGIN_TRIGGERS, PluginsRegistryPeer::PLUGIN_PM_FUNCTIONS, PluginsRegistryPeer::PLUGIN_REDIRECT_LOGIN, PluginsRegistryPeer::PLUGIN_STEPS, PluginsRegistryPeer::PLUGIN_CSS, PluginsRegistryPeer::PLUGIN_JS, PluginsRegistryPeer::PLUGIN_REST_SERVICE, PluginsRegistryPeer::PLUGIN_ATTRIBUTES, ),
BasePeer::TYPE_FIELDNAME => array ('ID', 'PR_UID', 'PLUGIN_NAMESPACE', 'PLUGIN_DESCRIPTION', 'PLUGIN_CLASS_NAME', 'PLUGIN_FRIENDLY_NAME', 'PLUGIN_FILE', 'PLUGIN_FOLDER', 'PLUGIN_SETUP_PAGE', 'PLUGIN_COMPANY_LOGO', 'PLUGIN_WORKSPACES', 'PLUGIN_VERSION', 'PLUGIN_ENABLE', 'PLUGIN_PRIVATE', 'PLUGIN_MENUS', 'PLUGIN_FOLDERS', 'PLUGIN_TRIGGERS', 'PLUGIN_PM_FUNCTIONS', 'PLUGIN_REDIRECT_LOGIN', 'PLUGIN_STEPS', 'PLUGIN_CSS', 'PLUGIN_JS', 'PLUGIN_REST_SERVICE', 'PLUGIN_ATTRIBUTES', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, )
BasePeer::TYPE_PHPNAME => array ('PrUid', 'PluginNamespace', 'PluginDescription', 'PluginClassName', 'PluginFriendlyName', 'PluginFile', 'PluginFolder', 'PluginSetupPage', 'PluginCompanyLogo', 'PluginWorkspaces', 'PluginVersion', 'PluginEnable', 'PluginPrivate', 'PluginMenus', 'PluginFolders', 'PluginTriggers', 'PluginPmFunctions', 'PluginRedirectLogin', 'PluginSteps', 'PluginCss', 'PluginJs', 'PluginRestService', 'PluginAttributes', ),
BasePeer::TYPE_COLNAME => array (PluginsRegistryPeer::PR_UID, PluginsRegistryPeer::PLUGIN_NAMESPACE, PluginsRegistryPeer::PLUGIN_DESCRIPTION, PluginsRegistryPeer::PLUGIN_CLASS_NAME, PluginsRegistryPeer::PLUGIN_FRIENDLY_NAME, PluginsRegistryPeer::PLUGIN_FILE, PluginsRegistryPeer::PLUGIN_FOLDER, PluginsRegistryPeer::PLUGIN_SETUP_PAGE, PluginsRegistryPeer::PLUGIN_COMPANY_LOGO, PluginsRegistryPeer::PLUGIN_WORKSPACES, PluginsRegistryPeer::PLUGIN_VERSION, PluginsRegistryPeer::PLUGIN_ENABLE, PluginsRegistryPeer::PLUGIN_PRIVATE, PluginsRegistryPeer::PLUGIN_MENUS, PluginsRegistryPeer::PLUGIN_FOLDERS, PluginsRegistryPeer::PLUGIN_TRIGGERS, PluginsRegistryPeer::PLUGIN_PM_FUNCTIONS, PluginsRegistryPeer::PLUGIN_REDIRECT_LOGIN, PluginsRegistryPeer::PLUGIN_STEPS, PluginsRegistryPeer::PLUGIN_CSS, PluginsRegistryPeer::PLUGIN_JS, PluginsRegistryPeer::PLUGIN_REST_SERVICE, PluginsRegistryPeer::PLUGIN_ATTRIBUTES, ),
BasePeer::TYPE_FIELDNAME => array ('PR_UID', 'PLUGIN_NAMESPACE', 'PLUGIN_DESCRIPTION', 'PLUGIN_CLASS_NAME', 'PLUGIN_FRIENDLY_NAME', 'PLUGIN_FILE', 'PLUGIN_FOLDER', 'PLUGIN_SETUP_PAGE', 'PLUGIN_COMPANY_LOGO', 'PLUGIN_WORKSPACES', 'PLUGIN_VERSION', 'PLUGIN_ENABLE', 'PLUGIN_PRIVATE', 'PLUGIN_MENUS', 'PLUGIN_FOLDERS', 'PLUGIN_TRIGGERS', 'PLUGIN_PM_FUNCTIONS', 'PLUGIN_REDIRECT_LOGIN', 'PLUGIN_STEPS', 'PLUGIN_CSS', 'PLUGIN_JS', 'PLUGIN_REST_SERVICE', 'PLUGIN_ATTRIBUTES', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, )
);
/**
@@ -127,10 +124,10 @@ abstract class BasePluginsRegistryPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'PrUid' => 1, 'PluginNamespace' => 2, 'PluginDescription' => 3, 'PluginClassName' => 4, 'PluginFriendlyName' => 5, 'PluginFile' => 6, 'PluginFolder' => 7, 'PluginSetupPage' => 8, 'PluginCompanyLogo' => 9, 'PluginWorkspaces' => 10, 'PluginVersion' => 11, 'PluginEnable' => 12, 'PluginPrivate' => 13, 'PluginMenus' => 14, 'PluginFolders' => 15, 'PluginTriggers' => 16, 'PluginPmFunctions' => 17, 'PluginRedirectLogin' => 18, 'PluginSteps' => 19, 'PluginCss' => 20, 'PluginJs' => 21, 'PluginRestService' => 22, 'PluginAttributes' => 23, ),
BasePeer::TYPE_COLNAME => array (PluginsRegistryPeer::ID => 0, PluginsRegistryPeer::PR_UID => 1, PluginsRegistryPeer::PLUGIN_NAMESPACE => 2, PluginsRegistryPeer::PLUGIN_DESCRIPTION => 3, PluginsRegistryPeer::PLUGIN_CLASS_NAME => 4, PluginsRegistryPeer::PLUGIN_FRIENDLY_NAME => 5, PluginsRegistryPeer::PLUGIN_FILE => 6, PluginsRegistryPeer::PLUGIN_FOLDER => 7, PluginsRegistryPeer::PLUGIN_SETUP_PAGE => 8, PluginsRegistryPeer::PLUGIN_COMPANY_LOGO => 9, PluginsRegistryPeer::PLUGIN_WORKSPACES => 10, PluginsRegistryPeer::PLUGIN_VERSION => 11, PluginsRegistryPeer::PLUGIN_ENABLE => 12, PluginsRegistryPeer::PLUGIN_PRIVATE => 13, PluginsRegistryPeer::PLUGIN_MENUS => 14, PluginsRegistryPeer::PLUGIN_FOLDERS => 15, PluginsRegistryPeer::PLUGIN_TRIGGERS => 16, PluginsRegistryPeer::PLUGIN_PM_FUNCTIONS => 17, PluginsRegistryPeer::PLUGIN_REDIRECT_LOGIN => 18, PluginsRegistryPeer::PLUGIN_STEPS => 19, PluginsRegistryPeer::PLUGIN_CSS => 20, PluginsRegistryPeer::PLUGIN_JS => 21, PluginsRegistryPeer::PLUGIN_REST_SERVICE => 22, PluginsRegistryPeer::PLUGIN_ATTRIBUTES => 23, ),
BasePeer::TYPE_FIELDNAME => array ('ID' => 0, 'PR_UID' => 1, 'PLUGIN_NAMESPACE' => 2, 'PLUGIN_DESCRIPTION' => 3, 'PLUGIN_CLASS_NAME' => 4, 'PLUGIN_FRIENDLY_NAME' => 5, 'PLUGIN_FILE' => 6, 'PLUGIN_FOLDER' => 7, 'PLUGIN_SETUP_PAGE' => 8, 'PLUGIN_COMPANY_LOGO' => 9, 'PLUGIN_WORKSPACES' => 10, 'PLUGIN_VERSION' => 11, 'PLUGIN_ENABLE' => 12, 'PLUGIN_PRIVATE' => 13, 'PLUGIN_MENUS' => 14, 'PLUGIN_FOLDERS' => 15, 'PLUGIN_TRIGGERS' => 16, 'PLUGIN_PM_FUNCTIONS' => 17, 'PLUGIN_REDIRECT_LOGIN' => 18, 'PLUGIN_STEPS' => 19, 'PLUGIN_CSS' => 20, 'PLUGIN_JS' => 21, 'PLUGIN_REST_SERVICE' => 22, 'PLUGIN_ATTRIBUTES' => 23, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, )
BasePeer::TYPE_PHPNAME => array ('PrUid' => 0, 'PluginNamespace' => 1, 'PluginDescription' => 2, 'PluginClassName' => 3, 'PluginFriendlyName' => 4, 'PluginFile' => 5, 'PluginFolder' => 6, 'PluginSetupPage' => 7, 'PluginCompanyLogo' => 8, 'PluginWorkspaces' => 9, 'PluginVersion' => 10, 'PluginEnable' => 11, 'PluginPrivate' => 12, 'PluginMenus' => 13, 'PluginFolders' => 14, 'PluginTriggers' => 15, 'PluginPmFunctions' => 16, 'PluginRedirectLogin' => 17, 'PluginSteps' => 18, 'PluginCss' => 19, 'PluginJs' => 20, 'PluginRestService' => 21, 'PluginAttributes' => 22, ),
BasePeer::TYPE_COLNAME => array (PluginsRegistryPeer::PR_UID => 0, PluginsRegistryPeer::PLUGIN_NAMESPACE => 1, PluginsRegistryPeer::PLUGIN_DESCRIPTION => 2, PluginsRegistryPeer::PLUGIN_CLASS_NAME => 3, PluginsRegistryPeer::PLUGIN_FRIENDLY_NAME => 4, PluginsRegistryPeer::PLUGIN_FILE => 5, PluginsRegistryPeer::PLUGIN_FOLDER => 6, PluginsRegistryPeer::PLUGIN_SETUP_PAGE => 7, PluginsRegistryPeer::PLUGIN_COMPANY_LOGO => 8, PluginsRegistryPeer::PLUGIN_WORKSPACES => 9, PluginsRegistryPeer::PLUGIN_VERSION => 10, PluginsRegistryPeer::PLUGIN_ENABLE => 11, PluginsRegistryPeer::PLUGIN_PRIVATE => 12, PluginsRegistryPeer::PLUGIN_MENUS => 13, PluginsRegistryPeer::PLUGIN_FOLDERS => 14, PluginsRegistryPeer::PLUGIN_TRIGGERS => 15, PluginsRegistryPeer::PLUGIN_PM_FUNCTIONS => 16, PluginsRegistryPeer::PLUGIN_REDIRECT_LOGIN => 17, PluginsRegistryPeer::PLUGIN_STEPS => 18, PluginsRegistryPeer::PLUGIN_CSS => 19, PluginsRegistryPeer::PLUGIN_JS => 20, PluginsRegistryPeer::PLUGIN_REST_SERVICE => 21, PluginsRegistryPeer::PLUGIN_ATTRIBUTES => 22, ),
BasePeer::TYPE_FIELDNAME => array ('PR_UID' => 0, 'PLUGIN_NAMESPACE' => 1, 'PLUGIN_DESCRIPTION' => 2, 'PLUGIN_CLASS_NAME' => 3, 'PLUGIN_FRIENDLY_NAME' => 4, 'PLUGIN_FILE' => 5, 'PLUGIN_FOLDER' => 6, 'PLUGIN_SETUP_PAGE' => 7, 'PLUGIN_COMPANY_LOGO' => 8, 'PLUGIN_WORKSPACES' => 9, 'PLUGIN_VERSION' => 10, 'PLUGIN_ENABLE' => 11, 'PLUGIN_PRIVATE' => 12, 'PLUGIN_MENUS' => 13, 'PLUGIN_FOLDERS' => 14, 'PLUGIN_TRIGGERS' => 15, 'PLUGIN_PM_FUNCTIONS' => 16, 'PLUGIN_REDIRECT_LOGIN' => 17, 'PLUGIN_STEPS' => 18, 'PLUGIN_CSS' => 19, 'PLUGIN_JS' => 20, 'PLUGIN_REST_SERVICE' => 21, 'PLUGIN_ATTRIBUTES' => 22, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, )
);
/**
@@ -231,8 +228,6 @@ abstract class BasePluginsRegistryPeer
public static function addSelectColumns(Criteria $criteria)
{
$criteria->addSelectColumn(PluginsRegistryPeer::ID);
$criteria->addSelectColumn(PluginsRegistryPeer::PR_UID);
$criteria->addSelectColumn(PluginsRegistryPeer::PLUGIN_NAMESPACE);