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

Session handling to prevent session lose in other places like, home, admin, etc

Browse Source 
when user is using the new designer that have not session because it is using only the API
This commit is contained in:
Erik Amaru Ortiz
2014-06-16 18:56:08 -04:00
parent 03288704bc
commit d0e20c4b2e
41 changed files with 427 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/classes/model/PmoauthUserAccessTokens.php
View File

@@ -14,6 +14,19 @@ require_once 'classes/model/om/BasePmoauthUserAccessTokens.php';
*
* @package classes.model
*/
class PmoauthUserAccessTokens extends BasePmoauthUserAccessTokens {
class PmoauthUserAccessTokens extends BasePmoauthUserAccessTokens
{
/**
* @param $token
* @return \PmoauthUserAccessTokens|bool
*/
public function getSessionData($token)
{
$c = new Criteria('workflow');
//$c->addSelectColumn(PmoauthUserAccessTokensPeer::ACCESS_TOKEN);
$c->add(PmoauthUserAccessTokensPeer::ACCESS_TOKEN, $token, Criteria::EQUAL);
$result = PmoauthUserAccessTokensPeer::doSelect($c);
return (is_array($result) && empty($result)) ? false : $result[0];
}
} // PmoauthUserAccessTokens

1
workflow/engine/classes/model/map/OutputDocumentMapBuilder.php
View File

@@ -8,6 +8,7 @@ include_once 'creole/CreoleTypes.php';
* This class adds structure of 'OUTPUT_DOCUMENT' table to 'workflow' DatabaseMap object.
*
*
*
* These statically-built map classes are used by Propel to do runtime db structure discovery.
* For example, the createSelectSql() method checks the type of a given column used in an
* ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive

4
workflow/engine/classes/model/map/PmoauthUserAccessTokensMapBuilder.php
View File

@@ -71,7 +71,9 @@ class PmoauthUserAccessTokensMapBuilder
$tMap->addColumn('USER_ID', 'UserId', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('SESSION_ID', 'SessionId', 'string', CreoleTypes::VARCHAR, true, 40);
$tMap->addColumn('SESSION_ID', 'SessionId', 'string', CreoleTypes::VARCHAR, true, 64);
$tMap->addColumn('SESSION_NAME', 'SessionName', 'string', CreoleTypes::VARCHAR, true, 64);
} // doBuild()

28
workflow/engine/classes/model/om/BaseAppCacheView.php
View File

@@ -924,6 +924,10 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [del_delegate_date] from input: " .
var_export($v, true));
@@ -949,6 +953,10 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [del_init_date] from input: " .
var_export($v, true));
@@ -974,6 +982,10 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [del_task_due_date] from input: " .
var_export($v, true));
@@ -999,6 +1011,10 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [del_finish_date] from input: " .
var_export($v, true));
@@ -1314,6 +1330,10 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_create_date] from input: " .
var_export($v, true));
@@ -1339,6 +1359,10 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_finish_date] from input: " .
var_export($v, true));
@@ -1364,6 +1388,10 @@ abstract class BaseAppCacheView extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_update_date] from input: " .
var_export($v, true));

12
workflow/engine/classes/model/om/BaseAppDelay.php
View File

@@ -573,6 +573,10 @@ abstract class BaseAppDelay extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_enable_action_date] from input: " .
var_export($v, true));
@@ -620,6 +624,10 @@ abstract class BaseAppDelay extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_disable_action_date] from input: " .
var_export($v, true));
@@ -645,6 +653,10 @@ abstract class BaseAppDelay extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_automatic_disabled_date] from input: " .
var_export($v, true));

16
workflow/engine/classes/model/om/BaseAppDelegation.php
View File

@@ -769,6 +769,10 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [del_delegate_date] from input: " .
var_export($v, true));
@@ -794,6 +798,10 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [del_init_date] from input: " .
var_export($v, true));
@@ -819,6 +827,10 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [del_task_due_date] from input: " .
var_export($v, true));
@@ -844,6 +856,10 @@ abstract class BaseAppDelegation extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [del_finish_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseAppDocument.php
View File

@@ -503,6 +503,10 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_doc_create_date] from input: " .
var_export($v, true));
@@ -638,6 +642,10 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_doc_status_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseAppEvent.php
View File

