Rework output and page classes

app/modules/welcome/controllers/welcome.php

@@ -55,7 +55,7 @@ class Welcome extends MM_Controller {
 		$output = ob_get_contents();
 		ob_end_clean();
 		
-		$this->output->set_output($output);
+		$this->page->set_output($output);
 	}
 }
 // End of welcome.php

docs/classes.svg

@@ -22,21 +22,21 @@
 <!-- \\MM_Model -->
 <g id="node2" class="node"><title>\\MM_Model</title>
 <a xlink:href="sys.core.model.html" xlink:title="MM_Model" target="_parent">
-<polygon fill="none" stroke="black" points="606,-263 536,-263 536,-227 606,-227 606,-263"/>
+<polygon fill="none" stroke="black" points="606,-155 536,-155 536,-119 606,-119 606,-155"/>
-<text text-anchor="middle" x="571" y="-241.6" font-family="Courier,monospace" font-size="11.00">MM_Model</text>
+<text text-anchor="middle" x="571" y="-133.6" font-family="Courier,monospace" font-size="11.00">MM_Model</text>
 </a>
 </g>
 <!-- \\miniMVC -->
 <g id="node5" class="node"><title>\\miniMVC</title>
 <a xlink:href="sys.core.miniMVC.html" xlink:title="miniMVC" target="_parent">
-<polygon fill="none" stroke="black" points="411,-182 347,-182 347,-146 411,-146 411,-182"/>
+<polygon fill="none" stroke="black" points="411,-236 347,-236 347,-200 411,-200 411,-236"/>
-<text text-anchor="middle" x="379" y="-160.6" font-family="Courier,monospace" font-size="11.00">miniMVC</text>
+<text text-anchor="middle" x="379" y="-214.6" font-family="Courier,monospace" font-size="11.00">miniMVC</text>
 </a>
 </g>
 <!-- \\MM_Model&#45;&gt;\\miniMVC -->
 <g id="edge3" class="edge"><title>\\MM_Model&#45;&gt;\\miniMVC</title>
-<path fill="none" stroke="black" d="M535.336,-229.954C502.922,-216.279 455.073,-196.093 420.858,-181.659"/>
+<path fill="none" stroke="black" d="M535.336,-152.046C502.922,-165.721 455.073,-185.907 420.858,-200.341"/>
-<polygon fill="none" stroke="black" points="422.167,-178.413 411.593,-177.75 419.446,-184.862 422.167,-178.413"/>
+<polygon fill="none" stroke="black" points="419.446,-197.138 411.593,-204.25 422.167,-203.587 419.446,-197.138"/>
 </g>
 <!-- \\DB -->
 <g id="node3" class="node"><title>\\DB</title>
@@ -58,60 +58,60 @@
 <!-- \\MM -->
 <g id="node4" class="node"><title>\\MM</title>
 <a xlink:href="sys.core.miniMVC.html" xlink:title="MM" target="_parent">
-<polygon fill="none" stroke="black" points="268,-236 214,-236 214,-200 268,-200 268,-236"/>
+<polygon fill="none" stroke="black" points="268,-263 214,-263 214,-227 268,-227 268,-263"/>
-<text text-anchor="middle" x="241" y="-214.6" font-family="Courier,monospace" font-size="11.00">MM</text>
+<text text-anchor="middle" x="241" y="-241.6" font-family="Courier,monospace" font-size="11.00">MM</text>
 </a>
 </g>
 <!-- \\ArrayObject -->
 <g id="node17" class="node"><title>\\ArrayObject</title>
-<ellipse fill="none" stroke="black" cx="71" cy="-218" rx="71.107" ry="18"/>
+<ellipse fill="none" stroke="black" cx="71" cy="-245" rx="71.107" ry="18"/>
-<text text-anchor="middle" x="71" y="-213.4" font-family="Times Roman,serif" font-size="14.00" fill="gray">\ArrayObject</text>
+<text text-anchor="middle" x="71" y="-240.4" font-family="Times Roman,serif" font-size="14.00" fill="gray">\ArrayObject</text>
 </g>
 <!-- \\MM&#45;&gt;\\ArrayObject -->
 <g id="edge7" class="edge"><title>\\MM&#45;&gt;\\ArrayObject</title>
-<path fill="none" stroke="black" d="M213.687,-218C196.92,-218 174.483,-218 152.374,-218"/>
+<path fill="none" stroke="black" d="M213.687,-245C196.92,-245 174.483,-245 152.374,-245"/>
-<polygon fill="none" stroke="black" points="152.26,-214.5 142.26,-218 152.26,-221.5 152.26,-214.5"/>
+<polygon fill="none" stroke="black" points="152.26,-241.5 142.26,-245 152.26,-248.5 152.26,-241.5"/>
 </g>
 <!-- \\miniMVC&#45;&gt;\\MM -->
 <g id="edge9" class="edge"><title>\\miniMVC&#45;&gt;\\MM</title>
-<path fill="none" stroke="black" d="M346.296,-176.797C325.699,-184.857 299.069,-195.277 277.744,-203.622"/>
+<path fill="none" stroke="black" d="M346.296,-224.399C325.884,-228.392 299.548,-233.545 278.321,-237.698"/>
-<polygon fill="none" stroke="black" points="276.397,-200.391 268.36,-207.294 278.948,-206.909 276.397,-200.391"/>
+<polygon fill="none" stroke="black" points="277.502,-234.292 268.36,-239.647 278.846,-241.162 277.502,-234.292"/>
 </g>
 <!-- \\MM_Page -->
 <g id="node6" class="node"><title>\\MM_Page</title>
 <a xlink:href="sys.core.page.html" xlink:title="MM_Page" target="_parent">
-<polygon fill="none" stroke="black" points="411,-290 347,-290 347,-254 411,-254 411,-290"/>
+<polygon fill="none" stroke="black" points="603,-290 539,-290 539,-254 603,-254 603,-290"/>
-<text text-anchor="middle" x="379" y="-268.6" font-family="Courier,monospace" font-size="11.00">MM_Page</text>
+<text text-anchor="middle" x="571" y="-268.6" font-family="Courier,monospace" font-size="11.00">MM_Page</text>
 </a>
 </g>
-<!-- \\MM_Page&#45;&gt;\\MM -->
-<g id="edge11" class="edge"><title>\\MM_Page&#45;&gt;\\MM</title>
-<path fill="none" stroke="black" d="M346.296,-259.203C325.699,-251.143 299.069,-240.723 277.744,-232.378"/>
-<polygon fill="none" stroke="black" points="278.948,-229.091 268.36,-228.706 276.397,-235.609 278.948,-229.091"/>
-</g>
-<!-- \\MM_Controller -->
-<g id="node7" class="node"><title>\\MM_Controller</title>
-<a xlink:href="sys.core.controller.html" xlink:title="MM_Controller" target="_parent">
-<polygon fill="none" stroke="black" points="623,-155 519,-155 519,-119 623,-119 623,-155"/>
-<text text-anchor="middle" x="571" y="-133.6" font-family="Courier,monospace" font-size="11.00">MM_Controller</text>
-</a>
-</g>
-<!-- \\MM_Controller&#45;&gt;\\miniMVC -->
-<g id="edge13" class="edge"><title>\\MM_Controller&#45;&gt;\\miniMVC</title>
-<path fill="none" stroke="black" d="M518.281,-144.414C487.927,-148.682 450.272,-153.977 421.77,-157.985"/>
-<polygon fill="none" stroke="black" points="421.129,-154.541 411.714,-159.4 422.104,-161.473 421.129,-154.541"/>
-</g>
 <!-- \\MM_Output -->
 <g id="node8" class="node"><title>\\MM_Output</title>
 <a xlink:href="sys.core.output.html" xlink:title="MM_Output" target="_parent">
