Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

fix(BE): correct camelcase naming #7554

Merged
merged 1 commit into from
May 24, 2019
Merged

fix(BE): correct camelcase naming #7554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion www/include/configuration/configObject/service/formService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function myDecodeService($arg)
if (!$centreon->user->admin) {
if ($service_id) {
$checkres = $pearDB->query("SELECT service_id
FROM $acldbname.centreon_acl
FROM $aclDbName.centreon_acl
WHERE service_id = " . $pearDB->escape($service_id) . "
AND group_id IN (" . $acl->getAccessGroupsString() . ")");
if (!$checkres->rowCount()) {
Expand Down
2 changes: 1 addition & 1 deletion www/include/configuration/configObject/service/listServiceByHost.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@

$queryTablesToFetch = 'FROM service sv, host' .
((isset($hostgroups) && $hostgroups) ? ', hostgroup_relation hogr, ' : ', ') .
($centreon->user->admin ? '' : $acldbname . '.centreon_acl acl, ') .
($centreon->user->admin ? '' : $aclDbName . '.centreon_acl acl, ') .
'host_service_relation hsr ' .
'LEFT JOIN extended_service_information esi ON esi.service_service_id = hsr.service_service_id ';

Expand Down
2 changes: 1 addition & 1 deletion www/include/configuration/configObject/service/listServiceByHostGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
$aclCond = "";
$distinct = "";
if (!$centreon->user->admin) {
$aclFrom = ", $acldbname.centreon_acl acl ";
$aclFrom = ", $aclDbName.centreon_acl acl ";
$aclCond = " AND sv.service_id = acl.service_id
AND acl.group_id IN (" . $acl->getAccessGroupsString() . ") ";
$distinct = " DISTINCT ";
Expand Down
2 changes: 1 addition & 1 deletion www/include/configuration/configObject/service/serviceByHost.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
}

$acl = $centreon->user->access;
$acldbname = $acl->getNameDBAcl();
$aclDbName = $acl->getNameDBAcl();

switch ($o) {
case "a":
Expand Down
2 changes: 1 addition & 1 deletion www/include/configuration/configObject/service/serviceByHostGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
}

$acl = $centreon->user->access;
$acldbname = $acl->getNameDBAcl();
$aclDbName = $acl->getNameDBAcl();

switch ($o) {
case "a":
Expand Down