@@ -279,6 +279,10 @@ abstract class BaseAppEvent extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_evn_action_date] from input: " .
var_export($v, true));
@@ -326,6 +330,10 @@ abstract class BaseAppEvent extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_evn_last_execution_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseAppFolder.php
View File

@@ -245,6 +245,10 @@ abstract class BaseAppFolder extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [folder_create_date] from input: " .
var_export($v, true));
@@ -270,6 +274,10 @@ abstract class BaseAppFolder extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [folder_update_date] from input: " .
var_export($v, true));

4
workflow/engine/classes/model/om/BaseAppHistory.php
View File

@@ -380,6 +380,10 @@ abstract class BaseAppHistory extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [history_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseAppMessage.php
View File

@@ -581,6 +581,10 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_msg_date] from input: " .
var_export($v, true));
@@ -716,6 +720,10 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_msg_send_date] from input: " .
var_export($v, true));

4
workflow/engine/classes/model/om/BaseAppNotes.php
View File

@@ -287,6 +287,10 @@ abstract class BaseAppNotes extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [note_date] from input: " .
var_export($v, true));

4
workflow/engine/classes/model/om/BaseAppSolrQueue.php
View File

@@ -163,6 +163,10 @@ abstract class BaseAppSolrQueue extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_change_date] from input: " .
var_export($v, true));

16
workflow/engine/classes/model/om/BaseApplication.php
View File

@@ -628,6 +628,10 @@ abstract class BaseApplication extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_create_date] from input: " .
var_export($v, true));
@@ -653,6 +657,10 @@ abstract class BaseApplication extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_init_date] from input: " .
var_export($v, true));
@@ -678,6 +686,10 @@ abstract class BaseApplication extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_finish_date] from input: " .
var_export($v, true));
@@ -703,6 +715,10 @@ abstract class BaseApplication extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [app_update_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseBpmnProject.php
View File

@@ -659,6 +659,10 @@ abstract class BaseBpmnProject extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [prj_create_date] from input: " .
var_export($v, true));
@@ -684,6 +688,10 @@ abstract class BaseBpmnProject extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [prj_update_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseCalendarDefinition.php
View File

@@ -257,6 +257,10 @@ abstract class BaseCalendarDefinition extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [calendar_create_date] from input: " .
var_export($v, true));
@@ -282,6 +286,10 @@ abstract class BaseCalendarDefinition extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [calendar_update_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseCalendarHolidays.php
View File

@@ -206,6 +206,10 @@ abstract class BaseCalendarHolidays extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [calendar_holiday_start] from input: " .
var_export($v, true));
@@ -231,6 +235,10 @@ abstract class BaseCalendarHolidays extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [calendar_holiday_end] from input: " .
var_export($v, true));

20
workflow/engine/classes/model/om/BaseCaseScheduler.php
View File

@@ -736,6 +736,10 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [sch_time_next_run] from input: " .
var_export($v, true));
@@ -761,6 +765,10 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [sch_last_run_time] from input: " .
var_export($v, true));
@@ -874,6 +882,10 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [sch_start_time] from input: " .
var_export($v, true));
@@ -899,6 +911,10 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [sch_start_date] from input: " .
var_export($v, true));
@@ -1034,6 +1050,10 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [sch_end_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseDashlet.php
View File

@@ -340,6 +340,10 @@ abstract class BaseDashlet extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [das_create_date] from input: " .
var_export($v, true));
@@ -365,6 +369,10 @@ abstract class BaseDashlet extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [das_update_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseDashletInstance.php
View File

@@ -340,6 +340,10 @@ abstract class BaseDashletInstance extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [das_ins_create_date] from input: " .
var_export($v, true));
@@ -365,6 +369,10 @@ abstract class BaseDashletInstance extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [das_ins_update_date] from input: " .
var_export($v, true));

4
workflow/engine/classes/model/om/BaseLogCasesScheduler.php
View File

@@ -331,6 +331,10 @@ abstract class BaseLogCasesScheduler extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [exec_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseLoginLog.php
View File

@@ -318,6 +318,10 @@ abstract class BaseLoginLog extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [log_init_date] from input: " .
var_export($v, true));
@@ -343,6 +347,10 @@ abstract class BaseLoginLog extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [log_end_date] from input: " .
var_export($v, true));

