miscellaneous tweaks

This commit is contained in:
Timothy Warren 2012-05-15 16:53:10 -04:00
parent 7751d1d7aa
commit a8cbfb0cbe
31 changed files with 101 additions and 76 deletions

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -367,7 +367,7 @@
</div>
<a name="load_class" id="load_class"></a><div class="element clickable method public load_class" data-toggle="collapse" data-target=".load_class .collapse">
<h2>Method to load classes into the singleton</h2>
<pre>load_class(string $name) : void</pre>
<pre>load_class(string $name) : object</pre>
<div class="labels"><span class="label">Inherited</span></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
@ -380,6 +380,8 @@
<h4>$name</h4>
<code>string</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code>object</code></div>
</div></div>
</div>
<a name="load_config" id="load_config"></a><div class="element clickable method public load_config" data-toggle="collapse" data-target=".load_config .collapse">
@ -759,7 +761,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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -150,9 +150,16 @@
</div>
<a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
<h2>Initialize the model class</h2>
<pre>__construct() : void</pre>
<pre>__construct(array $args) : void</pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$args</h4>
<code>array</code>
</div>
</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()
@ -363,7 +370,7 @@
</div>
<a name="load_class" id="load_class"></a><div class="element clickable method public load_class" data-toggle="collapse" data-target=".load_class .collapse">
<h2>Method to load classes into the singleton</h2>
<pre>load_class(string $name) : void</pre>
<pre>load_class(string $name) : object</pre>
<div class="labels"><span class="label">Inherited</span></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
@ -376,6 +383,8 @@
<h4>$name</h4>
<code>string</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code>object</code></div>
</div></div>
</div>
<a name="load_config" id="load_config"></a><div class="element clickable method public load_config" data-toggle="collapse" data-target=".load_config .collapse">
@ -709,7 +718,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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -971,7 +971,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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -417,7 +417,7 @@
</div>
<a name="load_class" id="load_class"></a><div class="element clickable method public load_class" data-toggle="collapse" data-target=".load_class .collapse">
<h2>Method to load classes into the singleton</h2>
<pre>load_class(string $name) : void</pre>
<pre>load_class(string $name) : object</pre>
<div class="labels"><span class="label">Inherited</span></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
@ -436,6 +436,8 @@
<h4>$name</h4>
<code>string</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code>object</code></div>
</div></div>
</div>
<a name="load_config" id="load_config"></a><div class="element clickable method public load_config" data-toggle="collapse" data-target=".load_config .collapse">
@ -901,7 +903,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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -405,7 +405,7 @@
</div>
<a name="load_class" id="load_class"></a><div class="element clickable method public load_class" data-toggle="collapse" data-target=".load_class .collapse">
<h2>Method to load classes into the singleton</h2>
<pre>load_class(string $name) : void</pre>
<pre>load_class(string $name) : object</pre>
<div class="labels"><span class="label">Inherited</span></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
@ -424,6 +424,8 @@
<h4>$name</h4>
<code>string</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code>object</code></div>
</div></div>
</div>
<a name="load_config" id="load_config"></a><div class="element clickable method public load_config" data-toggle="collapse" data-target=".load_config .collapse">
@ -823,7 +825,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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -330,7 +330,7 @@
</div>
<a name="load_class" id="load_class"></a><div class="element clickable method public load_class" data-toggle="collapse" data-target=".load_class .collapse">
<h2>Method to load classes into the singleton</h2>
<pre>load_class(string $name) : void</pre>
<pre>load_class(string $name) : object</pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
@ -339,6 +339,8 @@
<h4>$name</h4>
<code>string</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code>object</code></div>
</div></div>
</div>
<a name="load_config" id="load_config"></a><div class="element clickable method public load_config" data-toggle="collapse" data-target=".load_config .collapse">
@ -610,7 +612,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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -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-15T12:38:56-04:00.<br></footer></div>
generated on 2012-05-15T16:52:58-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<project version="2.0.0a2" title="miniMVC">
<file path="sys/core/model.php" hash="05938afe30705659f4d53e7ca1153feb" package="miniMVC">
<file path="sys/core/model.php" hash="5f2aa5ce784a74986e60ef1d75c1c0c6" package="miniMVC">
<docblock line="2">
<description><![CDATA[MiniMVC]]></description>
<long-description><![CDATA[<p>Convention-based micro-framework for PHP</p>]]></long-description>
@ -20,20 +20,28 @@
<tag line="16" name="package" description="miniMVC"/>
<tag line="16" name="subpackage" description="System"/>
</docblock>
<method final="false" abstract="false" static="false" visibility="public" namespace="default" line="29" package="">
<method final="false" abstract="false" static="false" visibility="public" namespace="default" line="30" package="">
<name>__construct</name>
<type>function</type>
<docblock line="24">
<description><![CDATA[Initialize the model class]]></description>
<long-description><![CDATA[]]></long-description>
<tag line="24" name="param" description="" type="array" variable="$args">
<type by_reference="false">array</type>
</tag>
<tag line="24" name="return" description="" type="void">
<type by_reference="false">void</type>
</tag>
</docblock>
<argument line="30">
<name>$args</name>
<default><![CDATA[[]]]></default>
<type>array</type>
</argument>
</method>
</class>
</file>
<file path="sys/core/db.php" hash="17e8d53feb056a5d76270d1a6ea190d2" package="miniMVC">
<file path="sys/core/db.php" hash="388ee87f5e490b140bf63f342cde085d" package="miniMVC">
<docblock line="2">
<description><![CDATA[MiniMVC]]></description>
<long-description><![CDATA[<p>Convention-based micro-framework for PHP</p>]]></long-description>
@ -107,47 +115,47 @@
<type>array</type>
</argument>
</method>
<method final="false" abstract="false" static="false" visibility="public" namespace="default" line="86" package="">
<method final="false" abstract="false" static="false" visibility="public" namespace="default" line="85" package="">
<name>__call</name>
<type>function</type>
<docblock line="79">
<docblock line="78">
<description><![CDATA[Override __call in trait to call __call in Query Builder...lol]]></description>
<long-description><![CDATA[]]></long-description>
<tag line="79" name="param" description="" type="string" variable="$name">
<tag line="78" name="param" description="" type="string" variable="$name">
<type by_reference="false">string</type>
</tag>
<tag line="79" name="param" description="" type="array" variable="$params">
<tag line="78" name="param" description="" type="array" variable="$params">
<type by_reference="false">array</type>
</tag>
<tag line="79" name="return" description="" type="mixed">
<tag line="78" name="return" description="" type="mixed">
<type by_reference="false">mixed</type>
</tag>
</docblock>
<argument line="86">
<argument line="85">
<name>$name</name>
<default><![CDATA[]]></default>
<type/>
</argument>
<argument line="86">
<argument line="85">
<name>$params</name>
<default><![CDATA[[]]]></default>
<type/>
</argument>
</method>
<method final="false" abstract="false" static="false" visibility="public" namespace="default" line="98" package="">
<method final="false" abstract="false" static="false" visibility="public" namespace="default" line="97" package="">
<name>get_last_error</name>
<type>function</type>
<docblock line="93">
<docblock line="92">
<description><![CDATA[Returns the last error from the database]]></description>
<long-description><![CDATA[]]></long-description>
<tag line="93" name="return" description="" type="string">
<tag line="92" name="return" description="" type="string">
<type by_reference="false">string</type>
</tag>
</docblock>
</method>
</class>
</file>
<file path="sys/core/miniMVC.php" hash="265d598dc2eea39d29b8ec99734c54cf" package="miniMVC">
<file path="sys/core/miniMVC.php" hash="f378e846e7eea02086fa35d27f46f3c8" package="miniMVC">
<docblock line="2">
<description><![CDATA[MiniMVC]]></description>
<long-description><![CDATA[<p>Convention-based micro-framework for PHP</p>]]></long-description>
@ -361,8 +369,8 @@ dynamic methods]]></description>
<tag line="312" name="param" description="" type="string" variable="$name">
<type by_reference="false">string</type>
</tag>
<tag line="312" name="return" description="" type="void">
<type by_reference="false">void</type>
<tag line="312" name="return" description="" type="object">
<type by_reference="false">object</type>
</tag>
</docblock>
<argument line="318">
@ -405,7 +413,7 @@ dynamic methods]]></description>
</method>
</class>
</file>
<file path="sys/core/page.php" hash="0763c678214a982e5f6ef215b5e54eb9" package="miniMVC">
<file path="sys/core/page.php" hash="fb328467d359b5a0bd2fbe770f740211" package="miniMVC">
<docblock line="2">
<description><![CDATA[MiniMVC]]></description>
<long-description><![CDATA[<p>Convention-based micro-framework for PHP</p>]]></long-description>
@ -1208,7 +1216,7 @@ Used for outputing HTML]]></description>
</method>
</class>
</file>
<file path="sys/libraries/data_store.php" hash="fdef6e0da2ded311637fad3e8a8f8f16" package="miniMVC">
<file path="sys/libraries/data_store.php" hash="574fd813db37e3eb35727e618ac96a50" package="miniMVC">
<docblock line="2">
<description><![CDATA[MiniMVC]]></description>
<long-description><![CDATA[<p>Convention-based micro-framework for PHP</p>]]></long-description>
@ -1459,7 +1467,7 @@ of the singleton]]></description>
</method>
</class>
</file>
<file path="sys/common.php" hash="c4a43e48f47ebe51c3b6dc4850a0b96b" package="miniMVC">
<file path="sys/common.php" hash="a48dbb60b8941616059508efd3681357" package="miniMVC">
<docblock line="2">
<description><![CDATA[MiniMVC]]></description>
<long-description><![CDATA[<p>Convention-based micro-framework for PHP</p>]]></long-description>
@ -1721,7 +1729,7 @@ display them cleanly]]></description>
</argument>
</function>
</file>
<file path="index.php" hash="ec4c291649bc651088cf7b4daeddb574" package="miniMVC">
<file path="index.php" hash="93d31b713e13e7687899b53f6b375502" package="miniMVC">
<docblock line="2">
<description><![CDATA[MiniMVC]]></description>
<long-description><![CDATA[<p>Convention-based micro-framework for PHP</p>]]></long-description>

