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

Merged in paulis/processmaker/HOR-774 (pull request #4098)

Browse Source 
HOR-774
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-18 12:32:23 -04:00
parent 8c7370a1c3 30545631cc
commit 1a4344b638
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -279,16 +279,16 @@ function executeQuery ($SqlStatement, $DBConnectionUID = 'workflow', $aParameter
}
if(isset($nameOfTable) && $nameOfTable !== ''){
if(in_array($nameOfTable,$aListAllTables)){
G::SendTemporalMessage( 'ID_NOT_EXECUTE_QUERY', 'error', 'labels' );
throw new SQLException(G::loadTranslation('ID_NOT_EXECUTE_QUERY'));
G::SendTemporalMessage( G::loadTranslation('ID_NOT_EXECUTE_QUERY', array($nameOfTable)), 'error', 'labels' );
throw new SQLException(G::loadTranslation('ID_NOT_EXECUTE_QUERY', array($nameOfTable)));
}
}
if (is_array($arrayOfTables)){
foreach ($arrayOfTables as $row){
if(!empty($row)){
if(in_array($row, $aListAllTables)){
G::SendTemporalMessage( 'ID_NOT_EXECUTE_QUERY', 'error', 'labels' );
throw new SQLException(G::loadTranslation('ID_NOT_EXECUTE_QUERY'));
G::SendTemporalMessage(G::loadTranslation('ID_NOT_EXECUTE_QUERY', array($nameOfTable)), 'error', 'labels' );
throw new SQLException(G::loadTranslation('ID_NOT_EXECUTE_QUERY', array($nameOfTable)));
}
}
}

6
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -24391,6 +24391,12 @@ msgstr "The user with \"{0}\" is invalid to cancel the Case."
msgid "The user with \"{0}\" did not have permission to perform this action."
msgstr "The user with \"{0}\" did not have permission to perform this action."
# TRANSLATION
# LABEL/ID_NOT_EXECUTE_QUERY
#: LABEL/ID_NOT_EXECUTE_QUERY
msgid "Changes to {0} are forbidden. Please contact system administrator for more information."
msgstr "Changes to {0} are forbidden. Please contact system administrator for more information."
# TRANSLATION
# LABEL/ID_EMAIL_MORE_THAN_ONE_USER
#: LABEL/ID_EMAIL_MORE_THAN_ONE_USER

2
workflow/engine/data/mssql/insert.sql
View File

@@ -9646,6 +9646,8 @@ SELECT 'LABEL','ID_NO_LICENSE_FEATURE_ENABLED','en','Your license does not have
UNION ALL
SELECT 'LABEL','ID_USER_NOT_ACTIVE','en','The user is not active.','2015-09-08'
UNION ALL
SELECT 'LABEL','ID_NOT_EXECUTE_QUERY','en','Changes to {0} are forbidden. Please contact system administrator for more information.','2016-04-11'
UNION ALL
SELECT 'LABEL','ID_MAFE_b776b96aded5145322e09111013ef8c5','en','Invalid connection type','2016-03-30'
UNION ALL
SELECT 'LABEL','ID_MAFE_89d626523f83c2d1f8a5549a845dd6aa','en','Start Event must have an outgoing sequence flow','2016-03-30'

1
workflow/engine/data/mysql/insert.sql
View File

@@ -5579,6 +5579,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_USER_DOES_NOT_CORRESPOND','en','Wrong authentication. This user does not correspond with the email address.','2015-09-08') ,
( 'LABEL','ID_NO_LICENSE_FEATURE_ENABLED','en','Your license does not have the Gmail integration. Please contact your administrator.','2015-09-17') ,
( 'LABEL','ID_USER_NOT_ACTIVE','en','The user is not active.','2015-09-08') ,
( 'LABEL','ID_NOT_EXECUTE_QUERY','en','Changes to {0} are forbidden. Please contact system administrator for more information.','2016-04-11') ,
( 'LABEL','ID_MAFE_b776b96aded5145322e09111013ef8c5','en','Invalid connection type','2016-03-30') ,
( 'LABEL','ID_MAFE_89d626523f83c2d1f8a5549a845dd6aa','en','Start Event must have an outgoing sequence flow','2016-03-30') ,
( 'LABEL','ID_MAFE_d4bff85814308aca1cfde4b977872550','en','Start Event must not have an incommig sequence flow','2016-03-30') ,