Mercurial > hg > lukkari
changeset 188:658422c83b49
Change the class setting request parameter and cookie from "luokka" to
"class", but also support the old one for backwards compatibility for now.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 13 Jan 2016 08:17:10 +0200 |
| parents | 3fca160af8a5 |
| children | bc0d7a5d7b8e |
| files | index.php |
| diffstat | 1 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/index.php Wed Dec 30 11:01:56 2015 +0200 +++ b/index.php Wed Jan 13 08:17:10 2016 +0200 @@ -498,15 +498,16 @@ } -// Check class setting -if (($classID = stGetRequestItem("luokka", FALSE, TRUE)) !== FALSE && lukCheckClassID($classID)) +// Check class setting (check "luokka" for backwards compatibility also) +if ((($classID = stGetRequestItem("class", FALSE, TRUE)) !== FALSE || + ($classID = stGetRequestItem("luokka", FALSE, TRUE)) !== FALSE) && lukCheckClassID($classID)) { - setcookie("lukluokka", $classID, time() + 365*24*60*60); // expire in a year + setcookie("lukclass", $classID, time() + 365*24*60*60); // expire in a year } else -if (isset($_COOKIE["lukluokka"])) +if (isset($_COOKIE["lukclass"])) { - $classID = $_COOKIE["lukluokka"]; + $classID = $_COOKIE["lukclass"]; lukCheckClassID($classID); } else @@ -631,7 +632,7 @@ " <table>\n". " <tr>\n". " <th>\n". - " <select name=\"luokka\">\n"; + " <select name=\"class\">\n"; if ($classIDs !== FALSE) { @@ -660,14 +661,14 @@ { echo " <th><a id=\"orig\" class=\"textctrl\" href=\"".$origBaseURI.$classID.$origBaseExt."\" title=\"".cmQM("expl_link_original_data")."\">".cmQM("link_original_data")."</a></th>\n"; - //" <th><a id=\"xml\" class=\"textctrl\" href=\"".$baseURI.$cachePath."/".$luokka.".xml\">XML</a></th>\n"; + //" <th><a id=\"xml\" class=\"textctrl\" href=\"".$baseURI.$cachePath."/".$class.".xml\">XML</a></th>\n"; } echo " <th><a class=\"textctrl mobile\" href=\"http://tnsp.org/mluk/\" title=\"".cmQM("expl_link_mobile_version")."\">".cmQM("link_mobile_version")."</a></th>\n"; } -$currURL = $baseURI."?luokka=".$classID."&lang=".$pageLang. +$currURL = $baseURI."?class=".$classID."&lang=".$pageLang. (isset($pageCSSIndex) ? "&css=".$pageCSSIndex : ""). ($nextPeriod ? "&next" : "");