archive/salesagility_SuiteCRM
0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-03-15 05:44:49 +00:00
Code Issues Projects Releases Wiki Activity

Upgraded Security Suite to version 2.7.4

Browse source
This commit is contained in:
Matthew 2014-07-01 12:13:31 +01:00
parent ff555c7757
commit 0b0a0e46af
17 changed files with 80 additions and 36 deletions

1
custom/Extension/application/Ext/Language/de_de.SecurityGroups.php
View file

@ -3,5 +3,6 @@
$app_list_strings["moduleList"]["SecurityGroups"] = 'Berechtigungsgruppen';
$app_strings['LBL_LOGIN_AS'] = "Einloggen als ";
$app_strings['LBL_LOGOUT_AS'] = "Ausloggen als ";
$app_strings['LBL_SECURITYGROUP'] = 'Berechtigungsgruppe';
?>

1
custom/Extension/application/Ext/Language/en_us.SecurityGroups.php
View file

@ -3,5 +3,6 @@
$app_list_strings["moduleList"]["SecurityGroups"] = 'Security Groups Management';
$app_strings['LBL_LOGIN_AS'] = "Login as ";
$app_strings['LBL_LOGOUT_AS'] = "Logout as ";
$app_strings['LBL_SECURITYGROUP'] = 'Security Group';
?>

1
custom/Extension/application/Ext/Language/es_es.SecurityGroups.php
View file

@ -3,5 +3,6 @@
$app_list_strings["moduleList"]["SecurityGroups"] = 'Administración de Grupos de Seguridad';
$app_strings['LBL_LOGIN_AS'] = "Conexión como ";
$app_strings['LBL_LOGOUT_AS'] = "Cerrar sesión como ";
$app_strings['LBL_SECURITYGROUP'] = 'Administración de Grupo';
?>

1
custom/Extension/application/Ext/Language/fr_FR.SecurityGroups.php
View file

@ -3,5 +3,6 @@
$app_list_strings["moduleList"]["SecurityGroups"] = "Gestion des équipes";
$app_strings['LBL_LOGIN_AS'] = "Ouverture comme ";
$app_strings['LBL_LOGOUT_AS'] = "Déconnexion comme ";
$app_strings['LBL_SECURITYGROUP'] = 'Gestion des équipe';
?>

1
custom/Extension/application/Ext/Language/hu_hu.SecurityGroups.php
View file

@ -3,5 +3,6 @@
$app_list_strings["moduleList"]["SecurityGroups"] = 'Biztonsági Csoportok Kezelése';
$app_strings['LBL_LOGIN_AS'] = "Belépés mint ";
$app_strings['LBL_LOGOUT_AS'] = "Kilépés mint ";
$app_strings['LBL_SECURITYGROUP'] = 'Biztonsági Csoportok';
?>

1
custom/Extension/application/Ext/Language/it_it.SecurityGroups.php
View file

@ -3,5 +3,6 @@
$app_list_strings["moduleList"]["SecurityGroups"] = 'Gestione Gruppi di Sicurezza';
$app_strings['LBL_LOGIN_AS'] = "Inizio attività come ";
$app_strings['LBL_LOGOUT_AS'] = "Termine attività come ";
$app_strings['LBL_SECURITYGROUP'] = 'Gestione Gruppi';
?>

5
custom/Extension/application/Ext/Language/nl_NL.SecurityGroups.php
View file

@ -1,7 +1,8 @@
<?php
$app_list_strings["moduleList"]["SecurityGroups"] = 'Security Groep Beheer';
$app_list_strings["moduleList"]["SecurityGroups"] = 'Security Groepen';
$app_strings['LBL_LOGIN_AS'] = "Log in als ";
$app_strings['LBL_LOGOUT_AS'] = "Log uit als ";
$app_strings['LBL_SECURITYGROUP'] = 'Security Groepen';
?>
?>

1
custom/Extension/application/Ext/Language/pt_br.SecurityGroups.php
View file

@ -3,5 +3,6 @@
$app_list_strings["moduleList"]["SecurityGroups"] = 'Gerenciamento de Grupos de Segurança';
$app_strings['LBL_LOGIN_AS'] = "Iniciar sessão como ";
$app_strings['LBL_LOGOUT_AS'] = "Terminar sessão como ";
$app_strings['LBL_SECURITYGROUP'] = 'Gerenciamento de Grupo';
?>

12
custom/Extension/application/Ext/Language/ru_ru.SecurityGroups.php
View file

@ -1,7 +1,7 @@
<?php
<?php
$app_list_strings["moduleList"]["SecurityGroups"] = 'Группы пользователей';
$app_strings['LBL_LOGIN_AS'] = "Login as ";
$app_strings['LBL_LOGOUT_AS'] = "Logout as ";
?>
$app_list_strings["moduleList"]["SecurityGroups"] = 'Управление Группами пользователей';
$app_strings['LBL_LOGIN_AS'] = "Войти как ";
$app_strings['LBL_LOGOUT_AS'] = "Выйти как ";
$app_strings['LBL_SECURITYGROUP'] = 'Управление Группами';
?>

