From 2108ca2c0ccd594ab52a0090baac7dbf05e18c0d Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 5 Apr 2024 11:24:25 +0530
Subject: [PATCH] Bug FIxes 3 Form Back Button Issues fixes : ps

---
 application/config/development/config.php     |  4 +-
 application/config/production/config.php      |  6 +--
 application/config/testing/config.php         |  2 +-
 .../Layout/views/includes/default_menu.php    | 39 ++++++++++++-------
 .../Layout/views/includes/employee_menu.php   | 20 +++++++---
 .../modules/Leave/views/apply_leave.php       | 13 +++----
 6 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/application/config/development/config.php b/application/config/development/config.php
index a6c321a..d427d28 100644
--- a/application/config/development/config.php
+++ b/application/config/development/config.php
@@ -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();
diff --git a/application/config/production/config.php b/application/config/production/config.php
index cd332be..f1fdc08 100644
--- a/application/config/production/config.php
+++ b/application/config/production/config.php
@@ -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();
diff --git a/application/config/testing/config.php b/application/config/testing/config.php
index 4ee4c90..78200a7 100644
--- a/application/config/testing/config.php
+++ b/application/config/testing/config.php
@@ -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();
diff --git a/application/modules/Layout/views/includes/default_menu.php b/application/modules/Layout/views/includes/default_menu.php
index de5aa1c..7f306a3 100644
--- a/application/modules/Layout/views/includes/default_menu.php
+++ b/application/modules/Layout/views/includes/default_menu.php
@@ -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>
diff --git a/application/modules/Layout/views/includes/employee_menu.php b/application/modules/Layout/views/includes/employee_menu.php
index 6fc2399..670ad6b 100644
--- a/application/modules/Layout/views/includes/employee_menu.php
+++ b/application/modules/Layout/views/includes/employee_menu.php
@@ -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;}
diff --git a/application/modules/Leave/views/apply_leave.php b/application/modules/Leave/views/apply_leave.php
index 987e379..ed80aba 100644
--- a/application/modules/Leave/views/apply_leave.php
+++ b/application/modules/Leave/views/apply_leave.php
@@ -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>