From 5fdb8d8f43e15b9581e8320153eb2e8c24cedac8 Mon Sep 17 00:00:00 2001
From: sijanec <sijanecantonluka@gmail.com>
Date: Tue, 1 Dec 2020 23:50:20 +0100
Subject: =?UTF-8?q?dodal=20mo=C5=BEnost=20komentiranja?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _data/comments.json             |  26 -----
 _data/comments.yml              |  20 ++++
 _data/lang.yml                  |   4 +
 _includes/commentreplyform.html |  18 +++
 _includes/commentsthread.html   |  47 +++-----
 _includes/main.js               |   1 +
 _includes/main.scss             |   1 +
 _layouts/default.html           |   9 +-
 _layouts/post.html              |  21 +++-
 _sass/main.scss                 |  31 +++--
 api/Makefile                    |   6 -
 api/api                         | Bin 17992 -> 0 bytes
 api/api.c                       | 244 ----------------------------------------
 api/c/Makefile                  |   7 ++
 api/c/api                       | Bin 0 -> 17992 bytes
 api/c/api.c                     | 244 ++++++++++++++++++++++++++++++++++++++++
 api/c/urlcode.c                 |  48 ++++++++
 api/php/api.php                 |  60 ++++++++++
 api/urlcode.c                   |  48 --------
 assets/js/main.js               |   3 +-
 20 files changed, 471 insertions(+), 367 deletions(-)
 delete mode 100644 _data/comments.json
 create mode 100644 _data/comments.yml
 create mode 100644 _data/lang.yml
 create mode 100644 _includes/commentreplyform.html
 create mode 120000 _includes/main.js
 create mode 120000 _includes/main.scss
 delete mode 100644 api/Makefile
 delete mode 100755 api/api
 delete mode 100644 api/api.c
 create mode 100644 api/c/Makefile
 create mode 100755 api/c/api
 create mode 100644 api/c/api.c
 create mode 100644 api/c/urlcode.c
 create mode 100644 api/php/api.php
 delete mode 100644 api/urlcode.c

diff --git a/_data/comments.json b/_data/comments.json
deleted file mode 100644
index 037f8c4..0000000
--- a/_data/comments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-	{
-		"author": "Anton Luka Šijanec",
-		"date": "2020-11-09 22:09:00",
-		"message": "### komentar\nTo je testiranje funkcije komentiranja. ![foo](bar) <script>alert(1);</script>",
-		"parent": "post|/blog/test/2020/11/06/druga-objava.html"
-	},
-	{
-		"author": "Anton Luka Šijanec",
-		"date": "2020-11-09 22:10:00",
-		"message": "drugi kometar",
-		"parent": "comment|Anton Luka Šijanec|2020-11-09 22:09:00"
-	},
-	{
-		"author": "Anton Luka Šijanec",
-		"date": "2020-11-10 11:28:00",
-		"message": "tretji kometar",
-		"parent": "comment|Anton Luka Šijanec|2020-11-09 22:09:00"
-	},
-	{
-		"author": "Anton Luka Šijanec",
-		"date": "2020-11-10 11:29:00",
-		"message": "četrti kometar",
-		"parent": "comment|Anton Luka Šijanec|2020-11-09 22:10:00"
-	}
-]
diff --git a/_data/comments.yml b/_data/comments.yml
new file mode 100644
index 0000000..749a3a9
--- /dev/null
+++ b/_data/comments.yml
@@ -0,0 +1,20 @@
+- author: "Anton Luka Šijanec"
+  date: "2020-11-09 22:09:00"
+  message: "### komentar\nTo je testiranje funkcije komentiranja. ![foo](bar) <script>alert(1);</script>"
+  parent: "post|/blog/test/2020/11/06/druga-objava.html"
+  nonce: "a"
+- author: "Anton Luka Šijanec"
+  date: "2020-11-09 22:10:00"
+  message: "drugi kometar"
+  parent: "comment|a"
+  nonce: "b"
+- author: "Anton Luka Šijanec"
+  date: "2020-11-10 11:28:00"
+  message: "tretji kometar"
+  parent: "comment|a"
+  nonce: "c"
+- author: "Anton Luka Šijanec"
+  date: "2020-11-10 11:29:00"
+  message: "četrti kometar"
+  parent: "comment|b"
+  nonce: "d"
diff --git a/_data/lang.yml b/_data/lang.yml
new file mode 100644
index 0000000..b077785
--- /dev/null
+++ b/_data/lang.yml
@@ -0,0 +1,4 @@
+comment:
+ taplaceholder: "Vpišite besedilo komentarja (markdown omogočen)."
+basic:
+ nepodpiraiframe: "Vaš brskalnik ne podpira iframe elementa, ki je potreben za vpogled v status oddaje komentarja."
diff --git a/_includes/commentreplyform.html b/_includes/commentreplyform.html
new file mode 100644
index 0000000..99ffaf3
--- /dev/null
+++ b/_includes/commentreplyform.html
@@ -0,0 +1,18 @@
+{% comment %}
+	argv: thisid,uid
+	return: html form
+	langstrings used: comment.taplaceholder, basic.nepodpiraiframe
+{% endcomment %}
+{% capture return %}
+	<form target=comstatus{{ argv[1] }} action=/api?m=commentreply method=POST class=commentform >
+		<input type=text name=vzdevek placeholder="Vzdevek pošiljatelja" />
+		<input type=submit name=submit value=Objavi! />
+		<textarea placeholder="{{ site.data.lang.comment.taplaceholder }}" name=message ></textarea>
+		{% comment	%}
+			assign thisid = "comment|" | append: comment.author | append: "|" | append: comment.date <!-- rajši imamo xss-safe nonce !!! thisid se generira prej -->
+		{% endcomment %}
+		<input type=hidden name=parent value="{{ argv[0] | replace: '"', "&quot;" }}" />
+		<input type=hidden name=is-submitter-human value=true />
+		<iframe id=comstatus{{ argv[1] }}>{{ site.data.lang.basic.nepodpiraiframe }}</iframe>
+	</form>
+{% endcapture %}
diff --git a/_includes/commentsthread.html b/_includes/commentsthread.html
index 84647f7..2e1119a 100644
--- a/_includes/commentsthread.html
+++ b/_includes/commentsthread.html
@@ -1,10 +1,7 @@
 {% comment %}
 	argv: id_of_object_whose_posts_you_want,__isinathread
