From b6b02e48b09b83fcd869d5c1c5ef5c7f7b90b8c1 Mon Sep 17 00:00:00 2001
From: Vencislav Atanasov <user890104@users.noreply.github.com>
Date: Sun, 16 Oct 2016 19:47:05 +0300
Subject: [PATCH] Revert to the initial version of schedule

---
 schedule/.gitignore |  2 --
 schedule/load.php   | 18 ++++++++----------
 schedule/parse.php  | 34 ++++++----------------------------
 3 files changed, 14 insertions(+), 40 deletions(-)
 delete mode 100644 schedule/.gitignore

diff --git a/schedule/.gitignore b/schedule/.gitignore
deleted file mode 100644
index f3917d2..0000000
--- a/schedule/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-cache
-cache.json
diff --git a/schedule/load.php b/schedule/load.php
index 9c2c971..fc9c8af 100644
--- a/schedule/load.php
+++ b/schedule/load.php
@@ -1,7 +1,7 @@
 <?php
 require __DIR__ . DIRECTORY_SEPARATOR . 'class.SmartCurl.php';
 
-$base_url = 'https://cfp.openfest.org/api/conferences/'. $CF['confid'] .'/';
+$base_url = 'https://cfp.openfest.org/api/conferences/2/';
 
 $filenames = [
 	'events'			=>	'events.json',
@@ -12,15 +12,14 @@ $filenames = [
 	'slots'				=>	'slots.json',
 ];
 
-
 $data = [];
 
 foreach ($filenames as $name => $filename) {
-	$curl = new SmartCurl($base_url, 'cache' . DIRECTORY_SEPARATOR .$CF['confid']);
+	$curl = new SmartCurl($base_url);
 	$json = $curl->getUrl($filename);
 
 	if ($json === false) {
-		echo 'get failed: ', $filename, ' ', $base_url, PHP_EOL;
+		echo 'get failed: ', $filename, PHP_EOL;
 		exit;
 	}
 	
@@ -32,13 +31,12 @@ foreach ($filenames as $name => $filename) {
 	}
 	
 	$add = true;
+	
 	switch ($name) {
 		case 'halls':
-			$ret = array();
-			foreach($decoded as $id => $hall) {
-					if (in_array($id, $CF['allowedhallids'])) $ret[$id] = $hall['name'];
-			}
-			$decoded = $ret;
+			$decoded = array_map(function($el) {
+				return $el['name'];
+			}, $decoded);
 		break;
 		case 'slots':
 			$decoded = array_map(function($el) {
@@ -65,6 +63,6 @@ uasort($data['slots'], function($a, $b) {
 	return compareKeys($a, $b, 'starts_at') ?: compareKeys($a, $b, 'hall_id');
 });
 
-//array_pop($data['halls']);
+array_pop($data['halls']);
 
 return $data;
diff --git a/schedule/parse.php b/schedule/parse.php
index 6ab9345..4ef5deb 100644
--- a/schedule/parse.php
+++ b/schedule/parse.php
@@ -9,11 +9,7 @@
 
 $data = require __DIR__ . DIRECTORY_SEPARATOR . 'load.php';
 
-/* no idea why do I have to write this, doesn't seem to exist in the system */
-
-$languages = array('en' => array('name' => 'English', 'locale' => 'en_US.UTF8'), 'bg' => array ('name' => 'Български', 'locale' => 'bg_BG.UTF8'));
-
-$cut_len = 70;
+$cut_len = 50;
 $cfp_url = 'http://cfp.openfest.org';
 $time = 0;
 $date = 0;
@@ -25,20 +21,13 @@ $hall_ids = array_keys($data['halls']);
 $first_hall_id = min($hall_ids);
 $last_hall_id = max($hall_ids);
 
-/* We need to set these so we actually parse properly the dates. WP fucks up both. */
-date_default_timezone_set('Europe/Sofia');
-setlocale(LC_TIME, $languages[$CF['lang']]['locale']);
-
 foreach ($data['slots'] as $slot_id => $slot) {
-	if (! in_array($slot['hall_id'], $CF['allowedhallids'])) continue;
 	$slotTime = $slot['starts_at'];
 	$slotDate = date('d', $slotTime);
 		
 	if ($slotDate !== $date) {
-		/* this seems to be the easiest way to localize the date */
-		$localdate = strftime('%d %B - %A' ,$slotTime);
 		$lines[] = '<tr>';
-		$lines[] = '<td>' . $localdate . '</td>';
+		$lines[] = '<td>' . date('d F - l', $slotTime) . '</td>';
 		$lines[] = '<td colspan="3">&nbsp;</td>';
 		$lines[] = '</tr>';
 		
@@ -63,7 +52,7 @@ foreach ($data['slots'] as $slot_id => $slot) {
 		$lines[] = '<td>TBA</td>';
 	}
 	else {
-		$title = mb_substr($event['title'], 0, $cut_len) . (mb_strlen($event['title']) > $cut_len ? '...' : '');
+		$title = mb_substr($event['title'], 0, $cut_len) . (strlen($event['title']) > $cut_len ? '...' : '');
 		$speakers = '';
 		
 		if (count($event['participant_user_ids']) > 0) {
@@ -78,7 +67,7 @@ foreach ($data['slots'] as $slot_id => $slot) {
 				} else {
 					/* TODO: fix the URL */
 					$name = $data['speakers'][$uid]['first_name'] . ' ' . $data['speakers'][$uid]['last_name'];
-					$spk[$uid] = '<a class="vt-p" href="SPKURL#'. $name . '">' . $name . '</a>';
+					$spk[$uid] = '<a class="vt-p" href="#'. $name . '">' . $name . '</a>';
 				}
 			}
 			$speakers = implode (', ', $spk);
@@ -103,7 +92,7 @@ foreach ($data['slots'] as $slot_id => $slot) {
 		$fulltalk_spkr = strlen($speakers)>1 ? ' (' . $speakers . ')' : '';
 		$fulltalks[$eid] .= '<p><strong>' . $event['title'] . ' ' . $fulltalk_spkr . '</strong>';
 		$fulltalks[$eid] .= '<p>' . $event['abstract'] . '</p>';
-		$fulltalks[$eid] .= '<div class="separator"></div></section>';
+		$fulltalks[$eid] .= '<div class="separator"></div>';
 
 		if ($slot['event_id'] === $prev_event_id) {
 			array_pop($lines);
@@ -119,16 +108,6 @@ foreach ($data['slots'] as $slot_id => $slot) {
 }
 
 $lines[] = '</tr>';
-/* create the legend */
-
-$legend = [];
-
-foreach($data['tracks'] as $track) {
-	$legend[] = '<tr><td class="' . $track['css_class'] . '">' . $track['name'][$CF['lang']] . '</td></tr>';
-}
-foreach ($languages as $l => $n) {
-	$legend[] = '<tr><td class="schedule-' . $l . '">' . $n['name'] . '</td></tr>';
-}
 
 $gspk = [];
 $fspk = [];
@@ -159,11 +138,10 @@ foreach ($data['speakers'] as $speaker) {
 			$fspk[] = '<a href="'. $parm['url'] . $speaker[$type] . '"><i class="' . $parm['class'] . '"></i></a>';
 		}
 	}
-	$fspk[] = '</div>';
 	$fspk[] = '<p>' . $speaker['biography'] . '</p>';
 	$fspk[] = '</div><div class="separator"></div>';
 }
 
 $gspk[] = '</div>';
 
-return array_merge($data, compact('lines', 'fulltalks', 'gspk', 'fspk', 'legend'));
+return array_merge($data, compact('lines', 'fulltalks', 'gspk', 'fspk'));