mirror of
https://github.com/sorenpeter/timeline.git
synced 2025-12-15 10:57:01 +00:00
fix(webmentions): call to undefined function getMentionsFromTwt()
This commit is contained in:
parent
97a97122bb
commit
d3ce716e9a
2 changed files with 30 additions and 38 deletions
|
|
@ -1,7 +1,8 @@
|
||||||
<?php
|
<?php
|
||||||
|
require_once "libs/twtxt.php";
|
||||||
|
|
||||||
// Send webmentions (TODO: move to it own file?)
|
// Send webmentions (TODO: move to it own file?)
|
||||||
$new_mentions = getMentionsFromTwt($twt);
|
$new_mentions = getMentionsFromTwt($twt);
|
||||||
|
|
||||||
foreach ($new_mentions as $mention) {
|
foreach ($new_mentions as $mention) {
|
||||||
//print_r(getMentionsFromTwt($twt));
|
//print_r(getMentionsFromTwt($twt));
|
||||||
|
|
@ -9,17 +10,17 @@ foreach ($new_mentions as $mention) {
|
||||||
|
|
||||||
// Detect webmention endpoint define in twtxt.txt as `# webmention = URL`
|
// Detect webmention endpoint define in twtxt.txt as `# webmention = URL`
|
||||||
$targets_webmention_endpoint = getSingleParameter("webmention", file_get_contents($mention["url"]));
|
$targets_webmention_endpoint = getSingleParameter("webmention", file_get_contents($mention["url"]));
|
||||||
|
|
||||||
if (!isset($targets_webmention_endpoint)) {
|
if (!isset($targets_webmention_endpoint)) {
|
||||||
echo "<p class='notice'>No endpoint found in: ".$mention["url"]."</p>";
|
echo "<p class='notice'>No endpoint found in: ".$mention["url"]."</p>";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
$new_twt_url = $public_txt_url."#:~:text=".$datetime;
|
$new_twt_url = $public_txt_url."#:~:text=".$datetime;
|
||||||
//$target_url = $mention["url"];
|
//$target_url = $mention["url"];
|
||||||
$payload = "source=".$new_twt_url."&target=".$mention["url"];
|
$payload = "source=".$new_twt_url."&target=".$mention["url"];
|
||||||
//echo $payload;
|
//echo $payload;
|
||||||
|
|
||||||
$curl = curl_init();
|
$curl = curl_init();
|
||||||
curl_setopt($curl, CURLOPT_URL, $targets_webmention_endpoint);
|
curl_setopt($curl, CURLOPT_URL, $targets_webmention_endpoint);
|
||||||
curl_setopt($curl, CURLOPT_POST, TRUE);
|
curl_setopt($curl, CURLOPT_POST, TRUE);
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
// TODO: Give a warning if the file is not found
|
// TODO: Give a warning if the file is not found
|
||||||
$config = parse_ini_file('private/config.ini');
|
$config = parse_ini_file('private/config.ini');
|
||||||
|
|
||||||
|
|
||||||
if ($config['debug_mode']) {
|
if ($config['debug_mode']) {
|
||||||
ini_set('display_errors', 1);
|
ini_set('display_errors', 1);
|
||||||
ini_set('display_startup_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'];
|
$public_txt_url = $config['public_txt_url'];
|
||||||
$timezone = $config['timezone'];
|
$timezone = $config['timezone'];
|
||||||
|
|
||||||
require_once('libs/session.php');
|
require_once 'libs/session.php';
|
||||||
|
|
||||||
// if (!has_valid_session()) {
|
|
||||||
// header('Location: /login.php');
|
|
||||||
// exit();
|
|
||||||
// }
|
|
||||||
|
|
||||||
if (!isset($_SESSION['password'])) {
|
if (!isset($_SESSION['password'])) {
|
||||||
header('Location: ./login');
|
header('Location: ./login');
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (isset($_POST['submit'])) {
|
if (isset($_POST['submit'])) {
|
||||||
$new_post = filter_input(INPUT_POST, 'new_post');
|
$new_post = filter_input(INPUT_POST, 'new_post');
|
||||||
$new_post = trim($new_post);
|
$new_post = trim($new_post);
|
||||||
|
|
@ -53,7 +46,7 @@ if (isset($_POST['submit'])) {
|
||||||
|
|
||||||
/*if (!date_default_timezone_set($timezone)) {
|
/*if (!date_default_timezone_set($timezone)) {
|
||||||
date_default_timezone_set('UTC');
|
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'));
|
//$datetime = gmdate('Y-m-d\TH:i:s\Z', $date->format('U'));
|
||||||
//$twt = $datetime . "\t$new_post\n";
|
//$twt = $datetime . "\t$new_post\n";
|
||||||
|
|
@ -72,16 +65,16 @@ if (isset($_POST['submit'])) {
|
||||||
// Fall back if the marker is not found.
|
// Fall back if the marker is not found.
|
||||||
$contents .= $twt;
|
$contents .= $twt;
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
// Append twt at the end of file
|
// Append twt at the end of file
|
||||||
$contents .= $twt;
|
$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
|
// 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
|
// 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);
|
$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
|
// TODO: replace with file_put_contents($logfile, $log, FILE_APPEND) -- https://www.w3schools.com/php/func_filesystem_file_put_contents.asp
|
||||||
|
|
||||||
// Send webmentions
|
// Send webmentions
|
||||||
include_once 'partials/webmentions_send.php';
|
include_once 'partials/webmentions_send.php';
|
||||||
|
|
@ -91,33 +84,31 @@ if (isset($_POST['submit'])) {
|
||||||
//exit;
|
//exit;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
require_once("partials/base.php");
|
require_once "partials/base.php";
|
||||||
$title = "New post - ".$title;
|
$title = "New post - ".$title;
|
||||||
include_once 'partials/header.php';
|
include_once 'partials/header.php';
|
||||||
|
|
||||||
|
if (!isset($textareaValue)) {
|
||||||
|
$textareaValue = '';
|
||||||
|
}
|
||||||
|
|
||||||
if (!isset($textareaValue)) {
|
if (isset($_GET['hash'])) {
|
||||||
$textareaValue = '';
|
$hash = $_GET['hash'];
|
||||||
}
|
$textareaValue = "(#$hash) ";
|
||||||
|
|
||||||
if (isset($_GET['hash'])) {
|
// COPY from conv.php
|
||||||
$hash = $_GET['hash'];
|
// TODO: make into a partial or global function
|
||||||
$textareaValue = "(#$hash) ";
|
// 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
|
//$textareaValue .= print_r($twts);
|
||||||
// TODO: make into a partial or global function
|
//$textareaValue .= $twts["nick"];
|
||||||
// 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';
|
|
||||||
}
|
|
||||||
|
|
||||||
|
include_once 'partials/timeline.php';
|
||||||
|
}
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<article id="new_twt">
|
<article id="new_twt">
|
||||||
|
|
@ -140,7 +131,7 @@ if (isset($_GET['hash'])) {
|
||||||
element: "toolbar",
|
element: "toolbar",
|
||||||
editor: tinyMDE,
|
editor: tinyMDE,
|
||||||
commands: ['bold', 'italic', 'strikethrough', 'ul', 'ol', 'blockquote', 'code', '|', 'insertLink', 'insertImage'],
|
commands: ['bold', 'italic', 'strikethrough', 'ul', 'ol', 'blockquote', 'code', '|', 'insertLink', 'insertImage'],
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue