Eliminate inline javascript

* All JS code was moved to 'index.js'
* Using 'fetch_all' instead of 'fetch_asoc' to get data from DB
* Added configuration file for ESLint

Author: Pavel Vyskočil

.eslintrc.yml

@@ -0,0 +1,27 @@
+env:
+  browser: true
+  jquery: true
+extends:
+  - airbnb-base
+parserOptions:
+  ecmaVersion: 5
+  sourceType: script
+  impliedStrict: true
+  jsx: false
+rules:
+  comma-dangle:
+    - error
+    - "never"
+  no-plusplus:
+    - error
+    - {allowForLoopAfterthoughts: true}
+  no-var: off
+  object-shorthand: off
+  prefer-arrow-callback: off
+  prefer-const: off
+  prefer-destructuring: off
+  prefer-numeric-literals: off
+  prefer-rest-params: off
+  prefer-spread: off
+  prefer-template: off
+  vars-on-top: off

CHANGELOG.md

@@ -2,13 +2,19 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+#### Added
+- Added configuration file for ESLint
+
 #### Changed
 - Using of short array syntax (from array() to [])
 - Specify engine and default charset in tables.sql
 - Removed unused include from 'templates/spDetail-tpl.php'
 - Deleted useless code
 - Deleted 'head' and 'body' tag in tab templates
 - Use 'filter_input' to GET and VALIDATE value send as GET/POST param
+- Eliminate inline javascript
+    - All JS code was moved to 'index.js'
+- Using 'fetch_all' instead of 'fetch_asoc' to get data from DB
 
 #### Fixed
 - Fixed the syntax of CHANGELOG

lib/Auth/Process/DatabaseCommand.php

@@ -127,15 +127,9 @@ public static function getLoginCountPerDay($days)
         }
         $stmt->execute();
         $result = $stmt->get_result();
-        while ($row = $result->fetch_assoc()) {
-            echo "[new Date(" .
-                $row["year"] . "," .
-                ($row["month"] - 1) .", " .
-                $row["day"] . "), {v:" .
-                $row["count"] .
-                "}],";
-        }
+        $r = $result->fetch_all(MYSQLI_ASSOC);
         $conn->close();
+        return $r;
     }
 
     public static function getLoginCountPerDayForService($days, $spIdentifier)
@@ -165,15 +159,9 @@ public static function getLoginCountPerDayForService($days, $spIdentifier)
         }
         $stmt->execute();
         $result = $stmt->get_result();
-        while ($row = $result->fetch_assoc()) {
-            echo "[new Date(" .
-                $row["year"] . "," .
-                ($row["month"] - 1) . ", " .
-                $row["day"] . "), {v:" .
-                $row["count"] .
-                "}],";
-        }
+        $r = $result->fetch_all(MYSQLI_ASSOC);
         $conn->close();
+        return $r;
     }
 
     public static function getLoginCountPerDayForIdp($days, $idpIdentifier)
@@ -203,15 +191,9 @@ public static function getLoginCountPerDayForIdp($days, $idpIdentifier)
         }
         $stmt->execute();
         $result = $stmt->get_result();
-        while ($row = $result->fetch_assoc()) {
-            echo "[new Date(" .
-                $row["year"] . "," .
-                ($row["month"] - 1) . ", " .
-                $row["day"] . "), {v:" .
-                $row["count"] .
-                "}],";
-        }
+        $r = $result->fetch_all(MYSQLI_ASSOC);
         $conn->close();
+        return $r;
     }
 
     public static function getAccessCountPerService($days)
