Merge pull request #575 from wrongecho/more-tidy

More tidying/cleanups

account_add_modal.php

@@ -38,7 +38,7 @@
               </div>
               <select class="form-control select2" name="currency_code" required>
                 <option value="">- Currency -</option>
-                <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
+                <?php foreach ($currencies_array as $currency_code => $currency_name) { ?>
                 <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
                 <?php } ?>
               </select>

accounts.php

@@ -1,7 +1,7 @@
 <?php require_once("inc_all_settings.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "account_name";
 }

ajax.php

@@ -34,7 +34,7 @@ if (isset($_GET['certificate_fetch_parse_json_details'])) {
 
     // Get certificate (using verify peer false to allow for self-signed certs)
     $socket = "ssl://$url:$port";
-    $get = stream_context_create(array("ssl" => array("capture_peer_cert" => TRUE, "verify_peer" => FALSE,)));
+    $get = stream_context_create(array("ssl" => array("capture_peer_cert" => true, "verify_peer" => false,)));
     $read = stream_socket_client($socket, $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $get);
     $cert = stream_context_get_params($read);
     $cert_public_key_obj = openssl_x509_parse($cert['options']['ssl']['peer_certificate']);
@@ -121,7 +121,7 @@ if (isset($_GET['merge_ticket_get_json_details'])) {
         //Return ticket, client and contact details for the given ticket number
         $response = mysqli_fetch_array($sql);
         $response = array_map('htmlentities', $response);
-        echo json_encode( $response);
+        echo json_encode($response);
     }
 }
 

check_login.php

@@ -24,7 +24,6 @@ if (!isset($_SESSION['logged']) || !$_SESSION['logged']) {
 
 // SESSION FINGERPRINT
 $session_ip = strip_tags(mysqli_real_escape_string($mysqli,get_ip()));
-//$session_os = strip_tags(mysqli_real_escape_string($mysqli,get_os()));
 
 // User agent
 $session_user_agent = strip_tags(mysqli_real_escape_string($mysqli,$_SERVER['HTTP_USER_AGENT']));

footer.php

@@ -15,14 +15,13 @@
 	<script src="plugins/moment/moment.min.js"></script>
 	<script src="plugins/chart.js/Chart.min.js"></script>
 	<script src="plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
-	<!-- <script src='plugins/fullcalendar/main.min.js'></script> -->
 	<script src='plugins/daterangepicker/daterangepicker.js'></script>
 	<script src='plugins/select2/js/select2.min.js'></script>
 	<script src='plugins/inputmask/jquery.inputmask.min.js'></script>
 	<script src="plugins/summernote/summernote-bs4.min.js"></script>
 	<script src="plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
 	<script src="plugins/clipboardjs/clipboard.min.js"></script>
-	<!-- <script src="plugins/dropzone/min/dropzone.min.js"></script> -->
+
 	<!-- AdminLTE App -->
 	<script src="dist/js/adminlte.min.js"></script>
 	<script src="js/app.js"></script>
@@ -36,5 +35,3 @@
 //$time_end = microtime(true);
 //$execution_time = ($time_end - $time_start);
 //echo 'Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds';
-
-?>

header.php

@@ -22,8 +22,6 @@ header("X-Frame-Options: DENY");
 
   <!-- Theme style -->
   <link rel="stylesheet" href="dist/css/adminlte.min.css">
-  <!-- Google Font: Source Sans Pro -->
-  <!-- <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet"> -->
 
   <!-- Custom Style Sheet -->
   <link href="plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
@@ -32,7 +30,7 @@ header("X-Frame-Options: DENY");
   <link href='plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
   <link href="plugins/summernote/summernote-bs4.min.css" rel="stylesheet">
   <link href="plugins/toastr/toastr.min.css" rel="stylesheet">
-  <!-- <link href="plugins/dropzone/min/dropzone.min.css" rel="stylesheet"> -->
+
   <!-- jQuery -->
   <script src="plugins/jquery/jquery.min.js"></script>
   <script src="plugins/toastr/toastr.min.js"></script>

inc_client_top_head.php

@@ -82,7 +82,7 @@ $location_phone = formatPhoneNumber($location_phone);
         }
         ?>
       </div>
