From b928436008c227dddf1d4abd46f839e7c7486214 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Fri, 10 Oct 2014 15:09:26 -0400 Subject: [PATCH 01/12] PM-401 Backup workspace modified Backup database modified --- workflow/engine/bin/tasks/cliWorkspaces.php | 100 ++++++++++---------- workflow/engine/classes/class.wsTools.php | 13 ++- 2 files changed, 62 insertions(+), 51 deletions(-) diff --git a/workflow/engine/bin/tasks/cliWorkspaces.php b/workflow/engine/bin/tasks/cliWorkspaces.php index 165afd35c..ef4f93176 100755 --- a/workflow/engine/bin/tasks/cliWorkspaces.php +++ b/workflow/engine/bin/tasks/cliWorkspaces.php @@ -372,60 +372,64 @@ function run_drafts_clean($args, $opts) { } function run_workspace_backup($args, $opts) { - $workspaces = array(); - if (sizeof($args) > 2) { - $filename = array_pop($args); - foreach ($args as $arg) { - $workspaces[] = new workspaceTools($arg); + $workspaces = array(); + if (sizeof($args) > 2) { + $filename = array_pop($args); + foreach ($args as $arg) { + $workspaces[] = new workspaceTools($arg); + } + } else if (sizeof($args) > 0) { + $workspace = new workspaceTools($args[0]); + $workspaces[] = $workspace; + if (sizeof($args) == 2) { + $filename = $args[1]; + } else { + $filename = "{$workspace->name}.tar"; + } + } else { + throw new Exception("No workspace specified for backup"); } - } else if (sizeof($args) > 0) { - $workspace = new workspaceTools($args[0]); - $workspaces[] = $workspace; - if (sizeof($args) == 2) - $filename = $args[1]; - else - $filename = "{$workspace->name}.tar"; - } else { - throw new Exception("No workspace specified for backup"); - } - foreach ($workspaces as $workspace) - if (!$workspace->workspaceExists()) - throw new Exception("Workspace '{$workspace->name}' not found"); - //If this is a relative path, put the file in the backups directory - if (strpos($filename, "/") === false && strpos($filename, '\\') === false){ - $filename = PATH_DATA . "backups/$filename"; - } - CLI::logging("Backing up to $filename\n"); - $filesize = array_key_exists("filesize", $opts) ? $opts['filesize'] : -1; - if($filesize >= 0) - { - if(!Bootstrap::isLinuxOs()){ + + foreach ($workspaces as $workspace) { + if (!$workspace->workspaceExists()) { + throw new Exception("Workspace '{$workspace->name}' not found"); + } + } + + //If this is a relative path, put the file in the backups directory + if (strpos($filename, "/") === false && strpos($filename, '\\') === false){ + $filename = PATH_DATA . "backups/$filename"; + } + CLI::logging("Backing up to $filename\n"); + + $filesize = array_key_exists("filesize", $opts) ? $opts['filesize'] : -1; + + if ($filesize >= 0) { + if (!Bootstrap::isLinuxOs()) { CLI::error("This is not a Linux enviroment, cannot use this filesize [-s] feature.\n"); return; - } - $multipleBackup = new multipleFilesBackup ($filename,$filesize);//if filesize is 0 the default size will be took - //using new method - foreach ($workspaces as $workspace){ - $multipleBackup->addToBackup($workspace); - } - $multipleBackup->letsBackup(); - } - else - { - //ansient method to backup into one large file - $backup = workspaceTools::createBackup($filename); + } + $multipleBackup = new multipleFilesBackup ($filename,$filesize);//if filesize is 0 the default size will be took + //using new method + foreach ($workspaces as $workspace) { + $multipleBackup->addToBackup($workspace); + } + $multipleBackup->letsBackup(); + } else { + //ansient method to backup into one large file + $backup = workspaceTools::createBackup($filename); - foreach ($workspaces as $workspace) - $workspace->backup($backup); - } - CLI::logging("\n"); - workspaceTools::printSysInfo(); - foreach ($workspaces as $workspace) { + foreach ($workspaces as $workspace) { + $workspace->backup($backup); + } + } CLI::logging("\n"); - $workspace->printMetadata(false); - } - + workspaceTools::printSysInfo(); + foreach ($workspaces as $workspace) { + CLI::logging("\n"); + $workspace->printMetadata(false); + } } function run_workspace_restore($args, $opts) { diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 3554854d7..458bd6134 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -1032,10 +1032,14 @@ class workspaceTools $wfDsn = $fields['DB_ADAPTER'] . '://' . $fields['DB_USER'] . ':' . $fields['DB_PASS'] . '@' . $fields['DB_HOST'] . '/' . $fields['DB_NAME']; + if ($fields['DB_NAME'] == $fields['DB_RBAC_NAME']) { + $info = array('Workspace Name' => $fields['WORKSPACE_NAME'], 'Workflow Database' => sprintf("%s://%s:%s@%s/%s", $fields['DB_ADAPTER'], $fields['DB_USER'], $fields['DB_PASS'], $fields['DB_HOST'], $fields['DB_NAME']), 'MySql Version' => $fields['DATABASE']); + } else { $info = array('Workspace Name' => $fields['WORKSPACE_NAME'], //'Available Databases' => $fields['AVAILABLE_DB'], 'Workflow Database' => sprintf("%s://%s:%s@%s/%s", $fields['DB_ADAPTER'], $fields['DB_USER'], $fields['DB_PASS'], $fields['DB_HOST'], $fields['DB_NAME']), 'RBAC Database' => sprintf("%s://%s:%s@%s/%s", $fields['DB_ADAPTER'], $fields['DB_RBAC_USER'], $fields['DB_RBAC_PASS'], $fields['DB_RBAC_HOST'], $fields['DB_RBAC_NAME']), 'Report Database' => sprintf("%s://%s:%s@%s/%s", $fields['DB_ADAPTER'], $fields['DB_REPORT_USER'], $fields['DB_REPORT_PASS'], $fields['DB_REPORT_HOST'], $fields['DB_REPORT_NAME']), 'MySql Version' => $fields['DATABASE'] ); + } foreach ($info as $k => $v) { if (is_numeric($k)) { @@ -1070,15 +1074,18 @@ class workspaceTools public function exportDatabase($path, $onedb = false) { $dbInfo = $this->getDBInfo(); - + if ($onedb) { $databases = array("rb", "rp"); + } else if ($dbInfo['DB_NAME'] == $dbInfo['DB_RBAC_NAME']) { + $databases = array("wf"); } else { $databases = array("wf", "rp", "rb"); } $dbNames = array(); - foreach ($databases as $db) { + + foreach ($databases as $db) { $dbInfo = $this->getDBCredentials($db); $oDbMaintainer = new DataBaseMaintenance($dbInfo["host"], $dbInfo["user"], $dbInfo["pass"]); CLI::logging("Saving database {$dbInfo["name"]}\n"); @@ -1139,7 +1146,7 @@ class workspaceTools * @param bool $compress specifies wheter the backup is compressed or not */ public function backup($backupFile, $compress = true) - { + { /* $filename can be a string, in which case it's used as the filename of * the backup, or it can be a previously created tar, which allows for * multiple workspaces in one backup. From 91ceca99391d0d7851cc7b92c5508e23a94e0ebe Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Fri, 10 Oct 2014 16:05:38 -0400 Subject: [PATCH 02/12] Updating .po and .sql files for 2.8 RC1 (2014-10-10) --- .../translations/english/processmaker.en.po | 480 +++++++++++++++++- workflow/engine/data/mssql/insert.sql | 164 +++++- workflow/engine/data/mysql/insert.sql | 92 +++- 3 files changed, 703 insertions(+), 33 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 058eb2ae9..2e590cfb7 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.5.2.3\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2014-09-22 16:11:21\n" +"PO-Revision-Date: 2014-10-10 16:02:15\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -10036,8 +10036,8 @@ msgstr "Resume" # TRANSLATION # LABEL/ID_USER_ID #: LABEL/ID_USER_ID -msgid "User ID (*)" -msgstr "User ID (*)" +msgid "[LABEL/ID_USER_ID] Username" +msgstr "Username" # TRANSLATION # LABEL/ID_PHONE @@ -12412,8 +12412,8 @@ msgstr "Ajax communication failed" # TRANSLATION # LABEL/ID_CHECK_FIELDS_MARK_RED #: LABEL/ID_CHECK_FIELDS_MARK_RED -msgid "Please check the fields mark in red." -msgstr "Please check the fields mark in red." +msgid "Please check the fields marked in red." +msgstr "Please check the fields marked in red." # TRANSLATION # LABEL/ID_INPUT_ERROR @@ -13204,8 +13204,8 @@ msgstr "xxx" # TRANSLATION # LABEL/ID_SIZE_VERY_LARGE_PERMITTED #: LABEL/ID_SIZE_VERY_LARGE_PERMITTED -msgid "The size is very large as permitted!" -msgstr "The size is very large as permitted!" +msgid "The file is too large . Please upload a smaller file." +msgstr "The file is too large . Please upload a smaller file." # TRANSLATION # LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5 @@ -14392,8 +14392,8 @@ msgstr "All Categories" # TRANSLATION # LABEL/ID_CASES_NOTES_NO_PERMISSIONS #: LABEL/ID_CASES_NOTES_NO_PERMISSIONS -msgid "You do not have permission to cases notes" -msgstr "You do not have permission to cases notes" +msgid "You do not have permission to access cases notes" +msgstr "You do not have permission to access cases notes" # TRANSLATION # LABEL/ID_DELETE_DOCUMENT @@ -16456,8 +16456,8 @@ msgstr "Index" # TRANSLATION # LABEL/ID_ERROR_JS_NOT_AVAILABLE #: LABEL/ID_ERROR_JS_NOT_AVAILABLE -msgid "Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won't work totally because javascript is used." -msgstr "Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won't work totally because javascript is used." +msgid "Your browser doesn't support JavaScript or it may be disabled. Please use a different browser or enable the JavaScript, Dynaforms won't entirely work because JavaScript is used." +msgstr "Your browser doesn't support JavaScript or it may be disabled. Please use a different browser or enable the JavaScript, Dynaforms won't entirely work because JavaScript is used." # TRANSLATION # LABEL/ID_MAXIMUM_SIZE_FILE_REQUIRED @@ -16900,14 +16900,14 @@ msgstr "Audit Log has been disabled" # TRANSLATION # LABEL/ID_AUDIT_LOG_DETAILS_1 #: LABEL/ID_AUDIT_LOG_DETAILS_1 -msgid "Audit Log details1" -msgstr "Audit Log details1" +msgid "When this option is enabled, all changes made in the \"ADMIN\" tab are registered in a log." +msgstr "When this option is enabled, all changes made in the \"ADMIN\" tab are registered in a log." # TRANSLATION # LABEL/ID_AUDIT_LOG_DETAILS_2 #: LABEL/ID_AUDIT_LOG_DETAILS_2 -msgid "Audit Log details 2" -msgstr "Audit Log details 2" +msgid "and the user will be able to see those changes in the \"Audit Log\" option in Logs Menu" +msgstr "and the user will be able to see those changes in the \"Audit Log\" option in Logs Menu" # TRANSLATION # LABEL/ID_PRIVATE @@ -16945,6 +16945,450 @@ msgstr "center" msgid "right" msgstr "right" +# TRANSLATION +# LABEL/ID_LANGUAGE_CANT_DELETE_CURRENTLY +#: LABEL/ID_LANGUAGE_CANT_DELETE_CURRENTLY +msgid "The language, which the system is currently using, cannot be deleted." +msgstr "The language, which the system is currently using, cannot be deleted." + +# TRANSLATION +# LABEL/ID_INPUT_DOC_MAX_FILESIZE_REQUIRED +#: LABEL/ID_INPUT_DOC_MAX_FILESIZE_REQUIRED +msgid "Maximum file size parameter is required." +msgstr "Maximum file size parameter is required." + +# TRANSLATION +# LABEL/ID_AUDIT_LOG_ACTIONS +#: LABEL/ID_AUDIT_LOG_ACTIONS +msgid "Audit Log Actions" +msgstr "Audit Log Actions" + +# TRANSLATION +# LABEL/ID_RESET_FILTERS +#: LABEL/ID_RESET_FILTERS +msgid "Reset Filters" +msgstr "Reset Filters" + +# TRANSLATION +# LABEL/ID_INPUT_DB +#: LABEL/ID_INPUT_DB +msgid "Input" +msgstr "Input" + +# TRANSLATION +# LABEL/ID_TRIGGER_DB +#: LABEL/ID_TRIGGER_DB +msgid "Trigger" +msgstr "Trigger" + +# TRANSLATION +# LABEL/ID_IP +#: LABEL/ID_IP +msgid "IP Client" +msgstr "IP Client" + +# TRANSLATION +# LABEL/ID_OUTPUT_DB +#: LABEL/ID_OUTPUT_DB +msgid "Output" +msgstr "Output" + +# TRANSLATION +# LABEL/ID_ATTACHED_DB +#: LABEL/ID_ATTACHED_DB +msgid "Attached" +msgstr "Attached" + +# TRANSLATION +# LABEL/ID_DERIVATION_DB +#: LABEL/ID_DERIVATION_DB +msgid "Derivation" +msgstr "Derivation" + +# TRANSLATION +# LABEL/ID_OPEN_DYNAFORM_TAB +#: LABEL/ID_OPEN_DYNAFORM_TAB +msgid "Open the Dynaform in a new tab" +msgstr "Open the Dynaform in a new tab" + +# TRANSLATION +# LABEL/ID_ENTERPRISE_FEATURES +#: LABEL/ID_ENTERPRISE_FEATURES +msgid "Enterprise features" +msgstr "Enterprise features" + +# TRANSLATION +# LABEL/ID_CREATE_USER +#: LABEL/ID_CREATE_USER +msgid "Create User" +msgstr "Create User" + +# TRANSLATION +# LABEL/ID_UPDATE_USER +#: LABEL/ID_UPDATE_USER +msgid "Update User" +msgstr "Update User" + +# TRANSLATION +# LABEL/ID_DELETE_USER +#: LABEL/ID_DELETE_USER +msgid "Delete User" +msgstr "Delete User" + +# TRANSLATION +# LABEL/ID_ENABLE_USER +#: LABEL/ID_ENABLE_USER +msgid "Enable User" +msgstr "Enable User" + +# TRANSLATION +# LABEL/ID_DISABLE_USER +#: LABEL/ID_DISABLE_USER +msgid "Disable User" +msgstr "Disable User" + +# TRANSLATION +# LABEL/ID_ASSIGN_AUTHENTICATION_SOURCE +#: LABEL/ID_ASSIGN_AUTHENTICATION_SOURCE +msgid "Assign Authentication Source" +msgstr "Assign Authentication Source" + +# TRANSLATION +# LABEL/ID_ASSIGN_USER_TO_GROUP +#: LABEL/ID_ASSIGN_USER_TO_GROUP +msgid "Assign Users To Group" +msgstr "Assign Users To Group" + +# TRANSLATION +# LABEL/ID_CREATE_AUTH_SOURCE +#: LABEL/ID_CREATE_AUTH_SOURCE +msgid "Create Auth Source" +msgstr "Create Auth Source" + +# TRANSLATION +# LABEL/ID_UPDATE_AUTH_SOURCE +#: LABEL/ID_UPDATE_AUTH_SOURCE +msgid "Update Auth Source" +msgstr "Update Auth Source" + +# TRANSLATION +# LABEL/ID_DELETE_AUTH_SOURCE +#: LABEL/ID_DELETE_AUTH_SOURCE +msgid "Delete Auth Source" +msgstr "Delete Auth Source" + +# TRANSLATION +# LABEL/ID_UPDATE_ROLE +#: LABEL/ID_UPDATE_ROLE +msgid "Update Role" +msgstr "Update Role" + +# TRANSLATION +# LABEL/ID_DELETE_ROLE +#: LABEL/ID_DELETE_ROLE +msgid "Delete Role" +msgstr "Delete Role" + +# TRANSLATION +# LABEL/ID_ASSIGN_USER_TO_ROLE +#: LABEL/ID_ASSIGN_USER_TO_ROLE +msgid "Assign Users To Role" +msgstr "Assign Users To Role" + +# TRANSLATION +# LABEL/ID_DELETE_USER_TO_ROLE +#: LABEL/ID_DELETE_USER_TO_ROLE +msgid "Delete Users To Role" +msgstr "Delete Users To Role" + +# TRANSLATION +# LABEL/ID_ADD_PERMISSION_TO_ROLE +#: LABEL/ID_ADD_PERMISSION_TO_ROLE +msgid "Add Permission To Role" +msgstr "Add Permission To Role" + +# TRANSLATION +# LABEL/ID_DELETE_PERMISSION_TO_ROLE +#: LABEL/ID_DELETE_PERMISSION_TO_ROLE +msgid "Delete Permission To Role" +msgstr "Delete Permission To Role" + +# TRANSLATION +# LABEL/ID_CREATE_SKIN +#: LABEL/ID_CREATE_SKIN +msgid "Create Skin" +msgstr "Create Skin" + +# TRANSLATION +# LABEL/ID_IMPORT_SKIN +#: LABEL/ID_IMPORT_SKIN +msgid "Import Skin" +msgstr "Import Skin" + +# TRANSLATION +# LABEL/ID_EXPORT_SKIN +#: LABEL/ID_EXPORT_SKIN +msgid "Export Skin" +msgstr "Export Skin" + +# TRANSLATION +# LABEL/ID_DELETE_SKIN +#: LABEL/ID_DELETE_SKIN +msgid "Delete Skin" +msgstr "Delete Skin" + +# TRANSLATION +# LABEL/ID_UPDATE_GROUP +#: LABEL/ID_UPDATE_GROUP +msgid "Update Group" +msgstr "Update Group" + +# TRANSLATION +# LABEL/ID_CREATE_CATEGORY +#: LABEL/ID_CREATE_CATEGORY +msgid "Create Category" +msgstr "Create Category" + +# TRANSLATION +# LABEL/ID_UPDATE_CATEGORY +#: LABEL/ID_UPDATE_CATEGORY +msgid "Update Category" +msgstr "Update Category" + +# TRANSLATION +# LABEL/ID_DELETE_CATEGORY +#: LABEL/ID_DELETE_CATEGORY +msgid "Delete Category" +msgstr "Delete Category" + +# TRANSLATION +# LABEL/ID_BUILD_CACHE +#: LABEL/ID_BUILD_CACHE +msgid "[LABEL/ID_BUILD_CACHE] Build Cache" +msgstr "Build Cache" + +# TRANSLATION +# LABEL/ID_CLEAR_CRON +#: LABEL/ID_CLEAR_CRON +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" + +# TRANSLATION +# LABEL/ID_UPDATE_LOGIN_SETTINGS +#: LABEL/ID_UPDATE_LOGIN_SETTINGS +msgid "Update Login Settings" +msgstr "Update Login Settings" + +# TRANSLATION +# LABEL/ID_DISABLE_HEART_BEAT +#: LABEL/ID_DISABLE_HEART_BEAT +msgid "Disable Heart Beat" +msgstr "Disable Heart Beat" + +# TRANSLATION +# LABEL/ID_CREATE_PMTABLE +#: LABEL/ID_CREATE_PMTABLE +msgid "Create PM Table" +msgstr "Create PM Table" + +# TRANSLATION +# LABEL/ID_UPDATE_PMTABLE +#: LABEL/ID_UPDATE_PMTABLE +msgid "Update PM Table" +msgstr "Update PM Table" + +# TRANSLATION +# LABEL/ID_DELETE_PMTABLE +#: LABEL/ID_DELETE_PMTABLE +msgid "Delete PM Table" +msgstr "Delete PM Table" + +# TRANSLATION +# LABEL/ID_ADD_DATA_PMTABLE +#: LABEL/ID_ADD_DATA_PMTABLE +msgid "Add Data to PM table" +msgstr "Add Data to PM table" + +# TRANSLATION +# LABEL/ID_UPDATE_DATA_PMTABLE +#: LABEL/ID_UPDATE_DATA_PMTABLE +msgid "Update Data from PM Table" +msgstr "Update Data from PM Table" + +# TRANSLATION +# LABEL/ID_DELETE_DATA_PMTABLE +#: LABEL/ID_DELETE_DATA_PMTABLE +msgid "Delete Data from PM Table" +msgstr "Delete Data from PM Table" + +# TRANSLATION +# LABEL/ID_IMPORT_TABLE +#: LABEL/ID_IMPORT_TABLE +msgid "Import Table" +msgstr "Import Table" + +# TRANSLATION +# LABEL/ID_EXPORT_TABLE +#: LABEL/ID_EXPORT_TABLE +msgid "Export Table" +msgstr "Export Table" + +# TRANSLATION +# LABEL/ID_CREATE_CALENDAR +#: LABEL/ID_CREATE_CALENDAR +msgid "Create Calendar" +msgstr "Create Calendar" + +# TRANSLATION +# LABEL/ID_UPDATE_CALENDAR +#: LABEL/ID_UPDATE_CALENDAR +msgid "Update Calendar" +msgstr "Update Calendar" + +# TRANSLATION +# LABEL/ID_DELETE_CALENDAR +#: LABEL/ID_DELETE_CALENDAR +msgid "Delete Calendar" +msgstr "Delete Calendar" + +# TRANSLATION +# LABEL/ID_CREATE_DASHLET_INSTANCE +#: LABEL/ID_CREATE_DASHLET_INSTANCE +msgid "Create Dashlet Instance" +msgstr "Create Dashlet Instance" + +# TRANSLATION +# LABEL/ID_UPDATE_DASHLET_INSTANCE +#: LABEL/ID_UPDATE_DASHLET_INSTANCE +msgid "Update Dashlet Instance" +msgstr "Update Dashlet Instance" + +# TRANSLATION +# LABEL/ID_DELETE_DASHLET_INSTANCE +#: LABEL/ID_DELETE_DASHLET_INSTANCE +msgid "Delete Dashlet Instance" +msgstr "Delete Dashlet Instance" + +# TRANSLATION +# LABEL/ID_CREATE_DEPARTAMENT +#: LABEL/ID_CREATE_DEPARTAMENT +msgid "Create Departament" +msgstr "Create Departament" + +# TRANSLATION +# LABEL/ID_CREATE_SUB_DEPARTAMENT +#: LABEL/ID_CREATE_SUB_DEPARTAMENT +msgid "Create Sub Departament" +msgstr "Create Sub Departament" + +# TRANSLATION +# LABEL/ID_UPDATE_DEPARTAMENT +#: LABEL/ID_UPDATE_DEPARTAMENT +msgid "Update Departament" +msgstr "Update Departament" + +# TRANSLATION +# LABEL/ID_UPDATE_SUB_DEPARTAMENT +#: LABEL/ID_UPDATE_SUB_DEPARTAMENT +msgid "Update Sub Departament" +msgstr "Update Sub Departament" + +# TRANSLATION +# LABEL/ID_DELETE_DEPARTAMENT +#: LABEL/ID_DELETE_DEPARTAMENT +msgid "Delete Departament" +msgstr "Delete Departament" + +# TRANSLATION +# LABEL/ID_ASSIGN_MANAGER_TO_DEPARTAMENT +#: LABEL/ID_ASSIGN_MANAGER_TO_DEPARTAMENT +msgid "Assign Manager To Departament" +msgstr "Assign Manager To Departament" + +# TRANSLATION +# LABEL/ID_ASSIGN_USER_TO_DEPARTAMENT +#: LABEL/ID_ASSIGN_USER_TO_DEPARTAMENT +msgid "Assign Users To Departament" +msgstr "Assign Users To Departament" + +# TRANSLATION +# LABEL/ID_REMOVE_USERS_FROM_DEPARTAMENT +#: LABEL/ID_REMOVE_USERS_FROM_DEPARTAMENT +msgid "Remove Users From Departament" +msgstr "Remove Users From Departament" + +# TRANSLATION +# LABEL/ID_UPLOAD_LANGUAGE +#: LABEL/ID_UPLOAD_LANGUAGE +msgid "Upload Language" +msgstr "Upload Language" + +# TRANSLATION +# LABEL/ID_EXPORT_LANGUAGE +#: LABEL/ID_EXPORT_LANGUAGE +msgid "Export Language" +msgstr "Export Language" + +# TRANSLATION +# LABEL/ID_DELETE_LAGUAGE +#: LABEL/ID_DELETE_LAGUAGE +msgid "Delete Language" +msgstr "Delete Language" + +# TRANSLATION +# LABEL/ID_UPLOAD_SYSTEM_SETTINGS +#: LABEL/ID_UPLOAD_SYSTEM_SETTINGS +msgid "Upload System Settings" +msgstr "Upload System Settings" + +# TRANSLATION +# LABEL/ID_UPDATE_EMAIL_SETTINGS +#: LABEL/ID_UPDATE_EMAIL_SETTINGS +msgid "Update Email Settings" +msgstr "Update Email Settings" + +# TRANSLATION +# LABEL/ID_CREATE_EMAIL_SETTINGS +#: LABEL/ID_CREATE_EMAIL_SETTINGS +msgid "Create Email Settings" +msgstr "Create Email Settings" + +# TRANSLATION +# LABEL/ID_UPLOAD_LOGO +#: LABEL/ID_UPLOAD_LOGO +msgid "Upload Logo" +msgstr "Upload Logo" + +# TRANSLATION +# LABEL/ID_DELETE_LOGO +#: LABEL/ID_DELETE_LOGO +msgid "Delete Logo" +msgstr "Delete Logo" + +# TRANSLATION +# LABEL/ID_INSTALL_PLUGIN +#: LABEL/ID_INSTALL_PLUGIN +msgid "Install Plugin" +msgstr "Install Plugin" + +# TRANSLATION +# LABEL/ID_SET_COLUMNS +#: LABEL/ID_SET_COLUMNS +msgid "Set Columns" +msgstr "Set Columns" + +# TRANSLATION +# LABEL/ID_DISABLE_AUDIT_LOG +#: LABEL/ID_DISABLE_AUDIT_LOG +msgid "Disable Audit Log" +msgstr "Disable Audit Log" + # additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml #: text - ADD_TAB_NAME @@ -25262,7 +25706,7 @@ msgstr "-- Default --" # events/eventsEditAction.xml?TRI_UID # events/eventsEditAction.xml #: dropdown - TRI_UID -msgid "Trigger" +msgid "[events/eventsEditAction.xml?TRI_UID] Trigger" msgstr "Trigger" # events/eventsEditAction.xml?TRI_UID- @@ -35690,7 +36134,7 @@ msgstr "Last Name" # users/users_Edit.xml?USR_USERNAME # users/users_Edit.xml #: text - USR_USERNAME -msgid "[users/users_Edit.xml?USR_USERNAME] User ID (*)" +msgid "User ID (*)" msgstr "User ID (*)" # users/users_Edit.xml?USR_EMAIL @@ -37928,7 +38372,7 @@ msgstr "Label" # dynaforms/fields/file.xml?PME_INPUT # dynaforms/fields/file.xml #: dropdown - PME_INPUT -msgid "Input" +msgid "[dynaforms/fields/file.xml?PME_INPUT] Input" msgstr "Input" # dynaforms/fields/file.xml?PME_INPUT- diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index 5d560c37e..c2ebfbf2b 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -4770,7 +4770,7 @@ SELECT 'LABEL','ID_PLEASE_SELECT_PHOTO','en','Please select a photo','2014-01-15 UNION ALL SELECT 'LABEL','ID_RESUME','en','Resume','2014-01-15' UNION ALL -SELECT 'LABEL','ID_USER_ID','en','User ID (*)','2014-01-15' +SELECT 'LABEL','ID_USER_ID','en','Username','2014-10-09' UNION ALL SELECT 'LABEL','ID_PHONE','en','Phone','2014-01-15' UNION ALL @@ -5572,7 +5572,7 @@ SELECT 'LABEL','ID_FAILED_DASHBOARD INSTANCE','en','Dashboard Instance registere UNION ALL SELECT 'LABEL','ID_AJAX_COMMUNICATION_FAILED','en','Ajax communication failed','2014-01-15' UNION ALL -SELECT 'LABEL','ID_CHECK_FIELDS_MARK_RED','en','Please check the fields mark in red.','2014-01-15' +SELECT 'LABEL','ID_CHECK_FIELDS_MARK_RED','en','Please check the fields marked in red.','2014-10-06' UNION ALL SELECT 'LABEL','ID_INPUT_ERROR','en','Input Error','2014-01-15' UNION ALL @@ -5840,7 +5840,7 @@ SELECT 'LABEL','ID_LOGIN_WITH_FACEBOOK','en','Login with Facebook!!','2014-01-15 UNION ALL SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP6','en','xxx','2014-01-15' UNION ALL -SELECT 'LABEL','ID_SIZE_VERY_LARGE_PERMITTED','en','The size is very large as permitted!','2014-09-10' +SELECT 'LABEL','ID_SIZE_VERY_LARGE_PERMITTED','en','The file is too large . Please upload a smaller file.','2014-10-08' UNION ALL SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5','en','ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login.','2014-09-02' UNION ALL @@ -6240,7 +6240,7 @@ SELECT 'LABEL','ID_MSG_ENABLE_HTML_EDITING','en','Warning: Editing the HT UNION ALL SELECT 'LABEL','ID_ALL_CATEGORIES','en','All Categories','2014-01-15' UNION ALL -SELECT 'LABEL','ID_CASES_NOTES_NO_PERMISSIONS','en','You do not have permission to cases notes','2014-01-15' +SELECT 'LABEL','ID_CASES_NOTES_NO_PERMISSIONS','en','You do not have permission to access cases notes','2014-09-30' UNION ALL SELECT 'LABEL','ID_DELETE_DOCUMENT','en','Do you want to delete selected document?','2014-01-15' UNION ALL @@ -6938,7 +6938,7 @@ SELECT 'LABEL','ID_CHOOSE_PROVIDER','en','Please select provider','2014-08-27' UNION ALL SELECT 'LABEL','ID_INDEX','en','Index','2014-09-10' UNION ALL -SELECT 'LABEL','ID_ERROR_JS_NOT_AVAILABLE','en','Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won''t work totally because javascript is used.','2014-08-29' +SELECT 'LABEL','ID_ERROR_JS_NOT_AVAILABLE','en','Your browser doesn''t support JavaScript or it may be disabled. Please use a different browser or enable the JavaScript, Dynaforms won''t entirely work because JavaScript is used.','2014-10-09' UNION ALL SELECT 'LABEL','ID_MAXIMUM_SIZE_FILE_REQUIRED','en','The maximum size file, is required!','2014-09-12' UNION ALL @@ -7088,9 +7088,9 @@ SELECT 'LABEL','ID_AUDIT_LOG_ENABLED','en','Audit Log has been enabled','2014-09 UNION ALL SELECT 'LABEL','ID_AUDIT_LOG_DISABLED','en','Audit Log has been disabled','2014-09-19' UNION ALL -SELECT 'LABEL','ID_AUDIT_LOG_DETAILS_1','en','Audit Log details1','2014-09-19' +SELECT 'LABEL','ID_AUDIT_LOG_DETAILS_1','en','When this option is enabled, all changes made in the "ADMIN" tab are registered in a log.','2014-09-30' UNION ALL -SELECT 'LABEL','ID_AUDIT_LOG_DETAILS_2','en','Audit Log details 2','2014-09-19' +SELECT 'LABEL','ID_AUDIT_LOG_DETAILS_2','en','and the user will be able to see those changes in the "Audit Log" option in Logs Menu','2014-10-10' UNION ALL SELECT 'LABEL','ID_PRIVATE','en','Private','2014-09-22' UNION ALL @@ -7103,6 +7103,156 @@ SELECT 'LABEL','ID_LEFT','en','left','2014-09-18' SELECT 'LABEL','ID_CENTER','en','center','2014-09-18' UNION ALL SELECT 'LABEL','ID_RIGHT','en','right','2014-09-18' + UNION ALL +SELECT 'LABEL','ID_LANGUAGE_CANT_DELETE_CURRENTLY','en','The language, which the system is currently using, cannot be deleted.','2014-09-25' + UNION ALL +SELECT 'LABEL','ID_INPUT_DOC_MAX_FILESIZE_REQUIRED','en','Maximum file size parameter is required.','2014-09-30' + UNION ALL +SELECT 'LABEL','ID_AUDIT_LOG_ACTIONS','en','Audit Log Actions','2014-09-30' + UNION ALL +SELECT 'LABEL','ID_RESET_FILTERS','en','Reset Filters','2014-10-07' + UNION ALL +SELECT 'LABEL','ID_INPUT_DB','en','Input','2014-10-08' + UNION ALL +SELECT 'LABEL','ID_TRIGGER_DB','en','Trigger','2014-10-08' + UNION ALL +SELECT 'LABEL','ID_IP','en','IP Client','2014-10-08' + UNION ALL +SELECT 'LABEL','ID_OUTPUT_DB','en','Output','2014-10-08' + UNION ALL +SELECT 'LABEL','ID_ATTACHED_DB','en','Attached','2014-10-08' + UNION ALL +SELECT 'LABEL','ID_DERIVATION_DB','en','Derivation','2014-10-08' + UNION ALL +SELECT 'LABEL','ID_OPEN_DYNAFORM_TAB','en','Open the Dynaform in a new tab','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_ENTERPRISE_FEATURES','en','Enterprise features','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_USER','en','Create User','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPDATE_USER','en','Update User','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_USER','en','Delete User','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_ENABLE_USER','en','Enable User','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DISABLE_USER','en','Disable User','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_ASSIGN_AUTHENTICATION_SOURCE','en','Assign Authentication Source','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_ASSIGN_USER_TO_GROUP','en','Assign Users To Group','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_AUTH_SOURCE','en','Create Auth Source','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPDATE_AUTH_SOURCE','en','Update Auth Source','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_AUTH_SOURCE','en','Delete Auth Source','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPDATE_ROLE','en','Update Role','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_ROLE','en','Delete Role','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_ASSIGN_USER_TO_ROLE','en','Assign Users To Role','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_USER_TO_ROLE','en','Delete Users To Role','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_ADD_PERMISSION_TO_ROLE','en','Add Permission To Role','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_PERMISSION_TO_ROLE','en','Delete Permission To Role','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_SKIN','en','Create Skin','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_IMPORT_SKIN','en','Import Skin','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_EXPORT_SKIN','en','Export Skin','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_SKIN','en','Delete Skin','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPDATE_GROUP','en','Update Group','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_CATEGORY','en','Create Category','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPDATE_CATEGORY','en','Update Category','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_CATEGORY','en','Delete Category','2014-10-10' + UNION ALL +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' + UNION ALL +SELECT 'LABEL','ID_UPDATE_LOGIN_SETTINGS','en','Update Login Settings','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DISABLE_HEART_BEAT','en','Disable Heart Beat','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_PMTABLE','en','Create PM Table','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPDATE_PMTABLE','en','Update PM Table','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_PMTABLE','en','Delete PM Table','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_ADD_DATA_PMTABLE','en','Add Data to PM table','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPDATE_DATA_PMTABLE','en','Update Data from PM Table','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_DATA_PMTABLE','en','Delete Data from PM Table','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_IMPORT_TABLE','en','Import Table','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_EXPORT_TABLE','en','Export Table','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_CALENDAR','en','Create Calendar','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPDATE_CALENDAR','en','Update Calendar','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_CALENDAR','en','Delete Calendar','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_DASHLET_INSTANCE','en','Create Dashlet Instance','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPDATE_DASHLET_INSTANCE','en','Update Dashlet Instance','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_DASHLET_INSTANCE','en','Delete Dashlet Instance','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_DEPARTAMENT','en','Create Departament','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_SUB_DEPARTAMENT','en','Create Sub Departament','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPDATE_DEPARTAMENT','en','Update Departament','2014-10-10' + ; +INSERT INTO [TRANSLATION] ([TRN_CATEGORY],[TRN_ID],[TRN_LANG],[TRN_VALUE],[TRN_UPDATE_DATE]) + +SELECT 'LABEL','ID_UPDATE_SUB_DEPARTAMENT','en','Update Sub Departament','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_DEPARTAMENT','en','Delete Departament','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_ASSIGN_MANAGER_TO_DEPARTAMENT','en','Assign Manager To Departament','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_ASSIGN_USER_TO_DEPARTAMENT','en','Assign Users To Departament','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_REMOVE_USERS_FROM_DEPARTAMENT','en','Remove Users From Departament','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPLOAD_LANGUAGE','en','Upload Language','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_EXPORT_LANGUAGE','en','Export Language','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_LAGUAGE','en','Delete Language','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPLOAD_SYSTEM_SETTINGS','en','Upload System Settings','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPDATE_EMAIL_SETTINGS','en','Update Email Settings','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_EMAIL_SETTINGS','en','Create Email Settings','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_UPLOAD_LOGO','en','Upload Logo','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DELETE_LOGO','en','Delete Logo','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_INSTALL_PLUGIN','en','Install Plugin','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_SET_COLUMNS','en','Set Columns','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_DISABLE_AUDIT_LOG','en','Disable Audit Log','2014-10-10' ; 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 2d9fb9868..47ee404ba 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -3100,7 +3100,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PROFILE','en','Profile','2014-01-15') , ( 'LABEL','ID_PLEASE_SELECT_PHOTO','en','Please select a photo','2014-01-15') , ( 'LABEL','ID_RESUME','en','Resume','2014-01-15') , -( 'LABEL','ID_USER_ID','en','User ID (*)','2014-01-15') , +( 'LABEL','ID_USER_ID','en','Username','2014-10-09') , ( 'LABEL','ID_PHONE','en','Phone','2014-01-15') , ( 'LABEL','ID_NEW_PASSWORD','en','New Password','2014-01-15') , ( 'LABEL','ID_CONFIRM_PASSWORD','en','Confirm Password','2014-01-15') , @@ -3506,7 +3506,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_INVALID_DATA','en','Invalid data','2014-01-15') , ( 'LABEL','ID_FAILED_DASHBOARD INSTANCE','en','Dashboard Instance registered failed','2014-01-15') , ( 'LABEL','ID_AJAX_COMMUNICATION_FAILED','en','Ajax communication failed','2014-01-15') , -( 'LABEL','ID_CHECK_FIELDS_MARK_RED','en','Please check the fields mark in red.','2014-01-15') , +( 'LABEL','ID_CHECK_FIELDS_MARK_RED','en','Please check the fields marked in red.','2014-10-06') , ( 'LABEL','ID_INPUT_ERROR','en','Input Error','2014-01-15') , ( 'LABEL','ID_INVALID_APPLICATION_NUMBER','en','You have set a invalid Application Number','2014-01-15') , ( 'LABEL','ID_3DAYSMINIMUM','en','3 days at least','2014-01-15') , @@ -3642,7 +3642,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_COPYRIGHT','en','Copyright © 2003-2011 Colosa, Inc. All rights reserved.','2014-01-15') , ( 'LABEL','ID_LOGIN_WITH_FACEBOOK','en','Login with Facebook!!','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP6','en','xxx','2014-01-15') , -( 'LABEL','ID_SIZE_VERY_LARGE_PERMITTED','en','The size is very large as permitted!','2014-09-10') , +( 'LABEL','ID_SIZE_VERY_LARGE_PERMITTED','en','The file is too large . Please upload a smaller file.','2014-10-08') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5','en','ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login.','2014-09-02') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_2','en','If you are installing ProcessMaker on a remote web server, you will need to get this information from your Database Server.','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_1','en','ProcessMaker stores all of its data in a database. This screen gives the installation program the information needed to create this database.','2014-01-15') , @@ -3844,7 +3844,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_REFRESH_TIME_SECONDS','en','Refresh Time (seconds)','2014-01-15') , ( 'LABEL','ID_MSG_ENABLE_HTML_EDITING','en','Warning: Editing the HTML prevents fields from being added or moved, so only edit the HTML after creating all the fields. Do you like to continue anyway?','2014-01-15') , ( 'LABEL','ID_ALL_CATEGORIES','en','All Categories','2014-01-15') , -( 'LABEL','ID_CASES_NOTES_NO_PERMISSIONS','en','You do not have permission to cases notes','2014-01-15') , +( 'LABEL','ID_CASES_NOTES_NO_PERMISSIONS','en','You do not have permission to access cases notes','2014-09-30') , ( 'LABEL','ID_DELETE_DOCUMENT','en','Do you want to delete selected document?','2014-01-15') , ( 'LABEL','ID_CRON_ACTIONS_LOG','en','Cron Actions Log','2014-01-15') , ( 'LABEL','ID_AUTH_SOURCE_MISSING','en','The plugin that is related to this authentication source was removed or disabled, please consult to your system administrator.','2014-01-15') ; @@ -4198,7 +4198,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_TINY_SYSTEM_VARIABLE','en','System Variable','2014-08-27') , ( 'LABEL','ID_CHOOSE_PROVIDER','en','Please select provider','2014-08-27') , ( 'LABEL','ID_INDEX','en','Index','2014-09-10') , -( 'LABEL','ID_ERROR_JS_NOT_AVAILABLE','en','Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won''t work totally because javascript is used.','2014-08-29') , +( 'LABEL','ID_ERROR_JS_NOT_AVAILABLE','en','Your browser doesn''t support JavaScript or it may be disabled. Please use a different browser or enable the JavaScript, Dynaforms won''t entirely work because JavaScript is used.','2014-10-09') , ( 'LABEL','ID_MAXIMUM_SIZE_FILE_REQUIRED','en','The maximum size file, is required!','2014-09-12') , ( 'LABEL','ID_BEFORE_UPDATE','en','Before Upgrade','2014-09-18') , ( 'LABEL','ID_WAIT_INSTALLING_PLUGIN','en','Please wait while installing the plugin...','2014-09-18') , @@ -4274,14 +4274,90 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_ENABLE_AUDIT_LOG','en','Enable Audit Log','2014-09-19') , ( 'LABEL','ID_AUDIT_LOG_ENABLED','en','Audit Log has been enabled','2014-09-19') , ( 'LABEL','ID_AUDIT_LOG_DISABLED','en','Audit Log has been disabled','2014-09-19') , -( 'LABEL','ID_AUDIT_LOG_DETAILS_1','en','Audit Log details1','2014-09-19') , -( 'LABEL','ID_AUDIT_LOG_DETAILS_2','en','Audit Log details 2','2014-09-19') , +( 'LABEL','ID_AUDIT_LOG_DETAILS_1','en','When this option is enabled, all changes made in the "ADMIN" tab are registered in a log.','2014-09-30') , +( 'LABEL','ID_AUDIT_LOG_DETAILS_2','en','and the user will be able to see those changes in the "Audit Log" option in Logs Menu','2014-10-10') , ( 'LABEL','ID_PRIVATE','en','Private','2014-09-22') , ( 'LABEL','ID_CASES_LIST','en','Cases Lists','2014-09-18') , ( 'LABEL','ID_MENU_NAME','en','Enterprise Plugins Manager','2014-09-18') , ( 'LABEL','ID_LEFT','en','left','2014-09-18') , ( 'LABEL','ID_CENTER','en','center','2014-09-18') , -( 'LABEL','ID_RIGHT','en','right','2014-09-18') ; +( 'LABEL','ID_RIGHT','en','right','2014-09-18') , +( 'LABEL','ID_LANGUAGE_CANT_DELETE_CURRENTLY','en','The language, which the system is currently using, cannot be deleted.','2014-09-25') , +( 'LABEL','ID_INPUT_DOC_MAX_FILESIZE_REQUIRED','en','Maximum file size parameter is required.','2014-09-30') , +( 'LABEL','ID_AUDIT_LOG_ACTIONS','en','Audit Log Actions','2014-09-30') , +( 'LABEL','ID_RESET_FILTERS','en','Reset Filters','2014-10-07') , +( 'LABEL','ID_INPUT_DB','en','Input','2014-10-08') , +( 'LABEL','ID_TRIGGER_DB','en','Trigger','2014-10-08') , +( 'LABEL','ID_IP','en','IP Client','2014-10-08') , +( 'LABEL','ID_OUTPUT_DB','en','Output','2014-10-08') , +( 'LABEL','ID_ATTACHED_DB','en','Attached','2014-10-08') , +( 'LABEL','ID_DERIVATION_DB','en','Derivation','2014-10-08') , +( 'LABEL','ID_OPEN_DYNAFORM_TAB','en','Open the Dynaform in a new tab','2014-10-10') , +( 'LABEL','ID_ENTERPRISE_FEATURES','en','Enterprise features','2014-10-10') , +( 'LABEL','ID_CREATE_USER','en','Create User','2014-10-10') , +( 'LABEL','ID_UPDATE_USER','en','Update User','2014-10-10') , +( 'LABEL','ID_DELETE_USER','en','Delete User','2014-10-10') , +( 'LABEL','ID_ENABLE_USER','en','Enable User','2014-10-10') , +( 'LABEL','ID_DISABLE_USER','en','Disable User','2014-10-10') , +( 'LABEL','ID_ASSIGN_AUTHENTICATION_SOURCE','en','Assign Authentication Source','2014-10-10') , +( 'LABEL','ID_ASSIGN_USER_TO_GROUP','en','Assign Users To Group','2014-10-10') , +( 'LABEL','ID_CREATE_AUTH_SOURCE','en','Create Auth Source','2014-10-10') , +( 'LABEL','ID_UPDATE_AUTH_SOURCE','en','Update Auth Source','2014-10-10') , +( 'LABEL','ID_DELETE_AUTH_SOURCE','en','Delete Auth Source','2014-10-10') , +( 'LABEL','ID_UPDATE_ROLE','en','Update Role','2014-10-10') , +( 'LABEL','ID_DELETE_ROLE','en','Delete Role','2014-10-10') , +( 'LABEL','ID_ASSIGN_USER_TO_ROLE','en','Assign Users To Role','2014-10-10') , +( 'LABEL','ID_DELETE_USER_TO_ROLE','en','Delete Users To Role','2014-10-10') , +( 'LABEL','ID_ADD_PERMISSION_TO_ROLE','en','Add Permission To Role','2014-10-10') , +( 'LABEL','ID_DELETE_PERMISSION_TO_ROLE','en','Delete Permission To Role','2014-10-10') , +( 'LABEL','ID_CREATE_SKIN','en','Create Skin','2014-10-10') , +( 'LABEL','ID_IMPORT_SKIN','en','Import Skin','2014-10-10') , +( 'LABEL','ID_EXPORT_SKIN','en','Export Skin','2014-10-10') , +( 'LABEL','ID_DELETE_SKIN','en','Delete Skin','2014-10-10') , +( 'LABEL','ID_UPDATE_GROUP','en','Update Group','2014-10-10') , +( 'LABEL','ID_CREATE_CATEGORY','en','Create Category','2014-10-10') , +( 'LABEL','ID_UPDATE_CATEGORY','en','Update Category','2014-10-10') , +( '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_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') , +( 'LABEL','ID_UPDATE_PMTABLE','en','Update PM Table','2014-10-10') , +( 'LABEL','ID_DELETE_PMTABLE','en','Delete PM Table','2014-10-10') , +( 'LABEL','ID_ADD_DATA_PMTABLE','en','Add Data to PM table','2014-10-10') , +( 'LABEL','ID_UPDATE_DATA_PMTABLE','en','Update Data from PM Table','2014-10-10') , +( 'LABEL','ID_DELETE_DATA_PMTABLE','en','Delete Data from PM Table','2014-10-10') , +( 'LABEL','ID_IMPORT_TABLE','en','Import Table','2014-10-10') , +( 'LABEL','ID_EXPORT_TABLE','en','Export Table','2014-10-10') , +( 'LABEL','ID_CREATE_CALENDAR','en','Create Calendar','2014-10-10') , +( 'LABEL','ID_UPDATE_CALENDAR','en','Update Calendar','2014-10-10') , +( 'LABEL','ID_DELETE_CALENDAR','en','Delete Calendar','2014-10-10') , +( 'LABEL','ID_CREATE_DASHLET_INSTANCE','en','Create Dashlet Instance','2014-10-10') , +( 'LABEL','ID_UPDATE_DASHLET_INSTANCE','en','Update Dashlet Instance','2014-10-10') , +( 'LABEL','ID_DELETE_DASHLET_INSTANCE','en','Delete Dashlet Instance','2014-10-10') , +( 'LABEL','ID_CREATE_DEPARTAMENT','en','Create Departament','2014-10-10') , +( 'LABEL','ID_CREATE_SUB_DEPARTAMENT','en','Create Sub Departament','2014-10-10') , +( 'LABEL','ID_UPDATE_DEPARTAMENT','en','Update Departament','2014-10-10') ; +INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ) VALUES + +( 'LABEL','ID_UPDATE_SUB_DEPARTAMENT','en','Update Sub Departament','2014-10-10') , +( 'LABEL','ID_DELETE_DEPARTAMENT','en','Delete Departament','2014-10-10') , +( 'LABEL','ID_ASSIGN_MANAGER_TO_DEPARTAMENT','en','Assign Manager To Departament','2014-10-10') , +( 'LABEL','ID_ASSIGN_USER_TO_DEPARTAMENT','en','Assign Users To Departament','2014-10-10') , +( 'LABEL','ID_REMOVE_USERS_FROM_DEPARTAMENT','en','Remove Users From Departament','2014-10-10') , +( 'LABEL','ID_UPLOAD_LANGUAGE','en','Upload Language','2014-10-10') , +( 'LABEL','ID_EXPORT_LANGUAGE','en','Export Language','2014-10-10') , +( 'LABEL','ID_DELETE_LAGUAGE','en','Delete Language','2014-10-10') , +( 'LABEL','ID_UPLOAD_SYSTEM_SETTINGS','en','Upload System Settings','2014-10-10') , +( 'LABEL','ID_UPDATE_EMAIL_SETTINGS','en','Update Email Settings','2014-10-10') , +( 'LABEL','ID_CREATE_EMAIL_SETTINGS','en','Create Email Settings','2014-10-10') , +( 'LABEL','ID_UPLOAD_LOGO','en','Upload Logo','2014-10-10') , +( 'LABEL','ID_DELETE_LOGO','en','Delete Logo','2014-10-10') , +( 'LABEL','ID_INSTALL_PLUGIN','en','Install Plugin','2014-10-10') , +( 'LABEL','ID_SET_COLUMNS','en','Set Columns','2014-10-10') , +( 'LABEL','ID_DISABLE_AUDIT_LOG','en','Disable Audit Log','2014-10-10') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , From 43571faa092b3b694ce9a5b74c74568dc74f6bff Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Fri, 10 Oct 2014 16:09:47 -0400 Subject: [PATCH 03/12] Updating .po and .sql files for 2.8 RC1 (2014-10-10) --- workflow/engine/content/translations/english/processmaker.en.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 2e590cfb7..f6e2cd717 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: ProcessMaker 2.5.2.3\n" +"Project-Id-Version: ProcessMaker 2.8\n" "POT-Creation-Date: \n" "PO-Revision-Date: 2014-10-10 16:02:15\n" "Last-Translator: \n" From ea42cf711b6d23fea1346478a0bf1d0e9a7cf0f7 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Fri, 10 Oct 2014 16:17:07 -0400 Subject: [PATCH 04/12] Improvement enable features enterprise --- gulliver/system/class.g.php | 3 ++- gulliver/thirdparty/propel/Propel.php | 5 +++++ workflow/engine/bin/tasks/cliAddons.php | 13 +++++++++++- .../engine/classes/class.licensedFeatures.php | 20 +++++++------------ workflow/engine/classes/class.wsBase.php | 3 ++- workflow/engine/classes/class.wsTools.php | 8 +++++++- workflow/engine/menus/setup.php | 7 +++++-- .../templates/enterprise/addonsStore.js | 2 +- 8 files changed, 41 insertions(+), 20 deletions(-) diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index c423a3caf..d3ef213a7 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -5279,7 +5279,8 @@ class G $sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS ); $ipClient = G::getIpAddress(); - if ($sflagAudit) { + $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'; $fullname = isset($_SESSION['USR_FULLNAME']) && $_SESSION['USR_FULLNAME'] != '' ? $_SESSION['USR_FULLNAME'] : '-'; diff --git a/gulliver/thirdparty/propel/Propel.php b/gulliver/thirdparty/propel/Propel.php index dc7c81036..b6a7377c6 100755 --- a/gulliver/thirdparty/propel/Propel.php +++ b/gulliver/thirdparty/propel/Propel.php @@ -614,6 +614,11 @@ class Propel { */ public static function getDbConnection($name) { + $licensedFeatures = & PMLicensedFeatures::getSingleton(); + if (! $licensedFeatures->verifyfeature('02YeEFKNnVoOWFKMzN4ZmpXT0V3MU9SVklnOXNCcE9zcXJKa0tpemNmQkJ5OTUvOWlLdFhibGp0MHVHUlV0VmNpNw==')) { + return null; + } + if (! empty(self::$configuration['datasources'][$name]['connection'])) { return self::getConnection($name); } diff --git a/workflow/engine/bin/tasks/cliAddons.php b/workflow/engine/bin/tasks/cliAddons.php index eae7ce857..beac69878 100644 --- a/workflow/engine/bin/tasks/cliAddons.php +++ b/workflow/engine/bin/tasks/cliAddons.php @@ -118,7 +118,18 @@ function change_hash($command, $opts) $response = new stdclass(); $response->workspace = $workspace; $response->hash = $hash; - $workspace->changeHashPassword($workspace->name, $response); + if (!defined("SYS_SYS")) { + define("SYS_SYS", $workspace->name); + } + if (!defined("PATH_DATA_SITE")) { + define("PATH_DATA_SITE", PATH_DATA . "sites/" . SYS_SYS . "/"); + } + $_SESSION['__sw__'] = ''; + if (!$workspace->changeHashPassword($workspace->name, $response)) { + CLI::logging(pakeColor::colorize("This command cannot be used because your license does not include it.", "ERROR") . "\n"); + $workspace->close(); + die; + } $workspace->close(); CLI::logging(pakeColor::colorize("Changed...", "ERROR") . "\n"); } catch (Exception $e) { diff --git a/workflow/engine/classes/class.licensedFeatures.php b/workflow/engine/classes/class.licensedFeatures.php index 50ccb71e6..9a60e7895 100644 --- a/workflow/engine/classes/class.licensedFeatures.php +++ b/workflow/engine/classes/class.licensedFeatures.php @@ -65,25 +65,19 @@ class PMLicensedFeatures public function verifyfeature ($featureName) { + if (!class_exists("pmLicenseManager")) { + require_once ("classes" . PATH_SEP . "class.pmLicenseManager.php"); + } $licenseManager = &pmLicenseManager::getSingleton(); + $_SESSION['__sw__'] = true; $padl = new padl(); + $value = $padl->_decrypt($featureName); - $enable = in_array($padl->_decrypt($featureName), $licenseManager->features); + $enable = in_array($value[0], $licenseManager->licensedfeatures); - $this->featuresDetails[$padl->_decrypt($featureName)]->enabled = $enable; + $this->featuresDetails[$value[0]]->enabled = $enable; return $enable; } - - public static function loadSingleton($file) - { - self::$instancefeature = unserialize(file_get_contents($file)); - - if (! is_object(self::$instancefeature) || get_class(self::$instancefeature) != "PMLicensedFeatures") { - throw new Exception("Can't load main PMLicensedFeatures object."); - } - - return self::$instancefeature; - } } diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index 3e4c65a9a..43965394e 100755 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -920,7 +920,8 @@ class wsBase if (!class_exists('System')) { G::LoadClass('system'); } - $aSetup = !empty($config) ? $config : System::getEmailConfiguration(); + $licensedFeatures = & PMLicensedFeatures::getSingleton(); + $aSetup = (!empty($config) && $licensedFeatures->verifyfeature('nKaNTNuT1MzK0RsMEtXTnYzR09ucHF2WGNuS0hRdDBBak42WXJhNVVOOG1INEVoaU1EaTllbjBBeEJNeG9wRVJ6NmxQelhyVTBvdThzPQ==') ) ? $config : System::getEmailConfiguration(); $oSpool = new spoolRun(); diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 458bd6134..4063f0634 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -1668,7 +1668,13 @@ class workspaceTools { $this->initPropel( true ); G::LoadClass("enterprise"); - enterpriseClass::setHashPassword($response); + $licensedFeatures = & PMLicensedFeatures::getSingleton(); + if ($licensedFeatures->verifyfeature('95OY24wcXpEMzIyRmlNSnF0STNFSHJzMG9wYTJKekpLNmY2ZmRCeGtuZk5oUDloaUNhUGVjTDJBPT0=')) { + enterpriseClass::setHashPassword($response); + } else { + return false; + } + return true; } public function verifyEnterprise ($workspace) diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php index afde8664f..1b8c48b4e 100755 --- a/workflow/engine/menus/setup.php +++ b/workflow/engine/menus/setup.php @@ -28,6 +28,7 @@ $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false; $oServerConf = & serverConf::getSingleton(); $sAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS ); +$licensedFeatures = & PMLicensedFeatures::getSingleton(); if ($RBAC->userCanAccess('PM_SETUP') == 1 ) { //settings options @@ -98,7 +99,7 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1) { $G_TMP_MENU->AddIdRawOption('LOG_CASE_SCHEDULER', '../cases/cases_Scheduler_Log', G::LoadTranslation('ID_CASE_SCHEDULER'), "icon-logs-list.png",'', 'logs'); $G_TMP_MENU->AddIdRawOption("CRON", "../setup/cron", G::LoadTranslation("ID_CRON_ACTIONS"), null, null, "logs"); $G_TMP_MENU->AddIdRawOption('EMAILS', '../mails/emailList', ucfirst (strtolower ( G::LoadTranslation('ID_EMAILS'))), '', '', 'logs'); - if (isset($sAudit) && $sAudit != false) { + if (isset($sAudit) && $sAudit != false && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) { $G_TMP_MENU->AddIdRawOption('AUDIT_LOG', '../setup/auditLog', ucfirst (G::LoadTranslation('ID_AUDITLOG_DISPLAY')), '', '', 'logs'); } } @@ -107,7 +108,9 @@ if ($RBAC->userCanAccess("PM_SETUP") == 1) { $G_TMP_MENU->AddIdRawOption("PM_REQUIREMENTS", "../setup/systemInfo", G::LoadTranslation("ID_PROCESSMAKER_REQUIREMENTS_CHECK"), "", "", "settings"); $G_TMP_MENU->AddIdRawOption("PHP_INFO", "../setup/systemInfo?option=php", G::LoadTranslation("ID_PHP_INFO"), "", "", "settings"); //$G_TMP_MENU->AddIdRawOption("PHP_MAINTENANCE", "../admin/maintenance", 'Maintenance', "", "", "settings"); - $G_TMP_MENU->AddIdRawOption("AUDIT_LOG", "auditLogConfig", G::LoadTranslation("ID_AUDITLOG_DISPLAY"), "", "", "settings"); + if ($licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) { + $G_TMP_MENU->AddIdRawOption("AUDIT_LOG", "auditLogConfig", G::LoadTranslation("ID_AUDITLOG_DISPLAY"), "", "", "settings"); + } } require_once 'classes/class.pmLicenseManager.php'; diff --git a/workflow/engine/templates/enterprise/addonsStore.js b/workflow/engine/templates/enterprise/addonsStore.js index 2aa05dfc3..7fabaaa8a 100644 --- a/workflow/engine/templates/enterprise/addonsStore.js +++ b/workflow/engine/templates/enterprise/addonsStore.js @@ -1709,7 +1709,7 @@ Ext.onReady(function() { title: _('ID_ENTERPRISE_PLUGINS'), items : addonsGrid },{ - title: _('ID_ENTERPRISE_FIXTURES'), + title: _('ID_ENTERPRISE_FEATURES'), items : addonsFeatureGrid } ] From 95adfc840c6346ff3a67bde2f29a704e14c34231 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Fri, 10 Oct 2014 16:19:46 -0400 Subject: [PATCH 05/12] updating oauth docs --- workflow/engine/templates/oauth2/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/oauth2/index.html b/workflow/engine/templates/oauth2/index.html index 3c36f7a65..c809ecb7a 100644 --- a/workflow/engine/templates/oauth2/index.html +++ b/workflow/engine/templates/oauth2/index.html @@ -125,7 +125,7 @@ grant_type=password& username=bob& password=secret& - scope=offline_access + scope=*

From 37e1ad781cb807d1dece2b52449131380cd20885 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Fri, 10 Oct 2014 16:41:15 -0400 Subject: [PATCH 06/12] Change message when the 'unify-database' commanda is executed in a workspace that already using one database --- workflow/engine/bin/tasks/cliUpgrade.php | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/workflow/engine/bin/tasks/cliUpgrade.php b/workflow/engine/bin/tasks/cliUpgrade.php index 532e3871d..d76dd1b38 100755 --- a/workflow/engine/bin/tasks/cliUpgrade.php +++ b/workflow/engine/bin/tasks/cliUpgrade.php @@ -196,9 +196,9 @@ function listFiles($dir) { } function run_unify_database($args) -{ +{ $workspaces = array(); - + if (sizeof($args) > 2) { $filename = array_pop($args); foreach ($args as $arg) { @@ -213,10 +213,10 @@ function run_unify_database($args) CLI::logging("Checking workspaces...\n"); //setting flag to true to check into sysGeneric.php $flag = G::isPMUnderUpdating(0); - + //start to unify $count = count($workspaces); - + if ($count > 1) { if(!Bootstrap::isLinuxOs()){ CLI::error("This is not a Linux enviroment, please especify workspace.\n"); @@ -228,16 +228,16 @@ function run_unify_database($args) $errors = false; $countWorkspace = 0; $buildCacheView = array_key_exists("buildACV", $args); - - foreach ($workspaces as $workspace) { - try { + + foreach ($workspaces as $workspace) { + try { $countWorkspace++; if (! $workspace->workspaceExists()) { echo "Workspace {$workspace->name} not found\n"; return false; } - + $ws = $workspace->name; $sContent = file_get_contents (PATH_DB . $ws . PATH_SEP . 'db.php'); @@ -248,7 +248,7 @@ function run_unify_database($args) } if ($workspace->onedb) { - CLI::logging("Workspace $workspace->name already one Database...\n"); + CLI::logging("The \"$workspace->name\" workspace already using one database...\n"); } else { //create destination path $parentDirectory = PATH_DATA . "upgrade"; @@ -265,18 +265,18 @@ function run_unify_database($args) CLI::logging( "Exporting rb and rp databases to a temporal location...\n" ); $metadata["databases"] = $workspace->exportDatabase( $tempDirectory,true ); $metadata["version"] = 1; - + list ($dbHost, $dbUser, $dbPass) = @explode( SYSTEM_HASH, G::decrypt( HASH_INSTALLATION, SYSTEM_HASH ) ); $link = mysql_connect( $dbHost, $dbUser, $dbPass ); - + foreach ($metadata['databases'] as $db) { $dbName = 'wf_'.$workspace->name; CLI::logging( "+> Restoring {$db['name']} to $dbName database\n" ); $aParameters = array('dbHost'=>$dbHost,'dbUser'=>$dbUser,'dbPass'=>$dbPass); - + $restore = $workspace->executeScript( $dbName, "$tempDirectory/{$db['name']}.sql", $aParameters); - + if ($restore) { CLI::logging( "+> Remove {$db['name']} database\n" ); @@ -286,15 +286,15 @@ function run_unify_database($args) } } } - + CLI::logging( "Removing temporary files\n" ); G::rm_dir( $tempDirectory ); - + $newDBNames = $workspace->resetDBInfo( $dbHost, true, true ); CLI::logging( CLI::info( "Done restoring databases" ) . "\n" ); - } - } catch (Exception $e) { + } + } catch (Exception $e) { CLI::logging("Errors upgrading workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n"); $errors = true; } From 4cb09a2668e55aa21ce64dfd8d5653aad66798aa Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Fri, 10 Oct 2014 17:15:58 -0400 Subject: [PATCH 07/12] Updating .po and .sql files for 2.8 RC1 (2014-10-10 17:16) --- .../content/translations/english/processmaker.en.po | 10 ++++++++-- workflow/engine/data/mssql/insert.sql | 2 ++ workflow/engine/data/mysql/insert.sql | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index f6e2cd717..098e35de6 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -1,8 +1,8 @@ msgid "" msgstr "" -"Project-Id-Version: ProcessMaker 2.8\n" +"Project-Id-Version: ProcessMaker 2.8.0\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2014-10-10 16:02:15\n" +"PO-Revision-Date: 2014-10-10 17:13:58\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -17389,6 +17389,12 @@ msgstr "Set Columns" msgid "Disable Audit Log" msgstr "Disable Audit Log" +# TRANSLATION +# LABEL/ID_REMOVE_PLUGIN +#: LABEL/ID_REMOVE_PLUGIN +msgid "Remove Plugin" +msgstr "Remove Plugin" + # 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 c2ebfbf2b..0ae42f08a 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -7253,6 +7253,8 @@ SELECT 'LABEL','ID_INSTALL_PLUGIN','en','Install Plugin','2014-10-10' SELECT 'LABEL','ID_SET_COLUMNS','en','Set Columns','2014-10-10' UNION ALL SELECT 'LABEL','ID_DISABLE_AUDIT_LOG','en','Disable Audit Log','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_REMOVE_PLUGIN','en','Remove Plugin','2014-10-10' ; 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 47ee404ba..130c47e3f 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -4357,7 +4357,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_DELETE_LOGO','en','Delete Logo','2014-10-10') , ( 'LABEL','ID_INSTALL_PLUGIN','en','Install Plugin','2014-10-10') , ( 'LABEL','ID_SET_COLUMNS','en','Set Columns','2014-10-10') , -( 'LABEL','ID_DISABLE_AUDIT_LOG','en','Disable Audit Log','2014-10-10') ; +( 'LABEL','ID_DISABLE_AUDIT_LOG','en','Disable Audit Log','2014-10-10') , +( 'LABEL','ID_REMOVE_PLUGIN','en','Remove Plugin','2014-10-10') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , From 1fdb037d090fa37ab21a0c414336725ed2f82929 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Fri, 10 Oct 2014 17:45:50 -0400 Subject: [PATCH 08/12] Branch 2.8 "No mostra menu New en Disigner" --- workflow/engine/templates/processes/main.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 96b8a7a63..5876fc335 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -224,7 +224,7 @@ Ext.onReady(function(){ }), store: store, tbar:[ - { + /*{ xtype: 'tbsplit', text: _('ID_NEW'), iconCls: 'button_menu_ext ss_sprite ss_add', @@ -251,13 +251,24 @@ Ext.onReady(function(){ obj.showMenu(); } } - },/* + },*//* { text: _('ID_NEW'), iconCls: 'button_menu_ext ss_sprite ss_add', //icon: '/images/addc.png', handler: newProcess },*/ + + { + text: _("ID_NEW"), + iconCls: "button_menu_ext ss_sprite ss_add", + icon: "", + handler: function () + { + newProcess({type: "classicProject"}); + } + }, + '-' ,{ text: _('ID_EDIT'), From 6d5f3eac827bc2041b53c452fd7a7cfa23a6b4f5 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 13 Oct 2014 11:11:01 -0400 Subject: [PATCH 09/12] Merging fixes from 2.5 branch --- .../engine/classes/class.licensedFeatures.php | 3 ++ .../translations/english/processmaker.en.po | 44 ++++++++++++++++--- workflow/engine/data/mssql/insert.sql | 16 +++++-- workflow/engine/data/mysql/insert.sql | 13 ++++-- 4 files changed, 62 insertions(+), 14 deletions(-) diff --git a/workflow/engine/classes/class.licensedFeatures.php b/workflow/engine/classes/class.licensedFeatures.php index 9a60e7895..9b543c487 100644 --- a/workflow/engine/classes/class.licensedFeatures.php +++ b/workflow/engine/classes/class.licensedFeatures.php @@ -76,6 +76,9 @@ class PMLicensedFeatures $enable = in_array($value[0], $licenseManager->licensedfeatures); + if (!isset($this->featuresDetails[$value[0]]) || !is_object($this->featuresDetails[$value[0]])) { + $this->featuresDetails[$value[0]] = new stdclass(); + } $this->featuresDetails[$value[0]]->enabled = $enable; return $enable; } diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 098e35de6..aefe8fe35 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-10 17:13:58\n" +"PO-Revision-Date: 2014-10-13 09:11:02\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -17062,20 +17062,20 @@ msgstr "Assign Users To Group" # TRANSLATION # LABEL/ID_CREATE_AUTH_SOURCE #: LABEL/ID_CREATE_AUTH_SOURCE -msgid "Create Auth Source" -msgstr "Create Auth Source" +msgid "Create Authentication Source" +msgstr "Create Authentication Source" # TRANSLATION # LABEL/ID_UPDATE_AUTH_SOURCE #: LABEL/ID_UPDATE_AUTH_SOURCE -msgid "Update Auth Source" -msgstr "Update Auth Source" +msgid "Update Authentication Source" +msgstr "Update Authentication Source" # TRANSLATION # LABEL/ID_DELETE_AUTH_SOURCE #: LABEL/ID_DELETE_AUTH_SOURCE -msgid "Delete Auth Source" -msgstr "Delete Auth Source" +msgid "Delete Authentication Source" +msgstr "Delete Authentication Source" # TRANSLATION # LABEL/ID_UPDATE_ROLE @@ -17395,6 +17395,36 @@ msgstr "Disable Audit Log" msgid "Remove Plugin" msgstr "Remove Plugin" +# TRANSLATION +# LABEL/ID_CREATE_ROLE +#: LABEL/ID_CREATE_ROLE +msgid "[LABEL/ID_CREATE_ROLE] Create New Role" +msgstr "Create New Role" + +# TRANSLATION +# LABEL/ID_CREATE_GROUP +#: LABEL/ID_CREATE_GROUP +msgid "[LABEL/ID_CREATE_GROUP] Create New Group" +msgstr "Create New Group" + +# TRANSLATION +# LABEL/ID_DELETE_GROUP +#: LABEL/ID_DELETE_GROUP +msgid "Remove Group" +msgstr "Remove Group" + +# TRANSLATION +# LABEL/ID_DISABLE_PLUGIN +#: LABEL/ID_DISABLE_PLUGIN +msgid "Disable Plugin" +msgstr "Disable Plugin" + +# TRANSLATION +# LABEL/ID_ENABLE_PLUGIN +#: LABEL/ID_ENABLE_PLUGIN +msgid "Enable Plugin" +msgstr "Enable Plugin" + # 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 0ae42f08a..528570da1 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -7142,11 +7142,11 @@ SELECT 'LABEL','ID_ASSIGN_AUTHENTICATION_SOURCE','en','Assign Authentication Sou UNION ALL SELECT 'LABEL','ID_ASSIGN_USER_TO_GROUP','en','Assign Users To Group','2014-10-10' UNION ALL -SELECT 'LABEL','ID_CREATE_AUTH_SOURCE','en','Create Auth Source','2014-10-10' +SELECT 'LABEL','ID_CREATE_AUTH_SOURCE','en','Create Authentication Source','2014-10-13' UNION ALL -SELECT 'LABEL','ID_UPDATE_AUTH_SOURCE','en','Update Auth Source','2014-10-10' +SELECT 'LABEL','ID_UPDATE_AUTH_SOURCE','en','Update Authentication Source','2014-10-13' UNION ALL -SELECT 'LABEL','ID_DELETE_AUTH_SOURCE','en','Delete Auth Source','2014-10-10' +SELECT 'LABEL','ID_DELETE_AUTH_SOURCE','en','Delete Authentication Source','2014-10-13' UNION ALL SELECT 'LABEL','ID_UPDATE_ROLE','en','Update Role','2014-10-10' UNION ALL @@ -7255,6 +7255,16 @@ SELECT 'LABEL','ID_SET_COLUMNS','en','Set Columns','2014-10-10' SELECT 'LABEL','ID_DISABLE_AUDIT_LOG','en','Disable Audit Log','2014-10-10' UNION ALL SELECT 'LABEL','ID_REMOVE_PLUGIN','en','Remove Plugin','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_ROLE','en','Create New Role','2014-10-13' + UNION ALL +SELECT 'LABEL','ID_CREATE_GROUP','en','Create New Group','2014-10-13' + UNION ALL +SELECT 'LABEL','ID_DELETE_GROUP','en','Remove Group','2014-10-13' + UNION ALL +SELECT 'LABEL','ID_DISABLE_PLUGIN','en','Disable Plugin','2014-10-13' + UNION ALL +SELECT 'LABEL','ID_ENABLE_PLUGIN','en','Enable Plugin','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 130c47e3f..1be9c2a2a 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -4301,9 +4301,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_DISABLE_USER','en','Disable User','2014-10-10') , ( 'LABEL','ID_ASSIGN_AUTHENTICATION_SOURCE','en','Assign Authentication Source','2014-10-10') , ( 'LABEL','ID_ASSIGN_USER_TO_GROUP','en','Assign Users To Group','2014-10-10') , -( 'LABEL','ID_CREATE_AUTH_SOURCE','en','Create Auth Source','2014-10-10') , -( 'LABEL','ID_UPDATE_AUTH_SOURCE','en','Update Auth Source','2014-10-10') , -( 'LABEL','ID_DELETE_AUTH_SOURCE','en','Delete Auth Source','2014-10-10') , +( 'LABEL','ID_CREATE_AUTH_SOURCE','en','Create Authentication Source','2014-10-13') , +( 'LABEL','ID_UPDATE_AUTH_SOURCE','en','Update Authentication Source','2014-10-13') , +( 'LABEL','ID_DELETE_AUTH_SOURCE','en','Delete Authentication Source','2014-10-13') , ( 'LABEL','ID_UPDATE_ROLE','en','Update Role','2014-10-10') , ( 'LABEL','ID_DELETE_ROLE','en','Delete Role','2014-10-10') , ( 'LABEL','ID_ASSIGN_USER_TO_ROLE','en','Assign Users To Role','2014-10-10') , @@ -4358,7 +4358,12 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_INSTALL_PLUGIN','en','Install Plugin','2014-10-10') , ( 'LABEL','ID_SET_COLUMNS','en','Set Columns','2014-10-10') , ( 'LABEL','ID_DISABLE_AUDIT_LOG','en','Disable Audit Log','2014-10-10') , -( 'LABEL','ID_REMOVE_PLUGIN','en','Remove Plugin','2014-10-10') ; +( 'LABEL','ID_REMOVE_PLUGIN','en','Remove Plugin','2014-10-10') , +( 'LABEL','ID_CREATE_ROLE','en','Create New Role','2014-10-13') , +( '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') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , From ecc10ab7ab029cff568bbef5bf873746da8dd952 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 13 Oct 2014 11:14:35 -0400 Subject: [PATCH 10/12] Merging fixes from 2.5 branch --- workflow/engine/templates/processes/main.js | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 5876fc335..96b8a7a63 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -224,7 +224,7 @@ Ext.onReady(function(){ }), store: store, tbar:[ - /*{ + { xtype: 'tbsplit', text: _('ID_NEW'), iconCls: 'button_menu_ext ss_sprite ss_add', @@ -251,24 +251,13 @@ Ext.onReady(function(){ obj.showMenu(); } } - },*//* + },/* { text: _('ID_NEW'), iconCls: 'button_menu_ext ss_sprite ss_add', //icon: '/images/addc.png', handler: newProcess },*/ - - { - text: _("ID_NEW"), - iconCls: "button_menu_ext ss_sprite ss_add", - icon: "", - handler: function () - { - newProcess({type: "classicProject"}); - } - }, - '-' ,{ text: _('ID_EDIT'), From c9f29cb1c5c0b75e4cfebce318ca6322b50bac9b Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 13 Oct 2014 12:39:49 -0400 Subject: [PATCH 11/12] 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 0c2a82cf5c2248c559833999c95b621be4e15bc9 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 13 Oct 2014 15:13:34 -0400 Subject: [PATCH 12/12] 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