From e2afa7568343ab762fd98ca203558d1b556bc83a Mon Sep 17 00:00:00 2001 From: carlyn lee Date: Thu, 7 Mar 2024 11:06:00 -0800 Subject: [PATCH 1/4] room lookup tables and topic listings --- server/index.php | 32 ++++++++++++++++---------------- server/room.php | 39 +++++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 30 deletions(-) diff --git a/server/index.php b/server/index.php index 49f2a92..91aacaf 100644 --- a/server/index.php +++ b/server/index.php @@ -488,22 +488,22 @@ function avnoc() { function room($room, $year = '', $month = '', $day = '', $hour = '', $minute = '') { $room_lookup_table = array( - "ballroom-a" => "BallroomA", - "ballroom-b" => "BallroomB", - "ballroom-c" => "BallroomC", - "ballroom-de" => "BallroomDE", - "ballroom-f" => "BallroomF", - "ballroom-g" => "BallroomG", - "ballroom-h" => "BallroomH", - "room-101" => "Room101", - "room-103" => "Room103", - "room-104" => "Room104", - "room-105" => "Room105", - "room-106" => "Room106", - "room-107" => "Room107", - "room-209" => "Room209", - "room-211" => "Room211", - "room-212" => "Room212", + "ballroom-a" => "BallroomA", + "ballroom-b" => "BallroomB", + "ballroom-c" => "BallroomC", + "ballroom-de" => "BallroomDE", + "ballroom-f" => "BallroomF", + "ballroom-g" => "BallroomG", + "ballroom-h" => "BallroomH", + "room-101" => "Room101", + "room-103" => "Room103", + "room-104" => "Room104", + "room-105" => "Room105", + "room-106" => "Room106", + "room-107" => "Room107", + "room-209" => "Room209", + "room-211" => "Room211", + "room-212" => "Room212", ); ?> diff --git a/server/room.php b/server/room.php index f6ef762..6548510 100644 --- a/server/room.php +++ b/server/room.php @@ -361,20 +361,31 @@ $times = array(); $shorten_topics = array( - "BoFs" => "BoFs", - "CloudNative" => "CloudNative", - "Developer" => "Developer", - "DevOpsDayLA" => "DevOps Day LA", - "General" => "General", - "MySQL" => "MySQL", - "Observability" => "Observability", - "OpenData" => "Open Data", - "OpenGovernment" => "Open Government", - "OpenMedical" => "Open Medical", - "PosgreSQL" => "PostgreSQL", - "Security" => "Security", - "Sponsored" => "Sponsored", - "SystemsandInfrastructure" => "Systems and Infrastructure", + "CareerDay" => "Career Day", + "CloudNative" => "Cloud Native", + "DataonKubernetes" => "Data on Kubernetes", + "Developer" => "Developer", + "DevOpsDayLA" => "DevOpsDay LA", + "Embedded" => "Embedded", + "FOSSHOME" => "FOSS@HOME", + "General" => "General", + "KernelandLowLevelSystems" => "Kernel and Low Level Systems", + "Keynote" => "Keynote", + "KubernetesCommunityDay" => "Kubernetes Community Day", + "MySQL" => "MySQL", + "NextGeneration" => "Next Generation", + "NixCon" => "NixCon", + "Observability" => "Observability", + "OpenGovernment" => "Open Government", + "OpenSourceAIandAppliedScience" => "Open Source AI and Applied Science", + "PostgreSQL" => "PostgreSQL", + "ReproducibleandImmutableSoftware" => "Reproducible and Immutable Software", + "Security" => "Security", + "Sponsored" => "Sponsored", + "SystemsandInfrastructure" => "Systems and Infrastructure", + "Ubucon" => "Ubucon", + "UpSCALE" => "UpSCALE", + "Workshops" => "Workshops" ); foreach ($xml->node AS $node) { From b0f92c801a0360748e7494306e7ff8cedd267261 Mon Sep 17 00:00:00 2001 From: carlyn lee Date: Fri, 8 Mar 2024 06:31:42 -0800 Subject: [PATCH 2/4] fix typo site247, to match scroll.php --- server/room.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/room.php b/server/room.php index 6548510..7bea5d2 100644 --- a/server/room.php +++ b/server/room.php @@ -8,9 +8,12 @@ #$starttime = mktime(0, 0, 0, 3, 5, 2020) / 60; #$starttime = mktime(0, 0, 0, 3, 9, 2023) / 60; + # after "spring forward" #$starttime = mktime(23, 0, 0, 7, 27, 2022) / 60; -$starttime = mktime(23, 0, 0, 3, 8, 2023) / 60; +#$starttime = mktime(23, 0, 0, 3, 8, 2023) / 60; +$starttime = mktime(0, 0, 0, 3, 14, 2024) / 60; + $sponsors_for_room = array(); $sponsor_class = "Room"; @@ -186,7 +189,7 @@ "netknights", "perforce", "redhat", - "site24x7", + "site247", "suse", ); From 28e3f288fc76782a50f97a39509f600ae5c0333b Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Sun, 10 Mar 2024 07:00:59 +0000 Subject: [PATCH 3/4] index: set rooms Without setting rooms in the case statement (room-105 for example) the following queries would not show the speaker in the room (intended) but instead show the entire schedule as if it were the RPi sign clients when room-105 was missing in the case: http://localhost/?room=room-105&year=2024&month=3&day=16&hour=11&minute=30 --- server/index.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/server/index.php b/server/index.php index 91aacaf..8da3408 100644 --- a/server/index.php +++ b/server/index.php @@ -62,26 +62,21 @@ } else { if (!empty($_GET["room"])) { switch ($_GET["room"]) { - case 'ballroom-de': case 'ballroom-a': case 'ballroom-b': case 'ballroom-c': + case 'ballroom-de': case 'ballroom-f': case 'ballroom-g': case 'ballroom-h': - case 'ballroom-gh': - case 'ballroom-i': - case 'ballroom-j': case 'room-101': case 'room-103': - case 'room-104': + case 'room-105': case 'room-106': case 'room-107': + case 'room-209': case 'room-211': case 'room-212': - case 'room-209': - case 'room-205': - case 'room-215': $year = $month = $day = $hour = $minute = ''; if (!empty($_GET["year"])) { $year = $_GET['year']; From 6c320ca1e0e508fd4b3d6701e7c6d99d284e7dbf Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Sun, 10 Mar 2024 07:01:25 +0000 Subject: [PATCH 4/4] room: duplicate topic replace in room Make sure topic special chars are dealt with the same way in room as they are in scroll.php --- server/room.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/room.php b/server/room.php index 7bea5d2..2cc615d 100644 --- a/server/room.php +++ b/server/room.php @@ -397,8 +397,10 @@ $node->{'Time'} = preg_replace('/<[^>]*>/', '', $node->{'Time'}); $node->{'Day'} = preg_replace('/<[^>]*>/', '', $node->{'Day'}); - // Remove Spaces so we can use it for a CSS class + // Remove special chars in Topic from XML request so we can use it for a CSS class $node->{'Topic'} = preg_replace('/\s+/', '', $node->{'Topic'}); + $node->{'Topic'} = preg_replace('/\&/', 'and', $node->{'Topic'}); + $node->{'Topic'} = preg_replace('/\@/', '', $node->{'Topic'}); $pos = strpos((string) $node->{'Time'}, ","); $lpos = strrpos((string) $node->{'Time'}, ",");