diff --git a/Teknik/Areas/Status/Scripts/Status.js b/Teknik/Areas/Status/Scripts/Status.js index 9cceffd..b12efe5 100644 --- a/Teknik/Areas/Status/Scripts/Status.js +++ b/Teknik/Areas/Status/Scripts/Status.js @@ -246,51 +246,53 @@ $(document).ready(function () { /* ---------------------------------------- Visitor History -----------------------------------------*/ - visitChart = new Highcharts.chart({ - chart: { - renderTo: 'visitor-chart', - type: 'line', - marginRight: 10 - }, - title: { - text: 'Daily Visitors' - }, - xAxis: { - type: 'datetime', - dateTimeLabelFormats: { // don't display the dummy year - month: '%e. %b', - year: '%b' + if (showVisitorStats) { + visitChart = new Highcharts.chart({ + chart: { + renderTo: 'visitor-chart', + type: 'line', + marginRight: 10 }, title: { - text: 'Date' - } - }, - yAxis: { - title: { - text: 'Visitors' + text: 'Daily Visitors' }, - min: 0 - }, - tooltip: { - shared: true, - crosshairs: true, - headerFormat: '{point.key:%B %e, %Y}
', - pointFormat: '\u25CF {series.name}: {point.y}
' - }, - credits: { - enabled: false - }, - series: [ - { - name: 'All Visitors', - data: [] + xAxis: { + type: 'datetime', + dateTimeLabelFormats: { // don't display the dummy year + month: '%e. %b', + year: '%b' + }, + title: { + text: 'Date' + } }, - { - name: 'Unique Visitors', - data: [] - } - ] - }); + yAxis: { + title: { + text: 'Visitors' + }, + min: 0 + }, + tooltip: { + shared: true, + crosshairs: true, + headerFormat: '{point.key:%B %e, %Y}
', + pointFormat: '\u25CF {series.name}: {point.y}
' + }, + credits: { + enabled: false + }, + series: [ + { + name: 'All Visitors', + data: [] + }, + { + name: 'Unique Visitors', + data: [] + } + ] + }); + } /* ---------------------------------------- diff --git a/Utilities/Utilities/ResponseHelper.cs b/Utilities/Utilities/ResponseHelper.cs index 8bcfd50..a0d2c61 100644 --- a/Utilities/Utilities/ResponseHelper.cs +++ b/Utilities/Utilities/ResponseHelper.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -14,23 +14,19 @@ namespace Teknik.Utilities { try { - if (flush) - { - // If the client isn't here, just quit early - if (!response.IsClientConnected) - { - return; - } - response.Flush(); - } - - int curByte = 0; int processedBytes = 0; byte[] buffer = new byte[chunkSize]; int bytesRemaining = length; int bytesToRead = chunkSize; do { + // Flush the response + if (flush) + { + //response.OutputStream.Write(buffer, 0, 1); + response.Flush(); + } + if (chunkSize > bytesRemaining) { bytesToRead = bytesRemaining; @@ -39,30 +35,11 @@ namespace Teknik.Utilities processedBytes = stream.Read(buffer, 0, bytesToRead); if (processedBytes > 0) { - // If the client isn't here, just quit early - if (!response.IsClientConnected) - { - return; - } - response.OutputStream.Write(buffer, 0, processedBytes); // Clear the buffer Array.Clear(buffer, 0, chunkSize); - - // Flush the response - if (flush) - { - // If the client isn't here, just quit early - if (!response.IsClientConnected) - { - return; - } - //response.OutputStream.Write(buffer, 0, 1); - response.Flush(); - } } - curByte += processedBytes; bytesRemaining -= processedBytes; } while (processedBytes > 0 && bytesRemaining > 0);