diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index e6c6ae39a..faf88a941 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -2,7 +2,7 @@
namespace Maveriks;
use Maveriks\Util;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
use ProcessMaker\Services;
use ProcessMaker\Services\Api;
diff --git a/workflow/engine/classes/model/map/PluginsRegistryMapBuilder.php b/workflow/engine/classes/model/map/PluginsRegistryMapBuilder.php
index 69733f7a6..7be2b32e9 100644
--- a/workflow/engine/classes/model/map/PluginsRegistryMapBuilder.php
+++ b/workflow/engine/classes/model/map/PluginsRegistryMapBuilder.php
@@ -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);
diff --git a/workflow/engine/classes/model/om/BasePluginsRegistry.php b/workflow/engine/classes/model/om/BasePluginsRegistry.php
index 29d3abdd4..042361f6d 100644
--- a/workflow/engine/classes/model/om/BasePluginsRegistry.php
+++ b/workflow/engine/classes/model/om/BasePluginsRegistry.php
@@ -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);
diff --git a/workflow/engine/classes/model/om/BasePluginsRegistryPeer.php b/workflow/engine/classes/model/om/BasePluginsRegistryPeer.php
index 9623cb3cb..7b900ec09 100644
--- a/workflow/engine/classes/model/om/BasePluginsRegistryPeer.php
+++ b/workflow/engine/classes/model/om/BasePluginsRegistryPeer.php
@@ -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);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index b5d4854d5..a2036ea2f 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -5641,7 +5641,6 @@
-
@@ -5666,8 +5665,5 @@
-
-
-
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 1df411eca..156fdc2e4 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -3153,7 +3153,6 @@ DROP TABLE IF EXISTS `PLUGINS_REGISTRY`;
CREATE TABLE `PLUGINS_REGISTRY`
(
- `ID` INTEGER NOT NULL AUTO_INCREMENT,
`PR_UID` VARCHAR(32) default '' NOT NULL,
`PLUGIN_NAMESPACE` VARCHAR(100) NOT NULL,
`PLUGIN_DESCRIPTION` VARCHAR(200) default '',
@@ -3177,8 +3176,7 @@ CREATE TABLE `PLUGINS_REGISTRY`
`PLUGIN_JS` MEDIUMTEXT,
`PLUGIN_REST_SERVICE` MEDIUMTEXT,
`PLUGIN_ATTRIBUTES` MEDIUMTEXT,
- PRIMARY KEY (`PR_UID`),
- UNIQUE KEY `INDEX_PLUGINS_REGISTRY_ID` (`ID`)
+ PRIMARY KEY (`PR_UID`)
)ENGINE=InnoDB ;
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
index 04102fb6a..fb0c7b3dd 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
@@ -2,7 +2,7 @@
namespace ProcessMaker\BusinessModel;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
use PmDynaform;
use SpoolRun;
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index aecf744dc..c5c1e6b2f 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -5,7 +5,7 @@ use G;
use UsersPeer;
use CasesPeer;
use AppDelegation;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
use Exception;
use WsBase;
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
index 33fd825f6..4fd3b5702 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
@@ -4,7 +4,7 @@ use G;
use Exception;
use Bootstrap;
use SpoolRun;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
class EmailServer
{
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
index d21f000de..92a578e4c 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
@@ -7,7 +7,7 @@ use Criteria;
use UsersPeer;
use AppDelegationPeer;
use AppDelayPeer;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
use ProcessMaker\Util\DateTime;
use PmLicenseManager;
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
index ced6f6734..ec282273e 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
@@ -2,7 +2,7 @@
namespace ProcessMaker\BusinessModel\Light;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
use \ProcessMaker\Services\Api;
use G;
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
index 2310454e8..98c02649d 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
@@ -13,7 +13,7 @@
namespace ProcessMaker\BusinessModel\Light;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
class PushMessageAndroid
{
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
index a778a2d52..d75ca9a15 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
@@ -12,7 +12,7 @@
namespace ProcessMaker\BusinessModel\Light;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
class PushMessageIOS
{
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
index 05bca6bc8..c3b670abc 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
@@ -2,7 +2,7 @@
namespace ProcessMaker\BusinessModel\Migrator;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
use ProcessMaker\Project;
use ProcessMaker\Util\Common;
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
index d3f9dbbca..397b5805a 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
@@ -6,7 +6,7 @@ use \Criteria;
use \UsersPeer;
use \GroupUserPeer;
use \ResultSet;
-use Processmaker\Core\System;
+use ProcessMaker\Core\System;
/**
* @copyright Colosa - Bolivia
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
index 069f5dba6..e7c94d9f8 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
@@ -1,7 +1,7 @@
* @access public
* @return array of workspace tools objects
*/
@@ -105,7 +104,6 @@ class System
* If version-pmos.php is not found, try to
* retrieve the version from git.
*
- * @author Alexandre Rosenfeld
* @return string system
*/
public static function getVersion()
@@ -127,7 +125,6 @@ class System
/**
* Get the branch and tag information from a git repository.
*
- * @author Alexandre Rosenfeld
* @return string branch and tag information
*/
public static function getVersionFromGit($dir = null)
@@ -148,7 +145,6 @@ class System
/**
* Get system information
*
- * param
*
* @return array with system information
*/
@@ -211,6 +207,11 @@ class System
return $Fields;
}
+ /**
+ * Load the po files
+ *
+ * @return array $items
+ */
public static function listPoFiles()
{
$folders = glob(PATH_CORE . '/content/translations/*');
@@ -226,6 +227,11 @@ class System
return $items;
}
+ /**
+ * Review the checksum.txt
+ *
+ * @return array $result
+ */
public static function verifyChecksum()
{
if (!file_exists(PATH_TRUNK . "checksum.txt")) {
@@ -257,10 +263,8 @@ class System
/**
* This function checks files to do updated to pm
*
- *
* @name verifyFileForUpgrade
*
- * param
* @return boolean
*/
public function verifyFileForUpgrade()
@@ -285,11 +289,9 @@ class System
/**
* This function gets files to do updated to pm
*
- *
* @name getUpgradedFilesList
- *
- * param
* @return void
+ * @throws Exception
*/
public function getUpgradedFilesList()
{
@@ -312,10 +314,7 @@ class System
/**
* This function checks to do updated for boot
*
- *
* @name verifyForBootstrapUpgrade
- *
- * param
* @return boolean
*/
public function verifyForBootstrapUpgrade()
@@ -332,11 +331,10 @@ class System
/**
* This function updates to the files
*
- *
* @name upgrade
*
- * param
- * @return array
+ * @return object
+ * @throws Exception
*/
public function upgrade()
{
@@ -636,10 +634,8 @@ class System
/**
* This function does to clean up to the upgrate directory
*
- *
* @name cleanupUpgradeDirectory
*
- * param
* @return array
*/
public function cleanupUpgradeDirectory()
@@ -671,11 +667,10 @@ class System
/**
* This function gets info about db
*
- *
* @name getDatabaseCredentials
*
* @param string $dbFile
- * @return $sContent
+ * @return string $sContent
*/
public function getDatabaseCredentials($dbFile)
{
@@ -732,7 +727,7 @@ class System
* Retrieves a schema array from a file.
*
* @param string $sSchemaFile schema filename
- * @return $sContent
+ * @return string $sContent
*/
public static function getSchema($sSchemaFile)
{
@@ -845,18 +840,11 @@ class System
*/
public static function compareSchema($aOldSchema, $aNewSchema)
{
- //$aChanges = array('tablesToDelete' => array(), 'tablesToAdd' => array(), 'tablesToAlter' => array());
- //Tables to delete, but this is disabled
- //foreach ($aOldSchema as $sTableName => $aColumns) {
- // if ( !isset($aNewSchema[$sTableName])) {
- // if (!in_array($sTableName, array('KT_APPLICATION', 'KT_DOCUMENT', 'KT_PROCESS'))) {
- // $aChanges['tablesToDelete'][] = $sTableName;
- // }
- // }
- //}
-
-
- $aChanges = array('tablesToAdd' => array(), 'tablesToAlter' => array(), 'tablesWithNewIndex' => array(), 'tablesToAlterIndex' => array()
+ $aChanges = array(
+ 'tablesToAdd' => array(),
+ 'tablesToAlter' => array(),
+ 'tablesWithNewIndex' => array(),
+ 'tablesToAlterIndex' => array()
);
//new tables to create and alter
@@ -943,7 +931,6 @@ class System
//only columns, no the indexes column
}
//foreach $aColumns
-
//now check the indexes of table
if (isset($aNewSchema[$sTableName]['INDEXES'])) {
foreach ($aNewSchema[$sTableName]['INDEXES'] as $indexName => $indexFields) {
@@ -1007,6 +994,11 @@ class System
}
}
+ /**
+ * Get the list of skins
+ *
+ * @return array $skinListArray
+ */
public function getSkingList()
{
//Create Skins custom folder if it doesn't exists
@@ -1085,11 +1077,23 @@ class System
return $skinListArray;
}
+ /**
+ * Get all time zones
+ *
+ * @return array $skinListArray
+ * @throws Exception
+ * @deprecated this method is deprecated
+ */
public function getAllTimeZones()
{
throw new Exception(__METHOD__ . ': The method is deprecated');
}
+ /**
+ * Get the system configuration
+ *
+ * @return array $config
+ */
public static function getSystemConfiguration($globalIniFile = '', $wsIniFile = '', $wsName = '')
{
if (!is_null(self::$config)) {
@@ -1150,12 +1154,12 @@ class System
return $config;
}
- /*
- * Get information about the queries permitted and tables we can modified
- * @access public
- * @param string $globalIniFile
- * @return array of execute query Black list
- */
+ /**
+ * Get information about the queries permitted and tables we can modified
+ * @access public
+ * @param string $globalIniFile
+ * @return array of execute query Black list
+ */
public static function getQueryBlackList($globalIniFile = '')
{
$config = array();
@@ -1174,6 +1178,13 @@ class System
return $config;
}
+ /**
+ * Update index file
+ *
+ * @param string $conf
+ * @return string $result
+ * @throws Exception
+ */
public function updateIndexFile($conf)
{
if (!file_exists(PATH_HTML . 'index.html')) {
@@ -1203,6 +1214,12 @@ class System
return $result;
}
+ /**
+ * Get the system configuration
+ *
+ * @param string $sysName
+ * @return array $config
+ */
public static function solrEnv($sysName = '')
{
if (empty($sysName)) {
@@ -1223,6 +1240,11 @@ class System
return false;
}
+ /**
+ * Get the instance of the class
+ *
+ * @return array $instance
+ */
public static function getInstance()
{
if (is_null(self::$instance)) {
@@ -1232,6 +1254,11 @@ class System
return self::$instance;
}
+ /**
+ * Get if is debug mode
+ *
+ * @return array $debug
+ */
public static function isDebugMode()
{
if (is_null(self::$debug)) {
@@ -1245,6 +1272,7 @@ class System
* Get the complete name of the server host configured for requests Front-End (e.g. https://127.0.0.1:81)
*
* @return string Returns an string with the complete name of the server host configured for requests Front-End
+ * @throws Exception
*/
public static function getHttpServerHostnameRequestsFrontEnd()
{
diff --git a/workflow/engine/src/ProcessMaker/Exporter/Exporter.php b/workflow/engine/src/ProcessMaker/Exporter/Exporter.php
index d551ce576..22a5a6a46 100644
--- a/workflow/engine/src/ProcessMaker/Exporter/Exporter.php
+++ b/workflow/engine/src/ProcessMaker/Exporter/Exporter.php
@@ -1,7 +1,7 @@