-<polygon fill="none" stroke="black" points="418,-236 340,-236 340,-200 418,-200 418,-236"/>
+<polygon fill="none" stroke="black" points="418,-290 340,-290 340,-254 418,-254 418,-290"/>
-<text text-anchor="middle" x="379" y="-214.6" font-family="Courier,monospace" font-size="11.00">MM_Output</text>
+<text text-anchor="middle" x="379" y="-268.6" font-family="Courier,monospace" font-size="11.00">MM_Output</text>
 </a>
 </g>
+<!-- \\MM_Page&#45;&gt;\\MM_Output -->
+<g id="edge11" class="edge"><title>\\MM_Page&#45;&gt;\\MM_Output</title>
+<path fill="none" stroke="black" d="M538.43,-272C508.276,-272 463.009,-272 428.405,-272"/>
+<polygon fill="none" stroke="black" points="428.037,-268.5 418.037,-272 428.037,-275.5 428.037,-268.5"/>
+</g>
+<!-- \\MM_Controller -->
+<g id="node7" class="node"><title>\\MM_Controller</title>
+<a xlink:href="sys.core.controller.html" xlink:title="MM_Controller" target="_parent">
+<polygon fill="none" stroke="black" points="623,-236 519,-236 519,-200 623,-200 623,-236"/>
+<text text-anchor="middle" x="571" y="-214.6" font-family="Courier,monospace" font-size="11.00">MM_Controller</text>
+</a>
+</g>
+<!-- \\MM_Controller&#45;&gt;\\miniMVC -->
+<g id="edge13" class="edge"><title>\\MM_Controller&#45;&gt;\\miniMVC</title>
+<path fill="none" stroke="black" d="M518.281,-218C487.927,-218 450.272,-218 421.77,-218"/>
+<polygon fill="none" stroke="black" points="421.714,-214.5 411.714,-218 421.714,-221.5 421.714,-214.5"/>
+</g>
 <!-- \\MM_Output&#45;&gt;\\MM -->
 <g id="edge15" class="edge"><title>\\MM_Output&#45;&gt;\\MM</title>
-<path fill="none" stroke="black" d="M339.824,-218C320.46,-218 297.217,-218 278.137,-218"/>
+<path fill="none" stroke="black" d="M339.824,-264.335C320.371,-260.529 297.001,-255.957 277.873,-252.214"/>
-<polygon fill="none" stroke="black" points="278.018,-214.5 268.018,-218 278.017,-221.5 278.018,-214.5"/>
+<polygon fill="none" stroke="black" points="278.504,-248.771 268.018,-250.286 277.159,-255.641 278.504,-248.771"/>
 </g>
 <!-- \\MM_Data_Store -->
 <g id="node9" class="node"><title>\\MM_Data_Store</title>
@@ -130,26 +130,26 @@
 <!-- \\Welcome_Model -->
 <g id="node11" class="node"><title>\\Welcome_Model</title>
 <a xlink:href="app.modules.welcome.models.welcome_model.html" xlink:title="Welcome_Model" target="_parent">
-<polygon fill="none" stroke="black" points="829,-304 725,-304 725,-268 829,-268 829,-304"/>
+<polygon fill="none" stroke="black" points="829,-142 725,-142 725,-106 829,-106 829,-142"/>
-<text text-anchor="middle" x="777" y="-282.6" font-family="Courier,monospace" font-size="11.00">Welcome_Model</text>
+<text text-anchor="middle" x="777" y="-120.6" font-family="Courier,monospace" font-size="11.00">Welcome_Model</text>
 </a>
 </g>
 <!-- \\Welcome_Model&#45;&gt;\\MM_Model -->
 <g id="edge17" class="edge"><title>\\Welcome_Model&#45;&gt;\\MM_Model</title>
-<path fill="none" stroke="black" d="M724.751,-275.601C691.408,-268.965 648.606,-260.446 616.632,-254.082"/>
+<path fill="none" stroke="black" d="M724.751,-127.297C691.553,-129.392 648.976,-132.079 617.048,-134.094"/>
-<polygon fill="none" stroke="black" points="617.148,-250.616 606.657,-252.097 615.782,-257.482 617.148,-250.616"/>
+<polygon fill="none" stroke="black" points="616.417,-130.627 606.657,-134.75 616.858,-137.613 616.417,-130.627"/>
 </g>
 <!-- \\Welcome -->
 <g id="node12" class="node"><title>\\Welcome</title>
 <a xlink:href="app.modules.welcome.controllers.welcome.html" xlink:title="Welcome" target="_parent">
-<polygon fill="none" stroke="black" points="809,-142 745,-142 745,-106 809,-106 809,-142"/>
+<polygon fill="none" stroke="black" points="809,-304 745,-304 745,-268 809,-268 809,-304"/>
-<text text-anchor="middle" x="777" y="-120.6" font-family="Courier,monospace" font-size="11.00">Welcome</text>
+<text text-anchor="middle" x="777" y="-282.6" font-family="Courier,monospace" font-size="11.00">Welcome</text>
 </a>
 </g>
 <!-- \\Welcome&#45;&gt;\\MM_Controller -->
 <g id="edge19" class="edge"><title>\\Welcome&#45;&gt;\\MM_Controller</title>
-<path fill="none" stroke="black" d="M744.812,-126.031C715.23,-127.898 670.544,-130.718 633.889,-133.031"/>
+<path fill="none" stroke="black" d="M744.812,-275.375C715.104,-265.568 670.161,-250.733 633.419,-238.604"/>
-<polygon fill="none" stroke="black" points="633.542,-129.546 623.783,-133.669 633.983,-136.532 633.542,-129.546"/>
+<polygon fill="none" stroke="black" points="634.376,-235.234 623.783,-235.423 632.181,-241.882 634.376,-235.234"/>
 </g>
 </g>
 </svg>

docs/classes/DB.html

@@ -159,7 +159,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MM.html

@@ -433,7 +433,7 @@ dynamic methods</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MM_Controller.html

@@ -56,7 +56,9 @@
 <ul class="side-nav nav nav-list">
 <li class="nav-header">
 <i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public inherited"><a href="#__call" title="__call :: PHP magic method to facilitate dynamic methods"><span class="description">PHP magic method to facilitate dynamic methods</span><pre>__call()</pre></a></li>
+<li class="method public inherited"><a href="#__call" title="__call :: Allow calling of array methods on the object and
+dynamic methods"><span class="description">Allow calling of array methods on the object and
+dynamic methods</span><pre>__call()</pre></a></li>
 <li class="method public "><a href="#__construct" title="__construct :: Create the controller object"><span class="description">Create the controller object</span><pre>__construct()</pre></a></li>
 <li class="method public inherited"><a href="#append" title="append :: "><span class="description">append()
         </span><pre>append()</pre></a></li>
@@ -107,7 +109,6 @@
         </span><pre>unserialize()</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public inherited"><a href="#%24output" title="$output :: Reference to output class"><span class="description">Reference to output class</span><pre>$output</pre></a></li>
 <li class="nav-header protected">» Protected</li>
 <li class="property protected "><a href="#%24page" title="$page :: Instance of Page class"><span class="description">Instance of Page class</span><pre>$page</pre></a></li>
 </ul>
@@ -130,22 +131,29 @@
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
-<h2>PHP magic method to facilitate dynamic methods</h2>
+<h2>Allow calling of array methods on the object and
-<pre>__call(string $name, array $args) : mixed</pre>
+dynamic methods</h2>
+<pre>__call(string $name, array $params) : mixed</pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
-<table class="table table-bordered"><tr>
+<table class="table table-bordered">
+<tr>
+<th>inherited_from</th>
+<td>\MM::__call()</td>
+</tr>
+<tr>
 <th>inherited_from</th>
 <td>\miniMVC::__call()</td>
-</tr></table>
+</tr>
+</table>
 <h3>Parameters</h3>
 <div class="subelement argument">
 <h4>$name</h4>
 <code>string</code>
 </div>
 <div class="subelement argument">
-<h4>$args</h4>
+<h4>$params</h4>
 <code>array</code>
 </div>
 <h3>Returns</h3>