-	return: nothing. outputs html directly.
+	return: next UID. outputs html directly.
 {% endcomment %}
-{% capture taplaceholder %}Vpišite besedilo komentarja (markdown omogočen).
-POMEMBNO: Zaradi tehničnih razlogov (veriga blokov) dokončen izbris komentarja (niti vzdevka avtorja) iz Interneta ni mogoč!{% endcapture %}
-{% capture nepodpiraiframe %}Vaš brskalnik ne podpira <pre>iframe</pre> elementa, ki je potreben za vpogled v status oddaje komentarja.{% endcapture %}
 {% capture editnotice %}
 Komentar lahko uredi samo tisti, ki ga je napisal. Komentar uredite v brskalniku, v katerem ste ga napisali. Bodisi piškotek bodisi IP naslov mora biti enak prejšnji oddaji komentarja. Če se objavo uredi še naslednjič, se to lahko stori iz katerega koli IP naslova in piškotka, ki se je uporabil pri predhodnih urejanjih.{% endcapture %}
 {% assign comments = site.data.comments | where: "parent", argv[0] %}
@@ -27,7 +24,8 @@ Komentar lahko uredi samo tisti, ki ga je napisal. Komentar uredite v brskalniku
 			V {{ return }} je	{{ comment.author || replace: "<", "&lt;" }} komentiral:
 		</small>
 		<p>
-			{{ comment.message | replace: "<", "&lt;" | replace: "!", "&#33;" | markdownify }}
+			{% assign safemsg = comment.message | replace: "<", "&lt;" | replace: "!", "&#33;" %}
+			{{ safemsg | markdownify }}
 		</p>
 		<small class=dimmedtext>
 			<a href="mailto:anton@sijanec.eu?subject=Prijava%20neprimernega%20komentarja%20na%20blogu.">
@@ -38,36 +36,25 @@ Komentar lahko uredi samo tisti, ki ga je napisal. Komentar uredite v brskalniku
 				<a>
 					odgovori</a>
 			</label>
-			<input type=checkbox id=checkbox{{ uid }} class=commentreplycheckbox >
-			<div hidden=hidden class=commentform>
-				<!--
-					<form target=comstatus{{ uid }} action=/api?m=commentreply type=POST>
-						<input type=text name=vzdevek placeholder="Vzdevek pošiljatelja" />
-						<input type=submit value=Objavi! />
-						<textarea placeholder="{{ taplaceholder }}" name=message ></textarea>
-						{% assign thisid = "comment|" | append: comment.author | append: "|" | append: comment.date %}
-						<input type=hidden name=parent value="{{ thisid | replace: '"', "&quot;" }}" />
-						<iframe id=comstatus{{ uid }}>{{ nepodpiraiframe }}</iframe>
-					</form>
-				-->
-				Objavljanje komentarjev še ni izdelano.
+			<input type=checkbox id=checkbox{{ uid }} class=showhide-checkbox >
+			<div class=showhide-hiddenelement>
+				{% assign thisid = "comment|" | append: comment.nonce %}
+				{% assign argv = thisid | append: "," | append: uid | split: "," %}
+				{% include commentreplyform.html %} {{ return }}
 			</div>
 			|
 			<label for=edit{{ uid }}>
 				<a>uredi</a>
 			</label>
-			<input type=checkbox id=edit{{ uid }} class=commentreplycheckbox >
-			<div class=commentform >
-				<!--
-					<form action=POST action=/api?m=commentedit target=editstatus{{ uid }} >
-						<input type=text name=vzdevek value="{{ comment.author | replace: '"', "&quot;" }}" />
-						<input type=submit value=Uredi! />
-						<textarea placeholder="{{ taplaceholder }}{{editnotice}}" name=message ></textarea>
-						<input type=hidden name=commentid value="{{ thisid | replace: '"', '&quot;' }}"/>
-						<iframe id=editstatus{{ uid }} >{{ nepodpiraiframe }}</iframe>
-					</form>
-				-->
-				Urejanje komentarjev še ni izdelano.
+			<input type=checkbox id=edit{{ uid }} class=showhide-checkbox >
+			<div class=showhide-hiddenelement >
+				<form class=commentform method=POST action=/api?m=commentedit target=editstatus{{ uid }} >
+					<input type=text name=vzdevek value="{{ comment.author | replace: '&', "&amp;" | replace: '"', "&quot;" }}" />
+					<input type=submit value=Uredi! />
+					<textarea placeholder="{{ taplaceholder }}{{ editnotice }}" name=message >{{ safemsg | replace: "&#33;", "!" }}</textarea>
+					<input type=hidden name=commentid value="{{ thisid | replace: '"', '&quot;' }}"/>
+					<iframe id=editstatus{{ uid }} >{{ nepodpiraiframe }}</iframe>
+				</form>
 			</div>
 		</small>
 		{% assign argv = "true" | split: "," %}