@@ -223,15 +205,15 @@ public static function getAccessCountPerService($days)
         $serviceProvidersMapTableName = $databaseConnector->getServiceProvidersMapTableName();
         if ($days == 0) {    // 0 = all time
             $stmt = $conn->prepare(
-                "SELECT service, IFNULL(name,service) AS spName, SUM(count) AS count " .
+                "SELECT IFNULL(name,service) AS spName, service, SUM(count) AS count " .
                 "FROM " . $table_name . " " .
                 "LEFT OUTER JOIN " . $serviceProvidersMapTableName . " ON service = identifier " .
                 "GROUP BY service HAVING service != '' " .
                 "ORDER BY count DESC"
             );
         } else {
             $stmt = $conn->prepare(
-                "SELECT year, month, day, service, IFNULL(name,service) AS spName, SUM(count) AS count " .
+                "SELECT IFNULL(name,service) AS spName, service, SUM(count) AS count " .
                 "FROM " . $table_name . " " .
                 "LEFT OUTER JOIN " . $serviceProvidersMapTableName . "  ON service = identifier " .
                 "WHERE CONCAT(year,'-',LPAD(month,2,'00'),'-',LPAD(day,2,'00')) " .
@@ -243,12 +225,9 @@ public static function getAccessCountPerService($days)
         }
         $stmt->execute();
         $result = $stmt->get_result();
-        while ($row = $result->fetch_assoc()) {
-            echo "['" .
-                str_replace("'", "\'", $row["spName"]) .
-                "', '" . $row ["service"] . "', " . $row["count"] . "],";
-        }
+        $r = $result->fetch_all(MYSQLI_NUM);
         $conn->close();
+        return $r;
     }
 
     public static function getAccessCountForServicePerIdentityProviders($days, $spIdentifier)
