Mercurial > hg > mgallery
comparison mgallery.php @ 322:2f4e3e458714
Improve configuration handling, and add "string array" configuration item type.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 09 Apr 2020 11:55:08 +0300 |
parents | f07e3d79c421 |
children | 23625c53e62d |
comparison
equal
deleted
inserted
replaced
321:f07e3d79c421 | 322:2f4e3e458714 |
---|---|
138 " <link rel=\"stylesheet\" href=\"".mgMangleURI($filename). | 138 " <link rel=\"stylesheet\" href=\"".mgMangleURI($filename). |
139 "\" type=\"text/css\" ".($media !== FALSE ? "media=\"".$media."\"": "")." />\n"; | 139 "\" type=\"text/css\" ".($media !== FALSE ? "media=\"".$media."\"": "")." />\n"; |
140 } | 140 } |
141 | 141 |
142 | 142 |
143 function mgPrintPageHeader($pageTitle, $pageClass) | 143 function mgGetJSLine($filename) |
144 { | 144 { |
145 global $pageCSS, $pageCharset, $pageUrchin, $pageJSFile, $pageLang; | 145 return |
146 " <script src=\"".mgMangleURI($filename)."\"></script>\n"; | |
147 } | |
148 | |
149 | |
150 function mgIncludeUrchin($filename) | |
151 { | |
152 if (file_exists($filename)) | |
153 require_once $filename; | |
154 } | |
155 | |
156 | |
157 function mgPrintPageHeader($pageTitle, $pageDivID) | |
158 { | |
159 global $pageCSS, $pageCharset, $pageUrchin, $pageJS, $pageLang; | |
146 | 160 |
147 echo | 161 echo |
148 "<!DOCTYPE html>\n". | 162 "<!DOCTYPE html>\n". |
149 "<html lang=\"".$pageLang."\">\n". | 163 "<html lang=\"".$pageLang."\">\n". |
150 "<head>\n". | 164 "<head>\n". |
151 " <meta charset=\"".$pageCharset."\">\n". | 165 " <meta charset=\"".$pageCharset."\">\n". |
152 // Setting the viewport makes things break especially with the | 166 // Setting the viewport makes things break especially with the |
153 // text-size-adjust CSS settings... so we don't use it. | 167 // text-size-adjust CSS settings... so we don't use it. |
168 // XXX: We do now. For now. | |
154 " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n". | 169 " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n". |
155 " <script src=\"".mgMangleURI($pageJSFile)."\"></script>\n". | |
156 " <title>".strip_tags($pageTitle)."</title>\n". | 170 " <title>".strip_tags($pageTitle)."</title>\n". |
157 mgGetCSSLine($pageCSS, FALSE). | 171 (is_array($pageJS) ? array_map('mgGetJSLine', $pageJS) : mgGetJSLine($pageJS)). |
172 (is_array($pageCSS) ? array_map('mgGetCSSLine', $pageCSS) : mgGetCSSLine($pageCSS, FALSE)). | |
158 "</head>\n". | 173 "</head>\n". |
159 "<body>\n"; | 174 "<body>\n"; |
160 | 175 |
161 if ($pageUrchin !== FALSE && file_exists($pageUrchin)) | 176 if ($pageUrchin !== NULL) |
162 require_once $pageUrchin; | 177 { |
178 if (is_array($pageUrchin)) | |
179 { | |
180 foreach ($pageUrchin as $filename) | |
181 mgIncludeUrchin($filename); | |
182 } | |
183 else | |
184 mgIncludeUrchin($pageUrchin); | |
185 } | |
163 | 186 |
164 echo | 187 echo |
165 "<div id=\"".$pageClass."\">\n"; | 188 "<div id=\"".$pageDivID."\">\n"; |
166 } | 189 } |
167 | 190 |
168 | 191 |
169 function mgPrintPageFooter() | 192 function mgPrintPageFooter() |
170 { | 193 { |
458 mgPrintPageFooter(); | 481 mgPrintPageFooter(); |
459 exit; | 482 exit; |
460 } | 483 } |
461 | 484 |
462 $pageCSS = mgGetSetting("css"); | 485 $pageCSS = mgGetSetting("css"); |
463 $pageJSFile = mgGetSetting("js_file"); | 486 $pageJS = mgGetSetting("js_file"); |
464 $pageUrchin = mgGetSetting("urchin_file"); | 487 $pageUrchin = mgGetSetting("urchin_file"); |
465 $galBasePath = mgGetSetting("base_path"); | 488 $galBasePath = mgGetSetting("base_path"); |
466 $galBaseURL = mgGetSetting("base_url"); | 489 $galBaseURL = mgGetSetting("base_url"); |
467 $galImageURL = mgGetSetting("image_url", mgGetSetting("base_url")); | 490 $galImageURL = mgGetSetting("image_url", mgGetSetting("base_url")); |
468 | 491 |