Mercurial > hg > lukkari
annotate index.php @ 39:78d0c1cd7282
Add support for upcoming period data.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 08 Mar 2012 07:31:33 +0200 |
| parents | 2195ede068c8 |
| children | 40d6c44c97ec |
| rev | line source |
|---|---|
| 1 | 1 <? |
| 2 $pageCSS = array("http://tnsp.org/docs1.css", "luk.css"); | |
|
38
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
3 $pageCharset = "utf-8"; |
|
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
4 $internalCharset = "utf-8"; |
| 1 | 5 $luokkaDefault = "TTE9SNO"; |
| 5 | 6 $classFile = "luokat.txt"; |
| 1 | 7 $mapFile = "kartta.png"; |
| 5 | 8 $roomFile = "luokkatilat.txt"; |
| 1 | 9 $cacheFile = "coursecache.txt"; |
|
16
ea9558465ad6
Add link to original data, fix left-over beta stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
10 $baseURI = "http://tnsp.org/luk/"; |
| 30 | 11 //$infoURI = "http://www.oamk.fi/opiskelijalle/rakenne/opinto-opas/koulutusohjelmat/?sivu=oj&kieli=FI&opas=2010-2011&vuosi=10S11K&koodi1="; |
| 12 $infoURI = "http://www.oamk.fi/opiskelijalle/rakenne/opinto-opas/koulutusohjelmat/?sivu=oj&kieli=FI&koodi1="; | |
| 1 | 13 $dayNames = array("Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai", "Sunnuntai"); |
| 14 | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
15 $hourStamps = array( |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
16 array( 8, 15), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
17 array( 9, 15), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
18 array(10, 15), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
19 array(11, 15), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
20 array(12, 15), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
21 array(13, 15), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
22 array(14, 15), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
23 array(15, 15), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
24 array(16, 15), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
25 array(17, 5), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
26 array(18, 5), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
27 array(19, 0), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
28 array(20, 45), |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
29 ); |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
30 |
| 5 | 31 // Include framework |
| 1 | 32 require "mcommon.inc.php"; |
| 33 require "merrors.inc.php"; | |
| 34 | |
| 2 | 35 |
| 5 | 36 // Helper functions |
|
38
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
37 function chentities($str) |
|
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
38 { |
|
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
39 global $internalCharset; |
|
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
40 // return $str; |
|
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
41 return htmlentities($str, ENT_NOQUOTES, $internalCharset); |
|
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
42 } |
|
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
43 |
| 1 | 44 function checkClassID(&$id) |
| 45 { | |
| 46 global $luokkaDefault; | |
|
23
b4b86915ae2c
Better input validation for $_GET arguments, thanks to Hjalmarr for pointing out the error.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
47 if (preg_match("#^([A-Z]{3}\d[A-Za-z0-9_]{1,6}|ccr|Ryh_[A-Z]{3}\d[A-Za-z0-9_]{1,6})$#", $id, $m)) { |
|
b4b86915ae2c
Better input validation for $_GET arguments, thanks to Hjalmarr for pointing out the error.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
48 $id = $m[1]; |
|
b4b86915ae2c
Better input validation for $_GET arguments, thanks to Hjalmarr for pointing out the error.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
49 return TRUE; |
|
b4b86915ae2c
Better input validation for $_GET arguments, thanks to Hjalmarr for pointing out the error.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
50 } else { |
| 37 | 51 errorMsg("Virhe! Luokan täytyy olla muotoa <b>XXXnXXX</b>, käytetään vakioarvoa <b>".$luokkaDefault."</b>."); |
| 1 | 52 $id = $luokkaDefault; |
| 53 return FALSE; | |
|
23
b4b86915ae2c
Better input validation for $_GET arguments, thanks to Hjalmarr for pointing out the error.
Matti Hamalainen <ccr@tnsp.org>
parents:
20
diff
changeset
|
54 } |
| 1 | 55 } |
| 56 | |
| 20 | 57 function getHourStamp($hour, $sec = 0, $mon = 0, $day = 0, $year = 0) |
| 5 | 58 { |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
59 global $hourStamps; |
| 17 | 60 if (isset($hourStamps[$hour])) |
| 20 | 61 return mktime($hourStamps[$hour][0], $hourStamps[$hour][1], $sec, $mon, $year); |
| 17 | 62 else |
| 20 | 63 return mktime($hour + 8, 0, $sec, $mon, $year); |
| 64 } | |
| 65 | |
| 17 | 66 |
| 20 | 67 function getHour($hour) |
| 68 { | |
| 69 $stamp = getHourStamp($hour); | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
70 return "<br />".date("H:i", $stamp)." - ".date("H:i", $stamp + 45 * 60)."<br /><br />"; |
| 5 | 71 } |
| 72 | |
| 73 | |
| 1 | 74 function matchCourse($id) |
| 75 { | |
|
38
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
76 global $cache, $infoURI, $cacheDirty, $internalCharset; |
| 1 | 77 |
| 78 // Check if course exists in cache | |
| 79 if (!isset($cache[$id])) { | |
| 80 $cacheDirty = TRUE; | |
| 81 // Not cached, try to fetch data | |
| 82 $data = @file_get_contents($infoURI.$id); | |
| 83 if ($data !== FALSE) { | |
|
38
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
84 $data = iconv("iso-8859-1", $internalCharset, $data); |
| 1 | 85 if (preg_match("#<td class=\"smallheadercell\"><strong>(.+?)\s+(\d+)\s*op\s*</strong></td>#", $data, $m)) { |
| 86 // Add data to cache | |
| 87 $cache[$id] = array("desc" => $m[1], "op" => intval($m[2])); | |
| 88 } | |
| 89 } | |
| 90 } | |
| 91 | |
| 92 if (isset($cache[$id])) | |
|
38
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
93 return "<a target=\"_blank\" title=\"".chentities($id." - ".$cache[$id]["op"]." op"). |
|
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
94 "\" href=\"".chentities($infoURI.$id)."\">".chentities($cache[$id]["desc"])."</a>"; |
| 1 | 95 else |
|
38
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
96 return chentities($id); |
| 1 | 97 } |
| 98 | |
| 99 | |
| 100 function matchClass($matches) | |
| 101 { | |
| 102 global $baseURI; | |
| 5 | 103 return "<b><a href=\"".$baseURI."?tila=".$matches[1]."\">".$matches[1]."</a></b> ".$matches[2]; |
| 1 | 104 } |
| 105 | |
| 106 | |
|
39
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
107 // Check for mini-info mode |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
108 $miniMode = isset($_GET["nyt"]); |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
109 |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
110 // Check given parameters |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
111 if (isset($_GET["luokka"])) { |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
112 $luokka = $_GET["luokka"]; |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
113 if (checkClassID($luokka) && !$miniMode) { |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
114 setcookie("lukluokka", $luokka, time() + 365*24*60*60); // expire in a year |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
115 } |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
116 } else |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
117 if (isset($_COOKIE["lukluokka"])) { |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
118 $luokka = $_COOKIE["lukluokka"]; |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
119 checkClassID($luokka); |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
120 } else { |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
121 errorMsg("Luokkaa ei asetettu, käytetään vakioarvoa <b>".$luokkaDefault."</b>."); |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
122 $luokka = $luokkaDefault; |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
123 } |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
124 |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
125 |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
126 if (isset($_GET["tila"])) { |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
127 $tila = $_GET["tila"]; |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
128 echo "Luokkatilan näyttömoodi ei vielä tuettu.<br />\n"; |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
129 exit; |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
130 |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
131 $fp = @fopen($roomFile, "rb"); |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
132 if ($fp) { |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
133 fclose($fp); |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
134 } |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
135 } |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
136 |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
137 |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
138 if (isset($_GET["next"])) { |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
139 $nextPeriod = TRUE; |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
140 $dataFile = "cache-next/".$luokka.".data"; |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
141 } else { |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
142 $nextPeriod = FALSE; |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
143 $dataFile = "cache/".$luokka.".data"; |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
144 } |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
145 |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
146 |
| 1 | 147 // Global cache for course data |
| 148 $cache = array(); | |
| 149 $cacheDirty = FALSE; | |
| 150 | |
| 151 | |
| 152 // Try to read cachefile, if we can get file lock on it | |
| 153 $fp = @fopen($cacheFile, "rb"); | |
| 154 if ($fp) { | |
| 155 if (flock($fp, LOCK_SH)) { | |
| 156 require($cacheFile); | |
| 157 flock($fp, LOCK_UN); | |
| 158 } | |
| 159 fclose($fp); | |
| 160 } | |
| 161 | |
| 28 | 162 // Read classfile |
| 5 | 163 $fp = @fopen($classFile, "rb"); |
| 164 $classes = array(); | |
| 165 if ($fp) { | |
| 166 if (flock($fp, LOCK_SH)) { | |
| 167 while (!feof($fp)) { | |
| 168 $str = trim(fgets($fp, 128)); | |
| 169 if ($str[0] != "#" && strlen($str) > 2) | |
| 170 $classes[] = $str; | |
| 171 } | |
| 172 flock($fp, LOCK_UN); | |
| 173 } | |
| 174 fclose($fp); | |
| 17 | 175 } else { |
| 37 | 176 errorMsg("Luokkien listaa ei löytynyt. Kokeile ladata sivu uudelleen hetken kuluttua."); |
| 1 | 177 } |
| 178 | |
| 179 | |
|
31
dbe7ff545293
Add support for fetching and showing data for next/upcoming period.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
180 if (!file_exists($dataFile)) { |
|
38
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
181 errorMsg("Luokan ".chentities($luokka)." tietoja ei löytynyt! Jos luokkakoodi on uusi, ilmestyy se järjestelmään seuraavan päivityksen aikana. Luokkatiedot päivitetään 2 kertaa vuorokaudessa."); |
| 5 | 182 $haveData = FALSE; |
| 183 } else { | |
|
31
dbe7ff545293
Add support for fetching and showing data for next/upcoming period.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
184 require($dataFile); |
| 5 | 185 $haveData = isset($classDefs); |
| 1 | 186 } |
| 187 | |
| 5 | 188 |
| 189 function printHourInfo($dayHours, $showDays) | |
| 190 { | |
| 37 | 191 $out = " <tr>\n <td>Tunteja<br />(<b>ryhmä/vv</b>)</td>\n"; |
| 5 | 192 for ($day = 0; $day < $showDays; $day++) { |
| 193 $out .= " <td>".$dayHours[$day]["total"]."h (<b>".$dayHours[$day]["grouped"]."h</b>)</td>\n"; | |
| 194 } | |
| 195 return $out." </tr>\n"; | |
| 1 | 196 } |
| 197 | |
| 198 | |
|
12
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
199 function findHours($start, $day, $cmp, $mark = FALSE) |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
200 { |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
201 global $classHourTable, $classInfo; |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
202 $n = 0; |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
203 for ($i = $start; $i < $classInfo["maxhours"]; $i++) |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
204 if ($classHourTable[$i][$day] == $cmp) { |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
205 if ($mark) $classHourTable[$i][$day] = -9999; |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
206 $n++; |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
207 } else |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
208 break; |
|
12
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
209 return $n; |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
210 } |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
211 |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
212 |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
213 function findNextHour(&$j, &$i, $day, $hour, $chk) |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
214 { |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
215 global $classInfo, $classHourTable; |
| 20 | 216 // for ($j = $day; $j < $classInfo["maxdays"]; $j++) |
| 217 $j = $day; | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
218 for ($i = $hour; $i < $classInfo["maxhours"]; $i++) { |
| 20 | 219 if ($chk > 0 && $classHourTable[$i][$j] != $chk) |
| 220 return $classHourTable[$i][$j]; | |
| 221 | |
| 222 if ($classHourTable[$i][$j] > 0 && $classHourTable[$i][$j] != $chk) | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
223 return $classHourTable[$i][$j]; |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
224 } |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
225 |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
226 return -1; |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
227 } |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
228 |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
229 |
| 19 | 230 function getHourInfo($isSplit, $d) |
| 231 { | |
| 232 if ($isSplit) { | |
| 233 $out = "<table>". | |
| 234 "<tr><td>".matchCourse($d[0])."</td><td>".matchCourse($d[1])."</td></tr>"; | |
| 235 | |
| 236 for ($j = 2; $j < count($d); $j += 2) | |
|
38
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
237 $out .= "<tr><td>".chentities($d[$j])."</td><td>".(isset($d[$j+1]) ? chentities($d[$j+1]) : "")."</td></tr>"; |
| 19 | 238 |
| 239 return $out."</table>"; | |
| 240 } else { | |
| 241 $out = matchCourse($d[0])."<br />"; | |
| 242 | |
| 243 for ($j = 1; $j < count($d); $j++) | |
|
38
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
244 $out .= chentities($d[$j])."<br />"; |
| 19 | 245 |
| 246 return $out; | |
| 247 } | |
| 248 } | |
| 249 | |
| 250 | |
| 251 function getHourInfoData($id) | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
252 { |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
253 global $classDefs; |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
254 |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
255 if (isset($id)) { |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
256 if ($id >= 0 && isset($classDefs[$id])) { |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
257 $i = $classDefs[$id]; |
| 19 | 258 $isSplit = preg_match("/^[A-Z]\d{6}$/", $i["data"][1]); |
| 259 return getHourInfo($isSplit, $i["data"]); | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
260 } else |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
261 return "<p>Ei tunteja.</p>"; |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
262 } else |
| 37 | 263 return "<p>Ei mitään.</p>"; |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
264 |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
265 return ""; |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
266 } |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
267 |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
268 |
| 17 | 269 if ($miniMode) { |
| 20 | 270 $stamp = time(); |
| 271 $aika = getdate($stamp); | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
272 $day = $aika["wday"] - 1; |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
273 if ($day < 0) $day = 7; |
| 20 | 274 $hour = $aika["hours"] - 8; |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
275 |
| 20 | 276 $id = $classHourTable[$hour][$day]; |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
277 |
| 18 | 278 $out = "<div class=\"content\">\n". |
| 20 | 279 "<h2>".$dayNames[$day]." ".date("d.n.Y", $stamp)." - klo ".date("H:i", $stamp)."</h2>\n". |
| 280 getHourInfoData($id)."\n"; | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
281 |
| 20 | 282 |
| 283 if (isset($id) && $id >= 0 && isset($classDefs[$id])) { | |
| 284 $i = $classDefs[$id]; | |
| 285 $start = getHourStamp($i["start"]); | |
| 286 } | |
| 287 | |
| 288 // echo "day=$day, hour=$hour, id=$id<br />\n"; | |
| 289 | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
290 if ($day >= $classInfo["maxdays"]) { |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
291 $day = $hour = 0; |
| 20 | 292 $id = -1; |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
293 } else |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
294 if ($hour < 0) { |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
295 $hour = 0; |
| 20 | 296 $id = -1; |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
297 } else |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
298 if ($hour >= $classInfo["maxhours"]) { |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
299 $day++; |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
300 $hour = 0; |
| 20 | 301 $id = -1; |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
302 } |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
303 |
| 20 | 304 // echo "day=$day, hour=$hour, id=$id<br />\n"; |
| 305 $found = findNextHour($nday, $nhour, $day, $hour, $id); | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
306 |
| 20 | 307 // echo "nday=$nday, nhour=$nhour, id=$found<br />\n"; |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
308 |
| 20 | 309 $out .= "<h2>Seuraavaksi"; |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
310 if ($found > 0) { |
| 20 | 311 $stamp = getHourStamp($nhour, 0, 0, $aika["mon"], $aika["mday"] + $nday - $day, $aika["year"]); |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
312 $aika = getdate($stamp); |
| 20 | 313 $out .= ": ".$dayNames[$nday]." ".date("d.n.Y", $stamp)." - klo ".date("H:i", $stamp)."</h2>\n". |
| 314 getHourInfoData($found)."\n"; | |
| 315 } else { | |
| 316 $out .= "</h2>\n". | |
| 37 | 317 "<p>Ei mitään</p>\n"; |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
318 } |
| 20 | 319 |
| 320 $out .= "</div>\n"; | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
321 } |
|
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
322 else |
| 5 | 323 if ($haveData) { |
| 324 $totalHours = 0; | |
| 325 $totalGrouped = 0; | |
| 326 $dayHours = array(); | |
| 7 | 327 |
| 11 | 328 for ($day = 0; $day < $classInfo["maxdays"]; $day++) { |
| 5 | 329 $dayHours[$day]["total"] = $dayHours[$day]["grouped"] = 0; |
| 1 | 330 |
| 11 | 331 for ($hour = 0; $hour < $classInfo["maxhours"]; $hour++) { |
| 332 $id = $classHourTable[$hour][$day]; | |
| 1 | 333 |
| 11 | 334 if ($id > 0) { |
| 335 $totalHours++; | |
| 336 $dayHours[$day]["total"]++; | |
| 337 | |
| 338 if ($classDefs[$id]["grouped"]) { | |
| 339 $totalGrouped++; | |
| 340 $dayHours[$day]["grouped"]++; | |
| 341 } | |
| 342 } | |
| 5 | 343 } |
| 344 } | |
| 345 | |
| 346 // Create the timetable table | |
| 347 $out = | |
| 348 "<p>".join("; ", $classInfo["general"])."</p>\n". | |
| 37 | 349 "<div>Viikossa yhteensä <b>".$totalHours."</b> tuntia, joista <b>".$totalGrouped."</b> ryhmissä tai vuoroviikoin.</div>\n". |
| 5 | 350 "<table class=\"timetable\">". |
| 351 " <tr>\n <th></th>\n"; | |
| 7 | 352 for ($day = 0; $day < $classInfo["maxdays"]; $day++) { |
| 18 | 353 $out .= " <th style=\"width: ".(100 / $classInfo["maxdays"]). |
| 354 "%;\" class=\"days\">".$dayNames[$day]."</th>\n"; | |
| 5 | 355 } |
| 356 $out .= " </tr>\n"; | |
| 1 | 357 |
| 358 for ($hour = 0; $hour < $classInfo["maxhours"]; $hour++) { | |
| 5 | 359 $out .= " <tr>\n". |
| 360 " <th class=\"hours\">".getHour($hour)."</th>\n"; | |
| 7 | 361 for ($day = 0; $day < $classInfo["maxdays"]; $day++) { |
| 1 | 362 if (isset($classHourTable[$hour][$day])) { |
| 363 $h = $classHourTable[$hour][$day]; | |
| 364 | |
| 365 if ($h < 1) { | |
|
10
6272ca0cacea
Make editing of custom timetable easier.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
366 if ($h > -9999) { |
|
12
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
367 $n = findHours($hour, $day, $h, TRUE); |
| 5 | 368 $out .= " <td rowspan=\"".$n."\" class=\"clnothing\"></td>\n"; |
| 1 | 369 } |
| 370 } else | |
| 371 if (isset($classDefs[$h])) { | |
| 372 if (!isset($classDefs[$h]["done"])) { | |
| 373 $classDefs[$h]["done"] = true; | |
| 374 $i = $classDefs[$h]; | |
| 375 $d = $classDefs[$h]["data"]; | |
| 376 | |
| 377 $isSplit = preg_match("/^[A-Z]\d{6}$/", $d[1]); | |
| 378 | |
|
12
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
379 $hours = findHours($hour, $day, $h, FALSE); |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
380 if ($hours != $i["hours"]) { |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
381 errorMsg("Internal error, cell $hour / $day : hour id $h hours ($hours) do not match ".$i["hours"]."!"); |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
382 } |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
383 |
|
306028aa2253
Fix hour counts when table has been modified.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
384 $out .= " <td rowspan=\"".$hours. |
| 19 | 385 "\" class=\"".($isSplit || $i["grouped"] ? "clgrouped" : "clnormal")."\">". |
| 386 getHourInfo($isSplit, $d). | |
| 387 "<div class=\"nhours\"><span>".$hours."h</span></div></td>\n"; | |
| 1 | 388 } |
| 389 } else | |
| 390 errorMsg("Internal error cell $hour / $day : hour id $h does not exist!"); | |
| 391 } else | |
| 392 errorMsg("Internal error, cell $hour / $day does not exist."); | |
| 393 } | |
| 5 | 394 $out .= " </tr>\n"; |
| 1 | 395 } |
| 396 | |
| 7 | 397 $out .= printHourInfo($dayHours, $classInfo["maxdays"]). |
| 14 | 398 "</table>\n"; |
| 5 | 399 |
| 400 } // haveData | |
| 401 | |
| 402 | |
| 403 $pageTitle = $haveData ? $luokka." / ".join("; ", $classInfo["info"]) : $luokka; | |
| 404 printPageHeader($pageTitle); | |
| 18 | 405 |
| 406 if ($miniMode) echo "<div id=\"mini\">\n"; | |
| 5 | 407 |
| 18 | 408 echo |
| 30 | 409 "<form id=\"controls\" action=\"".$baseURI."\" method=\"get\"> |
| 410 <table> | |
| 411 <tr> | |
| 412 <td> | |
| 413 <select name=\"luokka\"> | |
| 414 "; | |
| 5 | 415 |
| 416 foreach ($classes as $class) { | |
|
38
2195ede068c8
Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
37
diff
changeset
|
417 echo " <option ".($luokka == $class ? "selected=\"selected\" " : "")."value=\"".$class."\">".chentities($class)."</option>\n"; |
| 1 | 418 } |
| 30 | 419 echo |
| 420 " </select> | |
| 421 </td> | |
| 422 <td><input type=\"submit\" value=\" Vaihda \" /></td> | |
| 423 <td>[<a href=\"".$baseURI."?luokka=".$luokka; | |
| 17 | 424 |
| 425 if ($miniMode) | |
| 426 echo "\">Normaali"; | |
| 427 else | |
| 428 echo "&nyt\">Mini-info"; | |
| 429 | |
| 30 | 430 echo "</a>]</td> |
|
39
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
431 <td>[<a href=\"http://www.oamk.fi/tyojarjestykset/otek/luokat/OR_".$luokka.".htm\">Alkuperäinen</a>]</td> |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
432 |
|
78d0c1cd7282
Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents:
38
diff
changeset
|
433 <td>[<a href=\"".$baseURI.($nextPeriod ? "" : "?next")."\">".($nextPeriod ? "Nykyinen" : "Seuraava")." periodi</a>]</td> |
| 30 | 434 </tr> |
| 435 </table> | |
| 436 </form> | |
| 437 "; | |
|
13
57dd1db922c2
Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
438 |
| 18 | 439 echo "<h1>".$pageTitle."</h1>\n"; |
| 1 | 440 |
| 441 // Show error messages | |
| 442 if ($errorSet) { | |
| 443 echo "<ul>\n"; | |
| 444 foreach ($errorMsgs as $msg) | |
| 445 echo "<li>$msg</li>\n"; | |
| 446 echo "</ul>\n"; | |
| 447 } | |
| 448 | |
| 5 | 449 echo $out; |
| 450 | |
| 28 | 451 echo "<div style=\"position: relative; top: 5em; font-size: 5pt;\"><hr /> |
| 37 | 452 Yhteydenotot <b>ccr @ IRCNet</b> tai <b>ccr at tnsp dot org</b>. En vastaa mahdollisista virheistä tiedoissa! |
| 30 | 453 </div> |
| 454 "; | |
| 18 | 455 |
| 456 if ($miniMode) echo "</div>\n"; | |
| 1 | 457 printPageFooter(); |
| 458 | |
| 459 | |
| 460 // Dump the course data cache, but only if it has changed | |
| 461 if ($cacheDirty) { | |
|
27
7655db03ea60
Use different strategy of saving course cache, by using file_put_contents() with locking instead of using separate writes.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
462 // Create string containing the data |
|
7655db03ea60
Use different strategy of saving course cache, by using file_put_contents() with locking instead of using separate writes.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
463 $str = "<?\n\$cache = array(\n"; |
|
7655db03ea60
Use different strategy of saving course cache, by using file_put_contents() with locking instead of using separate writes.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
464 foreach ($cache as $id => $data) { |
|
7655db03ea60
Use different strategy of saving course cache, by using file_put_contents() with locking instead of using separate writes.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
465 $str .= " \"".addslashes($id)."\" => array(\"desc\" => \"". |
|
7655db03ea60
Use different strategy of saving course cache, by using file_put_contents() with locking instead of using separate writes.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
466 addslashes($data["desc"])."\", \"op\" => ".$data["op"]."),\n"; |
|
7655db03ea60
Use different strategy of saving course cache, by using file_put_contents() with locking instead of using separate writes.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
467 } |
|
7655db03ea60
Use different strategy of saving course cache, by using file_put_contents() with locking instead of using separate writes.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
468 $str .= ");\n?>"; |
|
7655db03ea60
Use different strategy of saving course cache, by using file_put_contents() with locking instead of using separate writes.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
469 |
|
7655db03ea60
Use different strategy of saving course cache, by using file_put_contents() with locking instead of using separate writes.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
470 // Use locking to prevent concurrent access and dump data |
|
7655db03ea60
Use different strategy of saving course cache, by using file_put_contents() with locking instead of using separate writes.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
471 if (file_put_contents($cacheFile, $str, LOCK_EX) === FALSE) { |
|
7655db03ea60
Use different strategy of saving course cache, by using file_put_contents() with locking instead of using separate writes.
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
472 // Can't do much anything here .. |
| 1 | 473 } |
| 474 } | |
| 475 | |
| 476 ?> |