get_source(,,$join=TRUE): Care for 0 byte files

[pukiwiki/pukiwiki.git] / lib / file.php

diff --git a/lib/file.php b/lib/file.php
index 4f90f99..066d100 100644 (file)
--- a/lib/file.php
+++ b/lib/file.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: file.php,v 1.69 2006/05/19 15:04:25 henoheno Exp $
+// $Id: file.php,v 1.95 2011/01/25 15:01:01 henoheno Exp $
 // Copyright (C)
 //   2002-2006 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -31,7 +31,12 @@ function get_source($page = NULL, $lock = TRUE, $join = FALSE)
 
                if ($join) {
                        // Returns a value
-                       $result = str_replace("\r", '', fread($fp, filesize($path)));
+                       $size = filesize($path);
+                       if ($size > 0) {
+                               $result = str_replace("\r", '', fread($fp, filesize($path)));
+                       } else {
+                               $result = '';
+                       }
                } else {
                        // Returns an array
                        // Removing line-feeds: Because file() doesn't remove them.
@@ -62,8 +67,6 @@ function get_filename($page)
 // Put a data(wiki text) into a physical file(diff, backup, text)
 function page_write($page, $postdata, $notimestamp = FALSE)
 {
-       global $trackback;
-
        if (PKWK_READONLY) return; // Do nothing
 
        $postdata = make_str_rules($postdata);
@@ -79,14 +82,6 @@ function page_write($page, $postdata, $notimestamp = FALSE)
        // Create wiki text
        file_write(DATA_DIR, $page, $postdata, $notimestamp);
 
-       if ($trackback) {
-               // TrackBack Ping
-               $_diff = explode("\n", $diffdata);
-               $plus  = join("\n", preg_replace('/^\+/', '', preg_grep('/^\+/', $_diff)));
-               $minus = join("\n", preg_replace('/^-/',  '', preg_grep('/^-/',  $_diff)));
-               tb_send($page, $plus, $minus);
-       }
-
        links_update($page);
 }
 
@@ -223,14 +218,14 @@ function file_write($dir, $page, $str, $notimestamp = FALSE)
        // File replacement (Edit)
 
        if (! is_pagename($page))
-               die_message(str_replace('$1', htmlspecialchars($page),
+               die_message(str_replace('$1', htmlsc($page),
                            str_replace('$2', 'WikiName', $_msg_invalidiwn)));
 
        $str = rtrim(preg_replace('/' . "\r" . '/', '', $str)) . "\n";
        $timestamp = ($file_exists && $notimestamp) ? filemtime($file) : FALSE;
 
        $fp = fopen($file, 'a') or die('fopen() failed: ' .
-               htmlspecialchars(basename($dir) . '/' . encode($page) . '.txt') .       
+               htmlsc(basename($dir) . '/' . encode($page) . '.txt') . 
                '<br />' . "\n" .
                'Maybe permission is not writable or filename is too long');
        set_file_buffer($fp, 0);
@@ -249,7 +244,7 @@ function file_write($dir, $page, $str, $notimestamp = FALSE)
                if ($timestamp === FALSE) lastmodified_add($page);
 
                // Command execution per update
-               if (defined(PKWK_UPDATE_EXEC)) 
+               if (defined('PKWK_UPDATE_EXEC') && PKWK_UPDATE_EXEC)
                        system(PKWK_UPDATE_EXEC . ' > /dev/null &');
 
        } else if ($dir == DIFF_DIR && $notify) {
@@ -285,7 +280,7 @@ function add_recent($page, $recentpage, $subject = '', $limit = 0)
 
        // Add
        array_unshift($lines, '-' . format_date(UTIME) . ' - ' . $_page .
-               htmlspecialchars($subject) . "\n");
+               htmlsc($subject) . "\n");
 
        // Get latest $limit reports
        $lines = array_splice($lines, 0, $limit);
@@ -293,7 +288,7 @@ function add_recent($page, $recentpage, $subject = '', $limit = 0)
        // Update
        $fp = fopen(get_filename($recentpage), 'w') or
                die_message('Cannot write page file ' .
-               htmlspecialchars($recentpage) .
+               htmlsc($recentpage) .
                '<br />Maybe permission is not writable or filename is too long');
        set_file_buffer($fp, 0);
        flock($fp, LOCK_EX);
@@ -377,7 +372,7 @@ function lastmodified_add($update = '', $remove = '')
        // Open
        pkwk_touch_file($file);
        $fp = fopen($file, 'r+') or
-               die_message('Cannot open ' . htmlspecialchars($whatsnew));
+               die_message('Cannot open ' . htmlsc($whatsnew));
        set_file_buffer($fp, 0);
        flock($fp, LOCK_EX);
 
@@ -385,8 +380,8 @@ function lastmodified_add($update = '', $remove = '')
        ftruncate($fp, 0);
        rewind($fp);
        foreach ($recent_pages as $_page=>$time)
-               fputs($fp, '-' . htmlspecialchars(format_date($time)) .
-                       ' - ' . '[[' . htmlspecialchars($_page) . ']]' . "\n");
+               fputs($fp, '-' . htmlsc(format_date($time)) .
+                       ' - ' . '[[' . htmlsc($_page) . ']]' . "\n");
        fputs($fp, '#norelated' . "\n"); // :)
 
        flock($fp, LOCK_UN);
@@ -417,8 +412,8 @@ function put_lastmodified()
        $count   = $maxshow + PKWK_MAXSHOW_ALLOWANCE;
        $_recent = array();
        foreach($recent_pages as $key=>$value) {
-               $_recent[$key] = $value;
                unset($recent_pages[$key]);
+               $_recent[$key] = $value;
                if (--$count < 1) break;
        }
        $recent_pages = & $_recent;
@@ -441,15 +436,15 @@ function put_lastmodified()
        $file = get_filename($whatsnew);
        pkwk_touch_file($file);
        $fp = fopen($file, 'r+') or
-               die_message('Cannot open ' . htmlspecialchars($whatsnew));
+               die_message('Cannot open ' . htmlsc($whatsnew));
        set_file_buffer($fp, 0);
        flock($fp, LOCK_EX);
        ftruncate($fp, 0);
        rewind($fp);
        foreach (array_keys($recent_pages) as $page) {
                $time      = $recent_pages[$page];
-               $s_lastmod = htmlspecialchars(format_date($time));
-               $s_page    = htmlspecialchars($page);
+               $s_lastmod = htmlsc(format_date($time));
+               $s_page    = htmlsc($page);
                fputs($fp, '-' . $s_lastmod . ' - [[' . $s_page . ']]' . "\n");
        }
        fputs($fp, '#norelated' . "\n"); // :)
@@ -664,7 +659,7 @@ function get_readings()
 
                if($unknownPage || $deletedPage) {
 
-                       asort($readings); // Sort by pronouncing(alphabetical/reading) order
+                       asort($readings, SORT_STRING); // Sort by pronouncing(alphabetical/reading) order
                        $body = '';
                        foreach ($readings as $page => $reading)
                                $body .= '-[[' . $page . ']] ' . $reading . "\n";
@@ -730,12 +725,12 @@ function pkwk_chown($filename, $preserve_time = TRUE)
        $lockfile = CACHE_DIR . 'pkwk_chown.lock';
        $flock = fopen($lockfile, 'a') or
                die('pkwk_chown(): fopen() failed for: CACHEDIR/' .
-                       basename(htmlspecialchars($lockfile)));
+                       basename(htmlsc($lockfile)));
        flock($flock, LOCK_EX) or die('pkwk_chown(): flock() failed for lock');
 
        // Check owner
        $stat = stat($filename) or
-               die('pkwk_chown(): stat() failed for: '  . basename(htmlspecialchars($filename)));
+               die('pkwk_chown(): stat() failed for: '  . basename(htmlsc($filename)));
        if ($stat[4] === $php_uid) {
                // NOTE: Windows always here
                $result = TRUE; // Seems the same UID. Nothing to do
@@ -746,7 +741,7 @@ function pkwk_chown($filename, $preserve_time = TRUE)
                // NOTE: Not 'r+'. Don't check write permission here
                $ffile = fopen($filename, 'r') or
                        die('pkwk_chown(): fopen() failed for: ' .
-                               basename(htmlspecialchars($filename)));
+                               basename(htmlsc($filename)));
 
                // Try to chown by re-creating files
                // NOTE:
@@ -786,7 +781,7 @@ function pkwk_touch_file($filename, $time = FALSE, $atime = FALSE)
                return $result;
        } else {
                die('pkwk_touch_file(): Invalid UID and (not writable for the directory or not a flie): ' .
-                       htmlspecialchars(basename($filename)));
+                       htmlsc(basename($filename)));
        }
 }
 ?>