BugTrack2/384 Support LDAP Group - Security Group of Active Directory

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

diff --git a/lib/pukiwiki.php b/lib/pukiwiki.php
index 6f34000..62f6d52 100644 (file)
--- a/lib/pukiwiki.php
+++ b/lib/pukiwiki.php
@@ -1,14 +1,14 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: pukiwiki.php,v 1.11 2005/09/11 05:58:33 henoheno Exp $
+// $Id: pukiwiki.php,v 1.23 2011/01/25 15:01:01 henoheno Exp $
 //
 // PukiWiki 1.4.*
-//  Copyright (C) 2002-2005 by PukiWiki Developers Team
-//  http://pukiwiki.sourceforge.jp/
+//  Copyright (C) 2002-2005 by PukiWiki Development Team
+//  http://pukiwiki.osdn.jp/
 //
 // PukiWiki 1.3.*
-//  Copyright (C) 2002-2004 by PukiWiki Developers Team
-//  http://pukiwiki.sourceforge.jp/
+//  Copyright (C) 2002-2004 by PukiWiki Development Team
+//  http://pukiwiki.osdn.jp/
 //
 // PukiWiki 1.3 (Base)
 //  Copyright (C) 2001-2002 by yu-ji <sng@factage.com>
@@ -53,7 +53,7 @@ if (! extension_loaded('mbstring')) {
 }
 
 // Defaults
-$notify = $trackback = $referer = 0;
+$notify = 0;
 
 // Load *.ini.php files and init PukiWiki
 require(LIB_DIR . 'init.php');
@@ -62,11 +62,6 @@ require(LIB_DIR . 'init.php');
 if ($notify) {
        require(LIB_DIR . 'mail.php'); // Mail notification
 }
-if ($trackback || $referer) {
-       // Referer functionality uses trackback functions
-       // without functional reason now
-       require(LIB_DIR . 'trackback.php'); // TrackBack
-}
 
 /////////////////////////////////////////////////
 // Main
@@ -82,6 +77,7 @@ if (isset($vars['cmd'])) {
        $plugin = '';
 }
 if ($plugin != '') {
+       ensure_valid_auth_user();
        if (exist_plugin_action($plugin)) {
                // Found and exec
                $retvars = do_plugin_action($plugin);
@@ -94,14 +90,14 @@ if ($plugin != '') {
                }
        } else {
                // Not found
-               $msg = 'plugin=' . htmlspecialchars($plugin) .
+               $msg = 'plugin=' . htmlsc($plugin) .
                        ' is not implemented.';
                $retvars = array('msg'=>$msg,'body'=>$msg);
                $base    = & $defaultpage;
        }
 }
 
-$title = htmlspecialchars(strip_bracket($base));
+$title = htmlsc(strip_bracket($base));
 $page  = make_search($base);
 if (isset($retvars['msg']) && $retvars['msg'] != '') {
        $title = str_replace('$1', $title, $retvars['msg']);
@@ -113,7 +109,7 @@ if (isset($retvars['body']) && $retvars['body'] != '') {
 } else {
        if ($base == '' || ! is_page($base)) {
                $base  = & $defaultpage;
-               $title = htmlspecialchars(strip_bracket($base));
+               $title = htmlsc(strip_bracket($base));
                $page  = make_search($base);
        }
 
@@ -121,12 +117,8 @@ if (isset($retvars['body']) && $retvars['body'] != '') {
        $vars['page'] = & $base;
 
        $body  = convert_html(get_source($base));
-
-       if ($trackback) $body .= tb_get_rdf($base); // Add TrackBack-Ping URI
-       if ($referer) ref_save($base);
 }
 
 // Output
 catbody($title, $page, $body);
 exit;
-?>