From af0a80c524c1274d284c2e362cdb5962f1c9c600 Mon Sep 17 00:00:00 2001
From: "eapl.mx" <eapl@gemugami.com>
Date: Sun, 22 Dec 2024 12:51:12 -0600
Subject: [PATCH 1/3] fix(timezone): fixes wrong timezone in replies

- Moves loading timezone from config file to 'load_timezone.php'
- Applies code style suggestions from IDE
---
 libs/load_timezone.php      |  6 ++++++
 partials/base.php           | 32 +++++++++-----------------------
 private/config_template.ini | 13 +++++++++----
 views/new_twt.php           | 17 ++++++-----------
 4 files changed, 30 insertions(+), 38 deletions(-)
 create mode 100644 libs/load_timezone.php

diff --git a/libs/load_timezone.php b/libs/load_timezone.php
new file mode 100644
index 0000000..5971066
--- /dev/null
+++ b/libs/load_timezone.php
@@ -0,0 +1,6 @@
+<?php
+$config = parse_ini_file('private/config.ini');
+
+if (!date_default_timezone_set($config['timezone'])) {
+	die('Not a valid timezone - Check your config.ini file');
+}
\ No newline at end of file
diff --git a/partials/base.php b/partials/base.php
index 5e5fa93..6021cff 100644
--- a/partials/base.php
+++ b/partials/base.php
@@ -17,31 +17,21 @@ declare (strict_types = 1);
 #
 # hash(string) =
 
-require_once('libs/session.php');
-require_once('libs/twtxt.php');
-require_once('libs/hash.php');
-require_once('libs/Parsedown.php');
-
-const TWTS_PER_PAGE = 50;
+require_once 'libs/session.php';
+require_once 'libs/twtxt.php';
+require_once 'libs/hash.php';
+require_once 'libs/Parsedown.php';
+require_once 'libs/load_timezone.php';
 
 // TODO: Move twts per page to config.ini
 // Add a fallback if the number is invalid (it should be between 1 and 999)
+const TWTS_PER_PAGE = 50;
 $config = parse_ini_file('private/config.ini');
 
-// TODO: Take the title from the config.ini
-$title = "Timeline"; // Fallback, should be set in all views
-
-if (isset($config['site_title'])) {
-	$title = $config['site_title'];
-}
+$title = $config['site_title'] ?? "Timeline";
 
 // HACKED by sp@darch.dk
-if(!empty($_GET['list'])) {
-	$url = $baseURL.$_GET['list'];
-}
-else {
-	$url = $config['public_txt_url'];
-}
+$url = !empty($_GET['list']) ? $baseURL.$_GET['list'] : $config['public_txt_url'];
 
 /*
 if(isset($_GET['selectList'])){
@@ -57,11 +47,7 @@ if(isset($_GET['selectList'])){
 }
 */
 
