Merge branch 'master' of https://github.com/allinurl/goaccess

README.md

@@ -216,6 +216,11 @@ example, for Apache's *combined* log format:
     output /srv/report/index.html
     real-time-html true
 
+If you want a secure connection, a TLS/SSL certificate and a key files must be configured as well:
+
+    ssl-cert /srv/data/domain.crt
+    ssl-key /srv/data/domain.key
+
 Once you have your configuration file all set, clone the repo:
 
     $ git clone https://github.com/allinurl/goaccess.git goaccess && cd $_
@@ -235,14 +240,18 @@ have to rebuild from scratch. Simply restart the container:
     docker restart goaccess
 
 If you want to expose goaccess on a different port on the host machine, you
-*have to* set the `ws-url` option in the config file, e.g.:`
+*have to* set the `ws-url` option in the config file, e.g.:
 
     ws-url ws://example.com:8080
 
 or for secured connections:
 
     ws-url wss://example.com:8080
 
+    # Note that ssl-cert and ssl-key are needed to enable TLS/SSL secured connections.
+    ssl-cert /srv/data/domain.crt
+    ssl-key /srv/data/domain.key
+
 And start the container as follows:
 
     docker run --restart=always -d -p 8080:7890 \

po/goaccess.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2018-03-13 06:51-0500\n"
+"POT-Creation-Date: 2018-03-20 21:20-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

po/zh_CN.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: goaccess 1.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2018-03-14 21:19-0500\n"
+"POT-Creation-Date: 2018-03-20 21:20-0500\n"
 "PO-Revision-Date: 2017-04-03 09:43+0200\n"
 "Last-Translator: Ai<[email protected]>\n"
 "Language-Team: Ai\n"
@@ -614,6 +614,7 @@ msgstr "条形图"
 msgid "Plot Metric"
 msgstr "绘制度量"
 
+# change
 #: ../src/labels.h:352
 msgid "Table Columns"
 msgstr "表格列"

resources/js/app.js

@@ -1634,8 +1634,8 @@ GoAccess.App = {
 		// panel's data
 		var panelData = GoAccess.getPanelData(panel).data;
 		panelData.sort(function (a, b) {
-			var a = this.sortField(a, field);
-			var b = this.sortField(b, field);
+			a = this.sortField(a, field);
+			b = this.sortField(b, field);
 
 			if (typeof a === 'string' && typeof b === 'string')
 				return 'asc' == order ? a.localeCompare(b) : b.localeCompare(a);

resources/js/charts.js

@@ -260,7 +260,7 @@ function AreaChart(dualYaxis) {
 			.attr('y', 10)
 			.text(labels.y1);
 		dualYaxis && tEnter
-			.attr('x', width - 25)
+			.attr('x', width - 25);
 	}
 
 	function createSkeleton(svg) {
@@ -332,7 +332,7 @@ function AreaChart(dualYaxis) {
 				return pl + ' ' + pl;
 			})
 			.attr('stroke-dashoffset', function (d) {
-				return pathLen(d3.select(this))
+				return pathLen(d3.select(this));
 			});
 		// update
 		path
@@ -386,8 +386,8 @@ function AreaChart(dualYaxis) {
 			.attr('r', radius)
 			.attr('class', 'point');
 		points
-			.attr('cx', function (d) { return xScale(d[0]) })
-			.attr('cy', function (d) { return yScale0(d[1]) })
+			.attr('cx', function (d) { return xScale(d[0]); })
+			.attr('cy', function (d) { return yScale0(d[1]); })
 		// remove elements
 		points.exit().remove();