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

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Ralph Asendeteufrer
2012-10-08 16:31:04 -04:00
parent 43939268ce d191835d9e
commit 832e516ec5
271 changed files with 115071 additions and 110294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gulliver/js/form/core/form.js
View File

@@ -3409,7 +3409,7 @@ function putFieldNumericValue(elem, num, mask, decimalSeparator)
var strAux = maskNumber.split("").reverse().join("");
cont = 0;
pos = 0;
pos = -1;
for (i = 0; i <= strAux.length - 1; i++) {
if (strAux.charAt(i) == "#") {
@@ -3422,26 +3422,35 @@ function putFieldNumericValue(elem, num, mask, decimalSeparator)
}
}
var mask2 = strAux.substring(0, pos + 1);
var mask2 = "";
if (pos != -1) {
mask2 = strAux.substring(0, pos + 1);
mask2 = mask2.split("").reverse().join("");
} else {
mask1 = maskNumber;
}
maskNumber = mask1 + mask2;
}
var newNumber = putStringMask(n.split("").reverse().join(""), maskNumber.split("").reverse().join(""));
var newDecimal = putStringMask(d, maskDecimal);
newNumber = newNumber.split("").reverse().join("");
var newNumber = putStringMask(n, maskNumber, "reverse");
var newDecimal = putStringMask(d, maskDecimal, "forward");
elem.value = newNumber + decimalSeparator + newDecimal;
}
function putStringMask(str, mask)
function putStringMask(str, mask, dir)
{
var newStr = "";
var i1 = 0;
var i2 = 0;
if (dir == "reverse") {
str = str.split("").reverse().join("");
mask = mask.split("").reverse().join("");
}
for (i1 = 0; i1 <= mask.length - 1; i1++) {
switch (mask.charAt(i1)) {
case "#":
@@ -3460,6 +3469,10 @@ function putStringMask(str, mask)
}
}
if (dir == "reverse") {
newStr = newStr.split("").reverse().join("");
}
return newStr;
}

38
gulliver/js/grid/core/grid.js
View File