4
custom/Extension/application/Ext/Language/ua_ua.SecurityGroups.php
View file

@ -1,7 +1,7 @@
<?php
<?php
$app_list_strings["moduleList"]["SecurityGroups"] = 'Управління Групами Користувачів';
$app_strings['LBL_LOGIN_AS'] = "Ввійти як ";
$app_strings['LBL_LOGOUT_AS'] = "Вийти як ";
$app_strings['LBL_SECURITYGROUP'] = 'Управління Групами';
?>

1
custom/application/Ext/Language/en_us.lang.ext.php
View file

@ -785,6 +785,7 @@ $app_list_strings['marker_image_list']['zoo'] = 'Zoo';
$app_list_strings["moduleList"]["SecurityGroups"] = 'Security Groups Management';
$app_strings['LBL_LOGIN_AS'] = "Login as ";
$app_strings['LBL_LOGOUT_AS'] = "Logout as ";
$app_strings['LBL_SECURITYGROUP'] = 'Security Group';

1
custom/metadata/securitygroups_usersMetaData.php
View file

@ -42,6 +42,7 @@ $dictionary["securitygroups_users"] = array (
'vname' => 'LBL_NONINHERITABLE',
'type' => 'bool',
'reportable'=>false,
'default' => '0',
'comment' => 'Indicator for whether a group can be inherited by a record'
),
),

3
custom/modules/logic_hooks.php
View file

@ -7,8 +7,7 @@ $hook_array = Array();
$hook_array['after_ui_footer'] = Array();
$hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_onload');
$hook_array['after_ui_frame'] = Array();
$hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign');
$hook_array['after_ui_frame'][] = Array(40, 'version_check', 'modules/SecurityGroups/VersionCheck.php','VersionCheck', 'version_check');
$hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign');
$hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php','hooks', 'load_js');
$hook_array['after_save'] = Array();
$hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_select');

52
modules/SecurityGroups/SaveConfig.php
View file

@ -55,30 +55,40 @@ if(!empty($_REQUEST['remove_default_id'])) {
}
require('modules/Configurator/Configurator.php');
$cfg = new Configurator();
// save securitysuite_additive setting
$sugar_config['securitysuite_additive'] = ($_REQUEST['securitysuite_additive'] == 1) ? true : false;
// save securitysuite_strict_rights setting
$sugar_config['securitysuite_strict_rights'] = ($_REQUEST['securitysuite_strict_rights'] == 1) ? true : false;
// save securitysuite_filter_user_list setting
$sugar_config['securitysuite_filter_user_list'] = ($_REQUEST['securitysuite_filter_user_list'] == 1) ? true : false;
// save securitysuite_user_role_precedence setting
$sugar_config['securitysuite_user_role_precedence'] = ($_REQUEST['securitysuite_user_role_precedence'] == 1) ? true : false;
// save securitysuite_user_popup setting
$sugar_config['securitysuite_user_popup'] = ($_REQUEST['securitysuite_user_popup'] == 1) ? true : false;
// save securitysuite_popup_select setting
$sugar_config['securitysuite_popup_select'] = ($_REQUEST['securitysuite_popup_select'] == 1) ? true : false;
// save securitysuite_inherit_creator setting
$sugar_config['securitysuite_inherit_creator'] = ($_REQUEST['securitysuite_inherit_creator'] == 1) ? true : false;
// save securitysuite_inherit_parent setting
$sugar_config['securitysuite_inherit_parent'] = ($_REQUEST['securitysuite_inherit_parent'] == 1) ? true : false;
// save securitysuite_inherit_assigned setting
$sugar_config['securitysuite_inherit_assigned'] = ($_REQUEST['securitysuite_inherit_assigned'] == 1) ? true : false;
$cfg->config['securitysuite_additive'] = ($_REQUEST['securitysuite_additive'] == 1) ? true : false;
// save securitysuite_strict_rights setting
$cfg->config['securitysuite_strict_rights'] = ($_REQUEST['securitysuite_strict_rights'] == 1) ? true : false;
// save securitysuite_filter_user_list setting
$cfg->config['securitysuite_filter_user_list'] = ($_REQUEST['securitysuite_filter_user_list'] == 1) ? true : false;
// save securitysuite_user_role_precedence setting
$cfg->config['securitysuite_user_role_precedence'] = ($_REQUEST['securitysuite_user_role_precedence'] == 1) ? true : false;
// save securitysuite_user_popup setting
$cfg->config['securitysuite_user_popup'] = ($_REQUEST['securitysuite_user_popup'] == 1) ? true : false;
// save securitysuite_popup_select setting
$cfg->config['securitysuite_popup_select'] = ($_REQUEST['securitysuite_popup_select'] == 1) ? true : false;
// save securitysuite_inherit_creator setting
$cfg->config['securitysuite_inherit_creator'] = ($_REQUEST['securitysuite_inherit_creator'] == 1) ? true : false;
// save securitysuite_inherit_parent setting
$cfg->config['securitysuite_inherit_parent'] = ($_REQUEST['securitysuite_inherit_parent'] == 1) ? true : false;
// save securitysuite_inherit_assigned setting
$cfg->config['securitysuite_inherit_assigned'] = ($_REQUEST['securitysuite_inherit_assigned'] == 1) ? true : false;
// save securitysuite_inbound_email setting
$cfg->config['securitysuite_inbound_email'] = ($_REQUEST['securitysuite_inbound_email'] == 1) ? true : false;
if(!isset($cfg->config['addAjaxBannedModules'])) {
$cfg->config['addAjaxBannedModules'] = array();
}
if(!in_array('SecurityGroups',$cfg->config['addAjaxBannedModules'])) {
$cfg->config['addAjaxBannedModules'][] = 'SecurityGroups';
}
ksort($sugar_config);
write_array_to_file('sugar_config', $sugar_config, 'config.php');
$cfg->handleOverride();
}
header("Location: index.php?action={$_POST['return_action']}&module={$_POST['return_module']}");
?>

