Upgrades from IceHrm Pro v24

core/admin/employees/index.php

@@ -16,8 +16,7 @@ $customFields = \Classes\BaseService::getInstance()->getCustomFields("Employee")
             <li class="active"><a id="tabEmployee" href="#tabPageEmployee"><?=t('Employees')?></a></li>
         <?php }?>
 
-        <?php if($user->user_level == "Admin"){
-        ?>
+        <?php if ($user->user_level == "Admin") { ?>
 		<li><a id="tabEmployeeSkill" href="#tabPageEmployeeSkill"><?=t('Skills')?></a></li>
 		<li><a id="tabEmployeeEducation" href="#tabPageEmployeeEducation"><?=t('Education')?></a></li>
 		<li><a id="tabEmployeeCertification" href="#tabPageEmployeeCertification"><?=t('Certifications')?></a></li>
@@ -28,8 +27,7 @@ $customFields = \Classes\BaseService::getInstance()->getCustomFields("Employee")
                 <li><a id="tabEmployeeDocument" href="#tabPageEmployeeDocument"><?=t('Documents')?></a></li>
             <?php } ?>
         <?php }?>
-        <?php if($user->user_level == "Admin"){
-        ?>
+        <?php if ($user->user_level == "Admin"){ ?>
         <li class="dropdown">
             <a href="#" id="terminatedEmployeeMenu" class="dropdown-toggle" data-toggle="dropdown" aria-controls="terminatedEmployeeMenu-contents"><?=t('Deactivated Employees')?> <span class="caret"></span></a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="terminatedEmployeeMenu" id="terminatedEmployeeMenu-contents">
@@ -37,7 +35,7 @@ $customFields = \Classes\BaseService::getInstance()->getCustomFields("Employee")
                 <li><a id="tabArchivedEmployee" href="#tabPageArchivedEmployee"><?=t('Terminated Employee Data')?></a></li>
             </ul>
         </li>
-        <?php }?>
+        <?php } ?>
 
 	</ul>
 
@@ -131,17 +129,13 @@ $customFields = \Classes\BaseService::getInstance()->getCustomFields("Employee")
 </div>
 <script>
 var modJsList = new Array();
-<?php if($user->user_level != "Admin"){
-?>
+<?php if($user->user_level != "Admin"){ ?>
 modJsList['tabEmployee'] = new EmployeeAdapter('Employee','Employee',{"status":"Active"});
 modJsList['tabEmployee'].setShowAddNew(false);
-<?php
-}else{
-?>
+modJsList['tabEmployee'].setShowDelete(false);
+<?php }else{ ?>
 modJsList['tabEmployee'] = new EmployeeAdapter('Employee','Employee',{"status":"Active"});
-<?php
-}
-?>
+<?php } ?>
 
 modJsList['tabEmployee'].setRemoteTable(true);
 modJsList['tabEmployee'].setFieldNameMap(<?=json_encode($fieldNameMap)?>);

core/admin/users/index.php

@@ -25,9 +25,8 @@ $moduleName = 'users';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
-
+$csrf = \Classes\BaseService::getInstance()->generateCsrf('User');
 ?><div class="span9">
-			  
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
 		<li class="active"><a id="tabUser" href="#tabPageUser"><?=t('Users')?></a></li>
 		<li class=""><a id="tabUserRole" href="#tabPageUserRole"><?=t('User Roles')?></a></li>
@@ -38,7 +37,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 			<div id="User" class="reviewBlock" data-content="List" style="padding-left:5px;">
 		
 			</div>
-			<div id="UserForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+			<div id="UserForm" class="reviewBlock" data-content="Form" data-csrf="<?=$csrf?>" style="padding-left:5px;display:none;">
 		
 			</div>
 		</div>
@@ -56,8 +55,9 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 <script>
 var modJsList = new Array();
 modJsList['tabUser'] = new UserAdapter('User');
-<?php if(isset($_REQUEST['action']) && $_REQUEST['action'] == "new" && isset($_REQUEST['object'])){?>
-modJsList['tabUser'].newInitObject = JSON.parse(Base64.decode('<?=$_REQUEST['object']?>'));
+modJsList['tabUser'].setCSRFRequired(true);
+<?php if(isset($_GET['action']) && $_GET['action'] == "new" && isset($_GET['object'])){?>
+modJsList['tabUser'].newInitObject = JSON.parse(Base64.decode('<?=$_GET['object']?>'));
 <?php }?>
 modJsList['tabUserRole'] = new UserRoleAdapter('UserRole');
 var modJs = modJsList['tabUser'];