diff --git a/_includes/main.js b/_includes/main.js
new file mode 120000
index 0000000..9f673d3
--- /dev/null
+++ b/_includes/main.js
@@ -0,0 +1 @@
+../assets/js/main.js
\ No newline at end of file
diff --git a/_includes/main.scss b/_includes/main.scss
new file mode 120000
index 0000000..a47427a
--- /dev/null
+++ b/_includes/main.scss
@@ -0,0 +1 @@
+../_sass/main.scss
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index e85e731..8611085 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -5,7 +5,11 @@
 		<title>
 			{{ page.title }} :: {{ site.name }}
 		</title>
-		<link rel=stylesheet href=/assets/css/styles.css />
+		<!-- <link rel=stylesheet href=/assets/css/styles.css /> -->
+		{% capture mainscss %}
+			{% include main.scss %}
+		{% endcapture %}
+		<style>{{ mainscss | scssify }}</style>
 		<link rel=alternate hreflang=sl type=application/rss+xml href=/feed.xml />
 		<meta name=viewport content="width=device-width,initial-scale=1.0" />
 		<link rel="shortcut icon" type=image/x-icon href=/favicon.ico />
@@ -19,6 +23,7 @@
 		{% include navigation.html %}
 		{{ content }}
 		{% include footer.html %}
-		<script src=/assets/js/main.js ></script>
+		<!-- <script src=/assets/js/main.js ></script> -->
+		<script>{% include main.js %}</script>
 	</body>
 </html>
diff --git a/_layouts/post.html b/_layouts/post.html
index a2b42bd..8ef9181 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -54,12 +54,27 @@ layout: default
 {% assign postid = "post|" | append: page.url %}
 {% assign argv = argv | unshift: postid %} <!-- unshift doda na zač. arraya -->
 {% capture commentsthreadhtml %}
-	{% include commentsthread.html %} <!-- outputs html directly -->
+	{% include commentsthread.html %} <!-- outputs html directly and returns next uid / number of comments -->
 {% endcapture %}
+{% assign totalcomments = return %}
 <h3>
-	{{ return }}
-	{% assign argv = ",komentarjev,komentar,komentarja,komentarji" | prepend: return | split: "," %}
+	{{ totalcomments }}
+	{% assign argv = ",komentarjev,komentar,komentarja,komentarji" | prepend: totalcomments | split: "," %}
 	{% include slnum.html %}
 	{{ return }}
 </h3>
 {{ commentsthreadhtml }}
