diff --git a/Rocksolid_Light/rocksolid/post.php b/Rocksolid_Light/rocksolid/post.php index 930067c..cf6b82b 100644 --- a/Rocksolid_Light/rocksolid/post.php +++ b/Rocksolid_Light/rocksolid/post.php @@ -306,13 +306,32 @@ if ($type == "reply") { } else { $bodyzeile = $head->from; } - - // For Synchronet use + // For Synchronet use (deprecated) $fromname = $bodyzeile; - // On Fri, 5 Jul 2024 15:54:40 -0500, nobody@nonospam.org wrote: - $bodyzeile = "On " . date("D, j M Y G:i:s (T),", $head->date) . " " . $bodyzeile . $text_post["wrote_suffix"] . "\n\n"; - //$bodyzeile = $text_post["wrote_prefix"] . $bodyzeile . $text_post["wrote_suffix"] . "\n\n"; + // Set quote reply format (On date somebody wrote:) + if(!isset($OVERRIDES['quote_head'])) { + $OVERRIDES['quote_head'] = 'date_name'; + } + switch($OVERRIDES['quote_head']) { + case 'date_name': + $bodyzeile = "On " . date("D, j M Y G:i:s (T),", $head->date) . " " . $bodyzeile . $text_post["wrote_suffix"] . "\n\n"; + break; + case 'msgid_name': + $bodyzeile = "In " . $head->id . ", " . $bodyzeile . $text_post["wrote_suffix"] . "\n\n"; + break; + case 'date_msgid_name': + $bodyzeile = "On " . date("D, j M Y G:i:s (T),", $head->date) . " in " . $head->id . ", " . $bodyzeile . $text_post["wrote_suffix"] . "\n\n"; + break; + case 'name': + $bodyzeile = $text_post["wrote_prefix"] . $bodyzeile . $text_post["wrote_suffix"] . "\n\n"; + break; + default: + $bodyzeile = "On " . date("D, j M Y G:i:s (T),", $head->date) . " " . $bodyzeile . $text_post["wrote_suffix"] . "\n\n"; + break; + + } + for ($i = 0; $i <= count($body) - 1; $i ++) { if ((isset($cutsignature)) && ($cutsignature == true) && ($body[$i] == '-- ')) { break; diff --git a/Rocksolid_Light/rslight/overrides.inc.php.dist b/Rocksolid_Light/rslight/overrides.inc.php.dist index c0dda1b..b624ee5 100644 --- a/Rocksolid_Light/rslight/overrides.inc.php.dist +++ b/Rocksolid_Light/rslight/overrides.inc.php.dist @@ -52,7 +52,14 @@ return [ // Set to false to NOT add '>' to quotes for blank lines // Default is true 'quote_blank_lines' => true, - + + // How to format 'who wrote' quoting in reply: + // 'On 4, Jan 2024, John Doe wrote:' + // Options are: + // 'date_name', 'msgid_name', 'date_msgid_name', or 'name' + // Default is 'date_name' + 'quote_head' => 'date_name', + // Disable immediate post insertion (wait for remote server) // for a SECTION. Comma separated list ex: 'rocksolid,section3,section5', 'insert_disable' => 'sectionONE, sectionTWO',