@@ -736,18 +744,6 @@
 </div>
 <h3>
 <i class="icon-custom icon-property"></i> Properties</h3>
-<a name="%24output" id="$output"> </a><div class="element clickable property public $output" data-toggle="collapse" data-target=".$output .collapse">
-<h2>Reference to output class</h2>
-<pre>$output : <a href="../classes/MM_Output.html">\MM_Output</a></pre>
-<div class="labels"><span class="label">Inherited</span></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<table class="table table-bordered"><tr>
-<th>inherited_from</th>
-<td>\miniMVC::$$output</td>
-</tr></table>
-</div></div>
-</div>
 <a name="%24page" id="$page"> </a><div class="element clickable property protected $page" data-toggle="collapse" data-target=".$page .collapse">
 <h2>Instance of Page class</h2>
 <pre>$page : \Page</pre>
@@ -761,7 +757,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MM_Data_Store.html

@@ -199,7 +199,7 @@ of the singleton</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MM_Model.html

@@ -56,7 +56,9 @@
 <ul class="side-nav nav nav-list">
 <li class="nav-header">
 <i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public inherited"><a href="#__call" title="__call :: PHP magic method to facilitate dynamic methods"><span class="description">PHP magic method to facilitate dynamic methods</span><pre>__call()</pre></a></li>
+<li class="method public inherited"><a href="#__call" title="__call :: Allow calling of array methods on the object and
+dynamic methods"><span class="description">Allow calling of array methods on the object and
+dynamic methods</span><pre>__call()</pre></a></li>
 <li class="method public "><a href="#__construct" title="__construct :: Initialize the model class"><span class="description">Initialize the model class</span><pre>__construct()</pre></a></li>
 <li class="method public inherited"><a href="#append" title="append :: "><span class="description">append()
         </span><pre>append()</pre></a></li>
@@ -103,9 +105,6 @@
 <li class="method public inherited"><a href="#unload" title="unload :: Convenience function to remove an object from the singleton"><span class="description">Convenience function to remove an object from the singleton</span><pre>unload()</pre></a></li>
 <li class="method public inherited"><a href="#unserialize" title="unserialize :: "><span class="description">unserialize()
         </span><pre>unserialize()</pre></a></li>
-<li class="nav-header">
-<i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public inherited"><a href="#%24output" title="$output :: Reference to output class"><span class="description">Reference to output class</span><pre>$output</pre></a></li>
 </ul>
 </div>
 <div class="span8">
@@ -126,22 +125,29 @@
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
-<h2>PHP magic method to facilitate dynamic methods</h2>
+<h2>Allow calling of array methods on the object and
-<pre>__call(string $name, array $args) : mixed</pre>
+dynamic methods</h2>
+<pre>__call(string $name, array $params) : mixed</pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
-<table class="table table-bordered"><tr>
+<table class="table table-bordered">
+<tr>
+<th>inherited_from</th>
+<td>\MM::__call()</td>
+</tr>
+<tr>
 <th>inherited_from</th>
 <td>\miniMVC::__call()</td>
-</tr></table>
+</tr>
+</table>
 <h3>Parameters</h3>
 <div class="subelement argument">
 <h4>$name</h4>
 <code>string</code>
 </div>
 <div class="subelement argument">
-<h4>$args</h4>
+<h4>$params</h4>
 <code>array</code>
 </div>
 <h3>Returns</h3>
@@ -697,20 +703,6 @@
 </table>
 </div></div>
 </div>
-<h3>
-<i class="icon-custom icon-property"></i> Properties</h3>
-<a name="%24output" id="$output"> </a><div class="element clickable property public $output" data-toggle="collapse" data-target=".$output .collapse">
-<h2>Reference to output class</h2>
-<pre>$output : <a href="../classes/MM_Output.html">\MM_Output</a></pre>
-<div class="labels"><span class="label">Inherited</span></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<table class="table table-bordered"><tr>
-<th>inherited_from</th>
-<td>\miniMVC::$$output</td>
-</tr></table>
-</div></div>
-</div>
 </div>
 </div>
 </div>
@@ -718,7 +710,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MM_Output.html

@@ -639,7 +639,7 @@ Used for outputing HTML</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MM_Page.html

@@ -60,8 +60,12 @@
 dynamic methods"><span class="description">Allow calling of array methods on the object and
 dynamic methods</span><pre>__call()</pre></a></li>
 <li class="method public "><a href="#__construct" title="__construct :: Set up the page class"><span class="description">Set up the page class</span><pre>__construct()</pre></a></li>
+<li class="method public inherited"><a href="#__destruct" title="__destruct :: PHP magic method called when ending the script
+Used for outputing HTML"><span class="description">PHP magic method called when ending the script
+Used for outputing HTML</span><pre>__destruct()</pre></a></li>
 <li class="method public inherited"><a href="#append" title="append :: "><span class="description">append()
         </span><pre>append()</pre></a></li>
+<li class="method public inherited"><a href="#append_output" title="append_output :: Adds text to the output buffer"><span class="description">Adds text to the output buffer</span><pre>append_output()</pre></a></li>
 <li class="method public inherited"><a href="#asort" title="asort :: "><span class="description">asort()
         </span><pre>asort()</pre></a></li>
 <li class="method public "><a href="#build_footer" title="build_footer :: Builds common footer with any additional js"><span class="description">Builds common footer with any additional js</span><pre>build_footer()</pre></a></li>
@@ -70,6 +74,7 @@ dynamic methods</span><pre>__call()</pre></a></li>
         </span><pre>count()</pre></a></li>
 <li class="method public inherited"><a href="#exchangeArray" title="exchangeArray :: "><span class="description">exchangeArray()
         </span><pre>exchangeArray()</pre></a></li>
+<li class="method public inherited"><a href="#flush_headers" title="flush_headers :: Sends headers and then removes them"><span class="description">Sends headers and then removes them</span><pre>flush_headers()</pre></a></li>
 <li class="method public inherited"><a href="#getArrayCopy" title="getArrayCopy :: "><span class="description">getArrayCopy()
         </span><pre>getArrayCopy()</pre></a></li>
 <li class="method public inherited"><a href="#getFlags" title="getFlags :: "><span class="description">getFlags()
@@ -109,8 +114,10 @@ dynamic methods</span><pre>__call()</pre></a></li>
 <li class="method public "><a href="#set_foot_js_group" title="set_foot_js_group :: Sets a minified javascript group for the page footer"><span class="description">Sets a minified javascript group for the page footer</span><pre>set_foot_js_group()</pre></a></li>
 <li class="method public "><a href="#set_head_js_group" title="set_head_js_group :: Sets minified javascript group in header"><span class="description">Sets minified javascript group in header</span><pre>set_head_js_group()</pre></a></li>
 <li class="method public "><a href="#set_head_tag" title="set_head_tag :: Sets a custom tag in the header"><span class="description">Sets a custom tag in the header</span><pre>set_head_tag()</pre></a></li>
+<li class="method public inherited"><a href="#set_header" title="set_header :: Sets a header for later output"><span class="description">Sets a header for later output</span><pre>set_header()</pre></a></li>
 <li class="method public "><a href="#set_message" title="set_message :: Set Message"><span class="description">Set Message</span><pre>set_message()</pre></a></li>
 <li class="method public "><a href="#set_meta" title="set_meta :: Set Meta"><span class="description">Set Meta</span><pre>set_meta()</pre></a></li>
+<li class="method public inherited"><a href="#set_output" title="set_output :: Sets the output buffer"><span class="description">Sets the output buffer</span><pre>set_output()</pre></a></li>
 <li class="method public "><a href="#set_title" title="set_title :: Sets html title string"><span class="description">Sets html title string</span><pre>set_title()</pre></a></li>
 <li class="method public inherited"><a href="#uasort" title="uasort :: "><span class="description">uasort()
         </span><pre>uasort()</pre></a></li>
