Use Short echo tags across the code

agent/modals/recurring_invoice/recurring_invoice_add.php

@@ -19,7 +19,7 @@ ob_start();
     <div class="modal-body">
 
         <?php if ($client_id) { ?>
-            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <input type="hidden" name="client_id" value="<?= $client_id ?>">
         <?php } else { ?>
 
             <div class="form-group">
@@ -37,7 +37,7 @@ ob_start();
                             $client_id = intval($row['client_id']);
                             $client_name = escapeHtml($row['client_name']);
                         ?>
-                            <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
+                            <option value="<?= $client_id ?>"><?= "$client_name" ?></option>
 
                         <?php
                         }
@@ -64,7 +64,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
-                <input type="date" class="form-control" name="start_date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+                <input type="date" class="form-control" name="start_date" max="2999-12-31" value="<?= date("Y-m-d") ?>" required>
             </div>
         </div>
 
@@ -97,7 +97,7 @@ ob_start();
                         $category_id = intval($row['category_id']);
                         $category_name = escapeHtml($row['category_name']);
                     ?>
-                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                        <option value="<?= $category_id ?>"><?= $category_name ?></option>
 
                     <?php
                     }

agent/modals/recurring_invoice/recurring_invoice_edit.php

@@ -27,14 +27,14 @@ ob_start();
 ?>
 
 <div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fas fa-fw fa-redo-alt mr-2"></i>Editing Recur Invoice: <strong><?php echo "$recurring_invoice_prefix$recurring_invoice_number"; ?></strong></h5>
+    <h5 class="modal-title"><i class="fas fa-fw fa-redo-alt mr-2"></i>Editing Recur Invoice: <strong><?= "$recurring_invoice_prefix$recurring_invoice_number" ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <input type="hidden" name="recurring_invoice_id" value="<?php echo $recurring_invoice_id; ?>">
+    <input type="hidden" name="recurring_invoice_id" value="<?= $recurring_invoice_id ?>">
 
     <div class="modal-body">
 
@@ -44,7 +44,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
                 </div>
-                <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255" value="<?php echo $recurring_invoice_scope; ?>">
+                <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255" value="<?= $recurring_invoice_scope ?>">
             </div>
         </div>
 
@@ -68,7 +68,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
-                <input type="date" class="form-control" name="next_date" max="2999-12-31" value="<?php echo $recurring_invoice_next_date; ?>" required>
+                <input type="date" class="form-control" name="next_date" max="2999-12-31" value="<?= $recurring_invoice_next_date ?>" required>
             </div>
         </div>
 
@@ -87,7 +87,7 @@ ob_start();
                         $category_id_select = intval($row['category_id']);
                         $category_name_select = escapeHtml($row['category_name']);
                     ?>
-                        <option <?php if ($category_id == $category_id_select) { ?> selected <?php } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
+                        <option <?php if ($category_id == $category_id_select) { ?> selected <?php } ?> value="<?= $category_id_select ?>"><?= $category_name_select ?></option>
 
                     <?php
                     }
@@ -108,7 +108,7 @@ ob_start();
                 <div class='input-group-prepend'>
                     <span class='input-group-text'><i class='fa fa-fw fa-dollar-sign'></i></span>
                 </div>
-                <input type='text' class='form-control' inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name='recurring_invoice_discount' placeholder='0.00' value="<?php echo number_format($recurring_invoice_discount, 2, '.', ''); ?>">
+                <input type='text' class='form-control' inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name='recurring_invoice_discount' placeholder='0.00' value="<?= number_format($recurring_invoice_discount, 2, '.', '') ?>">
             </div>
         </div>
 

agent/modals/recurring_invoice/recurring_invoice_export.php

@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="client_id" value="<?= $client_id ?>">
                 <div class="modal-body">
 
                 </div>

agent/modals/recurring_invoice/recurring_invoice_item_edit.php

@@ -24,15 +24,15 @@ ob_start();
 ?>
 
 <div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fas fa-fw fa-edit mr-2"></i>Editing Line Item: <strong><?php echo $item_name; ?></strong></h5>
+    <h5 class="modal-title"><i class="fas fa-fw fa-edit mr-2"></i>Editing Line Item: <strong><?= $item_name ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <input type="hidden" name="item_id" value="<?php echo $item_id; ?>">
-    <input type="hidden" name="product_id" value="<?php echo $product_id; ?>">
+    <input type="hidden" name="item_id" value="<?= $item_id ?>">
+    <input type="hidden" name="product_id" value="<?= $product_id ?>">
 
     <div class="modal-body">
         <div class="form-group">
@@ -41,7 +41,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
                 </div>
-                <input type="text" class="form-control" name="name" maxlength="200" value="<?php echo $item_name; ?>" placeholder="Enter item name" required>
+                <input type="text" class="form-control" name="name" maxlength="200" value="<?= $item_name ?>" placeholder="Enter item name" required>
             </div>
         </div>
 
@@ -53,7 +53,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
                         </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="qty" value="<?php echo number_format($item_quantity, 2); ?>" placeholder="0.00" required>
+                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="qty" value="<?= number_format($item_quantity, 2) ?>" placeholder="0.00" required>
                     </div>
                 </div>
             </div>
@@ -65,7 +65,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                         </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name="price" value="<?php echo number_format($item_price, 2, '.', ''); ?>" placeholder="0.00" required>
+                        <input type="text" class="form-control" inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name="price" value="<?= number_format($item_price, 2, '.', '') ?>" placeholder="0.00" required>
                     </div>
                 </div>
             </div>
@@ -74,7 +74,7 @@ ob_start();
         <div class="form-group">
             <label>Description</label>
             <div class="input-group">
-                <textarea class="form-control" rows="5" name="description" placeholder="Enter a description"><?php echo $item_description; ?></textarea>
+                <textarea class="form-control" rows="5" name="description" placeholder="Enter a description"><?= $item_description ?></textarea>
             </div>
         </div>
 
@@ -93,7 +93,7 @@ ob_start();
                             $tax_name = escapeHtml($row['tax_name']);
                             $tax_percent = floatval($row['tax_percent']);
                     ?>
-                        <option <?php if ($tax_id_select == $tax_id) { echo "selected"; } ?> value="<?php echo $tax_id_select; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
+                        <option <?php if ($tax_id_select == $tax_id) { echo "selected"; } ?> value="<?= $tax_id_select ?>"><?= "$tax_name $tax_percent%" ?></option>
                     <?php
                         }
                     ?>

agent/modals/recurring_invoice/recurring_invoice_note.php

@@ -9,10 +9,10 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-        <input type="hidden" name="recurring_invoice_id" value="<?php echo $recurring_invoice_id; ?>">
+        <input type="hidden" name="recurring_invoice_id" value="<?= $recurring_invoice_id ?>">
         <div class="modal-body">
           <div class="form-group">
-            <textarea class="form-control" rows="8" name="note" placeholder="Enter some notes"><?php echo $recurring_invoice_note; ?></textarea>
+            <textarea class="form-control" rows="8" name="note" placeholder="Enter some notes"><?= $recurring_invoice_note ?></textarea>
           </div>
         </div>
         <div class="modal-footer">