comparison 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
comparison
equal deleted inserted replaced
134:6f7a2f9dcad4 135:31ba82aabbba
12 $pageLang = "fi"; 12 $pageLang = "fi";
13 $pageLanguages = array("fi", "en"); 13 $pageLanguages = array("fi", "en");
14 $pageCSSData = array("cookie" => "lukcss", "prefix" => $baseURI."luk"); 14 $pageCSSData = array("cookie" => "lukcss", "prefix" => $baseURI."luk");
15 $pageCSSAlts = array("blue" => "1", "old" => "2", "purple" => "3", "dark" => "4"); 15 $pageCSSAlts = array("blue" => "1", "old" => "2", "purple" => "3", "dark" => "4");
16 16
17 $classDefault = "TTE1SNO"; 17 $classDefaultID = "TTE1SNO";
18 $classIDFile = "classes.txt"; 18 $classIDFile = "classes.txt";
19 $courseCacheFile = "coursecache.txt"; 19 $courseCacheFile = "coursecache.txt";
20 20
21 $lukDayNames = array( 21 $lukDayNames = array(
22 "fi" => array("Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai", "Sunnuntai"), 22 "fi" => array("Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai", "Sunnuntai"),
98 } 98 }
99 99
100 100
101 function lukCheckClassID(&$id) 101 function lukCheckClassID(&$id)
102 { 102 {
103 global $classDefault; 103 global $classDefaultID;
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)) 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))
105 { 105 {
106 $id = $m[1]; 106 $id = $m[1];
107 return TRUE; 107 return TRUE;
108 } else { 108 } else {
109 stError(cmQM("classFormatError", $classDefault)); 109 stError(cmQM("classFormatError", $classDefaultID));
110 $id = $classDefault; 110 $id = $classDefaultID;
111 return FALSE; 111 return FALSE;
112 } 112 }
113 } 113 }
114 114
115 115
406 */ 406 */
407 407
408 // Check class setting 408 // Check class setting
409 if (isset($_GET["luokka"])) 409 if (isset($_GET["luokka"]))
410 { 410 {
411 $luokka = $_GET["luokka"]; 411 $classID = $_GET["luokka"];
412 if (lukCheckClassID($luokka)) 412 if (lukCheckClassID($classID))
413 { 413 {
414 setcookie("lukluokka", $luokka, time() + 365*24*60*60); // expire in a year 414 setcookie("lukluokka", $classID, time() + 365*24*60*60); // expire in a year
415 } 415 }
416 } 416 }
417 else 417 else
418 if (isset($_COOKIE["lukluokka"])) 418 if (isset($_COOKIE["lukluokka"]))
419 { 419 {
420 $luokka = $_COOKIE["lukluokka"]; 420 $classID = $_COOKIE["lukluokka"];
421 lukCheckClassID($luokka); 421 lukCheckClassID($classID);
422 } 422 }
423 else 423 else
424 { 424 {
425 stError(cmQM("classNotSet", $classDefault)); 425 stError(cmQM("classNotSet", $classDefaultID));
426 $luokka = $classDefault; 426 $classID = $classDefaultID;
427 } 427 }
428 428
429 429
430 // Check next period flag 430 // Check next period flag
431 if (isset($_GET["next"])) 431 if (isset($_GET["next"]))
461 fclose($fp); 461 fclose($fp);
462 } 462 }
463 463
464 464
465 // Read classfile 465 // Read classfile
466 if (($classes = lukReadClassFile($classIDFile, &$timestamp)) === false) 466 if (($classIDs = lukReadClassFile($classIDFile, &$timestamp)) === false)
467 stError(stQM("classListNotFound")); 467 stError(stQM("classListNotFound"));
468 468
469 469
470 // Read class data 470 // Read class data
471 $dataFile = $cachePath.$luokka.".data"; 471 $dataFile = $cachePath.$classID.".data";
472 if (!file_exists($dataFile)) 472 if (!file_exists($dataFile))
473 { 473 {
474 stError(cmQM("classDataNotFound", chentities($luokka))); 474 stError(cmQM("classDataNotFound", chentities($classID)));
475 $haveData = FALSE; 475 $haveData = FALSE;
476 } 476 }
477 else 477 else
478 { 478 {
479 require($dataFile); 479 require($dataFile);
480 $haveData = isset($classInfo); 480 $haveData = isset($classInfo);
481 } 481 }
482 482
483 483
484 // Set some variables 484 // Set some variables
485 $pageTitle = $haveData ? $luokka." / ".join("; ", $classInfo["info"]) : $luokka; 485 $pageTitle = $haveData ? $classID." / ".join("; ", $classInfo["info"]) : $classID;
486 486
487 487
488 // Create references to mobile device (Apple touch) icons 488 // Create references to mobile device (Apple touch) icons
489 $extra = ""; 489 $extra = "";
490 foreach (array(57 => FALSE, 76 => TRUE, 114 => TRUE, 120 => TRUE, 152 => TRUE) as $iconSize => $addSize) 490 foreach (array(57 => FALSE, 76 => TRUE, 114 => TRUE, 120 => TRUE, 152 => TRUE) as $iconSize => $addSize)
531 } 531 }
532 532
533 echo 533 echo
534 "</div>\n". 534 "</div>\n".
535 "</div>\n"; 535 "</div>\n";
536
537
538 536
539 537
540 // Additional controls 538 // Additional controls
541 echo 539 echo
542 "<form id=\"controls\" action=\"".$baseURI."\" method=\"get\">\n". 540 "<form id=\"controls\" action=\"".$baseURI."\" method=\"get\">\n".
543 " <table>\n". 541 " <table>\n".
544 " <tr>\n". 542 " <tr>\n".
545 " <th>\n". 543 " <th>\n".
546 " <select name=\"luokka\">\n"; 544 " <select name=\"luokka\">\n";
547 545
548 foreach ($classes as $class) 546 foreach ($classIDs as $id)
549 { 547 {
550 echo 548 echo
551 " <option ".($luokka == $class ? "selected=\"selected\" " : ""). 549 " <option ".($classID == $id ? "selected=\"selected\" " : "").
552 "value=\"".$class."\">".chentities($class)."</option>\n"; 550 "value=\"".$id."\">".chentities($id)."</option>\n";
553 } 551 }
552
554 echo 553 echo
555 " </select>\n". 554 " </select>\n".
556 " </th>\n". 555 " </th>\n".
557 " <th><input class=\"submit\" type=\"submit\" value=\"".cmQM("Switch")."\" /></th>\n"; 556 " <th><input class=\"submit\" type=\"submit\" value=\"".cmQM("Switch")."\" /></th>\n";
558 557
564 "</a></th>\n"; 563 "</a></th>\n";
565 564
566 if ($haveData) 565 if ($haveData)
567 { 566 {
568 echo 567 echo
569 " <th><a id=\"orig\" class=\"textctrl\" href=\"".$origBaseURI.$luokka.$origBaseExt."\">".cmQM("Original")."</a></th>\n"; 568 " <th><a id=\"orig\" class=\"textctrl\" href=\"".$origBaseURI.$classID.$origBaseExt."\">".cmQM("Original")."</a></th>\n";
570 //" <th><a id=\"xml\" class=\"textctrl\" href=\"".$baseURI.$cachePath."/".$luokka.".xml\">XML</a></th>\n"; 569 //" <th><a id=\"xml\" class=\"textctrl\" href=\"".$baseURI.$cachePath."/".$luokka.".xml\">XML</a></th>\n";
571 } 570 }
572 571
573 echo 572 echo
574 " <th><a class=\"textctrl mobile\" href=\"http://tnsp.org/mluk/\">Mobile</a></th>\n"; 573 " <th><a class=\"textctrl mobile\" href=\"http://tnsp.org/mluk/\">Mobile</a></th>\n";
575 } 574 }
576 575
577 $currURL = $baseURI."?luokka=".$luokka."&amp;lang=".$pageLang. 576 $currURL = $baseURI."?luokka=".$classID."&amp;lang=".$pageLang.
578 (isset($pageCSSIndex) ? "&amp;css=".$pageCSSIndex : ""). 577 (isset($pageCSSIndex) ? "&amp;css=".$pageCSSIndex : "").
579 ($nextPeriod ? "&amp;next" : ""); 578 ($nextPeriod ? "&amp;next" : "");
580 579
581 echo 580 echo
582 " <th><a href=\"".$currURL."\" class=\"textctrl\" title=\"".cmQM("currLukLink")."\">Link</a></th>\n". 581 " <th><a href=\"".$currURL."\" class=\"textctrl\" title=\"".cmQM("currLukLink")."\">Link</a></th>\n".
590 // Show error messages 589 // Show error messages
591 if ($errorSet) 590 if ($errorSet)
592 { 591 {
593 echo "<ul>\n"; 592 echo "<ul>\n";
594 foreach ($errorMsgs as $msg) 593 foreach ($errorMsgs as $msg)
595 echo "<li>$msg</li>\n"; 594 echo "<li>".$msg."</li>\n";
596 echo "</ul>\n"; 595 echo "</ul>\n";
597 } 596 }
598 597
599 if ($haveData) 598 if ($haveData)
600 { 599 {