Routing fixes. Fix issue #1

This commit is contained in:
Timothy Warren 2012-05-01 15:22:29 -04:00
parent b4d5ed60ee
commit a2fa2d917f
50 changed files with 1054 additions and 658 deletions

View File

@ -113,11 +113,13 @@ passed array with key / value pairs</span><pre>where()</pre></a></li>
<li class="method public inherited"><a href="#where_not_in" title="where_not_in :: WHERE NOT IN (FOO) clause"><span class="description">WHERE NOT IN (FOO) clause</span><pre>where_not_in()</pre></a></li>
<li class="nav-header private">» Private</li>
<li class="method private inherited"><a href="#_compile" title="_compile :: String together the sql statements for sending to the db"><span class="description">String together the sql statements for sending to the db</span><pre>_compile()</pre></a></li>
<li class="method private inherited"><a href="#_having" title="_having :: Simplify building having clauses"><span class="description">Simplify building having clauses</span><pre>_having()</pre></a></li>
<li class="method private inherited"><a href="#_like" title="_like :: Simplify 'like' methods"><span class="description">Simplify 'like' methods</span><pre>_like()</pre></a></li>
<li class="method private inherited"><a href="#_reset" title="_reset :: Clear out the class variables, so the next query can be run"><span class="description">Clear out the class variables, so the next query can be run</span><pre>_reset()</pre></a></li>
<li class="method private inherited"><a href="#_select" title="_select :: Method to simplify select_ methods"><span class="description">Method to simplify select_ methods</span><pre>_select()</pre></a></li>
<li class="method private inherited"><a href="#_where" title="_where :: Do all the repeditive stuff for where/having type methods"><span class="description">Do all the repeditive stuff for where/having type methods</span><pre>_where()</pre></a></li>
<li class="method private inherited"><a href="#_where_in" title="_where_in :: Simplify where_in methods"><span class="description">Simplify where_in methods</span><pre>_where_in()</pre></a></li>
<li class="method private inherited"><a href="#_where_string" title="_where_string :: Simplify generating where string"><span class="description">Simplify generating where string</span><pre>_where_string()</pre></a></li>
<li class="nav-header">
<i class="icon-custom icon-property"></i> Properties</li>
<li class="property public inherited"><a href="#%24conn_name" title="$conn_name :: Convenience property for connection management"><span class="description">Convenience property for connection management</span><pre>$conn_name</pre></a></li>
@ -781,7 +783,7 @@ prefixed with 'OR NOT'</h2>
</div>
<a name="or_where" id="or_where"></a><div class="element clickable method public or_where" data-toggle="collapse" data-target=".or_where .collapse">
<h2>Where clause prefixed with "OR"</h2>
<pre>or_where(string $field, mixed $val) : <a href="../classes/DB.html">\DB</a></pre>
<pre>or_where(string $key, mixed $val) : <a href="../classes/DB.html">\DB</a></pre>
<div class="labels"><span class="label">Inherited</span></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
@ -797,7 +799,7 @@ prefixed with 'OR NOT'</h2>
</table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$field</h4>
<h4>$key</h4>
<code>string</code>
</div>
<div class="subelement argument">
@ -1200,16 +1202,55 @@ passed array with key / value pairs</h2>
<div class="subelement response"><code>\$string</code></div>
</div></div>
</div>
<a name="_like" id="_like"></a><div class="element clickable method private _like" data-toggle="collapse" data-target="._like .collapse">
<h2>Simplify 'like' methods</h2>
<pre>_like(string $field, mixed $val, string $pos, string $like, string $conj) </pre>
<a name="_having" id="_having"></a><div class="element clickable method private _having" data-toggle="collapse" data-target="._having .collapse">
<h2>Simplify building having clauses</h2>
<pre>_having(mixed $key, mixed $val, string $conj) : <a href="../classes/DB.html">\DB</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>
<table class="table table-bordered">
<tr>
<th>inherited_from</th>
<td>\Query_Builder::_having()</td>
</tr>
<tr>
<th>fluent</th>
<td>This method is part of a fluent interface and will return the same instance</td>
</tr>
</table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$key</h4>
<code>mixed</code>
</div>
<div class="subelement argument">
<h4>$val</h4>
<code>mixed</code>
</div>
<div class="subelement argument">
<h4>$conj</h4>
<code>string</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code><a href="../classes/DB.html">\DB</a></code></div>
</div></div>
</div>
<a name="_like" id="_like"></a><div class="element clickable method private _like" data-toggle="collapse" data-target="._like .collapse">
<h2>Simplify 'like' methods</h2>
<pre>_like(string $field, mixed $val, string $pos, string $like, string $conj) : <a href="../classes/DB.html">\DB</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>\Query_Builder::_like()</td>
</tr></table>
</tr>
<tr>
<th>fluent</th>
<td>This method is part of a fluent interface and will return the same instance</td>
</tr>
</table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$field</h4>
@ -1231,11 +1272,13 @@ passed array with key / value pairs</h2>
<h4>$conj</h4>
<code>string</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code><a href="../classes/DB.html">\DB</a></code></div>
</div></div>
</div>
<a name="_reset" id="_reset"></a><div class="element clickable method private _reset" data-toggle="collapse" data-target="._reset .collapse">
<h2>Clear out the class variables, so the next query can be run</h2>
<pre>_reset() </pre>
<pre>_reset() : void</pre>
<div class="labels"><span class="label">Inherited</span></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
@ -1293,14 +1336,20 @@ passed array with key / value pairs</h2>
</div>
<a name="_where_in" id="_where_in"></a><div class="element clickable method private _where_in" data-toggle="collapse" data-target="._where_in .collapse">
<h2>Simplify where_in methods</h2>
<pre>_where_in(mixed $key, mixed $val, $in, $conj) : void</pre>
<pre>_where_in(mixed $key, mixed $val, $in, $conj) : <a href="../classes/DB.html">\DB</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>
<table class="table table-bordered">
<tr>
<th>inherited_from</th>
<td>\Query_Builder::_where_in()</td>
</tr></table>
</tr>
<tr>
<th>fluent</th>
<td>This method is part of a fluent interface and will return the same instance</td>
</tr>
</table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$key</h4>
@ -1316,6 +1365,41 @@ passed array with key / value pairs</h2>
<div class="subelement argument">
<h4>$conj</h4>
<code></code><p>string</p></div>
<h3>Returns</h3>
<div class="subelement response"><code><a href="../classes/DB.html">\DB</a></code></div>
</div></div>
</div>
<a name="_where_string" id="_where_string"></a><div class="element clickable method private _where_string" data-toggle="collapse" data-target="._where_string .collapse">
<h2>Simplify generating where string</h2>
<pre>_where_string(mixed $key, mixed $val, string $conj) : <a href="../classes/DB.html">\DB</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>\Query_Builder::_where_string()</td>
</tr>
<tr>
<th>fluent</th>
<td>This method is part of a fluent interface and will return the same instance</td>
</tr>
</table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$key</h4>
<code>mixed</code>
</div>
<div class="subelement argument">
<h4>$val</h4>
<code>mixed</code>
</div>
<div class="subelement argument">
<h4>$conj</h4>
<code>string</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code><a href="../classes/DB.html">\DB</a></code></div>
</div></div>
</div>
<h3>
@ -1520,7 +1604,7 @@ for complex select queries</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -114,6 +114,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
<li class="method public "><a href="#switch_db" title="switch_db :: Connect to a different database"><span class="description">Connect to a different database</span><pre>switch_db()</pre></a></li>
<li class="method public "><a href="#truncate" title="truncate :: Empty the passed table"><span class="description">Empty the passed table</span><pre>truncate()</pre></a></li>
<li class="nav-header protected">» Protected</li>
<li class="method protected "><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
<li class="method protected "><a href="#driver_query" title="driver_query :: Method to simplify retreiving db results for meta-data queries"><span class="description">Method to simplify retreiving db results for meta-data queries</span><pre>driver_query()</pre></a></li>
<li class="nav-header">
<i class="icon-custom icon-property"></i> Properties</li>
@ -611,6 +612,21 @@ the connection/database</h2>
</div>
</div></div>
</div>
<a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
<h2>Helper method for quote_ident</h2>
<pre>_quote(mixed $str) : mixed</pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$str</h4>
<code>mixed</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code>mixed</code></div>
</div></div>
</div>
<a name="driver_query" id="driver_query"></a><div class="element clickable method protected driver_query" data-toggle="collapse" data-target=".driver_query .collapse">
<h2>Method to simplify retreiving db results for meta-data queries</h2>
<pre>driver_query(string $sql, bool $filtered_index) : mixed</pre>
@ -663,7 +679,7 @@ the connection/database</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -152,7 +152,7 @@ and organizes database connections</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -269,7 +269,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -209,7 +209,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -106,6 +106,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
<li class="method public "><a href="#switch_db" title="switch_db :: Doesn't apply to Firebird"><span class="description">Doesn't apply to Firebird</span><pre>switch_db()</pre></a></li>
<li class="method public "><a href="#truncate" title="truncate :: Empty a database table"><span class="description">Empty a database table</span><pre>truncate()</pre></a></li>
<li class="nav-header protected">» Protected</li>
<li class="method protected inherited"><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
<li class="method protected inherited"><a href="#driver_query" title="driver_query :: Method to simplify retreiving db results for meta-data queries"><span class="description">Method to simplify retreiving db results for meta-data queries</span><pre>driver_query()</pre></a></li>
<li class="nav-header">
<i class="icon-custom icon-property"></i> Properties</li>
@ -720,6 +721,25 @@ the connection/database</h2>
</div>
</div></div>
</div>
<a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
<h2>Helper method for quote_ident</h2>
<pre>_quote(mixed $str) : 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>\DB_PDO::_quote()</td>
</tr></table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$str</h4>
<code>mixed</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code>mixed</code></div>
</div></div>
</div>
<a name="driver_query" id="driver_query"></a><div class="element clickable method protected driver_query" data-toggle="collapse" data-target=".driver_query .collapse">
<h2>Method to simplify retreiving db results for meta-data queries</h2>
<pre>driver_query(string $sql, bool $filtered_index) : mixed</pre>
@ -813,7 +833,7 @@ the last query executed</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -504,7 +504,7 @@ the query</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -297,7 +297,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -212,7 +212,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -434,7 +434,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -108,6 +108,7 @@
</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="#%24module" title="$module :: Name of the current module"><span class="description">Name of the current module</span><pre>$module</pre></a></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="property public "><a href="#%24page" title="$page :: Instance of Page class"><span class="description">Instance of Page class</span><pre>$page</pre></a></li>
</ul>
@ -738,6 +739,12 @@
</div>
<h3>
<i class="icon-custom icon-property"></i> Properties</h3>
<a name="%24module" id="$module"> </a><div class="element clickable property public $module" data-toggle="collapse" data-target=".$module .collapse">
<h2>Name of the current module</h2>
<pre>$module : string</pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
</div>
<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>
@ -763,7 +770,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-01T09:29:07-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -728,7 +728,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -640,7 +640,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-01T09:29:07-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -972,7 +972,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -114,6 +114,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
<li class="method public "><a href="#switch_db" title="switch_db :: Connect to a different database"><span class="description">Connect to a different database</span><pre>switch_db()</pre></a></li>
<li class="method public "><a href="#truncate" title="truncate :: Empty a table"><span class="description">Empty a table</span><pre>truncate()</pre></a></li>
<li class="nav-header protected">» Protected</li>
<li class="method protected inherited"><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
<li class="method protected inherited"><a href="#driver_query" title="driver_query :: Method to simplify retreiving db results for meta-data queries"><span class="description">Method to simplify retreiving db results for meta-data queries</span><pre>driver_query()</pre></a></li>
<li class="nav-header">
<i class="icon-custom icon-property"></i> Properties</li>
@ -775,6 +776,25 @@ the connection/database</h2>
</div>
</div></div>
</div>
<a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
<h2>Helper method for quote_ident</h2>
<pre>_quote(mixed $str) : 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>\DB_PDO::_quote()</td>
</tr></table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$str</h4>
<code>mixed</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code>mixed</code></div>
</div></div>
</div>
<a name="driver_query" id="driver_query"></a><div class="element clickable method protected driver_query" data-toggle="collapse" data-target=".driver_query .collapse">
<h2>Method to simplify retreiving db results for meta-data queries</h2>
<pre>driver_query(string $sql, bool $filtered_index) : mixed</pre>
@ -849,7 +869,7 @@ the connection/database</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -281,7 +281,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -208,7 +208,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -114,6 +114,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
<li class="method public "><a href="#switch_db" title="switch_db :: Doesn't apply to ODBC"><span class="description">Doesn't apply to ODBC</span><pre>switch_db()</pre></a></li>
<li class="method public "><a href="#truncate" title="truncate :: Empty the current database"><span class="description">Empty the current database</span><pre>truncate()</pre></a></li>
<li class="nav-header protected">» Protected</li>
<li class="method protected inherited"><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
<li class="method protected inherited"><a href="#driver_query" title="driver_query :: Method to simplify retreiving db results for meta-data queries"><span class="description">Method to simplify retreiving db results for meta-data queries</span><pre>driver_query()</pre></a></li>
<li class="nav-header">
<i class="icon-custom icon-property"></i> Properties</li>
@ -777,6 +778,25 @@ the connection/database</h2>
</div>
</div></div>
</div>
<a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
<h2>Helper method for quote_ident</h2>
<pre>_quote(mixed $str) : 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>\DB_PDO::_quote()</td>
</tr></table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$str</h4>
<code>mixed</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code>mixed</code></div>
</div></div>
</div>
<a name="driver_query" id="driver_query"></a><div class="element clickable method protected driver_query" data-toggle="collapse" data-target=".driver_query .collapse">
<h2>Method to simplify retreiving db results for meta-data queries</h2>
<pre>driver_query(string $sql, bool $filtered_index) : mixed</pre>
@ -851,7 +871,7 @@ the connection/database</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -281,7 +281,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -203,7 +203,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -114,6 +114,7 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
<li class="method public "><a href="#switch_db" title="switch_db :: Connect to a different database"><span class="description">Connect to a different database</span><pre>switch_db()</pre></a></li>
<li class="method public "><a href="#truncate" title="truncate :: Empty a table"><span class="description">Empty a table</span><pre>truncate()</pre></a></li>
<li class="nav-header protected">» Protected</li>
<li class="method protected inherited"><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
<li class="method protected inherited"><a href="#driver_query" title="driver_query :: Method to simplify retreiving db results for meta-data queries"><span class="description">Method to simplify retreiving db results for meta-data queries</span><pre>driver_query()</pre></a></li>
<li class="nav-header">
<i class="icon-custom icon-property"></i> Properties</li>
@ -771,6 +772,25 @@ the connection/database</h2>
</div>
</div></div>
</div>
<a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
<h2>Helper method for quote_ident</h2>
<pre>_quote(mixed $str) : 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>\DB_PDO::_quote()</td>
</tr></table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$str</h4>
<code>mixed</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code>mixed</code></div>
</div></div>
</div>
<a name="driver_query" id="driver_query"></a><div class="element clickable method protected driver_query" data-toggle="collapse" data-target=".driver_query .collapse">
<h2>Method to simplify retreiving db results for meta-data queries</h2>
<pre>driver_query(string $sql, bool $filtered_index) : mixed</pre>
@ -851,7 +871,7 @@ the connection/database</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -297,7 +297,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -208,7 +208,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -108,11 +108,13 @@ passed array with key / value pairs</span><pre>where()</pre></a></li>
<li class="method public "><a href="#where_not_in" title="where_not_in :: WHERE NOT IN (FOO) clause"><span class="description">WHERE NOT IN (FOO) clause</span><pre>where_not_in()</pre></a></li>
<li class="nav-header private">» Private</li>
<li class="method private "><a href="#_compile" title="_compile :: String together the sql statements for sending to the db"><span class="description">String together the sql statements for sending to the db</span><pre>_compile()</pre></a></li>
<li class="method private "><a href="#_having" title="_having :: Simplify building having clauses"><span class="description">Simplify building having clauses</span><pre>_having()</pre></a></li>
<li class="method private "><a href="#_like" title="_like :: Simplify 'like' methods"><span class="description">Simplify 'like' methods</span><pre>_like()</pre></a></li>
<li class="method private "><a href="#_reset" title="_reset :: Clear out the class variables, so the next query can be run"><span class="description">Clear out the class variables, so the next query can be run</span><pre>_reset()</pre></a></li>
<li class="method private "><a href="#_select" title="_select :: Method to simplify select_ methods"><span class="description">Method to simplify select_ methods</span><pre>_select()</pre></a></li>
<li class="method private "><a href="#_where" title="_where :: Do all the repeditive stuff for where/having type methods"><span class="description">Do all the repeditive stuff for where/having type methods</span><pre>_where()</pre></a></li>
<li class="method private "><a href="#_where_in" title="_where_in :: Simplify where_in methods"><span class="description">Simplify where_in methods</span><pre>_where_in()</pre></a></li>
<li class="method private "><a href="#_where_string" title="_where_string :: Simplify generating where string"><span class="description">Simplify generating where string</span><pre>_where_string()</pre></a></li>
<li class="nav-header">
<i class="icon-custom icon-property"></i> Properties</li>
<li class="property public "><a href="#%24conn_name" title="$conn_name :: Convenience property for connection management"><span class="description">Convenience property for connection management</span><pre>$conn_name</pre></a></li>
@ -619,7 +621,7 @@ prefixed with 'OR NOT'</h2>
</div>
<a name="or_where" id="or_where"></a><div class="element clickable method public or_where" data-toggle="collapse" data-target=".or_where .collapse">
<h2>Where clause prefixed with "OR"</h2>
<pre>or_where(string $field, mixed $val) : <a href="../classes/Query_Builder.html">\Query_Builder</a></pre>
<pre>or_where(string $key, mixed $val) : <a href="../classes/Query_Builder.html">\Query_Builder</a></pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
@ -629,7 +631,7 @@ prefixed with 'OR NOT'</h2>
</tr></table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$field</h4>
<h4>$key</h4>
<code>string</code>
</div>
<div class="subelement argument">
@ -952,12 +954,43 @@ passed array with key / value pairs</h2>
<div class="subelement response"><code>\$string</code></div>
</div></div>
</div>
<a name="_like" id="_like"></a><div class="element clickable method private _like" data-toggle="collapse" data-target="._like .collapse">
<h2>Simplify 'like' methods</h2>
<pre>_like(string $field, mixed $val, string $pos, string $like, string $conj) </pre>
<a name="_having" id="_having"></a><div class="element clickable method private _having" data-toggle="collapse" data-target="._having .collapse">
<h2>Simplify building having clauses</h2>
<pre>_having(mixed $key, mixed $val, string $conj) : <a href="../classes/Query_Builder.html">\Query_Builder</a></pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
<table class="table table-bordered"><tr>
<th>fluent</th>
<td>This method is part of a fluent interface and will return the same instance</td>
</tr></table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$key</h4>
<code>mixed</code>
</div>
<div class="subelement argument">
<h4>$val</h4>
<code>mixed</code>
</div>
<div class="subelement argument">
<h4>$conj</h4>
<code>string</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code><a href="../classes/Query_Builder.html">\Query_Builder</a></code></div>
</div></div>
</div>
<a name="_like" id="_like"></a><div class="element clickable method private _like" data-toggle="collapse" data-target="._like .collapse">
<h2>Simplify 'like' methods</h2>
<pre>_like(string $field, mixed $val, string $pos, string $like, string $conj) : <a href="../classes/Query_Builder.html">\Query_Builder</a></pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
<table class="table table-bordered"><tr>
<th>fluent</th>
<td>This method is part of a fluent interface and will return the same instance</td>
</tr></table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$field</h4>
@ -979,11 +1012,13 @@ passed array with key / value pairs</h2>
<h4>$conj</h4>
<code>string</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code><a href="../classes/Query_Builder.html">\Query_Builder</a></code></div>
</div></div>
</div>
<a name="_reset" id="_reset"></a><div class="element clickable method private _reset" data-toggle="collapse" data-target="._reset .collapse">
<h2>Clear out the class variables, so the next query can be run</h2>
<pre>_reset() </pre>
<pre>_reset() : void</pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
</div>
@ -1027,10 +1062,14 @@ passed array with key / value pairs</h2>
</div>
<a name="_where_in" id="_where_in"></a><div class="element clickable method private _where_in" data-toggle="collapse" data-target="._where_in .collapse">
<h2>Simplify where_in methods</h2>
<pre>_where_in(mixed $key, mixed $val, $in, $conj) : void</pre>
<pre>_where_in(mixed $key, mixed $val, $in, $conj) : <a href="../classes/Query_Builder.html">\Query_Builder</a></pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
<table class="table table-bordered"><tr>
<th>fluent</th>
<td>This method is part of a fluent interface and will return the same instance</td>
</tr></table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$key</h4>
@ -1046,6 +1085,35 @@ passed array with key / value pairs</h2>
<div class="subelement argument">
<h4>$conj</h4>
<code></code><p>string</p></div>
<h3>Returns</h3>
<div class="subelement response"><code><a href="../classes/Query_Builder.html">\Query_Builder</a></code></div>
</div></div>
</div>
<a name="_where_string" id="_where_string"></a><div class="element clickable method private _where_string" data-toggle="collapse" data-target="._where_string .collapse">
<h2>Simplify generating where string</h2>
<pre>_where_string(mixed $key, mixed $val, string $conj) : <a href="../classes/Query_Builder.html">\Query_Builder</a></pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8">
<p class="long_description"></p>
<table class="table table-bordered"><tr>
<th>fluent</th>
<td>This method is part of a fluent interface and will return the same instance</td>
</tr></table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$key</h4>
<code>mixed</code>
</div>
<div class="subelement argument">
<h4>$val</h4>
<code>mixed</code>
</div>
<div class="subelement argument">
<h4>$conj</h4>
<code>string</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code><a href="../classes/Query_Builder.html">\Query_Builder</a></code></div>
</div></div>
</div>
<h3>
@ -1154,7 +1222,7 @@ for complex select queries</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -114,6 +114,7 @@ method if the database does not support 'TRUNCATE';</span><pre>empty_table()</pr
<li class="method public "><a href="#truncate" title="truncate :: Empty a table"><span class="description">Empty a table</span><pre>truncate()</pre></a></li>
<li class="method public "><a href="#unload_database" title="unload_database :: Unload a database from the current connection"><span class="description">Unload a database from the current connection</span><pre>unload_database()</pre></a></li>
<li class="nav-header protected">» Protected</li>
<li class="method protected inherited"><a href="#_quote" title="_quote :: Helper method for quote_ident"><span class="description">Helper method for quote_ident</span><pre>_quote()</pre></a></li>
<li class="method protected inherited"><a href="#driver_query" title="driver_query :: Method to simplify retreiving db results for meta-data queries"><span class="description">Method to simplify retreiving db results for meta-data queries</span><pre>driver_query()</pre></a></li>
<li class="nav-header">
<i class="icon-custom icon-property"></i> Properties</li>
@ -792,6 +793,25 @@ method if the database does not support 'TRUNCATE';</h2>
</div>
</div></div>
</div>
<a name="_quote" id="_quote"></a><div class="element clickable method protected _quote" data-toggle="collapse" data-target="._quote .collapse">
<h2>Helper method for quote_ident</h2>
<pre>_quote(mixed $str) : 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>\DB_PDO::_quote()</td>
</tr></table>
<h3>Parameters</h3>
<div class="subelement argument">
<h4>$str</h4>
<code>mixed</code>
</div>
<h3>Returns</h3>
<div class="subelement response"><code>mixed</code></div>
</div></div>
</div>
<a name="driver_query" id="driver_query"></a><div class="element clickable method protected driver_query" data-toggle="collapse" data-target=".driver_query .collapse">
<h2>Method to simplify retreiving db results for meta-data queries</h2>
<pre>driver_query(string $sql, bool $filtered_index) : mixed</pre>
@ -866,7 +886,7 @@ method if the database does not support 'TRUNCATE';</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -281,7 +281,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -208,7 +208,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -244,7 +244,7 @@ directly - the settings should be safe!</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -110,6 +110,7 @@
</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="#%24module" title="$module :: Name of the current module"><span class="description">Name of the current module</span><pre>$module</pre></a></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="property public inherited"><a href="#%24page" title="$page :: Instance of Page class"><span class="description">Instance of Page class</span><pre>$page</pre></a></li>
</ul>
@ -868,6 +869,18 @@
</div>
<h3>
<i class="icon-custom icon-property"></i> Properties</h3>
<a name="%24module" id="$module"> </a><div class="element clickable property public $module" data-toggle="collapse" data-target=".$module .collapse">
<h2>Name of the current module</h2>
<pre>$module : 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_Controller::$$module</td>
</tr></table>
</div></div>
</div>
<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>
@ -905,7 +918,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-01T09:29:07-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -846,7 +846,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-01T09:29:07-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -615,7 +615,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -67,7 +67,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-01T09:29:07-04:00.<br></footer></div>
generated on 2012-05-01T15:21:51-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -106,7 +106,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-01T09:29:07-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -64,7 +64,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-01T09:29:07-04:00.<br></footer></div>
generated on 2012-05-01T15:21:51-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -80,7 +80,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -69,7 +69,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-01T09:29:07-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -295,13 +295,13 @@ with array_map and glob</h2>
</div>
<a name="route" id="route"></a><div class="element clickable function route" data-toggle="collapse" data-target=".route .collapse">
<h2>Calls the appropriate module/controller/function based on the url</h2>
<pre>route() </pre>
<pre>route() : void</pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
</div>
<a name="show_404" id="show_404"></a><div class="element clickable function show_404" data-toggle="collapse" data-target=".show_404 .collapse">
<h2>General 404 function</h2>
<pre>show_404() </pre>
<pre>show_404() : void</pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
</div>
@ -326,7 +326,7 @@ with array_map and glob</h2>
<h2>Function to run on script shutdown
-used to catch most fatal errors, and
display them cleanly</h2>
<pre>shutdown() </pre>
<pre>shutdown() : void</pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
</div>
@ -719,7 +719,7 @@ instantiates the specific db driver</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -67,7 +67,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -185,7 +185,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -211,7 +211,7 @@ data-fetching methods</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -97,7 +97,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -115,7 +115,7 @@ instantiates the specific db driver</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -316,7 +316,7 @@ instantiates the specific db driver</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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -139,7 +139,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -137,7 +137,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

