Mercurial > hg > fapweb

changeset 574:463189fc05ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some changes from custom site system branch.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 20 Sep 2014 01:50:50 +0300
parents 65597d34e8da
children 1ec34a220df3
files msitegen.inc.php
diffstat 1 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/msitegen.inc.php	Sat May 24 20:46:52 2014 +0300
+++ b/msitegen.inc.php	Sat Sep 20 01:50:50 2014 +0300
@@ -657,12 +657,11 @@
 }
 
 
-
-function cmPrintCSSLine($uri, $media = "")
+function cmPrintCSSLine($filename, $media = FALSE)
 {
   echo
-    "  <link rel=\"stylesheet\" href=\"css/".$uri.
-    "\" type=\"text/css\" ".($media != "" ? "media=\"".$media."\"": "")." />\n";
+    "  <link rel=\"stylesheet\" href=\"".$filename.
+    "\" type=\"text/css\" ".($media !== FALSE ? "media=\"".$media."\"": "")." />\n";
 }
 
 
@@ -686,18 +685,21 @@
   }
   else
   {
-    cmPrintCSSLine($pageCSS);
+    cmPrintCSSLine($pageCSS, FALSE);
   }
 
   echo
   "</head>\n".
   "<body>\n";
 
-  if (isset($pageUrchin))
+  if (isset($pageUrchin) && file_exists($pageUrchin))
     require_once $pageUrchin;
+  else
+  if (file_exists("urchin.inc.php"))
+    require_once "urchin.inc.php";
 
   echo "<div id=\"messageBox\"></div>\n";
-  
+
   if ($useContents)
     echo "<div id=\"contents\">\n";
 }
@@ -794,8 +796,8 @@
 if (!isset($localeInited) || !$localeInited)
 {
   $localeInited = TRUE;
+  $pageCharset = "UTF-8";
 
-  $pageCharset = "UTF-8";
   mb_internal_encoding($pageCharset);
 
   $tmp = "en_US.".strtolower(str_replace("-", "", $pageCharset));