xoy
/
ctdo.de
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

[Projektstruktur und Code aufräumen / optimieren]

This commit is contained in:
xoy 2023-06-17 22:41:31 +02:00
parent 5fd21990db
commit 1bb33f20c1
18 changed files with 234 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
index.php
View File

@ -1,19 +1,20 @@
<?php
require __DIR__ . '/vendor/autoload.php';
require __DIR__ . '/php/util.php';
use Twig\Environment;
use Twig\Loader\FilesystemLoader;
use League\CommonMark\CommonMarkConverter;
require __DIR__ . '/php/util.php';
require __DIR__ . '/php/events.php';
require __DIR__ . '/php/posts.php';
$converter = new CommonMarkConverter([
'html_input' => 'strip',
'allow_unsafe_links' => false,
]);
$util = new Util();
$pageloader = new FilesystemLoader(__DIR__ . '/pages');
$templateloader = new FilesystemLoader(__DIR__ . '/templates');
@ -23,10 +24,7 @@ $twig_templates = new Environment($templateloader);
$title = '';
$content = '';
$topictreff = $twig_templates->render('topictreff.html.twig');
$nextevents = $twig_templates->render('nextevents.html.twig');
$raumstatus_b = $util->raumstatus();
$raumstatus_b = get_web_json('https://status.ctdo.de/api/simple/v2')["state"];
$raumstatus = '<b>unbekannt</b>';
$pages = array('index', 'about', 'treff', 'blog', 'events', 'kontakt', 'support', 'verein');
@ -36,123 +34,99 @@ $active_page = '';
if(gettype($raumstatus_b) == "boolean") {
if($raumstatus_b)
$raumstatus = $util->html_link('https://status.ctdo.de/', 'green-text', '<b>offen</b>', TRUE);
$raumstatus = html_link('https://status.ctdo.de/', 'green-text', '<b>offen</b>', TRUE);
else
$raumstatus = $util->html_link('https://status.ctdo.de/', 'red-text', '<b>geschlossen</b>', TRUE);
$raumstatus = html_link('https://status.ctdo.de/', 'red-text', '<b>geschlossen</b>', TRUE);
}
$topic = $util->get_next_topic();
$topic = get_next_topic();
$treff = $util->get_next_treff();
$treff = get_next_treff();
$repaircafe = $util->get_next_repaircafe();
$repaircafelink = '<a href="/?page=events&id=repaircafe">RepairCafe</a>';
switch ($repaircafe->days) {
case 0:
$repaircafe_output = '<p class="topic">Das nächste '.$repaircafelink.' findet heute statt!</p>';
break;
case 1:
$repaircafe_output = '<p class="topic">Das nächste '.$repaircafelink.' findet morgen statt!</p>';
break;
default:
$repaircafe_output = '<p class="topic">Das nächste '.$repaircafelink.' findet in '.$repaircafe->days.' Tagen ['.$repaircafe->date.'] statt.</p>';
break;
}
$repaircafe = get_next_repaircafe();
$brunch = $util->get_next_brunch();
$brunchlink = '<a href="/?page=events&id=brunch">ChaosBrunch</a>';
switch ($brunch->days) {
case 0:
$brunch_output = '<p class="topic">Das nächste '.$brunchlink.' findet heute statt!</p>';
break;
case 1:
$brunch_output = '<p class="topic">Das nächste '.$brunchlink.' findet morgen statt!</p>';
break;
default:
$brunch_output = '<p class="topic">Das nächste '.$brunchlink.' findet in '.$brunch->days.' Tagen ['.$brunch->date.'] statt.</p>';
break;
}
$brunch = get_next_brunch();
$css = ['main'];
if(isset($_GET['page'])) {
$page = $_GET['page'];
$active_page = $util->str_mass_replace(array('adresse', 'irc', 'mail'), array('kontakt', 'kontakt', 'kontakt'), $page);
$active_page = str_mass_replace(array('adresse', 'irc', 'mail'), array('kontakt', 'kontakt', 'kontakt'), $page);
$title = $page_names[array_search($active_page, $pages)];
switch ($page) {
case 'index':
$content = $twig_pages->render('index.html.twig', [ 'topic' => $topic_output, 'posts' => $util->generate_post_list(4) ]);
$content = $twig_pages->render('index.twig', [ 'topic' => $topic_output, 'posts' => generate_post_list(4) ]);
$css[] = 'home';
$css[] = 'events';
break;
case 'about':
$content = $twig_pages->render('about.html.twig');
$content = $twig_pages->render('about.twig');
$css[] = 'about';
break;
case 'treff':
$content = $twig_pages->render('treff.html.twig');
$content = $twig_pages->render('treff.twig');
break;
case 'blog':
if(!isset($_GET['id'])) {
$content = $twig_pages->render('blog.html.twig', [ 'posts' => $util->generate_post_list() ]);
$content = $twig_pages->render('blog.twig', [ 'posts' => generate_post_list() ]);
$css[] = 'events';
} else {
$content = $converter->convert($util->get_post_content($_GET['id']));
$content = $converter->convert(get_post_content($_GET['id']));
$css[] = 'event';
}
break;
case 'events':
if(!isset($_GET['id'])) {
$content = $twig_pages->render('events.html.twig', [ 'topic' => $topic, 'treff' => $treff, 'repaircafe' => $repaircafe, 'brunch' => $brunch, 'events' => $util->generate_event_list() ]);
$content = $twig_pages->render('events.twig', [ 'topic' => $topic, 'treff' => $treff, 'repaircafe' => $repaircafe, 'brunch' => $brunch, 'events' => generate_event_list() ]);
$css[] = 'events';
} else {
$content = $util->str_mass_replace(array('{{ topicdatum }}', 'Chaostreff Dortmund e.V.', '{{ treffdatum }}', '{{ repaircafedatum }}', '{{ brunchdatum }}'), array($util->get_next_topic()->date, $util->html_link('/?page=treff', '', 'Chaostreff Dortmund e.V.', FALSE), $util->get_next_treff()->date, $util->get_next_repaircafe()->date, $util->get_next_brunch()->date), $converter->convert($util->get_event_content($_GET['id'])));
$content = str_mass_replace(array('{{ topicdatum }}', 'Chaostreff Dortmund e.V.', '{{ treffdatum }}', '{{ repaircafedatum }}', '{{ brunchdatum }}'), array(get_next_topic()->date, html_link('/?page=treff', '', 'Chaostreff Dortmund e.V.', FALSE), get_next_treff()->date, get_next_repaircafe()->date, get_next_brunch()->date), $converter->convert(get_event_content($_GET['id'])));
$css[] = 'event';
}
break;
case 'kontakt':
$content = $twig_pages->render('kontakt.html.twig');
$content = $twig_pages->render('kontakt.twig');
$css[] = 'kontakt';
break;
case 'adresse':
$content = $twig_pages->render('kontakt/adresse.html.twig');
$content = $twig_pages->render('kontakt/adresse.twig');
break;
case 'irc':
$content = $twig_pages->render('kontakt/irc.html.twig');
$content = $twig_pages->render('kontakt/irc.twig');
break;
case 'mail':
$content = $twig_pages->render('kontakt/mail.html.twig');
$content = $twig_pages->render('kontakt/mail.twig');
break;
case 'tel':
$content = $twig_pages->render('kontakt/tel.html.twig');
$content = $twig_pages->render('kontakt/tel.twig');
break;
case 'support':
$content = $twig_pages->render('support.html.twig');
$content = $twig_pages->render('support.twig');
break;
case 'verein':
$content = $twig_pages->render('verein.html.twig');
$content = $twig_pages->render('verein.twig');
break;
case 'impressum':
$title = 'impressum';
$content = $twig_pages->render('impressum.html.twig');
$content = $twig_pages->render('impressum.twig');
break;
case 'datenschutz':
$title = 'datenschutz';
$content = $twig_pages->render('datenschutz.html.twig');
$content = $twig_pages->render('datenschutz.twig');
break;
default:
$content = $twig_pages->render('404.html.twig', ['page' => $_GET['page']]);
$content = $twig_pages->render('404.twig', ['page' => $_GET['page']]);
break;
}
} else {
$active_page = 'index';
$title = $active_page;
$content = $twig_pages->render('index.html.twig', [ 'posts' => $util->generate_post_list(4) ]);
$content = $twig_pages->render('index.twig', [ 'posts' => generate_post_list(4) ]);
$css[] = 'home';
$css[] = 'events';
}
$nav = $util->generate_nav($active_page, $pages, $page_names);
$nav = generate_nav($active_page, $pages, $page_names);
echo $twig_templates->render('html5struct.html.twig', ['title' => $title, 'css' => $css, 'nav' => $nav, 'raumstatus' => $raumstatus, 'main' => $content]);
echo $twig_templates->render('default.twig', ['title' => $title, 'css' => $css, 'nav' => $nav, 'raumstatus' => $raumstatus, 'main' => $content]);
?>