@@ -129,10 +136,12 @@ dynamic methods</span><pre>__call()</pre></a></li>
 <li class="property private "><a href="#%24base" title="$base :: Base tag"><span class="description">Base tag</span><pre>$base</pre></a></li>
 <li class="property private "><a href="#%24body_class" title="$body_class :: Class(es) to apply to the main body tag"><span class="description">Class(es) to apply to the main body tag</span><pre>$body_class</pre></a></li>
 <li class="property private "><a href="#%24body_id" title="$body_id :: Id to apply to the body tag"><span class="description">Id to apply to the body tag</span><pre>$body_id</pre></a></li>
+<li class="property private inherited"><a href="#%24buffer" title="$buffer :: Content for outputting"><span class="description">Content for outputting</span><pre>$buffer</pre></a></li>
 <li class="property private "><a href="#%24css" title="$css :: CSS tags for the page"><span class="description">CSS tags for the page</span><pre>$css</pre></a></li>
 <li class="property private "><a href="#%24foot_js" title="$foot_js :: JS tags for the footer"><span class="description">JS tags for the footer</span><pre>$foot_js</pre></a></li>
 <li class="property private "><a href="#%24head_js" title="$head_js :: JS tags for the header"><span class="description">JS tags for the header</span><pre>$head_js</pre></a></li>
 <li class="property private "><a href="#%24head_tags" title="$head_tags :: Additional header tags"><span class="description">Additional header tags</span><pre>$head_tags</pre></a></li>
+<li class="property private inherited"><a href="#%24headers" title="$headers :: HTTP headers to send"><span class="description">HTTP headers to send</span><pre>$headers</pre></a></li>
 <li class="property private "><a href="#%24meta" title="$meta :: Meta tags"><span class="description">Meta tags</span><pre>$meta</pre></a></li>
 <li class="property private "><a href="#%24title" title="$title :: Page title"><span class="description">Page title</span><pre>$title</pre></a></li>
 </ul>
@@ -162,10 +171,16 @@ dynamic methods</h2>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
-<table class="table table-bordered"><tr>
+<table class="table table-bordered">
+<tr>
 <th>inherited_from</th>
 <td>\MM::__call()</td>
-</tr></table>
+</tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::__call()</td>
+</tr>
+</table>
 <h3>Parameters</h3>
 <div class="subelement argument">
 <h4>$name</h4>
@@ -191,6 +206,19 @@ dynamic methods</h2>
 <code></code><p>object</p></div>
 </div></div>
 </div>
+<a name="__destruct" id="__destruct"></a><div class="element clickable method public __destruct" data-toggle="collapse" data-target=".__destruct .collapse">
+<h2>PHP magic method called when ending the script
+Used for outputing HTML</h2>
+<pre>__destruct() : void</pre>
+<div class="labels"><span class="label">Inherited</span></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\MM_Output::__destruct()</td>
+</tr></table>
+</div></div>
+</div>
 <a name="append" id="append"></a><div class="element clickable method public append" data-toggle="collapse" data-target=".append .collapse">
 <h2>append()
         </h2>
@@ -207,9 +235,30 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::append()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::append()</td>
+</tr>
 </table>
 </div></div>
 </div>
+<a name="append_output" id="append_output"></a><div class="element clickable method public append_output" data-toggle="collapse" data-target=".append_output .collapse">
+<h2>Adds text to the output buffer</h2>
+<pre>append_output(string $string) </pre>
+<div class="labels"><span class="label">Inherited</span></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\MM_Output::append_output()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$string</h4>
+<code>string</code>
+</div>
+</div></div>
+</div>
 <a name="asort" id="asort"></a><div class="element clickable method public asort" data-toggle="collapse" data-target=".asort .collapse">
 <h2>asort()
         </h2>
@@ -226,6 +275,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::asort()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::asort()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -266,6 +319,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::count()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::count()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -285,9 +342,25 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::exchangeArray()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::exchangeArray()</td>
+</tr>
 </table>
 </div></div>
 </div>
+<a name="flush_headers" id="flush_headers"></a><div class="element clickable method public flush_headers" data-toggle="collapse" data-target=".flush_headers .collapse">
+<h2>Sends headers and then removes them</h2>
+<pre>flush_headers() </pre>
+<div class="labels"><span class="label">Inherited</span></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\MM_Output::flush_headers()</td>
+</tr></table>
+</div></div>
+</div>
 <a name="getArrayCopy" id="getArrayCopy"></a><div class="element clickable method public getArrayCopy" data-toggle="collapse" data-target=".getArrayCopy .collapse">
 <h2>getArrayCopy()
         </h2>
@@ -304,6 +377,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::getArrayCopy()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::getArrayCopy()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -323,6 +400,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::getFlags()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::getFlags()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -342,6 +423,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::getIterator()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::getIterator()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -361,6 +446,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::getIteratorClass()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::getIteratorClass()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -380,6 +469,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::ksort()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::ksort()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -399,6 +492,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::natcasesort()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::natcasesort()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -418,6 +515,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::natsort()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::natsort()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -437,6 +538,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::offsetExists()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::offsetExists()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -456,6 +561,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::offsetGet()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::offsetGet()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -475,6 +584,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::offsetSet()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::offsetSet()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -494,6 +607,10 @@ dynamic methods</h2>
 <th>inherited_from</th>
 <td>\MM::offsetUnset()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::offsetUnset()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -558,6 +675,10 @@ page.</p></p>
 <th>inherited_from</th>
 <td>\MM::serialize()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::serialize()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -577,6 +698,10 @@ page.</p></p>
 <th>inherited_from</th>
 <td>\MM::setFlags()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::setFlags()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -596,6 +721,10 @@ page.</p></p>
 <th>inherited_from</th>
 <td>\MM::setIteratorClass()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::setIteratorClass()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -734,6 +863,27 @@ page.</p></p>
 <div class="subelement response"><code>\Page</code></div>
 </div></div>
 </div>
+<a name="set_header" id="set_header"></a><div class="element clickable method public set_header" data-toggle="collapse" data-target=".set_header .collapse">
+<h2>Sets a header for later output</h2>
+<pre>set_header(string $key, string $val) </pre>
+<div class="labels"><span class="label">Inherited</span></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\MM_Output::set_header()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$key</h4>
+<code>string</code>
+</div>
+<div class="subelement argument">
+<h4>$val</h4>
+<code>string</code>
+</div>
+</div></div>
+</div>
 <a name="set_message" id="set_message"></a><div class="element clickable method public set_message" data-toggle="collapse" data-target=".set_message .collapse">
 <h2>Set Message</h2>
 <pre>set_message(string $type, string $message, bool $return) : void</pre>
@@ -770,6 +920,23 @@ page.</p></p>
 <div class="subelement response"><code>\Page</code></div>
 </div></div>
 </div>
+<a name="set_output" id="set_output"></a><div class="element clickable method public set_output" data-toggle="collapse" data-target=".set_output .collapse">
+<h2>Sets the output buffer</h2>
+<pre>set_output(string $string) </pre>
+<div class="labels"><span class="label">Inherited</span></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\MM_Output::set_output()</td>
+</tr></table>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$string</h4>
+<code>string</code>
+</div>
+</div></div>
+</div>
 <a name="set_title" id="set_title"></a><div class="element clickable method public set_title" data-toggle="collapse" data-target=".set_title .collapse">
 <h2>Sets html title string</h2>
 <pre>set_title(string $title) : \Page</pre>
@@ -801,6 +968,10 @@ page.</p></p>
 <th>inherited_from</th>
 <td>\MM::uasort()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::uasort()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -820,6 +991,10 @@ page.</p></p>
 <th>inherited_from</th>
 <td>\MM::uksort()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::uksort()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -839,6 +1014,10 @@ page.</p></p>
 <th>inherited_from</th>
 <td>\MM::unserialize()</td>
 </tr>
+<tr>
+<th>inherited_from</th>
+<td>\MM_Output::unserialize()</td>
+</tr>
 </table>
 </div></div>
 </div>
