diff --git a/app/extensions/extension_download.php b/app/extensions/extension_download.php
index 3fa035b416..034ba2ed46 100644
--- a/app/extensions/extension_download.php
+++ b/app/extensions/extension_download.php
@@ -61,7 +61,7 @@ function download_send_headers($filename) {
     header("Cache-Control: max-age=0, no-cache, must-revalidate, proxy-revalidate");
     header("Last-Modified: {$now} GMT");
 
-    // force download  
+    // force download
     header("Content-Type: application/force-download");
     header("Content-Type: application/octet-stream");
     header("Content-Type: application/download");
@@ -154,9 +154,9 @@ $row_style["1"] = "row_style1";
 		echo "<th><input type=\"checkbox\" id=\"selecctall\"/>";
 		echo "</th>";
 		echo "<th> Column Name";
-		echo "</th>";	
+		echo "</th>";
 		echo "<th> Description";
-		echo "</th>";	
+		echo "</th>";
 		echo "</tr>";
 	echo "</tr>";
 	foreach ($columns as $value) {
@@ -164,9 +164,9 @@ $row_style["1"] = "row_style1";
 		echo "	<td width = '20px' valign='top' class='".$row_style[$c]."'><input class=\"checkbox1\" type=\"checkbox\" name=\"column_group[]\" value=\"$value\"/>";
 		echo "</td>";
 		echo "	<td valign='top' class='".$row_style[$c]."'> $value";
-		echo "</td>";	
+		echo "</td>";
 		echo "	<td valign='top' class='".$row_style[$c]."'>";
-		echo "</td>";	
+		echo "</td>";
 		echo "</tr>";
 		if ($c==0) { $c=1; } else { $c=0; }
 	}
@@ -181,7 +181,7 @@ $row_style["1"] = "row_style1";
 	echo "</table>";
 	echo "<br><br>";
 	echo "</form>";
-	
+
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 35b17e5a2b..7ba61f42c6 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -151,15 +151,15 @@ if(!function_exists('fax_enqueue')) {
 			$date_utc_now_sql  = "datetime('now')";
 		}
 		$sql = <<<HERE
-INSERT INTO v_fax_tasks( fax_task_uuid, fax_uuid, 
-	task_next_time, task_lock_time, 
-	task_fax_file, task_wav_file, task_uri, task_dial_string, task_dtmf, 
+INSERT INTO v_fax_tasks( fax_task_uuid, fax_uuid,
+	task_next_time, task_lock_time,
+	task_fax_file, task_wav_file, task_uri, task_dial_string, task_dtmf,
 	task_interrupted, task_status, task_no_answer_counter, task_no_answer_retry_counter, task_retry_counter,
 	task_reply_address, task_description)
 VALUES (?, ?,
-	$date_utc_now_sql, NULL, 
-	?, ?, ?, ?, ?, 
-	'false', 0, 0, 0, 0, 
+	$date_utc_now_sql, NULL,
+	?, ?, ?, ?, ?,
+	'false', 0, 0, 0, 0,
 	?, ?);
 HERE;
 		$stmt = $db->prepare($sql);
diff --git a/app/fax/resources/classes/fax.php b/app/fax/resources/classes/fax.php
index 534e48fc1d..d20d842dca 100644
--- a/app/fax/resources/classes/fax.php
+++ b/app/fax/resources/classes/fax.php
@@ -26,7 +26,7 @@
 
 /**
  * cache class provides an abstracted cache
- * 
+ *
  * @method string dialplan - builds the dialplan for the fax servers
  */
 //define the fax class
@@ -150,7 +150,7 @@
 							$dialplan["dialplan_details"][$y]["dialplan_detail_data"] = substr($data,8,strlen($data));
 						}
 						elseif (substr($data,0,9) == "outbound:") {}
-						else { 
+						else {
 							$dialplan["dialplan_details"][$y]["dialplan_detail_data"] = $data;
 						}
 						$dialplan["dialplan_details"][$y]["dialplan_detail_group"] = "1";
diff --git a/app/fifo_list/fifo_interactive_inc.php b/app/fifo_list/fifo_interactive_inc.php
index 0761c53436..3db0b39600 100644
--- a/app/fifo_list/fifo_interactive_inc.php
+++ b/app/fifo_list/fifo_interactive_inc.php
@@ -188,8 +188,8 @@ else {
 				if ($c==0) { $c=1; } else { $c=0; }
 			}
 			echo "</table>\n";
-			
-			
+
+
 			//Current logged members
 			//set the alternating row styles
 			$c = 0;
@@ -201,33 +201,33 @@ else {
 			echo "</div>\n";
 			echo "<br><br>Logged in agents<br><br>\n";
 
-			
+
 		//show the content
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	
-			
+
+
 			echo "<tr>\n";
 			echo "<th>".$text['label-username']."</th>\n";
 			echo "<th>Total inbound calls</th>\n";
 			echo "<th>Logged on since</th>\n";
 			echo "</tr>\n";
-			
-			
+
+
 			//print_r($xml->fifo->outbound->member[0]);
 			//print_r($xml->fifo->outbound->member[1]);
 
-			
+
 			foreach ($xml->fifo->outbound->member as $row) {
 
-				
-				
+
+
 				$username=explode("@",$row);
 				$username=explode("/",$username[0]);
 				$username=$username[1];
-				
+
 				$fifo_duration_formatted=$row["logged-on-since"];
 				$fifo_total_inbound_calls=$row["outbound-call-total-count"];
-			
+
 				echo "<tr>\n";
 				echo "<td valign='top' class='".$row_style[$c]."'>$username &nbsp;</td>\n";
 				echo "<td valign='top' class='".$row_style[$c]."'>$fifo_total_inbound_calls &nbsp;</td>\n";
diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php
index 1a3178ddcb..e1870452e0 100644
--- a/app/time_conditions/time_condition_edit.php
+++ b/app/time_conditions/time_condition_edit.php
@@ -49,7 +49,7 @@ require_once "resources/header.php";
 		$available_presets[] = json_decode($json, true);
 	}
 	unset($preset_region);
-	
+
 //set the action as an add or an update
 	if (isset($_REQUEST["id"])) {
 		$action = "update";
@@ -250,14 +250,14 @@ require_once "resources/header.php";
 			$is_preset = (in_array($group_id, $_REQUEST['preset'])) ? true : false;
 
 			//set group and order number
-			
+
 			$dialplan_detail_group_user = check_str($_POST["group_$group_id"]);
 			if($dialplan_detail_group_user!='') {
 				$dialplan_detail_group = $dialplan_detail_group_user;
 			} else {
 				$dialplan_detail_group = $group_id;
-			}	
-					
+			}
+
 			$dialplan_detail_order = 0;
 
 			foreach ($conditions as $cond_num => $cond_var) {
diff --git a/app/traffic_graph/svg_graph.php b/app/traffic_graph/svg_graph.php
index 1fc6a2836e..9188c9c7da 100644
--- a/app/traffic_graph/svg_graph.php
+++ b/app/traffic_graph/svg_graph.php
@@ -2,21 +2,21 @@
 /*
 	graph.php
 	part of m0n0wall (http://m0n0.ch/wall)
-	
+
 	Copyright (C) 2004-2006 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net>
 	and Jonathan Watt <jwatt@jwatt.org>.
 	All rights reserved.
-	
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
-	
+
 	1. Redistributions of source code must retain the above copyright notice,
 	   this list of conditions and the following disclaimer.
-	
+
 	2. Redistributions in binary form must reproduce the above copyright
 	   notice, this list of conditions and the following disclaimer in the
 	   documentation and/or other materials provided with the distribution.
-	
+
 	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -197,7 +197,7 @@ function fetch_data() {
 function plot_data(obj) {
   // Show datetimelegend
   var now = new Date();
-  var datetime = (now.getMonth()+1) + "/" + now.getDate() + "/" + now.getFullYear() + ' ' + 
+  var datetime = (now.getMonth()+1) + "/" + now.getDate() + "/" + now.getFullYear() + ' ' +
     LZ(now.getHours()) + ":" + LZ(now.getMinutes()) + ":" + LZ(now.getSeconds());
   SVGDoc.getElementById('datetime').firstChild.data = datetime;
 
@@ -223,7 +223,7 @@ function plot_data(obj) {
   last_ugmt = ugmt;
   last_ifin = ifin;
   last_ifout = ifout;
-  
+
   switch (plot_in.length) {
   	case 0:
   		SVGDoc.getElementById("collect_initial").setAttributeNS(null, 'visibility', 'visible');
@@ -296,7 +296,7 @@ function plot_data(obj) {
         rmax *= 1.25;
       else
         rmax *= 2;
-      
+
       if (i == 8)
         rmax *= 1.024;
     }
diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php
index 1a0c840845..6f5a12dd23 100644
--- a/app/vars/app_defaults.php
+++ b/app/vars/app_defaults.php
@@ -121,7 +121,7 @@ EOD;
 			if ( $country_iso===NULL ) {
 				return;
 			}
-			
+
 			if(isset($countries[$country_iso])){
 				$country = $countries[$country_iso];
 
@@ -133,7 +133,7 @@ EOD;
 				if ($prep_statement) {
 					$prep_statement->execute();
 					$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-	
+
 					if ($row['num_rows'] == 0) {
 						$sql = "insert into v_vars ";
 						$sql .= "(";
@@ -161,7 +161,7 @@ EOD;
 					}
 				}
 				unset($prep_statement, $sql);
-	
+
 		// Set default Country code
 				$sql = "select count(*) as num_rows from v_vars ";
 				$sql .= "where var_name = 'default_countrycode' ";
@@ -197,7 +197,7 @@ EOD;
 					}
 				}
 				unset($prep_statement, $sql);
-	
+
 		// Set default International Direct Dialing code
 				$sql = "select count(*) as num_rows from v_vars ";
 				$sql .= "where var_name = 'default_exitcode' ";
@@ -229,11 +229,11 @@ EOD;
 						$sql .= ");";
 						$db->exec(check_sql($sql));
 						unset($sql, $row);
-						$x++;				
+						$x++;
 					}
 				}
 				unset($prep_statement, $sql);
-	
+
 				unset($countries);
 			}
 		}