12
modules/SecurityGroups/SecurityGroup.php
View file

@ -521,6 +521,10 @@ class SecurityGroup extends SecurityGroup_sugar {
$security_modules = array();
//https://www.sugaroutfitters.com/support/securitysuite/496
//There are some modules that shouldn't ever inherit groups...
$module_blacklist = array('SchedulersJobs','Schedulers','Trackers');
require_once('modules/Relationships/Relationship.php');
$rs = new Relationship();
$query = "SELECT lhs_module, rhs_module FROM $rs->table_name WHERE deleted=0 AND (lhs_module = 'SecurityGroups' OR rhs_module='SecurityGroups')";
@ -529,9 +533,17 @@ class SecurityGroup extends SecurityGroup_sugar {
while(($row=$rs->db->fetchByAssoc($result)) != null) {
if($row['lhs_module'] == 'SecurityGroups') {
if(in_array($row['rhs_module'],$module_blacklist)) {
continue;
}
//$security_modules[$row['rhs_module']] = $row['rhs_module'];
$security_modules[$row['rhs_module']] = $app_list_strings['moduleList'][$row['rhs_module']];//rost fix
} else {
if(in_array($row['lhs_module'],$module_blacklist)) {
continue;
}
//$security_modules[$row['lhs_module']] = $row['lhs_module'];
$security_modules[$row['lhs_module']] = $app_list_strings['moduleList'][$row['lhs_module']];//rost fix

6
modules/SecurityGroups/config.html
View file

@ -135,10 +135,14 @@
</td>
<td width="20%" class="dataLabel" valign='top'>
{MOD.LBL_INBOUND_EMAIL}
&nbsp;
</td>
<td width="30%" class="dataField" valign='top'>
<input name="securitysuite_inbound_email" tabindex='1' value="1" class="checkbox" type="checkbox" {securitysuite_inbound_email}>
&nbsp;
</td>
</tr>
@ -148,6 +152,8 @@
</td>
<td colspan="2" class="dataField">
<em>{MOD.LBL_INBOUND_EMAIL_DESC}</em>
&nbsp;
</td>
</tr>

13
modules/SecurityGroups/config.php
View file

@ -24,7 +24,7 @@ if(isset($mod_strings['LBL_MODULE_NAME'])) {
$mod_name = $mod_strings['LBL_MODULE_NAME'];
}
echo "\n<p>\n";
echo get_module_title($mod_id, $mod_name.": ".$mod_strings['LBL_CONFIGURE_SETTINGS'], true);
echo get_module_title($mod_id, $mod_name.": ".$mod_strings['LBL_CONFIGURE_SETTINGS'], false);
echo "\n</p>\n";
global $theme;
global $currentModule;
@ -110,6 +110,13 @@ if(isset($sugar_config['securitysuite_inherit_assigned']) && $sugar_config['secu
$xtpl->assign('securitysuite_inherit_assigned', $securitysuite_inherit_assigned);
// securitysuite_inbound_email
$securitysuite_inbound_email = '';
if(isset($sugar_config['securitysuite_inbound_email']) && $sugar_config['securitysuite_inbound_email'] == true) {
$securitysuite_inbound_email = 'CHECKED';
}
$xtpl->assign('securitysuite_inbound_email', $securitysuite_inbound_email);
//default security groups
$groupFocus = new SecurityGroup();
@ -137,7 +144,7 @@ foreach($groups['list'] as $group) {
$options[$group->id] = $group->name;
}
$xtpl->assign("SECURITY_GROUP_OPTIONS", get_select_options_with_id($options, ""));
//$moduleList = $app_list_strings['moduleList'];
//require_once('modules/Studio/DropDowns/DropDownHelper.php');
@ -150,7 +157,7 @@ $security_modules["All"] = $mod_strings["LBL_ALL_MODULES"];//rost fix
ksort($security_modules);
$xtpl->assign("MODULE_OPTIONS", get_select_options_with_id($security_modules, "All"));
$xtpl->parse("main");
$xtpl->out("main");