@@ -260,7 +239,7 @@ public static function getAccessCountForServicePerIdentityProviders($days, $spId
         $identityProvidersMapTableName = $databaseConnector->getIdentityProvidersMapTableName();
         if ($days == 0) {    // 0 = all time
             $stmt = $conn->prepare(
-                "SELECT sourceIdp, service, IFNULL(name,sourceIdp) AS idpName, SUM(count) AS count " .
+                "SELECT IFNULL(name,sourceIdp) AS idpName, SUM(count) AS count " .
                 "FROM " . $table_name . " " .
                 "LEFT OUTER JOIN " . $identityProvidersMapTableName . " ON sourceIdp = entityId " .
                 "GROUP BY sourceIdp, service HAVING sourceIdp != '' AND service=? " .
@@ -269,7 +248,7 @@ public static function getAccessCountForServicePerIdentityProviders($days, $spId
             $stmt->bind_param('s', $spIdentifier);
         } else {
             $stmt = $conn->prepare(
-                "SELECT year, month, day, sourceIdp, service, IFNULL(name,sourceIdp) AS idpName, SUM(count) AS count " .
+                "SELECT IFNULL(name,sourceIdp) AS idpName, SUM(count) AS count " .
                 "FROM " . $table_name . " " .
                 "LEFT OUTER JOIN " . $identityProvidersMapTableName . "  ON sourceIdp = entityId " .
                 "WHERE CONCAT(year,'-',LPAD(month,2,'00'),'-',LPAD(day,2,'00')) " .
@@ -281,10 +260,9 @@ public static function getAccessCountForServicePerIdentityProviders($days, $spId
         }
         $stmt->execute();
         $result = $stmt->get_result();
-        while ($row = $result->fetch_assoc()) {
-            echo "['" . str_replace("'", "\'", $row["idpName"]) . "', " . $row["count"] . "],";
-        }
+        $r = $result->fetch_all(MYSQLI_NUM);
         $conn->close();
+        return $r;
     }
 
     public static function getAccessCountForIdentityProviderPerServiceProviders($days, $idpEntityId)
@@ -296,7 +274,7 @@ public static function getAccessCountForIdentityProviderPerServiceProviders($day
         $serviceProvidersMapTableName = $databaseConnector->getServiceProvidersMapTableName();
         if ($days == 0) {    // 0 = all time
             $stmt = $conn->prepare(
-                "SELECT sourceIdp, service, IFNULL(name,service) AS spName, SUM(count) AS count " .
+                "SELECT IFNULL(name,service) AS spName, SUM(count) AS count " .
                 "FROM " . $table_name . " " .
                 "LEFT OUTER JOIN " . $serviceProvidersMapTableName . " ON service = identifier " .
                 "GROUP BY sourceIdp, service HAVING service != '' AND sourceIdp=? " .
@@ -305,7 +283,7 @@ public static function getAccessCountForIdentityProviderPerServiceProviders($day
             $stmt->bind_param('s', $idpEntityId);
         } else {
             $stmt = $conn->prepare(
-                "SELECT year, month, day, sourceIdp, service, IFNULL(name,service) AS spName, SUM(count) AS count " .
+                "SELECT IFNULL(name,service) AS spName, SUM(count) AS count " .
                 "FROM " . $table_name . " " .
                 "LEFT OUTER JOIN " . $serviceProvidersMapTableName . "  ON service = identifier " .
                 "WHERE CONCAT(year,'-',LPAD(month,2,'00'),'-',LPAD(day,2,'00')) " .
@@ -317,10 +295,9 @@ public static function getAccessCountForIdentityProviderPerServiceProviders($day
         }
         $stmt->execute();
         $result = $stmt->get_result();
-        while ($row = $result->fetch_assoc()) {
-            echo "['" . str_replace("'", "\'", $row["spName"]) . "', " . $row["count"] . "],";
-        }
+        $r = $result->fetch_all(MYSQLI_NUM);
         $conn->close();
+        return $r;
     }
 
     public static function getLoginCountPerIdp($days)
@@ -332,15 +309,15 @@ public static function getLoginCountPerIdp($days)
         $identityProvidersMapTableName = $databaseConnector->getIdentityProvidersMapTableName();
         if ($days == 0) {    // 0 = all time
             $stmt = $conn->prepare(
-                "SELECT sourceIdp, IFNULL(name,sourceIdp) AS idpName, SUM(count) AS count " .
+                "SELECT IFNULL(name,sourceIdp) AS idpName, sourceIdp, SUM(count) AS count " .
                 "FROM " . $tableName . " " .
                 "LEFT OUTER JOIN " . $identityProvidersMapTableName . " ON sourceIdp = entityId " .
                 "GROUP BY sourceIdp HAVING sourceIdp != '' " .
                 "ORDER BY count DESC"
             );
         } else {
             $stmt = $conn->prepare(
-                "SELECT year, month, day, sourceIdp, IFNULL(name,sourceIdp) AS idpName, SUM(count) AS count " .
+                "SELECT IFNULL(name,sourceIdp) AS idpName, sourceIdp, SUM(count) AS count " .
                 "FROM " . $tableName . " " .
                 "LEFT OUTER JOIN " . $identityProvidersMapTableName . " ON sourceIdp = entityId " .
                 "WHERE CONCAT(year,'-',LPAD(month,2,'00'),'-',LPAD(day,2,'00')) " .
@@ -352,11 +329,8 @@ public static function getLoginCountPerIdp($days)
         }
         $stmt->execute();
         $result = $stmt->get_result();
-        while ($row = $result->fetch_assoc()) {
-            echo "['" .
-                str_replace("'", "\'", $row["idpName"]) .
-                "', '" . $row['sourceIdp'] . "', " . $row["count"] . "],";
-        }
+        $r = $result->fetch_all(MYSQLI_NUM);
         $conn->close();
+        return $r;
     }
 }

templates/identityProviders-tpl.php

@@ -1,7 +1,6 @@
 <?php
 
 use SimpleSAML\Module;
-use SimpleSAML\Module\proxystatistics\Auth\Process\DatabaseCommand;
 
 /**
  * @author Pavel Vyskočil <[email protected]>
@@ -11,103 +10,28 @@
 $lastDays = $this->data['lastDays'];
 
 ?>
-
-<link rel="stylesheet" media="screen" type="text/css"
-      href="<?php Module::getModuleUrl('proxystatistics/statisticsproxy.css') ?>"/>
-<script type="text/javascript">
-    google.charts.load('current', {'packages': ['corechart', 'table']});
-    google.charts.setOnLoadCallback(drawIdpsChart);
-    google.charts.setOnLoadCallback(drawIdpsTable);
-
-    function drawIdpsChart() {
-        var data = google.visualization.arrayToDataTable([
-            ['sourceIdp', 'sourceIdPEntityId', 'Count'],
-            <?php DatabaseCommand::getLoginCountPerIdp($lastDays)?>
-        ]);
-
-        data.sort([{column: 2, desc: true}]);
-
-        var view = new google.visualization.DataView(data);
-
-        view.setColumns([0, 2]);
-
-        var options = {
-            pieSliceText: 'value',
-            chartArea: {left: 20, top: 0, width: '100%', height: '100%'},
-        };
-
-        var chart = new google.visualization.PieChart(document.getElementById('idpsChartDetail'));
-        chart.draw(view, options);
-
-        google.visualization.events.addListener(chart, 'select', selectHandler);
-
-        function selectHandler() {
-            var selection = chart.getSelection();
-            if (selection.length) {
-                var entityId = data.getValue(selection[0].row, 1);
-                window.location.href = 'idpDetail.php?entityId=' + entityId;
-            }
-        }
-    }
-
-    function drawIdpsTable() {
-        var data = new google.visualization.DataTable();
-
-        data.addColumn(
-            'string', '<?php echo $this->t('{proxystatistics:Proxystatistics:templates/tables_identity_provider}'); ?>'
-        );
-        data.addColumn(
-            'string', '<?php echo $this->t('{proxystatistics:Proxystatistics:templates/tables_identity_provider}'); ?>'
-        );
-        data.addColumn(
-            'number', '<?php echo $this->t('{proxystatistics:Proxystatistics:templates/count}'); ?>'
-        );
-        data.addRows([<?php DatabaseCommand::getLoginCountPerIdp($lastDays)?>]);
-
-        data.sort([{column: 2, desc: true}]);
-
-        var view = new google.visualization.DataView(data);
-
-        view.setColumns([0, 2]);
-
-        var table = new google.visualization.Table(document.getElementById('idpsTable'));
-
-        table.draw(view);
-
-        google.visualization.events.addListener(table, 'select', selectHandler);
-
-        function selectHandler() {
-            var selection = table.getSelection();
-            if (selection.length) {
-                var entityId = data.getValue(selection[0].row, 1);
-                window.location.href = 'idpDetail.php?entityId=' + entityId;
-            }
-        }
-    }
-
-</script>
 <div class="timeRange">
     <h4><?php echo $this->t('{proxystatistics:Proxystatistics:templates_time_range}'); ?></h4>
     <form id="dateSelector" method="post">
-        <input name="tab" value="2" hidden>
+        <input name="tab" value="1" type="hidden">
         <label>
             <input id="1" type="radio" name="lastDays" value=0
-                   onclick="this.form.submit()"<?php echo ($lastDays == 0) ? "checked=true" : "" ?>>
+                    <?php echo ($lastDays == 0) ? "checked=true" : "" ?>>
             <?php echo $this->t('{proxystatistics:Proxystatistics:templates/statistics-tpl_all}'); ?>
         </label>
         <label>
             <input id="2" type="radio" name="lastDays" value=7
-                   onclick="this.form.submit()" <?php echo ($lastDays == 7) ? "checked=true" : "" ?>>
+                    <?php echo ($lastDays == 7) ? "checked=true" : "" ?>>
             <?php echo $this->t('{proxystatistics:Proxystatistics:templates/statistics-tpl_week}'); ?>
         </label>
         <label>
             <input id="3" type="radio" name="lastDays" value=30
-                   onclick="this.form.submit()" <?php echo ($lastDays == 30) ? "checked=true" : "" ?>>
+                    <?php echo ($lastDays == 30) ? "checked=true" : "" ?>>
             <?php echo $this->t('{proxystatistics:Proxystatistics:templates/statistics-tpl_month}'); ?>
         </label>
         <label>
             <input id="4" type="radio" name="lastDays" value=365
-                   onclick="this.form.submit()" <?php echo ($lastDays == 365) ? "checked=true" : "" ?>>
+                    <?php echo ($lastDays == 365) ? "checked=true" : "" ?>>
             <?php echo $this->t('{proxystatistics:Proxystatistics:templates/statistics-tpl_year}'); ?>
         </label>
     </form>
@@ -119,7 +43,7 @@ function selectHandler() {
 </div>
 <div class="row">
     <div class="col-md-8">
-        <div id="idpsChartDetail" class="pieChart"></div>
+        <div id="idpsChartDetail" class="pieChart chart-idpsChart"></div>
     </div>
     <div class="col-md-4">
         <div id="idpsTable" class="table"></div>