lukkari: index.php annotate

annotate index.php @ 135:31ba82aabbba

Backport some cleanups from 3.0.

author	Matti Hamalainen <ccr@tnsp.org>
date	Wed, 27 Aug 2014 19:00:49 +0300
parents	6f7a2f9dcad4
children	48c3012c89d7

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 //
127 1e44468dbbd8 Various style changes, and add indicators to currently selected language and Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	3 // OAMK Lukkari v2.3
118 16d0369e23f5 Bump version. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	4 // (C) Copyright 2010 - 2014 Matti 'ccr' Hämäläinen <ccr@tnsp.org>
65 2cfb0a7eac9b Rename some data files. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	5 // Yes, this code is rather horrible. :\|
43 7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	6 //
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	7 // Include framework
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	8 require "mcommon.inc.php";
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	9
127 1e44468dbbd8 Various style changes, and add indicators to currently selected language and Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	10 $pageVersion = "2.3";
117 f844f704fa57 Fix a minor 10L. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	11 $baseURI = "http://tnsp.org/luk/";
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	12 $pageLang = "fi";
115 6bc9b304aa11 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	13 $pageLanguages = array("fi", "en");
6bc9b304aa11 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	14 $pageCSSData = array("cookie" => "lukcss", "prefix" => $baseURI."luk");
6bc9b304aa11 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	15 $pageCSSAlts = array("blue" => "1", "old" => "2", "purple" => "3", "dark" => "4");
6bc9b304aa11 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	16
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	17 $classDefaultID = "TTE1SNO";
82 c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	18 $classIDFile = "classes.txt";
c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	19 $courseCacheFile = "coursecache.txt";
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	21 $lukDayNames = array(
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	22 "fi" => array("Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai", "Sunnuntai"),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	23 "en" => array("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	24 );
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	25
98 6a7172b3a841 Update to match the main page API. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	26 $pageTranslations = array(
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	27 "Original" => array("fi" => "Alkuperäinen"),
100 055c33cba66e Make the current/next period button a bit clearer .. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	28
055c33cba66e Make the current/next period button a bit clearer .. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	29 "Shown" => array("fi" => "Näkyvillä"),
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	30 "Next period" => array("fi" => "Seuraava periodi"),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	31 "Current period" => array("fi" => "Nykyinen periodi"),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	32 "Switch" => array("fi" => "Vaihda"),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	33
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	34 "contact" => array(
126 d954c4d34a3f Message adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	35 "en" => "Contact <b>%1</b> or <b>%2</b>. The author can't be held responsible for any errors or inaccuracies in the data!",
d954c4d34a3f Message adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	36 "fi" => "Yhteydenotot <b>%1</b> tai <b>%2</b>. En vastaa mahdollisista virheistä tai epätarkkuuksista tiedoissa!",
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	37 ),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	38
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	39 "updated" => array(
a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	40 "en" => "Last updated: <b>%1</b>.",
a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	41 "fi" => "Päivitetty: <b>%1</b>.",
103 38e9772901f1 Add in hdd.fi advertisement. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	42 ),
38e9772901f1 Add in hdd.fi advertisement. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	43
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	44 "beta" => array(
126 d954c4d34a3f Message adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	45 "en" => " NOTICE! OAMK Lukkari v%1 is still under development. There may be bugs.",
d954c4d34a3f Message adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	46 "fi" => " HUOM! OAMK Lukkari v%1 on vielä kehityksen alla. Bugeja voi löytyä.",
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	47 ),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	48
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	49 "viikossa" => array(
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	50 "en" => "Total of <b>%1</b> hours in the week.",
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	51 "fi" => "Viikossa yhteensä <b>%1</b> tuntia.",
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	52 ),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	53
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	54 "classNotSet" => array(
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	55 "en" => "Class not set, using default <b>%1</b>.",
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	56 "fi" => "Luokkaa ei asetettu, käytetään vakioarvoa <b>%1</b>.",
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	57 ),
89 f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	58
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	59 "classDataNotFound" => array(
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	60 "fi" => "Luokan %1 tietoja ei löytynyt! Jos luokkakoodi on uusi, ".
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	61 "ilmestyy se järjestelmään seuraavan päivityksen aikana. Luokkatiedot ".
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	62 "päivitetään kerran viikossa.",
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	63 "en" => "Data for class %1 was not found. If the class code is new, it ".
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	64 "should appear in this system during the next update. The data is updated ".
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	65 "once per week.",
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	66 ),
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	67
106 e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	68 "classListNotFound" => array(
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	69 "fi" => "Luokkien listaa ei löytynyt. Kokeile ladata sivu uudelleen hetken kuluttua.",
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	70 "en" => "Class list not found. An update may be in progress, try reloading in a minute.",
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	71 ),
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	72
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	73 "classFormatError" => array(
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	74 "fi" => "Virhe! Luokan täytyy olla muotoa <b>XXXnXXX</b>, käytetään vakioarvoa <b>%1</b>.",
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	75 "en" => "Error! Class code must be of format <b>XXXnXXX</b>, using default value of <b>%1</b>.",
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	76 ),
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	77
114 09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	78 "Style" => array(
09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	79 "fi" => "Tyyli",
09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	80 ),
119 78b4eb3a9719 Add link to the page with current settings, etc. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	81
78b4eb3a9719 Add link to the page with current settings, etc. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	82 "currLukLink" => array(
78b4eb3a9719 Add link to the page with current settings, etc. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	83 "fi" => "Linkki tähän lukujärjestykseen nykyisillä asetuksilla (kieli, jne.)",
78b4eb3a9719 Add link to the page with current settings, etc. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	84 "en" => "Link to the this timetable with current settings (language, etc.)",
78b4eb3a9719 Add link to the page with current settings, etc. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	85 ),
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	86 // "" => array("fi" => ),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	87 );
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	88
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	89
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	90 function lukGetDayName($day)
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	91 {
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	92 global $lukDayNames, $pageLang;
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	93
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	94 if (isset($lukDayNames[$pageLang]) && isset($lukDayNames[$pageLang][$day]))
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	95 return $lukDayNames[$pageLang][$day];
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	96 else
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	97 return $lukDayNames["en"][$day];
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	98 }
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	99
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	100
43 7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	101 function lukCheckClassID(&$id)
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102 {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	103 global $classDefaultID;
114 09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	104 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))
09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	105 {
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	106 $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	107 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	108 } else {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	109 stError(cmQM("classFormatError", $classDefaultID));
31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	110 $id = $classDefaultID;
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 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	112 }
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	115
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	116 function lukGetWeekdayFromTimestamp($stamp)
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	117 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	118 $info = getdate($stamp);
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	119 $day = $info["wday"];
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	120 return ($day > 0) ? $day - 1 : $day + 6;
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
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 function lukGetHourStamp($stamp)
5 3d6a83eaa2ba Improvements. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	125 {
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	126 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	127 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	128
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 function lukGetHourStr($hour)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	131 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	132 global $classHourTimes;
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	133 if (isset($classHourTimes[$hour]))
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 return
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	136 "<br />".
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	137 lukGetHourStamp($classHourTimes[$hour]["start"]).
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	138 " - ".
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	139 lukGetHourStamp($classHourTimes[$hour]["end"]).
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	140 "<br /><br />";
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	141 }
17 611452d30bd4 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	142 else
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	143 return "ERROR";
5 3d6a83eaa2ba Improvements. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	144 }
3d6a83eaa2ba Improvements. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	145
3d6a83eaa2ba Improvements. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	146
43 7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	147 function lukMatchCourse($id)
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 {
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	149 global $cache, $cacheDirty, $pageCharset, $pageLang;
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	150
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	151 $uri = "http://www.oamk.fi/opiskelijalle/rakenne/opinto-opas/koulutusohjelmat/?sivu=oj&kieli=".strtoupper($pageLang)."&koodi1=".$id;
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	152
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	153 // Create the index
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	154 if (!isset($cache[$id]))
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	155 $cache[$id] = array();
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 // Check if course exists in cache
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	158 if (!isset($cache[$id][$pageLang]))
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	159 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	160 // Not cached, try to fetch data
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161 $cacheDirty = TRUE;
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	162 $data = @file_get_contents($uri);
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	163 if ($data !== FALSE)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	164 {
120 807c7b90386d Iconv can spew some errors, so suppress them. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	165 $data = @iconv("iso-8859-15", $pageCharset, $data);
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	166 if (preg_match("#<td class=\"smallheadercell\"><strong>(.+?)\s+(\d+)\s(op\|ECTS\s+cr)\s</strong></td>#", $data, $m))
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	167 {
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168 // Add data to cache
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	169 $cache[$id][$pageLang] = array("desc" => $m[1], "op" => intval($m[2]));
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	170 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	173
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	174 if (isset($cache[$id]) && isset($cache[$id][$pageLang]))
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	175 {
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	176 return "<a target=\"_blank\" title=\"".chentities($id." - ".$cache[$id][$pageLang]["op"]." op").
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	177 "\" href=\"".chentities($uri)."\">".chentities($cache[$id][$pageLang]["desc"])."</a>";
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	178 }
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179 else
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	180 return chentities($id);
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	184 function lukGetClassInfo($grouped, $data)
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	185 {
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	186 if ($grouped)
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	187 {
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	188 $out = "<table><tr>";
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	189
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	190 $maxCount = 0;
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	191 foreach ($data as $col)
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	192 {
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	193 $out .= "<td>".lukMatchCourse($col[0])."</td>";
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	194 if (count($col) > $maxCount)
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	195 $maxCount = count($col);
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	196 }
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	197 $out .= "</tr>";
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	198
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	199 for ($i = 1; $i < $maxCount; $i++)
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	200 {
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	201 $out .= "<tr>";
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	202 foreach ($data as $col)
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	203 {
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	204 $out .= "<td>";
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	205 if (isset($col[$i]))
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	206 $out .= chentities($col[$i]);
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	207 $out .= "</td>";
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	208 }
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	209 $out .= "</tr>";
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	210 }
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	211
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	212 return $out."</table>";
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	213 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	214 else
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	215 {
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	216 $out = lukMatchCourse($data[0][0])."<br />";
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	217
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	218 for ($i = 1; $i < count($data[0]); $i++)
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	219 {
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	220 $out .= chentities($data[0][$i])."<br />";
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	221 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	222
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	223 return $out;
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	224 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	225 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	226
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	227
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	228 function lukFindClass($day, $hour)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	229 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	230 global $classHourDefs, $classDayTable;
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	231 if (isset($classDayTable[$day]))
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 foreach ($classDayTable[$day] as $id)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	234 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	235 if ($hour >= $classHourDefs[$id]["start"] &&
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	236 $hour < $classHourDefs[$id]["start"] + $classHourDefs[$id]["hours"])
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	237 return $id;
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	238 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	239 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	240 return 0;
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	241 }
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
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	244 function lukReadClassFile($filename, &$mtimestamp)
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	245 {
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	246 // Attempt to open file for reading
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	247 if (($fp = @fopen($filename, "rb")) === false)
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	248 return false;
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	249
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	250 $mtimestamp = filemtime($filename);
a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	251 $mclasses = FALSE;
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	252
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	253 // Lock file so that we do not get clashes
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	254 if (flock($fp, LOCK_SH))
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	255 {
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	256 $mclasses = array();
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	257 // Read and parse data
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	258 while (!feof($fp))
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	259 {
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	260 $str = trim(fgets($fp, 128));
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	261 if (strlen($str) > 2 && $str[0] != "#")
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	262 $mclasses[] = $str;
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	263 }
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	264
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	265 // Release lock
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	266 flock($fp, LOCK_UN);
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	267 }
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	268
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	269 fclose($fp);
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	270 return $mclasses;
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	271 }
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	272
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	273
128 0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	274 function lukPrintTimeTable($mini)
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	275 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	276 global $classInfo, $classHourDefs, $classHourTimes;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	277
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	278 // $currStamp = time() + ((3 * 60) + 45) * 60;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	279 $currStamp = time();
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	280 $currTime = $currStamp - mktime(0, 0, 0);
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	281 $currDay = lukGetWeekdayFromTimestamp($currStamp);
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	282
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	283 $nextStamp = $currStamp + 30 * 60;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	284 $nextTime = $nextStamp - mktime(0, 0, 0);
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	285
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	286 // Create the timetable table
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	287 if ($mini)
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	288 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	289 $out =
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	290 "<table class=\"timetable\">".
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	291 " <tr>\n <th></th>".
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	292 " <th class=\"days\">".lukGetDayName($currDay)."</th>\n </tr>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	293
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	294 $startDay = $currDay;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	295 $lastDay = $currDay + 1;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	296 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	297 else
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	298 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	299 $out =
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	300 "<p>".join("; ", $classInfo["general"]).
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	301 //" [".cmQM("viikossa", $classInfo["totalHours"])."]".
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	302 "</p>\n".
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	303 "<table class=\"timetable\">".
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	304 " <tr>\n <th></th>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	305
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	306 $cellWidth = $classInfo["maxDays"] > 0 ? 100 / $classInfo["maxDays"] : 15;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	307 if ($cellWidth > 25) $cellWidth = 25;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	308
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	309 for ($day = 0; $day < $classInfo["maxDays"]; $day++)
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	310 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	311 $out .= " <th style=\"width: ".$cellWidth."%;\" class=\"days\">".lukGetDayName($day)."</th>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	312 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	313 $out .= " </tr>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	314 $startDay = 0;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	315 $lastDay = $classInfo["maxDays"];
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	316 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	317
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	318
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	319 for ($hour = $classInfo["firstHour"]; $hour < $classInfo["lastHour"]; $hour++)
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	320 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	321 $out .= " <tr>\n".
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	322 " <th class=\"hours\">".lukGetHourStr($hour)."</th>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	323 for ($day = $startDay; $day < $lastDay; $day++)
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	324 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	325 $id = lukFindClass($day, $hour);
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	326 if ($id > 0)
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	327 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	328 $class = &$classHourDefs[$id];
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	329 if (!isset($class["set"]))
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	330 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	331 $class["set"] = TRUE;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	332
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	333 $nextActive = $day == $currDay &&
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	334 $nextTime >= $classHourTimes[$class["start"]]["start"] &&
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	335 $nextTime < $classHourTimes[$class["start"] + $class["hours"] - 1]["end"];
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	336
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	337 $isActive = $day == $currDay &&
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	338 $currTime >= $classHourTimes[$class["start"]]["start"] &&
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	339 $currTime < $classHourTimes[$class["start"] + $class["hours"] - 1]["end"];
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	340
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	341 $out .= " <td rowspan=\"".$class["hours"]."\" class=\"".
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	342 ($isActive ? "clactive " : "").
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	343 (!$isActive && $nextActive ? "clnext " : "").
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	344 ($class["grouped"] ? "clgrouped" : "clnormal")."\">".
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	345 lukGetClassInfo($class["grouped"], $class["data"]).
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	346 "<div class=\"nhours\"><span>".$class["hours"]."h</span></div></td>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	347 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	348 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	349 else
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	350 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	351 $out .= " <td class=\"clnothing\"></td>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	352 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	353 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	354 $out .= " </tr>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	355 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	356
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	357 return $out."</table>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	358 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	359
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	360
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	361
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	362 //
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	363 // Main code begins
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	364 //
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	365 // Check given parameters:
87 8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	366 // Language must be the first setting to be validated,
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	367 // so that the translation support works properly.
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	368 //
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	369
87 8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	370 if (isset($_GET["lang"]))
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	371 {
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	372 $tmp = strtolower($_GET["lang"]);
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	373 if (in_array($tmp, $pageLanguages))
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	374 {
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	375 $pageLang = $tmp;
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	376 setcookie("luklang", $tmp, time() + 3652460*60); // expire in a year
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	377 }
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	378 }
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	379 else
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	380 if (isset($_COOKIE["luklang"]))
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	381 {
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	382 $tmp = $_COOKIE["luklang"];
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	383 if (in_array($tmp, $pageLanguages))
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	384 $pageLang = $tmp;
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	385 }
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	386
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	387
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	388 // Check if we are using mobile mode
83 85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	389 $mobileMode = FALSE;
88 d78a063b2053 Disable mobile mode in the main branch for now. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	390 /*
83 85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	391 if (isset($_GET["m"]))
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	392 {
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	393 $mobileMode = intval($_GET["m"]);
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	394 setcookie("lukmobile", $mobileMode, time() + 3652460*60); // expire in a year
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	395 }
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	396 else
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	397 if (isset($_COOKIE["lukmobile"]))
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	398 {
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	399 $mobileMode = $_COOKIE["lukmobile"];
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	400 }
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	401
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	402 if ($mobileMode)
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	403 {
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	404 $pageCSSData["prefix"] = $baseURI."mluk";
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	405 }
88 d78a063b2053 Disable mobile mode in the main branch for now. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	406 */
82 c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	407
87 8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	408 // Check class setting
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	409 if (isset($_GET["luokka"]))
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	410 {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	411 $classID = $_GET["luokka"];
31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	412 if (lukCheckClassID($classID))
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	413 {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	414 setcookie("lukluokka", $classID, time() + 3652460*60); // expire in a year
39 78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	415 }
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	416 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	417 else
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	418 if (isset($_COOKIE["lukluokka"]))
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	419 {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	420 $classID = $_COOKIE["lukluokka"];
31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	421 lukCheckClassID($classID);
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	422 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	423 else
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	424 {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	425 stError(cmQM("classNotSet", $classDefaultID));
31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	426 $classID = $classDefaultID;
39 78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	427 }
78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	428
78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	429
87 8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	430 // Check next period flag
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	431 if (isset($_GET["next"]))
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	432 {
39 78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	433 $nextPeriod = TRUE;
82 c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	434 $cachePath = "cache-next/";
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	435 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	436 else
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	437 {
39 78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	438 $nextPeriod = FALSE;
82 c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	439 $cachePath = "cache/";
c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	440 }
c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	441
c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	442 if (file_exists($cachePath."baseuri.data"))
c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	443 {
c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	444 require $cachePath."baseuri.data";
39 78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	445 }
78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	446
78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	447
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	448 // Global cache for course data
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	449 $cache = array();
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	450 $cacheDirty = FALSE;
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	451
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	452 // Try to read cachefile, if we can get file lock on it
82 c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	453 $fp = @fopen($courseCacheFile, "rb");
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	454 if ($fp)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	455 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	456 if (flock($fp, LOCK_SH))
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	457 {
82 c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	458 require($courseCacheFile);
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	459 flock($fp, LOCK_UN);
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	460 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	461 fclose($fp);
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	462 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463
43 7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	464
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	465 // Read classfile
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	466 if (($classIDs = lukReadClassFile($classIDFile, &$timestamp)) === false)
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	467 stError(stQM("classListNotFound"));
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	468
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	469
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	470 // Read class data
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	471 $dataFile = $cachePath.$classID.".data";
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	472 if (!file_exists($dataFile))
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	473 {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	474 stError(cmQM("classDataNotFound", chentities($classID)));
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	475 $haveData = FALSE;
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	476 }
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	477 else
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	478 {
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	479 require($dataFile);
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	480 $haveData = isset($classInfo);
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	481 }
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	482
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	483
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	484 // Set some variables
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	485 $pageTitle = $haveData ? $classID." / ".join("; ", $classInfo["info"]) : $classID;
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	486
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	487
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	488 // Create references to mobile device (Apple touch) icons
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	489 $extra = "";
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	490 foreach (array(57 => FALSE, 76 => TRUE, 114 => TRUE, 120 => TRUE, 152 => TRUE) as $iconSize => $addSize)
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	491 {
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	492 $extra .= " <link rel=\"apple-touch-icon\" ".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	493 ($addSize ? "sizes=\"".$iconSize."x".$iconSize."\" " : "").
110 7d77d21873d1 Add mobile/Apple "touch icons". Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	494 "href=\"img/icon-".$iconSize."-precomposed.png\" />\n";
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	495 }
18 e0f1a5861f28 Fixes, cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 17 diff changeset	496
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	497
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	498 // Start printing the page
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	499 cmPrintPageHeader($pageTitle, $extra);
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	500
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	501
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	502 // Info box
130 7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	503 echo
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	504 "<div id=\"infobox\">\n".
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	505 " <div id=\"ctitle\">OAMK Lukkari v".$pageVersion."</div>\n";
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	506
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	507 if (!$mobileMode)
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	508 {
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	509 echo
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	510 " <div id=\"csssel\">".cmQM("Style").": ";
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	511
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	512 foreach ($pageCSSAlts as $name => $id)
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	513 {
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	514 echo
131 31347f83cbea Bugfix generated HTML. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	515 "<a ".(($pageCSSIndex == $id) ? "class=\"selected\" " : "").
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	516 "href=\"".$baseURI."?css=".$id."\">".$name."</a>";
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	517 }
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	518
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	519 echo
130 7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	520 "</div>\n";
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	521 }
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	522
130 7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	523 echo
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	524 " <div id=\"clang\">";
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	525
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	526 foreach ($pageLanguages as $id)
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	527 {
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	528 echo
131 31347f83cbea Bugfix generated HTML. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	529 "<a ".(($pageLang == $id) ? "class=\"selected\" " : "").
130 7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	530 "href=\"".$baseURI."?lang=".$id."\">".$id."</a>";
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	531 }
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	532
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	533 echo
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	534 "</div>\n".
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	535 "</div>\n";
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	536
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	537
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	538 // Additional controls
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	539 echo
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	540 "<form id=\"controls\" action=\"".$baseURI."\" method=\"get\">\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	541 " <table>\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	542 " <tr>\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	543 " <th>\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	544 " <select name=\"luokka\">\n";
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	545
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	546 foreach ($classIDs as $id)
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	547 {
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	548 echo
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	549 " <option ".($classID == $id ? "selected=\"selected\" " : "").
31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	550 "value=\"".$id."\">".chentities($id)."</option>\n";
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 }
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	552
30 6148ce4a83ed Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	553 echo
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	554 " </select>\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	555 " </th>\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	556 " <th><input class=\"submit\" type=\"submit\" value=\"".cmQM("Switch")."\" /></th>\n";
17 611452d30bd4 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	557
83 85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	558 if (!$mobileMode)
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	559 {
96 0ba79f50e604 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	560 echo
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	561 " <th><a id=\"next\" class=\"textctrl\" href=\"".$baseURI.($nextPeriod ? "" : "?next")."\">".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	562 cmQM("Shown").": ".($nextPeriod ? cmQM("Next period") : cmQM("Current period")).
134 6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	563 "</a></th>\n";
6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	564
6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	565 if ($haveData)
6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	566 {
6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	567 echo
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	568 " <th><a id=\"orig\" class=\"textctrl\" href=\"".$origBaseURI.$classID.$origBaseExt."\">".cmQM("Original")."</a></th>\n";
134 6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	569 //" <th><a id=\"xml\" class=\"textctrl\" href=\"".$baseURI.$cachePath."/".$luokka.".xml\">XML</a></th>\n";
6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	570 }
6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	571
6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	572 echo
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	573 " <th><a class=\"textctrl mobile\" href=\"http://tnsp.org/mluk/\">Mobile</a></th>\n";
83 85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	574 }
78 2f9c78c68a2c Add link to the XML. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	575
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	576 $currURL = $baseURI."?luokka=".$classID."&lang=".$pageLang.
123 ad7ccdd904b7 Fix some HTML. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	577 (isset($pageCSSIndex) ? "&css=".$pageCSSIndex : "").
ad7ccdd904b7 Fix some HTML. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	578 ($nextPeriod ? "&next" : "");
119 78b4eb3a9719 Add link to the page with current settings, etc. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	579
96 0ba79f50e604 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	580 echo
126 d954c4d34a3f Message adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	581 " <th><a href=\"".$currURL."\" class=\"textctrl\" title=\"".cmQM("currLukLink")."\">Link</a></th>\n".
d954c4d34a3f Message adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	582 // " <th class=\"advert\"><a href=\"http://tnsp.org/u/HXh\"><img src=\"img/cell.png\" alt=\"Division Cell\" /></a></th>\n".
d954c4d34a3f Message adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	583 " <th class=\"advert\"><a href=\"http://tnsp.org/u/G1X\"><img src=\"img/hdd_fi.gif\" alt=\"HDD.fi\" /></a></th>\n".
96 0ba79f50e604 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	584 " </tr>\n".
0ba79f50e604 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	585 " </table>\n".
0ba79f50e604 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	586 "</form>\n".
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	587 "<h1>".$pageTitle."</h1>\n";
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589 // Show error messages
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	590 if ($errorSet)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	591 {
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592 echo "<ul>\n";
44 57af36f0864e Rename some functions + reindentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	593 foreach ($errorMsgs as $msg)
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	594 echo "<li>".$msg."</li>\n";
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595 echo "</ul>\n";
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	598 if ($haveData)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	599 {
83 85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	600 echo lukPrintTimeTable($mobileMode);
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	601 }
5 3d6a83eaa2ba Improvements. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	602
73 241839ebb09f More cleanups, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	603 echo
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	604 "<div id=\"footer\">".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	605 cmQM("contact", "ccr @ IRCNet", "ccr (at) tnsp (dot) org").
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	606 " / ".
133 ad10ab39e2d1 Fix date stamp. Matti Hamalainen <ccr@tnsp.org> parents: 131 diff changeset	607 cmQM("updated", strftime("%d.%m.%Y, %H:%M", $timestamp)).
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	608 //" <div style=\"color: red;\">".cmQM("beta", $pageVersion)."</div>\n".
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	609 "</div>\n";
84 adaad33f929c Improve mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	610
98 6a7172b3a841 Update to match the main page API. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	611 cmPrintPageFooter();
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614 // Dump the course data cache, but only if it has changed
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	615 if ($cacheDirty)
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	616 {
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	617 $str = "<?\n\$cache = ".var_export($cache, TRUE)."\n?>";
114 09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	618 if (file_put_contents($courseCacheFile, $str, LOCK_EX) === FALSE)
09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	619 {
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	620 // Can't do much anything here ..
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	621 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	623
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624 ?>

Mercurial > hg > lukkari

annotate index.php @ 135:31ba82aabbba