View File

@ -294,13 +294,13 @@ display them cleanly</span><pre>shutdown</pre></a></li>
</div>
<a name="route" id="route"></a><div class="element clickable function route" data-toggle="collapse" data-target=".route .collapse">
<h2>Calls the appropriate module/controller/function based on the url</h2>
<pre>route() </pre>
<pre>route() : void</pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
</div>
<a name="show_404" id="show_404"></a><div class="element clickable function show_404" data-toggle="collapse" data-target=".show_404 .collapse">
<h2>General 404 function</h2>
<pre>show_404() </pre>
<pre>show_404() : void</pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
</div>
@ -325,7 +325,7 @@ display them cleanly</span><pre>shutdown</pre></a></li>
<h2>Function to run on script shutdown
-used to catch most fatal errors, and
display them cleanly</h2>
<pre>shutdown() </pre>
<pre>shutdown() : void</pre>
<div class="labels"></div>
<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
</div>
@ -492,7 +492,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-01T09:29:06-04:00.<br></footer></div>
generated on 2012-05-01T15:21:50-04:00.<br></footer></div>
</div>
</body>
</html>

File diff suppressed because it is too large Load Diff

@ -1 +1 @@
Subproject commit f43e3c7ccf1e4d63ba67f6ac51184f6b14818ce4
Subproject commit 31ba0881ea6088c6b141d6b75d6f2f302e61585c

