Changeset 1060

Timestamp:

04/29/2008 10:22:48 PM (2 years ago)

Author:

BrianKoontz

Message:

Standard phpdoc header and lang strings added; user-friendly error
message displayed if target page not accessible. Refs #710, #749.

Files:

• branches/1.1.6.5/actions/include.php (modified) (2 diffs)

branches/1.1.6.5/actions/include.php

@@ -1 +1 @@
 <?php
+/**
+ * Include contents of a target page at the point of invocation 
+ *
+ * @package             Actions
+ * @version             $Id$
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
+ * @filesource
+ *
+ * @uses                Wakka::HasAccess()
+ * @uses                Wakka::LoadPage()
+ * @uses                Wakka::Format()
+ */
+
+// defaults
+if(!defined('ERROR_CIRCULAR_REF')) define('ERROR_CIRCULAR_REF', 'Circular reference detected');
+if(!defined('ERROR_TARGET_ACL')) define('ERROR_TARGET_ACL', "You aren't allowed to read included page <tt>%s</tt>");
 
 if (!$page) $page = $wikka_vars;
+$orig_page = $page;
 $page = strtolower($page);
 if (!$this->config["includes"]) $this->config["includes"][] = strtolower($this->tag);
@@ -11 +28 @@
                 print $this->Format($page["body"]);
         }
-} else print "<em class='error'>Circular reference detected</em>";
+        else printf("<em class='error'>".ERROR_TARGET_ACL."</em>", $orig_page);
+} else print "<em class='error'>".ERROR_CIRCULAR_REF."</em>";
 
 ?>