4
workflow/engine/classes/model/om/BaseOauthAccessTokens.php
View File

@@ -224,6 +224,10 @@ abstract class BaseOauthAccessTokens extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [expires] from input: " .
var_export($v, true));

4
workflow/engine/classes/model/om/BaseOauthAuthorizationCodes.php
View File

@@ -263,6 +263,10 @@ abstract class BaseOauthAuthorizationCodes extends BaseObject implements Persist
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [expires] from input: " .
var_export($v, true));

4
workflow/engine/classes/model/om/BaseOauthRefreshTokens.php
View File

@@ -224,6 +224,10 @@ abstract class BaseOauthRefreshTokens extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [expires] from input: " .
var_export($v, true));

3
workflow/engine/classes/model/om/BaseOutputDocument.php
View File

@@ -4,14 +4,15 @@ require_once 'propel/om/BaseObject.php';
require_once 'propel/om/Persistent.php';
include_once 'propel/util/Criteria.php';
include_once 'classes/model/OutputDocumentPeer.php';
/**
* Base class that represents a row from the 'OUTPUT_DOCUMENT' table.
*
*
*
*
* @package workflow.classes.model.om
*/

2
workflow/engine/classes/model/om/BaseOutputDocumentPeer.php
View File

@@ -7,8 +7,8 @@ include_once 'classes/model/OutputDocument.php';
/**
* Base static class for performing query and update operations on the 'OUTPUT_DOCUMENT' table.
*
*
*
*
* @package workflow.classes.model.om
*/

60
workflow/engine/classes/model/om/BasePmoauthUserAccessTokens.php
View File

