Bigbamboo/bbone
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug FIxes 3 Form Back Button Issues fixes : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-04-05 11:24:25 +05:30
parent f6f709eba8
commit 2108ca2c0c
6 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/config/development/config.php
View File

@ -451,9 +451,9 @@
| 'csrf_regenerate' = Regenerate token on every submission
| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
*/
$config['csrf_protection'] = FALSE;
$config['csrf_protection'] = TRUE;
$config['csrf_token_name'] = 'ci_csrf_token';
$config['csrf_cookie_name'] = 'csrf_cookie_name';
$config['csrf_cookie_name'] = 'ci_csrf_token';
$config['csrf_expire'] = 7200;
$config['csrf_regenerate'] = TRUE;
$config['csrf_exclude_uris'] = array();

6
application/config/production/config.php
View File

@ -450,9 +450,9 @@
| 'csrf_regenerate' = Regenerate token on every submission
| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
*/
$config['csrf_protection'] = FALSE;
$config['csrf_token_name'] = 'csrf_test_name';
$config['csrf_cookie_name'] = 'csrf_cookie_name';
$config['csrf_protection'] = TRUE;
$config['csrf_token_name'] = 'ci_csrf_token';
$config['csrf_cookie_name'] = 'ci_csrf_token';
$config['csrf_expire'] = 7200;
$config['csrf_regenerate'] = TRUE;
$config['csrf_exclude_uris'] = array();

2
application/config/testing/config.php
View File

@ -451,7 +451,7 @@
*/
$config['csrf_protection'] = TRUE;
$config['csrf_token_name'] = 'ci_csrf_token';
$config['csrf_cookie_name'] = 'csrf_cookie_name';
$config['csrf_cookie_name'] = 'ci_csrf_token';
$config['csrf_expire'] = 7200;
$config['csrf_regenerate'] = TRUE;
$config['csrf_exclude_uris'] = array();

39
application/modules/Layout/views/includes/default_menu.php
View File

@ -3,12 +3,19 @@
<div class="navbar nav_title" style="border: 0;">
<a class="site_title">
<?php if(check_auth() && is_superadmin()) { ?>
<img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $settings->logo;?>"
class="img-circle logo">
<?php if($settings->logo !== '' || $settings->logo !== null) {
$settLogo = base_url() . '/assets/uploads/logo/'.$settings->logo;
$settContents = @file_get_contents($settLogo);
if($settContents !== false){ ?>
<img src="<?php echo $settLogo; ?>" class="img-circle logo">
<?php }} ?>
<?php } else if(check_auth() && is_admin() || !is_null(is_user())) { ?>
<img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $business->logo;?>"
class="img-circle logo">
<?php if($business->logo !== '' || $business->logo !== null) {
$busiLogo = base_url() . '/assets/uploads/logo/'.$business->logo;
$busiContents = @file_get_contents($busiLogo);
if($busiContents !== false){ ?>
<img src="<?php echo $busiLogo; ?>" class="img-circle logo">
<?php }} ?>
<?php } ?>
<span>
<?php if(check_auth() && is_admin() || !is_null(is_user()))
@ -23,15 +30,19 @@ class="img-circle logo">
<!-- menu profile quick info -->
<div class="profile clearfix">
<div class="profile_pic">
<?php if(user()->profile_image == '' || user()->profile_image == null) { ?>
<img src="<?php echo base_url(); ?>/assets/uploads/profile_picture/profile.jpg" alt="..."
class="img-circle profile_img">
<?php } else { ?>
<img src="<?php echo base_url(); ?>/assets/uploads/profile_picture/<?php echo user()->profile_image; ?>"
alt="..." class="img-circle profile_img">
<?php } ?>
<?php
$defaultProfilePicture = base_url() . '/assets/uploads/profile_picture/profile.jpg';
$FinalProfilePicture = "";
if(user()->profile_image == '' || user()->profile_image == null) {
$FinalProfilePicture = $defaultProfilePicture;
}else{
$personProfilePicture = base_url() . '/assets/uploads/profile_picture/'.user()->profile_image;
$persContents = @file_get_contents($personProfilePicture);
$FinalProfilePicture = ($persContents !== false) ? $personProfilePicture : $defaultProfilePicture;
}
?>
<img src="<?php echo $FinalProfilePicture; ?>" alt="..." class="img-circle profile_img">
</div>
<div class="profile_info">
<span>Welcome,</span>

20
application/modules/Layout/views/includes/employee_menu.php
View File

@ -2,11 +2,21 @@
<div class="left_col scroll-view">
<div class="navbar nav_title" style="border: 0;">
<a class="site_title">
<?php if(check_auth() && is_superadmin()) { ?>
<img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $settings->logo;?>" class="img-circle logo">
<?php } else if(check_auth() && is_admin() || !is_null(is_user())) { ?>
<img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $business->logo;?>" class="img-circle logo">
<?php } ?>
<?php if(check_auth() && is_superadmin()) { ?>
<?php if($settings->logo !== '' || $settings->logo !== null) {
$settLogo = base_url() . '/assets/uploads/logo/'.$settings->logo;
$settContents = @file_get_contents($settLogo);
if($settContents !== false){ ?>
<img src="<?php echo $settLogo; ?>" class="img-circle logo">
<?php }} ?>
<?php } else if(check_auth() && is_admin() || !is_null(is_user())) { ?>
<?php if($business->logo !== '' || $business->logo !== null) {
$busiLogo = base_url() . '/assets/uploads/logo/'.$business->logo;
$busiContents = @file_get_contents($busiLogo);
if($busiContents !== false){ ?>
<img src="<?php echo $busiLogo; ?>" class="img-circle logo">
<?php }} ?>
<?php } ?>
<span>
<?php if(check_auth() && is_admin() || !is_null(is_user()))
{echo $business->business_name;}

13
application/modules/Leave/views/apply_leave.php
View File

@ -108,11 +108,11 @@
<?php echo $this->session->unset_userdata('error');?>
<script>
$(document).ready(function(){
if($('#error').val() == 1)
{
$('#button').click();
}
$('#myForm')[0].reset();
if($('#error').val() == 1)
{
$('#button').click();
}
})
</script>
@ -162,7 +162,7 @@
<label class="control-label col-md-2 col-sm-2 " for="last-name">Leave Type<a style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 ">
<select id="type" name="type" required class="form-control" onchange="permission(this.id)" >
<select id="type" name="type" required class="form-control">
<option value="">--Select--</option>
<?php foreach ($leavetype as $key => $value) { ?>
@ -230,7 +230,6 @@
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-2 col-sm-2 " for="last-name">Note</label>