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

Merge branch 'develop' of github.com:gamonoid/icehrm into develop

Browse Source
This commit is contained in:
Thilina Pituwala
2020-06-10 02:04:18 +02:00
parent c65bdbbfb3 a245826ae7
commit 7decc9d810
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/admin/dashboard/index.php
View File

@@ -50,10 +50,10 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
modJsList['tabDashboard'] = new DashboardAdapter('Dashboard','Dashboard'); modJsList['tabDashboard'] = new DashboardAdapter('Dashboard','Dashboard');
var modJs = modJsList['tabDashboard']; var modJs = modJsList['tabDashboard'];
<?php if($user->user_level == "Admin") { ?>
$(document).ready(function () { $(document).ready(function () {
$('.span9 .row').prepend(window.atob('PGRpdiBjbGFzcz0iY2FsbG91dCBjYWxsb3V0LXdhcm5pbmcgbGVhZCIgc3R5bGU9ImZvbnQtc2l6ZTogMTRweDttYXJnaW4tdG9wOiA5MHB4OyI+CiAgICAgICAgICAgIDxoND5Zb3UgYXJlIGN1cnJlbnRseSB1c2luZyBJY2VIcm0gT3BlbnNvdXJjZSBWZXJzaW9uPC9oND4KICAgICAgICAgICAgPHAgc3R5bGU9ImZvbnQtd2VpZ2h0OiBib2xkOyI+CiAgICAgICAgICAgICAgICBXZSBoYXZlIGEgbG90IG1vcmUgZmVhdHVyZXMgdG8gb2ZmZXIuIEluY2x1ZGluZyBvdXIgaGlnaGx5IGN1c3RvbWl6YWJsZSBsZWF2ZSBtYW5hZ2VtZW50LCByZWNydWl0bWVudCBtb2R1bGVzIGFuZCBtYW55IG1vcmUgYWR2YW5jZWQgZmVhdHVyZXMgaW4gSWNlSHJtUHJvJiMxNzQ7CiAgICAgICAgICAgICAgICA8YnIvPgogICAgICAgICAgICAgICAgPGJyLz4KICAgICAgICAgICAgICAgIDxhIHRhcmdldD0iX2JsYW5rIiBocmVmPSJodHRwczovL2ljZWhybS5jb20vcHVyY2hhc2UtaWNlaHJtcHJvIiBjbGFzcz0iYnRuIGJ0bi1zdWNjZXNzIGJ0bS14cyI+PGkgY2xhc3M9ImZhIGZhLWNoZWNrb3V0Ij48L2k+IE1vcmUgYWJvdXQgSWNlSHJtUHJvJiMxNzQ7PC9hPgogICAgICAgICAgICA8L3A+CiAgICAgICAgPC9kaXY+')); $('.span9 .row').prepend(window.atob('PGRpdiBjbGFzcz0iY2FsbG91dCBjYWxsb3V0LXdhcm5pbmcgbGVhZCIgc3R5bGU9ImZvbnQtc2l6ZTogMTRweDttYXJnaW4tdG9wOiA5MHB4OyI+CiAgICAgICAgICAgIDxoND5Zb3UgYXJlIGN1cnJlbnRseSB1c2luZyBJY2VIcm0gT3BlbnNvdXJjZSBWZXJzaW9uPC9oND4KICAgICAgICAgICAgPHAgc3R5bGU9ImZvbnQtd2VpZ2h0OiBib2xkOyI+CiAgICAgICAgICAgICAgICBXZSBoYXZlIGEgbG90IG1vcmUgZmVhdHVyZXMgdG8gb2ZmZXIuIEluY2x1ZGluZyBvdXIgaGlnaGx5IGN1c3RvbWl6YWJsZSBsZWF2ZSBtYW5hZ2VtZW50LCByZWNydWl0bWVudCBtb2R1bGVzIGFuZCBtYW55IG1vcmUgYWR2YW5jZWQgZmVhdHVyZXMgaW4gSWNlSHJtUHJvJiMxNzQ7CiAgICAgICAgICAgICAgICA8YnIvPgogICAgICAgICAgICAgICAgPGJyLz4KICAgICAgICAgICAgICAgIDxhIHRhcmdldD0iX2JsYW5rIiBocmVmPSJodHRwczovL2ljZWhybS5jb20vcHVyY2hhc2UtaWNlaHJtcHJvIiBjbGFzcz0iYnRuIGJ0bi1zdWNjZXNzIGJ0bS14cyI+PGkgY2xhc3M9ImZhIGZhLWNoZWNrb3V0Ij48L2k+IE1vcmUgYWJvdXQgSWNlSHJtUHJvJiMxNzQ7PC9hPgogICAgICAgICAgICA8L3A+CiAgICAgICAgPC9kaXY+'));
}); });
<?php } ?>
</script> </script>
<?php include APP_BASE_PATH.'footer.php';?> <?php include APP_BASE_PATH.'footer.php';?>

6
core/config.base.php
View File

@@ -13,9 +13,9 @@ if(!defined('HOME_LINK_OTHERS')){
} }
//Version //Version
define('VERSION', '27.0.0.OS'); define('VERSION', '27.0.1.OS');
define('CACHE_VALUE', '27.0.0.OS'); define('CACHE_VALUE', '27.0.1.OS');
define('VERSION_NUMBER', '270000'); define('VERSION_NUMBER', '270001');
define('VERSION_DATE', '29/05/2020'); define('VERSION_DATE', '29/05/2020');
if(!defined('CONTACT_EMAIL')){define('CONTACT_EMAIL','icehrm@gamonoid.com');} if(!defined('CONTACT_EMAIL')){define('CONTACT_EMAIL','icehrm@gamonoid.com');}

4
core/login.php
View File

@@ -136,6 +136,8 @@ $logoFileUrl = \Classes\UIManager::getInstance()->getCompanyLogoUrl();
$csrfToken = sha1(rand(4500, 100000) . time(). CLIENT_BASE_URL); $csrfToken = sha1(rand(4500, 100000) . time(). CLIENT_BASE_URL);
\Utils\SessionUtils::saveSessionObject('csrf-login', $csrfToken); \Utils\SessionUtils::saveSessionObject('csrf-login', $csrfToken);
$refLink = base64_encode("http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
?><!DOCTYPE html> ?><!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@@ -328,7 +330,7 @@ $csrfToken = sha1(rand(4500, 100000) . time(). CLIENT_BASE_URL);
<div class="content" style="margin-top:100px;"> <div class="content" style="margin-top:100px;">
<div class="row"> <div class="row">
<div class="login-form"> <div class="login-form">
<h2><img src="<?=$logoFileUrl?>"/></h2> <h2><a href="https://icehrm.com?ref=<?=$refLink?>" target="_blank"><img alt="The HR App to Fit All Your Needs, such as Employee, Time, Vacation and Expense Management" src="<?=$logoFileUrl?>"/></a></h2>
<?php if (!isset($_REQUEST['cp'])) {?> <?php if (!isset($_REQUEST['cp'])) {?>
<form id="loginForm" action="login.php" method="POST"> <form id="loginForm" action="login.php" method="POST">
<input type="hidden" id="next" name="next" value="<?=$_REQUEST['next']?>"/> <input type="hidden" id="next" name="next" value="<?=$_REQUEST['next']?>"/>

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

@@ -285,8 +285,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
@@ -479,8 +479,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();
@@ -560,8 +560,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();
@@ -1781,8 +1781,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));