@@ -928,6 +1107,18 @@ supports</p></p>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
+<a name="%24buffer" id="$buffer"> </a><div class="element clickable property private $buffer" data-toggle="collapse" data-target=".$buffer .collapse">
+<h2>Content for outputting</h2>
+<pre>$buffer : string</pre>
+<div class="labels"><span class="label">Inherited</span></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\MM_Output::$$buffer</td>
+</tr></table>
+</div></div>
+</div>
 <a name="%24css" id="$css"> </a><div class="element clickable property private $css" data-toggle="collapse" data-target=".$css .collapse">
 <h2>CSS tags for the page</h2>
 <pre>$css : string</pre>
@@ -952,6 +1143,18 @@ supports</p></p>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
+<a name="%24headers" id="$headers"> </a><div class="element clickable property private $headers" data-toggle="collapse" data-target=".$headers .collapse">
+<h2>HTTP headers to send</h2>
+<pre>$headers : array</pre>
+<div class="labels"><span class="label">Inherited</span></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\MM_Output::$$headers</td>
+</tr></table>
+</div></div>
+</div>
 <a name="%24meta" id="$meta"> </a><div class="element clickable property private $meta" data-toggle="collapse" data-target=".$meta .collapse">
 <h2>Meta tags</h2>
 <pre>$meta : string</pre>
@@ -971,7 +1174,7 @@ supports</p></p>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/MM_Session.html

@@ -143,7 +143,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Welcome.html

@@ -56,7 +56,9 @@
 <ul class="side-nav nav nav-list">
 <li class="nav-header">
 <i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public inherited"><a href="#__call" title="__call :: PHP magic method to facilitate dynamic methods"><span class="description">PHP magic method to facilitate dynamic methods</span><pre>__call()</pre></a></li>
+<li class="method public inherited"><a href="#__call" title="__call :: Allow calling of array methods on the object and
+dynamic methods"><span class="description">Allow calling of array methods on the object and
+dynamic methods</span><pre>__call()</pre></a></li>
 <li class="method public "><a href="#__construct" title="__construct :: Initialize the constructor"><span class="description">Initialize the constructor</span><pre>__construct()</pre></a></li>
 <li class="method public inherited"><a href="#append" title="append :: "><span class="description">append()
         </span><pre>append()</pre></a></li>
@@ -109,7 +111,6 @@
         </span><pre>unserialize()</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public inherited"><a href="#%24output" title="$output :: Reference to output class"><span class="description">Reference to output class</span><pre>$output</pre></a></li>
 <li class="nav-header protected">» Protected</li>
 <li class="property protected inherited"><a href="#%24page" title="$page :: Instance of Page class"><span class="description">Instance of Page class</span><pre>$page</pre></a></li>
 </ul>
@@ -132,14 +133,19 @@
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
-<h2>PHP magic method to facilitate dynamic methods</h2>
+<h2>Allow calling of array methods on the object and
-<pre>__call(string $name, array $args) : mixed</pre>
+dynamic methods</h2>
+<pre>__call(string $name, array $params) : mixed</pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
 <table class="table table-bordered">
 <tr>
 <th>inherited_from</th>
+<td>\MM::__call()</td>
+</tr>
+<tr>
+<th>inherited_from</th>
 <td>\miniMVC::__call()</td>
 </tr>
 <tr>
@@ -153,7 +159,7 @@
 <code>string</code>
 </div>
 <div class="subelement argument">
-<h4>$args</h4>
+<h4>$params</h4>
 <code>array</code>
 </div>
 <h3>Returns</h3>
@@ -866,24 +872,6 @@
 </div>
 <h3>
 <i class="icon-custom icon-property"></i> Properties</h3>
-<a name="%24output" id="$output"> </a><div class="element clickable property public $output" data-toggle="collapse" data-target=".$output .collapse">
-<h2>Reference to output class</h2>
-<pre>$output : <a href="../classes/MM_Output.html">\MM_Output</a></pre>
-<div class="labels"><span class="label">Inherited</span></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<table class="table table-bordered">
-<tr>
-<th>inherited_from</th>
-<td>\miniMVC::$$output</td>
-</tr>
-<tr>
-<th>inherited_from</th>
-<td>\MM_Controller::$$output</td>
-</tr>
-</table>
-</div></div>
-</div>
 <a name="%24page" id="$page"> </a><div class="element clickable property protected $page" data-toggle="collapse" data-target=".$page .collapse">
 <h2>Instance of Page class</h2>
 <pre>$page : \Page</pre>
@@ -903,7 +891,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/Welcome_Model.html

@@ -56,7 +56,9 @@
 <ul class="side-nav nav nav-list">
 <li class="nav-header">
 <i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public inherited"><a href="#__call" title="__call :: PHP magic method to facilitate dynamic methods"><span class="description">PHP magic method to facilitate dynamic methods</span><pre>__call()</pre></a></li>
+<li class="method public inherited"><a href="#__call" title="__call :: Allow calling of array methods on the object and
+dynamic methods"><span class="description">Allow calling of array methods on the object and
+dynamic methods</span><pre>__call()</pre></a></li>
 <li class="method public "><a href="#__construct" title="__construct :: Initialize the model"><span class="description">Initialize the model</span><pre>__construct()</pre></a></li>
 <li class="method public inherited"><a href="#append" title="append :: "><span class="description">append()
         </span><pre>append()</pre></a></li>
@@ -103,9 +105,6 @@
 <li class="method public inherited"><a href="#unload" title="unload :: Convenience function to remove an object from the singleton"><span class="description">Convenience function to remove an object from the singleton</span><pre>unload()</pre></a></li>
 <li class="method public inherited"><a href="#unserialize" title="unserialize :: "><span class="description">unserialize()
         </span><pre>unserialize()</pre></a></li>
-<li class="nav-header">
-<i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public inherited"><a href="#%24output" title="$output :: Reference to output class"><span class="description">Reference to output class</span><pre>$output</pre></a></li>
 </ul>
 </div>
 <div class="span8">
@@ -126,14 +125,19 @@
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
-<h2>PHP magic method to facilitate dynamic methods</h2>
+<h2>Allow calling of array methods on the object and
-<pre>__call(string $name, array $args) : mixed</pre>
+dynamic methods</h2>
+<pre>__call(string $name, array $params) : mixed</pre>
 <div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
 <table class="table table-bordered">
 <tr>
 <th>inherited_from</th>
+<td>\MM::__call()</td>
+</tr>
+<tr>
+<th>inherited_from</th>
 <td>\miniMVC::__call()</td>
 </tr>
 <tr>
@@ -147,7 +151,7 @@
 <code>string</code>
 </div>
 <div class="subelement argument">
-<h4>$args</h4>
+<h4>$params</h4>
 <code>array</code>
 </div>
 <h3>Returns</h3>
@@ -798,26 +802,6 @@
 </table>
 </div></div>
 </div>
-<h3>
-<i class="icon-custom icon-property"></i> Properties</h3>
-<a name="%24output" id="$output"> </a><div class="element clickable property public $output" data-toggle="collapse" data-target=".$output .collapse">
-<h2>Reference to output class</h2>
-<pre>$output : <a href="../classes/MM_Output.html">\MM_Output</a></pre>
-<div class="labels"><span class="label">Inherited</span></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<table class="table table-bordered">
-<tr>
-<th>inherited_from</th>
-<td>\miniMVC::$$output</td>
-</tr>
-<tr>
-<th>inherited_from</th>
-<td>\MM_Model::$$output</td>
-</tr>
-</table>
-</div></div>
-</div>
 </div>
 </div>
 </div>
@@ -825,7 +809,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/classes/miniMVC.html

@@ -56,7 +56,9 @@
 <ul class="side-nav nav nav-list">
 <li class="nav-header">
 <i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public "><a href="#__call" title="__call :: PHP magic method to facilitate dynamic methods"><span class="description">PHP magic method to facilitate dynamic methods</span><pre>__call()</pre></a></li>