-      <?php if ($session_user_role == 1 || $session_user_role == 3 AND $config_module_enable_accounting == 1) { ?>
+      <?php if ($session_user_role == 1 || $session_user_role == 3 && $config_module_enable_accounting == 1) { ?>
       <div class="col-md border-left">
         <h4 class="text-secondary">Billing</h4>
         <h6 class="ml-1 text-secondary">Paid <div class="text-dark float-right"> <?php echo numfmt_format_currency($currency_format, $amount_paid, $client_currency_code); ?></div></h6>

login.php

@@ -223,7 +223,7 @@ if (isset($_POST['login'])) {
 <body class="hold-transition login-page">
 <div class="login-box">
     <div class="login-logo">
-        <?php if(!empty($company_logo)) { ?>
+        <?php if (!empty($company_logo)) { ?>
             <img alt="<?=$company_name?> logo" height="110" width="380" class="img-fluid" src="<?php echo "uploads/settings/1/$company_logo"; ?>">
         <?php } else { ?>
             <b>IT</b>Flow
@@ -233,7 +233,7 @@ if (isset($_POST['login'])) {
     <!-- /.login-logo -->
     <div class="card">
         <div class="card-body login-card-body">
-            <p class="login-box-msg"><?php if(isset($response)) { echo $response; } ?></p>
+            <p class="login-box-msg"><?php if (isset($response)) { echo $response; } ?></p>
             <form method="post">
                 <div class="input-group mb-3">
                     <input type="text" class="form-control" placeholder="Agent Email" name="email" value="<?php if(!empty($token_field)){ echo $email; }?>" required <?php if(empty($token_field)){ echo "autofocus"; } ?> >

portal/check_login.php

@@ -22,7 +22,6 @@ if (!$_SESSION['client_logged_in']) {
 
 // SESSION FINGERPRINT
 $session_ip = strip_tags(mysqli_real_escape_string($mysqli, get_ip()));
-$session_os = strip_tags(mysqli_real_escape_string($mysqli, get_os()));
 
 // Get user agent
 $session_user_agent = strip_tags(mysqli_real_escape_string($mysqli, $_SERVER['HTTP_USER_AGENT']));

portal/login.php

@@ -91,10 +91,10 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
 <body class="hold-transition login-page">
 <div class="login-box">
     <div class="login-logo">
-        <?php if(!empty($company_logo)) { ?>
+        <?php if (!empty($company_logo)) { ?>
             <img alt="<?=$company_name?> logo" height="110" width="380" class="img-fluid" src="<?php echo "../uploads/settings/1/$company_logo"; ?>">
         <?php } else { ?>
-        <b><?=$company_name?></b> <br>Client Portal Login</h2>
+            <b><?=$company_name?></b> <br>Client Portal Login</h2>
         <?php } ?>
     </div>
     <div class="card">

portal/ticket_view_all.php

@@ -4,7 +4,7 @@
  * Primary contact view: all tickets
  */
 
-require('inc_portal.php');
+require_once('inc_portal.php');
 
 if ($session_contact_id !== $session_client_primary_contact_id) {
     header("Location: portal_post.php?logout");

side_nav.php

@@ -131,7 +131,7 @@
 
                 <?php } ?>
 
-                <?php if ($session_user_role == 1 OR $session_user_role == 3 && $config_module_enable_accounting == 1) { ?>
+                <?php if ($session_user_role == 1 || $session_user_role == 3 && $config_module_enable_accounting == 1) { ?>
 
                     <li class="nav-header mt-3">ACCOUNTING</li>
                     <li class="nav-item">