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

v16.1

Browse Source
This commit is contained in:
Thilina Hasantha
2016-05-05 20:29:17 +05:30
parent 22a371eef9
commit 66ced28bad
214 changed files with 68117 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core-ext/config.base.php
View File

@@ -9,9 +9,9 @@ define('HOME_LINK_ADMIN', CLIENT_BASE_URL."?g=admin&n=dashboard&m=admin_Admin");
define('HOME_LINK_OTHERS', CLIENT_BASE_URL."?g=modules&n=dashboard&m=module_Personal_Information");
//Version
define('VERSION', '16.1.OS');
define('CACHE_VALUE', '16.1.OS');
define('VERSION_DATE', '26/04/2016');
define('VERSION', '16.2.OS');
define('CACHE_VALUE', '16.2.OS');
define('VERSION_DATE', '02/05/2016');
if(!defined('CONTACT_EMAIL')){define('CONTACT_EMAIL','icehrm@gamonoid.com');}
if(!defined('KEY_PREFIX')){define('KEY_PREFIX','IceHrm');}

1
core-ext/login.com.inc.php
View File

@@ -1,3 +1,2 @@
<?php
//Nothing here
?>

9
core-ext/login.php
View File

@@ -8,7 +8,7 @@ error_log(print_r($_REQUEST,true));
if(empty($user)){
if(!isset($_REQUEST['f']) && isset($_COOKIE['icehrmLF']) && $_REQUEST['login'] != 'no' && !isset($_REQUEST['username'])){
if(!isset($_REQUEST['f']) && isset($_COOKIE['icehrmLF']) && @$_REQUEST['login'] != 'no' && !isset($_REQUEST['username'])){
$tempUser = new User();
$tempUser->Load("login_hash = ?",array($_COOKIE['icehrmLF']));
@@ -30,14 +30,15 @@ if(empty($user)){
LogManager::getInstance()->debug("LDAP: Enabled :" . SettingsManager::getInstance()->getSetting("LDAP: Enabled"));
if (SettingsManager::getInstance()->getSetting("LDAP: Enabled") == "1") {
$ldapResp = LDAPManager::getInstance()->checkLDAPLogin($_REQUEST['username'], $_REQUEST['password']);
LogManager::getInstance()->debug("LDAP Response :" . json_encode($ldapResp));
LogManager::getInstance()->debug("LDAP Response :" . print_r($ldapResp, true));
LogManager::getInstance()->debug("LDAP Response Status :" . $ldapResp->getStatus());
if ($ldapResp->getStatus() == IceResponse::ERROR) {
header("Location:" . CLIENT_BASE_URL . "login.php?f=1");
exit();
} else {
$suser = new User();
$suser->Load("username = ?", array($_REQUEST['username']));
LogManager::getInstance()->debug("LDAP Response :[".$_REQUEST['username']."]" . print_r($suser, true));
if (empty($suser)) {
header("Location:" . CLIENT_BASE_URL . "login.php?f=1");
exit();
@@ -52,8 +53,6 @@ if(empty($user)){
if(!isset($_REQUEST['hashedPwd'])){
$_REQUEST['hashedPwd'] = md5($_REQUEST['password']);
}
$suser = null;
$ssoUserLoaded = false;
include 'login.com.inc.php';

4
core-ext/scripts/icehrm_sample_data.sql
View File

@@ -278,6 +278,10 @@ INSERT INTO `EmployeeLeaveDays` VALUES
INSERT INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
('Instance : ID', '0847429146712c108e23c435e8f93b4d', '',''),
('Instance: Key', 'UQHEYBx9H1eNR66nhNCNCz1WCDDhkjtx1OuJbO3ZQMt+8tfSGvuOH/YEHntRajY=', '','');
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;