changeset 167:605c891870fa

Cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 01 Mar 2018 14:31:55 +0200
parents d8387b48b08d
children ba02d12cb4be
files mgallery.php
diffstat 1 files changed, 13 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/mgallery.php	Thu Mar 01 14:01:49 2018 +0200
+++ b/mgallery.php	Thu Mar 01 14:31:55 2018 +0200
@@ -93,9 +93,9 @@
 }
 
 
-function mgPrintCSSLine($filename, $media = FALSE)
+function mgGetCSSLine($filename, $media = FALSE)
 {
-  echo
+  return
     "  <link rel=\"stylesheet\" href=\"".$filename.
     "\" type=\"text/css\" ".($media !== FALSE ? "media=\"".$media."\"": "")." />\n";
 }
@@ -106,28 +106,17 @@
   global $pageCSS, $pageCharset, $pageUrchin, $pageJSFile;
 
   echo
-  "<!DOCTYPE html>\n".
-  "<html>\n".
-  "<head>\n".
-  "  <meta charset=\"".$pageCharset."\">\n".
-  "  <meta http-equiv=\"Content-type\" content=\"text/html;charset=".$pageCharset."\">\n".
-  "  <script type=\"text/javascript\" src=\"".$pageJSFile."\"></script>\n".
-  "  <title>".strip_tags($pageTitle)."</title>\n".
-  $pageExtra;
-
-  if (is_array($pageCSS))
-  {
-    foreach ($pageCSS as $uri => $media)
-      mgPrintCSSLine($uri, $media);
-  }
-  else
-  {
-    mgPrintCSSLine($pageCSS, FALSE);
-  }
-
-  echo
-  "</head>\n".
-  "<body>\n";
+    "<!DOCTYPE html>\n".
+    "<html>\n".
+    "<head>\n".
+    "  <meta charset=\"".$pageCharset."\">\n".
+    "  <meta http-equiv=\"Content-type\" content=\"text/html;charset=".$pageCharset."\">\n".
+    "  <script type=\"text/javascript\" src=\"".$pageJSFile."\"></script>\n".
+    "  <title>".strip_tags($pageTitle)."</title>\n".
+    mgGetCSSLine($pageCSS, FALSE).
+    $pageExtra.
+    "</head>\n".
+    "<body>\n";
 
   if ($pageUrchin !== FALSE && file_exists($pageUrchin))
     require_once $pageUrchin;