[phpwiki-checkins] SF.net SVN: phpwiki:[7270] trunk/lib/plugin

[<var...@us...>]

Revision: 7270
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7270&view=rev
Author:   vargenau
Date:     2009-11-20 16:58:11 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Check if page to include exists

Modified Paths:
--------------
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/Template.php

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2009-11-20 16:37:58 UTC (rev 7269)
+++ trunk/lib/plugin/IncludePage.php	2009-11-20 16:58:11 UTC (rev 7270)
@@ -90,9 +90,14 @@
                                         $page));
         }
 
+        // Check if page exists
+        if (!($dbi->isWikiPage($page))) {
+            return $this->error(sprintf(_("Page '%s' does not exist"), $page));
+        }
+
         // Check if user is allowed to get the Page.
         if (!mayAccessPage ('view', $page)) {
-        	return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+            return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
                                         $page));
         }
         
@@ -124,8 +129,8 @@
                 return $this->error(sprintf(_("recursive inclusion of page %s ignored"),
                                                 $page.' => '.$m[1]));
             }
-	    $page = $m[1];
-	    $p = $dbi->getPage($page);
+            $page = $m[1];
+            $p = $dbi->getPage($page);
             $r = $p->getCurrentRevision();
             $c = $r->getContent();   // array of lines
         }

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2009-11-20 16:37:58 UTC (rev 7269)
+++ trunk/lib/plugin/Template.php	2009-11-20 16:58:11 UTC (rev 7270)
@@ -128,6 +128,11 @@
                                         $page));
         }
 
+        // Check if page exists
+        if (!($dbi->isWikiPage($page))) {
+            return $this->error(sprintf(_("Page '%s' does not exist"), $page));
+        }
+
         // Check if user is allowed to get the Page.
         if (!mayAccessPage ('view', $page)) {
         	return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.