+<label for=checkbox{{ return }} >
+	<a>
+		napiši komentar na to objavo
+	</a>
+</label>
+<input type=checkbox class=showhide-checkbox id=checkbox{{ return }} />
+<div class=showhide-hiddenelement >
+	{% assign argv = "" | split: "," %}
+	{% assign postid = "post|" | append: page.url %}
+	{% assign argv = argv | unshift: totalcomments %}
+	{% assign argv = argv | unshift: postid %} <!-- unshift doda na za. arraya -->
+	{% include commentreplyform.html %}
+	{{ return }}
+</div>
diff --git a/_sass/main.scss b/_sass/main.scss
index 3f10bf7..b88f35d 100644
--- a/_sass/main.scss
+++ b/_sass/main.scss
@@ -26,6 +26,19 @@ table, th, td, tr {
 a {
 	text-decoration: underline;
 	cursor: pointer;
+	color: blue;
+}
+
+a:visited {
+	color: purple;
+}
+
+a:hover {
+	color: darkblue;
+}
+
+a:active {
+	color: lightblue;
 }
 
 /* comments begin */
@@ -48,31 +61,35 @@ a {
 		background-color: lightgrey;
 	}
 
-	.commentreplycheckbox {
+	.showhide-checkbox {
 		display: none;
 	}
 
-	.comment iframe, textarea {
+	.commentform iframe, .commentform textarea {
 		width: 90%;
 		margin-left: 5%;
 		height: 7em
 	}
 	
-	.comment iframe {
+	.commentform iframe {
 		height: 2em;
 	}
 
-	.comment input[type=text] {
+	.commentform input[type=text] {
 		margin-left: 5%;
 		width: 75%;
 	}
 
-	.commentform {
+	.showhide-hiddenelement {
 		display: none;
 	}
 
-	.commentreplycheckbox:checked + .commentform {
-		display: block;
+	.showhide-checkbox:checked + .showhide-hiddenelement {
+		display: block; /* such element is shown by default and hidden on click */
+	}
+
+	.showhide-checkbox:checked + .showhide-shownelement {
+		display: none; /* such element is hidden by default and shown on click */
 	}
 
 /* comments end */
diff --git a/api/Makefile b/api/Makefile
deleted file mode 100644
index 7b8ab7d..0000000
--- a/api/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-compile:
-	gcc api.c -Wall -lfcgi --pedantic -lpthread -o api
-prepare:
-	wget http://www.geekhideout.com/downloads/urlcode.c
-clean:
-	rm urlencode.c api
diff --git a/api/api b/api/api
deleted file mode 100755
index cd48526..0000000
Binary files a/api/api and /dev/null differ
diff --git a/api/api.c b/api/api.c
deleted file mode 100644
index e452617..0000000
--- a/api/api.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * threaded.c -- A simple multi-threaded FastCGI application.
- */
-
-#ifndef lint
-// static const char rcsid[] = "$Id: threaded.c,v 1.9 2001/11/20 03:23:21 robs Exp $"; // just popps up warnings
-#endif /* not lint */
-
-#include "fcgi_config.h"
-
-#include <pthread.h>
-#include <sys/types.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "fcgiapp.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "urlcode.c"
-#include <limits.h>
-#include <stdio.h>
-#define MALLOC_RETURNED_NULL fprintf(stderr, "%s()@" __FILE__ ":%d: malloc() returned NULL\n", __func__, __LINE__);
-
-
-#define THREAD_COUNT 20
-
-static int counts[THREAD_COUNT];
-
-struct assoc_s {
-	char * key;
-	char * value;
-}; // value je lahko NULL
-
-void free_assoc_s(struct assoc_s * s) {
-	if (s->key != NULL) {
-		free(s->key);
-		s->key = NULL;
-	}
-	if (s->value != NULL) {
-		free(s->value);
-		s->value = NULL;
-	}
-	free(s);
-	s = NULL;
-	return;
-}
-
-struct request_uri_s {
-	char * path;
-	struct assoc_s ** params; // to je "array". zadnji naj bo NULL.
-};
-
-void free_request_uri_s(struct request_uri_s * s) {
-	int unsigned i = 0;
-	while (s->params[i] != NULL) {
-		free_assoc_s(s->params[i]);
-		s->params[i++] = NULL;
-	}
-	free(s->path);
-	s->path = NULL;
-	free(s->params);
-	s->params = NULL;
-	free(s);
-	s = NULL;
-	return;
-}
-
-struct assoc_s ** parse_html_keyvalue(const char * t) {
-	struct assoc_s ** params = malloc(sizeof(void *));
-	if (params == NULL) {
-		MALLOC_RETURNED_NULL
-		return NULL;
-	}
-	unsigned int o = 0; // številka parametra od 0 vključno z 0
-	unsigned int n = 0; // 0 če smo v key, 1 če smo v value, 3 če je konec urija
-	unsigned int a = 0; // nakazuje pozicijo naslednjega znaka, ki ga bomo napisa.
-	params[0] = malloc(sizeof(struct assoc_s));
-	if (params[0] == NULL) {
-		MALLOC_RETURNED_NULL
-		return NULL;
-	}
-	for (unsigned int e = 0; n != 3 && e <= UINT_MAX; e++) {
-		switch (t[e]) {
-			case '\0':
-				params = realloc(params, sizeof(struct assoc_s)*(o+1));
-				if (params == NULL) {
-					MALLOC_RETURNED_NULL
-					return NULL;
-				} // zadnji mora biti null
-				params[o+1] = NULL;
-				n = 3;
-				break;
-			case '=':
-				if (n == 0) { // ni treba mallocat, realloca se pred vsakim writom bajta
-					n = 1;
-					a = 0;
-				} else { // this is some undocumented behaviour, adding = to param value
-					params[o]->value = realloc(params[o]->value, a+1);
-					if (params[o]->value == NULL) {
-						MALLOC_RETURNED_NULL
-						return NULL;
-					}
-					params[o]->value[a++] = '=';
-				}
-				break;
-			case '&': // tu je treba mallocat, ker assoc_s še ne obstaja za naslednji
-				n = 0;
-				a = 0;
-				o++;
-				params = realloc(params, sizeof(struct assoc_s)*(o+1));
-				if (params == NULL) {
-					MALLOC_RETURNED_NULL
-					return NULL;
-				}
-				params[o] = malloc(sizeof(struct assoc_s)); // value kasneje
-				if (params[o] == NULL) {
-					MALLOC_RETURNED_NULL
-					return NULL;
-				}
-				break;
-			default:
-				if (n == 0) {
-					params[o]->key = realloc(params[o]->key, a+1);
-					if (params[o]->key == NULL) {
-						MALLOC_RETURNED_NULL
-						return NULL;
-					}
-					params[o]->key[a++] = t[e];
-				} else {
-					params[o]->value = realloc(params[o]->value, a+1);
-					if (params[o]->value == NULL) {
-						MALLOC_RETURNED_NULL
-						return NULL;
-					}
-					params[o]->value[a++] = t[e];
-				}
-				break;
-		}
-	}
-	return params;
-}
-
-struct request_uri_s * parse_request_uri(char * uri) { // returns NULL on fail!
-	struct request_uri_s * parsed = malloc(sizeof(struct request_uri_s));
-	if (parsed == NULL) { // and returns pointer to ONE request_uri_s on success^
-		MALLOC_RETURNED_NULL
-		return NULL;
-	}
-	char * t = strchr(uri, '?'); // remember to free /\ !
-	if (t != NULL)
-		t[0] = '\0'; // uri vedno vseeno pride ven nespremenjen/popravljen
-	parsed->path = malloc(sizeof(char)*strlen(uri)+1); //znak po path je itak NULL
-	if (parsed->path == NULL) { // malloc returna NULL, fucking panic!
-		if (t != NULL) // popravimo še \0 nazaj na ?
-			t[0] = '?';
-		MALLOC_RETURNED_NULL
-		return NULL;
-	}
-	strncpy(parsed->path, uri, strlen(uri)+1); // torej zadnji znak patha bo NULL
-	parsed->params = NULL; // če slučajno ni query_stringa in kmalu returnamo
-	if (t == NULL) // ni query stringa zato je path parse dovoljšen
-		return parsed; // parsed.params je NULL, to pred uporabo PREVERIMO!
-	t[0] = '?'; // ker smo prej zaradi strlen in strncpy dali na NULL, sedaj spre.
-	t++; // da ne začnemo z vprašajem ampak z prvim znakom
-	parsed->params = parse_html_keyvalue(t);
-	return parsed;
-}
-
-static void *doit(void *a) {
-	intptr_t rc, i, thread_id = (intptr_t)a;
-	pid_t pid = getpid();
-	FCGX_Request request;
-	char *server_name;
-	char * uri_to_parse;
-	struct request_uri_s * parseduri;
-
-	FCGX_InitRequest(&request, 0, 0);
-
-	for (;;) {
-		static pthread_mutex_t accept_mutex = PTHREAD_MUTEX_INITIALIZER;
-		static pthread_mutex_t counts_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-		/* Some platforms require accept() serialization, some don't.. */
-		pthread_mutex_lock(&accept_mutex);
-		rc = FCGX_Accept_r(&request);
-		pthread_mutex_unlock(&accept_mutex);
-
-		if (rc < 0)
-			break;	
-
-		server_name = FCGX_GetParam("SERVER_NAME", request.envp);
-		uri_to_parse = FCGX_GetParam("REQUEST_URI", request.envp);
-		parseduri = parse_request_uri(uri_to_parse);
-		if (strchr(parseduri->path, 'S') != NULL) {
-			exit(0);
-		}
-		if (parseduri == NULL) {
-			FCGX_FPrintF(request.out, "Status: 500 Zaledna napaka\r\n"
-				"Content-Type: text/plain; charset=utf-8\r\n\r\n"
-				"zgodila se je napaka na strežniku med procesiranjem URIja.\r\n");
-			free_request_uri_s(parseduri);
-			goto doit_finish;
-		}
-		FCGX_FPrintF(request.out,
-				"Status: 200 V redu\r\n"
-				"Content-type: text/html; charset=utf-8\r\n"
-				"\r\n"
-				"<title>FastCGI Pozdravljen svet! (večnitenje v C, knjižnica fcgiapp)</title>"
-				"<h1>FastCGI Pozdravljen svet! (večnitenje v C, knjižnica fcgiapp)</h1>"
-				"Nit %d, Proces %ld<p>"
-				"Števci zahtev za %d niti na strežniku <i>%s</i><p><code>",
-				thread_id, pid,
-				THREAD_COUNT, server_name ? server_name : "?");
-		free_request_uri_s(parseduri);
-		pthread_mutex_lock(&counts_mutex);
-		++counts[thread_id];
-		for (i = 0; i < THREAD_COUNT; i++)
-			FCGX_FPrintF(request.out, "%5d " , counts[i]);
-		pthread_mutex_unlock(&counts_mutex);
-
-doit_finish:
-		FCGX_Finish_r(&request);
-	}
-
-	return NULL;
-}
-
-int main(void) {
-	intptr_t i;
-	pthread_t id[THREAD_COUNT];
-
-	FCGX_Init();
-
-	for (i = 1; i < THREAD_COUNT; i++)
-		pthread_create(&id[i], NULL, doit, (void*)i);
-
-	doit(0); // trenutno nit uporabimo tudi kot handler, zakaj pa ne (:
-
-	return 0;
-}
diff --git a/api/c/Makefile b/api/c/Makefile
new file mode 100644
index 0000000..5f4f70a
--- /dev/null
+++ b/api/c/Makefile
@@ -0,0 +1,7 @@
+compile:
+	gcc api.c -Wall -lfcgi --pedantic -lpthread -o api
+prepare:
+	wget http://www.geekhideout.com/downloads/urlcode.c
+clean:
+	rm urlencode.c api
+
diff --git a/api/c/api b/api/c/api
new file mode 100755
index 0000000..cd48526
Binary files /dev/null and b/api/c/api differ
diff --git a/api/c/api.c b/api/c/api.c
new file mode 100644
index 0000000..e452617
--- /dev/null
+++ b/api/c/api.c
@@ -0,0 +1,244 @@
+/*
+ * threaded.c -- A simple multi-threaded FastCGI application.
+ */
+
+#ifndef lint
+// static const char rcsid[] = "$Id: threaded.c,v 1.9 2001/11/20 03:23:21 robs Exp $"; // just popps up warnings
+#endif /* not lint */
+
+#include "fcgi_config.h"
+
+#include <pthread.h>
+#include <sys/types.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "fcgiapp.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "urlcode.c"
+#include <limits.h>
+#include <stdio.h>
+#define MALLOC_RETURNED_NULL fprintf(stderr, "%s()@" __FILE__ ":%d: malloc() returned NULL\n", __func__, __LINE__);
+
+
+#define THREAD_COUNT 20
+
+static int counts[THREAD_COUNT];
+
+struct assoc_s {
+	char * key;
+	char * value;
+}; // value je lahko NULL
+
+void free_assoc_s(struct assoc_s * s) {
+	if (s->key != NULL) {
+		free(s->key);
+		s->key = NULL;
+	}
+	if (s->value != NULL) {
+		free(s->value);
+		s->value = NULL;
+	}
+	free(s);
+	s = NULL;
+	return;
+}
+
+struct request_uri_s {
+	char * path;
+	struct assoc_s ** params; // to je "array". zadnji naj bo NULL.
+};
+
+void free_request_uri_s(struct request_uri_s * s) {
+	int unsigned i = 0;
+	while (s->params[i] != NULL) {
+		free_assoc_s(s->params[i]);
+		s->params[i++] = NULL;
+	}
+	free(s->path);
+	s->path = NULL;
+	free(s->params);
+	s->params = NULL;
+	free(s);
+	s = NULL;
+	return;
+}
+
+struct assoc_s ** parse_html_keyvalue(const char * t) {
+	struct assoc_s ** params = malloc(sizeof(void *));
+	if (params == NULL) {
+		MALLOC_RETURNED_NULL
+		return NULL;
+	}
+	unsigned int o = 0; // številka parametra od 0 vključno z 0
+	unsigned int n = 0; // 0 če smo v key, 1 če smo v value, 3 če je konec urija
+	unsigned int a = 0; // nakazuje pozicijo naslednjega znaka, ki ga bomo napisa.
+	params[0] = malloc(sizeof(struct assoc_s));
+	if (params[0] == NULL) {
+		MALLOC_RETURNED_NULL
+		return NULL;
+	}
+	for (unsigned int e = 0; n != 3 && e <= UINT_MAX; e++) {
+		switch (t[e]) {
+			case '\0':
+				params = realloc(params, sizeof(struct assoc_s)*(o+1));
+				if (params == NULL) {
+					MALLOC_RETURNED_NULL
+					return NULL;
+				} // zadnji mora biti null
+				params[o+1] = NULL;
+				n = 3;
+				break;
+			case '=':
+				if (n == 0) { // ni treba mallocat, realloca se pred vsakim writom bajta
+					n = 1;
+					a = 0;
+				} else { // this is some undocumented behaviour, adding = to param value
+					params[o]->value = realloc(params[o]->value, a+1);
+					if (params[o]->value == NULL) {
+						MALLOC_RETURNED_NULL
+						return NULL;
+					}
+					params[o]->value[a++] = '=';
+				}
+				break;
+			case '&': // tu je treba mallocat, ker assoc_s še ne obstaja za naslednji
+				n = 0;
+				a = 0;
+				o++;
+				params = realloc(params, sizeof(struct assoc_s)*(o+1));
+				if (params == NULL) {
+					MALLOC_RETURNED_NULL
+					return NULL;
+				}
+				params[o] = malloc(sizeof(struct assoc_s)); // value kasneje
+				if (params[o] == NULL) {
+					MALLOC_RETURNED_NULL
+					return NULL;
+				}
+				break;
+			default:
+				if (n == 0) {
+					params[o]->key = realloc(params[o]->key, a+1);
+					if (params[o]->key == NULL) {
+						MALLOC_RETURNED_NULL
+						return NULL;
+					}
+					params[o]->key[a++] = t[e];
+				} else {
+					params[o]->value = realloc(params[o]->value, a+1);
+					if (params[o]->value == NULL) {
+						MALLOC_RETURNED_NULL
+						return NULL;
+					}
+					params[o]->value[a++] = t[e];
+				}
+				break;
+		}
+	}
+	return params;
+}
+
+struct request_uri_s * parse_request_uri(char * uri) { // returns NULL on fail!
+	struct request_uri_s * parsed = malloc(sizeof(struct request_uri_s));
+	if (parsed == NULL) { // and returns pointer to ONE request_uri_s on success^
+		MALLOC_RETURNED_NULL
+		return NULL;
+	}
+	char * t = strchr(uri, '?'); // remember to free /\ !
+	if (t != NULL)
+		t[0] = '\0'; // uri vedno vseeno pride ven nespremenjen/popravljen
+	parsed->path = malloc(sizeof(char)*strlen(uri)+1); //znak po path je itak NULL
+	if (parsed->path == NULL) { // malloc returna NULL, fucking panic!
+		if (t != NULL) // popravimo še \0 nazaj na ?
+			t[0] = '?';
+		MALLOC_RETURNED_NULL
+		return NULL;
+	}
+	strncpy(parsed->path, uri, strlen(uri)+1); // torej zadnji znak patha bo NULL
+	parsed->params = NULL; // če slučajno ni query_stringa in kmalu returnamo
+	if (t == NULL) // ni query stringa zato je path parse dovoljšen
+		return parsed; // parsed.params je NULL, to pred uporabo PREVERIMO!
+	t[0] = '?'; // ker smo prej zaradi strlen in strncpy dali na NULL, sedaj spre.
+	t++; // da ne začnemo z vprašajem ampak z prvim znakom
+	parsed->params = parse_html_keyvalue(t);
+	return parsed;
+}
+
+static void *doit(void *a) {
+	intptr_t rc, i, thread_id = (intptr_t)a;
+	pid_t pid = getpid();
+	FCGX_Request request;
+	char *server_name;
+	char * uri_to_parse;
+	struct request_uri_s * parseduri;
+
+	FCGX_InitRequest(&request, 0, 0);
+
+	for (;;) {
+		static pthread_mutex_t accept_mutex = PTHREAD_MUTEX_INITIALIZER;
+		static pthread_mutex_t counts_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+		/* Some platforms require accept() serialization, some don't.. */
+		pthread_mutex_lock(&accept_mutex);
+		rc = FCGX_Accept_r(&request);
+		pthread_mutex_unlock(&accept_mutex);
+
+		if (rc < 0)
+			break;	
+
+		server_name = FCGX_GetParam("SERVER_NAME", request.envp);
+		uri_to_parse = FCGX_GetParam("REQUEST_URI", request.envp);
+		parseduri = parse_request_uri(uri_to_parse);
+		if (strchr(parseduri->path, 'S') != NULL) {
+			exit(0);
+		}
+		if (parseduri == NULL) {
+			FCGX_FPrintF(request.out, "Status: 500 Zaledna napaka\r\n"
+				"Content-Type: text/plain; charset=utf-8\r\n\r\n"
+				"zgodila se je napaka na strežniku med procesiranjem URIja.\r\n");
+			free_request_uri_s(parseduri);
+			goto doit_finish;
+		}
+		FCGX_FPrintF(request.out,
+				"Status: 200 V redu\r\n"
+				"Content-type: text/html; charset=utf-8\r\n"
+				"\r\n"
+				"<title>FastCGI Pozdravljen svet! (večnitenje v C, knjižnica fcgiapp)</title>"
+				"<h1>FastCGI Pozdravljen svet! (večnitenje v C, knjižnica fcgiapp)</h1>"
+				"Nit %d, Proces %ld<p>"
+				"Števci zahtev za %d niti na strežniku <i>%s</i><p><code>",
+				thread_id, pid,
+				THREAD_COUNT, server_name ? server_name : "?");
+		free_request_uri_s(parseduri);
+		pthread_mutex_lock(&counts_mutex);
+		++counts[thread_id];
+		for (i = 0; i < THREAD_COUNT; i++)
+			FCGX_FPrintF(request.out, "%5d " , counts[i]);
+		pthread_mutex_unlock(&counts_mutex);
+
+doit_finish:
+		FCGX_Finish_r(&request);
+	}
+
+	return NULL;
+}
+
+int main(void) {
+	intptr_t i;
+	pthread_t id[THREAD_COUNT];
+
+	FCGX_Init();
+
+	for (i = 1; i < THREAD_COUNT; i++)
+		pthread_create(&id[i], NULL, doit, (void*)i);
+
+	doit(0); // trenutno nit uporabimo tudi kot handler, zakaj pa ne (:
+
+	return 0;
+}
diff --git a/api/c/urlcode.c b/api/c/urlcode.c
new file mode 100644
index 0000000..ecf34e1
--- /dev/null
+++ b/api/c/urlcode.c
@@ -0,0 +1,48 @@
+/* Converts a hex character to its integer value */
+char from_hex(char ch) {
+  return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10;
+}
+
+/* Converts an integer value to its hex character*/
+char to_hex(char code) {
+  static char hex[] = "0123456789abcdef";
+  return hex[code & 15];
+}
+
+/* Returns a url-encoded version of str */
+/* IMPORTANT: be sure to free() the returned string after use */
+char *url_encode(char *str) {
+  char *pstr = str, *buf = malloc(strlen(str) * 3 + 1), *pbuf = buf;
+  while (*pstr) {
+    if (isalnum(*pstr) || *pstr == '-' || *pstr == '_' || *pstr == '.' || *pstr == '~') 
+      *pbuf++ = *pstr;
+    else if (*pstr == ' ') 
+      *pbuf++ = '+';
+    else 
+      *pbuf++ = '%', *pbuf++ = to_hex(*pstr >> 4), *pbuf++ = to_hex(*pstr & 15);
+    pstr++;
+  }
+  *pbuf = '\0';
+  return buf;
+}
+
+/* Returns a url-decoded version of str */
+/* IMPORTANT: be sure to free() the returned string after use */
+char *url_decode(char *str) {
+  char *pstr = str, *buf = malloc(strlen(str) + 1), *pbuf = buf;
+  while (*pstr) {
+    if (*pstr == '%') {
+      if (pstr[1] && pstr[2]) {
+        *pbuf++ = from_hex(pstr[1]) << 4 | from_hex(pstr[2]);
+        pstr += 2;
+      }
+    } else if (*pstr == '+') { 
+      *pbuf++ = ' ';
+    } else {
+      *pbuf++ = *pstr;
+    }
+    pstr++;
+  }
+  *pbuf = '\0';
+  return buf;
+}
diff --git a/api/php/api.php b/api/php/api.php
new file mode 100644
index 0000000..5c5ec82
--- /dev/null
+++ b/api/php/api.php
@@ -0,0 +1,60 @@
+<?php
+	// pisal bom v PHPju, ker se mi res ne da zajebavat s Cjem
+	switch ($_REQUEST["m"]) {
+		case "commentreply":
+			if (empty($_REQUEST['vzdevek'])) {
+				$vzdevek = "anonymous";
+			} else {
+				$vzdevek = $_REQUEST['vzdevek'];
+			}
+			if (empty($_REQUESTT['message'])) {
+				http_response_code(400);
+				header("Content-Type: text/plain");
+				exit("400: Napaka. Niste vnesli sporočila.");
+			}
+			if ($_REQUEST['submit'] != 'Objavi!') {
+				http_response_code(201); // he's obviously automating queries
+				header("Content-Type: text/plain");
+				exit("201: Uspelo! Komentar objavljen."); // lies and deception
+			}
+			if (empty($_REQUEST['parent'])) {
+				http_response_code(400);
+				header("Content-Type: text/plain");
+				exit("400: Napaka. V zahtevi ni določeno, na kaj odgovarjate.");
+			}
+			if (empty($_REQUEST["is-submitter-human"] != "true")) {
+				http_response_code(201); // he's obviously automating queries
+				header("Content-Type: text/plain");
+				exit("201: Uspelo! Komentar objavljen."); // lies and deception
+			}
+			$sporocilo = $_REQUEST['message'];
+			$parent = $_REQUEST['parent'];
+			if (strlen($sporocilo) > 1024 || strlen($parent) > 7+1+256+1+19 || strlen($vzdevek) > 256) {
+				http_response_code(400);
+				header("Content-Type: text/plain");
+				exit("400: Napaka. Preveč besedila - vzdevek je lahko dolg 256, sporočilo pa 1024 znakov.");
+			}
+			$datum = date("Y-m-d H:i:s");
+			$cm = yaml_emit(array(
+				"author" => $vzdevek,
+				"date" => $datum,
+				"message" => $sporocilo,
+				"parent" => $parent,
+				"ip" => $_SERVER['REMOTE_ADDR'],
+				"addedby" => "PHP API 0.0.0",
+				"nonce" => hash('sha256', $vzdevek."|".$datum."|".random_bytes(69))
+			));
+			file_put_contents($commentsfile, $cm, FILE_APPEND); // pri append ni locka
+			break;
+		case "commentedit":
+			http_response_code(400);
+			header("Content-Type: text/plain");
+			exit("400: Napaka. Urejanje komentarjev še ni izdelano. Napišite elektronsko sporočilo na anton+blog@sijanec.eu.");
+			break;
+		default:
+			http_response_code(400);
+			header("Content-Type: text/plain");
+			exit("400: Napaka. Izbrali ste neobstoječo API metodo.");
+			break;
+	}
+?>
diff --git a/api/urlcode.c b/api/urlcode.c
deleted file mode 100644
index ecf34e1..0000000
--- a/api/urlcode.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Converts a hex character to its integer value */
-char from_hex(char ch) {
-  return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10;
-}
-
-/* Converts an integer value to its hex character*/
-char to_hex(char code) {
-  static char hex[] = "0123456789abcdef";
-  return hex[code & 15];
-}
-
-/* Returns a url-encoded version of str */
-/* IMPORTANT: be sure to free() the returned string after use */
-char *url_encode(char *str) {
-  char *pstr = str, *buf = malloc(strlen(str) * 3 + 1), *pbuf = buf;
-  while (*pstr) {
-    if (isalnum(*pstr) || *pstr == '-' || *pstr == '_' || *pstr == '.' || *pstr == '~') 
-      *pbuf++ = *pstr;
-    else if (*pstr == ' ') 
-      *pbuf++ = '+';
-    else 
-      *pbuf++ = '%', *pbuf++ = to_hex(*pstr >> 4), *pbuf++ = to_hex(*pstr & 15);
-    pstr++;
-  }
-  *pbuf = '\0';
-  return buf;
-}
-
-/* Returns a url-decoded version of str */
-/* IMPORTANT: be sure to free() the returned string after use */
-char *url_decode(char *str) {
-  char *pstr = str, *buf = malloc(strlen(str) + 1), *pbuf = buf;
-  while (*pstr) {
-    if (*pstr == '%') {
-      if (pstr[1] && pstr[2]) {
-        *pbuf++ = from_hex(pstr[1]) << 4 | from_hex(pstr[2]);
-        pstr += 2;
-      }
-    } else if (*pstr == '+') { 
-      *pbuf++ = ' ';
-    } else {
-      *pbuf++ = *pstr;
-    }
-    pstr++;
-  }
-  *pbuf = '\0';
-  return buf;
-}
diff --git a/assets/js/main.js b/assets/js/main.js
index 72d0b66..9a7bb1b 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -1,7 +1,8 @@
 if (document.location.protocol != "https:"
 	&& (
 		window.location.hostname.endsWith("sijanec.eu")
-		|| window.location.hostname.endsWith("šijanec.eu"))) {
+		|| window.location.hostname.endsWith("šijanec.eu")
+		|| window.location.hostname.endsWith("xn--ijanec-9jb.eu"))) {
 	fetch("/?preveri-https").then((response)=>{
 		document.getElementById("ponudi-https").hidden = false;
 	}).catch((error)=>{
-- 
cgit v1.2.3