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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
user
2012-11-15 12:32:01 -04:00
parent 390efac0be 520baa83f2
commit d4ea48ac19
25 changed files with 129 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/classes/class.applications.php
View File

@@ -149,6 +149,7 @@ class Applications
$Criteria->addAlias( 'CU', 'USERS' );
$Criteria->addJoin( AppCacheViewPeer::USR_UID, 'CU.USR_UID', Criteria::LEFT_JOIN );
$Criteria->addAsColumn( 'USR_UID', 'CU.USR_UID' );
$Criteria->addAsColumn( 'USR_FIRSTNAME', 'CU.USR_FIRSTNAME' );
$Criteria->addAsColumn( 'USR_LASTNAME', 'CU.USR_LASTNAME' );
$Criteria->addAsColumn( 'USR_USERNAME', 'CU.USR_USERNAME' );

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

@@ -4717,6 +4717,11 @@ class Cases
if ($sTo != null) {
$oSpool = new spoolRun();
if ($aConfiguration['MESS_RAUTH'] == false || (is_string($aConfiguration['MESS_RAUTH']) && $aConfiguration['MESS_RAUTH'] == 'false')) {
$aConfiguration['MESS_RAUTH'] = 0;
} else {
$aConfiguration['MESS_RAUTH'] = 1;
}
$oSpool->setConfig(array(
"MESS_ENGINE" => $aConfiguration["MESS_ENGINE"],

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

@@ -169,7 +169,7 @@ class dynaformEditor extends WebResource
$oHeadPublisher->addScriptCode("var TRANSLATIONS = " . G::json_encode($labesTrans) . ";");
$oHeadPublisher->setTitle(G::LoadTranslation('ID_DYNAFORM_EDITOR') . ' - ' . $Properties['DYN_TITLE']);
$G_PUBLISH->AddContent('blank');
$this->panelConf['title'] = $this->title;
$this->panelConf['title'] = '';
$G_PUBLISH->AddContent('panel-init', 'mainPanel', $this->panelConf);
if ($Properties['DYN_TYPE'] == 'xmlform') {
$G_PUBLISH->AddContent('xmlform', 'toolbar', 'dynaforms/fields_Toolbar', 'display:none', $Parameters, '', '');

5
workflow/engine/classes/class.spool.php
View File

@@ -542,6 +542,11 @@ class spoolRun
if ($aConfiguration["MESS_ENABLED"] == "1") {
require_once ("classes/model/AppMessage.php");
if ($aConfiguration['MESS_RAUTH'] == false || (is_string($aConfiguration['MESS_RAUTH']) && $aConfiguration['MESS_RAUTH'] == 'false')) {
$aConfiguration['MESS_RAUTH'] = 0;
} else {
$aConfiguration['MESS_RAUTH'] = 1;
}
$this->setConfig( array ("MESS_ENGINE" => $aConfiguration["MESS_ENGINE"],"MESS_SERVER" => $aConfiguration["MESS_SERVER"],"MESS_PORT" => $aConfiguration["MESS_PORT"],"MESS_ACCOUNT" => $aConfiguration["MESS_ACCOUNT"],"MESS_PASSWORD" => $aConfiguration["MESS_PASSWORD"],"SMTPAuth" => $aConfiguration["MESS_RAUTH"],"SMTPSecure" => $aConfiguration["SMTPSecure"]
) );

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

@@ -931,6 +931,10 @@ class System
$skinListArray = array ();
$customSkins = glob( PATH_CUSTOM_SKINS . "*/config.xml" );
if (!is_array($customSkins)) {
$customSkins = array();
}
// getting al base skins
$baseSkins = glob( G::ExpandPath( "skinEngine" ) . '*/config.xml' );

23
workflow/engine/classes/class.toolBar.php
View File

@@ -155,6 +155,29 @@ class XmlForm_Field_toolButton extends XmlForm_Field
case 'text/image':
$html = $this->htmlentities( $this->label, ENT_QUOTES, 'utf-8' ) . '<br/><img src="' . htmlentities( $url, ENT_QUOTES, 'utf-8' ) . '"' . (($this->style) ? ' style="' . $this->style . '"' : '') . '/>';
break;
case 'dropdown':
$html = '';
if (isset($this->owner->values['PRO_UID'])) {
G::LoadClass('processMap');
$criteria = processMap::getDynaformsCriteria($this->owner->values['PRO_UID']);
$dataset = DynaformPeer::doSelectRS($criteria);
if ($dataset->getRecordCount() > 0) {
$html .= '<span style="font-size: 8pt;margin-left: 20px;">' . G::LoadTranslation('ID_EDITING_DYNAFORM');
$html .= ': <select onchange="window.location = \'dynaforms_Editor?PRO_UID=' . $this->owner->values['PRO_UID'];
$html .= '&DYN_UID=\' + this.value;" class="module_app_input___gray">';
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
while ($row = $dataset->getRow()) {
$html .= '<option value="' . $row['DYN_UID'] . '"';
$html .= ($this->owner->values['DYN_UID'] == $row['DYN_UID'] ? ' selected="selected"' : '') . '>';
$html .= htmlentities($row['DYN_TITLE'], ENT_QUOTES, 'utf-8') . '</option>';
$dataset->next();
}
$html .= '</select></span>';
}
}
return $html;
break;
case 'class':
$html = '<a href="#" onclick="' . $this->onclick . '" onmouseover="backImage(this, \'url(/images/dynamicForm/hover.gif) no-repeat\')" onmouseout="backImage(this, \'\')" style="width:25px;height:25px;margin-bottom:3px">
<div class="' . $this->class . '" title="' . strip_tags( $this->label ) . '" style="width:25px;height:25px;margin-bottom:3px"></div>

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

@@ -749,6 +749,11 @@ class wsBase
}
}
$aSetup['MESS_PASSWORD'] = $passwd;
if ($aSetup['MESS_RAUTH'] == false || (is_string($aSetup['MESS_RAUTH']) && $aSetup['MESS_RAUTH'] == 'false')) {
$aSetup['MESS_RAUTH'] = 0;
} else {
$aSetup['MESS_RAUTH'] = 1;
}
$oSpool = new spoolRun();
$oSpool->setConfig( array ('MESS_ENGINE' => $aSetup['MESS_ENGINE'],'MESS_SERVER' => $aSetup['MESS_SERVER'],'MESS_PORT' => $aSetup['MESS_PORT'],'MESS_ACCOUNT' => $aSetup['MESS_ACCOUNT'],'MESS_PASSWORD' => $aSetup['MESS_PASSWORD'],'SMTPAuth' => $aSetup['MESS_RAUTH']

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

@@ -315,6 +315,8 @@ class workspaceTools
} elseif ($first) {
CLI::logging( "Updating XML form translations with $poName\n" );
Language::import( $poFile, true, false );
CLI::logging( "Updating database translations with $poName\n" );
Language::import( $poFile, false, true );
}
}
}

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

@@ -217,6 +217,12 @@ class AppNotes extends BaseAppNotes
$sTo = ((($aUser['USR_FIRSTNAME'] != '') || ($aUser['USR_LASTNAME'] != '')) ? $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' ' : '') . '<' . $aUser['USR_EMAIL'] . '>';
$oSpool = new spoolRun();
if ($aConfiguration['MESS_RAUTH'] == false || (is_string($aConfiguration['MESS_RAUTH']) && $aConfiguration['MESS_RAUTH'] == 'false')) {
$aConfiguration['MESS_RAUTH'] = 0;
} else {
$aConfiguration['MESS_RAUTH'] = 1;
}
$oSpool->setConfig( array ('MESS_ENGINE' => $aConfiguration['MESS_ENGINE'],'MESS_SERVER' => $aConfiguration['MESS_SERVER'],'MESS_PORT' => $aConfiguration['MESS_PORT'],'MESS_ACCOUNT' => $aConfiguration['MESS_ACCOUNT'],'MESS_PASSWORD' => $aConfiguration['MESS_PASSWORD'],'SMTPAuth' => $aConfiguration['MESS_RAUTH'] == '1' ? true : false,'SMTPSecure' => isset( $aConfiguration['SMTPSecure'] ) ? $aConfiguration['SMTPSecure'] : '') );
$oSpool->create( array ('msg_uid' => '','app_uid' => $appUid,'del_index' => 1,'app_msg_type' => 'DERIVATION','app_msg_subject' => $sSubject,'app_msg_from' => $sFrom,'app_msg_to' => $sTo,'app_msg_body' => $sBody,'app_msg_cc' => '','app_msg_bcc' => '','app_msg_attach' => '','app_msg_template' => '','app_msg_status' => 'pending') );
if (($aConfiguration['MESS_BACKGROUND'] == '') || ($aConfiguration['MESS_TRY_SEND_INMEDIATLY'] == '1')) {

2
workflow/engine/methods/authSources/authSources_Edit.php
View File

@@ -88,7 +88,7 @@ if ($fields['AUTH_SOURCE_PROVIDER'] == 'ldap') {
// The attributes the users
G::loadClass('pmFunctions');
$data = executeQuery('DESCRIBE USERS');
$fieldSet = array('USR_UID', 'USR_USERNAME', 'USR_PASSWORD', 'USR_EMAIL', 'USR_CREATE_DATE', 'USR_UPDATE_DATE', 'USR_STATUS', 'USR_COUNTRY', 'USR_CITY', 'USR_LOCATION', 'DEP_UID', 'USR_RESUME', 'USR_ROLE', 'USR_REPORTS_TO', 'USR_REPLACED_BY', 'USR_UX');
$fieldSet = array('USR_UID', 'USR_USERNAME', 'USR_PASSWORD', 'USR_EMAIL', 'USR_CREATE_DATE', 'USR_UPDATE_DATE', 'USR_COUNTRY', 'USR_CITY', 'USR_LOCATION', 'DEP_UID', 'USR_RESUME', 'USR_ROLE', 'USR_REPORTS_TO', 'USR_REPLACED_BY', 'USR_UX');
$attributes = '';
foreach ($data as $value) {
if (!(in_array($value['Field'], $fieldSet))) {

16
workflow/engine/methods/authSources/authSources_ImportUsers.php
View File

@@ -72,6 +72,22 @@ foreach ($_POST['aUsers'] as $sUser) {
foreach ($aAttributes as $value) {
if (isset($aUser[$value['attributeUser']])) {
$aData[$value['attributeUser']] = str_replace( "*", "'", $aUser[$value['attributeUser']] );
if ($value['attributeUser'] == 'USR_STATUS') {
$evalValue = $aData[$value['attributeUser']];
$statusValue = 'INACTIVE';
if (is_string($evalValue) && G::toUpper($evalValue) == 'ACTIVE') {
$statusValue = 'ACTIVE';
}
if (is_bool($evalValue) && $evalValue == true) {
$statusValue = 'ACTIVE';
}
if ( (is_float($evalValue) || is_int($evalValue) ||
is_integer($evalValue) || is_numeric($evalValue)) && (int)$evalValue != 0) {
$statusValue = 'ACTIVE';
}
$aData[$value['attributeUser']] = $statusValue;
}
}
}
}

5
workflow/engine/methods/cases/caseMessageHistory_Ajax.php
View File

@@ -159,6 +159,11 @@ if ($actionAjax == 'sendMailMessage_JXP') {
$aConfiguration['MESS_PASSWORD'] = $passwd;
$oSpool = new spoolRun();
if ($aConfiguration['MESS_RAUTH'] == false || (is_string($aConfiguration['MESS_RAUTH']) && $aConfiguration['MESS_RAUTH'] == 'false')) {
$aConfiguration['MESS_RAUTH'] = 0;
} else {
$aConfiguration['MESS_RAUTH'] = 1;
}
$oSpool->setConfig( array ('MESS_ENGINE' => $aConfiguration['MESS_ENGINE'],'MESS_SERVER' => $aConfiguration['MESS_SERVER'],'MESS_PORT' => $aConfiguration['MESS_PORT'],'MESS_ACCOUNT' => $aConfiguration['MESS_ACCOUNT'],'MESS_PASSWORD' => $passwd,'SMTPAuth' => $aConfiguration['MESS_RAUTH']
) );

6
workflow/engine/methods/cases/cases_Ajax.php
View File

@@ -774,6 +774,12 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
}
$oSpool = new spoolRun();
if ($aConfiguration['MESS_RAUTH'] == false || (is_string($aConfiguration['MESS_RAUTH']) && $aConfiguration['MESS_RAUTH'] == 'false')) {
$aConfiguration['MESS_RAUTH'] = 0;
} else {
$aConfiguration['MESS_RAUTH'] = 1;
}
$oSpool->setConfig( array ('MESS_ENGINE' => $aConfiguration['MESS_ENGINE'],'MESS_SERVER' => $aConfiguration['MESS_SERVER'],'MESS_PORT' => $aConfiguration['MESS_PORT'],'MESS_ACCOUNT' => $aConfiguration['MESS_ACCOUNT'],'MESS_PASSWORD' => $aConfiguration['MESS_PASSWORD'],'SMTPAuth' => $aConfiguration['MESS_RAUTH']
) );
$passwd = $oSpool->config['MESS_PASSWORD'];

6
workflow/engine/methods/login/retrivePassword.php
View File

@@ -55,7 +55,11 @@ if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'
G::LoadClass('spool');
$oSpool = new spoolRun();
if ($aSetup['MESS_RAUTH'] == false || (is_string($aSetup['MESS_RAUTH']) && $aSetup['MESS_RAUTH'] == 'false')) {
$aSetup['MESS_RAUTH'] = 0;
} else {
$aSetup['MESS_RAUTH'] = 1;
}
$oSpool->setConfig( array(
'MESS_ENGINE' => $aSetup['MESS_ENGINE'],
'MESS_SERVER' => $aSetup['MESS_SERVER'],

10
workflow/engine/skinEngine/base/extJsInitLoad.html
View File

@@ -35,7 +35,7 @@
#loading-msg {
font: bold 11px arial,tahoma,sans-serif;
}
</style>
</head>
<body>
@@ -56,15 +56,9 @@
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Components...';</script>
<script type='text/javascript' src='/js/ext/ext-all.js'></script>
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Extensions';</script>
<!--
<script type='text/javascript' src='/js/ext/wz_jsgraphics.js'></script>
<script type='text/javascript' src='/js/ext/mootools.js'></script>
<script type='text/javascript' src='/js/ext/moocanvas.js'></script>
!-->
<script type='text/javascript' src='/js/ext/draw2d.js'></script>
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initializing...';</script>
{styles}
{bodyTemplate}
</body>
</html>

10
workflow/engine/skinEngine/simplified/extJsInitLoad.html
View File

@@ -36,7 +36,7 @@
#loading-msg {
font: bold 11px arial,tahoma,sans-serif;
}
</style>
</head>
<body>
@@ -57,15 +57,9 @@
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Components...';</script>
<script type='text/javascript' src='/js/ext/ext-all.js'></script>
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Extensions';</script>
<!--
<script type='text/javascript' src='/js/ext/wz_jsgraphics.js'></script>
<script type='text/javascript' src='/js/ext/mootools.js'></script>
<script type='text/javascript' src='/js/ext/moocanvas.js'></script>
!-->
<script type='text/javascript' src='/js/ext/draw2d.js'></script>
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initializing...';</script>
{styles}
{bodyTemplate}
</body>
</html>

10
workflow/engine/skinEngine/uxmodern/extJsInitLoad.html
View File

@@ -35,7 +35,7 @@
#loading-msg {
font: bold 11px arial,tahoma,sans-serif;
}
</style>
</head>
<body>
@@ -56,15 +56,9 @@
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Components...';</script>
<script type='text/javascript' src='/js/ext/ext-all.js'></script>
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Extensions';</script>
<!--
<script type='text/javascript' src='/js/ext/wz_jsgraphics.js'></script>
<script type='text/javascript' src='/js/ext/mootools.js'></script>
<script type='text/javascript' src='/js/ext/moocanvas.js'></script>
!-->
<script type='text/javascript' src='/js/ext/draw2d.js'></script>
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initializing...';</script>
{styles}
{bodyTemplate}
</body>
</html>

10
workflow/engine/skinEngine/uxs/extJsInitLoad.html
View File

@@ -35,7 +35,7 @@
#loading-msg {
font: bold 11px arial,tahoma,sans-serif;
}
</style>
</head>
<body>
@@ -56,15 +56,9 @@
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Components...';</script>
<script type='text/javascript' src='/js/ext/ext-all.js'></script>
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading UI Extensions';</script>
<!--
<script type='text/javascript' src='/js/ext/wz_jsgraphics.js'></script>
<script type='text/javascript' src='/js/ext/mootools.js'></script>
<script type='text/javascript' src='/js/ext/moocanvas.js'></script>
!-->
<script type='text/javascript' src='/js/ext/draw2d.js'></script>
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initializing...';</script>
{styles}
{bodyTemplate}
</body>
</html>

2
workflow/engine/templates/admin/emails.js
View File

@@ -673,6 +673,7 @@ var testEmailWindow = new Ext.Window({
width: 470,
closable:false,
plain: true,
modal: true,
autoHeight: true,
layout: 'fit',
y: 82,
@@ -683,6 +684,7 @@ var testEmailWindowMail = new Ext.Window({
width: 470,
closable:false,
plain: true,
modal: true,
autoHeight: true,
layout: 'fit',
y: 82,

18
workflow/engine/templates/cases/casesList.js
View File

@@ -491,7 +491,7 @@ Ext.onReady ( function() {
return _FNF(s.data.USR_USERNAME, s.data.USR_FIRSTNAME, s.data.USR_LASTNAME);
}
else {
return '';
return '[' + _('ID_UNASSIGNED').toUpperCase() + ']';
}
};
@@ -808,7 +808,9 @@ Ext.onReady ( function() {
comboProcess.getStore().loadData(processValues);
},
failure: function ( result, request) {
Ext.MessageBox.alert('Failed', result.responseText);
if (typeof(result.responseText) != 'undefined') {
Ext.MessageBox.alert(_('ID_FAILED'), result.responseText);
}
}
});
@@ -927,7 +929,9 @@ Ext.onReady ( function() {
},
failure: function ( result, request) {
Ext.MessageBox.alert('Failed', result.responseText);
if (typeof(result.responseText) != 'undefined') {
Ext.MessageBox.alert(_('ID_FAILED'), result.responseText);
}
}
});
}},
@@ -1257,7 +1261,9 @@ Ext.onReady ( function() {
}
},
failure: function ( result, request) {
Ext.MessageBox.alert( _('ID_FAILED'), result.responseText);
if (typeof(result.responseText) != 'undefined') {
Ext.MessageBox.alert( _('ID_FAILED'), result.responseText);
}
}
});
});
@@ -1285,7 +1291,9 @@ Ext.onReady ( function() {
}
},
failure: function ( result, request) {
Ext.MessageBox.alert('Failed', result.responseText);
if (typeof(result.responseText) != 'undefined') {
Ext.MessageBox.alert(_('ID_FAILED'), result.responseText);
}
}
});
});