0
pages/404.html.twig → pages/404.twig
View File

0
pages/about.html.twig → pages/about.twig
View File

0
pages/blog.html.twig → pages/blog.twig
View File

0
pages/datenschutz.html.twig → pages/datenschutz.twig
View File

0
pages/events.html.twig → pages/events.twig
View File

0
pages/impressum.html.twig → pages/impressum.twig
View File

0
pages/index.html.twig → pages/index.twig
View File

0
pages/kontakt.html.twig → pages/kontakt.twig
View File

0
pages/support.html.twig → pages/support.twig
View File

0
pages/treff.html.twig → pages/treff.twig
View File

0
pages/verein.html.twig → pages/verein.twig
View File

129
php/events.php Normal file
View File

@ -0,0 +1,129 @@
<?php
function scan_for_events() {
$s = scandir(__DIR__ . '/../events/', SCANDIR_SORT_DESCENDING);
$output = array();
foreach ($s as $f) {
if(count(str_split($f)) >= 4 && $f != 'treff.md' && $f != 'topictreff.md' && $f != 'repaircafe.md' && $f != 'brunch.md')
$output[] = $f;
}
return $output;
}
function generate_event_list($limit = -1) {
$events = scan_for_events();
$output = "";
if ($limit == -1) {
foreach ($events as $event) {
$lines = file(__DIR__ . '/../events/' . $event);
$title = $lines[0];
$desc = $lines[1];
$date = $lines[2];
$veranstaltungsort = $lines[4];
$output .= '<div class="eventblock"><a href="?page=events&id='.str_replace('.md', '', $event).'"><h3 class="a">'.$veranstaltungsort.'</h3><h3 class="b">'.$date.'</h3><h2>'.$title.'</h2><p>'.$desc.'</p></a></div>';
}
} else {
if($limit > count($events))
$limit = count($events);
for ($i = 0; $i < $limit; $i++) {
$lines = file(__DIR__ . '/../events/' . $event);
$title = $lines[0];
$desc = $lines[1];
$date = $lines[2];
$veranstaltungsort = $lines[4];
$output .= '<div class="eventblock"><a href="?page=events&id='.str_replace('.md', '', $event).'"><h3 class="a">'.$veranstaltungsort.'</h3><h3 class="b">'.$date.'</h3><h2>'.$title.'</h2><p>'.$desc.'</p></a></div>';
}
}
return $output;
}
function get_event_content($id) {
$lines = file(__DIR__ . '/../events/' . str_replace('.', '', $id) . '.md');
$output = "";
$output .= '## Datum/Zeit'."\n\n";
$output .= $lines[2]."\n".$lines[3]."\n\n## Veranstaltungsort\n\n".$lines[4]."\n\n";
for ($i = 6; $i < count($lines); $i++)
$output .= $lines[$i] . "\n";
return $output;
}
function get_next_topic() {
$output = new stdClass();
$currentDate = new DateTime();
$next_topic = clone $currentDate;
$next_topic->modify('second Tuesday of this month +1 week');
while ($next_topic->format('N') !== '2') {
$next_topic->add(new DateInterval('P1D'));
}
$output->days = $currentDate->diff($next_topic)->days+1;
$output->date = $next_topic->format('Y-m-d');
return $output;
}
function get_next_treff() {
$output = new stdClass();
// Get current date and time
$now = new DateTime();
// Find the next Friday
$now->modify('next Friday');
// Calculate the number of days until the next Friday
$diff = $now->diff(new DateTime());
$days_until = $diff->format('%a');
$output->days = $days_until+1;
$output->date = $now->format('Y-m-d');
// Return an array with the count and date of the next Friday
return $output;
}
function get_next_repaircafe() {
$output = new stdClass();
$today = new DateTime();
$lastDayOfMonth = clone $today;
$lastDayOfMonth->modify('last day of this month');
$lastThursday = clone $lastDayOfMonth;
while ($lastThursday->format('w') != 4) { // Thursday is represented by 4 (0-6, where 0 is Sunday)
$lastThursday->modify('-1 day');
}
$daysUntilLastThursday = $today->diff($lastThursday)->days;
$output->days = $daysUntilLastThursday;
$output->date = $lastThursday->format('Y-m-d');
return $output;
}
function get_next_brunch() {
$now = new DateTime();
if ($now->format('w') == 0) {
$nextSunday = clone $now;
} else {
$nextSunday = new DateTime('next Sunday');
}
$weekNumber = (int)$nextSunday->format('W');
$isEvenWeek = ($weekNumber % 2) == 0;
if ($isEvenWeek) {
$nextSunday->modify('+1 week');
}
$differenz = $nextSunday->diff($now);
$days = $differenz->days;
$output = new stdClass();
$output->date = $nextSunday->format('Y-m-d');
$output->days = $days+1;
return $output;
}
?>

