lukkari: index.php annotate

annotate index.php @ 145:c028506aa9cc

Separate the concepts of "every other week" classes and split group classes.

author	Matti Hamalainen <ccr@tnsp.org>
date	Wed, 10 Sep 2014 12:44:10 +0300
parents	f64a46fa7961
children	f559f0161fd5

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
136 48c3012c89d7 Add configuration. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	10 // Default settings
137 657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	11 $pageVersion = "2.3";
657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	12 $mobileMode = FALSE;
136 48c3012c89d7 Add configuration. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	13 $baseURI = "http://example.com/";
48c3012c89d7 Add configuration. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	14
115 6bc9b304aa11 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	15 $pageLanguages = array("fi", "en");
136 48c3012c89d7 Add configuration. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	16 $pageCSSData = array("cookie" => "lukcss", "prefix" => "luk");
115 6bc9b304aa11 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	17
136 48c3012c89d7 Add configuration. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	18 $classDefaultID = "DEFAULT";
82 c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	19 $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	20 $courseCacheFile = "coursecache.txt";
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21
136 48c3012c89d7 Add configuration. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	22 if (file_exists("config.inc.php"))
48c3012c89d7 Add configuration. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	23 @require "config.inc.php";
48c3012c89d7 Add configuration. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	24
48c3012c89d7 Add configuration. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	25 //
48c3012c89d7 Add configuration. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	26 // Hardcoded tables
48c3012c89d7 Add configuration. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	27 //
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	28 $lukDayNames = array(
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	29 "fi" => array("Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai", "Sunnuntai"),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	30 "en" => array("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	31 );
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	32
98 6a7172b3a841 Update to match the main page API. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	33 $pageTranslations = array(
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	34 "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	35
055c33cba66e Make the current/next period button a bit clearer .. Matti Hamalainen <ccr@tnsp.org> parents: 98 diff changeset	36 "Shown" => array("fi" => "Näkyvillä"),
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	37 "Next period" => array("fi" => "Seuraava periodi"),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	38 "Current period" => array("fi" => "Nykyinen periodi"),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	39 "Switch" => array("fi" => "Vaihda"),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	40
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	41 "contact" => array(
126 d954c4d34a3f Message adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	42 "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	43 "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	44 ),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	45
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	46 "updated" => array(
a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	47 "en" => "Last updated: <b>%1</b>.",
a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	48 "fi" => "Päivitetty: <b>%1</b>.",
103 38e9772901f1 Add in hdd.fi advertisement. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	49 ),
38e9772901f1 Add in hdd.fi advertisement. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	50
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	51 "beta" => array(
126 d954c4d34a3f Message adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	52 "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	53 "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	54 ),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	55
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	56 "viikossa" => array(
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	57 "en" => "Total of <b>%1</b> hours in the week.",
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	58 "fi" => "Viikossa yhteensä <b>%1</b> tuntia.",
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	59 ),
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	60
145 c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	61 "vuoroviikoin" => array(
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	62 "en" => "Every other week",
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	63 "fi" => "Vuoroviikoin",
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	64 ),
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	65
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	66 "classNotSet" => array(
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	67 "en" => "Class not set, using default <b>%1</b>.",
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	68 "fi" => "Luokkaa ei asetettu, käytetään vakioarvoa <b>%1</b>.",
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	69 ),
89 f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	70
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	71 "classDataNotFound" => array(
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	72 "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	73 "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	74 "päivitetään kerran viikossa.",
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	75 "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	76 "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	77 "once per week.",
f9cd4c5ca3d6 Translate one more error message. Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	78 ),
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	79
106 e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	80 "classListNotFound" => array(
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	81 "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	82 "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	83 ),
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	84
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	85 "classFormatError" => array(
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	86 "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	87 "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	88 ),
e7bd58dec4f3 Update for newer framework, add some translations. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	89
114 09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	90 "Style" => array(
09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	91 "fi" => "Tyyli",
09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	92 ),
119 78b4eb3a9719 Add link to the page with current settings, etc. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	93
78b4eb3a9719 Add link to the page with current settings, etc. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	94 "currLukLink" => array(
78b4eb3a9719 Add link to the page with current settings, etc. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	95 "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	96 "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	97 ),
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	98 // "" => array("fi" => ),
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
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	101
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	102 function lukGetDayName($day)
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	103 {
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	104 global $lukDayNames, $pageLang;
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	105
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	106 if (isset($lukDayNames[$pageLang]) && isset($lukDayNames[$pageLang][$day]))
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	107 return $lukDayNames[$pageLang][$day];
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	108 else
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	109 return $lukDayNames["en"][$day];
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	110 }
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	111
6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	112
43 7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	113 function lukCheckClassID(&$id)
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114 {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	115 global $classDefaultID;
114 09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	116 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	117 {
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	118 $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	119 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	120 } else {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	121 stError(cmQM("classFormatError", $classDefaultID));
31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	122 $id = $classDefaultID;
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 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	124 }
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	127
63 6635246b70d9 Implement translations. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	128 function lukGetWeekdayFromTimestamp($stamp)
59 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 $info = getdate($stamp);
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	131 $day = $info["wday"];
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	132 return ($day > 0) ? $day - 1 : $day + 6;
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 lukGetHourStamp($stamp)
5 3d6a83eaa2ba Improvements. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	137 {
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	138 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	139 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	140
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 function lukGetHourStr($hour)
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 global $classHourTimes;
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	145 if (isset($classHourTimes[$hour]))
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	146 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	147 return
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	148 "<br />".
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	149 lukGetHourStamp($classHourTimes[$hour]["start"]).
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 lukGetHourStamp($classHourTimes[$hour]["end"]).
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	152 "<br /><br />";
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	153 }
17 611452d30bd4 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	154 else
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	155 return "ERROR";
5 3d6a83eaa2ba Improvements. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	156 }
3d6a83eaa2ba Improvements. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	157
3d6a83eaa2ba Improvements. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	158
141 36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	159 function lukClassGetHourStr($start, $end)
36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	160 {
36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	161 global $classHourTimes;
36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	162 return
36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	163 lukGetHourStamp($classHourTimes[$start]["start"]).
36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	164 " - ".
36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	165 lukGetHourStamp($classHourTimes[$end]["end"]);
36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	166 }
36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	167
36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	168
43 7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	169 function lukMatchCourse($id)
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	170 {
137 657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	171 global $cache, $cacheDirty, $pageCharset, $pageLang, $mobileMode;
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	172
138 01c3784d3a90 Update course data URL. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	173 //$uri = "http://www.oamk.fi/opiskelijalle/rakenne/opinto-opas/koulutusohjelmat/?sivu=oj&kieli=".strtoupper($pageLang)."&koodi1=".$id;
01c3784d3a90 Update course data URL. Matti Hamalainen <ccr@tnsp.org> parents: 137 diff changeset	174 $uri = "http://www.oamk.fi/koulutus_ja_hakeminen/opiskelu_oamkissa/opinto-opas/koulutusohjelmat/?sivu=oj_kuvaus&koodi1=".$id."&kieli=".strtoupper($pageLang);
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	175
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	176 // Create the index
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	177 if (!isset($cache[$id]))
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	178 $cache[$id] = array();
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 // Check if course exists in cache
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	181 if (!isset($cache[$id][$pageLang]))
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	182 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	183 // Not cached, try to fetch data
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 $cacheDirty = TRUE;
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	185 $data = @file_get_contents($uri);
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	186 if ($data !== FALSE)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	187 {
120 807c7b90386d Iconv can spew some errors, so suppress them. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	188 $data = @iconv("iso-8859-15", $pageCharset, $data);
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	189 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	190 {
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 // Add data to cache
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	192 $cache[$id][$pageLang] = array("desc" => $m[1], "op" => intval($m[2]));
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	194 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196
64 6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	197 if (isset($cache[$id]) && isset($cache[$id][$pageLang]))
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	198 {
137 657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	199 if ($mobileMode)
657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	200 {
657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	201 return "<b>".chentities($cache[$id][$pageLang]["desc"])."</b>";
657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	202 }
657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	203 else
657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	204 {
657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	205 return
657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	206 "<a target=\"_blank\" title=\"".chentities($id." - ".$cache[$id][$pageLang]["op"]." op").
657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	207 "\" href=\"".chentities($uri)."\">".chentities($cache[$id][$pageLang]["desc"])."</a>";
657b0b7bf409 More merging with mobile version. Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	208 }
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	209 }
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	210 else
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	211 return chentities($id);
1 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
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214
145 c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	215 function lukGetClassInfo($class)
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	216 {
145 c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	217 $data = $class["data"];
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	218 if ($class["grouped"])
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	219 {
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	220 $out = "<table><tr>";
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	221
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	222 $maxCount = 0;
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	223 foreach ($data as $col)
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	224 {
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	225 $out .= "<td>".lukMatchCourse($col[0])."</td>";
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	226 if (count($col) > $maxCount)
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	227 $maxCount = count($col);
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	228 }
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	229 $out .= "</tr>";
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	230
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	231 for ($i = 1; $i < $maxCount; $i++)
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	232 {
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	233 $out .= "<tr>";
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	234 foreach ($data as $col)
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	235 {
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	236 $out .= "<td>";
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	237 if (isset($col[$i]))
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	238 $out .= chentities($col[$i]);
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	239 $out .= "</td>";
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	240 }
6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	241 $out .= "</tr>";
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	242 }
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	243
145 c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	244 $out .= "</table>";
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	245
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	246 if ($class["turns"])
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	247 $out .= cmQM("vuoroviikoin");
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	248
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	249 return $out;
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	250 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	251 else
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	252 {
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	253 $out = lukMatchCourse($data[0][0])."<br />";
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	254
72 6fd715063abc Clean up some parsing operations. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	255 for ($i = 1; $i < count($data[0]); $i++)
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	256 {
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	257 $out .= chentities($data[0][$i])."<br />";
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	258 }
145 c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	259 if ($class["turns"])
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	260 $out .= cmQM("vuoroviikoin");
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	261
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	262 return $out;
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	263 }
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
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	266
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	267 function lukFindClass($day, $hour)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	268 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	269 global $classHourDefs, $classDayTable;
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	270 if (isset($classDayTable[$day]))
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	271 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	272 foreach ($classDayTable[$day] as $id)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	273 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	274 if ($hour >= $classHourDefs[$id]["start"] &&
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	275 $hour < $classHourDefs[$id]["start"] + $classHourDefs[$id]["hours"])
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	276 return $id;
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	277 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	278 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	279 return 0;
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	280 }
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
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	283 function lukReadClassFile($filename, &$mtimestamp)
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	284 {
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	285 // Attempt to open file for reading
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	286 if (($fp = @fopen($filename, "rb")) === false)
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	287 return false;
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	288
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	289 $mtimestamp = filemtime($filename);
a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	290 $mclasses = FALSE;
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	291
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	292 // Lock file so that we do not get clashes
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	293 if (flock($fp, LOCK_SH))
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	294 {
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	295 $mclasses = array();
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	296 // Read and parse data
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	297 while (!feof($fp))
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	298 {
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	299 $str = trim(fgets($fp, 128));
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	300 if (strlen($str) > 2 && $str[0] != "#")
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	301 $mclasses[] = $str;
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	302 }
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	303
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	304 // Release lock
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	305 flock($fp, LOCK_UN);
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	306 }
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	307
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	308 fclose($fp);
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	309 return $mclasses;
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	310 }
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	311
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	312
128 0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	313 function lukPrintTimeTable($mini)
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	314 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	315 global $classInfo, $classHourDefs, $classHourTimes;
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 // $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	318 $currStamp = time();
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	319 $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	320 $currDay = lukGetWeekdayFromTimestamp($currStamp);
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	321
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	322 $nextStamp = $currStamp + 30 * 60;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	323 $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	324
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	325 // Create the timetable table
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	326 if ($mini)
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 $out =
144 f64a46fa7961 Rename some CSS elements. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	329 "<table id=\"timeTable\">\n".
f64a46fa7961 Rename some CSS elements. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	330 " <tr>\n".
f64a46fa7961 Rename some CSS elements. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	331 " <th></th>".
f64a46fa7961 Rename some CSS elements. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	332 " <th class=\"days\">".lukGetDayName($currDay)."</th>\n".
f64a46fa7961 Rename some CSS elements. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	333 " </tr>\n";
128 0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	334
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	335 $startDay = $currDay;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	336 $lastDay = $currDay + 1;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	337 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	338 else
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	339 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	340 $out =
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	341 "<p>".join("; ", $classInfo["general"]).
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	342 //" [".cmQM("viikossa", $classInfo["totalHours"])."]".
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	343 "</p>\n".
144 f64a46fa7961 Rename some CSS elements. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	344 "<table id=\"timeTable\">\n".
f64a46fa7961 Rename some CSS elements. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	345 " <tr>\n".
f64a46fa7961 Rename some CSS elements. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	346 " <th></th>\n";
128 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 $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	349 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	350
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	351 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	352 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	353 $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	354 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	355 $out .= " </tr>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	356 $startDay = 0;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	357 $lastDay = $classInfo["maxDays"];
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 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	362 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	363 $out .= " <tr>\n".
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	364 " <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	365 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	366 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	367 $id = lukFindClass($day, $hour);
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	368 if ($id > 0)
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	369 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	370 $class = &$classHourDefs[$id];
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	371 if (!isset($class["set"]))
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	372 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	373 $class["set"] = TRUE;
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	374
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	375 $nextActive = $day == $currDay &&
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	376 $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	377 $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	378
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	379 $isActive = $day == $currDay &&
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	380 $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	381 $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	382
141 36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	383 $out .= " <td rowspan=\"".$class["hours"]."\" ".
36fb1ce941d5 Add more information as a title attribute. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	384 "title=\"".lukClassGetHourStr($hour, $hour + $class["hours"] - 1)."\" class=\"".
128 0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	385 ($isActive ? "clactive " : "").
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	386 (!$isActive && $nextActive ? "clnext " : "").
145 c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	387 (($class["grouped"] \|\| $class["turns"]) ? "clgrouped" : "clnormal")."\">".
c028506aa9cc Separate the concepts of "every other week" classes and split group classes. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	388 lukGetClassInfo($class).
128 0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	389 "<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	390 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	391 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	392 else
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	393 {
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	394 $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	395 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	396 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	397 $out .= " </tr>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	398 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	399
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	400 return $out."</table>\n";
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	401 }
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	402
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	403
0f451151b9f1 Move code for one function to same group as others. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	404
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	405 //
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	406 // 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	407 //
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	408 // 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	409 // 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	410 // 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	411 //
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	412
142 0e8b8fac920d Check request instead of $_GET. Matti Hamalainen <ccr@tnsp.org> parents: 141 diff changeset	413 if (($tmp = stGetRequestItem("lang", FALSE, TRUE)) !== FALSE)
87 8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	414 {
142 0e8b8fac920d Check request instead of $_GET. Matti Hamalainen <ccr@tnsp.org> parents: 141 diff changeset	415 $tmp = strtolower($tmp);
87 8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	416 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	417 {
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	418 $pageLang = $tmp;
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	419 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	420 }
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	421 }
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	422 else
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	423 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	424 {
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	425 $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	426 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	427 $pageLang = $tmp;
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	428 }
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	429
8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	430
143 d70c899b0571 Remove mobile mode, and another $_GET. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	431 // Check class setting
d70c899b0571 Remove mobile mode, and another $_GET. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	432 if (($classID = stGetRequestItem("luokka", FALSE, TRUE)) !== FALSE && lukCheckClassID($classID))
83 85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	433 {
143 d70c899b0571 Remove mobile mode, and another $_GET. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	434 setcookie("lukluokka", $classID, time() + 3652460*60); // expire in a year
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 if (isset($_COOKIE["lukluokka"]))
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	438 {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	439 $classID = $_COOKIE["lukluokka"];
31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	440 lukCheckClassID($classID);
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	441 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	442 else
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	443 {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	444 stError(cmQM("classNotSet", $classDefaultID));
31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	445 $classID = $classDefaultID;
39 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
78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	448
87 8743ff5302ce Add some comments, check language setting first to have the proper language Matti Hamalainen <ccr@tnsp.org> parents: 86 diff changeset	449 // Check next period flag
142 0e8b8fac920d Check request instead of $_GET. Matti Hamalainen <ccr@tnsp.org> parents: 141 diff changeset	450 if (isset($_REQUEST["next"]))
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	451 {
39 78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	452 $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	453 $cachePath = "cache-next/";
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	454 }
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	455 else
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	456 {
39 78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	457 $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	458 $cachePath = "cache/";
c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	459 }
c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	460
c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	461 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	462 {
c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	463 require $cachePath."baseuri.data";
39 78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	464 }
78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	465
78d0c1cd7282 Add support for upcoming period data. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	466
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	467 // Global cache for course data
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	468 $cache = array();
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	469 $cacheDirty = FALSE;
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	470
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	471 // 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	472 $fp = @fopen($courseCacheFile, "rb");
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	473 if ($fp)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	474 {
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	475 if (flock($fp, LOCK_SH))
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	476 {
82 c553ad61e9c2 Make original data links work for both current and next period mode. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	477 require($courseCacheFile);
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	478 flock($fp, LOCK_UN);
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	479 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	480 fclose($fp);
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	481 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	482
43 7621bfc47491 Various bits and pieces -- a commit that defies logic. Oh well. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	483
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	484 // Read classfile
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	485 if (($classIDs = lukReadClassFile($classIDFile, &$timestamp)) === false)
139 0ccb459aaecb Oops. stQM() should've beem cmQM(). Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	486 stError(cmQM("classListNotFound"));
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	487
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	488
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	489 // Read class data
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	490 $dataFile = $cachePath.$classID.".data";
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	491 if (!file_exists($dataFile))
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	492 {
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	493 stError(cmQM("classDataNotFound", chentities($classID)));
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	494 $haveData = FALSE;
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	495 }
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	496 else
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	497 {
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	498 require($dataFile);
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	499 $haveData = isset($classInfo);
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	500 }
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	501
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	502
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	503 // Set some variables
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	504 $pageTitle = $haveData ? $classID." / ".join("; ", $classInfo["info"]) : $classID;
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	505
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	506
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	507 // Create references to mobile device (Apple touch) icons
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	508 $extra = "";
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	509 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	510 {
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	511 $extra .= " <link rel=\"apple-touch-icon\" ".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	512 ($addSize ? "sizes=\"".$iconSize."x".$iconSize."\" " : "").
110 7d77d21873d1 Add mobile/Apple "touch icons". Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	513 "href=\"img/icon-".$iconSize."-precomposed.png\" />\n";
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	514 }
18 e0f1a5861f28 Fixes, cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 17 diff changeset	515
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	516
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	517 // Start printing the page
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	518 cmPrintPageHeader($pageTitle, $extra);
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	519
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	520
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	521 // Info box
130 7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	522 echo
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	523 "<div id=\"infobox\">\n".
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	524 " <div id=\"ctitle\">OAMK Lukkari v".$pageVersion."</div>\n";
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	525
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	526 if (!$mobileMode)
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	527 {
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	528 echo
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	529 " <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	530
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	531 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	532 {
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	533 echo
131 31347f83cbea Bugfix generated HTML. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	534 "<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	535 "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	536 }
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	537
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	538 echo
130 7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	539 "</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	540 }
b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	541
130 7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	542 echo
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	543 " <div id=\"clang\">";
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	544
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	545 foreach ($pageLanguages as $id)
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	546 {
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	547 echo
131 31347f83cbea Bugfix generated HTML. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	548 "<a ".(($pageLang == $id) ? "class=\"selected\" " : "").
130 7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	549 "href=\"".$baseURI."?lang=".$id."\">".$id."</a>";
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	550 }
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	551
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	552 echo
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	553 "</div>\n".
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	554 "</div>\n";
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	555
7cfe0770168f Sync infobox snippets from mluk. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	556
129 b9ebc24f27fd Move some code around a bit, to make mobile mode integration easier. Matti Hamalainen <ccr@tnsp.org> parents: 128 diff changeset	557 // Additional controls
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	558 echo
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	559 "<form id=\"controls\" action=\"".$baseURI."\" method=\"get\">\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	560 " <table>\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	561 " <tr>\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	562 " <th>\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	563 " <select name=\"luokka\">\n";
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	564
140 26d266a685ed Fix handling of class selection when no class list is available. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	565 if ($classIDs !== FALSE)
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	566 {
140 26d266a685ed Fix handling of class selection when no class list is available. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	567 foreach ($classIDs as $id)
26d266a685ed Fix handling of class selection when no class list is available. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	568 {
26d266a685ed Fix handling of class selection when no class list is available. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	569 echo
26d266a685ed Fix handling of class selection when no class list is available. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	570 " <option ".($classID == $id ? "selected=\"selected\" " : "").
26d266a685ed Fix handling of class selection when no class list is available. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	571 "value=\"".$id."\">".chentities($id)."</option>\n";
26d266a685ed Fix handling of class selection when no class list is available. Matti Hamalainen <ccr@tnsp.org> parents: 139 diff changeset	572 }
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	573 }
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	574
30 6148ce4a83ed Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	575 echo
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	576 " </select>\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	577 " </th>\n".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	578 " <th><input class=\"submit\" type=\"submit\" value=\"".cmQM("Switch")."\" /></th>\n";
17 611452d30bd4 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	579
83 85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	580 if (!$mobileMode)
85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	581 {
96 0ba79f50e604 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	582 echo
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	583 " <th><a id=\"next\" class=\"textctrl\" href=\"".$baseURI.($nextPeriod ? "" : "?next")."\">".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	584 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	585 "</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	586
6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	587 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	588 {
6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	589 echo
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	590 " <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	591 //" <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	592 }
6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	593
6f7a2f9dcad4 Fix some errors due to undefined variables in case the class data is not Matti Hamalainen <ccr@tnsp.org> parents: 133 diff changeset	594 echo
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	595 " <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	596 }
78 2f9c78c68a2c Add link to the XML. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	597
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	598 $currURL = $baseURI."?luokka=".$classID."&lang=".$pageLang.
123 ad7ccdd904b7 Fix some HTML. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	599 (isset($pageCSSIndex) ? "&css=".$pageCSSIndex : "").
ad7ccdd904b7 Fix some HTML. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	600 ($nextPeriod ? "&next" : "");
119 78b4eb3a9719 Add link to the page with current settings, etc. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	601
96 0ba79f50e604 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	602 echo
126 d954c4d34a3f Message adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 123 diff changeset	603 " <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	604 // " <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	605 " <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	606 " </tr>\n".
0ba79f50e604 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	607 " </table>\n".
0ba79f50e604 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	608 "</form>\n".
121 a6af6538777a Add "last updated" timestamps and version stuff. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	609 "<h1>".$pageTitle."</h1>\n";
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	610
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611 // Show error messages
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	612 if ($errorSet)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	613 {
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614 echo "<ul>\n";
44 57af36f0864e Rename some functions + reindentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	615 foreach ($errorMsgs as $msg)
135 31ba82aabbba Backport some cleanups from 3.0. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	616 echo "<li>".$msg."</li>\n";
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617 echo "</ul>\n";
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	620 if ($haveData)
aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	621 {
83 85068c8513b4 Add back mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	622 echo lukPrintTimeTable($mobileMode);
59 aa201ddd33dd Cleaned up, v2.0 beta. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	623 }
5 3d6a83eaa2ba Improvements. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	624
73 241839ebb09f More cleanups, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	625 echo
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	626 "<div id=\"footer\">".
9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	627 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	628 " / ".
133 ad10ab39e2d1 Fix date stamp. Matti Hamalainen <ccr@tnsp.org> parents: 131 diff changeset	629 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	630 //" <div style=\"color: red;\">".cmQM("beta", $pageVersion)."</div>\n".
107 9f976ae7a3e2 Reformat, modularize, cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	631 "</div>\n";
84 adaad33f929c Improve mobile mode. Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	632
98 6a7172b3a841 Update to match the main page API. Matti Hamalainen <ccr@tnsp.org> parents: 96 diff changeset	633 cmPrintPageFooter();
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	634
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	635
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	636 // 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	637 if ($cacheDirty)
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	638 {
6900beff8789 Improve multi-language support. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	639 $str = "<?\n\$cache = ".var_export($cache, TRUE)."\n?>";
114 09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	640 if (file_put_contents($courseCacheFile, $str, LOCK_EX) === FALSE)
09d811e4387d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	641 {
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	642 // Can't do much anything here ..
1 21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	643 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	644 }
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	645
21fde93375e9 Add beta code. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	646 ?>

Mercurial > hg > lukkari

annotate index.php @ 145:c028506aa9cc