\n";
+ }
+ else {
+ echo "
\n
+
\n";
+ }
+ echo "
\n
\n";
if ($ip != '') { echo "$ip
\n"; }
@@ -417,9 +447,14 @@ function sender_details($geo_data, $stats, $domain, $dateRange, $ip) {
echo "
\n
\n
-
\n
- \n
-
\n
+
\n";
+
+ // if there's no maxmind data, then there's no map to find
+ if (GEO_ENABLE) {
+ echo "\n";
+ }
+
+ echo "
\n
\n
\n";
@@ -438,6 +473,7 @@ function sender_details($geo_data, $stats, $domain, $dateRange, $ip) {
}
foreach ($stats as $stat) {
+ $stat = array_map('htmlspecialchars',$stat);
$dkimresult = $stat['dkimresult'] ?: 'unknown';
$dkim_align = $stat['dkim_align'] ?: 'unknown';
$spfresult = $stat['spfresult'] ?: 'unknown';
@@ -467,6 +503,11 @@ function sender_details($geo_data, $stats, $domain, $dateRange, $ip) {
}
function report_details($data, $report) {
+
+ if ($data[0]['ip6'] != '') { $ip = $data[0]['ip6']; }
+ $data[0] = array_map('htmlspecialchars',$data[0]);
+ if ($data[0]['ip6'] != '') { $data[0]['ip6'] = $ip; }
+
if ($data[0]['policy_adkim'] == 'r') { $dkim_policy = 'Relaxed'; }
else if ($data[0]['policy_adkim'] == 's') { $dkim_policy = 'Strict'; }
else { $dkim_policy = 'unknown'; }
@@ -526,6 +567,7 @@ function report_details($data, $report) {
foreach ($data as $row) {
$ip = get_ip($row['ip'],$row['ip6']);
+ $row = array_map('htmlspecialchars',$row);
$dkimresult = $row['dkimresult'] ?: 'unknown';
$dkim_align = $row['dkim_align'] ?: 'unknown';
$spfresult = $row['spfresult'] ?: 'unknown';
diff --git a/install.php b/install.php
new file mode 100644
index 0000000..11f53b9
--- /dev/null
+++ b/install.php
@@ -0,0 +1,92 @@
+.
+*/
+
+// Includes
+include_once 'includes.php';
+
+// Connect to database
+
+echo "connecting to database...";
+$pdo = dbConn();
+echo " success
";
+
+// Read in file and build statement
+$statement ='';
+
+echo "opening file...";
+$lines = file('mysql.sql');
+echo " success
";
+
+foreach ($lines as $line)
+{
+ echo "→ $line
";
+ // skip comments
+ if (substr($line, 0, 2) == '--' || $line == '') { continue; }
+
+ // add line to statement
+ $statement .= $line;
+
+ // check for end of query and run it
+ if (substr(trim($line), -1, 1) == ';') {
+ try {
+ echo "performing query...";
+ $query = $pdo->prepare($statement);
+ $query->execute();
+
+ if($query->errorCode() != 0) {
+ $errors = $query->errorInfo();
+ echo " failed: ".$errors[2]."
";
+ exit();
+ }
+ }
+ catch (PDOException $e) {
+ echo " failed: ".$e->getMessage()."
";
+ exit();
+ }
+ echo " success
";
+ $query = NULL;
+ $statement = '';
+ }
+}
+
+echo "database successfully updated
";
+
+// kill the PDO
+$pdo = NULL;
+
+echo "deleting installation files
";
+
+if (unlink('mysql.sql') == true) {
+ echo "DELETED → mysql.sql
";
+}
+else {
+ echo "FAILED → mysql.sql
";
+}
+
+if (unlink(__FILE__) == true) {
+ echo "DELETED → install.php
";
+}
+else {
+ echo "FAILED → install.php
";
+}
+?>
diff --git a/mysql.sql b/mysql.sql
index cc65ae7..1d41a4a 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -1,4 +1,4 @@
-CREATE VIEW report_stats AS (
+CREATE VIEW IF NOT EXISTS report_stats AS (
SELECT
report.serial, domain, rcount, disposition, reason,
policy_p, policy_pct, dkimdomain, dkimresult, dkim_align,