From 327ba4bf6f82d0f00f038e0b3eed3d470b2c1049 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Thu, 3 May 2012 13:26:09 -0400 Subject: [PATCH] Reorganize system folder --- .gitignore | 5 + app/errors/error_404.php | 2 +- app/errors/error_general.php | 2 +- app/errors/error_php_exception.php | 6 +- app/views/footer.php | 2 +- app/views/header.php | 2 +- assets/css.php | 6 +- assets/js.php | 12 +- docs/classes.svg | 235 +-- docs/classes/DB.html | 2 +- docs/classes/DB_PDO.html | 2 +- docs/classes/DB_Reg.html | 2 +- docs/classes/DB_SQL.html | 2 +- docs/classes/DB_Util.html | 2 +- docs/classes/Firebird.html | 2 +- docs/classes/Firebird_Result.html | 2 +- docs/classes/Firebird_SQL.html | 2 +- docs/classes/Firebird_Util.html | 2 +- docs/classes/MM.html | 2 +- docs/classes/MM_Controller.html | 8 +- docs/classes/MM_Model.html | 8 +- docs/classes/MM_Output.html | 2 +- docs/classes/MM_Page.html | 2 +- docs/classes/MM_Session.html | 138 ++ docs/classes/MySQL.html | 2 +- docs/classes/MySQL_SQL.html | 2 +- docs/classes/MySQL_Util.html | 2 +- docs/classes/ODBC.html | 2 +- docs/classes/ODBC_SQL.html | 2 +- docs/classes/ODBC_Util.html | 2 +- docs/classes/PHP_Session.html | 633 ++++++ docs/classes/PgSQL.html | 2 +- docs/classes/PgSQL_SQL.html | 2 +- docs/classes/PgSQL_Util.html | 2 +- docs/classes/Query_Builder.html | 2 +- docs/classes/SQLite.html | 2 +- docs/classes/SQLite_SQL.html | 2 +- docs/classes/SQLite_Util.html | 2 +- docs/classes/Settings.html | 2 +- docs/classes/Welcome.html | 8 +- docs/classes/Welcome_Model.html | 8 +- docs/classes/miniMVC.html | 8 +- docs/deprecated.html | 2 +- docs/errors.html | 3 +- docs/graph_class.html | 2 +- docs/index.html | 2 +- docs/markers.html | 2 +- docs/namespaces/default.html | 9 +- docs/packages/.html | 2 +- docs/packages/Default.html | 2 +- docs/packages/Query.Drivers.html | 2 +- docs/packages/Query.Helper Classes.html | 2 +- docs/packages/Query.Query.html | 2 +- docs/packages/Query.html | 2 +- docs/packages/miniMVC.App.html | 2 +- docs/packages/miniMVC.Libraries.html | 95 + docs/packages/miniMVC.System.html | 2 +- docs/packages/miniMVC.html | 23 +- docs/structure.xml | 692 ++++--- index.php | 4 +- modules/welcome/controllers/welcome.php | 5 +- sys/Query | 1 - sys/common.php | 40 +- sys/{ => core}/controller.php | 4 +- sys/{ => core}/db.php | 4 +- sys/{ => core}/miniMVC.php | 39 +- sys/{ => core}/model.php | 0 sys/{ => core}/output.php | 10 +- sys/{ => core}/page.php | 2 +- sys/db/README.md | 83 - sys/db/autoload.php | 2 +- sys/db/classes/db_pdo.php | 8 +- sys/db/classes/settings.php | 12 +- sys/db/drivers/firebird/firebird_driver.php | 4 +- sys/db/drivers/firebird/firebird_util.php | 10 +- sys/db/drivers/mysql/mysql_util.php | 6 +- sys/db/drivers/pgsql/pgsql_sql.php | 2 +- sys/db/drivers/pgsql/pgsql_util.php | 6 +- sys/db/drivers/sqlite/sqlite_util.php | 6 +- sys/db/phpdoc.dist.xml | 18 - sys/db/tests/core/core.php | 73 - sys/db/tests/core/db_qb_test.php | 430 ---- sys/db/tests/core/db_test.php | 68 - sys/db/tests/core/settings.php | 91 - .../tests/databases/firebird/firebird-qb.php | 38 - sys/db/tests/databases/firebird/firebird.php | 221 --- sys/db/tests/databases/mysql/mysql-qb.php | 54 - sys/db/tests/databases/mysql/mysql.php | 195 -- sys/db/tests/databases/pgsql/pgsql-qb.php | 54 - sys/db/tests/databases/pgsql/pgsql.php | 213 -- sys/db/tests/databases/sqlite/sqlite-qb.php | 33 - sys/db/tests/databases/sqlite/sqlite.php | 203 -- sys/db/tests/index.php | 64 - .../HELP_MY_TESTS_DONT_WORK_ANYMORE | 399 ---- sys/db/tests/simpletest/LICENSE | 502 ----- sys/db/tests/simpletest/README | 102 - sys/db/tests/simpletest/VERSION | 1 - sys/db/tests/simpletest/arguments.php | 224 --- sys/db/tests/simpletest/authentication.php | 237 --- sys/db/tests/simpletest/autorun.php | 101 - sys/db/tests/simpletest/browser.php | 1144 ----------- sys/db/tests/simpletest/collector.php | 122 -- sys/db/tests/simpletest/compatibility.php | 166 -- sys/db/tests/simpletest/cookies.php | 380 ---- sys/db/tests/simpletest/default_reporter.php | 163 -- sys/db/tests/simpletest/detached.php | 96 - .../docs/en/authentication_documentation.html | 378 ---- .../docs/en/browser_documentation.html | 501 ----- sys/db/tests/simpletest/docs/en/docs.css | 121 -- .../docs/en/expectation_documentation.html | 476 ----- .../docs/en/form_testing_documentation.html | 351 ---- .../docs/en/group_test_documentation.html | 252 --- .../docs/en/mock_objects_documentation.html | 870 --------- sys/db/tests/simpletest/docs/en/overview.html | 487 ----- .../docs/en/partial_mocks_documentation.html | 457 ----- .../docs/en/reporter_documentation.html | 616 ------ .../docs/en/unit_test_documentation.html | 442 ----- .../docs/en/web_tester_documentation.html | 588 ------ .../docs/fr/authentication_documentation.html | 372 ---- .../docs/fr/browser_documentation.html | 500 ----- sys/db/tests/simpletest/docs/fr/docs.css | 84 - .../docs/fr/expectation_documentation.html | 451 ----- .../docs/fr/form_testing_documentation.html | 363 ---- .../docs/fr/group_test_documentation.html | 265 --- .../docs/fr/mock_objects_documentation.html | 933 --------- sys/db/tests/simpletest/docs/fr/overview.html | 321 --- .../docs/fr/partial_mocks_documentation.html | 475 ----- .../docs/fr/reporter_documentation.html | 630 ------ .../docs/fr/unit_test_documentation.html | 447 ----- .../docs/fr/web_tester_documentation.html | 570 ------ sys/db/tests/simpletest/dumper.php | 407 ---- sys/db/tests/simpletest/eclipse.php | 307 --- sys/db/tests/simpletest/encoding.php | 649 ------- sys/db/tests/simpletest/errors.php | 267 --- sys/db/tests/simpletest/exceptions.php | 226 --- sys/db/tests/simpletest/expectation.php | 984 ---------- .../simpletest/extensions/pear_test_case.php | 196 -- .../tests/simpletest/extensions/testdox.php | 53 - .../simpletest/extensions/testdox/test.php | 107 - sys/db/tests/simpletest/form.php | 361 ---- sys/db/tests/simpletest/frames.php | 592 ------ sys/db/tests/simpletest/http.php | 628 ------ sys/db/tests/simpletest/invoker.php | 139 -- sys/db/tests/simpletest/mock_objects.php | 1641 ---------------- sys/db/tests/simpletest/page.php | 542 ------ sys/db/tests/simpletest/php_parser.php | 1054 ---------- sys/db/tests/simpletest/recorder.php | 101 - sys/db/tests/simpletest/reflection_php4.php | 136 -- sys/db/tests/simpletest/reflection_php5.php | 386 ---- sys/db/tests/simpletest/remote.php | 115 -- sys/db/tests/simpletest/reporter.php | 445 ----- sys/db/tests/simpletest/scorer.php | 875 --------- sys/db/tests/simpletest/selector.php | 141 -- sys/db/tests/simpletest/shell_tester.php | 330 ---- sys/db/tests/simpletest/simpletest.php | 391 ---- sys/db/tests/simpletest/socket.php | 312 --- sys/db/tests/simpletest/tag.php | 1527 --------------- .../tests/simpletest/test/acceptance_test.php | 1729 ----------------- sys/db/tests/simpletest/test/adapter_test.php | 50 - sys/db/tests/simpletest/test/all_tests.php | 13 - .../tests/simpletest/test/arguments_test.php | 82 - .../simpletest/test/authentication_test.php | 145 -- sys/db/tests/simpletest/test/autorun_test.php | 23 - .../tests/simpletest/test/bad_test_suite.php | 10 - sys/db/tests/simpletest/test/browser_test.php | 802 -------- .../tests/simpletest/test/collector_test.php | 50 - .../simpletest/test/command_line_test.php | 40 - .../simpletest/test/compatibility_test.php | 87 - sys/db/tests/simpletest/test/cookies_test.php | 227 --- .../tests/simpletest/test/detached_test.php | 15 - sys/db/tests/simpletest/test/dumper_test.php | 88 - sys/db/tests/simpletest/test/eclipse_test.php | 32 - .../tests/simpletest/test/encoding_test.php | 240 --- sys/db/tests/simpletest/test/errors_test.php | 229 --- .../tests/simpletest/test/exceptions_test.php | 183 -- .../simpletest/test/expectation_test.php | 317 --- sys/db/tests/simpletest/test/form_test.php | 344 ---- sys/db/tests/simpletest/test/frames_test.php | 549 ------ sys/db/tests/simpletest/test/http_test.php | 492 ----- .../tests/simpletest/test/interfaces_test.php | 137 -- .../test/interfaces_test_php5_1.php | 14 - sys/db/tests/simpletest/test/live_test.php | 47 - .../simpletest/test/mock_objects_test.php | 985 ---------- sys/db/tests/simpletest/test/page_test.php | 166 -- .../simpletest/test/parse_error_test.php | 9 - sys/db/tests/simpletest/test/parsing_test.php | 642 ------ .../tests/simpletest/test/php_parser_test.php | 489 ----- .../tests/simpletest/test/recorder_test.php | 23 - .../simpletest/test/reflection_php5_test.php | 263 --- sys/db/tests/simpletest/test/remote_test.php | 19 - sys/db/tests/simpletest/test/shell_test.php | 38 - .../simpletest/test/shell_tester_test.php | 42 - .../tests/simpletest/test/simpletest_test.php | 58 - sys/db/tests/simpletest/test/site/file.html | 6 - sys/db/tests/simpletest/test/socket_test.php | 25 - .../test/support/collector/collectable.1 | 0 .../test/support/collector/collectable.2 | 0 .../test/support/empty_test_file.php | 3 - .../simpletest/test/support/failing_test.php | 9 - .../simpletest/test/support/latin1_sample | 1 - .../simpletest/test/support/passing_test.php | 9 - .../test/support/recorder_sample.php | 14 - .../simpletest/test/support/spl_examples.php | 15 - .../support/supplementary_upload_sample.txt | 1 - .../tests/simpletest/test/support/test1.php | 7 - .../simpletest/test/support/upload_sample.txt | 1 - sys/db/tests/simpletest/test/tag_test.php | 554 ------ .../simpletest/test/test_with_parse_error.php | 8 - .../simpletest/test/unit_tester_test.php | 61 - sys/db/tests/simpletest/test/unit_tests.php | 49 - sys/db/tests/simpletest/test/url_test.php | 515 ----- .../tests/simpletest/test/user_agent_test.php | 348 ---- sys/db/tests/simpletest/test/visual_test.php | 495 ----- .../tests/simpletest/test/web_tester_test.php | 155 -- sys/db/tests/simpletest/test/xml_test.php | 187 -- sys/db/tests/simpletest/test_case.php | 658 ------- sys/db/tests/simpletest/tidy_parser.php | 382 ---- sys/db/tests/simpletest/unit_tester.php | 413 ---- sys/db/tests/simpletest/url.php | 550 ------ sys/db/tests/simpletest/user_agent.php | 328 ---- sys/db/tests/simpletest/web_tester.php | 1532 --------------- sys/db/tests/simpletest/xml.php | 647 ------ sys/libraries/session.php | 83 + 223 files changed, 1640 insertions(+), 45578 deletions(-) create mode 100644 .gitignore create mode 100644 docs/classes/MM_Session.html create mode 100644 docs/classes/PHP_Session.html create mode 100644 docs/packages/miniMVC.Libraries.html delete mode 160000 sys/Query rename sys/{ => core}/controller.php (97%) rename sys/{ => core}/db.php (97%) rename sys/{ => core}/miniMVC.php (93%) rename sys/{ => core}/model.php (100%) rename sys/{ => core}/output.php (94%) rename sys/{ => core}/page.php (99%) delete mode 100644 sys/db/README.md delete mode 100644 sys/db/phpdoc.dist.xml delete mode 100644 sys/db/tests/core/core.php delete mode 100644 sys/db/tests/core/db_qb_test.php delete mode 100644 sys/db/tests/core/db_test.php delete mode 100644 sys/db/tests/core/settings.php delete mode 100644 sys/db/tests/databases/firebird/firebird-qb.php delete mode 100644 sys/db/tests/databases/firebird/firebird.php delete mode 100644 sys/db/tests/databases/mysql/mysql-qb.php delete mode 100644 sys/db/tests/databases/mysql/mysql.php delete mode 100644 sys/db/tests/databases/pgsql/pgsql-qb.php delete mode 100644 sys/db/tests/databases/pgsql/pgsql.php delete mode 100644 sys/db/tests/databases/sqlite/sqlite-qb.php delete mode 100644 sys/db/tests/databases/sqlite/sqlite.php delete mode 100644 sys/db/tests/index.php delete mode 100644 sys/db/tests/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE delete mode 100644 sys/db/tests/simpletest/LICENSE delete mode 100644 sys/db/tests/simpletest/README delete mode 100644 sys/db/tests/simpletest/VERSION delete mode 100644 sys/db/tests/simpletest/arguments.php delete mode 100644 sys/db/tests/simpletest/authentication.php delete mode 100644 sys/db/tests/simpletest/autorun.php delete mode 100644 sys/db/tests/simpletest/browser.php delete mode 100644 sys/db/tests/simpletest/collector.php delete mode 100644 sys/db/tests/simpletest/compatibility.php delete mode 100644 sys/db/tests/simpletest/cookies.php delete mode 100644 sys/db/tests/simpletest/default_reporter.php delete mode 100644 sys/db/tests/simpletest/detached.php delete mode 100644 sys/db/tests/simpletest/docs/en/authentication_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/en/browser_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/en/docs.css delete mode 100644 sys/db/tests/simpletest/docs/en/expectation_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/en/form_testing_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/en/group_test_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/en/mock_objects_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/en/overview.html delete mode 100644 sys/db/tests/simpletest/docs/en/partial_mocks_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/en/reporter_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/en/unit_test_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/en/web_tester_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/fr/authentication_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/fr/browser_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/fr/docs.css delete mode 100644 sys/db/tests/simpletest/docs/fr/expectation_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/fr/form_testing_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/fr/group_test_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/fr/mock_objects_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/fr/overview.html delete mode 100644 sys/db/tests/simpletest/docs/fr/partial_mocks_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/fr/reporter_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/fr/unit_test_documentation.html delete mode 100644 sys/db/tests/simpletest/docs/fr/web_tester_documentation.html delete mode 100644 sys/db/tests/simpletest/dumper.php delete mode 100644 sys/db/tests/simpletest/eclipse.php delete mode 100644 sys/db/tests/simpletest/encoding.php delete mode 100644 sys/db/tests/simpletest/errors.php delete mode 100644 sys/db/tests/simpletest/exceptions.php delete mode 100644 sys/db/tests/simpletest/expectation.php delete mode 100644 sys/db/tests/simpletest/extensions/pear_test_case.php delete mode 100644 sys/db/tests/simpletest/extensions/testdox.php delete mode 100644 sys/db/tests/simpletest/extensions/testdox/test.php delete mode 100644 sys/db/tests/simpletest/form.php delete mode 100644 sys/db/tests/simpletest/frames.php delete mode 100644 sys/db/tests/simpletest/http.php delete mode 100644 sys/db/tests/simpletest/invoker.php delete mode 100644 sys/db/tests/simpletest/mock_objects.php delete mode 100644 sys/db/tests/simpletest/page.php delete mode 100644 sys/db/tests/simpletest/php_parser.php delete mode 100644 sys/db/tests/simpletest/recorder.php delete mode 100644 sys/db/tests/simpletest/reflection_php4.php delete mode 100644 sys/db/tests/simpletest/reflection_php5.php delete mode 100644 sys/db/tests/simpletest/remote.php delete mode 100644 sys/db/tests/simpletest/reporter.php delete mode 100644 sys/db/tests/simpletest/scorer.php delete mode 100644 sys/db/tests/simpletest/selector.php delete mode 100644 sys/db/tests/simpletest/shell_tester.php delete mode 100644 sys/db/tests/simpletest/simpletest.php delete mode 100644 sys/db/tests/simpletest/socket.php delete mode 100644 sys/db/tests/simpletest/tag.php delete mode 100644 sys/db/tests/simpletest/test/acceptance_test.php delete mode 100644 sys/db/tests/simpletest/test/adapter_test.php delete mode 100644 sys/db/tests/simpletest/test/all_tests.php delete mode 100644 sys/db/tests/simpletest/test/arguments_test.php delete mode 100644 sys/db/tests/simpletest/test/authentication_test.php delete mode 100644 sys/db/tests/simpletest/test/autorun_test.php delete mode 100644 sys/db/tests/simpletest/test/bad_test_suite.php delete mode 100644 sys/db/tests/simpletest/test/browser_test.php delete mode 100644 sys/db/tests/simpletest/test/collector_test.php delete mode 100644 sys/db/tests/simpletest/test/command_line_test.php delete mode 100644 sys/db/tests/simpletest/test/compatibility_test.php delete mode 100644 sys/db/tests/simpletest/test/cookies_test.php delete mode 100644 sys/db/tests/simpletest/test/detached_test.php delete mode 100644 sys/db/tests/simpletest/test/dumper_test.php delete mode 100644 sys/db/tests/simpletest/test/eclipse_test.php delete mode 100644 sys/db/tests/simpletest/test/encoding_test.php delete mode 100644 sys/db/tests/simpletest/test/errors_test.php delete mode 100644 sys/db/tests/simpletest/test/exceptions_test.php delete mode 100644 sys/db/tests/simpletest/test/expectation_test.php delete mode 100644 sys/db/tests/simpletest/test/form_test.php delete mode 100644 sys/db/tests/simpletest/test/frames_test.php delete mode 100644 sys/db/tests/simpletest/test/http_test.php delete mode 100644 sys/db/tests/simpletest/test/interfaces_test.php delete mode 100644 sys/db/tests/simpletest/test/interfaces_test_php5_1.php delete mode 100644 sys/db/tests/simpletest/test/live_test.php delete mode 100644 sys/db/tests/simpletest/test/mock_objects_test.php delete mode 100644 sys/db/tests/simpletest/test/page_test.php delete mode 100644 sys/db/tests/simpletest/test/parse_error_test.php delete mode 100644 sys/db/tests/simpletest/test/parsing_test.php delete mode 100644 sys/db/tests/simpletest/test/php_parser_test.php delete mode 100644 sys/db/tests/simpletest/test/recorder_test.php delete mode 100644 sys/db/tests/simpletest/test/reflection_php5_test.php delete mode 100644 sys/db/tests/simpletest/test/remote_test.php delete mode 100644 sys/db/tests/simpletest/test/shell_test.php delete mode 100644 sys/db/tests/simpletest/test/shell_tester_test.php delete mode 100644 sys/db/tests/simpletest/test/simpletest_test.php delete mode 100644 sys/db/tests/simpletest/test/site/file.html delete mode 100644 sys/db/tests/simpletest/test/socket_test.php delete mode 100644 sys/db/tests/simpletest/test/support/collector/collectable.1 delete mode 100644 sys/db/tests/simpletest/test/support/collector/collectable.2 delete mode 100644 sys/db/tests/simpletest/test/support/empty_test_file.php delete mode 100644 sys/db/tests/simpletest/test/support/failing_test.php delete mode 100644 sys/db/tests/simpletest/test/support/latin1_sample delete mode 100644 sys/db/tests/simpletest/test/support/passing_test.php delete mode 100644 sys/db/tests/simpletest/test/support/recorder_sample.php delete mode 100644 sys/db/tests/simpletest/test/support/spl_examples.php delete mode 100644 sys/db/tests/simpletest/test/support/supplementary_upload_sample.txt delete mode 100644 sys/db/tests/simpletest/test/support/test1.php delete mode 100644 sys/db/tests/simpletest/test/support/upload_sample.txt delete mode 100644 sys/db/tests/simpletest/test/tag_test.php delete mode 100644 sys/db/tests/simpletest/test/test_with_parse_error.php delete mode 100644 sys/db/tests/simpletest/test/unit_tester_test.php delete mode 100644 sys/db/tests/simpletest/test/unit_tests.php delete mode 100644 sys/db/tests/simpletest/test/url_test.php delete mode 100644 sys/db/tests/simpletest/test/user_agent_test.php delete mode 100644 sys/db/tests/simpletest/test/visual_test.php delete mode 100644 sys/db/tests/simpletest/test/web_tester_test.php delete mode 100644 sys/db/tests/simpletest/test/xml_test.php delete mode 100644 sys/db/tests/simpletest/test_case.php delete mode 100644 sys/db/tests/simpletest/tidy_parser.php delete mode 100644 sys/db/tests/simpletest/unit_tester.php delete mode 100644 sys/db/tests/simpletest/url.php delete mode 100644 sys/db/tests/simpletest/user_agent.php delete mode 100644 sys/db/tests/simpletest/web_tester.php delete mode 100644 sys/db/tests/simpletest/xml.php create mode 100644 sys/libraries/session.php diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ed4f4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/sys/db/.travis.yml +/sys/db/docs/* +/sys/db/phpdoc.dist.xml +/sys/db/README.md +/sys/db/tests/* \ No newline at end of file diff --git a/app/errors/error_404.php b/app/errors/error_404.php index ef260f3..e210433 100644 --- a/app/errors/error_404.php +++ b/app/errors/error_404.php @@ -8,7 +8,7 @@
- +

diff --git a/app/errors/error_general.php b/app/errors/error_general.php index ef260f3..e210433 100644 --- a/app/errors/error_general.php +++ b/app/errors/error_general.php @@ -8,7 +8,7 @@
- +

diff --git a/app/errors/error_php_exception.php b/app/errors/error_php_exception.php index 367696a..e69e9ce 100755 --- a/app/errors/error_php_exception.php +++ b/app/errors/error_php_exception.php @@ -3,14 +3,14 @@

Message:

- +

Backtrace:

getTrace() as $error): ?> - +

- File:
+ File:
Line:
Function:

diff --git a/app/views/footer.php b/app/views/footer.php index 0e9f4ee..2db2403 100644 --- a/app/views/footer.php +++ b/app/views/footer.php @@ -1,5 +1,5 @@ - + diff --git a/app/views/header.php b/app/views/header.php index a8dd944..4bb3b22 100644 --- a/app/views/header.php +++ b/app/views/header.php @@ -4,7 +4,7 @@ <?= $title ?> - + diff --git a/assets/css.php b/assets/css.php index ae56a64..22c0668 100755 --- a/assets/css.php +++ b/assets/css.php @@ -86,7 +86,7 @@ while($i < $pia_len) $css = ''; $modified = array(); -if(isset($groups[$_GET['g']])) +if (isset($groups[$_GET['g']])) { foreach($groups[$_GET['g']] as $file) { @@ -107,13 +107,13 @@ $requested_time=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) ? strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) : time(); -if($last_modified === $requested_time) +if ($last_modified === $requested_time) { header("HTTP/1.1 304 Not Modified"); exit(); } -if(!isset($_GET['debug'])) +if (!isset($_GET['debug'])) { $css = compress($css); } diff --git a/assets/js.php b/assets/js.php index 69faadd..12b7e16 100755 --- a/assets/js.php +++ b/assets/js.php @@ -100,7 +100,7 @@ $modified = array(); // -------------------------------------------------------------------------- //Aggregate the last modified times of the files -if(isset($groups[$_GET['g']])) +if (isset($groups[$_GET['g']])) { $cache_file = $js_root.'cache/'.$_GET['g']; @@ -117,7 +117,7 @@ if(isset($groups[$_GET['g']])) $cache_modified = 0; //Add the cache file - if(is_file($cache_file)) + if (is_file($cache_file)) { $cache_modified = filemtime($cache_file); } @@ -139,7 +139,7 @@ $requested_time=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) // If the browser's cached version is up to date, // don't resend the file -if($last_modified === $requested_time) +if ($last_modified === $requested_time) { header("HTTP/1.1 304 Not Modified"); exit(); @@ -148,18 +148,18 @@ if($last_modified === $requested_time) // -------------------------------------------------------------------------- //Determine what to do: rebuild cache, send files as is, or send cache. -if($cache_modified < $last_modified) +if ($cache_modified < $last_modified) { $js = google_min(get_files()); $cs = file_put_contents($cache_file, $js); //Make sure cache file gets created/updated - if($cs === FALSE) + if ($cs === FALSE) { die("Cache file was not created. Make sure you have the correct folder permissions."); } } -else if(isset($_GET['debug'])) +else if (isset($_GET['debug'])) { $js = get_files(); } diff --git a/docs/classes.svg b/docs/classes.svg index 3b992cc..367318e 100644 --- a/docs/classes.svg +++ b/docs/classes.svg @@ -4,74 +4,74 @@ - - + + G - + cluster_default - - - - - + + + + + \\DB_Reg - -DB_Reg + +DB_Reg \\Settings - -Settings + +Settings \\DB_SQL - -«abstract» -DB_SQL + +«abstract» +DB_SQL \\DB_PDO - -«abstract» -DB_PDO + +«abstract» +DB_PDO -\\PDO +\\PDO \PDO \\DB_PDO->\\PDO - - + + \\Query_Builder - -Query_Builder + +Query_Builder \\DB_Util - -«abstract» -DB_Util + +«abstract» +DB_Util @@ -83,8 +83,8 @@ \\PgSQL_SQL->\\DB_SQL - - + + \\PgSQL_Util @@ -95,20 +95,20 @@ \\PgSQL_Util->\\DB_Util - - + + \\PgSQL - -PgSQL + +PgSQL \\PgSQL->\\DB_PDO - - + + \\ODBC_Util @@ -119,8 +119,8 @@ \\ODBC_Util->\\DB_Util - - + + \\ODBC_SQL @@ -131,20 +131,20 @@ \\ODBC_SQL->\\DB_SQL - - + + \\ODBC - -ODBC + +ODBC \\ODBC->\\DB_PDO - - + + \\MySQL_Util @@ -155,8 +155,8 @@ \\MySQL_Util->\\DB_Util - - + + \\MySQL @@ -167,8 +167,8 @@ \\MySQL->\\DB_PDO - - + + \\MySQL_SQL @@ -179,20 +179,20 @@ \\MySQL_SQL->\\DB_SQL - - + + \\SQLite_Util - -SQLite_Util + +SQLite_Util \\SQLite_Util->\\DB_Util - - + + \\SQLite @@ -203,20 +203,20 @@ \\SQLite->\\DB_PDO - - + + \\SQLite_SQL - -SQLite_SQL + +SQLite_SQL \\SQLite_SQL->\\DB_SQL - - + + \\Firebird_SQL @@ -227,8 +227,8 @@ \\Firebird_SQL->\\DB_SQL - - + + \\Firebird_Result @@ -238,7 +238,7 @@ -\\PDOStatement +\\PDOStatement \PDOStatement @@ -256,8 +256,8 @@ \\Firebird->\\DB_PDO - - + + \\Firebird_Util @@ -268,121 +268,128 @@ \\Firebird_Util->\\DB_Util - - + + \\MM_Model - - -MM_Model + + +MM_Model \\miniMVC - - -miniMVC + + +miniMVC \\MM_Model->\\miniMVC - - + + \\DB - - -DB + + +DB \\DB->\\Query_Builder - - + + \\MM - - -MM + + +MM -\\ArrayObject - -\ArrayObject +\\ArrayObject + +\ArrayObject \\MM->\\ArrayObject - - + + \\miniMVC->\\MM - - + + \\MM_Page - - -MM_Page + + +MM_Page \\MM_Page->\\MM - - + + \\MM_Controller - - -MM_Controller + + +MM_Controller \\MM_Controller->\\miniMVC - - + + \\MM_Output - - -MM_Output + + +MM_Output \\MM_Output->\\MM - - + + + + +\\MM_Session + + +MM_Session + -\\Welcome_Model +\\Welcome_Model - -Welcome_Model + +Welcome_Model \\Welcome_Model->\\MM_Model - - + + -\\Welcome +\\Welcome - -Welcome + +Welcome \\Welcome->\\MM_Controller - - + + diff --git a/docs/classes/DB.html b/docs/classes/DB.html index ca7cbb6..df3d592 100644 --- a/docs/classes/DB.html +++ b/docs/classes/DB.html @@ -1583,7 +1583,7 @@ for complex select queries
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/DB_PDO.html b/docs/classes/DB_PDO.html index 53709c7..a3914a1 100644 --- a/docs/classes/DB_PDO.html +++ b/docs/classes/DB_PDO.html @@ -679,7 +679,7 @@ the connection/database
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/DB_Reg.html b/docs/classes/DB_Reg.html index 2a42341..fbf05e0 100644 --- a/docs/classes/DB_Reg.html +++ b/docs/classes/DB_Reg.html @@ -152,7 +152,7 @@ and organizes database connections

+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/DB_SQL.html b/docs/classes/DB_SQL.html index bf9757c..f3aeb53 100644 --- a/docs/classes/DB_SQL.html +++ b/docs/classes/DB_SQL.html @@ -269,7 +269,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/DB_Util.html b/docs/classes/DB_Util.html index 5f35f34..ab1406a 100644 --- a/docs/classes/DB_Util.html +++ b/docs/classes/DB_Util.html @@ -209,7 +209,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/Firebird.html b/docs/classes/Firebird.html index ea1589c..6e27472 100644 --- a/docs/classes/Firebird.html +++ b/docs/classes/Firebird.html @@ -833,7 +833,7 @@ the last query executed
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/Firebird_Result.html b/docs/classes/Firebird_Result.html index 9b562a7..081197a 100644 --- a/docs/classes/Firebird_Result.html +++ b/docs/classes/Firebird_Result.html @@ -504,7 +504,7 @@ the query
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/Firebird_SQL.html b/docs/classes/Firebird_SQL.html index 8babdb2..3718f1f 100644 --- a/docs/classes/Firebird_SQL.html +++ b/docs/classes/Firebird_SQL.html @@ -297,7 +297,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/Firebird_Util.html b/docs/classes/Firebird_Util.html index db964b2..3487152 100644 --- a/docs/classes/Firebird_Util.html +++ b/docs/classes/Firebird_Util.html @@ -212,7 +212,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/MM.html b/docs/classes/MM.html index 780f1ee..3c915ac 100644 --- a/docs/classes/MM.html +++ b/docs/classes/MM.html @@ -434,7 +434,7 @@ dynamic methods
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/MM_Controller.html b/docs/classes/MM_Controller.html index 2f0e517..3a6e34a 100644 --- a/docs/classes/MM_Controller.html +++ b/docs/classes/MM_Controller.html @@ -368,7 +368,7 @@

Method to load classes into the singleton

-
load_class(string $name, string $type) : void
+
load_class(string $name) : void
Inherited

@@ -381,10 +381,6 @@

$name

string
-
-

$type

-string -
@@ -764,7 +760,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/MM_Model.html b/docs/classes/MM_Model.html index 788b56a..6ff765f 100644 --- a/docs/classes/MM_Model.html +++ b/docs/classes/MM_Model.html @@ -365,7 +365,7 @@

Method to load classes into the singleton

-
load_class(string $name, string $type) : void
+
load_class(string $name) : void
Inherited

@@ -378,10 +378,6 @@

$name

string
-
-

$type

-string -
@@ -728,7 +724,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/MM_Output.html b/docs/classes/MM_Output.html index 4e7c3b6..da934ff 100644 --- a/docs/classes/MM_Output.html +++ b/docs/classes/MM_Output.html @@ -640,7 +640,7 @@ Used for outputing HTML
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/MM_Page.html b/docs/classes/MM_Page.html index 229a7fb..c99a9cc 100644 --- a/docs/classes/MM_Page.html +++ b/docs/classes/MM_Page.html @@ -972,7 +972,7 @@ supports

+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/MM_Session.html b/docs/classes/MM_Session.html new file mode 100644 index 0000000..35942eb --- /dev/null +++ b/docs/classes/MM_Session.html @@ -0,0 +1,138 @@ + + + + + +miniMVC » \MM_Session + + + + + + + + + +
+
+miniMVC
+
+
Back to top  
+
+
+ +
+
+
+ +
+ +
+
+
+

Class to improve handling of PHP sessions

+
+

+ + + + + + + + + +
packageminiMVC
subpackageLibraries
+

+ Methods

+
+

Retreive a session value

+
__get(string $key) : mixed
+
+
+

+

Parameters

+
+

$key

+string +
+

Returns

+
mixed
+
+
+
+

Set a session value

+
__set(string $key, mixed $val) : void
+
+
+

+

Parameters

+
+

$key

+string +
+
+

$val

+mixed +
+
+
+
+

Destroy a session

+
destroy() : void
+
+

+
+
+

Start a session

+
__construct() 
+
+

+
+
+
+
+
+
+
+ + diff --git a/docs/classes/MySQL.html b/docs/classes/MySQL.html index 41fc958..1cdd58b 100644 --- a/docs/classes/MySQL.html +++ b/docs/classes/MySQL.html @@ -869,7 +869,7 @@ the connection/database
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/MySQL_SQL.html b/docs/classes/MySQL_SQL.html index 9ec51cc..4aac606 100644 --- a/docs/classes/MySQL_SQL.html +++ b/docs/classes/MySQL_SQL.html @@ -281,7 +281,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/MySQL_Util.html b/docs/classes/MySQL_Util.html index 6ca18c5..4515f37 100644 --- a/docs/classes/MySQL_Util.html +++ b/docs/classes/MySQL_Util.html @@ -208,7 +208,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/ODBC.html b/docs/classes/ODBC.html index 1390085..57e30eb 100644 --- a/docs/classes/ODBC.html +++ b/docs/classes/ODBC.html @@ -871,7 +871,7 @@ the connection/database
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/ODBC_SQL.html b/docs/classes/ODBC_SQL.html index c863cd0..b7debfd 100644 --- a/docs/classes/ODBC_SQL.html +++ b/docs/classes/ODBC_SQL.html @@ -281,7 +281,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/ODBC_Util.html b/docs/classes/ODBC_Util.html index ea474f8..093717b 100644 --- a/docs/classes/ODBC_Util.html +++ b/docs/classes/ODBC_Util.html @@ -203,7 +203,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/PHP_Session.html b/docs/classes/PHP_Session.html new file mode 100644 index 0000000..42a6b9a --- /dev/null +++ b/docs/classes/PHP_Session.html @@ -0,0 +1,633 @@ + + + + + +miniMVC » \PHP_Session + + + + + + + + + +
+
+miniMVC
+
+
Back to top  
+
+
+ +
+
+
+ +
+ +
+
+
+

Class to improve handling of PHP sessions

+
+

+ + + + + + + + + +
packageminiMVC
subpackageLibraries
+

+ Methods

+
+

Allow calling of array methods on the object and +dynamic methods

+
__call(string $name, array $params) : mixed
+
Inherited
+
+

+ + + +
inherited_from\MM::__call()
+

Parameters

+
+

$name

+string +
+
+

$params

+array +
+

Returns

+
mixed
+
+
+
+

Retreive a session value

+
__get(string $key) : mixed
+
+
+

+

Parameters

+
+

$key

+string +
+

Returns

+
mixed
+
+
+
+

Set a session value

+
__set(string $key, mixed $val) : void
+
+
+

+

Parameters

+
+

$key

+string +
+
+

$val

+mixed +
+
+
+
+

append() +

+
append() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::append()
inherited_from\MM::append()
+
+
+
+

asort() +

+
asort() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::asort()
inherited_from\MM::asort()
+
+
+
+

count() +

+
count() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::count()
inherited_from\MM::count()
+
+
+
+

Destroy a session

+
destroy() : void
+
+

+
+
+

exchangeArray() +

+
exchangeArray() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::exchangeArray()
inherited_from\MM::exchangeArray()
+
+
+
+

getArrayCopy() +

+
getArrayCopy() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::getArrayCopy()
inherited_from\MM::getArrayCopy()
+
+
+
+

getFlags() +

+
getFlags() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::getFlags()
inherited_from\MM::getFlags()
+
+
+
+

getIterator() +

+
getIterator() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::getIterator()
inherited_from\MM::getIterator()
+
+
+
+

getIteratorClass() +

+
getIteratorClass() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::getIteratorClass()
inherited_from\MM::getIteratorClass()
+
+
+
+

Return or create singleton

+
get_instance() : \PHP_Session
+
+
+

+ + + +
fluentThis method is part of a fluent interface and will return the same instance
+

Returns

+
\PHP_Session
+
+
+
+

ksort() +

+
ksort() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::ksort()
inherited_from\MM::ksort()
+
+
+
+

natcasesort() +

+
natcasesort() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::natcasesort()
inherited_from\MM::natcasesort()
+
+
+
+

natsort() +

+
natsort() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::natsort()
inherited_from\MM::natsort()
+
+
+
+

offsetExists() +

+
offsetExists() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::offsetExists()
inherited_from\MM::offsetExists()
+
+
+
+

offsetGet() +

+
offsetGet() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::offsetGet()
inherited_from\MM::offsetGet()
+
+
+
+

offsetSet() +

+
offsetSet() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::offsetSet()
inherited_from\MM::offsetSet()
+
+
+
+

offsetUnset() +

+
offsetUnset() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::offsetUnset()
inherited_from\MM::offsetUnset()
+
+
+
+

serialize() +

+
serialize() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::serialize()
inherited_from\MM::serialize()
+
+
+
+

setFlags() +

+
setFlags() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::setFlags()
inherited_from\MM::setFlags()
+
+
+
+

setIteratorClass() +

+
setIteratorClass() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::setIteratorClass()
inherited_from\MM::setIteratorClass()
+
+
+
+

uasort() +

+
uasort() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::uasort()
inherited_from\MM::uasort()
+
+
+
+

uksort() +

+
uksort() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::uksort()
inherited_from\MM::uksort()
+
+
+
+

unserialize() +

+
unserialize() 
+
Inherited
+
+

+ + + + + + + + + +
inherited_fromArrayObject::unserialize()
inherited_from\MM::unserialize()
+
+
+
+

Start a session

+
__construct() 
+
+

+
+

+ Properties

+ 
+

Instance of the current class

+
$instance : \PHP_Session
+
+

+
+
+
+
+
+
+
+ + diff --git a/docs/classes/PgSQL.html b/docs/classes/PgSQL.html index bc67ebd..ae367b4 100644 --- a/docs/classes/PgSQL.html +++ b/docs/classes/PgSQL.html @@ -871,7 +871,7 @@ the connection/database
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/PgSQL_SQL.html b/docs/classes/PgSQL_SQL.html index e049556..080132f 100644 --- a/docs/classes/PgSQL_SQL.html +++ b/docs/classes/PgSQL_SQL.html @@ -297,7 +297,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/PgSQL_Util.html b/docs/classes/PgSQL_Util.html index 4fe0827..1e0ef05 100644 --- a/docs/classes/PgSQL_Util.html +++ b/docs/classes/PgSQL_Util.html @@ -208,7 +208,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/Query_Builder.html b/docs/classes/Query_Builder.html index 3b9c9fe..d53d747 100644 --- a/docs/classes/Query_Builder.html +++ b/docs/classes/Query_Builder.html @@ -1222,7 +1222,7 @@ for complex select queries
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/SQLite.html b/docs/classes/SQLite.html index 036c01b..a05fd3b 100644 --- a/docs/classes/SQLite.html +++ b/docs/classes/SQLite.html @@ -886,7 +886,7 @@ method if the database does not support 'TRUNCATE';
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/SQLite_SQL.html b/docs/classes/SQLite_SQL.html index 38bb000..364f387 100644 --- a/docs/classes/SQLite_SQL.html +++ b/docs/classes/SQLite_SQL.html @@ -281,7 +281,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/SQLite_Util.html b/docs/classes/SQLite_Util.html index f4e6962..61beaf5 100644 --- a/docs/classes/SQLite_Util.html +++ b/docs/classes/SQLite_Util.html @@ -208,7 +208,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/Settings.html b/docs/classes/Settings.html index b7e185c..3491b77 100644 --- a/docs/classes/Settings.html +++ b/docs/classes/Settings.html @@ -244,7 +244,7 @@ directly - the settings should be safe!
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/Welcome.html b/docs/classes/Welcome.html index 78c0298..9fda5e7 100644 --- a/docs/classes/Welcome.html +++ b/docs/classes/Welcome.html @@ -418,7 +418,7 @@

Method to load classes into the singleton

-
load_class(string $name, string $type) : void
+
load_class(string $name) : void
Inherited

@@ -437,10 +437,6 @@

$name

string
-
-

$type

-string -
@@ -906,7 +902,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/Welcome_Model.html b/docs/classes/Welcome_Model.html index a92b949..c366627 100644 --- a/docs/classes/Welcome_Model.html +++ b/docs/classes/Welcome_Model.html @@ -407,7 +407,7 @@

Method to load classes into the singleton

-
load_class(string $name, string $type) : void
+
load_class(string $name) : void
Inherited

@@ -426,10 +426,6 @@

$name

string
-
-

$type

-string -
@@ -846,7 +842,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/classes/miniMVC.html b/docs/classes/miniMVC.html index 228e66a..716cc30 100644 --- a/docs/classes/miniMVC.html +++ b/docs/classes/miniMVC.html @@ -331,7 +331,7 @@

Method to load classes into the singleton

-
load_class(string $name, string $type) : void
+
load_class(string $name) : void

@@ -340,10 +340,6 @@

$name

string
-
-

$type

-string -
@@ -615,7 +611,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/deprecated.html b/docs/deprecated.html index 4883a9c..6fb601a 100644 --- a/docs/deprecated.html +++ b/docs/deprecated.html @@ -67,7 +67,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/errors.html b/docs/errors.html index 7ecb0c4..787720b 100644 --- a/docs/errors.html +++ b/docs/errors.html @@ -101,12 +101,13 @@
+
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/graph_class.html b/docs/graph_class.html index 8a80850..4c4efd0 100644 --- a/docs/graph_class.html +++ b/docs/graph_class.html @@ -64,7 +64,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/index.html b/docs/index.html index 28dd88e..b852c47 100644 --- a/docs/index.html +++ b/docs/index.html @@ -80,7 +80,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/markers.html b/docs/markers.html index 43b4cbb..2600af2 100644 --- a/docs/markers.html +++ b/docs/markers.html @@ -69,7 +69,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html index 4c4eb8d..40dbf97 100644 --- a/docs/namespaces/default.html +++ b/docs/namespaces/default.html @@ -448,6 +448,13 @@ data-fetching methods

« More » +
+

MM_Session¶ +

+

Class to improve handling of PHP sessions

+
+« More » +

MySQL¶

@@ -702,7 +709,7 @@ instantiates the specific db driver

+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/packages/.html b/docs/packages/.html index e259acf..f4a1418 100644 --- a/docs/packages/.html +++ b/docs/packages/.html @@ -67,7 +67,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/packages/Default.html b/docs/packages/Default.html index eeace1a..19723f9 100644 --- a/docs/packages/Default.html +++ b/docs/packages/Default.html @@ -185,7 +185,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/packages/Query.Drivers.html b/docs/packages/Query.Drivers.html index 7820dc2..13caf2b 100644 --- a/docs/packages/Query.Drivers.html +++ b/docs/packages/Query.Drivers.html @@ -211,7 +211,7 @@ data-fetching methods

+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/packages/Query.Helper Classes.html b/docs/packages/Query.Helper Classes.html index 12ffd58..3eb22ce 100644 --- a/docs/packages/Query.Helper Classes.html +++ b/docs/packages/Query.Helper Classes.html @@ -97,7 +97,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/packages/Query.Query.html b/docs/packages/Query.Query.html index 62633a9..dcdd974 100644 --- a/docs/packages/Query.Query.html +++ b/docs/packages/Query.Query.html @@ -115,7 +115,7 @@ instantiates the specific db driver

+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/packages/Query.html b/docs/packages/Query.html index 6eeb3c4..46b7c6d 100644 --- a/docs/packages/Query.html +++ b/docs/packages/Query.html @@ -316,7 +316,7 @@ instantiates the specific db driver

+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/packages/miniMVC.App.html b/docs/packages/miniMVC.App.html index b8e1774..fa9c0ec 100644 --- a/docs/packages/miniMVC.App.html +++ b/docs/packages/miniMVC.App.html @@ -139,7 +139,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/packages/miniMVC.Libraries.html b/docs/packages/miniMVC.Libraries.html new file mode 100644 index 0000000..8c9cedb --- /dev/null +++ b/docs/packages/miniMVC.Libraries.html @@ -0,0 +1,95 @@ + + + + + +miniMVC » miniMVC\Libraries + + + + + + + + + +
+
+miniMVC
+
+
Back to top  
+
+
+ +
+
+
+ +
+ +
+
+ +
+

+ Classes and interfaces

+
+

MM_Session¶ +

+

Class to improve handling of PHP sessions

+
+« More » +
+
+
+
+
+
+ + diff --git a/docs/packages/miniMVC.System.html b/docs/packages/miniMVC.System.html index e9d79c2..0fb9334 100644 --- a/docs/packages/miniMVC.System.html +++ b/docs/packages/miniMVC.System.html @@ -137,7 +137,7 @@
+ generated on 2012-05-03T13:23:53-04:00.
diff --git a/docs/packages/miniMVC.html b/docs/packages/miniMVC.html index e764fd5..3119931 100644 --- a/docs/packages/miniMVC.html +++ b/docs/packages/miniMVC.html @@ -63,6 +63,9 @@ App
  • +Libraries +
    • +
  • System
    • @@ -413,6 +416,24 @@ display them cleanly \
  • miniMVC
    • +\
  • Libraries
    • + +
    +

    + Classes and interfaces

    +
    +

    MM_Session¶ +

    +

    Class to improve handling of PHP sessions

    +
    +« More » +
    +
    +
    @@ -474,7 +495,7 @@ display them cleanly
    + generated on 2012-05-03T13:23:53-04:00.
    diff --git a/docs/structure.xml b/docs/structure.xml index 74633c1..6521c1d 100644 --- a/docs/structure.xml +++ b/docs/structure.xml @@ -95,7 +95,7 @@ and organizes database connections

    ]]> - + Free Query Builder / Database Abstraction Layer

    ]]>     @@ -510,7 +510,7 @@ directly - the settings should be safe!]]>     - + Free Query Builder / Database Abstraction Layer

    ]]>     @@ -2494,7 +2494,7 @@ in place of the get() method]]>     - + Free Query Builder / Database Abstraction Layer

    ]]>     @@ -2568,7 +2568,7 @@ with array_map and glob]]>     - + Free Query Builder / Database Abstraction Layer

    ]]>     @@ -2742,7 +2742,7 @@ with array_map and glob]]>     - + Free Query Builder / Database Abstraction Layer

    ]]>     @@ -3369,7 +3369,7 @@ with array_map and glob]]>     - + Free Query Builder / Database Abstraction Layer

    ]]>     @@ -3763,7 +3763,7 @@ with array_map and glob]]>     - + Free Query Builder / Database Abstraction Layer

    ]]>     @@ -4762,7 +4762,7 @@ the query]]>     - + Free Query Builder / Database Abstraction Layer

    ]]>     @@ -5078,7 +5078,7 @@ the last query executed]]>     - + Free Query Builder / Database Abstraction Layer

    ]]>     @@ -5219,7 +5219,7 @@ the last query executed]]>     - + Convention-based micro-framework for PHP

    ]]>     @@ -5271,275 +5271,7 @@ the last query executed]]>     - - - - Convention-based micro-framework for PHP

    ]]>     - - - - - -     - - db/autoload.php - - - miniMVC.php - - - shutdown - function - - - - - void - - - - - load_file - function - - - - - string - - - string - - - void - - - - $file - - - - - $curr_path - - - - - - on_error - function - - - - - int - - - string - - - string - - - int - - - \ErrorException - - - - $severity - - - - - $message - - - - - $filepath - - - - - $line - - - - - - on_exception - function - - - - - \Exception - - - void - - - - $exception - - - - - - is_like_array - function - - - - - mixed - - - bool - - - - $var - - - - - - show_404 - function - - - - - void - - - - - show_error - function - - - - - string - - - int - - - - $message - - - - - $status_code - - - - - - controller_methods - function - - - - - string - - - array - - - - $controller - - - - - - route - function - - - - - void - - - - - site_url - function - - - - - string - - - string - - - - $segment - - - - - - to_string - function - - - - - \object/array - - - string - - - string - - - - $data - - - - - $method - - - - - - do_include - function - - - - - string - - - void - - - - $path - - - - -     - + Convention-based micro-framework for PHP

    ]]>     @@ -5653,7 +5385,7 @@ display them cleanly]]>     - + Convention-based micro-framework for PHP

    ]]>     @@ -5869,7 +5601,7 @@ dynamic methods]]> - + load_class function @@ -5878,51 +5610,43 @@ dynamic methods]]> string - - string - void - + $name - - $type - - - - + unload function - + - + string - + $name - + load_config function - + - + string - + $name @@ -5930,7 +5654,7 @@ dynamic methods]]>     - + Convention-based micro-framework for PHP

    ]]>     @@ -6497,7 +6221,7 @@ page.

    ]]>     - + Convention-based micro-framework for PHP

    ]]>     @@ -6603,7 +6327,7 @@ page.

    ]]>     - + Convention-based micro-framework for PHP

    ]]>     @@ -6733,7 +6457,362 @@ Used for outputing HTML]]>     - + + + + Convention-based micro-framework for PHP

    ]]>     + + + + + +     + + MM_Session + \MM_Session + + + + + + + + + __construct + function + + + + + + + __set + function + + + + + string + + + mixed + + + void + + + + $key + + + + + $val + + + + + + __get + function + + + + + string + + + mixed + + + + $key + + + + + + destroy + function + + + + + void + + + + +     + + + + Convention-based micro-framework for PHP

    ]]>     + + + + + +     + + db/autoload.php + + + core/miniMVC.php + + + shutdown + function + + + + + void + + + + + load_file + function + + + + + string + + + string + + + void + + + + $file + + + + + $curr_path + + + + + + on_error + function + + + + + int + + + string + + + string + + + int + + + \ErrorException + + + + $severity + + + + + $message + + + + + $filepath + + + + + $line + + + + + + on_exception + function + + + + + \Exception + + + void + + + + $exception + + + + + + is_like_array + function + + + + + mixed + + + bool + + + + $var + + + + + + show_404 + function + + + + + void + + + + + show_error + function + + + + + string + + + int + + + + $message + + + + + $status_code + + + + + + controller_methods + function + + + + + string + + + array + + + + $controller + + + + + + route + function + + + + + void + + + + + site_url + function + + + + + string + + + string + + + + $segment + + + + + + to_string + function + + + + + \object/array + + + string + + + string + + + + $data + + + + + $method + + + + + + do_include + function + + + + + string + + + void + + + + $path + + + + +     + Convention-based micro-framework for PHP

    ]]>     @@ -6888,7 +6967,7 @@ Used for outputing HTML]]>     - + Convention-based micro-framework for PHP

    ]]>     @@ -6930,13 +7009,13 @@ Used for outputing HTML]]>     - + php function - + - + void @@ -6952,6 +7031,7 @@ Used for outputing HTML]]> + diff --git a/index.php b/index.php index daaab4a..6a37758 100644 --- a/index.php +++ b/index.php @@ -27,11 +27,11 @@ // PRODUCTION disables error reporting define('ENVIRONMENT', 'DEVELOPMENT'); -if(ENVIRONMENT == 'DEVELOPMENT') +if (ENVIRONMENT == 'DEVELOPMENT') { error_reporting(-1); } -else if(EVIRONMENT == 'PRODUCTION') +else if (EVIRONMENT == 'PRODUCTION') { error_reporting(0); } diff --git a/modules/welcome/controllers/welcome.php b/modules/welcome/controllers/welcome.php index 4588f36..ff78d82 100644 --- a/modules/welcome/controllers/welcome.php +++ b/modules/welcome/controllers/welcome.php @@ -38,8 +38,9 @@ class Welcome extends MM_Controller { */ public function index() { - $output = $this->page->set_message('info', "This is just a test message", TRUE); - $this->page->output_string($output); + $this->page->build_header(); + $output = $this->page->set_message('info', "This is just a test message"); + $this->page->build_footer(); } /** diff --git a/sys/Query b/sys/Query deleted file mode 160000 index 31ba088..0000000 --- a/sys/Query +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 31ba0881ea6088c6b141d6b75d6f2f302e61585c diff --git a/sys/common.php b/sys/common.php index d39c0a6..df9cf7e 100644 --- a/sys/common.php +++ b/sys/common.php @@ -38,7 +38,7 @@ function shutdown() $fatal = array(E_ERROR, E_PARSE, E_RECOVERABLE_ERROR); // Display pretty error page - if(in_array($error['type'], $fatal)) + if (in_array($error['type'], $fatal)) { $file = str_replace(MM_BASE_PATH, "", $error['file']); @@ -65,11 +65,11 @@ function load_file($file, $curr_path="") { $path = ""; - if($curr_path === "app") + if ($curr_path === "app") { $path = MM_APP_PATH."{$file}.php"; } - else if($curr_path === "sys") + else if ($curr_path === "sys") { $path = MM_SYS_PATH."{$file}.php"; } @@ -78,7 +78,7 @@ function load_file($file, $curr_path="") $path = MM_MOD_PATH."{$curr_path}/{$file}.php"; } - if(is_file($path)) + if (is_file($path)) { require_once($path); } @@ -133,7 +133,7 @@ function on_exception($exception) */ function is_like_array(&$var) { - if( ! isset($var)) + if ( ! isset($var)) { return FALSE; } @@ -174,7 +174,7 @@ function show_404() */ function show_error($message, $status_code=null) { - if( ! is_null($status_code)) + if ( ! is_null($status_code)) { @header("HTTP/1.1 {$status_code}", TRUE, (int)$status_code); } @@ -241,13 +241,13 @@ function route() $route_set = FALSE; // If it isn't the index page - if( ! empty($pi) && $pi !== "/") + if ( ! empty($pi) && $pi !== "/") { //Remove trailing slash and begining slash $pi = trim($pi, '/'); // URL matches the route exactly? Cool, that was easy - if(isset($routes[$pi])) + if (isset($routes[$pi])) { list($module, $controller, $func) = explode("/", $routes[$pi]); $route_set = TRUE; @@ -263,7 +263,7 @@ function route() foreach($custom_routes as $uri => $map) { - if(preg_match("`{$uri}`i", $pi)) + if (preg_match("`{$uri}`i", $pi)) { list($module, $controller, $func) = explode("/", $map); $route_set = TRUE; @@ -274,11 +274,11 @@ function route() // Doesn't match a predefined route? // Match on module/controller/method, controller/method, or method - if( ! $route_set) + if ( ! $route_set) { $num_segments = 0; - if(strpos($pi, '/') === FALSE && ! empty($pi)) + if (strpos($pi, '/') === FALSE && ! empty($pi)) { $num_segments = 1; } @@ -288,17 +288,17 @@ function route() $num_segments = count($segments); } - if($num_segments === 1) + if ($num_segments === 1) { $func = $pi; } - if($num_segments === 2) + if ($num_segments === 2) { list($controller, $func) = $segments; } - if($num_segments >= 3) + if ($num_segments >= 3) { list($module, $controller, $func) = $segments; } @@ -307,14 +307,14 @@ function route() $path = MM_MOD_PATH."{$module}/controllers/{$controller}.php"; - if(is_file($path)) + if (is_file($path)) { require_once($path); // Get the list of valid methods for that controller $methods = controller_methods($controller); - if(in_array($func, $methods)) + if (in_array($func, $methods)) { define('MM_MOD', $module); @@ -357,14 +357,14 @@ function to_string($data, $method='print_r') { $output = '
    ';
 	
-	if($method == "var_dump")
+	if ($method == "var_dump")
 	{
 		ob_start();
 		var_dump($data);
 		$output .= ob_get_contents();
 		ob_end_clean();
 	}
-	else if($method == "var_export")
+	else if ($method == "var_export")
 	{
 		ob_start();
 		var_export($data);
@@ -396,7 +396,7 @@ function do_include($path)
 require_once(MM_SYS_PATH.'db/autoload.php');
 
 // Load system libraries
-require_once(MM_SYS_PATH.'miniMVC.php');
-array_map('do_include', glob(MM_SYS_PATH.'*.php'));
+require_once(MM_SYS_PATH.'core/miniMVC.php');
+array_map('do_include', glob(MM_SYS_PATH.'core/*.php'));
 
 // End of common.php
\ No newline at end of file
diff --git a/sys/controller.php b/sys/core/controller.php
similarity index 97%
rename from sys/controller.php
rename to sys/core/controller.php
index 4112fdd..989bee8 100644
--- a/sys/controller.php
+++ b/sys/core/controller.php
@@ -92,7 +92,7 @@ class MM_Controller extends miniMVC {
 		
 		// If it's not a module, or doesn't exist in the module view folder
 		// look in the app view folder
-		if( ! is_file($path))
+		if ( ! is_file($path))
 		{	
 			$path = MM_APP_PATH . "views/{$file}.php";
 		}
@@ -109,7 +109,7 @@ class MM_Controller extends miniMVC {
 		$buffer = ob_get_contents();
 		ob_end_clean();
 		
-		if($return == TRUE)
+		if ($return == TRUE)
 		{
 			return $buffer;
 		}
diff --git a/sys/db.php b/sys/core/db.php
similarity index 97%
rename from sys/db.php
rename to sys/core/db.php
index 0211377..1da7cbd 100644
--- a/sys/db.php
+++ b/sys/core/db.php
@@ -45,7 +45,7 @@ class DB extends Query_Builder {
 			require_once(MM_APP_PATH.'config/db.php');
 			
 			// Get the correct database in the config file
-			if( ! is_like_array($db_conf[$dbname]))
+			if ( ! is_like_array($db_conf[$dbname]))
 			{
 				// Apparently the database doesn't exist
 				$this->get_last_error();
@@ -99,7 +99,7 @@ class DB extends Query_Builder {
 	{
 		$error = array();
 
-		if(isset($this->statement))
+		if (isset($this->statement))
 		{
 			$error = $this->statement->errorInfo();
 		}
diff --git a/sys/miniMVC.php b/sys/core/miniMVC.php
similarity index 93%
rename from sys/miniMVC.php
rename to sys/core/miniMVC.php
index 2a53e0c..90c0863 100644
--- a/sys/miniMVC.php
+++ b/sys/core/miniMVC.php
@@ -308,35 +308,33 @@ class miniMVC extends MM {
 	 * Method to load classes into the singleton
 	 *
 	 * @param string $name
-	 * @param string $type
 	 * @return void
 	 */
-	public function load_class($name, $type='class')
+	public function load_class($name)
 	{
-		switch($type)
-		{
-			default:
-				$path = MM_APP_PATH . "classes/{$name}.php";
-			break;
-			
-			case "sys":
-				$path = MM_SYS_PATH . "{$name}.php";
-			break;
-		}
-		
 		// In a subdirectory? No problem
-		if(strpos("/", $name) !== FALSE)
+		if (strpos("/", $name) !== FALSE)
 		{
 			$n = explode("/", $name);
 			$name = $n[count($n) -1];
 		}
 		
+		// Try system library first, then app library
+		$path = MM_SYS_PATH . "libraries/{$name}.php";
+		$name = 'MM_'.$name;
+		
+		if ( ! is_file($path))
+		{
+			$path = MM_APP_PATH . "classes/{$name}.php";
+			$name = str_replace('MM_', '', $name);
+		}
+		
 		$class = "{$name}";
 		
 		// Load the class file if need be
-		if( ! class_exists($class, FALSE))
+		if ( ! class_exists($class, FALSE))
 		{
-			if(is_file($path))
+			if (is_file($path))
 			{
 				require_once($path);
 			}
@@ -345,10 +343,13 @@ class miniMVC extends MM {
 		// Create the object, and add it to the current miniMVC object
 		if (class_exists($class, FALSE))
 		{
+			// Remove MM_ prefix from name
+			$name = str_replace('MM_', '', $name);
+		
 			if ( ! isset($this->$name))
 			{
 				// Call a singleton, if the get_instance method exists
-				if (is_callable(array($class, 'get_instance')))
+				if (method_exists($class, 'get_instance'))
 				{
 					$this->$name =& $class::get_instance();
 					return;
@@ -369,7 +370,7 @@ class miniMVC extends MM {
 	 */
 	public function unload($name)
 	{
-		if(isset($this->$name))
+		if (isset($this->$name))
 		{
 			unset($this->$name);
 		}
@@ -386,7 +387,7 @@ class miniMVC extends MM {
 	{
 		$path = MM_APP_PATH . "config/{$name}.php";
 	
-		if(is_file($path))
+		if (is_file($path))
 		{
 			require_once($path);
 		}
diff --git a/sys/model.php b/sys/core/model.php
similarity index 100%
rename from sys/model.php
rename to sys/core/model.php
diff --git a/sys/output.php b/sys/core/output.php
similarity index 94%
rename from sys/output.php
rename to sys/core/output.php
index 80730c4..8a6e926 100644
--- a/sys/output.php
+++ b/sys/core/output.php
@@ -53,12 +53,12 @@ class MM_Output extends MM {
 	 */
 	public function __destruct()
 	{
-		if( ! empty($this->headers))
+		if ( ! empty($this->headers))
 		{
 			// Set headers
 			foreach($this->headers as $key => $val)
 			{
-				if( ! isset($val))
+				if ( ! isset($val))
 				{
 					@header($key);
 				}
@@ -69,9 +69,9 @@ class MM_Output extends MM {
 			}
 		}
 		
-		if( ! empty($this->buffer))
+		if ( ! empty($this->buffer))
 		{	
-			if(is_null(error_get_last()))
+			if (is_null(error_get_last()))
 			{
 				// Compression is good! 
 				ob_start("ob_gzhandler");
@@ -133,7 +133,7 @@ class MM_Output extends MM {
 		// Set headers
 		foreach($this->headers as $key => $val)
 		{
-			if( ! isset($val))
+			if ( ! isset($val))
 			{
 				@header($key);
 			}
diff --git a/sys/page.php b/sys/core/page.php
similarity index 99%
rename from sys/page.php
rename to sys/core/page.php
index 818a981..e8cba24 100644
--- a/sys/page.php
+++ b/sys/core/page.php
@@ -533,7 +533,7 @@ class MM_Page extends MM {
 			$string .= $k . '="'.$v.'" ';
 		}
 		
-		$string .= " />";
+		$string .= "/>";
 		
 		return $string;
 	}
diff --git a/sys/db/README.md b/sys/db/README.md
deleted file mode 100644
index 67a151a..0000000
--- a/sys/db/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Query
-
-A query builder/abstraction layer, using prepared queries for security.
-
-[![Build Status](https://secure.travis-ci.org/timw4mail/Query.png)](http://travis-ci.org/timw4mail/Query)
-
-## Requirements
-* Pdo extensions for the databases you wish to use (unless it's Firebird, in which case, the interbase extension is required)
-* PHP 5.2+
-
-## Databases Supported
-	
-* Firebird
-* MySQL
-* PostgreSQL
-* SQLite
-* Others, via ODBC
-
-## Including Query in your application
-
-To include Query in your PHP project, just include the `autoload.php` file. This will automatically load the classes that are supported by the current PHP installation.
-
-	
-## Connecting
-
-Create a connection array or object similar to this:
-
-	 'mysql',
-		'host' => 'localhost',
-		'user' => 'root',
-		'pass' => '',
-		'port' => '3306',
-		'database' => 'test_db',
-		
-		// Only required
-		// SQLite or Firebird
-		'file' => '/path/to/db/file',
-	);
-	
-	$db = new Query_Builder($params);
-
-The parameters required depend on the database. 
-
-### Running Queries
-Query uses the same interface as CodeIgniter's [Active Record class](http://codeigniter.com/user_guide/database/active_record.html). However, it does not implement the `insert_batch` or `update_batch` methods.
-
-####You can also run queries manually. 
-
-To run a prepared statement, call
-`$db->prepare_execute($sql, $params)`. 
-
-To run a plain query, `$db->query($sql)`
-
-### Retrieving Results:
-
-An example of a moderately complex query:
-
-	$query = $db->select('id, key as k, val')
-		->from('table t')
-		->where('k >', 3)
-		->or_where('id !=' 5)
-		->order_by('val', 'DESC')
-		->limit(3, 1)
-		->get();
-		
-This will generate a query similar to (with this being the output for a Postgres database):
-
-	SELECT "id", "key" AS "k", "val"
-	FROM "table" "t"
-	WHERE "k" > ?
-	OR "id" != ?
-	ORDER BY "val" DESC
-	LIMIT 3 OFFSET 1
-
-
-To retreive the results of a query, use the PDO method [fetch](http://php.net/manual/en/pdostatement.fetch.php) and/or [fetchAll](http://php.net/manual/en/pdostatement.fetchall.php).
-
-	$query = $db->get('table_name');
-	
-	$results = $query->fetchAll(PDO::FETCH_ASSOC);
\ No newline at end of file
diff --git a/sys/db/autoload.php b/sys/db/autoload.php
index e95de2c..b4a2032 100644
--- a/sys/db/autoload.php
+++ b/sys/db/autoload.php
@@ -50,7 +50,7 @@ foreach(pdo_drivers() as $d)
 {
 	$dir = QDRIVER_PATH.$d;
 
-	if(is_dir($dir))
+	if (is_dir($dir))
 	{
 		array_map('do_include', glob($dir.'/*.php'));
 	}
diff --git a/sys/db/classes/db_pdo.php b/sys/db/classes/db_pdo.php
index 78c22d9..8965b3b 100644
--- a/sys/db/classes/db_pdo.php
+++ b/sys/db/classes/db_pdo.php
@@ -90,7 +90,7 @@ abstract class DB_PDO extends PDO {
 		// Prepare the sql
 		$query = $this->prepare($sql);
 
-		if( ! (is_object($query) || is_resource($query)))
+		if ( ! (is_object($query) || is_resource($query)))
 		{
 			$this->get_last_error();
 			return FALSE;
@@ -100,7 +100,7 @@ abstract class DB_PDO extends PDO {
 		$this->statement =& $query;
 
 
-		if( ! (is_array($data) || is_object($data)))
+		if ( ! (is_array($data) || is_object($data)))
 		{
 			trigger_error("Invalid data argument");
 			return FALSE;
@@ -109,14 +109,14 @@ abstract class DB_PDO extends PDO {
 		// Bind the parameters
 		foreach($data as $k => $value)
 		{
-			if(is_numeric($k))
+			if (is_numeric($k))
 			{
 				$k++;
 			}
 
 			$res = $query->bindValue($k, $value);
 
-			if( ! $res)
+			if ( ! $res)
 			{
 				trigger_error("Parameter not successfully bound");
 				return FALSE;
diff --git a/sys/db/classes/settings.php b/sys/db/classes/settings.php
index e087205..81a990e 100644
--- a/sys/db/classes/settings.php
+++ b/sys/db/classes/settings.php
@@ -39,7 +39,7 @@ class Settings {
 	 */
 	public static function &get_instance()
 	{
-		if( ! isset(self::$instance))
+		if ( ! isset(self::$instance))
 		{
 			$name = __CLASS__;
 			self::$instance = new $name();
@@ -63,7 +63,7 @@ class Settings {
 
 		$path = SETTINGS_DIR.'/settings.json';
 
-		if( ! is_file($path))
+		if ( ! is_file($path))
 		{
 			//Create the file!
 			touch($path);
@@ -75,7 +75,7 @@ class Settings {
 		}
 
 		// Add the DB object under the settings if it doesn't already exist
-		if( ! isset($this->current->dbs))
+		if ( ! isset($this->current->dbs))
 		{
 			$this->current->dbs = new stdClass();
 		}
@@ -122,7 +122,7 @@ class Settings {
 	public function __set($key, $val)
 	{
 		//Don't allow direct db config changes
-		if($key == "dbs")
+		if ($key == "dbs")
 		{
 			return FALSE;
 		}
@@ -146,7 +146,7 @@ class Settings {
 			return FALSE;
 		}
 
-		if( ! isset($this->current->dbs->{$name}))
+		if ( ! isset($this->current->dbs->{$name}))
 		{
 			$params['name'] = $name;
 
@@ -215,7 +215,7 @@ class Settings {
 	 */
 	public function remove_db($name)
 	{
-		if( ! isset($this->current->dbs->{$name}))
+		if ( ! isset($this->current->dbs->{$name}))
 		{
 			return FALSE;
 		}
diff --git a/sys/db/drivers/firebird/firebird_driver.php b/sys/db/drivers/firebird/firebird_driver.php
index 5a7c359..0e70cc9 100644
--- a/sys/db/drivers/firebird/firebird_driver.php
+++ b/sys/db/drivers/firebird/firebird_driver.php
@@ -169,7 +169,7 @@ class Firebird extends DB_PDO {
 	 */
 	public function beginTransaction()
 	{
-		if(($this->trans = fbird_trans($this->conn)) !== NULL)
+		if (($this->trans = fbird_trans($this->conn)) !== NULL)
 		{
 			return TRUE;
 		}
@@ -231,7 +231,7 @@ class Firebird extends DB_PDO {
 	 */
 	public function quote($str, $param_type = NULL)
 	{
-		if(is_numeric($str))
+		if (is_numeric($str))
 		{
 			return $str;
 		}
diff --git a/sys/db/drivers/firebird/firebird_util.php b/sys/db/drivers/firebird/firebird_util.php
index 71c3d46..0b51640 100644
--- a/sys/db/drivers/firebird/firebird_util.php
+++ b/sys/db/drivers/firebird/firebird_util.php
@@ -56,7 +56,7 @@ class Firebird_Util extends DB_Util {
 		// )
 		foreach($fields as $colname => $type)
 		{
-			if(is_numeric($colname))
+			if (is_numeric($colname))
 			{
 				$colname = $type;
 			}
@@ -65,7 +65,7 @@ class Firebird_Util extends DB_Util {
 			$column_array[$colname]['type'] = ($type !== $colname) ? $type : '';
 		}
 
-		if( ! empty($constraints))
+		if ( ! empty($constraints))
 		{
 			foreach($constraints as $col => $const)
 			{
@@ -130,7 +130,7 @@ class Firebird_Util extends DB_Util {
 	public function backup_data($exclude=array(), $system_tables=FALSE)
 	{
 		// Determine which tables to use
-		if($system_tables == TRUE)
+		if ($system_tables == TRUE)
 		{
 			$tables = array_merge($this->get_system_tables(), $this->get_tables());
 		}
@@ -140,7 +140,7 @@ class Firebird_Util extends DB_Util {
 		}
 
 		// Filter out the tables you don't want
-		if( ! empty($exclude))
+		if ( ! empty($exclude))
 		{
 			$tables = array_diff($tables, $exclude);
 		}
@@ -170,7 +170,7 @@ class Firebird_Util extends DB_Util {
 				$row = array_values($row);
 
 				// Quote values as needed by type
-				if(stripos($t, 'RDB$') === FALSE)
+				if (stripos($t, 'RDB$') === FALSE)
 				{
 					$row = array_map(array(&$this, 'quote'), $row);
 					$row = array_map('trim', $row);
diff --git a/sys/db/drivers/mysql/mysql_util.php b/sys/db/drivers/mysql/mysql_util.php
index 7af8395..f12357a 100644
--- a/sys/db/drivers/mysql/mysql_util.php
+++ b/sys/db/drivers/mysql/mysql_util.php
@@ -56,7 +56,7 @@ class MySQL_Util extends DB_Util {
 		// )
 		foreach($columns as $colname => $type)
 		{
-			if(is_numeric($colname))
+			if (is_numeric($colname))
 			{
 				$colname = $type;
 			}
@@ -65,7 +65,7 @@ class MySQL_Util extends DB_Util {
 			$column_array[$colname]['type'] = ($type !== $colname) ? $type : '';
 		}
 
-		if( ! empty($constraints))
+		if ( ! empty($constraints))
 		{
 			foreach($constraints as $col => $const)
 			{
@@ -141,7 +141,7 @@ class MySQL_Util extends DB_Util {
 		$tables = $this->get_tables();
 		
 		// Filter out the tables you don't want
-		if( ! empty($exclude))
+		if ( ! empty($exclude))
 		{
 			$tables = array_diff($tables, $exclude);
 		}
diff --git a/sys/db/drivers/pgsql/pgsql_sql.php b/sys/db/drivers/pgsql/pgsql_sql.php
index e7ee6b9..b8b29d6 100644
--- a/sys/db/drivers/pgsql/pgsql_sql.php
+++ b/sys/db/drivers/pgsql/pgsql_sql.php
@@ -32,7 +32,7 @@ class PgSQL_SQL extends DB_SQL {
 	{
 		$sql .= " LIMIT {$limit}";
 
-		if(is_numeric($offset))
+		if (is_numeric($offset))
 		{
 			$sql .= " OFFSET {$offset}";
 		}
diff --git a/sys/db/drivers/pgsql/pgsql_util.php b/sys/db/drivers/pgsql/pgsql_util.php
index bd07882..3679d69 100644
--- a/sys/db/drivers/pgsql/pgsql_util.php
+++ b/sys/db/drivers/pgsql/pgsql_util.php
@@ -53,7 +53,7 @@ class PgSQL_Util extends DB_Util {
 		// )
 		foreach($columns as $colname => $type)
 		{
-			if(is_numeric($colname))
+			if (is_numeric($colname))
 			{
 				$colname = $type;
 			}
@@ -62,7 +62,7 @@ class PgSQL_Util extends DB_Util {
 			$column_array[$colname]['type'] = ($type !== $colname) ? $type : '';
 		}
 
-		if( ! empty($constraints))
+		if ( ! empty($constraints))
 		{
 			foreach($constraints as $col => $const)
 			{
@@ -128,7 +128,7 @@ class PgSQL_Util extends DB_Util {
 		$tables = $this->get_tables();
 	
 		// Filter out the tables you don't want
-		if( ! empty($exclude))
+		if ( ! empty($exclude))
 		{
 			$tables = array_diff($tables, $exclude);
 		}
diff --git a/sys/db/drivers/sqlite/sqlite_util.php b/sys/db/drivers/sqlite/sqlite_util.php
index 992304c..e595d2e 100644
--- a/sys/db/drivers/sqlite/sqlite_util.php
+++ b/sys/db/drivers/sqlite/sqlite_util.php
@@ -55,7 +55,7 @@ class SQLite_Util extends DB_Util {
 		// )
 		foreach($columns as $colname => $type)
 		{
-			if(is_numeric($colname))
+			if (is_numeric($colname))
 			{
 				$colname = $type;
 			}
@@ -64,7 +64,7 @@ class SQLite_Util extends DB_Util {
 			$column_array[$colname]['type'] = ($type !== $colname) ? $type : '';
 		}
 
-		if( ! empty($constraints))
+		if ( ! empty($constraints))
 		{
 			foreach($constraints as $col => $const)
 			{
@@ -117,7 +117,7 @@ class SQLite_Util extends DB_Util {
 		// Get a list of all the objects
 		$sql = 'SELECT "name" FROM "sqlite_master"';
 
-		if( ! empty($excluded))
+		if ( ! empty($excluded))
 		{
 			$sql .= ' WHERE NOT IN("'.implode('","', $excluded).'")';
 		}
diff --git a/sys/db/phpdoc.dist.xml b/sys/db/phpdoc.dist.xml
deleted file mode 100644
index 5552b46..0000000
--- a/sys/db/phpdoc.dist.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	Query
-	
-		docs
-	
-	
-		docs
-	
-	
-