galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable instance verification

Browse Source
This commit is contained in:
Thilina Pituwala
2020-10-31 23:32:13 +01:00
parent d354fa4104
commit 587a950011
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/Classes/BaseService.php
View File

@@ -292,8 +292,8 @@ class BaseService
$childCompaniesIds = array(); $childCompaniesIds = array();
if (\Classes\SettingsManager::getInstance()->getSetting( if (\Classes\SettingsManager::getInstance()->getSetting(
'System: Child Company Structure Managers Enabled' 'System: Child Company Structure Managers Enabled'
) == '1' ) == '1'
) { ) {
$childCompaniesResp = \Company\Common\Model\CompanyStructure::getAllChildCompanyStructures( $childCompaniesResp = \Company\Common\Model\CompanyStructure::getAllChildCompanyStructures(
$cempObj->department $cempObj->department
@@ -486,8 +486,8 @@ class BaseService
$childCompaniesIds = array(); $childCompaniesIds = array();
if (SettingsManager::getInstance()->getSetting( if (SettingsManager::getInstance()->getSetting(
'System: Child Company Structure Managers Enabled' 'System: Child Company Structure Managers Enabled'
) == '1' ) == '1'
) { ) {
$childCompaniesResp = CompanyStructure::getAllChildCompanyStructures($cempObj->department); $childCompaniesResp = CompanyStructure::getAllChildCompanyStructures($cempObj->department);
$childCompanies = $childCompaniesResp->getObject(); $childCompanies = $childCompaniesResp->getObject();
@@ -567,8 +567,8 @@ class BaseService
$childCompaniesIds = array(); $childCompaniesIds = array();
if (SettingsManager::getInstance()->getSetting( if (SettingsManager::getInstance()->getSetting(
'System: Child Company Structure Managers Enabled' 'System: Child Company Structure Managers Enabled'
) == '1' ) == '1'
) { ) {
$childCompaniesResp = CompanyStructure::getAllChildCompanyStructures($cempObj->department); $childCompaniesResp = CompanyStructure::getAllChildCompanyStructures($cempObj->department);
$childCompanies = $childCompaniesResp->getObject(); $childCompanies = $childCompaniesResp->getObject();
@@ -1376,12 +1376,16 @@ class BaseService
return false; return false;
} }
$data = AesCtr::decrypt($key, $instanceId, 256); if (strlen($key) > 7) {
$arr = explode("|", $data);
if ($arr[0] == KEY_PREFIX && $arr[1] == $instanceId) {
return true; return true;
} }
// $data = AesCtr::decrypt($key, $instanceId, 256);
// $arr = explode("|", $data);
// if ($arr[0] == KEY_PREFIX && $arr[1] == $instanceId) {
// return true;
// }
return false; return false;
} }
@@ -1779,8 +1783,8 @@ END;
) { ) {
$departmentHeadFound = true; $departmentHeadFound = true;
} elseif (SettingsManager::getInstance()->getSetting( } elseif (SettingsManager::getInstance()->getSetting(
'System: Child Company Structure Managers Enabled' 'System: Child Company Structure Managers Enabled'
) == '1' ) == '1'
) { ) {
$companyStructure = new CompanyStructure(); $companyStructure = new CompanyStructure();
$companyStructure->Load('id = ?', array($subordinate->department)); $companyStructure->Load('id = ?', array($subordinate->department));
@@ -1800,7 +1804,7 @@ END;
$companyStructure->Load('id = ?', array($parentCompanyStructure)); $companyStructure->Load('id = ?', array($parentCompanyStructure));
} }
} while (!empty($companyStructure->id) } while (!empty($companyStructure->id)
&& !empty($parentCompanyStructure) && !empty($parentCompanyStructure)
); );
} }