View File

@ -26,6 +26,8 @@
* Function to run on script shutdown
* -used to catch most fatal errors, and
* display them cleanly
*
* @return void
*/
function shutdown()
{
@ -143,6 +145,8 @@ function is_like_array(&$var)
/**
* General 404 function
*
* @return void
*/
function show_404()
{
@ -196,30 +200,10 @@ function show_error($message, $status_code=null)
function controller_methods($controller)
{
$methods = get_class_methods($controller);
$num = count($methods);
for($i=0; $i < $num; $i++)
{
$skip_methods = array(
'load_file',
'on_error',
'on_exception',
'show_404',
'show_error',
'controller_methods',
'route',
'site_url',
'load_view',
'get_instance',
);
// If the method starts with an underscore, or
// is in the blacklist of methods, it is not callable
if($methods[$i]{0} === "_" || in_array($methods[$i], $skip_methods))
{
unset($methods[$i]);
}
}
// Eliminate methods from Controller and Model classes
$skip_methods = array_merge(get_class_methods('MM_Controller'), get_class_methods('MM_Model'));
$methods = array_diff($methods, $skip_methods);
return $methods;
}
@ -228,14 +212,25 @@ function controller_methods($controller)
/**
* Calls the appropriate module/controller/function based on the url
*
* @return void
*/
function route()
{
$sn = $_SERVER['SCRIPT_NAME'];
$ru = $_SERVER['REQUEST_URI'];
// Get the equivalent to path info
$pi = (isset($_SERVER['PATH_INFO']))
? str_replace($_SERVER['SCRIPT_NAME'], '', $_SERVER['REQUEST_URI'])
? str_replace($sn, '', $ru)
: '/';
// Make sure the home page works when in a sub_directory
if (strlen($sn) > strlen($ru))
{
$pi = '/';
}
// Load the routes config file
$routes = require_once(MM_APP_PATH.'config/routes.php');
@ -322,6 +317,7 @@ function route()
if(in_array($func, $methods))
{
$class = new $controller;
$class->module = $module;
return call_user_func(array($class, $func));
}

View File

@ -28,6 +28,13 @@ class MM_Controller extends miniMVC {
*/
public $page;
/**
* Name of the current module
*
* @var string
*/
public $module;
/**
* Create the controller object
*
@ -37,6 +44,7 @@ class MM_Controller extends miniMVC {
{
parent::__construct();
// Create the page object
$this->page = new MM_Page($this);
}
@ -51,20 +59,9 @@ class MM_Controller extends miniMVC {
*/
public function load_model($file, $args=array())
{
$path = "";
// The module is the lower of the class name
// need to figure out a way to allow multiple controllers
// in one module
$module = strtolower(get_class($this));
$not_modules = array('miniMVC', 'page', 'db', 'output');
// If it's a module, look in the module view folder
if( ! in_array($module, $not_modules))
{
$path = MM_MOD_PATH . "{$module}/models/{$file}.php";
}
// The module is set via the router
$module = strtolower($this->module);
$path = MM_MOD_PATH . "{$module}/models/{$file}.php";
if(is_file($path))
{