+<li class="method public inherited"><a href="#__call" title="__call :: Allow calling of array methods on the object and
+dynamic methods"><span class="description">Allow calling of array methods on the object and
+dynamic methods</span><pre>__call()</pre></a></li>
 <li class="method public "><a href="#__construct" title="__construct :: Constructor - Any classes loaded here become subclasses of miniMVC"><span class="description">Constructor - Any classes loaded here become subclasses of miniMVC</span><pre>__construct()</pre></a></li>
 <li class="method public inherited"><a href="#append" title="append :: "><span class="description">append()
         </span><pre>append()</pre></a></li>
@@ -103,9 +105,6 @@
 <li class="method public "><a href="#unload" title="unload :: Convenience function to remove an object from the singleton"><span class="description">Convenience function to remove an object from the singleton</span><pre>unload()</pre></a></li>
 <li class="method public inherited"><a href="#unserialize" title="unserialize :: "><span class="description">unserialize()
         </span><pre>unserialize()</pre></a></li>
-<li class="nav-header">
-<i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public "><a href="#%24output" title="$output :: Reference to output class"><span class="description">Reference to output class</span><pre>$output</pre></a></li>
 </ul>
 </div>
 <div class="span8">
@@ -126,18 +125,23 @@
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
-<h2>PHP magic method to facilitate dynamic methods</h2>
+<h2>Allow calling of array methods on the object and
-<pre>__call(string $name, array $args) : mixed</pre>
+dynamic methods</h2>
-<div class="labels"></div>
+<pre>__call(string $name, array $params) : mixed</pre>
+<div class="labels"><span class="label">Inherited</span></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>inherited_from</th>
+<td>\MM::__call()</td>
+</tr></table>
 <h3>Parameters</h3>
 <div class="subelement argument">
 <h4>$name</h4>
 <code>string</code>
 </div>
 <div class="subelement argument">
-<h4>$args</h4>
+<h4>$params</h4>
 <code>array</code>
 </div>
 <h3>Returns</h3>
@@ -597,14 +601,6 @@
 </table>
 </div></div>
 </div>
-<h3>
-<i class="icon-custom icon-property"></i> Properties</h3>
-<a name="%24output" id="$output"> </a><div class="element clickable property public $output" data-toggle="collapse" data-target=".$output .collapse">
-<h2>Reference to output class</h2>
-<pre>$output : <a href="../classes/MM_Output.html">\MM_Output</a></pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
-</div>
 </div>
 </div>
 </div>
@@ -612,7 +608,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/deprecated.html

@@ -66,7 +66,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/errors.html

@@ -84,7 +84,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/graph_class.html

@@ -63,7 +63,7 @@
         </script><div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/index.html

@@ -78,7 +78,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/markers.html

@@ -68,7 +68,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/namespaces/default.html

@@ -513,7 +513,7 @@ display them cleanly</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/.html

@@ -66,7 +66,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/Default.html

@@ -177,7 +177,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/miniMVC.App.html

@@ -138,7 +138,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/miniMVC.Libraries.html

@@ -96,7 +96,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/miniMVC.System.html

@@ -136,7 +136,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/packages/miniMVC.html

@@ -494,7 +494,7 @@ display them cleanly</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
+            generated on 2012-05-16T08:29:32-04:00.<br></footer></div>
 </div>
 </body>
 </html>

docs/structure.xml

@@ -155,7 +155,7 @@
       </method>
     </class>
   </file>
-  <file path="sys/core/miniMVC.php" hash="f378e846e7eea02086fa35d27f46f3c8" package="miniMVC">
+  <file path="sys/core/miniMVC.php" hash="c7e3e16b5780ba1122da5382b94dc1c0" package="miniMVC">
     <docblock line="2">
       <description><![CDATA[MiniMVC]]></description>
       <long-description><![CDATA[<p>Convention-based micro-framework for PHP</p>]]></long-description>
@@ -309,103 +309,68 @@ dynamic methods]]></description>
         <tag line="246" name="package" description="miniMVC"/>
         <tag line="246" name="subpackage" description="System"/>
       </docblock>
