From d3ce716e9a554392b267794fad8502dc98845d95 Mon Sep 17 00:00:00 2001
From: "eapl.mx" <eapl@gemugami.com>
Date: Sat, 14 Dec 2024 14:34:54 -0600
Subject: [PATCH] fix(webmentions): call to undefined function
 getMentionsFromTwt()

---
 partials/webmentions_send.php |  9 +++---
 views/new_twt.php             | 59 +++++++++++++++--------------------
 2 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/partials/webmentions_send.php b/partials/webmentions_send.php
index e09588f..ba8fa3b 100644
--- a/partials/webmentions_send.php
+++ b/partials/webmentions_send.php
@@ -1,7 +1,8 @@
 <?php
+require_once "libs/twtxt.php";
 
 // Send webmentions (TODO: move to it own file?)
-$new_mentions = getMentionsFromTwt($twt); 
+$new_mentions = getMentionsFromTwt($twt);
 
 foreach ($new_mentions as $mention) {
 	//print_r(getMentionsFromTwt($twt));
@@ -9,17 +10,17 @@ foreach ($new_mentions as $mention) {
 
 	// Detect webmention endpoint define in twtxt.txt as `# webmention = URL`
 	$targets_webmention_endpoint = getSingleParameter("webmention", file_get_contents($mention["url"]));
-	
+
 	if (!isset($targets_webmention_endpoint)) {
 		echo "<p class='notice'>No endpoint found in: ".$mention["url"]."</p>";
 
 	} else {
 
-		$new_twt_url = $public_txt_url."#:~:text=".$datetime; 
+		$new_twt_url = $public_txt_url."#:~:text=".$datetime;
 		//$target_url = $mention["url"];
 		$payload = "source=".$new_twt_url."&target=".$mention["url"];
 		//echo $payload;
-		
+
 		$curl = curl_init();
 		curl_setopt($curl, CURLOPT_URL, $targets_webmention_endpoint);
 		curl_setopt($curl, CURLOPT_POST, TRUE);
diff --git a/views/new_twt.php b/views/new_twt.php
index a9562d2..f90980b 100644
--- a/views/new_twt.php
+++ b/views/new_twt.php
@@ -2,7 +2,6 @@
 // TODO: Give a warning if the file is not found
 $config = parse_ini_file('private/config.ini');
 
-
 if ($config['debug_mode']) {
 	ini_set('display_errors', 1);
 	ini_set('display_startup_errors', 1);
@@ -13,19 +12,13 @@ $txt_file_path = $config['txt_file_path'];
 $public_txt_url = $config['public_txt_url'];
 $timezone = $config['timezone'];
 
-require_once('libs/session.php');
-
-// if (!has_valid_session()) {
-// 	header('Location: /login.php');
-// 	exit();
-// }
+require_once 'libs/session.php';
 
 if (!isset($_SESSION['password'])) {
 	header('Location: ./login');
 	exit();
 }
 
-
 if (isset($_POST['submit'])) {
 	$new_post = filter_input(INPUT_POST, 'new_post');
 	$new_post = trim($new_post);
@@ -53,7 +46,7 @@ if (isset($_POST['submit'])) {
 
 	/*if (!date_default_timezone_set($timezone)) {
 		date_default_timezone_set('UTC');
-	}*/ // Turned this off, so now the server need to have set the right timezone, seem to work for CET 
+	}*/ // Turned this off, so now the server need to have set the right timezone, seem to work for CET
 
 	//$datetime = gmdate('Y-m-d\TH:i:s\Z', $date->format('U'));
 	//$twt = $datetime . "\t$new_post\n";
@@ -72,16 +65,16 @@ if (isset($_POST['submit'])) {
 		// Fall back if the marker is not found.
 		$contents .= $twt;
 	}*/
-	
+
 	// Append twt at the end of file
 	$contents .= $twt;
-	
+
 // 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
 
-	$file_write_result = file_put_contents($txt_file_path, $contents); 
-// TODO: replace with file_put_contents($logfile, $log, FILE_APPEND)  -- https://www.w3schools.com/php/func_filesystem_file_put_contents.asp
+	$file_write_result = file_put_contents($txt_file_path, $contents);
+	// TODO: replace with file_put_contents($logfile, $log, FILE_APPEND)  -- https://www.w3schools.com/php/func_filesystem_file_put_contents.asp
 
 	// Send webmentions
 	include_once 'partials/webmentions_send.php';
@@ -91,33 +84,31 @@ if (isset($_POST['submit'])) {
 	//exit;
 
 } else {
-	require_once("partials/base.php");
+	require_once "partials/base.php";
 	$title = "New post - ".$title;
 	include_once 'partials/header.php';
 
+	if (!isset($textareaValue)) {
+		$textareaValue = '';
+	}
 
-if (!isset($textareaValue)) {
-	$textareaValue = '';
-}
+	if (isset($_GET['hash'])) {
+		$hash = $_GET['hash'];
+		$textareaValue = "(#$hash) ";
 
-if (isset($_GET['hash'])) {
-	$hash = $_GET['hash'];
-	$textareaValue = "(#$hash) ";
+		// COPY from conv.php
+		// TODO: make into a partial or global function
+		// Get the hashes (both post and replies) as $hash from the router and return an inverted list
+		$twt_op = array_filter($twts, function($twt) use ($hash) {
+			return $twt->hash === $hash; //|| $twt->replyToHash === $hash;
+		});
+		//$twts = array_reverse($twts, true);
 
-	// COPY from conv.php
-	// TODO: make into a partial or global function
-	// Get the hashes (both post and replies) as $hash from the router and return an inverted list	
-    $twt_op = array_filter($twts, function($twt) use ($hash) {
-        return $twt->hash === $hash; //|| $twt->replyToHash === $hash;
-    });
-    //$twts = array_reverse($twts, true);    
-
-    //$textareaValue .= print_r($twts);
-    //$textareaValue .= $twts["nick"];
-
-	include_once 'partials/timeline.php';
-}
+		//$textareaValue .= print_r($twts);
+		//$textareaValue .= $twts["nick"];
 
+		include_once 'partials/timeline.php';
+	}
 ?>
 
 <article id="new_twt">
@@ -140,7 +131,7 @@ if (isset($_GET['hash'])) {
 		    element: "toolbar",
 		    editor: tinyMDE,
 		    commands: ['bold', 'italic', 'strikethrough', 'ul', 'ol',  'blockquote', 'code', '|', 'insertLink', 'insertImage'],
-		    
+
 		  });
 		</script>