fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Wendy Nestor
2014-10-13 15:24:01 -04:00
parent 84905cc60b 6071f1b4cd
commit 9262d3b3f7
9 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gulliver/system/class.g.php
View File

@@ -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);

3
workflow/engine/classes/class.serverConfiguration.php
View File

@@ -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);
}
}

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

@@ -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 <developers@colosa.com>\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

2
workflow/engine/controllers/adminProxy.php
View File

@@ -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;
}

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

@@ -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])

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

@@ -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','','',' ','') ,

13
workflow/engine/methods/setup/auditLog.php
View File

@@ -19,15 +19,15 @@ $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" )),
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" )),
@@ -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" )),
@@ -67,9 +67,9 @@ $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 ("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" )),
@@ -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" )),

1
workflow/engine/methods/setup/auditLogAjax.php
View File

@@ -13,6 +13,7 @@ function auditLogArraySet ($str, $filter)
$date = "";
$workspace = "";
$action = "";
$ip = "";
$user = "";
$description = "";

4
workflow/engine/methods/setup/auditLogConfigAjax.php
View File

@@ -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'] )) {
@@ -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;