View File

@ -31,7 +31,7 @@ if(ENVIRONMENT == 'DEVELOPMENT')
{
error_reporting(-1);
}
else if(EVIRONMENT == 'PRODUCTION')
else if(ENVIRONMENT == 'PRODUCTION')
{
error_reporting(0);
}

View File

@ -178,7 +178,7 @@ function show_error($message, $status_code=null)
{
if ( ! is_null($status_code))
{
@header("HTTP/1.1 {$status_code}", TRUE, (int)$status_code);
@header("HTTP/1.1 {$status_code}", TRUE, (int) $status_code);
}
// Contain the content for buffering
@ -241,8 +241,8 @@ function route()
$controller = $routes['default_controller'];
$func = "index";
$route_set = FALSE;
// If it isn't the index page
// If it isn't the index page
if ( ! empty($pi) && $pi !== "/")
{
//Remove trailing slash and begining slash
@ -275,7 +275,7 @@ function route()
}
// Doesn't match a predefined route?
// Match on module/controller/method, controller/method, or method
// Match on module/controller/method, module/controller, controller/method, or method
if ( ! $route_set)
{
$num_segments = 0;
@ -333,7 +333,7 @@ function route()
return call_user_func_array([&$class, $func], []);
}
// Function doesn't exist...404
// Function doesn't exist...404
show_404();
die();
}

