htmlsc(): Just sugar for htmlspecialchars(), and a foundation

[pukiwiki/pukiwiki.git] / plugin / backup.inc.php

diff --git a/plugin/backup.inc.php b/plugin/backup.inc.php
index a3fa0ca..b673286 100644 (file)
--- a/plugin/backup.inc.php
+++ b/plugin/backup.inc.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: backup.inc.php,v 1.27 2005/12/10 12:48:02 henoheno Exp $
+// $Id: backup.inc.php,v 1.29 2011/01/25 15:01:01 henoheno Exp $
 // Copyright (C)
-//   2002-2005 PukiWiki Developers Team
+//   2002-2005, 2007 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -25,7 +25,7 @@ function plugin_backup_action()
        if ($page == '') return array('msg'=>$_title_backuplist, 'body'=>plugin_backup_get_list_all());
 
        check_readable($page, true, true);
-       $s_page = htmlspecialchars($page);
+       $s_page = htmlsc($page);
        $r_page = rawurlencode($page);
 
        $action = isset($vars['action']) ? $vars['action'] : '';
@@ -33,7 +33,7 @@ function plugin_backup_action()
 
        $s_action = $r_action = '';
        if ($action != '') {
-               $s_action = htmlspecialchars($action);
+               $s_action = htmlsc($action);
                $r_action = rawurlencode($action);
        }
 
@@ -103,11 +103,11 @@ function plugin_backup_action()
        } else if ($s_action == 'nowdiff') {
                $title = & $_title_backupnowdiff;
                $old = join('', $backups[$s_age]['data']);
-               $cur = join('', get_source($page));
+               $cur = get_source($page, TRUE, TRUE);
                $body .= plugin_backup_diff(do_diff($old, $cur));
        } else if ($s_action == 'source') {
                $title = & $_title_backupsource;
-               $body .= '<pre>' . htmlspecialchars(join('', $backups[$s_age]['data'])) .
+               $body .= '<pre>' . htmlsc(join('', $backups[$s_age]['data'])) .
                        '</pre>' . "\n";
        } else {
                if (PLUGIN_BACKUP_DISABLE_BACKUP_RENDERING) {
@@ -145,7 +145,7 @@ function plugin_backup_delete($page)
        }
 
        $script = get_script_uri();
-       $s_page = htmlspecialchars($page);
+       $s_page = htmlsc($page);
        $body .= <<<EOD
 <p>$_msg_backup_adminpass</p>
 <form action="$script" method="post">
@@ -172,7 +172,7 @@ $hr
 </ul>
 EOD;
 
-       return $ul . '<pre>' . diff_style_to_css(htmlspecialchars($str)) . '</pre>' . "\n";
+       return $ul . '<pre>' . diff_style_to_css(htmlsc($str)) . '</pre>' . "\n";
 }
 
 function plugin_backup_get_list($page)
@@ -182,7 +182,7 @@ function plugin_backup_get_list($page)
 
        $script = get_script_uri();
        $r_page = rawurlencode($page);
-       $s_page = htmlspecialchars($page);
+       $s_page = htmlsc($page);
        $retval = array();
        $retval[0] = <<<EOD
 <ul>