Add XDB::formatWildcard

[platal.git] / modules / core.php

diff --git a/modules/core.php b/modules/core.php
index c60cfec..56dd9e2 100644 (file)
--- a/modules/core.php
+++ b/modules/core.php
@@ -74,9 +74,9 @@ class CoreModule extends PLModule
 
     function handler_favicon(&$page)
     {
-        $data = file_get_contents(dirname(__FILE__).'/../htdocs/images/favicon.ico');
-        header('Content-Type: image/x-icon');
-        echo $data;
+        global $globals;
+        pl_cached_content_headers("image/x-icon");
+        readfile($globals->spoolroot . '/htdocs/images/favicon.ico');
         exit;
     }
 
@@ -94,7 +94,7 @@ class CoreModule extends PLModule
         }
 
         if (count($disallowed_uris) > 0) {
-            header('Content-Type: text/plain');
+            pl_cached_content_headers("text/plain");
             echo "User-agent: *\n";
             foreach ($disallowed_uris as $uri) {
                 echo "Disallow: $uri\n";
@@ -170,7 +170,7 @@ class CoreModule extends PLModule
     /// Shared handler for wiki syntax result preview
     function handler_wiki_preview(&$page, $action = 'title')
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $text = Env::v('text');
         echo MiniWiki::wikiToHtml($text, $action == 'title');
         exit;
@@ -179,10 +179,9 @@ class CoreModule extends PLModule
     function handler_sqlerror(&$page) {
         global $globals;
         $page->coreTpl('sql_errors.tpl');
-        $file = @fopen($globals->spoolroot . '/spool/tmp/query_errors', 'r');
+        $file = @file_get_contents($globals->spoolroot . '/spool/tmp/query_errors');
         if ($file !== false) {
-            $page->assign('errors', fpassthru($file));
-            fclose($file);
+            $page->assign('errors', utf8_encode($file));
         }
         if (Post::has('clear')) {
             @unlink($globals->spoolroot . '/spool/tmp/query_errors');