Code deduplication/tidying

- Move default pagination/sort/search query variable mapping to pagination_head.php - Remove user_logs.php
itflow-org · Apr 14, 2022 · b4f2fdd · b4f2fdd
1 parent ca62980
commit b4f2fdd
Show file tree

Hide file tree

Showing 50 changed files with 92 additions and 1,359 deletions.
diff --git a/accounts.php b/accounts.php
@@ -1,51 +1,19 @@
-<?php include("inc_all.php"); ?>
+<?php include("inc_all.php");
 
-<?php
-
-  //Paging
-  if(isset($_GET['p'])){
-    $p = intval($_GET['p']);
-    $record_from = (($p)-1)*$_SESSION['records_per_page'];
-    $record_to = $_SESSION['records_per_page'];
-  }else{
-    $record_from = 0;
-    $record_to = $_SESSION['records_per_page'];
-    $p = 1;
-  }
-
-  if(isset($_GET['q'])){
-    $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-  }else{
-    $q = "";
-  }
-
-  if(!empty($_GET['sb'])){
-    $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
-  }else{
-    $sb = "account_name";
-  }
-
-  if(isset($_GET['o'])){
-    if($_GET['o'] == 'ASC'){
-      $o = "ASC";
-      $disp = "DESC";
-    }else{
-      $o = "DESC";
-      $disp = "ASC";
-    }
-  }else{
-    $o = "ASC";
-    $disp = "DESC";
-  }
+if(!empty($_GET['sb'])){
+  $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
+}else{
+  $sb = "account_name";
+}
 
-  //Rebuild URL
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-  $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM accounts 
-    WHERE account_name LIKE '%$q%' AND company_id = $session_company_id
-    ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM accounts 
+  WHERE account_name LIKE '%$q%' AND company_id = $session_company_id
+  ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-  $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 ?>
 

diff --git a/assets.php b/assets.php
@@ -1,44 +1,12 @@
 <?php include("inc_all.php");
 
-//Paging
-if(isset($_GET['p'])){
-  $p = intval($_GET['p']);
-  $record_from = (($p)-1)*$_SESSION['records_per_page'];
-  $record_to = $_SESSION['records_per_page'];
-}else{
-  $record_from = 0;
-  $record_to = $_SESSION['records_per_page'];
-  $p = 1;
-}
-
-//Custom Query Filter  
-if(isset($_GET['q'])){
-  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-}else{
-  $q = "";
-}
-
 //Column Filter
 if(!empty($_GET['sb'])){
   $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
 }else{
   $sb = "asset_name";
 }
 