48
php/posts.php Normal file
View File

@ -0,0 +1,48 @@
<?php
function scan_for_posts() {
$s = scandir(__DIR__ . '/../posts/', SCANDIR_SORT_DESCENDING);
$output = array();
foreach ($s as $f) {
if(count(str_split($f)) >= 4)
$output[] = $f;
}
return $output;
}
function generate_post_list($limit = -1) {
$events = scan_for_posts();
$output = "";
if ($limit == -1) {
foreach ($events as $event) {
$lines = file(__DIR__ . '/../posts/' . $event);
$title = $lines[0];
$desc = $lines[1];
$date = $lines[2];
$signatur = $lines[3];
$output .= '<div class="eventblock"><h3>'.$signatur.'<br>'.$date.'</h3><a href="?page=blog&id='.str_replace('.md', '', $event).'"><h2>'.$title.'</h2><p>'.$desc.'</p></a></div>';
}
} else {
if($limit > count($events))
$limit = count($events);
for ($i = 0; $i < $limit; $i++) {
$lines = file(__DIR__ . '/../posts/' . $events[$i]);
$title = $lines[0];
$desc = $lines[1];
$date = $lines[2];
$signatur = $lines[3];
$output .= '<div class="eventblock"><h3 class="a">'.$signatur.'</h3><h3 class="b">'.$date.'</h3><a href="?page=blog&id='.str_replace('.md', '', $events[$i]).'"><h2>'.$title.'</h2><p>'.$desc.'</p></a></div>';
}
}
return $output;
}
function get_post_content($id) {
$lines = file(__DIR__ . '/../posts/' . str_replace('.', '', $id) . '.md');
$output = "";
for ($i = 5; $i < count($lines); $i++)
$output .= $lines[$i] . "\n";
return $output;
}
?>

