# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1409155249 -10800
# Node ID 31ba82aabbba1902e549660b137915123cbfcf04
# Parent  6f7a2f9dcad42b45693989e29e33fd839c38462c
Backport some cleanups from 3.0.

diff -r 6f7a2f9dcad4 -r 31ba82aabbba index.php
--- a/index.php	Wed Aug 27 18:57:37 2014 +0300
+++ b/index.php	Wed Aug 27 19:00:49 2014 +0300
@@ -14,7 +14,7 @@
 $pageCSSData = array("cookie" => "lukcss", "prefix" => $baseURI."luk");
 $pageCSSAlts = array("blue" => "1", "old" => "2", "purple" => "3", "dark" => "4");
 
-$classDefault = "TTE1SNO";
+$classDefaultID = "TTE1SNO";
 $classIDFile = "classes.txt";
 $courseCacheFile = "coursecache.txt";
 
@@ -100,14 +100,14 @@
 
 function lukCheckClassID(&$id)
 {
-  global $classDefault;
+  global $classDefaultID;
   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))
   {
     $id = $m[1];
     return TRUE;
   } else {
-    stError(cmQM("classFormatError", $classDefault));
-    $id = $classDefault;
+    stError(cmQM("classFormatError", $classDefaultID));
+    $id = $classDefaultID;
     return FALSE;
   }
 }
@@ -408,22 +408,22 @@
 // Check class setting
 if (isset($_GET["luokka"]))
 {
-  $luokka = $_GET["luokka"];
-  if (lukCheckClassID($luokka))
+  $classID = $_GET["luokka"];
+  if (lukCheckClassID($classID))
   {
-    setcookie("lukluokka", $luokka, time() + 365*24*60*60); // expire in a year
+    setcookie("lukluokka", $classID, time() + 365*24*60*60); // expire in a year
   }
 }
 else
 if (isset($_COOKIE["lukluokka"]))
 {
-  $luokka = $_COOKIE["lukluokka"];
-  lukCheckClassID($luokka);
+  $classID = $_COOKIE["lukluokka"];
+  lukCheckClassID($classID);
 }
 else
 {
-  stError(cmQM("classNotSet", $classDefault));
-  $luokka = $classDefault;
+  stError(cmQM("classNotSet", $classDefaultID));
+  $classID = $classDefaultID;
 }
 
 
@@ -463,15 +463,15 @@
 
 
 // Read classfile
-if (($classes = lukReadClassFile($classIDFile, &$timestamp)) === false)
+if (($classIDs = lukReadClassFile($classIDFile, &$timestamp)) === false)
   stError(stQM("classListNotFound"));
 
 
 // Read class data
-$dataFile = $cachePath.$luokka.".data";
+$dataFile = $cachePath.$classID.".data";
 if (!file_exists($dataFile))
 {
-  stError(cmQM("classDataNotFound", chentities($luokka)));
+  stError(cmQM("classDataNotFound", chentities($classID)));
   $haveData = FALSE;
 }
 else
@@ -482,7 +482,7 @@
 
 
 // Set some variables
-$pageTitle = $haveData ? $luokka." / ".join("; ", $classInfo["info"]) : $luokka;
+$pageTitle = $haveData ? $classID." / ".join("; ", $classInfo["info"]) : $classID;
 
 
 // Create references to mobile device (Apple touch) icons
@@ -535,8 +535,6 @@
   "</div>\n";
 
 
-
-
 // Additional controls
 echo
   "<form id=\"controls\" action=\"".$baseURI."\" method=\"get\">\n".
@@ -545,12 +543,13 @@
   "   <th>\n".
   "    <select name=\"luokka\">\n";
 
-foreach ($classes as $class)
+foreach ($classIDs as $id)
 {
   echo
-    "     <option ".($luokka == $class ? "selected=\"selected\" " : "").
-    "value=\"".$class."\">".chentities($class)."</option>\n";
+    "     <option ".($classID == $id ? "selected=\"selected\" " : "").
+    "value=\"".$id."\">".chentities($id)."</option>\n";
 }
+
 echo 
   "    </select>\n".
   "   </th>\n".
@@ -566,7 +565,7 @@
   if ($haveData)
   {
     echo
-    "   <th><a id=\"orig\" class=\"textctrl\" href=\"".$origBaseURI.$luokka.$origBaseExt."\">".cmQM("Original")."</a></th>\n";
+    "   <th><a id=\"orig\" class=\"textctrl\" href=\"".$origBaseURI.$classID.$origBaseExt."\">".cmQM("Original")."</a></th>\n";
     //"   <th><a id=\"xml\" class=\"textctrl\" href=\"".$baseURI.$cachePath."/".$luokka.".xml\">XML</a></th>\n";
   }
   
@@ -574,7 +573,7 @@
     "   <th><a class=\"textctrl mobile\" href=\"http://tnsp.org/mluk/\">Mobile</a></th>\n";
 }
 
-$currURL = $baseURI."?luokka=".$luokka."&amp;lang=".$pageLang.
+$currURL = $baseURI."?luokka=".$classID."&amp;lang=".$pageLang.
   (isset($pageCSSIndex) ? "&amp;css=".$pageCSSIndex : "").
   ($nextPeriod ? "&amp;next" : "");
 
@@ -592,7 +591,7 @@
 {
   echo "<ul>\n";
   foreach ($errorMsgs as $msg)
-    echo "<li>$msg</li>\n";
+    echo "<li>".$msg."</li>\n";
   echo "</ul>\n";
 }