Automatic merge with the upstream master branch

This commit is contained in:
Gustavo Cruz
2012-11-29 12:18:58 -04:00
144 changed files with 6902 additions and 2234 deletions

View File

@@ -4,7 +4,7 @@
* @package workflow.engine.classes.model
*/
require_once ('classes/model/om/BaseAppCacheView.php');
//require_once ('classes/model/om/BaseAppCacheView.php');
/**
@@ -18,11 +18,11 @@ require_once ('classes/model/om/BaseAppCacheView.php');
*
*/
require_once ('classes/model/Application.php');
require_once ('classes/model/AppDelegation.php');
require_once ('classes/model/AppDelay.php');
require_once ('classes/model/Task.php');
require_once ('classes/model/AdditionalTables.php');
//require_once ('classes/model/Application.php');
//require_once ('classes/model/AppDelegation.php');
//require_once ('classes/model/AppDelay.php');
//require_once ('classes/model/Task.php');
//require_once ('classes/model/AdditionalTables.php');
/**

View File

@@ -4,7 +4,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseAppDelay.php';
//require_once 'classes/model/om/BaseAppDelay.php';
/**

View File

@@ -25,11 +25,11 @@
*
*/
require_once 'classes/model/om/BaseAppDelegation.php';
require_once ("classes/model/HolidayPeer.php");
require_once ("classes/model/TaskPeer.php");
require_once ("classes/model/Task.php");
G::LoadClass( "dates" );
//require_once 'classes/model/om/BaseAppDelegation.php';
//require_once ("classes/model/HolidayPeer.php");
//require_once ("classes/model/TaskPeer.php");
//require_once ("classes/model/Task.php");
//G::LoadClass( "dates" );
/**
* Skeleton subclass for representing a row from the 'APP_DELEGATION' table.

View File

@@ -25,9 +25,9 @@
*
*/
require_once 'classes/model/om/BaseAppDocument.php';
require_once 'classes/model/Content.php';
require_once 'classes/model/InputDocument.php';
//require_once 'classes/model/om/BaseAppDocument.php';
//require_once 'classes/model/Content.php';
//require_once 'classes/model/InputDocument.php';
/**
* Skeleton subclass for representing a row from the 'APP_DOCUMENT' table.

View File

@@ -5,7 +5,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseAppEvent.php';
//require_once 'classes/model/om/BaseAppEvent.php';
/**
* Skeleton subclass for representing a row from the 'APP_EVENT' table.

View File

@@ -5,8 +5,8 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseAppFolder.php';
require_once 'classes/model/Application.php';
//require_once 'classes/model/om/BaseAppFolder.php';
//require_once 'classes/model/Application.php';
/**
* Skeleton subclass for representing a row from the 'APP_FOLDER' table.

View File

@@ -4,7 +4,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseAppHistory.php';
//require_once 'classes/model/om/BaseAppHistory.php';
/**

View File

@@ -23,7 +23,7 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
require_once 'classes/model/om/BaseAppMessage.php';
//require_once 'classes/model/om/BaseAppMessage.php';
/**
* Skeleton subclass for representing a row from the 'APP_MESSAGE' table.
@@ -120,5 +120,13 @@ class AppMessage extends BaseAppMessage
return $this->getAppMsgUid();
}
}
public function updateStatus($msgUid, $msgStatus)
{
$message = AppMessagePeer::retrieveByPk( $msgUid );
$message->fromArray( $message, BasePeer::TYPE_FIELDNAME );
$message->setAppMsgStatus($msgStatus);
$message->save();
}
}

View File

@@ -25,10 +25,10 @@
*/
// include base peer class
require_once 'classes/model/om/BaseAppMessagePeer.php';
//require_once 'classes/model/om/BaseAppMessagePeer.php';
// include object class
include_once 'classes/model/AppMessage.php';
//include_once 'classes/model/AppMessage.php';
/**

View File

@@ -1,6 +1,6 @@
<?php
require_once 'classes/model/om/BaseAppNotes.php';
//require_once 'classes/model/om/BaseAppNotes.php';
/**
* Skeleton subclass for representing a row from the 'APP_NOTES' table.
@@ -217,10 +217,10 @@ class AppNotes extends BaseAppNotes
$sTo = ((($aUser['USR_FIRSTNAME'] != '') || ($aUser['USR_LASTNAME'] != '')) ? $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' ' : '') . '<' . $aUser['USR_EMAIL'] . '>';
$oSpool = new spoolRun();
if ($aConfiguration['MESS_RAUTH'] == false || (is_string($aConfiguration['MESS_RAUTH']) && $aConfiguration['MESS_RAUTH'] == 'false')) {
$aConfiguration['MESS_RAUTH'] = 0;
} else {
$aConfiguration['MESS_RAUTH'] = 1;
if ($aConfiguration['MESS_RAUTH'] == false || (is_string($aConfiguration['MESS_RAUTH']) && $aConfiguration['MESS_RAUTH'] == 'false')) {
$aConfiguration['MESS_RAUTH'] = 0;
} else {
$aConfiguration['MESS_RAUTH'] = 1;
}
$oSpool->setConfig( array ('MESS_ENGINE' => $aConfiguration['MESS_ENGINE'],'MESS_SERVER' => $aConfiguration['MESS_SERVER'],'MESS_PORT' => $aConfiguration['MESS_PORT'],'MESS_ACCOUNT' => $aConfiguration['MESS_ACCOUNT'],'MESS_PASSWORD' => $aConfiguration['MESS_PASSWORD'],'SMTPAuth' => $aConfiguration['MESS_RAUTH'] == '1' ? true : false,'SMTPSecure' => isset( $aConfiguration['SMTPSecure'] ) ? $aConfiguration['SMTPSecure'] : '') );
@@ -235,5 +235,30 @@ class AppNotes extends BaseAppNotes
throw $oException;
}
}
public function addCaseNote($applicationUid, $userUid, $note, $sendMail)
{
$response = $this->postNewNote($applicationUid, $userUid, $note, false);
if ($sendMail == 1) {
G::LoadClass("case");
$case = new Cases();
$p = $case->getUsersParticipatedInCase($applicationUid);
$noteRecipientsList = array();
foreach ($p["array"] as $key => $userParticipated) {
$noteRecipientsList[] = $key;
}
$noteRecipients = implode(",", $noteRecipientsList);
$note = stripslashes($note);
$this->sendNoteNotification($applicationUid, $userUid, $note, $noteRecipients);
}
return $response;
}
}

View File

@@ -24,7 +24,7 @@
*
*/
require_once 'classes/model/om/BaseAppOwner.php';
//require_once 'classes/model/om/BaseAppOwner.php';
/**

View File

@@ -1,7 +1,7 @@
<?php
require_once 'classes/model/om/BaseAppSolrQueue.php';
require_once 'classes/entities/AppSolrQueue.php';
//require_once 'classes/model/om/BaseAppSolrQueue.php';
//require_once 'classes/entities/AppSolrQueue.php';
/**
* Skeleton subclass for representing a row from the 'APP_SOLR_QUEUE' table.

View File

@@ -24,7 +24,7 @@
*
*/
require_once 'classes/model/om/BaseAppThread.php';
//require_once 'classes/model/om/BaseAppThread.php';
/**

View File

@@ -24,8 +24,8 @@
*
*/
require_once ('classes/model/om/BaseApplication.php');
require_once ('classes/model/Content.php');
//require_once ('classes/model/om/BaseApplication.php');
//require_once ('classes/model/Content.php');
/**

View File

@@ -5,10 +5,10 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseCaseScheduler.php';
//require_once 'classes/model/om/BaseCaseScheduler.php';
require_once 'classes/model/Process.php';
require_once 'classes/model/Task.php';
//require_once 'classes/model/Process.php';
//require_once 'classes/model/Task.php';
/**
* Skeleton subclass for representing a row from the 'CASE_SCHEDULER' table.

View File

@@ -5,7 +5,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseCaseTracker.php';
//require_once 'classes/model/om/BaseCaseTracker.php';
/**
* Skeleton subclass for representing a row from the 'CASE_TRACKER' table.

View File

@@ -5,7 +5,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseCaseTrackerObject.php';
//require_once 'classes/model/om/BaseCaseTrackerObject.php';
/**
* Skeleton subclass for representing a row from the 'CASE_TRACKER_OBJECT' table.

View File

@@ -24,8 +24,8 @@
*
*/
require_once 'classes/model/om/BaseConfiguration.php';
require_once 'classes/model/Content.php';
//require_once 'classes/model/om/BaseConfiguration.php';
//require_once 'classes/model/Content.php';
/**

View File

@@ -25,7 +25,7 @@
*
*/
require_once 'classes/model/om/BaseContent.php';
//require_once 'classes/model/om/BaseContent.php';
/**
* Skeleton subclass for representing a row from the 'CONTENT' table.

View File

@@ -25,10 +25,10 @@
*/
// include base peer class
require_once 'classes/model/om/BaseContentPeer.php';
//require_once 'classes/model/om/BaseContentPeer.php';
// include object class
include_once 'classes/model/Content.php';
//include_once 'classes/model/Content.php';
/**

View File

@@ -24,8 +24,8 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
require_once 'classes/model/Content.php';
require_once 'classes/model/om/BaseDbSource.php';
//require_once 'classes/model/Content.php';
//require_once 'classes/model/om/BaseDbSource.php';
/**
* Skeleton subclass for representing a row from the 'DB_SOURCE' table.

View File

@@ -25,10 +25,10 @@
*
*/
require_once 'classes/model/om/BaseDynaform.php';
require_once 'classes/model/Content.php';
require_once ('classes/model/AdditionalTables.php');
G::LoadClass( 'dynaFormField' );
//require_once 'classes/model/om/BaseDynaform.php';
//require_once 'classes/model/Content.php';
//require_once ('classes/model/AdditionalTables.php');
//G::LoadClass( 'dynaFormField' );
/**
* Skeleton subclass for representing a row from the 'DYNAFORM' table.

View File

@@ -5,8 +5,8 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/Content.php';
require_once 'classes/model/om/BaseEvent.php';
//require_once 'classes/model/Content.php';
//require_once 'classes/model/om/BaseEvent.php';
/**
* Skeleton subclass for representing a row from the 'EVENT' table.
@@ -18,9 +18,9 @@ require_once 'classes/model/om/BaseEvent.php';
* long as it does not already exist in the output directory.
*/
require_once 'classes/model/AppDelegation.php';
require_once 'classes/model/AppEvent.php';
require_once 'classes/model/Triggers.php';
//require_once 'classes/model/AppDelegation.php';
//require_once 'classes/model/AppEvent.php';
//require_once 'classes/model/Triggers.php';
/**
*

View File

@@ -4,8 +4,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseFields.php';
//require_once 'classes/model/om/BaseFields.php';
/**
* Skeleton subclass for representing a row from the 'FIELDS' table.

View File

@@ -5,7 +5,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseGateway.php';
//require_once 'classes/model/om/BaseGateway.php';
/**
* Skeleton subclass for representing a row from the 'GATEWAY' table.

View File

@@ -25,10 +25,10 @@
*
*/
require_once 'classes/model/om/BaseGroupUser.php';
require_once 'classes/model/Content.php';
require_once 'classes/model/Users.php';
require_once 'classes/model/Groupwf.php';
//require_once 'classes/model/om/BaseGroupUser.php';
//require_once 'classes/model/Content.php';
//require_once 'classes/model/Users.php';
//require_once 'classes/model/Groupwf.php';
/**
* Skeleton subclass for representing a row from the 'GROUP_USER' table.

View File

@@ -25,8 +25,8 @@
*
*/
require_once 'classes/model/om/BaseInputDocument.php';
require_once 'classes/model/Content.php';
//require_once 'classes/model/om/BaseInputDocument.php';
//require_once 'classes/model/Content.php';
/**
* Skeleton subclass for representing a row from the 'INPUT_DOCUMENT' table.

View File

@@ -25,10 +25,10 @@
*/
// include base peer class
require_once 'classes/model/om/BaseInputDocumentPeer.php';
//require_once 'classes/model/om/BaseInputDocumentPeer.php';
// include object class
include_once 'classes/model/InputDocument.php';
//include_once 'classes/model/InputDocument.php';
/**

View File

@@ -24,7 +24,7 @@
*
*/
require_once 'classes/model/om/BaseIsoCountry.php';
//require_once 'classes/model/om/BaseIsoCountry.php';
/**

View File

@@ -24,7 +24,7 @@
*
*/
require_once 'classes/model/om/BaseIsoLocation.php';
//require_once 'classes/model/om/BaseIsoLocation.php';
/**

View File

@@ -24,7 +24,7 @@
*
*/
require_once 'classes/model/om/BaseIsoSubdivision.php';
//require_once 'classes/model/om/BaseIsoSubdivision.php';
/**

View File

@@ -25,11 +25,11 @@
*
*/
require_once 'classes/model/om/BaseLanguage.php';
//require_once 'classes/model/om/BaseLanguage.php';
require_once 'classes/model/Content.php';
require_once 'classes/model/IsoCountry.php';
require_once 'classes/model/Translation.php';
//require_once 'classes/model/Content.php';
//require_once 'classes/model/IsoCountry.php';
//require_once 'classes/model/Translation.php';
/**
* Skeleton subclass for representing a row from the 'LANGUAGE' table.

View File

@@ -4,7 +4,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseLogCasesScheduler.php';
//require_once 'classes/model/om/BaseLogCasesScheduler.php';
/**

View File

@@ -5,7 +5,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseObjectPermission.php';
//require_once 'classes/model/om/BaseObjectPermission.php';
/**
* Skeleton subclass for representing a row from the 'OBJECT_PERMISSION' table.

View File

@@ -24,8 +24,8 @@
*
*/
require_once ("classes/model/om/BaseOutputDocument.php");
require_once ("classes/model/Content.php");
//require_once ("classes/model/om/BaseOutputDocument.php");
//require_once ("classes/model/Content.php");
/**
* Skeleton subclass for representing a row from the 'OUTPUT_DOCUMENT' table.

View File

@@ -25,9 +25,9 @@
*
*/
require_once 'classes/model/om/BaseProcess.php';
require_once 'classes/model/Content.php';
require_once 'classes/model/ProcessCategory.php';
//require_once 'classes/model/om/BaseProcess.php';
//require_once 'classes/model/Content.php';
//require_once 'classes/model/ProcessCategory.php';
/**
* Skeleton subclass for representing a row from the 'PROCESS' table.

View File

@@ -4,7 +4,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseProcessCategory.php';
//require_once 'classes/model/om/BaseProcessCategory.php';
/**
* Skeleton subclass for representing a row from the 'PROCESS_CATEGORY' table.

View File

@@ -4,7 +4,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseProcessUser.php';
//require_once 'classes/model/om/BaseProcessUser.php';
/**

View File

@@ -25,8 +25,8 @@
*
*/
require_once 'classes/model/Content.php';
require_once 'classes/model/om/BaseReportTable.php';
//require_once 'classes/model/Content.php';
//require_once 'classes/model/om/BaseReportTable.php';
/**
* Skeleton subclass for representing a row from the 'REPORT_TABLE' table.

View File

@@ -5,7 +5,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseReportVar.php';
//require_once 'classes/model/om/BaseReportVar.php';
/**
* Skeleton subclass for representing a row from the 'REPORT_VAR' table.

View File

@@ -25,8 +25,8 @@
*
*/
require_once 'classes/model/om/BaseRoute.php';
require_once 'classes/model/Content.php';
//require_once 'classes/model/om/BaseRoute.php';
//require_once 'classes/model/Content.php';
/**
* Skeleton subclass for representing a row from the 'ROUTE' table.

View File

@@ -25,7 +25,7 @@
*
*/
require_once 'classes/model/om/BaseStep.php';
//require_once 'classes/model/om/BaseStep.php';
/**
* Skeleton subclass for representing a row from the 'STEP' table.

View File

@@ -5,7 +5,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseStepSupervisor.php';
//require_once 'classes/model/om/BaseStepSupervisor.php';
/**
* Skeleton subclass for representing a row from the 'STEP_SUPERVISOR' table.

View File

@@ -5,10 +5,10 @@
*/
// include base peer class
require_once 'classes/model/om/BaseStepSupervisorPeer.php';
//require_once 'classes/model/om/BaseStepSupervisorPeer.php';
// include object class
include_once 'classes/model/StepSupervisor.php';
//include_once 'classes/model/StepSupervisor.php';
/**

View File

@@ -25,7 +25,7 @@
*
*/
require_once 'classes/model/om/BaseStepTrigger.php';
//require_once 'classes/model/om/BaseStepTrigger.php';
/**
* Skeleton subclass for representing a row from the 'STEP_TRIGGER' table.

View File

@@ -4,7 +4,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseSubApplication.php';
//require_once 'classes/model/om/BaseSubApplication.php';
/**

View File

@@ -5,7 +5,7 @@
* @package workflow.engine.classes.model
*/
require_once 'classes/model/om/BaseSubProcess.php';
//require_once 'classes/model/om/BaseSubProcess.php';
/**
* Skeleton subclass for representing a row from the 'SUB_PROCESS' table.

View File

@@ -25,8 +25,8 @@
*
*/
require_once 'classes/model/om/BaseSwimlanesElements.php';
require_once 'classes/model/Content.php';
//require_once 'classes/model/om/BaseSwimlanesElements.php';
//require_once 'classes/model/Content.php';
/**
* Skeleton subclass for representing a row from the 'SWIMLANES_ELEMENTS' table.

View File

@@ -25,10 +25,10 @@
*/
// include base peer class
require_once 'classes/model/om/BaseSwimlanesElementsPeer.php';
//require_once 'classes/model/om/BaseSwimlanesElementsPeer.php';
// include object class
include_once 'classes/model/SwimlanesElements.php';
//include_once 'classes/model/SwimlanesElements.php';
/**

View File

@@ -1,6 +1,6 @@
<?php
require_once 'classes/model/om/BaseTask.php';
require_once 'classes/model/Content.php';
//require_once 'classes/model/om/BaseTask.php';
//require_once 'classes/model/Content.php';
/**

View File

@@ -25,8 +25,8 @@
*
*/
require_once 'classes/model/om/BaseTaskUser.php';
require_once 'classes/model/Content.php';
//require_once 'classes/model/om/BaseTaskUser.php';
//require_once 'classes/model/Content.php';
/**
* Skeleton subclass for representing a row from the 'GROUP_USER' table.

View File

@@ -25,7 +25,7 @@
*
*/
require_once 'classes/model/om/BaseTranslation.php';
//require_once 'classes/model/om/BaseTranslation.php';
/**
* Skeleton subclass for representing a row from the 'TRANSLATION' table.

View File

@@ -24,8 +24,8 @@
*
*/
require_once 'classes/model/Content.php';
require_once 'classes/model/om/BaseTriggers.php';
//require_once 'classes/model/Content.php';
//require_once 'classes/model/om/BaseTriggers.php';
/**

View File

@@ -25,10 +25,10 @@
*/
// include base peer class
require_once 'classes/model/om/BaseTriggersPeer.php';
//require_once 'classes/model/om/BaseTriggersPeer.php';
// include object class
include_once 'classes/model/Triggers.php';
//include_once 'classes/model/Triggers.php';
/**

View File

@@ -25,10 +25,10 @@
*
*/
require_once 'classes/model/om/BaseUsers.php';
require_once 'classes/model/IsoCountry.php';
require_once 'classes/model/IsoSubdivision.php';
require_once 'classes/model/IsoLocation.php';
//require_once 'classes/model/om/BaseUsers.php';
//require_once 'classes/model/IsoCountry.php';
//require_once 'classes/model/IsoSubdivision.php';
//require_once 'classes/model/IsoLocation.php';
/**
* Skeleton subclass for representing a row from the 'USERS' table.