@@ -51,6 +51,12 @@ abstract class BasePmoauthUserAccessTokens extends BaseObject implements Persist
*/
protected $session_id;
/**
* The value for the session_name field.
* @var string
*/
protected $session_name;
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -109,6 +115,17 @@ abstract class BasePmoauthUserAccessTokens extends BaseObject implements Persist
return $this->session_id;
}
/**
* Get the [session_name] column value.
*
* @return string
*/
public function getSessionName()
{
return $this->session_name;
}
/**
* Set the value of [access_token] column.
*
@@ -197,6 +214,28 @@ abstract class BasePmoauthUserAccessTokens extends BaseObject implements Persist
} // setSessionId()
/**
* Set the value of [session_name] column.
*
* @param string $v new value
* @return void
*/
public function setSessionName($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->session_name !== $v) {
$this->session_name = $v;
$this->modifiedColumns[] = PmoauthUserAccessTokensPeer::SESSION_NAME;
}
} // setSessionName()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -222,12 +261,14 @@ abstract class BasePmoauthUserAccessTokens extends BaseObject implements Persist
$this->session_id = $rs->getString($startcol + 3);
$this->session_name = $rs->getString($startcol + 4);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 4; // 4 = PmoauthUserAccessTokensPeer::NUM_COLUMNS - PmoauthUserAccessTokensPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 5; // 5 = PmoauthUserAccessTokensPeer::NUM_COLUMNS - PmoauthUserAccessTokensPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating PmoauthUserAccessTokens object", $e);
@@ -443,6 +484,9 @@ abstract class BasePmoauthUserAccessTokens extends BaseObject implements Persist
case 3:
return $this->getSessionId();
break;
case 4:
return $this->getSessionName();
break;
default:
return null;
break;
@@ -467,6 +511,7 @@ abstract class BasePmoauthUserAccessTokens extends BaseObject implements Persist
$keys[1] => $this->getRefreshToken(),
$keys[2] => $this->getUserId(),
$keys[3] => $this->getSessionId(),
$keys[4] => $this->getSessionName(),
);
return $result;
}
@@ -510,6 +555,9 @@ abstract class BasePmoauthUserAccessTokens extends BaseObject implements Persist
case 3:
$this->setSessionId($value);
break;
case 4:
$this->setSessionName($value);
break;
} // switch()
}
@@ -549,6 +597,10 @@ abstract class BasePmoauthUserAccessTokens extends BaseObject implements Persist
$this->setSessionId($arr[$keys[3]]);
}
if (array_key_exists($keys[4], $arr)) {
$this->setSessionName($arr[$keys[4]]);
}
}
/**
@@ -576,6 +628,10 @@ abstract class BasePmoauthUserAccessTokens extends BaseObject implements Persist
$criteria->add(PmoauthUserAccessTokensPeer::SESSION_ID, $this->session_id);
}
if ($this->isColumnModified(PmoauthUserAccessTokensPeer::SESSION_NAME)) {
$criteria->add(PmoauthUserAccessTokensPeer::SESSION_NAME, $this->session_name);
}
return $criteria;
}
@@ -636,6 +692,8 @@ abstract class BasePmoauthUserAccessTokens extends BaseObject implements Persist
$copyObj->setSessionId($this->session_id);
$copyObj->setSessionName($this->session_name);
$copyObj->setNew(true);

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

@@ -25,7 +25,7 @@ abstract class BasePmoauthUserAccessTokensPeer
const CLASS_DEFAULT = 'classes.model.PmoauthUserAccessTokens';
/** The total number of columns. */
const NUM_COLUMNS = 4;
const NUM_COLUMNS = 5;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -43,6 +43,9 @@ abstract class BasePmoauthUserAccessTokensPeer
/** the column name for the SESSION_ID field */
const SESSION_ID = 'PMOAUTH_USER_ACCESS_TOKENS.SESSION_ID';
/** the column name for the SESSION_NAME field */
const SESSION_NAME = 'PMOAUTH_USER_ACCESS_TOKENS.SESSION_NAME';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -54,10 +57,10 @@ abstract class BasePmoauthUserAccessTokensPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('AccessToken', 'RefreshToken', 'UserId', 'SessionId', ),
BasePeer::TYPE_COLNAME => array (PmoauthUserAccessTokensPeer::ACCESS_TOKEN, PmoauthUserAccessTokensPeer::REFRESH_TOKEN, PmoauthUserAccessTokensPeer::USER_ID, PmoauthUserAccessTokensPeer::SESSION_ID, ),
BasePeer::TYPE_FIELDNAME => array ('ACCESS_TOKEN', 'REFRESH_TOKEN', 'USER_ID', 'SESSION_ID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
BasePeer::TYPE_PHPNAME => array ('AccessToken', 'RefreshToken', 'UserId', 'SessionId', 'SessionName', ),
BasePeer::TYPE_COLNAME => array (PmoauthUserAccessTokensPeer::ACCESS_TOKEN, PmoauthUserAccessTokensPeer::REFRESH_TOKEN, PmoauthUserAccessTokensPeer::USER_ID, PmoauthUserAccessTokensPeer::SESSION_ID, PmoauthUserAccessTokensPeer::SESSION_NAME, ),
BasePeer::TYPE_FIELDNAME => array ('ACCESS_TOKEN', 'REFRESH_TOKEN', 'USER_ID', 'SESSION_ID', 'SESSION_NAME', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
);
/**
@@ -67,10 +70,10 @@ abstract class BasePmoauthUserAccessTokensPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AccessToken' => 0, 'RefreshToken' => 1, 'UserId' => 2, 'SessionId' => 3, ),
BasePeer::TYPE_COLNAME => array (PmoauthUserAccessTokensPeer::ACCESS_TOKEN => 0, PmoauthUserAccessTokensPeer::REFRESH_TOKEN => 1, PmoauthUserAccessTokensPeer::USER_ID => 2, PmoauthUserAccessTokensPeer::SESSION_ID => 3, ),
BasePeer::TYPE_FIELDNAME => array ('ACCESS_TOKEN' => 0, 'REFRESH_TOKEN' => 1, 'USER_ID' => 2, 'SESSION_ID' => 3, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
BasePeer::TYPE_PHPNAME => array ('AccessToken' => 0, 'RefreshToken' => 1, 'UserId' => 2, 'SessionId' => 3, 'SessionName' => 4, ),
BasePeer::TYPE_COLNAME => array (PmoauthUserAccessTokensPeer::ACCESS_TOKEN => 0, PmoauthUserAccessTokensPeer::REFRESH_TOKEN => 1, PmoauthUserAccessTokensPeer::USER_ID => 2, PmoauthUserAccessTokensPeer::SESSION_ID => 3, PmoauthUserAccessTokensPeer::SESSION_NAME => 4, ),
BasePeer::TYPE_FIELDNAME => array ('ACCESS_TOKEN' => 0, 'REFRESH_TOKEN' => 1, 'USER_ID' => 2, 'SESSION_ID' => 3, 'SESSION_NAME' => 4, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
);
/**
@@ -179,6 +182,8 @@ abstract class BasePmoauthUserAccessTokensPeer
$criteria->addSelectColumn(PmoauthUserAccessTokensPeer::SESSION_ID);
$criteria->addSelectColumn(PmoauthUserAccessTokensPeer::SESSION_NAME);
}
const COUNT = 'COUNT(PMOAUTH_USER_ACCESS_TOKENS.ACCESS_TOKEN)';

8
workflow/engine/classes/model/om/BaseProcess.php
View File

@@ -1038,6 +1038,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [pro_update_date] from input: " .
var_export($v, true));
@@ -1063,6 +1067,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [pro_create_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseProcessFiles.php
View File

@@ -401,6 +401,10 @@ abstract class BaseProcessFiles extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [prf_create_date] from input: " .
var_export($v, true));
@@ -426,6 +430,10 @@ abstract class BaseProcessFiles extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [prf_update_date] from input: " .
var_export($v, true));

4
workflow/engine/classes/model/om/BaseReportTable.php
View File

@@ -341,6 +341,10 @@ abstract class BaseReportTable extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [rep_tab_create_date] from input: " .
var_export($v, true));

4
workflow/engine/classes/model/om/BaseShadowTable.php
View File

@@ -324,6 +324,10 @@ abstract class BaseShadowTable extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [shd_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseSubApplication.php
View File

@@ -401,6 +401,10 @@ abstract class BaseSubApplication extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [sa_init_date] from input: " .
var_export($v, true));
@@ -426,6 +430,10 @@ abstract class BaseSubApplication extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [sa_finish_date] from input: " .
var_export($v, true));

4
workflow/engine/classes/model/om/BaseTranslation.php
View File

@@ -246,6 +246,10 @@ abstract class BaseTranslation extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [trn_update_date] from input: " .
var_export($v, true));

16
workflow/engine/classes/model/om/BaseUsers.php
View File

@@ -710,6 +710,10 @@ abstract class BaseUsers extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [usr_due_date] from input: " .
var_export($v, true));
@@ -735,6 +739,10 @@ abstract class BaseUsers extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [usr_create_date] from input: " .
var_export($v, true));
@@ -760,6 +768,10 @@ abstract class BaseUsers extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [usr_update_date] from input: " .
var_export($v, true));
@@ -1049,6 +1061,10 @@ abstract class BaseUsers extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [usr_birthday] from input: " .
var_export($v, true));

4
workflow/engine/classes/model/om/BaseUsersProperties.php
View File

@@ -163,6 +163,10 @@ abstract class BaseUsersProperties extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [usr_last_update_date] from input: " .
var_export($v, true));

8
workflow/engine/classes/model/om/BaseWebEntry.php
View File

@@ -518,6 +518,10 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [we_create_date] from input: " .
var_export($v, true));
@@ -543,6 +547,10 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
if ($v !== null && !is_int($v)) {
$ts = strtotime($v);
//Date/time accepts null values
if ($v == '') {
$ts = null;
}
if ($ts === -1 || $ts === false) {
throw new PropelException("Unable to parse date/time value for [we_update_date] from input: " .
var_export($v, true));

5
workflow/engine/config/schema.xml
View File

@@ -3080,7 +3080,7 @@
<column name="USR_UID" type="VARCHAR" size="32" default="" />
<column name="WE_METHOD" type="VARCHAR" size="4" default="HTML" />
<column name="WE_INPUT_DOCUMENT_ACCESS" type="INTEGER" default="0" />
<column name="WE_DATA" type="LONGVARCHAR" default="" />
<column name="WE_DATA" type="LONGVARCHAR" />
<column name="WE_CREATE_USR_UID" type="VARCHAR" size="32" default="" required="true" />
<column name="WE_UPDATE_USR_UID" type="VARCHAR" size="32" default="" />
<column name="WE_CREATE_DATE" type="TIMESTAMP" required="true" />
@@ -3203,7 +3203,8 @@
<column name="ACCESS_TOKEN" type="VARCHAR" size="40" required="true" primaryKey="true" />
<column name="REFRESH_TOKEN" type="VARCHAR" size="40" required="true" />
<column name="USER_ID" type="VARCHAR" size="32" required="false" />
<column name="SESSION_ID" type="VARCHAR" size="40" required="true" />
<column name="SESSION_ID" type="VARCHAR" size="64" required="true" />
<column name="SESSION_NAME" type="VARCHAR" size="64" required="true" />
</table>
<!--

88
workflow/engine/data/mysql/schema.sql
View File

@@ -785,8 +785,8 @@ CREATE TABLE `DB_SOURCE`
`DBS_PASSWORD` VARCHAR(32) default '',
`DBS_PORT` INTEGER default 0,
`DBS_ENCODE` VARCHAR(32) default '',
`DBS_CONNECTION_TYPE` VARCHAR(32) default 'NORMAL',
`DBS_TNS` VARCHAR(256) default '',
`DBS_CONNECTION_TYPE` VARCHAR(32) default 'NORMAL',
`DBS_TNS` VARCHAR(256) default '',
PRIMARY KEY (`DBS_UID`,`PRO_UID`),
KEY `indexDBSource`(`PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='DB_SOURCE';
@@ -1476,7 +1476,7 @@ CREATE TABLE `SESSION_STORAGE`
`CLIENT_ADDRESS` VARCHAR(32) default '0.0.0.0',
PRIMARY KEY (`ID`),
KEY `indexSessionStorage`(`ID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- PROCESS_FILES
#-----------------------------------------------------------------------------
@@ -1497,31 +1497,29 @@ CREATE TABLE `PROCESS_FILES`
`PRF_UPDATE_DATE` DATETIME,
PRIMARY KEY (`PRF_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Application files metadata';
#-----------------------------------------------------------------------------
#-- WEB_ENTRY
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS WEB_ENTRY;
DROP TABLE IF EXISTS `WEB_ENTRY`;
CREATE TABLE WEB_ENTRY
CREATE TABLE `WEB_ENTRY`
(
WE_UID VARCHAR(32) NOT NULL,
PRO_UID VARCHAR(32) NOT NULL,
TAS_UID VARCHAR(32) NOT NULL,
DYN_UID VARCHAR(32) NOT NULL,
USR_UID VARCHAR(32) DEFAULT '',
WE_METHOD VARCHAR(4) DEFAULT 'HTML',
WE_INPUT_DOCUMENT_ACCESS INTEGER DEFAULT 0,
WE_DATA MEDIUMTEXT,
WE_CREATE_USR_UID VARCHAR(32) DEFAULT '' NOT NULL,
WE_UPDATE_USR_UID VARCHAR(32) DEFAULT '',
WE_CREATE_DATE DATETIME NOT NULL,
WE_UPDATE_DATE DATETIME,
PRIMARY KEY (WE_UID)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
`WE_UID` VARCHAR(32) NOT NULL,
`PRO_UID` VARCHAR(32) NOT NULL,
`TAS_UID` VARCHAR(32) NOT NULL,
`DYN_UID` VARCHAR(32) NOT NULL,
`USR_UID` VARCHAR(32) default '',
`WE_METHOD` VARCHAR(4) default 'HTML',
`WE_INPUT_DOCUMENT_ACCESS` INTEGER default 0,
`WE_DATA` MEDIUMTEXT,
`WE_CREATE_USR_UID` VARCHAR(32) default '' NOT NULL,
`WE_UPDATE_USR_UID` VARCHAR(32) default '',
`WE_CREATE_DATE` DATETIME NOT NULL,
`WE_UPDATE_DATE` DATETIME,
PRIMARY KEY (`WE_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- OAUTH_ACCESS_TOKENS
#-----------------------------------------------------------------------------
@@ -1537,7 +1535,7 @@ CREATE TABLE `OAUTH_ACCESS_TOKENS`
`EXPIRES` DATETIME NOT NULL,
`SCOPE` VARCHAR(2000),
PRIMARY KEY (`ACCESS_TOKEN`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- OAUTH_AUTHORIZATION_CODES
#-----------------------------------------------------------------------------
@@ -1554,7 +1552,7 @@ CREATE TABLE `OAUTH_AUTHORIZATION_CODES`
`EXPIRES` DATETIME NOT NULL,
`SCOPE` VARCHAR(2000),
PRIMARY KEY (`AUTHORIZATION_CODE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- OAUTH_CLIENTS
#-----------------------------------------------------------------------------
@@ -1572,7 +1570,7 @@ CREATE TABLE `OAUTH_CLIENTS`
`REDIRECT_URI` VARCHAR(2000) NOT NULL,
`USR_UID` VARCHAR(32) NOT NULL,
PRIMARY KEY (`CLIENT_ID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- OAUTH_REFRESH_TOKENS
#-----------------------------------------------------------------------------
@@ -1588,7 +1586,7 @@ CREATE TABLE `OAUTH_REFRESH_TOKENS`
`EXPIRES` DATETIME NOT NULL,
`SCOPE` VARCHAR(2000),
PRIMARY KEY (`REFRESH_TOKEN`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- OAUTH_SCOPES
#-----------------------------------------------------------------------------
@@ -1601,7 +1599,7 @@ CREATE TABLE `OAUTH_SCOPES`
`TYPE` VARCHAR(40) NOT NULL,
`SCOPE` VARCHAR(2000),
`CLIENT_ID` VARCHAR(80)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- PMOAUTH_USER_ACCESS_TOKENS
#-----------------------------------------------------------------------------
@@ -1614,9 +1612,10 @@ CREATE TABLE `PMOAUTH_USER_ACCESS_TOKENS`
`ACCESS_TOKEN` VARCHAR(40) NOT NULL,
`REFRESH_TOKEN` VARCHAR(40) NOT NULL,
`USER_ID` VARCHAR(32),
`SESSION_ID` VARCHAR(40) NOT NULL,
`SESSION_ID` VARCHAR(64) NOT NULL,
`SESSION_NAME` VARCHAR(64) NOT NULL,
PRIMARY KEY (`ACCESS_TOKEN`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_PROJECT
#-----------------------------------------------------------------------------
@@ -1641,7 +1640,7 @@ CREATE TABLE `BPMN_PROJECT`
`PRJ_ORIGINAL_SOURCE` MEDIUMTEXT,
PRIMARY KEY (`PRJ_UID`),
KEY `BPMN_PROJECT_I_1`(`PRJ_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_PROCESS
#-----------------------------------------------------------------------------
@@ -1665,7 +1664,7 @@ CREATE TABLE `BPMN_PROCESS`
CONSTRAINT `fk_bpmn_process_project`
FOREIGN KEY (`PRJ_UID`)
REFERENCES `BPMN_PROJECT` (`PRJ_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_ACTIVITY
#-----------------------------------------------------------------------------
@@ -1715,7 +1714,7 @@ CREATE TABLE `BPMN_ACTIVITY`
CONSTRAINT `fk_bpmn_activity_process`
FOREIGN KEY (`PRO_UID`)
REFERENCES `BPMN_PROCESS` (`PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_ARTIFACT
#-----------------------------------------------------------------------------
@@ -1741,7 +1740,7 @@ CREATE TABLE `BPMN_ARTIFACT`
CONSTRAINT `fk_bpmn_artifact_process`
FOREIGN KEY (`PRO_UID`)
REFERENCES `BPMN_PROCESS` (`PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_DIAGRAM
#-----------------------------------------------------------------------------
@@ -1761,7 +1760,7 @@ CREATE TABLE `BPMN_DIAGRAM`
CONSTRAINT `fk_bpmn_diagram_project`
FOREIGN KEY (`PRJ_UID`)
REFERENCES `BPMN_PROJECT` (`PRJ_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_BOUND
#-----------------------------------------------------------------------------
@@ -1794,7 +1793,7 @@ CREATE TABLE `BPMN_BOUND`
CONSTRAINT `fk_bpmn_bound_diagram`
FOREIGN KEY (`DIA_UID`)
REFERENCES `BPMN_DIAGRAM` (`DIA_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_DATA
#-----------------------------------------------------------------------------
@@ -1826,7 +1825,7 @@ CREATE TABLE `BPMN_DATA`
CONSTRAINT `fk_bpmn_data_project`
FOREIGN KEY (`PRJ_UID`)
REFERENCES `BPMN_PROJECT` (`PRJ_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_EVENT
#-----------------------------------------------------------------------------
@@ -1869,7 +1868,7 @@ CREATE TABLE `BPMN_EVENT`
CONSTRAINT `fk_bpmn_event_process`
FOREIGN KEY (`PRO_UID`)
REFERENCES `BPMN_PROCESS` (`PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_FLOW
#-----------------------------------------------------------------------------
@@ -1907,7 +1906,7 @@ CREATE TABLE `BPMN_FLOW`
CONSTRAINT `fk_bpmn_flow_diagram`
FOREIGN KEY (`DIA_UID`)
REFERENCES `BPMN_DIAGRAM` (`DIA_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_GATEWAY
#-----------------------------------------------------------------------------
@@ -1938,7 +1937,7 @@ CREATE TABLE `BPMN_GATEWAY`
CONSTRAINT `fk_bpmn_gateway_process`
FOREIGN KEY (`PRO_UID`)
REFERENCES `BPMN_PROCESS` (`PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_LANESET
#-----------------------------------------------------------------------------
@@ -1965,7 +1964,7 @@ CREATE TABLE `BPMN_LANESET`
CONSTRAINT `fk_bpmn_laneset_process`
FOREIGN KEY (`PRO_UID`)
REFERENCES `BPMN_PROCESS` (`PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_LANE
#-----------------------------------------------------------------------------
@@ -1991,7 +1990,7 @@ CREATE TABLE `BPMN_LANE`
CONSTRAINT `fk_bpmn_lane_laneset`
FOREIGN KEY (`LNS_UID`)
REFERENCES `BPMN_LANESET` (`LNS_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_PARTICIPANT
#-----------------------------------------------------------------------------
@@ -2016,7 +2015,7 @@ CREATE TABLE `BPMN_PARTICIPANT`
CONSTRAINT `fk_bpmn_participant_project`
FOREIGN KEY (`PRJ_UID`)
REFERENCES `BPMN_PROJECT` (`PRJ_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_EXTENSION
#-----------------------------------------------------------------------------
@@ -2037,7 +2036,7 @@ CREATE TABLE `BPMN_EXTENSION`
CONSTRAINT `fk_bpmn_extension_project`
FOREIGN KEY (`PRJ_UID`)
REFERENCES `BPMN_PROJECT` (`PRJ_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' ;
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- BPMN_DOCUMENTATION
#-----------------------------------------------------------------------------
@@ -2058,7 +2057,6 @@ CREATE TABLE `BPMN_DOCUMENTATION`
CONSTRAINT `fk_bpmn_documentation_project`
FOREIGN KEY (`PRJ_UID`)
REFERENCES `BPMN_PROJECT` (`PRJ_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;

31
workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
View File

@@ -163,6 +163,7 @@ class Server implements iAuthenticate
$token = $response->getParameters();
if (array_key_exists('access_token', $token)) {
session_start();
$data = $this->storage->getAccessToken($token['access_token']);
// verify if the client is our local PM Designer client
@@ -175,6 +176,7 @@ class Server implements iAuthenticate
$userToken->setRefreshToken($token['refresh_token']);
$userToken->setUserId($data['user_id']);
$userToken->setSessionId(session_id());
$userToken->setSessionName(session_name());
$userToken->save();
}
@@ -196,16 +198,29 @@ class Server implements iAuthenticate
$allowed = $this->server->verifyResourceRequest($request);
$token = $this->server->getAccessTokenData($request);
self::$userId = $token['user_id'];
// Session handling to prevent session lose in other places like, home, admin, etc
// when user is using the new designer that have not session because it is using only the API
// verify if the client is not our local PM Designer client
if ($token['client_id'] != self::getPmClientId()) {
//return $allowed;
}
if ($allowed && $token['client_id'] == self::getPmClientId()) {
// making a local session verification for PM Web Designer Client
if (! isset($_SESSION) || ! array_key_exists('USER_LOGGED', $_SESSION)) {
//return false;
$pmAccessToken = new \PmoauthUserAccessTokens();
$session = $pmAccessToken->getSessionData($token['ACCESS_TOKEN']);
if ($session !== false) {
// increase the timeout for local php session cookie
$config = \Bootstrap::getSystemConfiguration();
if (isset($config['session.gc_maxlifetime'])) {
$lifetime = $config['session.gc_maxlifetime'];
} else {
$lifetime = ini_get('session.gc_maxlifetime');
}
if (empty($lifetime)) {
$lifetime = 1440;
}
setcookie($session->getSessionName(), $_COOKIE[$session->getSessionId()], time() + $lifetime, "/");
}
}
return $allowed;