-      <property final="false" static="false" visibility="public" line="261" package="Default">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="261" package="">
-        <name>$output</name>
-        <default><![CDATA[]]></default>
-        <docblock line="256">
-          <description><![CDATA[Reference to output class]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="256" name="var" description="" type="\MM_Output">
-            <type by_reference="false">\MM_Output</type>
-          </tag>
-        </docblock>
-      </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="268" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="263">
+        <docblock line="256">
           <description><![CDATA[Constructor - Any classes loaded here become subclasses of miniMVC]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="263" name="param" description="" type="array" variable="$members">
+          <tag line="256" name="param" description="" type="array" variable="$members">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
-        <argument line="268">
+        <argument line="261">
           <name>$members</name>
           <default><![CDATA[[]]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="284" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="275" package="">
-        <name>__call</name>
-        <type>function</type>
-        <docblock line="278">
-          <description><![CDATA[PHP magic method to facilitate dynamic methods]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="278" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="278" name="param" description="" type="array" variable="$args">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-        <argument line="284">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="284">
-          <name>$args</name>
-          <default><![CDATA[[]]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="318" package="">
         <name>load_class</name>
         <type>function</type>
-        <docblock line="312">
+        <docblock line="269">
           <description><![CDATA[Method to load classes into the singleton]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="312" name="param" description="" type="string" variable="$name">
+          <tag line="269" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="312" name="return" description="" type="object">
+          <tag line="269" name="return" description="" type="object">
             <type by_reference="false">object</type>
           </tag>
         </docblock>
-        <argument line="318">
+        <argument line="275">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="374" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="331" package="">
         <name>unload</name>
         <type>function</type>
-        <docblock line="369">
+        <docblock line="326">
           <description><![CDATA[Convenience function to remove an object from the singleton]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="369" name="param" description="" type="string" variable="$name">
+          <tag line="326" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="374">
+        <argument line="331">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="389" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="346" package="">
         <name>load_config</name>
         <type>function</type>
-        <docblock line="384">
+        <docblock line="341">
           <description><![CDATA[Convenience function to load config files]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="384" name="param" description="" type="string" variable="$name">
+          <tag line="341" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="389">
+        <argument line="346">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -413,7 +378,7 @@ dynamic methods]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/core/page.php" hash="fb328467d359b5a0bd2fbe770f740211" package="miniMVC">
+  <file path="sys/core/page.php" hash="4d0b31c524dc800d5d5d02e8385801d7" package="miniMVC">
     <docblock line="2">
       <description><![CDATA[MiniMVC]]></description>
       <long-description><![CDATA[<p>Convention-based micro-framework for PHP</p>]]></long-description>
@@ -426,7 +391,7 @@ dynamic methods]]></description>
     <class final="false" abstract="false" namespace="default" line="25" package="miniMVC\System">
       <name>MM_Page</name>
       <full_name>\MM_Page</full_name>
-      <extends>\MM</extends>
+      <extends>\MM_Output</extends>
       <docblock line="16">
         <description><![CDATA[Class for building pages]]></description>
         <long-description><![CDATA[<p>All methods are chainable, with the exception of the constructor,
@@ -550,429 +515,429 @@ build_header(), build_footer(), and _headers() methods.</p>]]></long-description
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="124" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="123" package="">
         <name>_headers</name>
         <type>function</type>
-        <docblock line="114">
+        <docblock line="113">
           <description><![CDATA[Sets server headers and doctype]]></description>
           <long-description><![CDATA[<p>Also sets page mime type, based on if sent as
 html or xhtml, and what the target browser
 supports</p>]]></long-description>
-          <tag line="114" name="param" description="" type="bool" variable="$html5">
+          <tag line="113" name="param" description="" type="bool" variable="$html5">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="114" name="return" description="" type="\Page">
+          <tag line="113" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="124">
+        <argument line="123">
           <name>$html5</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="165" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="164" package="">
         <name>set_meta</name>
         <type>function</type>
-        <docblock line="157">
+        <docblock line="156">
           <description><![CDATA[Set Meta]]></description>
           <long-description><![CDATA[<p>Sets meta tags, with codeigniter native meta tag helper</p>]]></long-description>
-          <tag line="157" name="param" description="" type="array" variable="$meta">
+          <tag line="156" name="param" description="" type="array" variable="$meta">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="157" name="return" description="" type="\Page">
+          <tag line="156" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="165">
+        <argument line="164">
           <name>$meta</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="180" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="179" package="">
         <name>set_head_js_group</name>
         <type>function</type>
-        <docblock line="173">
+        <docblock line="172">
           <description><![CDATA[Sets minified javascript group in header]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="173" name="param" description="" type="string" variable="$group">
+          <tag line="172" name="param" description="" type="string" variable="$group">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="173" name="param" description="" type="bool" variable="$debug">
+          <tag line="172" name="param" description="" type="bool" variable="$debug">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="173" name="return" description="" type="\Page">
+          <tag line="172" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="180">
+        <argument line="179">
           <name>$group</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="180">
+        <argument line="179">
           <name>$debug</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="200" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="199" package="">
         <name>set_css_group</name>
         <type>function</type>
-        <docblock line="195">
+        <docblock line="194">
           <description><![CDATA[Sets a minified css group]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="195" name="param" description="" type="string" variable="$group">
+          <tag line="194" name="param" description="" type="string" variable="$group">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="195" name="return" description="" type="\Page">
+          <tag line="194" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="200">
+        <argument line="199">
           <name>$group</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="221" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="220" package="">
         <name>set_foot_js_group</name>
         <type>function</type>
-        <docblock line="214">
+        <docblock line="213">
           <description><![CDATA[Sets a minified javascript group for the page footer]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="214" name="param" description="" type="string" variable="$group">
+          <tag line="213" name="param" description="" type="string" variable="$group">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="214" name="param" description="" type="bool" variable="$debug">
+          <tag line="213" name="param" description="" type="bool" variable="$debug">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="214" name="return" description="" type="\Page">
+          <tag line="213" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="221">
+        <argument line="220">
           <name>$group</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="221">
+        <argument line="220">
           <name>$debug</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="237" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="236" package="">
         <name>set_title</name>
         <type>function</type>
-        <docblock line="231">
+        <docblock line="230">
           <description><![CDATA[Sets html title string]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="231" name="param" description="" type="string" variable="$title">
+          <tag line="230" name="param" description="" type="string" variable="$title">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="231" name="return" description="" type="\Page">
+          <tag line="230" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="237">
+        <argument line="236">
           <name>$title</name>
           <default><![CDATA[""]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="254" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="253" package="">
         <name>set_body_class</name>
         <type>function</type>
-        <docblock line="248">
+        <docblock line="247">
           <description><![CDATA[Sets custom body class]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="248" name="param" description="" type="string" variable="$class">
+          <tag line="247" name="param" description="" type="string" variable="$class">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="248" name="return" description="" type="\Page">
+          <tag line="247" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="254">
+        <argument line="253">
           <name>$class</name>
           <default><![CDATA[""]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="268" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="267" package="">
         <name>set_body_id</name>
         <type>function</type>
-        <docblock line="262">
+        <docblock line="261">
           <description><![CDATA[Sets custom body id]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="262" name="param" description="" type="string" variable="$id">
+          <tag line="261" name="param" description="" type="string" variable="$id">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="262" name="return" description="" type="\Page">
+          <tag line="261" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="268">
+        <argument line="267">
           <name>$id</name>
           <default><![CDATA[""]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="282" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="281" package="">
         <name>set_base</name>
         <type>function</type>
-        <docblock line="276">
+        <docblock line="275">
           <description><![CDATA[Sets custom base href]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="276" name="param" description="href" type="string" variable="$href">
+          <tag line="275" name="param" description="href" type="string" variable="$href">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="276" name="return" description="" type="\Page">
+          <tag line="275" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="282">
+        <argument line="281">
           <name>$href</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="298" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="297" package="">
         <name>set_css_tag</name>
         <type>function</type>
-        <docblock line="290">
+        <docblock line="289">
           <description><![CDATA[Sets custom css tags]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="290" name="param" description="" type="string" variable="$name">
+          <tag line="289" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="290" name="param" description="" type="bool" variable="$domain">
+          <tag line="289" name="param" description="" type="bool" variable="$domain">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="290" name="param" description="" type="string" variable="$media">
+          <tag line="289" name="param" description="" type="string" variable="$media">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="290" name="return" description="" type="\Page">
+          <tag line="289" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="298">
+        <argument line="297">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="298">
+        <argument line="297">
           <name>$domain</name>
           <default><![CDATA[TRUE]]></default>
           <type/>
         </argument>
-        <argument line="298">
+        <argument line="297">
           <name>$media</name>
           <default><![CDATA["all"]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="326" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="325" package="">
         <name>set_head_tag</name>
         <type>function</type>
-        <docblock line="320">
+        <docblock line="319">
           <description><![CDATA[Sets a custom tag in the header]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="320" name="param" description="" type="string" variable="$tag">
+          <tag line="319" name="param" description="" type="string" variable="$tag">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="320" name="return" description="" type="\Page">
+          <tag line="319" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="326">
+        <argument line="325">
           <name>$tag</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="340" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="339" package="">
         <name>build_header</name>
         <type>function</type>
-        <docblock line="334">
+        <docblock line="333">
           <description><![CDATA[Sets custom page header]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="334" name="param" description="" type="bool" variable="$html5">
+          <tag line="333" name="param" description="" type="bool" variable="$html5">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="334" name="return" description="" type="\Page">
+          <tag line="333" name="return" description="" type="\Page">
             <type by_reference="false">\Page</type>
           </tag>
         </docblock>
-        <argument line="340">
+        <argument line="339">
           <name>$html5</name>
           <default><![CDATA[TRUE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="398" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="397" package="">
         <name>build_footer</name>
         <type>function</type>
-        <docblock line="395">
+        <docblock line="394">
           <description><![CDATA[Builds common footer with any additional js]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="418" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="417" package="">
         <name>script_tag</name>
         <type>function</type>
-        <docblock line="409">
+        <docblock line="408">
           <description><![CDATA[Script Tag]]></description>
           <long-description><![CDATA[<p>Helper function for making script tags</p>]]></long-description>
-          <tag line="409" name="param" description="" type="string" variable="$js">
+          <tag line="408" name="param" description="" type="string" variable="$js">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="409" name="param" description="" type="bool" variable="$domain">
+          <tag line="408" name="param" description="" type="bool" variable="$domain">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="409" name="return" description="" type="string">
+          <tag line="408" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="418">
+        <argument line="417">
           <name>$js</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="418">
+        <argument line="417">
           <name>$domain</name>
           <default><![CDATA[TRUE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="442" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="441" package="">
         <name>set_message</name>
         <type>function</type>
-        <docblock line="433">
+        <docblock line="432">
           <description><![CDATA[Set Message]]></description>
           <long-description><![CDATA[<p>Adds a message to the page</p>]]></long-description>
-          <tag line="433" name="param" description="" type="string" variable="$type">
+          <tag line="432" name="param" description="" type="string" variable="$type">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="433" name="param" description="" type="string" variable="$message">
+          <tag line="432" name="param" description="" type="string" variable="$message">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="433" name="param" description="" type="bool" variable="$return">
+          <tag line="432" name="param" description="" type="bool" variable="$return">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="433" name="return" description="" type="void">
+          <tag line="432" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="442">
+        <argument line="441">
           <name>$type</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="442">
+        <argument line="441">
           <name>$message</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="442">
+        <argument line="441">
           <name>$return</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="458" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="457" package="">
         <name>redirect_303</name>
         <type>function</type>
-        <docblock line="452">
+        <docblock line="451">
           <description><![CDATA[Redirect 303]]></description>
           <long-description><![CDATA[<p>Shortcut function for 303 redirect</p>]]></long-description>
-          <tag line="452" name="param" description="" type="string" variable="$url">
+          <tag line="451" name="param" description="" type="string" variable="$url">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="458">
+        <argument line="457">
           <name>$url</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="473" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="472" package="">
         <name>render</name>
         <type>function</type>
-        <docblock line="466">
+        <docblock line="465">
           <description><![CDATA[Render]]></description>
           <long-description><![CDATA[<p>Shortcut function for building a page</p>]]></long-description>
-          <tag line="466" name="param" description="" type="string" variable="$view">
+          <tag line="465" name="param" description="" type="string" variable="$view">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="466" name="param" description="" type="array" variable="$data">
+          <tag line="465" name="param" description="" type="array" variable="$data">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
-        <argument line="473">
+        <argument line="472">
           <name>$view</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="473">
+        <argument line="472">
           <name>$data</name>
           <default><![CDATA[[]]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="490" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="489" package="">
         <name>output_string</name>
         <type>function</type>
-        <docblock line="482">
+        <docblock line="481">
           <description><![CDATA[Output String]]></description>
           <long-description><![CDATA[<p>Similar to render(), this is a shortcut
 to output a string in the body of the
 page.</p>]]></long-description>
-          <tag line="482" name="param" description="" type="string" variable="$string">
+          <tag line="481" name="param" description="" type="string" variable="$string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="490">
+        <argument line="489">
           <name>$string</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="505" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="504" package="">
         <name>_meta</name>
         <type>function</type>
-        <docblock line="499">
+        <docblock line="498">
           <description><![CDATA[Private helper function to generate meta tags]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="499" name="param" description="" type="array" variable="$params">
+          <tag line="498" name="param" description="" type="array" variable="$params">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="499" name="return" description="" type="string">
+          <tag line="498" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="505">
+        <argument line="504">
           <name>$params</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="527" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="526" package="">
         <name>_link_tag</name>
         <type>function</type>
-        <docblock line="521">
+        <docblock line="520">
           <description><![CDATA[Private helper function to generate link tags]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="521" name="param" description="" type="array" variable="$params">
+          <tag line="520" name="param" description="" type="array" variable="$params">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="521" name="return" description="" type="string">
+          <tag line="520" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="527">
+        <argument line="526">
           <name>$params</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -980,7 +945,7 @@ page.</p>]]></long-description>
       </method>
     </class>
   </file>
-  <file path="sys/core/controller.php" hash="c51a147d4ddd1ea2a8491d7c7c71f372" package="miniMVC">
+  <file path="sys/core/controller.php" hash="04d74f84fc24b2a7440f48f44214cc38" package="miniMVC">
     <docblock line="2">
       <description><![CDATA[MiniMVC]]></description>
       <long-description><![CDATA[<p>Convention-based micro-framework for PHP</p>]]></long-description>
@@ -1890,7 +1855,7 @@ display them cleanly]]></description>
       </method>
     </class>
   </file>
-  <file path="app/modules/welcome/controllers/welcome.php" hash="b46fff4b3fd55129850e8edff54a75f5" package="miniMVC">
+  <file path="app/modules/welcome/controllers/welcome.php" hash="53ff84f9218e101772a8c6f7b001ce58" package="miniMVC">
     <docblock line="2">
       <description><![CDATA[MiniMVC]]></description>
       <long-description><![CDATA[<p>Convention-based micro-framework for PHP</p>]]></long-description>

sys/core/controller.php

@@ -115,7 +115,7 @@ class MM_Controller extends miniMVC {
 		}
 		else
 		{
-			$this->output->append_output($buffer);
+			$this->page->append_output($buffer);
 		}
 	}
 }

sys/core/miniMVC.php

@@ -252,13 +252,6 @@ class MM extends ArrayObject {
 class miniMVC extends MM {
 
 	use Singleton;
-	
-	/**
-	 * Reference to output class
-	 *
-	 * @var MM_Output
-	 */
-	public $output;
 
 	/**
 	 * Constructor - Any classes loaded here become subclasses of miniMVC
@@ -269,42 +262,6 @@ class miniMVC extends MM {
 	{
 		// Allow the class to be used like an array
 		parent::__construct($members);
-		
-		$this->output = new MM_Output();
-	}
-	
-	// --------------------------------------------------------------------------
-	
-	/** 
-	 * PHP magic method to facilitate dynamic methods
-	 *
-	 * @param string $name
-	 * @param array $args
-	 */
-	public function __call($name, $args = [])
-	{
-		// Allow array operations on the object
-		if (substr($name, 0, 6) === 'array_' && is_callable($name))
-		{
-			$args = array_merge($this->getArrayCopy(), $args);
-			return call_user_func_array($name, $args);
-		}
-	
-		// Call dynamic methods
-		if (is_callable(self::$instance->$name))
-		{	
-			// Add $this object to args
-			array_push($args, $this);
-		
-			// Call the dynamic function
-			return call_user_func_array(self::$instance->$name, $args);
-		}
-		
-		// Indirectly call output methods
-		if (is_callable(self::$instance->output->$name))
-		{
-			return call_user_func_array(self::$instance->output->$name, $args);
-		}
 	}
 	
 	// --------------------------------------------------------------------------

sys/core/page.php

@@ -22,7 +22,7 @@
  * @package miniMVC
  * @subpackage System
  */
-class MM_Page extends MM {
+class MM_Page extends MM_Output {
 
 	/**
 	 * Meta tags
@@ -106,7 +106,6 @@ class MM_Page extends MM {
 		$this->base       = "";
 		
 		$this->mm = $controller;
-		$this->output = $this->mm->output;
 	}
 	
 	// --------------------------------------------------------------------------
@@ -123,7 +122,7 @@ class MM_Page extends MM {
 	 */
 	private function _headers($html5)
 	{
-		$this->output->set_header("Cache-Control", "must-revalidate, public");
+		$this->set_header("Cache-Control", "must-revalidate, public");
 		$mime = "";
 		
 		//Variable for accept keyword
@@ -145,9 +144,9 @@ class MM_Page extends MM {
 		$doctype_string .= "<html lang='en'>";
 		
 		// finally, output the mime type and prolog type
-		$this->output->set_header("Content-Type", "{$mime};charset={$charset}");
+		$this->set_header("Content-Type", "{$mime};charset={$charset}");
-		$this->output->set_header("X-UA-Compatible", "chrome=1, IE=edge");
+		$this->set_header("X-UA-Compatible", "chrome=1, IE=edge");
-		$this->output->set_output($doctype_string);
+		$this->set_output($doctype_string);
 		
 		return $this;
 	}
@@ -298,7 +297,7 @@ class MM_Page extends MM {
 	public function set_css_tag($name, $domain = TRUE, $media = "all")
 	{
 		$path     = CONTENT_DOMAIN;
-		$css_file = $path . "/css/" . $name . ".css";
+		$css_file = "{$path}/css/{$name}.css";
 		
 		if ($domain == FALSE)
 		{
@@ -418,7 +417,7 @@ class MM_Page extends MM {
 	private function script_tag($js, $domain = TRUE)
 	{
 		$path    = CONTENT_DOMAIN;
-		$js_file = $path . "/js/" . $js . ".js";
+		$js_file = "{$path}/js/{$js}.js";
 		
 		if ($domain == FALSE)
 			$js_file = $js;
@@ -457,8 +456,8 @@ class MM_Page extends MM {
 	 */
 	function redirect_303($url)
 	{
-		$this->output->set_header("HTTP/1.1 303 See Other");
+		$this->set_header("HTTP/1.1 303 See Other");
-		$this->output->set_header("Location:" . $url);
+		$this->set_header("Location:" . $url);
 	}
 	
 	// --------------------------------------------------------------------------
@@ -490,7 +489,7 @@ class MM_Page extends MM {
 	function output_string($string)
 	{
 		$this->build_header();
-		$this->output->append_output($string);
+		$this->append_output($string);
 		$this->build_footer();
 	}