Mercurial > hg > mgallery
changeset 252:f85870271f51
Simplify mgGetNaviActive() a bit.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 12 Dec 2018 13:02:07 +0200 |
| parents | 19dab8b0c340 |
| children | 5b41efcec87d |
| files | mgallery.php |
| diffstat | 1 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/mgallery.php Wed Dec 12 12:40:57 2018 +0200 +++ b/mgallery.php Wed Dec 12 13:02:07 2018 +0200 @@ -211,15 +211,13 @@ } -function mgGetNaviActive(&$galIndex, $index, $delta, &$res, &$url, $entities) +function mgGetNaviActive(&$galIndex, $index, $delta, &$res, $entities) { global $galPath; $res = $index + $delta; + if ($res >= 0 && $res <= sizeof($galIndex) - 1) - { - $url = mgGetURL($galPath, $galIndex[$res], $entities); - return TRUE; - } + return mgGetURL($galPath, $galIndex[$res], $entities); else return FALSE; } @@ -244,9 +242,7 @@ function mgGetNaviControlImageBox(&$galIndex, $index, $class, $delta) { - if (!mgGetNaviActive($galIndex, $index, $delta, $res, $url, TRUE)) - $url = FALSE; - + $url = mgGetNaviActive($galIndex, $index, $delta, $res, TRUE); return mgGetNaviControlImage($galIndex, $res, $class, $url); } @@ -593,12 +589,12 @@ // Javascript navigation if ($ctrlFlags & MGF_JAVASCRIPT) { - $prevActive = mgGetNaviActive($galImagesIndex, $index, -1, $res, $prevURL, FALSE); - $nextActive = mgGetNaviActive($galImagesIndex, $index, 1, $res, $nextURL, FALSE); + $prevURL = mgGetNaviActive($galImagesIndex, $index, -1, $res, FALSE); + $nextURL = mgGetNaviActive($galImagesIndex, $index, 1, $res, FALSE); echo "<script>\n". - "var mgalPrevURL = \"".($prevActive ? $prevURL : "")."\";\n". - "var mgalNextURL = \"".($nextActive ? $nextURL : "")."\";\n". + "var mgalPrevURL = \"".($prevActive !== FALSE ? $prevURL : "")."\";\n". + "var mgalNextURL = \"".($nextActive !== FALSE ? $nextURL : "")."\";\n". "var mgalUpURL = \"".mgGetURL($galData["path"], FALSE)."\";\n". "\n"; ?>