annotate index.php @ 60:cdc04572800c

Add back the indicator box for number of hours for the class.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 24 Oct 2012 01:39:38 +0300
parents aa201ddd33dd
children 6635246b70d9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
1 <?php
43
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
2 //
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
3 // Yes, this is horrible. :|
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
4 //
38
2195ede068c8 Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents: 37
diff changeset
5 $pageCharset = "utf-8";
2195ede068c8 Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents: 37
diff changeset
6 $internalCharset = "utf-8";
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
7 $luokkaDefault = "TTE9SNO";
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
8 $classFile = "luokat.txt";
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
9 $cacheFile = "coursecache.txt";
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
10 $baseURI = "http://tnsp.org/luk2/";
30
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
11 //$infoURI = "http://www.oamk.fi/opiskelijalle/rakenne/opinto-opas/koulutusohjelmat/?sivu=oj&kieli=FI&opas=2010-2011&vuosi=10S11K&koodi1=";
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
12 $infoURI = "http://www.oamk.fi/opiskelijalle/rakenne/opinto-opas/koulutusohjelmat/?sivu=oj&kieli=FI&koodi1=";
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
13 $dayNames = array("Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai", "Sunnuntai");
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
14
48
d41b51cd4ae5 Implement switchable CSS support and a new default style + very minor code
Matti Hamalainen <ccr@tnsp.org>
parents: 45
diff changeset
15 $pageCSSData = array("cookie" => "lukcss", "prefix" => $baseURI."luk");
49
16aea8e5cb71 Improved CSS, added a third stylesheet option.
Matti Hamalainen <ccr@tnsp.org>
parents: 48
diff changeset
16 $pageCSSAlts = array("blue" => "1", "old" => "2", "purple" => "3");
48
d41b51cd4ae5 Implement switchable CSS support and a new default style + very minor code
Matti Hamalainen <ccr@tnsp.org>
parents: 45
diff changeset
17
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
18 // Include framework
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
19 require "mcommon.inc.php";
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
20 require "merrors.inc.php";
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
21
2
2471bb891299 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1
diff changeset
22
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
23 // Helper functions
43
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
24 function lukChEntities($str)
38
2195ede068c8 Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents: 37
diff changeset
25 {
2195ede068c8 Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents: 37
diff changeset
26 global $internalCharset;
2195ede068c8 Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents: 37
diff changeset
27 // return $str;
2195ede068c8 Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents: 37
diff changeset
28 return htmlentities($str, ENT_NOQUOTES, $internalCharset);
2195ede068c8 Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents: 37
diff changeset
29 }
2195ede068c8 Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents: 37
diff changeset
30
43
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
31 function lukCheckClassID(&$id)
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
32 {
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
33 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
34 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
35 $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
36 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
37 } else {
44
57af36f0864e Rename some functions + reindentation cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 43
diff changeset
38 errorMsg("Virhe! Luokan täytyy olla muotoa <b>XXXnXXX</b>, käytetään vakioarvoa <b>".$luokkaDefault."</b>.");
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
39 $id = $luokkaDefault;
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
40 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
41 }
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
42 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
43
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
44
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
45 function lukGetDayFromTimestamp($stamp)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
46 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
47 $info = getdate($stamp);
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
48 $day = $info["wday"];
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
49 return ($day > 0) ? $day - 1 : $day + 6;
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
50 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
51
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
52
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
53 function lukGetHourStamp($stamp)
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
54 {
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
55 return date("H:i", mktime(0, 0, $stamp, 0, 0, 0));
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
56 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
57
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
58
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
59 function lukGetHourStr($hour)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
60 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
61 global $classHourTimes;
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
62 if (isset($classHourTimes[$hour]))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
63 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
64 return
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
65 "<br />".
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
66 lukGetHourStamp($classHourTimes[$hour]["start"]).
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
67 " - ".
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
68 lukGetHourStamp($classHourTimes[$hour]["end"]).
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
69 "<br /><br />";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
70 }
17
611452d30bd4 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 16
diff changeset
71 else
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
72 return "ERROR";
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
73 }
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
74
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
75
43
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
76 function lukMatchCourse($id)
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
77 {
38
2195ede068c8 Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents: 37
diff changeset
78 global $cache, $infoURI, $cacheDirty, $internalCharset;
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
79
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
80 // Check if course exists in cache
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
81 if (!isset($cache[$id]))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
82 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
83 // Not cached, try to fetch data
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
84 $cacheDirty = TRUE;
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
85 $data = @file_get_contents($infoURI.$id);
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
86 if ($data !== FALSE)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
87 {
38
2195ede068c8 Add chentities() helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents: 37
diff changeset
88 $data = iconv("iso-8859-1", $internalCharset, $data);
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
89 if (preg_match("#<td class=\"smallheadercell\"><strong>(.+?)\s+(\d+)\s*op\s*</strong></td>#", $data, $m))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
90 {
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
91 // Add data to cache
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
92 $cache[$id] = array("desc" => $m[1], "op" => intval($m[2]));
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
93 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
94 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
95 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
96
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
97 if (isset($cache[$id]))
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
98 {
43
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
99 return "<a target=\"_blank\" title=\"".lukChEntities($id." - ".$cache[$id]["op"]." op").
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
100 "\" href=\"".lukChEntities($infoURI.$id)."\">".lukChEntities($cache[$id]["desc"])."</a>";
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
101 }
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
102 else
43
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
103 return lukChEntities($id);
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
104 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
105
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
106
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
107 function lukGetClassInfo($isSplit, $data)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
108 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
109 if ($isSplit)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
110 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
111 $out = "<table>".
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
112 "<tr><td>".lukMatchCourse($data[0])."</td><td>".lukMatchCourse($data[1])."</td></tr>";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
113
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
114 for ($i = 2; $i < count($data); $i += 2)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
115 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
116 $out .= "<tr><td>".lukChEntities($data[$i])."</td><td>".
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
117 (isset($data[$i+1]) ? lukChEntities($data[$i+1]) : "")."</td></tr>";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
118 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
119
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
120 return $out."</table>";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
121 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
122 else
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
123 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
124 $out = lukMatchCourse($data[0])."<br />";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
125
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
126 for ($i = 1; $i < count($data); $i++)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
127 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
128 $out .= lukChEntities($data[$i])."<br />";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
129 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
130
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
131 return $out;
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
132 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
133 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
134
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
135
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
136 function lukGetClassInfoData($id)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
137 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
138 global $classInfo;
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
139
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
140 if (isset($id))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
141 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
142 if ($id >= 0 && isset($classInfo[$id]))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
143 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
144 $i = $classInfo[$id];
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
145 $isSplit = preg_match("/^[A-Z]\d{6}$/", $i["data"][1]);
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
146 return lukGetClassInfo($isSplit, $i["data"]);
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
147 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
148 else
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
149 return "<p>Ei tunteja.</p>";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
150 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
151 else
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
152 return "<p>Ei mitään.</p>";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
153 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
154
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
155
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
156 function lukFindClass($day, $hour)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
157 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
158 global $classHourDefs, $classDayTable;
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
159 if (isset($classDayTable[$day]))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
160 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
161 foreach ($classDayTable[$day] as $id)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
162 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
163 if ($hour >= $classHourDefs[$id]["start"] &&
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
164 $hour < $classHourDefs[$id]["start"] + $classHourDefs[$id]["hours"])
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
165 return $id;
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
166 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
167 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
168 return 0;
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
169 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
170
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
171
39
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
172 // Check for mini-info mode
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
173 $miniMode = isset($_GET["nyt"]);
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
174
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
175 // Check given parameters
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
176 if (isset($_GET["luokka"]))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
177 {
39
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
178 $luokka = $_GET["luokka"];
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
179 if (lukCheckClassID($luokka) && !$miniMode)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
180 {
39
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
181 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
182 }
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
183 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
184 else
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
185 if (isset($_COOKIE["lukluokka"]))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
186 {
39
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
187 $luokka = $_COOKIE["lukluokka"];
43
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
188 lukCheckClassID($luokka);
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
189 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
190 else
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
191 {
44
57af36f0864e Rename some functions + reindentation cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 43
diff changeset
192 errorMsg("Luokkaa ei asetettu, käytetään vakioarvoa <b>".$luokkaDefault."</b>.");
39
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
193 $luokka = $luokkaDefault;
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
194 }
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
195
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
196
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
197 if (isset($_GET["next"]))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
198 {
39
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
199 $nextPeriod = TRUE;
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
200 $dataFile = "cache-next/".$luokka.".data";
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
201 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
202 else
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
203 {
39
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
204 $nextPeriod = FALSE;
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
205 $dataFile = "cache/".$luokka.".data";
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
206 }
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
207
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
208
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
209 // Global cache for course data
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
210 $cache = array();
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
211 $cacheDirty = FALSE;
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
212
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
213 // Try to read cachefile, if we can get file lock on it
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
214 $fp = @fopen($cacheFile, "rb");
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
215 if ($fp)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
216 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
217 if (flock($fp, LOCK_SH))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
218 {
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
219 require($cacheFile);
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
220 flock($fp, LOCK_UN);
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
221 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
222 fclose($fp);
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
223 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
224
43
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
225
28
ab06d838d916 Cosmetics & comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 27
diff changeset
226 // Read classfile
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
227 $classes = array();
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
228 $fp = @fopen($classFile, "rb");
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
229 if ($fp)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
230 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
231 if (flock($fp, LOCK_SH))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
232 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
233 while (!feof($fp))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
234 {
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
235 $str = trim(fgets($fp, 128));
43
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
236 if (strlen($str) > 2 && $str[0] != "#")
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
237 $classes[] = $str;
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
238 }
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
239 flock($fp, LOCK_UN);
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
240 }
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
241 fclose($fp);
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
242 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
243 else
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
244 {
44
57af36f0864e Rename some functions + reindentation cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 43
diff changeset
245 errorMsg("Luokkien listaa ei löytynyt. Kokeile ladata sivu uudelleen hetken kuluttua.");
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
246 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
247
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
248
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
249 if (!file_exists($dataFile))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
250 {
44
57af36f0864e Rename some functions + reindentation cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 43
diff changeset
251 errorMsg("Luokan ".lukChEntities($luokka)." tietoja ei löytynyt! ".
57af36f0864e Rename some functions + reindentation cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 43
diff changeset
252 "Jos luokkakoodi on uusi, ilmestyy se järjestelmään seuraavan ".
57af36f0864e Rename some functions + reindentation cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 43
diff changeset
253 "päivityksen aikana. Luokkatiedot päivitetään kerran viikossa.");
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
254 $haveData = FALSE;
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
255 }
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
256 else
13
57dd1db922c2 Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents: 12
diff changeset
257 {
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
258 require($dataFile);
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
259 $haveData = isset($classInfo);
13
57dd1db922c2 Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents: 12
diff changeset
260 }
57dd1db922c2 Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents: 12
diff changeset
261
57dd1db922c2 Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents: 12
diff changeset
262
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
263 function lukNormalTimeTable()
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
264 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
265 global $classInfo, $classHourDefs, $dayNames, $classHourTimes;
20
d9df76217991 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 19
diff changeset
266
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
267 // $currStamp = time() + 9 * 60 * 60 + 18 * 60;
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
268 $currStamp = time();
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
269 $currTime = $currStamp - mktime(0, 0, 0);
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
270 $currDay = lukGetDayFromTimestamp($currStamp);
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
271
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
272 // Create the timetable table
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
273 $out =
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
274 "<p>".join("; ", $classInfo["general"])."</p>\n".
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
275 "<div>Viikossa yhteensä <b>".$classInfo["totalHours"]."</b> tuntia.</div>\n".
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
276 "<table class=\"timetable\">".
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
277 " <tr>\n <th></th>\n";
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
278 $cellWidth = 100 / $classInfo["maxDays"];
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
279 if ($cellWidth > 25) $cellWidth = 25;
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
280 for ($day = 0; $day < $classInfo["maxDays"]; $day++)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
281 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
282 $out .= " <th style=\"width: ".$cellWidth."%;\" class=\"days\">".$dayNames[$day]."</th>\n";
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
283 }
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
284 $out .= " </tr>\n";
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
285
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
286 for ($hour = $classInfo["firstHour"]; $hour < $classInfo["lastHour"]; $hour++)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
287 {
44
57af36f0864e Rename some functions + reindentation cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 43
diff changeset
288 $out .= " <tr>\n".
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
289 " <th class=\"hours\">".lukGetHourStr($hour)."</th>\n";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
290 for ($day = 0; $day < $classInfo["maxDays"]; $day++)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
291 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
292 $id = lukFindClass($day, $hour);
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
293 if ($id > 0)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
294 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
295 $class = &$classHourDefs[$id];
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
296 if (!isset($class["set"]))
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
297 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
298 $class["set"] = TRUE;
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
299
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
300 $isSplit = preg_match("/^[A-Z]\d{6}$/", $class["data"][1]);
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
301
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
302 $isActive = $day == $currDay &&
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
303 $currTime >= $classHourTimes[$class["start"]]["start"] &&
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
304 $currTime < $classHourTimes[$class["start"] + $class["hours"] - 1]["end"];
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
305
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
306 $out .= " <td rowspan=\"".$class["hours"].
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
307 "\" class=\"".($class["grouped"] ? "clgrouped" : ($isActive ? "clactive" : "clnormal"))."\">";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
308
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
309 // if ($isActive)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
310 // $out .= sprintf("%d : %d <> %d, %d -- ", $day, $currTime, $classHourTimes[$class["start"]]["start"], $classHourTimes[$class["start"] + $class["hours"] - 1]["end"]);
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
311
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
312 $out .=
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
313 lukGetClassInfo($isSplit, $class["data"]).
60
cdc04572800c Add back the indicator box for number of hours for the class.
Matti Hamalainen <ccr@tnsp.org>
parents: 59
diff changeset
314 "<div class=\"nhours\"><span>".$class["hours"]."h</span></div></td>\n";
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
315 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
316 }
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
317 else
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
318 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
319 $out .= " <td class=\"clnothing\"></td>\n";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
320 }
44
57af36f0864e Rename some functions + reindentation cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 43
diff changeset
321 }
57af36f0864e Rename some functions + reindentation cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 43
diff changeset
322 $out .= " </tr>\n";
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
323 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
324
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
325 return $out."</table>\n";
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
326 }
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
327
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
328
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
329 //
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
330 //
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
331 //
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
332 $pageTitle = $haveData ? $luokka." / ".join("; ", $classInfo["info"]) : $luokka;
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
333 printPageHeader($pageTitle);
18
e0f1a5861f28 Fixes, cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 17
diff changeset
334
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
335 echo "<form id=\"controls\" action=\"".$baseURI."\" method=\"get\">
30
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
336 <table>
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
337 <tr>
45
d8a1e85b8dda Change the visual style a tiny bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 44
diff changeset
338 <th>
30
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
339 <select name=\"luokka\">
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
340 ";
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
341
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
342 foreach ($classes as $class) {
43
7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well.
Matti Hamalainen <ccr@tnsp.org>
parents: 41
diff changeset
343 echo " <option ".($luokka == $class ? "selected=\"selected\" " : "")."value=\"".$class."\">".lukChEntities($class)."</option>\n";
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
344 }
30
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
345 echo
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
346 " </select>
45
d8a1e85b8dda Change the visual style a tiny bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 44
diff changeset
347 </th>
d8a1e85b8dda Change the visual style a tiny bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 44
diff changeset
348 <th><input class=\"submit\" type=\"submit\" value=\" Vaihda \" /></th>
d8a1e85b8dda Change the visual style a tiny bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 44
diff changeset
349 <th><a href=\"".$baseURI."?luokka=".$luokka;
17
611452d30bd4 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 16
diff changeset
350
611452d30bd4 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 16
diff changeset
351 if ($miniMode)
611452d30bd4 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 16
diff changeset
352 echo "\">Normaali";
611452d30bd4 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 16
diff changeset
353 else
611452d30bd4 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 16
diff changeset
354 echo "&amp;nyt\">Mini-info";
611452d30bd4 Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 16
diff changeset
355
45
d8a1e85b8dda Change the visual style a tiny bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 44
diff changeset
356 echo "</a></th>
d8a1e85b8dda Change the visual style a tiny bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 44
diff changeset
357 <th><a href=\"http://www.oamk.fi/tyojarjestykset/otek/luokat/OR_".$luokka.".htm\">Alkuperäinen</a></th>
39
78d0c1cd7282 Add support for upcoming period data.
Matti Hamalainen <ccr@tnsp.org>
parents: 38
diff changeset
358
45
d8a1e85b8dda Change the visual style a tiny bit.
Matti Hamalainen <ccr@tnsp.org>
parents: 44
diff changeset
359 <th><a href=\"".$baseURI.($nextPeriod ? "" : "?next")."\">".($nextPeriod ? "Nykyinen" : "Seuraava")." periodi</a></th>
30
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
360 </tr>
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
361 </table>
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
362 </form>
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
363 ";
13
57dd1db922c2 Fix hours, add mini-info mode.
Matti Hamalainen <ccr@tnsp.org>
parents: 12
diff changeset
364
18
e0f1a5861f28 Fixes, cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 17
diff changeset
365 echo "<h1>".$pageTitle."</h1>\n";
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
366
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
367 // Show error messages
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
368 if ($errorSet)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
369 {
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
370 echo "<ul>\n";
44
57af36f0864e Rename some functions + reindentation cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 43
diff changeset
371 foreach ($errorMsgs as $msg)
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
372 echo "<li>$msg</li>\n";
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
373 echo "</ul>\n";
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
374 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
375
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
376 if ($haveData)
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
377 {
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
378 echo lukNormalTimeTable();
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
379 }
5
3d6a83eaa2ba Improvements.
Matti Hamalainen <ccr@tnsp.org>
parents: 2
diff changeset
380
48
d41b51cd4ae5 Implement switchable CSS support and a new default style + very minor code
Matti Hamalainen <ccr@tnsp.org>
parents: 45
diff changeset
381 echo "<div id=\"footer\">
37
3ba4feff55cb Partially convert to UTF-8.
Matti Hamalainen <ccr@tnsp.org>
parents: 31
diff changeset
382 Yhteydenotot <b>ccr @ IRCNet</b> tai <b>ccr at tnsp dot org</b>. En vastaa mahdollisista virheistä tiedoissa!
30
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
383 </div>
48
d41b51cd4ae5 Implement switchable CSS support and a new default style + very minor code
Matti Hamalainen <ccr@tnsp.org>
parents: 45
diff changeset
384 <div id=\"csssel\">
59
aa201ddd33dd Cleaned up, v2.0 beta.
Matti Hamalainen <ccr@tnsp.org>
parents: 49
diff changeset
385 <div id=\"ctitle\">Lukkari v2.0 beta</div>
48
d41b51cd4ae5 Implement switchable CSS support and a new default style + very minor code
Matti Hamalainen <ccr@tnsp.org>
parents: 45
diff changeset
386 Style: ";
49
16aea8e5cb71 Improved CSS, added a third stylesheet option.
Matti Hamalainen <ccr@tnsp.org>
parents: 48
diff changeset
387 foreach ($pageCSSAlts as $name => $id)
48
d41b51cd4ae5 Implement switchable CSS support and a new default style + very minor code
Matti Hamalainen <ccr@tnsp.org>
parents: 45
diff changeset
388 echo "<a href=\"?css=".$id."\">".$name."</a>";
d41b51cd4ae5 Implement switchable CSS support and a new default style + very minor code
Matti Hamalainen <ccr@tnsp.org>
parents: 45
diff changeset
389 echo "
d41b51cd4ae5 Implement switchable CSS support and a new default style + very minor code
Matti Hamalainen <ccr@tnsp.org>
parents: 45
diff changeset
390 </div>
30
6148ce4a83ed Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 28
diff changeset
391 ";
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
392 printPageFooter();
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
393
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
394
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
395 // Dump the course data cache, but only if it has changed
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
396 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
397 // 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
398 $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
399 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
400 $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
401 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
402 }
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
403 $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
404
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
405 // 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
406 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
407 // Can't do much anything here ..
1
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
408 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
409 }
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
410
21fde93375e9 Add beta code.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
411 ?>