changeset 79:9b490aa11124

Branch merge.
author Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
date Fri, 12 Oct 2012 16:47:25 +0200
parents 7c68015b211a (current diff) 9d766788f0bc (diff)
children 88904282b888 4acaab0b02e2
files Flag.inc flag.php
diffstat 2 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Flag.inc	Fri Oct 12 16:43:26 2012 +0200
+++ b/Flag.inc	Fri Oct 12 16:47:25 2012 +0200
@@ -7,16 +7,26 @@
 
 include_once 'CacheTimeCheck.inc';
 
+/// @cond
 $scriptCache = ScriptIncludeCache::instance(__FILE__);
 $scriptCache->includeOnce('Language.inc');
 $scriptCache->includeOnce('common-functions.inc');
 $scriptCache->includeOnce('Page.inc');
+/// @endcond
 
+/**
+ * Functionality for generating a flag based on state options
+ */
 class Flag extends Page
 {
   private $active;
   private $lang;
 
+  /**
+   * Constructs a flag object
+   *
+   * @param $masterCache link this objects cache to this masterCache
+   */
   function __construct($masterCache)
   {
     $this->active = $_GET['active'];
@@ -56,6 +66,9 @@
     return false;
   }
 
+  /**
+   * Produce the actual content
+   */
   function generateContent()
   {
 
--- a/flag.php	Fri Oct 12 16:43:26 2012 +0200
+++ b/flag.php	Fri Oct 12 16:47:25 2012 +0200
@@ -7,8 +7,10 @@
 
 include_once 'CacheTimeCheck.inc';
 
+/// @cond
 $scriptCache = ScriptIncludeCache::instance(__FILE__);
 $scriptCache->includeOnce('Flag.inc');
 
 $flag = new Flag($scriptCache);
-print $flag->genPage();
\ No newline at end of file
+$flag->genPage();
+/// @endcond