[phpwiki-checkins] CVS: phpwiki/lib/plugin SiteMap.php,1.13,1.14

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28971

Modified Files:
	SiteMap.php 
Log Message:
optimize ExcludedPages

Index: SiteMap.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/SiteMap.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -2 -b -p -d -r1.13 -r1.14
--- SiteMap.php	14 Dec 2004 21:36:06 -0000	1.13
+++ SiteMap.php	4 Mar 2006 13:58:02 -0000	1.14
@@ -2,5 +2,5 @@
 rcs_id('$Id$');
 /**
- Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
+ Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam
 
  This file is part of PhpWiki.
@@ -97,5 +97,6 @@ extends WikiPlugin
             $linkpagename = $link->getName();
             if (($linkpagename != $startpagename)
-                && !preg_match("/$this->ExcludedPages/", $linkpagename)) {
+                and (!$this->ExcludedPages or !preg_match("/".$this->ExcludedPages."/", $linkpagename))
+                {
                 $pagearr[$level . " [$linkpagename]"] = $link;
                 $pagearr = $this->recursivelyGetBackLinks($link, $pagearr,
@@ -104,4 +105,5 @@ extends WikiPlugin
             }
         }
+        }
         return $pagearr;
     }
@@ -124,8 +126,8 @@ extends WikiPlugin
         while ($link = $pagelinks->next()) {
             $linkpagename = $link->getName();
-            if (($linkpagename != $startpagename)
-                && !preg_match("/$this->ExcludedPages/", $linkpagename)) {
-                if (!$this->excludeunknown
-                    || $this->dbi->isWikiPage($linkpagename)) {
+            if (($linkpagename != $startpagename) and 
+                (!$this->ExcludedPages or !preg_match("/$this->ExcludedPages/", $linkpagename)))
+            {
+                if (!$this->excludeunknown or $this->dbi->isWikiPage($linkpagename)) {
                     $pagearr[$level . " [$linkpagename]"] = $link;
                     $pagearr = $this->recursivelyGetLinks($link, $pagearr,
@@ -152,5 +154,5 @@ extends WikiPlugin
         if (!$include_self)
             $exclude[] = $page;
-        $this->ExcludedPages = "^(?:" . join("|", $exclude) . ")";
+        $this->ExcludedPages = empty($exclude) ? "" : ("^(?:" . join("|", $exclude) . ")");
         $this->_default_limit = str_pad('', 3, '*');
         if (is_numeric($reclimit)) {
@@ -203,5 +205,6 @@ extends WikiPlugin
                 $indenter = str_pad($nothing, $a);
                 //$request->setArg('IncludePage', 1);
-                $plugin_args = 'page=' . $link->getName() . ' ' . $includepages;
+                // quote linkname, by Stefan Schorn
+                $plugin_args = 'page=\'' . $link->getName() . '\' ' . $includepages;
                 $pagehtml = $plugin->run($dbi, $plugin_args, $request, $basepage);
                 $html->pushContent($pagehtml); 
@@ -222,4 +225,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.14  2006/03/04 13:58:02  rurban
+// optimize ExcludedPages
+//
 // Revision 1.13  2004/12/14 21:36:06  rurban
 // exclude is already handled by getArgs