-//Column Order Filter
-if(isset($_GET['o'])){
-  if($_GET['o'] == 'ASC'){
-    $o = "ASC";
-    $disp = "DESC";
-  }else{
-    $o = "DESC";
-    $disp = "ASC";
-  }
-}else{
-  $o = "ASC";
-  $disp = "DESC";
-}
-
 //Date From and Date To Filter
 if(!empty($_GET['dtf'])){
   $dtf = mysqli_real_escape_string($mysqli,$_GET['dtf']);

diff --git a/campaigns.php b/campaigns.php
@@ -1,41 +1,11 @@
 <?php include("inc_all.php");
 
-  //Paging
-  if(isset($_GET['p'])){
-    $p = intval($_GET['p']);
-    $record_from = (($p)-1)*$_SESSION['records_per_page'];
-    $record_to = $_SESSION['records_per_page'];
-  }else{
-    $record_from = 0;
-    $record_to = $_SESSION['records_per_page'];
-    $p = 1;
-  }
-
-  if(isset($_GET['q'])){
-    $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-  }else{
-    $q = "";
-  }
-
   if(!empty($_GET['sb'])){
     $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
   }else{
     $sb = "campaign_created_at";
   }
 
-  if(isset($_GET['o'])){
-    if($_GET['o'] == 'ASC'){
-      $o = "ASC";
-      $disp = "DESC";
-    }else{
-      $o = "DESC";
-      $disp = "ASC";
-    }
-  }else{
-    $o = "DESC";
-    $disp = "ASC";
-  }
-
   if(empty($_GET['canned_date'])){
     //Prevents lots of undefined variable errors.
     // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
@@ -69,7 +39,7 @@
     $dtt = date('Y-m-d');
   }elseif($_GET['canned_date'] == "lastyear"){
     $dtf = date('Y-m-d',strtotime("first day of january last year"));
-    $dtt = date('Y-m-d',strtotime("last day of december last year"));  
+    $dtt = date('Y-m-d',strtotime("last day of december last year"));
   }else{
     $dtf = "0000-00-00";
     $dtt = "9999-00-00";
@@ -149,7 +119,7 @@
               <input type="date" class="form-control" name="dtt" value="<?php echo $dtt; ?>">
             </div>
           </div>
-        </div>    
+        </div>
       </div>
     </form>
     <hr>
@@ -170,7 +140,7 @@
         </thead>
         <tbody>
           <?php
-      
+
           while($row = mysqli_fetch_array($sql)){
             $campaign_id = $row['campaign_id'];
             $campaign_name = $row['campaign_name'];
@@ -245,9 +215,9 @@
           //include("campaign_copy_modal.php"); --doesnt exist yet
           include("campaign_edit_modal.php");
           include("campaign_test_modal.php");
-          
+
           }
-          
+
           ?>
 
         </tbody>

diff --git a/categories.php b/categories.php
@@ -1,47 +1,17 @@
 <?php include("inc_all_admin.php"); 
 
-//Paging
-if(isset($_GET['p'])){
-  $p = intval($_GET['p']);
-  $record_from = (($p)-1)*$_SESSION['records_per_page'];
-  $record_to = $_SESSION['records_per_page'];
+if(isset($_GET['category'])){
+  $category = mysqli_real_escape_string($mysqli,$_GET['category']);
 }else{
-  $record_from = 0;
-  $record_to = $_SESSION['records_per_page'];
-  $p = 1;
+  $category = "Expense";
 }
-
-if(isset($_GET['q'])){
-  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-}else{
-  $q = "";
-}
-
- if(isset($_GET['category'])){
-    $category = mysqli_real_escape_string($mysqli,$_GET['category']);
-  }else{
-    $category = "Expense";
-  }
 
 if(!empty($_GET['sb'])){
   $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
 }else{
   $sb = "category_name";
 }
 
-if(isset($_GET['o'])){
-  if($_GET['o'] == 'ASC'){
-    $o = "ASC";
-    $disp = "DESC";
-  }else{
-    $o = "DESC";
-    $disp = "ASC";
-  }
-}else{
-  $o = "ASC";
-  $disp = "DESC";
-}
-
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 

diff --git a/client_assets.php b/client_assets.php
@@ -29,42 +29,12 @@
   AND asset_archived_at IS NULL AND asset_client_id = $client_id"));
 $other_count = $row['count'];
 
-//Paging
-if(isset($_GET['p'])){
-  $p = intval($_GET['p']);
-  $record_from = (($p)-1)*$_SESSION['records_per_page'];
-  $record_to = $_SESSION['records_per_page'];
-}else{
-  $record_from = 0;
-  $record_to = $_SESSION['records_per_page'];
-  $p = 1;
-}
-
-if(isset($_GET['q'])){
-  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-}else{
-  $q = "";
-}
-
 if(!empty($_GET['sb'])){
   $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
 }else{
   $sb = "asset_name";
 }
 
-if(isset($_GET['o'])){
-  if($_GET['o'] == 'ASC'){
-    $o = "ASC";
-    $disp = "DESC";
-  }else{
-    $o = "DESC";
-    $disp = "ASC";
-  }
-}else{
-  $o = "ASC";
-  $disp = "DESC";
-}
-
 //Asset Type from GET
 if(isset($_GET['type']) && ($_GET['type']) == 'workstation'){
   $type_query = "asset_type = 'desktop' OR asset_type = 'laptop'";

diff --git a/client_certificates.php b/client_certificates.php
@@ -1,41 +1,12 @@
 <?php 
 
-//Paging
-if(isset($_GET['p'])){
-  $p = intval($_GET['p']);
-  $record_from = (($p)-1)*$_SESSION['records_per_page'];
-  $record_to = $_SESSION['records_per_page'];
-}else{
-  $record_from = 0;
-  $record_to = $_SESSION['records_per_page'];
-  $p = 1;
-}
-
-if(isset($_GET['q'])){
-  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-}else{
-  $q = "";
-}
 
 if(!empty($_GET['sb'])){
   $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
 }else{
   $sb = "certificate_name";
 }
 
-if(isset($_GET['o'])){
-  if($_GET['o'] == 'ASC'){
-    $o = "ASC";
-    $disp = "DESC";
-  }else{
-    $o = "DESC";
-    $disp = "ASC";
-  }
-}else{
-  $o = "ASC";
-  $disp = "DESC";
-}
-
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 

diff --git a/client_contacts.php b/client_contacts.php
@@ -1,24 +1,12 @@
 <?php 
 
-//Paging
-if(isset($_GET['p'])){
-  $p = intval($_GET['p']);
-  $record_from = (($p)-1)*$_SESSION['records_per_page'];
-  $record_to = $_SESSION['records_per_page'];
-}else{
-  $record_from = 0;
-  $record_to = $_SESSION['records_per_page'];
-  $p = 1;
-}
-
 if(isset($_GET['q'])){
   $q = mysqli_real_escape_string($mysqli,$_GET['q']);
   //Phone Numbers
   $n = preg_replace("/[^0-9]/", '',$q);
   if(empty($n)){
     $n = $q;
   }
-
 }else{
   $q = "";
   //Phone Numbers
@@ -31,19 +19,6 @@
   $sb = "contact_name";
 }
 
-if(isset($_GET['o'])){
-  if($_GET['o'] == 'ASC'){
-    $o = "ASC";
-    $disp = "DESC";
-  }else{
-    $o = "DESC";
-    $disp = "ASC";
-  }
-}else{
-  $o = "ASC";
-  $disp = "DESC";
-}
-
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));