@@ -465,6 +465,9 @@ var G_Grid = function(oForm, sGridName){
eval('aObjects[n].onclick = ' + onclickevn.replace(/\[1\]/g, '\[' + currentRow + '\]') + ';');
}
break;
case "file":
aObjects[n].value = "";
break;
}
}
}
@@ -723,6 +726,10 @@ var G_Grid = function(oForm, sGridName){
var iRow = Number(sRow);
var iRowAux = iRow + 1;
var lastItem = oObj.oGrid.rows.length - 2;
var elem2ParentNode;
var elem2Id = "";
var elem2Name = "";
var elemAux;
deleteRowOnDynaform(oObj, iRow);
@@ -730,16 +737,40 @@ var G_Grid = function(oForm, sGridName){
for (i = 1; i < oObj.oGrid.rows[iRowAux - 1].cells.length; i++) {
var oCell1 = oObj.oGrid.rows[iRowAux - 1].cells[i];
var oCell2 = oObj.oGrid.rows[iRowAux].cells[i];
switch (oCell1.innerHTML.replace(/^\s+|\s+$/g, '').substr(0, 6).toLowerCase()){
case '<input':
aObjects1 = oCell1.getElementsByTagName('input');
aObjects2 = oCell2.getElementsByTagName('input');
if (aObjects1 && aObjects2) {
if(aObjects1[0].type=='checkbox'){
switch (aObjects2[0].type) {
case "file":
elem2ParentNode = aObjects2[0].parentNode;
elem2Id = aObjects2[0].id;
elem2Name = aObjects2[0].name;
aObjects2[0].id = aObjects1[0].id;
aObjects2[0].name = aObjects1[0].name;
aObjects1[0].parentNode.replaceChild(aObjects2[0], aObjects1[0]);
elemAux = document.createElement("input");
elemAux.type = "file";
elemAux.setAttribute("id", elem2Id);
elemAux.setAttribute("name", elem2Name);
elem2ParentNode.insertBefore(elemAux, elem2ParentNode.firstChild);
break;
default:
if (aObjects2[0].type == "checkbox") {
aObjects1[0].checked = aObjects2[0].checked;
}
aObjects1[0].value = aObjects2[0].value;
aObjects1[0].className = aObjects2[0].className;
break;
}
}
aObjects = oCell1.getElementsByTagName('div');
@@ -796,10 +827,11 @@ var G_Grid = function(oForm, sGridName){
}
break;
default:
if (( oCell2.innerHTML.indexOf('changeValues')==111 || oCell2.innerHTML.indexOf('changeValues')==115 ) ) {
if ((oCell2.innerHTML.indexOf("changeValues") == 111 || oCell2.innerHTML.indexOf("changeValues") == 115)) {
break;
}
if (oCell2.innerHTML.toLowerCase().indexOf('deletegridrow') == -1) {
if (oCell2.innerHTML.toLowerCase().indexOf("deletegridrow") == -1) {
oCell1.innerHTML = oCell2.innerHTML;
}
break;

124
gulliver/system/class.form.php
View File

@@ -47,6 +47,7 @@ class Form extends XmlForm
var $objectRequiredFields = null;
var $nextstepsave = '';
var $printdynaform = '';
var $adjustgridswidth = '0';
public $visual_frontend;
@@ -307,29 +308,29 @@ class Form extends XmlForm
switch($v->type){
case 'radiogroup':
$values[$k] = $newValues[$k];
$values["{$k}_label"] = $newValues["{$k}_label"] = $v->options[$newValues[$k]];
$values[$k . "_label"] = $newValues[$k . "_label"] = $v->options[$newValues[$k]];
break;
case 'suggest':
$values[$k] = $newValues[$k];
$values["{$k}_label"] = $newValues["{$k}_label"];
$values[$k . "_label"] = $newValues[$k . "_label"];
break;
case 'checkgroup':
case 'listbox':
if ( is_array($newValues[$k]) ) {
$values[$k] = $values["{$k}_label"] = '';
$values[$k] = $values[$k . "_label"] = null;
foreach ($newValues[$k] as $i => $value) {
//if $value is empty continue with the next loop, because this is a not selected/checked item
if (trim($value) == '') {
continue;
}
$values[$k] .= ($i != 0 ? '|': '') . $value;
$values[$k] .= (($i != 0)? "|" : null) . $value;
if (isset($v->options[$value])){
$values["{$k}_label"] .= ($i != 0 ? '|': '') . $v->options[$value];
$values[$k . "_label"] .= (($i != 0)? "|" : null) . $v->options[$value];
}
else { // if hasn't options try execute a sql sentence
$query = G::replaceDataField($this->fields[$k]->sql,$newValues);
@@ -345,7 +346,7 @@ class Form extends XmlForm
list($rowId, $rowContent) = array_values($rs->getRow());//This to be sure that the array is numeric. Some cases when is DBArray result it returns an associative. By JHL
if ($value == $rowId){
$values["{$k}_label"] .= ($i != 0 ? '|': '') . $rowContent;
$values[$k . "_label"] .= (($i != 0)? "|" : null) . $rowContent;
break;
}
}
@@ -353,10 +354,11 @@ class Form extends XmlForm
}
}
$newValues["{$k}_label"] = isset($values["{$k}_label"]) ? $values["{$k}_label"] : '';
$newValues[$k . "_label"] = (isset($values[$k . "_label"]))? $values[$k . "_label"] : null;
} else {
$values[$k] = $newValues[$k];
$values["{$k}_label"] = isset($newValues["{$k}_label"]) ? $newValues["{$k}_label"] : '';
$values[$k . "_label"] = (isset($newValues[$k . "_label"]))? $newValues[$k . "_label"] : null;
}
break;
@@ -364,7 +366,7 @@ class Form extends XmlForm
$values[$k] = $newValues[$k];
if (isset($v->options[$newValues[$k]])){
$values["{$k}_label"] = $newValues["{$k}_label"] = $v->options[$newValues[$k]];
$values[$k . "_label"] = $newValues[$k . "_label"] = $v->options[$newValues[$k]];
}
else {
$query = G::replaceDataField($this->fields[$k]->sql,$newValues);
@@ -381,7 +383,7 @@ class Form extends XmlForm
while ($rs->next()) {
list($rowId, $rowContent) = $rs->getRow();
if ($newValues[$k]==$rowId){
$values["{$k}_label"] = $rowContent;
$values[$k . "_label"] = $rowContent;
break;
}
}
@@ -391,47 +393,62 @@ class Form extends XmlForm
case 'grid':
foreach( $newValues[$k] as $j => $item ) {
if(is_array($item)){
$i=0;
$values[$k][$j] = $this->fields[$k]->maskValue( $newValues[$k][$j], $this );
foreach ($item as $kk => $vv) {
//we need to know which fields are dropdowns
if($this->fields[$k]->fields[$kk]->type == 'dropdown') {
if ($this->fields[$k]->fields[$kk]->type != "file") {
switch ($this->fields[$k]->fields[$kk]->type) {
case "dropdown":
//We need to know which fields are dropdowns
$values[$k][$j] = $newValues[$k][$j];
if ($this->fields[$k]->validateValue($newValues[$k][$j], $this)) {
// if the dropdown has otions
//If the dropdown has otions
if (isset($this->fields[$k]->fields[$kk]->options[$vv])) {
$values[$k][$j]["{$kk}_label"] = $newValues[$k][$j][$kk . '_label'] = $this->fields[$k]->fields[$kk]->options[$vv];
} else { // if hasn't options try execute a sql sentence
$values[$k][$j][$kk . "_label"] = $newValues[$k][$j][$kk . "_label"] = $this->fields[$k]->fields[$kk]->options[$vv];
} else {
//If hasn't options try execute a sql sentence
$query = G::replaceDataField($this->fields[$k]->fields[$kk]->sql,$values[$k][$j]);
$con = Propel::getConnection($this->fields[$k]->fields[$kk]->sqlConnection!=""?$this->fields[$k]->fields[$kk]->sqlConnection:"workflow");
$con = Propel::getConnection((!empty($this->fields[$k]->fields[$kk]->sqlConnection))? $this->fields[$k]->fields[$kk]->sqlConnection : "workflow");
$stmt = $con->prepareStatement($query);
// execute just if a query was set, it should be not empty
if(trim($query) == '') {
continue; //if it is empty string skip it
//Execute just if a query was set, it should be not empty
if (trim($query) == "") {
//if it is empty string skip it
continue;
}
$rs = $stmt->executeQuery(ResultSet::FETCHMODE_NUM);
while ($rs->next()) {
// from the query executed we only need certain elements
//From the query executed we only need certain elements
//note added by krlos pacha carlos[at]colosa[dot]com
//the following line has the correct values because the query return an associative array. Related 7945 bug
list($rowId, $rowContent) = explode(',',implode(',',$rs->getRow()));
list($rowId, $rowContent) = explode(",", implode(",", $rs->getRow()));
if ($vv == $rowId) {
$values[$k][$j]["{$kk}_label"] = $newValues[$k][$j][$kk. '_label'] = $rowContent;
$values[$k][$j][$kk . "_label"] = $newValues[$k][$j][$kk. "_label"] = $rowContent;
break;
}
}//end $rw->next() while
}
}
} else {
// if there are no dropdowns previously setted and the evaluated field is not a dropdown
}
break;
default:
//If there are no dropdowns previously setted and the evaluated field is not a dropdown
//only then rewritte the $values
$values[$k][$j] = $this->fields[$k]->maskValue($newValues[$k][$j], $this);
break;
}
} else {
if (isset($_FILES["form"]["name"][$k][$j][$kk])) {
$values[$k][$j][$kk] = $_FILES["form"]["name"][$k][$j][$kk];
}
if (isset($this->fields[$k]->fields[$kk]->input) && !empty($this->fields[$k]->fields[$kk]->input)) {
//$_POST["INPUTS"][$k][$j][$kk] = $this->fields[$k]->fields[$kk]->input;
$_POST["INPUTS"][$k][$kk] = $this->fields[$k]->fields[$kk]->input;
}
}
$i++;
}
} else {
$values[$k][$j] = $this->fields[$k]->maskValue( $newValues[$k][$j], $this );
@@ -446,20 +463,14 @@ class Form extends XmlForm
}
}
} else {
if (isset($_FILES["form"]["name"][$k])) {
$values[$k] = $_FILES["form"]["name"][$k];
}
else {
if (isset($_FILES['form']['name'][$k])) {
$values[$k] = $_FILES['form']['name'][$k];
if (isset($v->input) && !empty($v->input)) {
$_POST["INPUTS"][$k] = $v->input;
}
/**
* FIXED for multiple inputs documents related to file type field
* By Erik Amaru Ortiz <erik@colosa.com>
* Nov 24th, 2009
*/
if ( isset($v->input) && $v->input != ''){
$_POST['INPUTS'][$k] = $v->input;
}
/**/
}
}
}
@@ -469,6 +480,7 @@ class Form extends XmlForm
$values[$k] = $v;
}
}
return $values;
}
@@ -569,32 +581,40 @@ class Form extends XmlForm
return count($notPassedFields) > 0 ? $notPassedFields : false;
}
function validateFields($data) {
$values = array();
$excludeTypes = array('submit', 'file');
public function validateFields($data)
{
$excludeTypes = array("submit", "file");
foreach ($this->fields as $k => $v) {
if (!in_array($v->type, $excludeTypes)) {
switch ($v->type) {
case 'checkbox':
$data[$v->name] = isset($data[$v->name])? $data[$v->name] : $v->falseValue;
case "checkbox":
$data[$v->name] = (isset($data[$v->name]))? $data[$v->name] : ((isset($v->falseValue))? $v->falseValue : null);
break;
case 'grid':
case "grid":
$i = 0;
foreach ($data[$v->name] as $dataGrid) {
$i++;
foreach ($v->fields as $dataGridInt) {
switch($dataGridInt->type) {
case 'checkbox':
$data[$v->name][$i][$dataGridInt->name] = isset($data[$v->name][$i][$dataGridInt->name])? $data[$v->name][$i][$dataGridInt->name] : $dataGridInt->falseValue;
$i = $i + 1;
foreach ($v->fields as $gridField) {
switch ($gridField->type) {
case "file":
$data[$v->name][$i][$gridField->name] = (isset($_FILES["form"]["name"][$v->name][$i][$gridField->name]))? $_FILES["form"]["name"][$v->name][$i][$gridField->name] : ((isset($gridField->falseValue))? $gridField->falseValue : null);
break;
case "checkbox":
$data[$v->name][$i][$gridField->name] = (isset($data[$v->name][$i][$gridField->name]))? $data[$v->name][$i][$gridField->name] : ((isset($gridField->falseValue))? $gridField->falseValue : null);
break;
}
}
}
break;
default:
break;
}
}
}
return $data;
}
}

163
gulliver/system/class.xmlform.php
View File

@@ -2324,9 +2324,11 @@ class XmlForm_Field_Link extends XmlForm_Field {
* @package gulliver.system
* @access public
*/
class XmlForm_Field_File extends XmlForm_Field {
var $required = false;
var $input = '';
class XmlForm_Field_File extends XmlForm_Field
{
public $required = false;
public $input = null;
/**
* Function render
* @author David S. Callizaya S. <davidsantos@colosa.com>
@@ -2334,66 +2336,99 @@ class XmlForm_Field_File extends XmlForm_Field {
* @param string value
* @return string
*/
function render($value = NULL) {
public function render($value=null, $owner=null, $rowId=null, $row=-1, $therow=-1)
{
$permission = false;
$url = '';
if (isset($_SESSION['APPLICATION']) && isset($_SESSION['USER_LOGGED']) && isset($_SESSION['TASK']) && $this->mode == 'view') {
$url = null;
if (isset($_SESSION["APPLICATION"]) &&
isset($_SESSION["USER_LOGGED"]) &&
isset($_SESSION["TASK"]) &&
isset($this->input) && $this->input != null &&
$this->mode == "view"
) {
require_once ("classes/model/AppDocument.php");
G::LoadClass('case');
G::LoadClass("case");
$case = new Cases();
$fields = $case->loadCase($_SESSION['APPLICATION']);
$sProcessUID = $fields['PRO_UID'];
$permissions = $case->getAllObjects($sProcessUID, $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']);
$arrayField = $case->loadCase($_SESSION["APPLICATION"]);
$arrayPermission = $case->getAllObjects($arrayField["PRO_UID"], $_SESSION["APPLICATION"], $_SESSION["TASK"], $_SESSION["USER_LOGGED"]);
$criteria = new Criteria();
$criteria->add(AppDocumentPeer::APP_DOC_UID, $permissions['INPUT_DOCUMENTS'], Criteria::IN);
$criteria->add(AppDocumentPeer::APP_DOC_UID, $arrayPermission["INPUT_DOCUMENTS"], Criteria::IN);
switch ($owner->type) {
case "xmlform":
break;
case "grid":
$criteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $owner->name . "_" . $row . "_" . $this->name);
break;
}
$criteria->addDescendingOrderByColumn(AppDocumentPeer::APP_DOC_CREATE_DATE);
$dataset = AppDocumentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$rsCriteria = AppDocumentPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$sw = 0;
while (($aRow = $dataset->getRow()) && $sw == 0) {
if ($aRow['DOC_UID'] == $this->input) {
$sw = 1;
while (($rsCriteria->next()) && $sw == 0) {
$row = $rsCriteria->getRow();
if ($row["DOC_UID"] == $this->input) {
$permission = true;
$url = (G::is_https() ? 'https://' : 'http://') .
$_SERVER['HTTP_HOST'].dirname($_SERVER['REQUEST_URI']).'/cases_ShowDocument?a='.
$aRow['APP_DOC_UID'].'&v='.$aRow['DOC_VERSION'];
$url = ((G::is_https())? "https://" : "http://") . $_SERVER["HTTP_HOST"] . dirname($_SERVER["REQUEST_URI"]) . "/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"];
$sw = 1;
}
$dataset->next();
}
}
$mode = ($this->mode == 'view') ? ' disabled="disabled"' : '';
if($this->mode == 'view'){
$displayStyle = 'display:none;';
$html1 = null;
$html2 = null;
$mode = ($this->mode == "view")? " disabled=\"disabled\"" : null;
$styleDisplay = null;
if ($this->mode == "view") {
if ($permission) {
$html = '<a href='.$url.'>'.$value.'<input class="module_app_input___gray_file" ' . $mode .'style='.$displayStyle .' id="form[' . $this->name . ']" name="form[' . $this->name . ']" type=\'file\' value=\'' . $value . '\' /></a>';
} else {
$html = $value.'<input class="module_app_input___gray_file" ' . $mode .'style='.$displayStyle .' id="form[' . $this->name . ']" name="form[' . $this->name . ']" type=\'file\' value=\'' . $value . '\' />';
}
}
else{
$html = '<input class="module_app_input___gray_file" ' . $mode . 'id="form[' . $this->name . ']" name="form[' . $this->name . ']" type=\'file\' value=\'' . $value . '\'/>';
$html1 = "<a href=\"" . $url . "\"" . (($owner->type == "grid")? " class=\"tableOption\" style=\"color: #006699; text-decoration: none; font-weight: normal;\"" : null) . ">";
$html2 = "</a>";
}
if( isset($this->input) && $this->input != '') {
require_once 'classes/model/InputDocument.php';
$oiDoc = new InputDocument;
$html1 = $html1 . $value;
$styleDisplay = "display: none;";
}
$html = $html1 . "<input type=\"file\" id=\"form" . $rowId . "[" . $this->name . "]\" name=\"form" . $rowId . "[" . $this->name . "]\" value=\"" . $value . "\" class=\"module_app_input___gray_file\" style=\"" . $styleDisplay . "\"" . $mode . " />" . $html2;
if (isset($this->input) && $this->input != null) {
require_once ("classes/model/InputDocument.php");
try {
$aDoc = $oiDoc->load($this->input);
$aDoc['INP_DOC_TITLE'] = isset($aDoc['INP_DOC_TITLE'])? $aDoc['INP_DOC_TITLE']: '';
$html .= '<label><img src="/images/inputdocument.gif" width="22px" width="22px"/><font size="1">('.trim($aDoc['INP_DOC_TITLE']).')</font></label>';
}
catch (Exception $e) {
// then the input document doesn't exits, id referencial broken
$html .= '&nbsp;<font color="red"><img src="/images/alert_icon.gif" width="16px" width="16px"/><font size="1">('.G::loadTranslation('ID_INPUT_DOC_DOESNT_EXIST').')</font></font>';
$indoc = new InputDocument();
$aDoc = $indoc->load($this->input);
$aDoc["INP_DOC_TITLE"] = (isset($aDoc["INP_DOC_TITLE"]))? $aDoc["INP_DOC_TITLE"] : null;
$html = $html . "<label><img src=\"/images/inputdocument.gif\" width=\"22px\" width=\"22px\" alt=\"\" /><font size=\"1\">(" . trim($aDoc["INP_DOC_TITLE"]) . ")</font></label>";
} catch (Exception $e) {
//Then the input document doesn"t exits, id referencial broken
$html = $html . "&nbsp;<font color=\"red\"><img src=\"/images/alert_icon.gif\" width=\"16px\" width=\"16px\" alt=\"\" /><font size=\"1\">(" . G::loadTranslation("ID_INPUT_DOC_DOESNT_EXIST") . ")</font></font>";
}
}
$html .= $this->renderHint();
$html = $html . $this->renderHint();
return $html;
}
public function renderGrid($value=array(), $owner=null, $therow=-1)
{
$arrayResult = array();
$r = 1;
foreach ($value as $v) {
$arrayResult[] = $this->render($v, $owner, "[" . $owner->name . "][" . $r . "]", $r, $therow);
$r = $r + 1;
}
return $arrayResult;
}
}
/**
@@ -3296,8 +3331,34 @@ class XmlForm_Field_Grid extends XmlForm_Field
$fieldsSize += $size;
$emptyRow [$key] = array ($emptyValue);
}
if (isset($owner->adjustgridswidth) && $owner->adjustgridswidth == '1') {
// 400w -> 34s to Firefox
// 400w -> 43s to Chrome
$baseWidth = 400;
$minusWidth = 30;
if (eregi('chrome', $_SERVER['HTTP_USER_AGENT'])) {
$baseSize = 43;
} else {
if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) {
$minusWidth = 20;
}
$baseSize = 34;
}
$baseWidth = 400;
$formWidth = (int)$owner->width;
$maxSize = (($formWidth*$baseSize) / $baseWidth);
if ($fieldsSize > $maxSize) {
$this->scrollStyle = 'height:100%; overflow-x: scroll; width:';
$this->scrollStyle .= $formWidth - $minusWidth . ';';
}
} else {
if($fieldsSize>100)
$owner->width = '100%';
}
// else
// $owner->width = $fieldsSize . 'em';
return $this->renderGrid ( $emptyRow, $owner );
@@ -4755,13 +4816,19 @@ class xmlformTemplate extends Smarty
}
}*/
if ($v->type == 'grid') {
$result ['form'] [$k] = $form->fields [$k]->renderGrid ( $value, $form, $therow );
if ($v->type == "grid") {
$result["form"][$k] = $form->fields[$k]->renderGrid($value, $form, $therow);
} else {
if ($v->type == 'dropdown') {
$result ['form'] [$k] = $form->fields [$k]->renderGrid ( $value, $form, false, $therow );
} else {
$result ['form'] [$k] = $form->fields [$k]->renderGrid ( $value, $form );
switch ($v->type) {
case "dropdown":
$result["form"][$k] = $form->fields[$k]->renderGrid($value, $form, false, $therow);
break;
case "file":
$result["form"][$k] = $form->fields[$k]->renderGrid($value, $form, $therow);
break;
default:
$result["form"][$k] = $form->fields[$k]->renderGrid($value, $form);
break;
}
}
}

14
phpunit.xml
View File

@@ -37,13 +37,13 @@
<var name="SYS_SYS" value="os" />
<var name="SYS_LANG" value="en" />
<var name="SYS_SKIN" value="classic" />
<var name="DB_ADAPTER" value="mysql" />
<var name="DB_HOST" value="localhost" />
<var name="DB_NAME" value="wf_os" />
<var name="DB_USER" value="root" />
<var name="DB_PASS" value="password" />
<var name="PATH_DB" value="tests/shared/" />
<var name="PATH_DATA" value="tests/shared/" />
<var name="zDB_ADAPTER" value="mysql" />
<var name="zDB_HOST" value="localhost" />
<var name="zDB_NAME" value="wf_os" />
<var name="zDB_USER" value="root" />
<var name="zDB_PASS" value="password" />
<var name="PATH_DB" value="/shared/workflow_data/sites/" />
<var name="PATH_DATA" value="/shared/workflow_data/sites/" />
</php>
<logging>

112
rbac/engine/classes/model/RbacUsers.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* RbacUsers.php
* @package rbac-classes-model
@@ -28,7 +29,6 @@
*/
require_once 'classes/model/om/BaseRbacUsers.php';
/**
* Skeleton subclass for representing a row from the 'USERS' table.
*
@@ -40,7 +40,9 @@ require_once 'classes/model/om/BaseRbacUsers.php';
*
* @package rbac-classes-model
*/
class RbacUsers extends BaseRbacUsers {
class RbacUsers extends BaseRbacUsers
{
/**
* Autentificacion de un usuario a traves de la clase RBAC_user
*
@@ -59,14 +61,16 @@ class RbacUsers extends BaseRbacUsers {
* -4: usuario vencido
* n : uid de usuario
*/
function verifyLogin($sUsername, $sPassword )
public function verifyLogin($sUsername, $sPassword)
{
//invalid user
if ( $sUsername == '' ) return -1;
if ($sUsername == '') {
return -1;
}
//invalid password
if ( $sPassword == '' ) return -2;
if ($sPassword == '') {
return -2;
}
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$c = new Criteria('rbac');
@@ -76,55 +80,61 @@ class RbacUsers extends BaseRbacUsers {
$aFields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
//verify password with md5, and md5 format
//if ( $aFields['USR_PASSWORD'] == md5 ($sPassword ) ) {
if ( $aFields['USR_PASSWORD'] == md5 ($sPassword ) || 'md5:'.$aFields['USR_PASSWORD'] === $sPassword) {
if ($aFields['USR_DUE_DATE'] < date('Y-m-d') )
if (mb_strtoupper($sUsername, 'utf-8') === mb_strtoupper($aFields['USR_USERNAME'], 'utf-8')) {
if ($aFields['USR_PASSWORD'] == md5($sPassword) ||
'md5:' . $aFields['USR_PASSWORD'] === $sPassword) {
if ($aFields['USR_DUE_DATE'] < date('Y-m-d')) {
return -4;
if ($aFields['USR_STATUS'] != 1 )
return -3;
return $aFields['USR_UID'];
}
else
if ($aFields['USR_STATUS'] != 1) {
return -3;
}
return $aFields['USR_UID'];
} else {
return -2;
}
else {
} else {
return -1;
}
} else {
return -1;
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
return -1;
}
function verifyUser($sUsername)
public function verifyUser($sUsername)
{
//invalid user
if ( $sUsername == '' ) return 0;
if ($sUsername == '') {
return 0;
}
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$c = new Criteria('rbac');
$c->add(RbacUsersPeer::USR_USERNAME, $sUsername);
$rs = RbacUsersPeer::doSelect($c);
if (is_array($rs) && isset( $rs[0] ) && is_object($rs[0]) && get_class ( $rs[0] ) == 'RbacUsers')
{
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
//return the row for futher check of which Autentificacion method belongs this user
$this->fields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);;
$this->fields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
;
return 1;
}
else
{
} else {
return 0;
}
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
}
function getByUsername($sUsername)
public function getByUsername($sUsername)
{
//invalid user
if ( $sUsername == '' ) return 0;
if ($sUsername == '') {
return 0;
}
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$c = new Criteria('rbac');
@@ -137,36 +147,33 @@ class RbacUsers extends BaseRbacUsers {
} else {
return false;
}
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
}
function verifyUserId($sUserId)
public function verifyUserId($sUserId)
{
//invalid user
if ( $sUserId == '' ) return 0;
if ($sUserId == '') {
return 0;
}
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$c = new Criteria('rbac');
$c->add(RbacUsersPeer::USR_UID, $sUserId);
$rs = RbacUsersPeer::doSelect($c);
if (is_array($rs) && isset( $rs[0] ) && is_object($rs[0]) && get_class ( $rs[0] ) == 'RbacUsers')
{
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
return 1;
}
else
{
} else {
return 0;
}
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
}
function load($sUsrUid)
public function load($sUsrUid)
{
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
@@ -178,14 +185,14 @@ class RbacUsers extends BaseRbacUsers {
return $aFields;
}
return false;
}
catch ( Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
return $res;
}
function create($aData) {
public function create($aData)
{
$oConnection = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$oRBACUsers = new RbacUsers();
@@ -207,34 +214,35 @@ class RbacUsers extends BaseRbacUsers {
}
throw(new Exception('The registry cannot be created!<br />' . $sMessage));
} */
}
catch (Exception $oError) {
} catch (Exception $oError) {
$oConnection->rollback();
throw($oError);
}
}
function update($aData) {
public function update($aData)
{
$oConnection = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$this->fromArray($aData, BasePeer::TYPE_FIELDNAME);
$this->setNew(false);
$iResult = $this->save();
}
catch (Exception $oError) {
} catch (Exception $oError) {
$oConnection->rollback();
throw($oError);
}
}
function remove($sUserUID = '') {
public function remove($sUserUID = '')
{
$this->setUsrUid($sUserUID);
$this->delete();
}
//Added by Qennix at Feb 14th, 2011
//Gets an associative array with total users by authentication sources
function getAllUsersByAuthSource(){
public function getAllUsersByAuthSource()
{
$oCriteria = new Criteria('rbac');
$oCriteria->addSelectColumn(RbacUsersPeer::UID_AUTH_SOURCE);
$oCriteria->addSelectColumn('COUNT(*) AS CNT');
@@ -252,7 +260,8 @@ class RbacUsers extends BaseRbacUsers {
}
//Returns all users with auth_source
function getListUsersByAuthSource($auth_source){
public function getListUsersByAuthSource($auth_source)
{
$oCriteria = new Criteria('rbac');
$oCriteria->addSelectColumn(RbacUsersPeer::USR_UID);
@@ -274,5 +283,6 @@ class RbacUsers extends BaseRbacUsers {
}
return $aUsers;
}
}
} // Users
// Users

40
tests/automated/gulliver/system/classGTest.php
View File

@@ -43,7 +43,8 @@ class classGTest extends PHPUnit_Framework_TestCase
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('G'); $this->assertTrue( count($methods) == 134);
$methods = get_class_methods('G');
$this->assertTrue( count($methods) == 139, "now there are " . count($methods) . " methods.");
}
/**
@@ -652,7 +653,7 @@ class classGTest extends PHPUnit_Framework_TestCase
/**
* @covers G::parseURI
* @todo Implement testparseURI().
* todo Implement testparseURI().
*/
public function testparseURI()
{
@@ -663,12 +664,45 @@ class classGTest extends PHPUnit_Framework_TestCase
$this->assertTrue( $params[0]->getName() == 'uri');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
$this->assertTrue( $params[1]->getName() == 'config');
$this->assertTrue( $params[1]->getName() == 'isRestRequest');
$this->assertTrue( $params[1]->isArray() == false);
$this->assertTrue( $params[1]->isOptional () == true);
$this->assertTrue( $params[1]->getDefaultValue() == array());
}
public function parseNormalUri()
{
$methods = get_class_methods($this->object);
$this->assertTrue( in_array('parseNormalUri', $methods ), 'exists method parseNormalUri' );
$r = new ReflectionMethod('G', 'parseNormalUri');
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'aRequestUri');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
}
public function parseRestUri()
{
$methods = get_class_methods($this->object);
$this->assertTrue( in_array('parseRestUri', $methods ), 'exists method parseRestUri' );
$r = new ReflectionMethod('G', 'parseRestUri');
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'aRequestUri');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
}
public function dispatchRestService()
{
$methods = get_class_methods($this->object);
$this->assertTrue( in_array('dispatchRestService', $methods ), 'exists method parseRestUri' );
$r = new ReflectionMethod('G', 'dispatchRestService');
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'uri');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
}
/**
* @covers G::strip_slashes
* @todo Implement teststrip_slashes().

3
tests/automated/gulliver/system/classRBACTest.php
View File

@@ -43,7 +43,8 @@ class classRBACTest extends PHPUnit_Framework_TestCase
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('RBAC'); $this->assertTrue( count($methods) == 54);
$methods = get_class_methods('RBAC');
$this->assertTrue( count($methods) == 55, "now there are " . count($methods) . " methods.");
}
/**

2
tests/automated/gulliver/system/classXmlForm_Field_GridTest.php
View File

@@ -139,7 +139,7 @@ class classXmlForm_Field_GridTest extends PHPUnit_Framework_TestCase
$this->assertTrue( in_array('flipValues', $methods ), 'exists method flipValues' );
$r = new ReflectionMethod('XmlForm_Field_Grid', 'flipValues');
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'values');
$this->assertTrue( $params[0]->getName() == 'arrayData');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
}

2
tests/automated/workflow/engine/classes/classAppSolrTest.php
View File

@@ -47,7 +47,7 @@ class classAppSolrTest extends PHPUnit_Framework_TestCase
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('AppSolr');
$this->assertTrue( count($methods) == 25);
$this->assertTrue( count($methods) == 28);
}
/**

3
tests/automated/workflow/engine/classes/classBpmnEngine_Services_SearchIndexTest.php
View File

@@ -43,7 +43,8 @@ class classBpmnEngine_Services_SearchIndexTest extends PHPUnit_Framework_TestCas
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('BpmnEngine_Services_SearchIndex'); $this->assertTrue( count($methods) == 9);
$methods = get_class_methods('BpmnEngine_Services_SearchIndex');
$this->assertTrue( count($methods) == 10);
}
/**

12
tests/automated/workflow/engine/classes/classCasesTest.php
View File

@@ -103,10 +103,10 @@ class classCasesTest extends PHPUnit_Framework_TestCase
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'sUIDUser');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
$this->assertTrue( $params[0]->isOptional () == true);
$this->assertTrue( $params[1]->getName() == 'typeView');
$this->assertTrue( $params[1]->isArray() == false);
$this->assertTrue( $params[1]->isOptional () == false);
$this->assertTrue( $params[1]->isOptional () == true);
}
/**
@@ -1448,10 +1448,10 @@ class classCasesTest extends PHPUnit_Framework_TestCase
$this->assertTrue( $params[1]->isOptional () == false);
$this->assertTrue( $params[2]->getName() == 'TAS_UID');
$this->assertTrue( $params[2]->isArray() == false);
$this->assertTrue( $params[2]->isOptional () == false);
$this->assertTrue( $params[2]->isOptional () == true);
$this->assertTrue( $params[3]->getName() == 'USR_UID');
$this->assertTrue( $params[3]->isArray() == false);
$this->assertTrue( $params[3]->isOptional () == false);
$this->assertTrue( $params[3]->isOptional () == true);
}
/**
@@ -1472,10 +1472,10 @@ class classCasesTest extends PHPUnit_Framework_TestCase
$this->assertTrue( $params[1]->isOptional () == false);
$this->assertTrue( $params[2]->getName() == 'TAS_UID');
$this->assertTrue( $params[2]->isArray() == false);
$this->assertTrue( $params[2]->isOptional () == false);
$this->assertTrue( $params[2]->isOptional () == true);
$this->assertTrue( $params[3]->getName() == 'USR_UID');
$this->assertTrue( $params[3]->isArray() == false);
$this->assertTrue( $params[3]->isOptional () == false);
$this->assertTrue( $params[3]->isOptional () == true);
$this->assertTrue( $params[4]->getName() == 'ACTION');
$this->assertTrue( $params[4]->isArray() == false);
$this->assertTrue( $params[4]->isOptional () == true);

2
tests/automated/workflow/engine/classes/classDerivationTest.php
View File

@@ -44,7 +44,7 @@ class classDerivationTest extends PHPUnit_Framework_TestCase
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('Derivation');
$this->assertTrue(count($methods) == 13);
$this->assertTrue(count($methods) == 14, count($methods));
}
/**

3
tests/automated/workflow/engine/classes/classPMPluginRegistryTest.php
View File

@@ -43,7 +43,8 @@ class classPMPluginRegistryTest extends PHPUnit_Framework_TestCase
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('PMPluginRegistry'); $this->assertTrue( count($methods) == 56);
$methods = get_class_methods('PMPluginRegistry');
$this->assertTrue( count($methods) == 60, count($methods));
}
/**

2
tests/automated/workflow/engine/classes/classPMPluginTest.php
View File

@@ -46,7 +46,7 @@ class classPMPluginTest extends PHPUnit_Framework_TestCase
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('PMPlugin');
$this->assertTrue(count($methods) == 22);
$this->assertTrue(count($methods) == 24, count($methods));
}
/**

3
tests/automated/workflow/engine/classes/classprocessMapTest.php
View File

@@ -43,7 +43,8 @@ class classprocessMapTest extends PHPUnit_Framework_TestCase
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('processMap'); $this->assertTrue( count($methods) == 149);
$methods = get_class_methods('processMap');
$this->assertTrue( count($methods) == 150, count($methods));
}
/**

2
tests/automated/workflow/engine/classes/classserverConfTest.php
View File

@@ -46,7 +46,7 @@ class classserverConfTest extends PHPUnit_Framework_TestCase
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('serverConf');
$this->assertTrue(count($methods) == 23);
$this->assertTrue(count($methods) == 24);
}
/**

2
tests/automated/workflow/engine/classes/classworkspaceToolsTest.php
View File

@@ -45,7 +45,7 @@ class classworkspaceToolsTest extends PHPUnit_Framework_TestCase
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('workspaceTools');
$this->assertTrue( count($methods) == 27);
$this->assertTrue( count($methods) == 28 );
}
/**

9
tests/automated/workflow/engine/classes/classwsBaseTest.php
View File

@@ -43,7 +43,8 @@ class classwsBaseTest extends PHPUnit_Framework_TestCase
*/
public function testNumberOfMethodsInThisClass()
{
$methods = get_class_methods('wsBase'); $this->assertTrue( count($methods) == 35);
$methods = get_class_methods('wsBase');
$this->assertTrue( count($methods) == 40, count($methods));
}
/**
@@ -332,13 +333,13 @@ class classwsBaseTest extends PHPUnit_Framework_TestCase
$this->assertTrue( in_array('createUser', $methods ), 'exists method createUser' );
$r = new ReflectionMethod('wsBase', 'createUser');
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'userId');
$this->assertTrue( $params[0]->getName() == 'userName');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
$this->assertTrue( $params[1]->getName() == 'firstname');
$this->assertTrue( $params[1]->getName() == 'firstName');
$this->assertTrue( $params[1]->isArray() == false);
$this->assertTrue( $params[1]->isOptional () == false);
$this->assertTrue( $params[2]->getName() == 'lastname');
$this->assertTrue( $params[2]->getName() == 'lastName');
$this->assertTrue( $params[2]->isArray() == false);
$this->assertTrue( $params[2]->isOptional () == false);
$this->assertTrue( $params[3]->getName() == 'email');

55
tests/bootstrap.php
View File

@@ -15,11 +15,11 @@ define('PATH_HOME', PATH_TRUNK . 'workflow' . PATH_SEP);
define('SYS_SYS', $GLOBALS['SYS_SYS']);
define('SYS_LANG', $GLOBALS['SYS_LANG']);
define('SYS_SKIN', $GLOBALS['SYS_SKIN']);
define('DB_ADAPTER', $GLOBALS['DB_ADAPTER']);
define('DB_NAME', $GLOBALS['DB_NAME']);
define('DB_USER', $GLOBALS['DB_USER']);
define('DB_PASS', $GLOBALS['DB_PASS']);
define('DB_HOST', $GLOBALS['DB_HOST']);
//define('DB_ADAPTER', $GLOBALS['DB_ADAPTER']);
//define('DB_NAME', $GLOBALS['DB_NAME']);
//define('DB_USER', $GLOBALS['DB_USER']);
//define('DB_PASS', $GLOBALS['DB_PASS']);
//define('DB_HOST', $GLOBALS['DB_HOST']);
define('PATH_DB', $GLOBALS['PATH_DB']);
define('PATH_DATA', $GLOBALS['PATH_DATA']);
define('PATH_C', PATH_TRUNK . 'tmp/' );
@@ -27,7 +27,48 @@ define('PATH_SMARTY_C', PATH_TRUNK . 'tmp/' );
define('PATH_SMARTY_CACHE', PATH_TRUNK . 'tmp/' );
@mkdir (PATH_C);
require PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php';
//require PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php';
// Defining RBAC Paths constants
define( 'PATH_RBAC_HOME', PATH_TRUNK . 'rbac' . PATH_SEP );
// Defining Gulliver framework paths constants
define( 'PATH_GULLIVER_HOME', PATH_TRUNK . 'gulliver' . PATH_SEP );
define( 'PATH_GULLIVER', PATH_GULLIVER_HOME . 'system' . PATH_SEP ); //gulliver system classes
define( 'PATH_GULLIVER_BIN', PATH_GULLIVER_HOME . 'bin' . PATH_SEP ); //gulliver bin classes
define( 'PATH_TEMPLATE', PATH_GULLIVER_HOME . 'templates' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP );
define( 'PATH_RBAC', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP ); //to enable rbac version 2
define( 'PATH_RBAC_CORE', PATH_RBAC_HOME . 'engine' . PATH_SEP );
define( 'PATH_HTML', PATH_HOME . 'public_html' . PATH_SEP );
// Defining PMCore Path constants
define( 'PATH_CORE', PATH_HOME . 'engine' . PATH_SEP );
define( 'PATH_SKINS', PATH_CORE . 'skins' . PATH_SEP );
define( 'PATH_SKIN_ENGINE', PATH_CORE . 'skinEngine' . PATH_SEP );
define( 'PATH_METHODS', PATH_CORE . 'methods' . PATH_SEP );
define( 'PATH_XMLFORM', PATH_CORE . 'xmlform' . PATH_SEP );
define( 'PATH_CONFIG', PATH_CORE . 'config' . PATH_SEP );
define( 'PATH_PLUGINS', PATH_CORE . 'plugins' . PATH_SEP );
define( 'PATH_HTMLMAIL', PATH_CORE . 'html_templates' . PATH_SEP );
define( 'PATH_TPL', PATH_CORE . 'templates' . PATH_SEP );
define( 'PATH_TEST', PATH_CORE . 'test' . PATH_SEP );
define( 'PATH_FIXTURES', PATH_TEST . 'fixtures' . PATH_SEP );
define( 'PATH_RTFDOCS' , PATH_CORE . 'rtf_templates' . PATH_SEP );
define( 'PATH_DYNACONT', PATH_CORE . 'content' . PATH_SEP . 'dynaform' . PATH_SEP );
//define( 'PATH_LANGUAGECONT',PATH_CORE . 'content' . PATH_SEP . 'languages' . PATH_SEP );
define( 'SYS_UPLOAD_PATH', PATH_HOME . "public_html/files/" );
define( 'PATH_UPLOAD', PATH_HTML . 'files' . PATH_SEP);
define( 'PATH_WORKFLOW_MYSQL_DATA', PATH_CORE . 'data' . PATH_SEP.'mysql'.PATH_SEP);
define( 'PATH_RBAC_MYSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP.'mysql'.PATH_SEP);
define( 'FILE_PATHS_INSTALLED', PATH_CORE . 'config' . PATH_SEP . 'paths_installed.php' );
define( 'PATH_WORKFLOW_MSSQL_DATA', PATH_CORE . 'data' . PATH_SEP.'mssql'.PATH_SEP);
define( 'PATH_RBAC_MSSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP.'mssql'.PATH_SEP);
define( 'PATH_CONTROLLERS', PATH_CORE . 'controllers' . PATH_SEP );
define( 'PATH_SERVICES_REST', PATH_CORE . 'services' . PATH_SEP . 'rest' . PATH_SEP);
define("URL_KEY", 'c0l0s40pt1mu59r1m3' );
set_include_path(
PATH_CORE . PATH_SEPARATOR .
@@ -36,6 +77,8 @@ set_include_path(
PATH_RBAC_CORE . PATH_SEPARATOR .
get_include_path()
);
// include Gulliver Class
require_once( PATH_GULLIVER . PATH_SEP . 'class.g.php');
// perpare propel env.
require_once "propel/Propel.php";

6
workflow/engine/bin/tasks/cliUpgrade.php
View File

@@ -95,15 +95,15 @@ function run_upgrade($command, $args)
if (defined('PATH_C')) {
rm_dir(PATH_C, true);
}
$workspaces = get_workspaces_from_args($args);
$workspaces = get_workspaces_from_args($command);
$count = count($workspaces);
$first = true;
$errors = false;
$buildCacheView = array_key_exists("buildACV", $command);
$buildCacheView = array_key_exists("buildACV", $args);
foreach ($workspaces as $index => $workspace) {
try {
CLI::logging("Upgrading workspaces ($index/$count): " . CLI::info($workspace->name) . "\n");
$workspace->upgrade($first, $buildCacheView);
$workspace->upgrade($first, $buildCacheView, $workspace->name);
$workspace->close();
$first = false;
} catch (Exception $e) {

2
workflow/engine/bin/tasks/cliWorkspaces.php
View File

@@ -174,7 +174,7 @@ function run_workspace_upgrade($args, $opts) {
$first = true;
foreach ($workspaces as $workspace) {
try {
$workspace->upgrade($first);
$workspace->upgrade($first, false, $workspace->name);
$first = false;
} catch (Exception $e) {
echo "Errors upgrading workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n";

44
workflow/engine/classes/class.case.php
View File

@@ -463,7 +463,7 @@ class Cases
return $rows;
}
public function isSelfService($USR_UID, $TAS_UID)
public function isSelfService($USR_UID, $TAS_UID, $APP_UID = '')
{
$tasks = $this->getSelfServiceTasks($USR_UID);
@@ -472,6 +472,23 @@ class Cases
return true;
}
}
if ($APP_UID != '') {
$groupsInstance = new Groups();
$groups = $groupsInstance->getActiveGroupsForAnUser($USR_UID);
$taskInstance = new Task();
$taskData = $taskInstance->Load($TAS_UID);
$tasGroupVariable = str_replace(array('@', '#'), '', $taskData['TAS_GROUP_VARIABLE']);
$caseData = $this->LoadCase($APP_UID);
if (isset($caseData['APP_DATA'][$tasGroupVariable])) {
if (trim($caseData['APP_DATA'][$tasGroupVariable]) != '') {
if (in_array(trim($caseData['APP_DATA'][$tasGroupVariable]), $groups)) {
return true;
}
}
}
}
return false;
}
@@ -4753,9 +4770,14 @@ class Cases
G::arrayDiff($MAIN_OBJECTS['VIEW']['OUTPUT_DOCUMENTS'],$MAIN_OBJECTS['BLOCK']['OUTPUT_DOCUMENTS']),
G::arrayDiff($MAIN_OBJECTS['DELETE']['OUTPUT_DOCUMENTS'],$MAIN_OBJECTS['BLOCK']['OUTPUT_DOCUMENTS'])
);
$RESULT_OBJECTS['CASES_NOTES'] = G::arrayDiff(
$MAIN_OBJECTS['VIEW']['CASES_NOTES'], $MAIN_OBJECTS['BLOCK']['CASES_NOTES']
);
array_push($RESULT_OBJECTS['DYNAFORMS'], -1);
array_push($RESULT_OBJECTS['INPUT_DOCUMENTS'], -1);
array_push($RESULT_OBJECTS['OUTPUT_DOCUMENTS'], -1);
array_push($RESULT_OBJECTS['CASES_NOTES'], -1);
return $RESULT_OBJECTS;
}
@@ -4773,7 +4795,7 @@ class Cases
$aCase = $this->loadCase($APP_UID);
$USER_PERMISSIONS = Array();
$GROUP_PERMISSIONS = Array();
$RESULT = Array("DYNAFORM" => Array(), "INPUT" => Array(), "OUTPUT" => Array());
$RESULT = Array("DYNAFORM" => Array(), "INPUT" => Array(), "OUTPUT" => Array(), "CASES_NOTES" => 0);
//permissions per user
$oCriteria = new Criteria('workflow');
@@ -4791,13 +4813,14 @@ class Cases
$oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, '')->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, '0')
)
)->addOr(
)
);
$oCriteria->add(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, 'ALL')->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, '')->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, '0')
)
)
)
);
$rs = ObjectPermissionPeer::doSelectRS($oCriteria);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -4826,13 +4849,14 @@ class Cases
$oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, '')->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, '0')
)
)->addOr(
)
);
$oCriteria->add(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, 'ALL')->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, '')->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, '0')
)
)
)
);
$rs = ObjectPermissionPeer::doSelectRS($oCriteria);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -4841,7 +4865,6 @@ class Cases
}
}
$PERMISSIONS = array_merge($USER_PERMISSIONS, $GROUP_PERMISSIONS);
foreach ($PERMISSIONS as $row) {
$USER = $row['USR_UID'];
$USER_RELATION = $row['OP_USER_RELATION'];
@@ -4927,6 +4950,7 @@ class Cases
}
$oDataset->next();
}
$RESULT['CASES_NOTES'] = 1;
break;
case 'DYNAFORM':
$oCriteria = new Criteria('workflow');
@@ -5000,13 +5024,17 @@ class Cases
$oDataset->next();
}
break;
case 'CASES_NOTES':
$RESULT['CASES_NOTES'] = 1;
break;
}
}
}
return Array(
"DYNAFORMS" => $RESULT['DYNAFORM'],
"INPUT_DOCUMENTS" => $RESULT['INPUT'],
"OUTPUT_DOCUMENTS" => $RESULT['OUTPUT']
"OUTPUT_DOCUMENTS" => $RESULT['OUTPUT'],
"CASES_NOTES" => $RESULT['CASES_NOTES']
);
}

4
workflow/engine/classes/class.dynaformEditor.php
View File

@@ -716,6 +716,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
//'ENABLETEMPLATE'=> $form->enableTemplate,
'MODE' => $form->mode,
'PRINTDYNAFORM' => $form->printdynaform,
'ADJUSTGRIDSWIDTH' => $form->adjustgridswidth,
'NEXTSTEPSAVE' => $form->nextstepsave
);
$tmp['Properties']=$Properties;
@@ -776,6 +777,9 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
if (isset($Fields['PRINTDYNAFORM'])) {
$ses2->execute(G::replaceDataField("UPDATE . SET PRINTDYNAFORM = @@PRINTDYNAFORM WHERE XMLNODE_NAME = 'dynaForm' ", $Fields));
}
if (isset($Fields['ADJUSTGRIDSWIDTH'])) {
$ses2->execute(G::replaceDataField("UPDATE . SET ADJUSTGRIDSWIDTH = @@ADJUSTGRIDSWIDTH WHERE XMLNODE_NAME = 'dynaForm' ", $Fields));
}
return 0;
}
catch(Exception $e) {

144
workflow/engine/classes/class.processMap.php
View File

@@ -1438,6 +1438,13 @@ class processMap {
//If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
$aFields ['TAS_CALENDAR'] = $calendarInfo ['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo ['CALENDAR_UID'] : "";
}
if ($iForm == 2) {
if ($aFields['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE' && $aFields['TAS_GROUP_VARIABLE'] != '') {
$aFields['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE_EVALUATE';
}
}
global $G_PUBLISH;
G::LoadClass('xmlfield_InputPM');
$G_PUBLISH = new Publisher ( );
@@ -3149,18 +3156,78 @@ class processMap {
* @return object(Criteria) $oCriteria
*/
function listProcessesUser($sProcessUID) {
$aResp = array(
array(
'LA_PU_UID' => 'char',
'LA_PRO_UID' => 'char',
'LA_USR_UID' => 'char',
'LA_PU_NAME' => 'char',
'LA_PU_TYPE_NAME' => 'char')
);
// Groups
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(ProcessUserPeer::PU_UID);
$oCriteria->addSelectColumn(ProcessUserPeer::USR_UID);
$oCriteria->addSelectColumn(ProcessUserPeer::PRO_UID);
$oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE);
$aConditions [] = array(ProcessUserPeer::USR_UID, ContentPeer::CON_ID);
$aConditions [] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter () . 'GRP_TITLE' . DBAdapter::getStringDelimiter ());
$aConditions [] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter () . SYS_LANG . DBAdapter::getStringDelimiter ());
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(ProcessUserPeer::PU_TYPE, 'GROUP_SUPERVISOR');
$oCriteria->add(ProcessUserPeer::PRO_UID, $sProcessUID);
$oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
$oDataset = ProcessUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$aResp[] = array(
'LA_PU_UID' => $aRow['PU_UID'],
'LA_PRO_UID' => $aRow['PRO_UID'],
'LA_USR_UID' => $aRow['USR_UID'],
'LA_PU_NAME' => $aRow['GRP_TITLE'],
'LA_PU_TYPE_NAME' => 'Group');
$oDataset->next();
}
// Users
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(ProcessUserPeer::PU_UID);
$oCriteria->addSelectColumn(ProcessUserPeer::USR_UID);
$oCriteria->addSelectColumn(ProcessUserPeer::PRO_UID);
$oCriteria->addSelectColumn(ProcessUserPeer::PU_TYPE);
$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
$oCriteria->addJoin(ProcessUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$oCriteria->add(ProcessUserPeer::PU_TYPE, 'SUPERVISOR');
$oCriteria->add(ProcessUserPeer::PRO_UID, $sProcessUID);
return $oCriteria;
$oCriteria->addAscendingOrderByColumn(UsersPeer::USR_FIRSTNAME);
$oDataset = ProcessUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$aResp[] = array(
'LA_PU_UID' => $aRow['PU_UID'],
'LA_PRO_UID' => $aRow['PRO_UID'],
'LA_USR_UID' => $aRow['USR_UID'],
'LA_PU_NAME' => $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'],
'LA_PU_TYPE_NAME' => 'User');
$oDataset->next();
}
global $_DBArray;
$_DBArray['data'] = $aResp;
$_SESSION['_DBArray'] = $_DBArray;
$LiCriteria = new Criteria('dbarray');
$LiCriteria->setDBArrayTable('data');
return $LiCriteria;
}
/**
@@ -3175,16 +3242,54 @@ class processMap {
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(ProcessUserPeer::USR_UID);
$oCriteria->addSelectColumn(ProcessUserPeer::PU_TYPE);
$oCriteria->add(ProcessUserPeer::PRO_UID, $sProcessUID);
$oCriteria->add(ProcessUserPeer::PU_TYPE, 'SUPERVISOR');
$oCriteria->add(ProcessUserPeer::PU_TYPE, '%SUPERVISOR%', Criteria::LIKE);
$oDataset = ProcessUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$aUIDS = array();
$aGRUS = array();
while ($aRow = $oDataset->getRow()) {
if ($aRow['PU_TYPE'] == 'SUPERVISOR') {
$aUIDS [] = $aRow ['USR_UID'];
} else {
$aGRUS [] = $aRow ['USR_UID'];
}
$oDataset->next();
}
$aRespLi = array(
array(
'UID' => 'char',
'USER_GROUP' => 'char',
'TYPE_UID' => 'char',
'PRO_UID' => 'char')
);
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE);
$aConditions [] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID);
$aConditions [] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter () . 'GRP_TITLE' . DBAdapter::getStringDelimiter ());
$aConditions [] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter () . SYS_LANG . DBAdapter::getStringDelimiter ());
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(GroupwfPeer::GRP_UID, $aGRUS, Criteria::NOT_IN);
$oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
$oDataset = GroupwfPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$aRespLi[] = array( 'UID' => $aRow['GRP_UID'],
'USER_GROUP' => $aRow['GRP_TITLE'],
'TYPE_UID' => 'Group',
'PRO_UID' => $sProcessUID);
$oDataset->next();
}
$sDelimiter = DBAdapter::getStringDelimiter ();
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(UsersPeer::USR_UID);
@@ -3217,7 +3322,26 @@ class processMap {
$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$oCriteria->add(UsersPeer::USR_UID, $aUIDS, Criteria::IN);
return $oCriteria;
$oCriteria->addAscendingOrderByColumn(UsersPeer::USR_FIRSTNAME);
$oDataset = UsersPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$aRespLi[] = array('UID' => $aRow['USR_UID'],
'USER_GROUP' => $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'],
'TYPE_UID' => 'User',
'PRO_UID' => $sProcessUID);
$oDataset->next();
}
global $_DBArray;
$_DBArray['data'] = $aRespLi;
$_SESSION['_DBArray'] = $_DBArray;
$LsCriteria = new Criteria('dbarray');
$LsCriteria->setDBArrayTable('data');
return $LsCriteria;
}
/**
@@ -3227,9 +3351,13 @@ class processMap {
* @param string $sUsrUID
* @return void
*/
function assignProcessUser($sProcessUID, $sUsrUID) {
function assignProcessUser($sProcessUID, $sUsrUID, $sTypeUID) {
$oProcessUser = new ProcessUser ( );
$oProcessUser->create(array('PU_UID' => G::generateUniqueID (), 'PRO_UID' => $sProcessUID, 'USR_UID' => $sUsrUID, 'PU_TYPE' => 'SUPERVISOR'));
$puType = 'SUPERVISOR';
if ($sTypeUID == 'Group') {
$puType = 'GROUP_SUPERVISOR';
}
$oProcessUser->create(array('PU_UID' => G::generateUniqueID (), 'PRO_UID' => $sProcessUID, 'USR_UID' => $sUsrUID, 'PU_TYPE' => $puType));
}
/**
@@ -3364,6 +3492,10 @@ class processMap {
$sObject = G::LoadTranslation('ID_ALL');
}
break;
case 'CASES_NOTES' :
$sObjectType = G::LoadTranslation('ID_CASES_NOTES');
$sObject = G::LoadTranslation('ID_ALL');
break;
default :
$sObjectType = G::LoadTranslation('ID_ALL');
$sObject = G::LoadTranslation('ID_ALL');

4
workflow/engine/classes/class.system.php
View File

@@ -1025,8 +1025,8 @@ class System {
'debug_time' => 0,
'debug_calendar' => 0,
'wsdl_cache' => 1,
'memory_limit' => '100M',
'time_zone' => 'America/La_Paz',
'memory_limit' => '128M',
'time_zone' => 'America/New_York',
'memcached' => 0,
'memcached_server' => '',
'default_skin' => 'classic',

37
workflow/engine/classes/class.wsBase.php
View File

@@ -1653,6 +1653,43 @@ class wsBase
}
}
/**
* get all variables the system and case selected
* @param string $caseId
*
* @return $result will return an object
*/
public function getVariablesNames($caseId)
{
try {
$oCase = new Cases();
$caseFields = $oCase->loadCase($caseId);
$oldFields = $caseFields['APP_DATA'];
$resFields = array();
foreach ($oldFields as $key => $val) {
$node = new stdClass();
$node->name = $key;
$resFields[] = $node;
}
$result = new wsGetVariableResponse(
0,
count($resFields) . G::loadTranslation('ID_VARIABLES_SENT'), $resFields
);
return $result;
} catch (Exception $e) {
$result = new wsGetVariableResponse(100, $e->getMessage(), null);
return $result;
}
}
/**
* new Case begins a new case under the name of the logged-in user.
* @param string $processId

8
workflow/engine/classes/class.wsTools.php
View File

@@ -54,7 +54,7 @@ class workspaceTools {
*
* @param bool $first true if this is the first workspace to be upgrade
*/
public function upgrade($first=false, $buildCacheView=false)
public function upgrade($first=false, $buildCacheView=false, $workSpace=SYS_SYS)
{
$start = microtime(true);
CLI::logging("> Updating database...\n");
@@ -72,7 +72,7 @@ class workspaceTools {
$start = microtime(true);
CLI::logging("> Updating Content...\n");
$this->upgradeContent();
$this->upgradeContent($workSpace);
$stop = microtime(true);
$final = $stop - $start;
CLI::logging("<*> Process Updating Content carried out in $final seconds.\n");
@@ -290,7 +290,7 @@ class workspaceTools {
* Upgrade this workspace Content.
*
*/
public function upgradeContent() {
public function upgradeContent($workSpace=SYS_SYS) {
$this->initPropel(true);
require_once('classes/model/Language.php');
G::LoadThirdParty('pear/json', 'class.json');
@@ -304,7 +304,7 @@ class workspaceTools {
}
require_once('classes/model/Content.php');
$regenerateContent = new Content();
$regenerateContent->regenerateContent($arrayLang);
$regenerateContent->regenerateContent($arrayLang, $workSpace);
}
/**

85
workflow/engine/classes/model/AppCacheView.php
View File

@@ -304,6 +304,61 @@ class AppCacheView extends BaseAppCacheView
return $tasks;
}
public function getSelfServiceCasesByEvaluate($userUid) {
$cases = array();
//check groups assigned to SelfService task
G::LoadClass('groups');
$group = new Groups();
$aGroups = $group->getActiveGroupsForAnUser($userUid);
$c = new Criteria();
$c->clearSelectColumns();
$c->addSelectColumn(TaskPeer::TAS_UID);
$c->addSelectColumn(TaskPeer::PRO_UID);
$c->addSelectColumn(TaskPeer::TAS_GROUP_VARIABLE);
$c->addJoin(TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
$c->add(TaskPeer::TAS_GROUP_VARIABLE, '', Criteria::NOT_EQUAL);
$rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next();
if ($rs->getRecordCount() > 0) {
if (!class_exists('Cases')) {
G::loadClass('case');
}
$caseInstance = new Cases();
while ($row = $rs->getRow()) {
$tasGroupVariable = str_replace(array('@', '#'), '', $row['TAS_GROUP_VARIABLE']);
$c2 = new Criteria();
$c2->clearSelectColumns();
$c2->addSelectColumn(AppDelegationPeer::APP_UID);
$c2->add(AppDelegationPeer::TAS_UID, $row['TAS_UID']);
$c2->add(AppDelegationPeer::USR_UID, '');
$c2->add(AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN');
$rs2 = AppDelegationPeer::doSelectRS($c2);
$rs2->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs2->next();
while ($row2 = $rs2->getRow()) {
$caseData = $caseInstance->LoadCase($row2['APP_UID']);
if (isset($caseData['APP_DATA'][$tasGroupVariable])) {
if (trim($caseData['APP_DATA'][$tasGroupVariable]) != '') {
if (in_array(trim($caseData['APP_DATA'][$tasGroupVariable]), $aGroups)) {
$cases[] = $row2['APP_UID'];
}
}
}
$rs2->next();
}
$rs->next();
}
}
return $cases;
}
/**
* gets the UNASSIGNED cases list criteria
* param $userUid the current userUid
@@ -327,14 +382,18 @@ class AppCacheView extends BaseAppCacheView
$criteria = $this->addPMFieldsToCriteria('unassigned');
}
//$criteria->add(AppCacheViewPeer::APP_STATUS, "TO_DO");
$criteria->add(AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
//$criteria->add(AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN');
//$criteria->add(AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN');
$criteria->add(AppCacheViewPeer::USR_UID, '');
$cases = $this->getSelfServiceCasesByEvaluate($userUid);
if (!empty($cases)) {
$criteria->add(
$criteria->getNewCriterion(AppCacheViewPeer::TAS_UID, $tasks, Criteria::IN)->
addOr($criteria->getNewCriterion(AppCacheViewPeer::APP_UID, $cases, Criteria::IN))
);
} else {
$criteria->add(AppCacheViewPeer::TAS_UID, $tasks, Criteria::IN);
}
return $criteria;
}
@@ -422,6 +481,7 @@ class AppCacheView extends BaseAppCacheView
public function getToRevise($userUid, $doCount)
{
require_once ('classes/model/ProcessUser.php');
require_once ('classes/model/GroupUser.php');
//adding configuration fields from the configuration options
//and forming the criteria object
@@ -438,6 +498,21 @@ class AppCacheView extends BaseAppCacheView
$oDataset->next();
}
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(ProcessUserPeer::PRO_UID);
$oCriteria->add(ProcessUserPeer::PU_TYPE, 'GROUP_SUPERVISOR');
$oCriteria->addJoin(ProcessUserPeer::USR_UID, GroupUserPeer::USR_UID, Criteria::LEFT_JOIN);
$oCriteria->add(GroupUserPeer::USR_UID, $userUid);
$oDataset = ProcessUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$aProcesses[] = $aRow['PRO_UID'];
$oDataset->next();
}
if ($doCount && !isset($this->confCasesList['PMTable']) && !empty($this->confCasesList['PMTable'])) {
$c = new Criteria('workflow');
} else {

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

@@ -276,7 +276,7 @@ class Content extends BaseContent {
*
* @param array $langs
*/
function regenerateContent($langs)
function regenerateContent($langs, $workSpace=SYS_SYS)
{
//Search the language
$key = array_search('en',$langs);
@@ -312,18 +312,25 @@ class Content extends BaseContent {
$sql = " SELECT CON_ID, CON_CATEGORY, CON_LANG, CON_PARENT, CON_VALUE
FROM CONTENT
ORDER BY CON_ID, CON_CATEGORY, CON_LANG, CON_PARENT ";
ORDER BY CON_ID, CON_CATEGORY, CON_PARENT, CON_LANG";
G::LoadClass("wsTools");
$workSpace = new workspaceTools($workSpace);
$workSpace->getDBInfo();
$link = mysql_pconnect($workSpace->dbHost, $workSpace->dbUser, $workSpace->dbPass)
or die ("Could not connect");
mysql_select_db($workSpace->dbName, $link);
mysql_query('SET OPTION SQL_BIG_SELECTS=1');
$result = mysql_unbuffered_query($sql);
$result = mysql_unbuffered_query($sql, $link);
$list = array();
$default = array();
$sw = array('CON_ID'=>'','CON_CATEGORY'=>'','CON_PARENT'=>'');
while ($row = mysql_fetch_assoc($result)) {
if ($sw['CON_ID'] == $row['CON_ID'] && $sw['CON_CATEGORY'] == $row['CON_CATEGORY'] && $sw['CON_PARENT'] == $row['CON_PARENT']) {
$list[] = $row;
if ($sw['CON_LANG'] == $langs[$key]) {
$default = $row;
}
} else {
$this->rowsClustered++;
if (count($langs) != count($list)) {
@@ -342,6 +349,9 @@ class Content extends BaseContent {
$default = array();
$list[] = $row;
}
if ($sw['CON_LANG'] == $langs[$key]) {
$default = $row;
}
$this->rowsProcessed++;
}
if (count($langs) != count($list)) {
@@ -352,12 +362,14 @@ class Content extends BaseContent {
mysql_free_result($result);
$total = $this->rowsProcessed + $this->rowsInserted;
if (!isset($_SERVER['SERVER_NAME'])) {
CLI::logging("Rows Processed ---> $this->rowsProcessed ..... \n");
CLI::logging("Rows Clustered ---> $this->rowsClustered ..... \n");
CLI::logging("Rows Unchanged ---> $this->rowsUnchanged ..... \n");
CLI::logging("Rows Inserted ---> $this->rowsInserted ..... \n");
CLI::logging("Rows Total ---> $total ..... \n");
}
}
function checkLanguage($content, $default)
{

3
workflow/engine/classes/model/map/AdditionalTablesMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AdditionalTablesMapBuilder {
class AdditionalTablesMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/AppCacheViewMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppCacheViewMapBuilder {
class AppCacheViewMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/AppDelayMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppDelayMapBuilder {
class AppDelayMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/AppDelegationMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppDelegationMapBuilder {
class AppDelegationMapBuilder
{
/**
* The (dot-path) name of this class

5
workflow/engine/classes/model/map/AppDocumentMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppDocumentMapBuilder {
class AppDocumentMapBuilder
{
/**
* The (dot-path) name of this class
@@ -92,6 +93,8 @@ class AppDocumentMapBuilder {
$tMap->addColumn('APP_DOC_STATUS_DATE', 'AppDocStatusDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('APP_DOC_FIELDNAME', 'AppDocFieldname', 'string', CreoleTypes::VARCHAR, false, 150);
$tMap->addValidator('APP_DOC_UID', 'maxLength', 'propel.validator.MaxLengthValidator', '32', 'Application Document UID can be no larger than 32 in size');
$tMap->addValidator('APP_DOC_UID', 'required', 'propel.validator.RequiredValidator', '', 'Application Document UID is required.');

3
workflow/engine/classes/model/map/AppEventMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppEventMapBuilder {
class AppEventMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/AppFolderMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppFolderMapBuilder {
class AppFolderMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/AppHistoryMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppHistoryMapBuilder {
class AppHistoryMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/AppMessageMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppMessageMapBuilder {
class AppMessageMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/AppNotesMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppNotesMapBuilder {
class AppNotesMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/AppOwnerMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppOwnerMapBuilder {
class AppOwnerMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/AppSolrQueueMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppSolrQueueMapBuilder {
class AppSolrQueueMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/AppThreadMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class AppThreadMapBuilder {
class AppThreadMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/ApplicationMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ApplicationMapBuilder {
class ApplicationMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/CalendarAssignmentsMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class CalendarAssignmentsMapBuilder {
class CalendarAssignmentsMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/CalendarBusinessHoursMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class CalendarBusinessHoursMapBuilder {
class CalendarBusinessHoursMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/CalendarDefinitionMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class CalendarDefinitionMapBuilder {
class CalendarDefinitionMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/CalendarHolidaysMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class CalendarHolidaysMapBuilder {
class CalendarHolidaysMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/CaseSchedulerMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class CaseSchedulerMapBuilder {
class CaseSchedulerMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/CaseTrackerMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class CaseTrackerMapBuilder {
class CaseTrackerMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/CaseTrackerObjectMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class CaseTrackerObjectMapBuilder {
class CaseTrackerObjectMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/ConfigurationMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ConfigurationMapBuilder {
class ConfigurationMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/ContentMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ContentMapBuilder {
class ContentMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/DashletInstanceMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class DashletInstanceMapBuilder {
class DashletInstanceMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/DashletMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class DashletMapBuilder {
class DashletMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/DbSourceMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class DbSourceMapBuilder {
class DbSourceMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/DepartmentMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class DepartmentMapBuilder {
class DepartmentMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/DimTimeCompleteMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class DimTimeCompleteMapBuilder {
class DimTimeCompleteMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/DimTimeDelegateMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class DimTimeDelegateMapBuilder {
class DimTimeDelegateMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/DynaformMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class DynaformMapBuilder {
class DynaformMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/EventMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class EventMapBuilder {
class EventMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/FieldConditionMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class FieldConditionMapBuilder {
class FieldConditionMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/FieldsMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class FieldsMapBuilder {
class FieldsMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/GatewayMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class GatewayMapBuilder {
class GatewayMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/GroupUserMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class GroupUserMapBuilder {
class GroupUserMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/GroupwfMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class GroupwfMapBuilder {
class GroupwfMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/HolidayMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class HolidayMapBuilder {
class HolidayMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/InputDocumentMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class InputDocumentMapBuilder {
class InputDocumentMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/IsoCountryMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class IsoCountryMapBuilder {
class IsoCountryMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/IsoLocationMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class IsoLocationMapBuilder {
class IsoLocationMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/IsoSubdivisionMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class IsoSubdivisionMapBuilder {
class IsoSubdivisionMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/LanguageMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class LanguageMapBuilder {
class LanguageMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/LexicoMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class LexicoMapBuilder {
class LexicoMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/LogCasesSchedulerMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class LogCasesSchedulerMapBuilder {
class LogCasesSchedulerMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/LoginLogMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class LoginLogMapBuilder {
class LoginLogMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/ObjectPermissionMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ObjectPermissionMapBuilder {
class ObjectPermissionMapBuilder
{
/**
* The (dot-path) name of this class

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

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class OutputDocumentMapBuilder {
class OutputDocumentMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/ProcessCategoryMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ProcessCategoryMapBuilder {
class ProcessCategoryMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/ProcessMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ProcessMapBuilder {
class ProcessMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/ProcessOwnerMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ProcessOwnerMapBuilder {
class ProcessOwnerMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/ProcessUserMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ProcessUserMapBuilder {
class ProcessUserMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/ReportTableMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ReportTableMapBuilder {
class ReportTableMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/ReportVarMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ReportVarMapBuilder {
class ReportVarMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/RouteMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class RouteMapBuilder {
class RouteMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/SessionMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class SessionMapBuilder {
class SessionMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/ShadowTableMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ShadowTableMapBuilder {
class ShadowTableMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/StageMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class StageMapBuilder {
class StageMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/StepMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class StepMapBuilder {
class StepMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/StepSupervisorMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class StepSupervisorMapBuilder {
class StepSupervisorMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/StepTriggerMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class StepTriggerMapBuilder {
class StepTriggerMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/SubApplicationMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class SubApplicationMapBuilder {
class SubApplicationMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/SubProcessMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class SubProcessMapBuilder {
class SubProcessMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/SwimlanesElementsMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class SwimlanesElementsMapBuilder {
class SwimlanesElementsMapBuilder
{
/**
* The (dot-path) name of this class

5
workflow/engine/classes/model/map/TaskMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class TaskMapBuilder {
class TaskMapBuilder
{
/**
* The (dot-path) name of this class
@@ -88,6 +89,8 @@ class TaskMapBuilder {
$tMap->addColumn('TAS_ASSIGN_VARIABLE', 'TasAssignVariable', 'string', CreoleTypes::VARCHAR, true, 100);
$tMap->addColumn('TAS_GROUP_VARIABLE', 'TasGroupVariable', 'string', CreoleTypes::VARCHAR, false, 100);
$tMap->addColumn('TAS_MI_INSTANCE_VARIABLE', 'TasMiInstanceVariable', 'string', CreoleTypes::VARCHAR, true, 100);
$tMap->addColumn('TAS_MI_COMPLETE_VARIABLE', 'TasMiCompleteVariable', 'string', CreoleTypes::VARCHAR, true, 100);

3
workflow/engine/classes/model/map/TaskUserMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class TaskUserMapBuilder {
class TaskUserMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/TranslationMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class TranslationMapBuilder {
class TranslationMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/TriggersMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class TriggersMapBuilder {
class TriggersMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/UsersMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class UsersMapBuilder {
class UsersMapBuilder
{
/**
* The (dot-path) name of this class

3
workflow/engine/classes/model/map/UsersPropertiesMapBuilder.php
View File

@@ -16,7 +16,8 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class UsersPropertiesMapBuilder {
class UsersPropertiesMapBuilder
{
/**
* The (dot-path) name of this class

189
workflow/engine/classes/model/om/BaseAdditionalTables.php
View File

@@ -16,8 +16,8 @@ include_once 'classes/model/AdditionalTablesPeer.php';
*
* @package workflow.classes.model.om
*/
abstract class BaseAdditionalTables extends BaseObject implements Persistent {
abstract class BaseAdditionalTables extends BaseObject implements Persistent
{
/**
* The Peer class.
@@ -27,112 +27,96 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent {
*/
protected static $peer;
/**
* The value for the add_tab_uid field.
* @var string
*/
protected $add_tab_uid = '';
/**
* The value for the add_tab_name field.
* @var string
*/
protected $add_tab_name = '';
/**
* The value for the add_tab_class_name field.
* @var string
*/
protected $add_tab_class_name = '';
/**
* The value for the add_tab_description field.
* @var string
*/
protected $add_tab_description;
/**
* The value for the add_tab_sdw_log_insert field.
* @var int
*/
protected $add_tab_sdw_log_insert = 0;
/**
* The value for the add_tab_sdw_log_update field.
* @var int
*/
protected $add_tab_sdw_log_update = 0;
/**
* The value for the add_tab_sdw_log_delete field.
* @var int
*/
protected $add_tab_sdw_log_delete = 0;
/**
* The value for the add_tab_sdw_log_select field.
* @var int
*/
protected $add_tab_sdw_log_select = 0;
/**
* The value for the add_tab_sdw_max_length field.
* @var int
*/
protected $add_tab_sdw_max_length = 0;
/**
* The value for the add_tab_sdw_auto_delete field.
* @var int
*/
protected $add_tab_sdw_auto_delete = 0;
/**
* The value for the add_tab_plg_uid field.
* @var string
*/
protected $add_tab_plg_uid = '';
/**
* The value for the dbs_uid field.
* @var string
*/
protected $dbs_uid = '';
/**
* The value for the pro_uid field.
* @var string
*/
protected $pro_uid = '';
/**
* The value for the add_tab_type field.
* @var string
*/
protected $add_tab_type = '';
/**
* The value for the add_tab_grid field.
* @var string
*/
protected $add_tab_grid = '';
/**
* The value for the add_tab_tag field.
* @var string
@@ -778,7 +762,7 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent {
* wraps the doSave() worker method in a transaction.
*
* @param Connection $con
* @return int The number of rows affected by this insert/update and any referring fk objects' save() operations.
* @return int The number of rows affected by this insert/update
* @throws PropelException
* @see doSave()
*/
@@ -810,7 +794,7 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent {
* All related objects are also updated in this method.
*
* @param Connection $con
* @return int The number of rows affected by this insert/update and any referring fk objects' save() operations.
* @return int The number of rows affected by this insert/update and any referring
* @throws PropelException
* @see save()
*/
@@ -890,7 +874,8 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent {
* an aggreagated array of ValidationFailed objects will be returned.
*
* @param array $columns Array of column names to validate.
* @return mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
* @return mixed <code>true</code> if all validations pass;
array of <code>ValidationFailed</code> objects otherwise.
*/
protected function doValidate($columns = null)
{
@@ -1124,22 +1109,70 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent {
{
$keys = AdditionalTablesPeer::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) $this->setAddTabUid($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setAddTabName($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setAddTabClassName($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setAddTabDescription($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setAddTabSdwLogInsert($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setAddTabSdwLogUpdate($arr[$keys[5]]);
if (array_key_exists($keys[6], $arr)) $this->setAddTabSdwLogDelete($arr[$keys[6]]);
if (array_key_exists($keys[7], $arr)) $this->setAddTabSdwLogSelect($arr[$keys[7]]);
if (array_key_exists($keys[8], $arr)) $this->setAddTabSdwMaxLength($arr[$keys[8]]);
if (array_key_exists($keys[9], $arr)) $this->setAddTabSdwAutoDelete($arr[$keys[9]]);
if (array_key_exists($keys[10], $arr)) $this->setAddTabPlgUid($arr[$keys[10]]);
if (array_key_exists($keys[11], $arr)) $this->setDbsUid($arr[$keys[11]]);
if (array_key_exists($keys[12], $arr)) $this->setProUid($arr[$keys[12]]);
if (array_key_exists($keys[13], $arr)) $this->setAddTabType($arr[$keys[13]]);
if (array_key_exists($keys[14], $arr)) $this->setAddTabGrid($arr[$keys[14]]);
if (array_key_exists($keys[15], $arr)) $this->setAddTabTag($arr[$keys[15]]);
if (array_key_exists($keys[0], $arr)) {
$this->setAddTabUid($arr[$keys[0]]);
}
if (array_key_exists($keys[1], $arr)) {
$this->setAddTabName($arr[$keys[1]]);
}
if (array_key_exists($keys[2], $arr)) {
$this->setAddTabClassName($arr[$keys[2]]);
}
if (array_key_exists($keys[3], $arr)) {
$this->setAddTabDescription($arr[$keys[3]]);
}
if (array_key_exists($keys[4], $arr)) {
$this->setAddTabSdwLogInsert($arr[$keys[4]]);
}
if (array_key_exists($keys[5], $arr)) {
$this->setAddTabSdwLogUpdate($arr[$keys[5]]);
}
if (array_key_exists($keys[6], $arr)) {
$this->setAddTabSdwLogDelete($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
$this->setAddTabSdwLogSelect($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
$this->setAddTabSdwMaxLength($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
$this->setAddTabSdwAutoDelete($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
$this->setAddTabPlgUid($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
$this->setDbsUid($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
$this->setProUid($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
$this->setAddTabType($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
$this->setAddTabGrid($arr[$keys[14]]);
}
if (array_key_exists($keys[15], $arr)) {
$this->setAddTabTag($arr[$keys[15]]);
}
}
/**
@@ -1151,22 +1184,70 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent {
{
$criteria = new Criteria(AdditionalTablesPeer::DATABASE_NAME);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_UID)) $criteria->add(AdditionalTablesPeer::ADD_TAB_UID, $this->add_tab_uid);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_NAME)) $criteria->add(AdditionalTablesPeer::ADD_TAB_NAME, $this->add_tab_name);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_CLASS_NAME)) $criteria->add(AdditionalTablesPeer::ADD_TAB_CLASS_NAME, $this->add_tab_class_name);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_DESCRIPTION)) $criteria->add(AdditionalTablesPeer::ADD_TAB_DESCRIPTION, $this->add_tab_description);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT, $this->add_tab_sdw_log_insert);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE, $this->add_tab_sdw_log_update);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE, $this->add_tab_sdw_log_delete);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT, $this->add_tab_sdw_log_select);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH, $this->add_tab_sdw_max_length);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE)) $criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE, $this->add_tab_sdw_auto_delete);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_PLG_UID)) $criteria->add(AdditionalTablesPeer::ADD_TAB_PLG_UID, $this->add_tab_plg_uid);
if ($this->isColumnModified(AdditionalTablesPeer::DBS_UID)) $criteria->add(AdditionalTablesPeer::DBS_UID, $this->dbs_uid);
if ($this->isColumnModified(AdditionalTablesPeer::PRO_UID)) $criteria->add(AdditionalTablesPeer::PRO_UID, $this->pro_uid);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_TYPE)) $criteria->add(AdditionalTablesPeer::ADD_TAB_TYPE, $this->add_tab_type);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_GRID)) $criteria->add(AdditionalTablesPeer::ADD_TAB_GRID, $this->add_tab_grid);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_TAG)) $criteria->add(AdditionalTablesPeer::ADD_TAB_TAG, $this->add_tab_tag);
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_UID)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_UID, $this->add_tab_uid);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_NAME)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_NAME, $this->add_tab_name);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_CLASS_NAME)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_CLASS_NAME, $this->add_tab_class_name);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_DESCRIPTION)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_DESCRIPTION, $this->add_tab_description);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT, $this->add_tab_sdw_log_insert);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE, $this->add_tab_sdw_log_update);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE, $this->add_tab_sdw_log_delete);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT, $this->add_tab_sdw_log_select);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH, $this->add_tab_sdw_max_length);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE, $this->add_tab_sdw_auto_delete);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_PLG_UID)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_PLG_UID, $this->add_tab_plg_uid);
}
if ($this->isColumnModified(AdditionalTablesPeer::DBS_UID)) {
$criteria->add(AdditionalTablesPeer::DBS_UID, $this->dbs_uid);
}
if ($this->isColumnModified(AdditionalTablesPeer::PRO_UID)) {
$criteria->add(AdditionalTablesPeer::PRO_UID, $this->pro_uid);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_TYPE)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_TYPE, $this->add_tab_type);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_GRID)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_GRID, $this->add_tab_grid);
}
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_TAG)) {
$criteria->add(AdditionalTablesPeer::ADD_TAB_TAG, $this->add_tab_tag);
}
return $criteria;
}
@@ -1295,5 +1376,5 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent {
}
return self::$peer;
}
}
} // BaseAdditionalTables

Some files were not shown because too many files have changed in this diff Show More