229
php/util.php
View File

@ -1,217 +1,38 @@
<?php
class Util {
function css_link($src) {
return '<link rel="stylesheet" href="'.$src.'">';
}
function css_link($src) {
return '<link rel="stylesheet" href="'.$src.'">';
}
function generate_nav($active_page, $pages, $page_names) {
$output = array();
foreach ($pages as $key => $page) {
if ($page == $active_page)
$output[] = ['page' => $page, 'name' => $page_names[$key], 'active' => TRUE];
else
$output[] = ['page' => $page, 'name' => $page_names[$key], 'active' => FALSE];
}
return $output;
}
function html_link($href, $class, $innerHTML, $blank) {
if($blank)
return '<a href="'.$href.'" class="'.$class.'" target="_blank">'.$innerHTML.'</a>';
function generate_nav($active_page, $pages, $page_names) {
$output = array();
foreach ($pages as $key => $page) {
if ($page == $active_page)
$output[] = ['page' => $page, 'name' => $page_names[$key], 'active' => TRUE];
else
return '<a href="'.$href.'" class="'.$class.'">'.$innerHTML.'</a>';
$output[] = ['page' => $page, 'name' => $page_names[$key], 'active' => FALSE];
}
function raumstatus() {
$url = 'https://status.ctdo.de/api/simple/v2';
$data = json_decode(file_get_contents($url), true);
return $data['state'];
}
return $output;
}
function str_mass_replace($searchs, $replacers, $string) {
foreach ($searchs as $key => $search) {
$string = str_replace($search, $replacers[$key], $string);
}
return $string;
}
function html_link($href, $class, $innerHTML, $blank) {
if($blank)
return '<a href="'.$href.'" class="'.$class.'" target="_blank">'.$innerHTML.'</a>';
else
return '<a href="'.$href.'" class="'.$class.'">'.$innerHTML.'</a>';
}
//Posts
function scan_for_posts() {
$s = scandir(__DIR__ . '/../posts/', SCANDIR_SORT_DESCENDING);
$output = array();
foreach ($s as $f) {
if(count(str_split($f)) >= 4)
$output[] = $f;
}
return $output;
}
function get_web_json($url) {
$data = json_decode(file_get_contents($url), true);
return $data;
}
function generate_post_list($limit = -1) {
$events = $this->scan_for_posts();
$output = "";
if ($limit == -1) {
foreach ($events as $event) {
$lines = file(__DIR__ . '/../posts/' . $event);
$title = $lines[0];
$desc = $lines[1];
$date = $lines[2];
$signatur = $lines[3];
$output .= '<div class="eventblock"><h3>'.$signatur.'<br>'.$date.'</h3><a href="?page=blog&id='.str_replace('.md', '', $event).'"><h2>'.$title.'</h2><p>'.$desc.'</p></a></div>';
}
} else {
if($limit > count($events))
$limit = count($events);
for ($i = 0; $i < $limit; $i++) {
$lines = file(__DIR__ . '/../posts/' . $events[$i]);
$title = $lines[0];
$desc = $lines[1];
$date = $lines[2];
$signatur = $lines[3];
$output .= '<div class="eventblock"><h3 class="a">'.$signatur.'</h3><h3 class="b">'.$date.'</h3><a href="?page=blog&id='.str_replace('.md', '', $events[$i]).'"><h2>'.$title.'</h2><p>'.$desc.'</p></a></div>';
}
}
return $output;
function str_mass_replace($searchs, $replacers, $string) {
foreach ($searchs as $key => $search) {
$string = str_replace($search, $replacers[$key], $string);
}
function get_post_content($id) {
$lines = file(__DIR__ . '/../posts/' . str_replace('.', '', $id) . '.md');
$output = "";
for ($i = 5; $i < count($lines); $i++)
$output .= $lines[$i] . "\n";
return $output;
}
//Posts end
//Events
function scan_for_events() {
$s = scandir(__DIR__ . '/../events/', SCANDIR_SORT_DESCENDING);
$output = array();
foreach ($s as $f) {
if(count(str_split($f)) >= 4 && $f != 'treff.md' && $f != 'topictreff.md' && $f != 'repaircafe.md' && $f != 'brunch.md')
$output[] = $f;
}
return $output;
}
function generate_event_list($limit = -1) {
$events = $this->scan_for_events();
$output = "";
if ($limit == -1) {
foreach ($events as $event) {
$lines = file(__DIR__ . '/../events/' . $event);
$title = $lines[0];
$desc = $lines[1];
$date = $lines[2];
$veranstaltungsort = $lines[4];
$output .= '<div class="eventblock"><a href="?page=events&id='.str_replace('.md', '', $event).'"><h3 class="a">'.$veranstaltungsort.'</h3><h3 class="b">'.$date.'</h3><h2>'.$title.'</h2><p>'.$desc.'</p></a></div>';
}
} else {
if($limit > count($events))
$limit = count($events);
for ($i = 0; $i < $limit; $i++) {
$lines = file(__DIR__ . '/../events/' . $event);
$title = $lines[0];
$desc = $lines[1];
$date = $lines[2];
$veranstaltungsort = $lines[4];
$output .= '<div class="eventblock"><a href="?page=events&id='.str_replace('.md', '', $event).'"><h3 class="a">'.$veranstaltungsort.'</h3><h3 class="b">'.$date.'</h3><h2>'.$title.'</h2><p>'.$desc.'</p></a></div>';
}
}
return $output;
}
function get_event_content($id) {
$lines = file(__DIR__ . '/../events/' . str_replace('.', '', $id) . '.md');
$output = "";
$output .= '## Datum/Zeit'."\n\n";
$output .= $lines[2]."\n".$lines[3]."\n\n## Veranstaltungsort\n\n".$lines[4]."\n\n";
for ($i = 6; $i < count($lines); $i++)
$output .= $lines[$i] . "\n";
return $output;
}
//Events end
function get_next_topic() {
$output = new stdClass();
$currentDate = new DateTime();
$next_topic = clone $currentDate;
$next_topic->modify('second Tuesday of this month +1 week');
while ($next_topic->format('N') !== '2') {
$next_topic->add(new DateInterval('P1D'));
}
$output->days = $currentDate->diff($next_topic)->days+1;
$output->date = $next_topic->format('Y-m-d');
return $output;
}
function get_next_treff() {
$output = new stdClass();
// Get current date and time
$now = new DateTime();
// Find the next Friday
$now->modify('next Friday');
// Calculate the number of days until the next Friday
$diff = $now->diff(new DateTime());
$days_until = $diff->format('%a');
$output->days = $days_until+1;
$output->date = $now->format('Y-m-d');
// Return an array with the count and date of the next Friday
return $output;
}
function get_next_repaircafe() {
$output = new stdClass();
$today = new DateTime();
$lastDayOfMonth = clone $today;
$lastDayOfMonth->modify('last day of this month');
$lastThursday = clone $lastDayOfMonth;
while ($lastThursday->format('w') != 4) { // Thursday is represented by 4 (0-6, where 0 is Sunday)
$lastThursday->modify('-1 day');
}
$daysUntilLastThursday = $today->diff($lastThursday)->days;
$output->days = $daysUntilLastThursday;
$output->date = $lastThursday->format('Y-m-d');
return $output;
}
function get_next_brunch() {
$now = new DateTime();
if ($now->format('w') == 0) {
$nextSunday = clone $now;
} else {
$nextSunday = new DateTime('next Sunday');
}
$weekNumber = (int)$nextSunday->format('W');
$isEvenWeek = ($weekNumber % 2) == 0;
if ($isEvenWeek) {
$nextSunday->modify('+1 week');
}
$differenz = $nextSunday->diff($now);
$days = $differenz->days;
$output = new stdClass();
$output->date = $nextSunday->format('Y-m-d');
$output->days = $days+1;
return $output;
}
return $string;
}
?>

0
templates/html5struct.html.twig → templates/default.twig
View File

1
templates/nextevents.html.twig
View File

@ -1 +0,0 @@
nextevents

1
templates/topictreff.html.twig
View File

@ -1 +0,0 @@
topictreff