View File

@ -67,11 +67,10 @@ class DB extends Query_Builder {
*
* @param array $params
*/
function __construct(array $params=[])
public function __construct(array $params=[])
{
// Let's try connecting now!
parent::__construct($params);
}
// --------------------------------------------------------------------------

View File

@ -313,7 +313,7 @@ class miniMVC extends MM {
* Method to load classes into the singleton
*
* @param string $name
* @return void
* @return object
*/
public function load_class($name)
{
@ -326,7 +326,7 @@ class miniMVC extends MM {
// Try system library first, then app library
$path = MM_SYS_PATH . "libraries/{$name}.php";
$name = 'MM_'.$name;
$name = "MM_{$name}";
if ( ! is_file($path))
{

View File

@ -24,11 +24,12 @@ class MM_Model extends miniMVC {
/**
* Initialize the model class
*
* @param array $args
* @return void
*/
public function __construct()
public function __construct(array $args = [])
{
parent::__construct();
parent::__construct($args);
}
}
// End of model.php

View File

@ -496,12 +496,12 @@ class MM_Page extends MM {
// --------------------------------------------------------------------------
/**
* Private helper function to generate meta tags
*
* @param array $params
* @return string
*/
/**
* Private helper function to generate meta tags
*
* @param array $params
* @return string
*/
private function _meta($params)
{
$string = "<meta ";
@ -518,13 +518,13 @@ class MM_Page extends MM {
// --------------------------------------------------------------------------
/**
* Private helper function to generate link tags
*
* @param array $params
* @return string
*/
private function _link_tag($params)
/**
* Private helper function to generate link tags
*
* @param array $params
* @return string
*/
private function _link_tag($params)
{
$string = "<link ";

View File

@ -41,7 +41,7 @@ class MM_Data_Store {
if ( ! is_file($path))
{
touch($path);
$this->current = new StdClass();
$this->current = (object)[];
}
else
{