11
workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml
View File

@@ -9,11 +9,11 @@
<en>Enable HTML Editing</en>
</PME_HTML_ENABLETEMPLATE>
<PME_RESTORE_HTML type="button" onclick="dynaformEditor.restoreHTML();">
<PME_RESTORE_HTML type="button" onclick="dynaformEditor.restoreHTML(); this.blur();">
<en>Restore Original HTML</en>
</PME_RESTORE_HTML>
<PME_REFRESH_VIEW type="button" onclick="html2_html();">
<PME_REFRESH_VIEW type="button" onclick="html2_html(); this.blur();">
<en>Refresh View</en>
</PME_REFRESH_VIEW>
@@ -79,13 +79,14 @@ getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").onclick=function()
label: "@G::LoadTranslation(ID_MSG_ENABLE_HTML_EDITING)",
size:{ w: 350, h: 150 },
action: function() { },
cancel: function() {
cancel: function () {
getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").checked = false;
}
});
dynaformEditor.setEnableTemplate( this.checked );
dynaformEditor.setEnableTemplate(this.checked);
}
}
]]></PME_RESIZE_JS>
</dynaForm>
</dynaForm>

4
workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
View File

@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dynaForm name="fields_Toolbar" version="1.0" type="toolbar" align="left" width="100%">
<PRO_UID type="private" />
<DYN_UID type="private" />
<separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save()" home="public_html" buttonType="class">
<en>Save</en>
@@ -92,4 +94,6 @@
<grid type="toolButton" class="ss_sprite button_toolbar ss_table" onclick="fieldsAdd('grid')" buttonType="class">
<en>Grid</en>
</grid>
<separator10 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<dynaforms type="toolButton" class="" onclick="" buttonType="dropdown" />
</dynaForm>

4
workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
View File

@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dynaForm name="fields_Toolbar" version="1.0" type="toolbar" align="left" width="894px">
<PRO_UID type="private" />
<DYN_UID type="private" />
<separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save()" buttonType="class">
<en>Save</en>
@@ -49,4 +51,6 @@
<file type="toolButton" class="ss_sprite button_toolbar ss_upload" onclick="fieldsAdd('file')" buttonType="class">
<en>File</en>
</file>
<separator10 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<dynaforms type="toolButton" class="" onclick="" buttonType="dropdown" />
</dynaForm>

1
workflow/public_html/sysGeneric.php
View File

@@ -607,6 +607,7 @@
$noLoginFiles[] = 'retrivePassword';
$noLoginFiles[] = 'defaultAjaxDynaform';
$noLoginFiles[] = 'dynaforms_checkDependentFields';
$noLoginFiles[] = 'genericAjax';
$noLoginFolders[] = 'services';
$noLoginFolders[] = 'tracker';