From 5ee06c7ec1001a5c9e4a7d5ed7b228951a49d5fc Mon Sep 17 00:00:00 2001 From: norahmollo Date: Mon, 13 Oct 2014 11:50:17 -0400 Subject: [PATCH 1/8] 12021 Correction Correction --- workflow/engine/methods/setup/auditLogAjax.php | 1 + workflow/engine/methods/setup/auditLogConfigAjax.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/engine/methods/setup/auditLogAjax.php b/workflow/engine/methods/setup/auditLogAjax.php index 306092bf4..236db9265 100644 --- a/workflow/engine/methods/setup/auditLogAjax.php +++ b/workflow/engine/methods/setup/auditLogAjax.php @@ -13,6 +13,7 @@ function auditLogArraySet ($str, $filter) $date = ""; $workspace = ""; $action = ""; + $ip = ""; $user = ""; $description = ""; diff --git a/workflow/engine/methods/setup/auditLogConfigAjax.php b/workflow/engine/methods/setup/auditLogConfigAjax.php index 290819754..f87398ceb 100644 --- a/workflow/engine/methods/setup/auditLogConfigAjax.php +++ b/workflow/engine/methods/setup/auditLogConfigAjax.php @@ -6,7 +6,7 @@ switch ($_GET['action']) { try { G::LoadClass( 'serverConfiguration' ); $oServerConf = & serverConf::getSingleton(); - + $response = new $oServerConf; /*you can use SYS_TEMP or SYS_SYS ON AUDIT_LOG_CONF to save for each workspace*/ $oServerConf->unsetAuditLogProperty( 'AL_TYPE', SYS_SYS ); if (isset( $_POST['acceptAL'] )) { From a44360fca2a66a57548789c7ce8a870fbec3089a Mon Sep 17 00:00:00 2001 From: norahmollo Date: Mon, 13 Oct 2014 12:08:57 -0400 Subject: [PATCH 2/8] 12021- Disable Audit Log Disable Audit Log --- workflow/engine/methods/setup/auditLogConfigAjax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/methods/setup/auditLogConfigAjax.php b/workflow/engine/methods/setup/auditLogConfigAjax.php index f87398ceb..fb29cc22d 100644 --- a/workflow/engine/methods/setup/auditLogConfigAjax.php +++ b/workflow/engine/methods/setup/auditLogConfigAjax.php @@ -15,11 +15,11 @@ switch ($_GET['action']) { $response->enable = true; G::auditLog("EnableAuditLog"); } else { + G::auditLog("DisableAuditLog"); $oServerConf->setAuditLogProperty( 'AL_OPTION', 0, SYS_SYS ); $oServerConf->unsetAuditLogProperty( 'AL_NEXT_DATE', SYS_SYS ); $oServerConf->setAuditLogProperty( 'AL_TYPE', 'endaudit', SYS_SYS ); $response->enable = false; - G::auditLog("DisableAuditLog"); } $response->success = true; From be4c4b5453274eaef4aba82e835c9427b34546a4 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Mon, 13 Oct 2014 12:22:45 -0400 Subject: [PATCH 3/8] BUG-12021 ADD TRANSLATIONS ADD TRANSLATIONS --- workflow/engine/methods/setup/auditLog.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/engine/methods/setup/auditLog.php b/workflow/engine/methods/setup/auditLog.php index 6f0a1595a..176011dc8 100644 --- a/workflow/engine/methods/setup/auditLog.php +++ b/workflow/engine/methods/setup/auditLog.php @@ -43,7 +43,7 @@ $arrayAction = array (array ("ALL", G::LoadTranslation( "ID_ALL" )), array ("BuildCache", G::LoadTranslation( "ID_BUILD_CACHE" )), array ("ClearCache", G::LoadTranslation( "ID_CLEAR_CACHE" )), array ("ClearCron", G::LoadTranslation( "ID_CLEAR_CRON" )), - array ("UpdateEnvironmentSettings", G::LoadTranslation( "ID_UPDATE_ENVIRONMENTS_SETTINGS" )), + array ("UpdateEnvironmentSettings", G::LoadTranslation( "ID_UPDATE_ENVIRONMENT_SETTINGS" )), array ("UpdateLoginSettings", G::LoadTranslation( "ID_UPDATE_LOGIN_SETTINGS" )), array ("EnableHeartBeat", G::LoadTranslation( "ID_ENABLE_HEART_BEAT" )), array ("DisableHeartBeat", G::LoadTranslation( "ID_DISABLE_HEART_BEAT" )), @@ -79,6 +79,7 @@ $arrayAction = array (array ("ALL", G::LoadTranslation( "ID_ALL" )), array ("UploadLogo", G::LoadTranslation( "ID_UPLOAD_LOGO" )), array ("DeleteLogo", G::LoadTranslation( "ID_DELETE_LOGO" )), array ("RestoreLogo", G::LoadTranslation( "ID_RESTORE_LOGO" )), + array ("ReplaceLogo", G::LoadTranslation( "ID_REPLACE_LOGO" )), array ("InstallPlugin", G::LoadTranslation( "ID_INSTALL_PLUGIN" )), array ("EnablePlugin", G::LoadTranslation( "ID_ENABLE_PLUGIN" )), array ("DisablePlugin", G::LoadTranslation( "ID_DISABLE_PLUGIN" )), From 5b02b182acd0e6a9f25a082ba8bf05da1c606e32 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Mon, 13 Oct 2014 12:31:08 -0400 Subject: [PATCH 4/8] 12021- Audit Log correction Audit Log correction --- workflow/engine/controllers/adminProxy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 532751989..a84047818 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -121,7 +121,7 @@ class adminProxy extends HttpProxyController $this->restart = $restart; $this->url = "/sys" . SYS_SYS . "/" . (($sysConf["default_lang"] != "")? $sysConf["default_lang"] : ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en")) . "/" . $sysConf["default_skin"] . $urlPart; $this->message = 'Saved Successfully'; - + $msg = ""; if($httpData->proxy_host != '' || $httpData->proxy_port != '' || $httpData->proxy_user != '') { $msg = " Host -> ".$httpData->proxy_host." Port -> ".$httpData->proxy_port." User -> ".$httpData->proxy_user; } From c9f29cb1c5c0b75e4cfebce318ca6322b50bac9b Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 13 Oct 2014 12:39:49 -0400 Subject: [PATCH 5/8] Updating .po and .sql files for 2.8 RC1 (2014-10-13 12:40) --- .../translations/english/processmaker.en.po | 16 +++++++++++----- workflow/engine/data/mssql/insert.sql | 4 +++- workflow/engine/data/mysql/insert.sql | 5 +++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index aefe8fe35..1d0bc79d1 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ProcessMaker 2.8.0\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2014-10-13 09:11:02\n" +"PO-Revision-Date: 2014-10-13 12:37:31\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -17174,10 +17174,10 @@ msgid "Clear Cron" msgstr "Clear Cron" # TRANSLATION -# LABEL/ID_UPDATE_ENVIRONMENTS_SETTINGS -#: LABEL/ID_UPDATE_ENVIRONMENTS_SETTINGS -msgid "Update Environment Settings" -msgstr "Update Environment Settings" +# LABEL/ID_REPLACE_LOGO +#: LABEL/ID_REPLACE_LOGO +msgid "Replace Logo" +msgstr "Replace Logo" # TRANSLATION # LABEL/ID_UPDATE_LOGIN_SETTINGS @@ -17425,6 +17425,12 @@ msgstr "Disable Plugin" msgid "Enable Plugin" msgstr "Enable Plugin" +# TRANSLATION +# LABEL/ID_UPDATE_ENVIRONMENT_SETTINGS +#: LABEL/ID_UPDATE_ENVIRONMENT_SETTINGS +msgid "Update Environment Settings" +msgstr "Update Environment Settings" + # additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml #: text - ADD_TAB_NAME diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index 528570da1..d18f0d8d5 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -7180,7 +7180,7 @@ SELECT 'LABEL','ID_BUILD_CACHE','en','Build Cache','2014-10-10' UNION ALL SELECT 'LABEL','ID_CLEAR_CRON','en','Clear Cron','2014-10-10' UNION ALL -SELECT 'LABEL','ID_UPDATE_ENVIRONMENTS_SETTINGS','en','Update Environment Settings','2014-10-10' +SELECT 'LABEL','ID_REPLACE_LOGO','en','Replace Logo','2014-10-13' UNION ALL SELECT 'LABEL','ID_UPDATE_LOGIN_SETTINGS','en','Update Login Settings','2014-10-10' UNION ALL @@ -7265,6 +7265,8 @@ SELECT 'LABEL','ID_DELETE_GROUP','en','Remove Group','2014-10-13' SELECT 'LABEL','ID_DISABLE_PLUGIN','en','Disable Plugin','2014-10-13' UNION ALL SELECT 'LABEL','ID_ENABLE_PLUGIN','en','Enable Plugin','2014-10-13' + UNION ALL +SELECT 'LABEL','ID_UPDATE_ENVIRONMENT_SETTINGS','en','Update Environment Settings','2014-10-13' ; INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID]) diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 1be9c2a2a..86a8eb077 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -4320,7 +4320,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_DELETE_CATEGORY','en','Delete Category','2014-10-10') , ( 'LABEL','ID_BUILD_CACHE','en','Build Cache','2014-10-10') , ( 'LABEL','ID_CLEAR_CRON','en','Clear Cron','2014-10-10') , -( 'LABEL','ID_UPDATE_ENVIRONMENTS_SETTINGS','en','Update Environment Settings','2014-10-10') , +( 'LABEL','ID_REPLACE_LOGO','en','Replace Logo','2014-10-13') , ( 'LABEL','ID_UPDATE_LOGIN_SETTINGS','en','Update Login Settings','2014-10-10') , ( 'LABEL','ID_DISABLE_HEART_BEAT','en','Disable Heart Beat','2014-10-10') , ( 'LABEL','ID_CREATE_PMTABLE','en','Create PM Table','2014-10-10') , @@ -4363,7 +4363,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_CREATE_GROUP','en','Create New Group','2014-10-13') , ( 'LABEL','ID_DELETE_GROUP','en','Remove Group','2014-10-13') , ( 'LABEL','ID_DISABLE_PLUGIN','en','Disable Plugin','2014-10-13') , -( 'LABEL','ID_ENABLE_PLUGIN','en','Enable Plugin','2014-10-13') ; +( 'LABEL','ID_ENABLE_PLUGIN','en','Enable Plugin','2014-10-13') , +( 'LABEL','ID_UPDATE_ENVIRONMENT_SETTINGS','en','Update Environment Settings','2014-10-13') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , From 6d3adcabc087130d86e7d3c317349f29e4659ee1 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Mon, 13 Oct 2014 15:07:51 -0400 Subject: [PATCH 6/8] BUG-12021 Translation Audit Log Translation Audit Log --- workflow/engine/methods/setup/auditLog.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/methods/setup/auditLog.php b/workflow/engine/methods/setup/auditLog.php index 176011dc8..d71c6aa00 100644 --- a/workflow/engine/methods/setup/auditLog.php +++ b/workflow/engine/methods/setup/auditLog.php @@ -19,7 +19,7 @@ $arrayAction = array (array ("ALL", G::LoadTranslation( "ID_ALL" )), array ("EnableUser", G::LoadTranslation( "ID_ENABLE_USER" )), array ("DisableUser", G::LoadTranslation( "ID_DISABLE_USER" )), array ("AssignAuthenticationSource", G::LoadTranslation( "ID_ASSIGN_AUTHENTICATION_SOURCE" )), - array ("AssignUsersToGroup", G::LoadTranslation( "ID_ASSIGN_USER_TO_GROUP" )), + array ("AssignUserToGroup", G::LoadTranslation( "ID_ASSIGN_USER_TO_GROUP" )), array ("CreateAuthSource", G::LoadTranslation( "ID_CREATE_AUTH_SOURCE" )), array ("UpdateAuthSource", G::LoadTranslation( "ID_UPDATE_AUTH_SOURCE" )), array ("DeleteAuthSource", G::LoadTranslation( "ID_DELETE_AUTH_SOURCE" )), @@ -67,7 +67,7 @@ $arrayAction = array (array ("ALL", G::LoadTranslation( "ID_ALL" )), array ("UpdateSubDepartament", G::LoadTranslation( "ID_UPDATE_SUB_DEPARTAMENT" )), array ("DeleteDepartament", G::LoadTranslation( "ID_DELETE_DEPARTAMENT" )), array ("AssignManagerToDepartament", G::LoadTranslation( "ID_ASSIGN_MANAGER_TO_DEPARTAMENT" )), - array ("AssignUsersToDepartament", G::LoadTranslation( "ID_ASSIGN_USER_TO_DEPARTAMENT" )), + array ("AssignUserToDepartament", G::LoadTranslation( "ID_ASSIGN_USER_TO_DEPARTAMENT" )), array ("RemoveUsersFromDepartament", G::LoadTranslation( "ID_REMOVE_USERS_FROM_DEPARTAMENT" )), array ("AssignUsersToGroup", G::LoadTranslation( "ID_ASSIGN_USER_TO_GROUP" )), array ("UploadLanguage", G::LoadTranslation( "ID_UPLOAD_LANGUAGE" )), From 0c2a82cf5c2248c559833999c95b621be4e15bc9 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 13 Oct 2014 15:13:34 -0400 Subject: [PATCH 7/8] Fix a couple of strict notices for PHP 5.4 --- gulliver/system/class.g.php | 16 ++++++++-------- .../engine/classes/class.serverConfiguration.php | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index d3ef213a7..e07d8e4f2 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -5273,19 +5273,19 @@ class G /** */ - public function auditLog($actionToLog, $valueToLog = "") - { + public static function auditLog($actionToLog, $valueToLog = "") + { $oServerConf = & serverConf::getSingleton(); $sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS ); $ipClient = G::getIpAddress(); $licensedFeatures = & PMLicensedFeatures::getSingleton(); if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) { - $workspace = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined'; - $username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User'; + $workspace = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined'; + $username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User'; $fullname = isset($_SESSION['USR_FULLNAME']) && $_SESSION['USR_FULLNAME'] != '' ? $_SESSION['USR_FULLNAME'] : '-'; G::log("|". $workspace ."|". $ipClient ."|". $username . "|" . $fullname ."|" . $actionToLog . "|" . $valueToLog, PATH_DATA, "audit.log"); - } + } } /** @@ -5347,9 +5347,9 @@ class G } /** - * Verify the InputDoc extension, cheking the file name extension (.pdf, .ppt) and the file content. + * Verify the InputDoc extension, cheking the file name extension (.pdf, .ppt) and the file content. + * * - * * */ public function verifyInputDocExtension($InpDocAllowedFiles, $filesName, $filesTmpName){ @@ -5380,7 +5380,7 @@ class G $finfo = new finfo(FILEINFO_MIME_TYPE); $finfo_ = $finfo->file($filesTmpName); $docType = explode("/", $finfo_); - + foreach ($allowedTypes as $types => $val) { if((preg_match('/^\*\.?[a-z]{2,8}$/', $val)) || ($val == '*.*')){ $allowedDocTypes = substr($val, 2); diff --git a/workflow/engine/classes/class.serverConfiguration.php b/workflow/engine/classes/class.serverConfiguration.php index d70d57123..9c4cf5fb9 100755 --- a/workflow/engine/classes/class.serverConfiguration.php +++ b/workflow/engine/classes/class.serverConfiguration.php @@ -76,7 +76,7 @@ class serverConf * * @return object */ - public function &getSingleton() + public static function &getSingleton() { if (self::$instance == null) { self::$instance = new serverConf(); @@ -518,4 +518,3 @@ class serverConf return in_array($lang, $this->rtlLang); } } - \ No newline at end of file From 46996435036aea1060bc0e19b4b857263b29174c Mon Sep 17 00:00:00 2001 From: norahmollo Date: Mon, 13 Oct 2014 15:19:06 -0400 Subject: [PATCH 8/8] BUG-12021 Translation Audit Log Translation Audit Log --- workflow/engine/methods/setup/auditLog.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/methods/setup/auditLog.php b/workflow/engine/methods/setup/auditLog.php index d71c6aa00..51bb5ef52 100644 --- a/workflow/engine/methods/setup/auditLog.php +++ b/workflow/engine/methods/setup/auditLog.php @@ -26,8 +26,8 @@ $arrayAction = array (array ("ALL", G::LoadTranslation( "ID_ALL" )), array ("CreateRole", G::LoadTranslation( "ID_CREATE_ROLE" )), array ("UpdateRole", G::LoadTranslation( "ID_UPDATE_ROLE" )), array ("DeleteRole", G::LoadTranslation( "ID_DELETE_ROLE" )), - array ("AssignUsersToRole", G::LoadTranslation( "ID_ASSIGN_USER_TO_ROLE" )), - array ("DeleteUsersToRole", G::LoadTranslation( "ID_DELETE_USER_TO_ROLE" )), + array ("AssignUserToRole", G::LoadTranslation( "ID_ASSIGN_USER_TO_ROLE" )), + array ("DeleteUserToRole", G::LoadTranslation( "ID_DELETE_USER_TO_ROLE" )), array ("AddPermissionToRole", G::LoadTranslation( "ID_ADD_PERMISSION_TO_ROLE" )), array ("DeletePermissionToRole", G::LoadTranslation( "ID_DELETE_PERMISSION_TO_ROLE" )), array ("CreateSkin", G::LoadTranslation( "ID_CREATE_SKIN" )), @@ -69,7 +69,7 @@ $arrayAction = array (array ("ALL", G::LoadTranslation( "ID_ALL" )), array ("AssignManagerToDepartament", G::LoadTranslation( "ID_ASSIGN_MANAGER_TO_DEPARTAMENT" )), array ("AssignUserToDepartament", G::LoadTranslation( "ID_ASSIGN_USER_TO_DEPARTAMENT" )), array ("RemoveUsersFromDepartament", G::LoadTranslation( "ID_REMOVE_USERS_FROM_DEPARTAMENT" )), - array ("AssignUsersToGroup", G::LoadTranslation( "ID_ASSIGN_USER_TO_GROUP" )), + array ("AssignUserToGroup", G::LoadTranslation( "ID_ASSIGN_USER_TO_GROUP" )), array ("UploadLanguage", G::LoadTranslation( "ID_UPLOAD_LANGUAGE" )), array ("ExportLanguage", G::LoadTranslation( "ID_EXPORT_LANGUAGE" )), array ("DeleteLanguage", G::LoadTranslation( "ID_DELETE_LAGUAGE" )),