-date_default_timezone_set('UTC');
-
-if (!empty($_GET['url'])) {
-	$url = $_GET['url'];
-}
+$url = !empty($_GET['url']) ? filter_var($_GET['url'], FILTER_SANITIZE_URL) : $url;
 
 if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) {
 	die('Not a valid URL');
diff --git a/private/config_template.ini b/private/config_template.ini
index a49498c..7473625 100644
--- a/private/config_template.ini
+++ b/private/config_template.ini
@@ -28,9 +28,14 @@ public_txt_url = "https://example.com/timeline/twtxt.txt"
 public_avatar = "https://example.com/timeline/avatar.png"
 public_nick = "Timeline"
 
+; Timezone for twts in your twtxt.txt
+; If you use "UTC", the time will be shown as "2024-12-13T21:39:32Z"
+; Otherwise, a time offset will be show as in "2024-12-13T16:51:20-05:00"
+
 ; Check available timezones here:
 ; https://www.php.net/manual/en/timezones.php
-timezone = "Europe/Copenhagen"
+timezone = "UTC"
+;timezone = "Europe/Copenhagen"
 
 twts_per_page = 50
 
@@ -46,9 +51,9 @@ public_webmentions = "https://example.com/timeline/mentions.txt"
 totp_digits = 10
 totp_secret = "1234567890"
 
+; Simple password for unnamed user
+password = "123"
+
 ; It's recommended that your site is hosted on HTTPS
 ; In case it's in HTTP (not secure), set this to false
 secure_cookies = true
-
-; Simple password for unnamed user
-password = ""
\ No newline at end of file
diff --git a/views/new_twt.php b/views/new_twt.php
index f90980b..7228418 100644
--- a/views/new_twt.php
+++ b/views/new_twt.php
@@ -13,6 +13,7 @@ $public_txt_url = $config['public_txt_url'];
 $timezone = $config['timezone'];
 
 require_once 'libs/session.php';
+require_once 'libs/load_timezone.php';
 
 if (!isset($_SESSION['password'])) {
 	header('Location: ./login');
@@ -28,11 +29,7 @@ if (isset($_POST['submit'])) {
 	// Remove Carriage return if needed
 	$new_post = str_replace("\r", '', $new_post);
 
-	// TODO: If twt is emply, show an error
-	/*
-	if ($new_post) {
-	}
-	*/
+	// TODO: If twt is empty, show an error
 
 	// Check if we have a point to insert the next Twt
 	define('NEW_TWT_MARKER', "#~~~#\n");
@@ -52,7 +49,7 @@ if (isset($_POST['submit'])) {
 	//$twt = $datetime . "\t$new_post\n";
 	//$twt = date('c') . "\t$new_post\n";
 	$datetime = date('Y-m-d\TH:i:sp'); // abracting to be used for webmentions
-	$twt = "\n" . $datetime . "\t" .$new_post; // NB: only works with PHP 8
+	$twt = "\n$datetime\t$new_post"; // NB: only works with PHP 8
 
 	// TODO: Delete?
 	/*if (strpos($contents, NEW_TWT_MARKER) !== false) {
@@ -69,7 +66,7 @@ if (isset($_POST['submit'])) {
 	// Append twt at the end of file
 	$contents .= $twt;
 
-// TODO: Add error handling if write to the file fails
+	// TODO: Add error handling if write to the file fails
 	// For example due to permissions problems
 	// https://www.w3docs.com/snippets/php/how-can-i-handle-the-warning-of-file-get-contents-function-in-php.html
 
@@ -85,12 +82,10 @@ if (isset($_POST['submit'])) {
 
 } else {
 	require_once "partials/base.php";
-	$title = "New post - ".$title;
+	$title = "New post - $title";
 	include_once 'partials/header.php';
 
-	if (!isset($textareaValue)) {
-		$textareaValue = '';
-	}
+	$textareaValue = $textareaValue ?? '';
 
 	if (isset($_GET['hash'])) {
 		$hash = $_GET['hash'];

From 27315d83b010bd08682354cee6c127d78634c150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?s=C3=B8renpeter?= <sp@darch.dk>
Date: Sun, 12 Jan 2025 13:39:16 +0100
Subject: [PATCH 2/3] Update README.md

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 49eebbc..3b35c83 100644
--- a/README.md
+++ b/README.md
@@ -15,13 +15,16 @@ It then gives you an interface for posting words, links (and images too, soon),
 
 For the social features timeline are using the [twtxt](https://twtxt.readthedocs.io)  format and most of the twtxt Extensions developed in the context of Yarn.social](https://yarn.social/).
 
-timeline also support its own flavor  of WebMentions, so it is possible  to be notified about `@mentions` from feeds you are not currently/yet following. You can also search for others feeds using WebFinger, if they got that set up on their server , like it's the case for most yarn.social pods.
+timeline also support its own flavor  of WebMentions, so it is possible  to be notified about `@mentions` from feeds you are not currently/yet following.
 You can also search for others feeds using [WebFinger](https://webfinger.net/), if they got that set up on their servser, like it's the case for most yarn.social pods.
 
 My visions for timeline is to bring back the fun and quirkiness  of bygone sites such as Geocities of the 1990s and Myspace of the 2000s, that enables creating a personalized  place for you to express yourself online and also being able to follow others who inspire you.
 
 At the same time providing a good looking basic design with the help of [Simple.css](https://simplecss.org), which allows you to customize  the look and feel. Even to the level where timeline aligns with the design of your excsing webpage, like I did on: [darch.dk/timeline](https://darch.dk/timeline).
 
+See my talk about twtxt and timeline at Piksel Festival 2024: https://www.darch.dk/twtxtalk-piksel
+[![](https://i.ytimg.com/vi_webp/1RVFxNPzRDg/maxresdefault.webp)](https://www.youtube.com/watch?v=1RVFxNPzRDg)
+
 ![](media/screenshot.png)
 _Conversation view with replies / Profile view / Gallery View_
 

From 63356010871a4e645dfeb5c004046b65caccc87f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?s=C3=B8renpeter?= <sp@darch.dk>
Date: Sun, 12 Jan 2025 13:40:45 +0100
Subject: [PATCH 3/3] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 3b35c83..d0104b9 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@ My visions for timeline is to bring back the fun and quirkiness  of bygone sites
 At the same time providing a good looking basic design with the help of [Simple.css](https://simplecss.org), which allows you to customize  the look and feel. Even to the level where timeline aligns with the design of your excsing webpage, like I did on: [darch.dk/timeline](https://darch.dk/timeline).
 
 See my talk about twtxt and timeline at Piksel Festival 2024: https://www.darch.dk/twtxtalk-piksel
-[![](https://i.ytimg.com/vi_webp/1RVFxNPzRDg/maxresdefault.webp)](https://www.youtube.com/watch?v=1RVFxNPzRDg)
 
 ![](media/screenshot.png)
 _Conversation view with replies / Profile view / Gallery View_