From bb73fbbd17554059b17f966f60dd2d56e0dfbc2a Mon Sep 17 00:00:00 2001 From: Deon George Date: Sun, 29 Jan 2012 17:25:06 +1100 Subject: [PATCH] Removed final Agilebill items --- includes/adodb/adodb-csvlib.inc.php | 317 -- includes/adodb/adodb-datadict.inc.php | 1001 ---- includes/adodb/adodb-error.inc.php | 258 - includes/adodb/adodb-errorhandler.inc.php | 79 - includes/adodb/adodb-errorpear.inc.php | 88 - includes/adodb/adodb-exceptions.inc.php | 82 - includes/adodb/adodb-iterator.inc.php | 30 - includes/adodb/adodb-lib.inc.php | 1180 ----- includes/adodb/adodb-pager.inc.php | 290 -- includes/adodb/adodb-pear.inc.php | 374 -- includes/adodb/adodb-perf.inc.php | 1089 ---- includes/adodb/adodb-php4.inc.php | 16 - includes/adodb/adodb-time.inc.php | 1426 ------ includes/adodb/adodb-xmlschema.inc.php | 2223 --------- includes/adodb/adodb-xmlschema03.inc.php | 2404 --------- includes/adodb/adodb.inc.php | 4376 ----------------- .../adodb/datadict/datadict-access.inc.php | 95 - includes/adodb/datadict/datadict-db2.inc.php | 143 - .../adodb/datadict/datadict-firebird.inc.php | 151 - .../adodb/datadict/datadict-generic.inc.php | 125 - .../adodb/datadict/datadict-ibase.inc.php | 67 - .../adodb/datadict/datadict-informix.inc.php | 80 - .../adodb/datadict/datadict-mssql.inc.php | 282 -- .../datadict/datadict-mssqlnative.inc.php | 282 -- .../adodb/datadict/datadict-mysql.inc.php | 181 - includes/adodb/datadict/datadict-oci8.inc.php | 291 -- .../adodb/datadict/datadict-postgres.inc.php | 447 -- .../datadict/datadict-postgres.inc.php.bak | 441 -- .../adodb/datadict/datadict-sapdb.inc.php | 121 - .../adodb/datadict/datadict-sybase.inc.php | 228 - includes/adodb/drivers/adodb-access.inc.php | 87 - includes/adodb/drivers/adodb-ado.inc.php | 644 --- includes/adodb/drivers/adodb-ado5.inc.php | 678 --- .../adodb/drivers/adodb-ado_access.inc.php | 55 - .../adodb/drivers/adodb-ado_mssql.inc.php | 154 - .../adodb/drivers/adodb-borland_ibase.inc.php | 92 - includes/adodb/drivers/adodb-csv.inc.php | 207 - includes/adodb/drivers/adodb-db2.inc.php | 828 ---- includes/adodb/drivers/adodb-fbsql.inc.php | 266 - includes/adodb/drivers/adodb-firebird.inc.php | 77 - includes/adodb/drivers/adodb-ibase.inc.php | 887 ---- includes/adodb/drivers/adodb-informix.inc.php | 40 - .../adodb/drivers/adodb-informix72.inc.php | 475 -- includes/adodb/drivers/adodb-ldap.inc.php | 419 -- includes/adodb/drivers/adodb-mssql.inc.php | 1054 ---- includes/adodb/drivers/adodb-mssql_n.inc.php | 171 - .../adodb/drivers/adodb-mssqlnative.inc.php | 902 ---- includes/adodb/drivers/adodb-mssqlpo.inc.php | 62 - includes/adodb/drivers/adodb-mysql.inc.php | 791 --- includes/adodb/drivers/adodb-mysqli.inc.php | 1184 ----- includes/adodb/drivers/adodb-mysqlpo.inc.php | 138 - includes/adodb/drivers/adodb-mysqlt.inc.php | 155 - includes/adodb/drivers/adodb-netezza.inc.php | 170 - includes/adodb/drivers/adodb-oci8.inc.php | 1574 ------ includes/adodb/drivers/adodb-oci8.old.inc.php | 1532 ------ includes/adodb/drivers/adodb-oci805.inc.php | 59 - includes/adodb/drivers/adodb-oci8po.inc.php | 218 - includes/adodb/drivers/adodb-odbc.inc.php | 738 --- includes/adodb/drivers/adodb-odbc_db2.inc.php | 368 -- .../adodb/drivers/adodb-odbc_mssql.inc.php | 306 -- .../adodb/drivers/adodb-odbc_oracle.inc.php | 115 - includes/adodb/drivers/adodb-odbtp.inc.php | 793 --- .../adodb/drivers/adodb-odbtp_unicode.inc.php | 39 - includes/adodb/drivers/adodb-oracle.inc.php | 338 -- includes/adodb/drivers/adodb-pdo.inc.php | 580 --- .../adodb/drivers/adodb-pdo_mssql.inc.php | 61 - .../adodb/drivers/adodb-pdo_mysql.inc.php | 182 - includes/adodb/drivers/adodb-pdo_oci.inc.php | 93 - .../adodb/drivers/adodb-pdo_pgsql.inc.php | 230 - .../adodb/drivers/adodb-pdo_sqlite.inc.php | 268 - includes/adodb/drivers/adodb-postgres.inc.php | 14 - .../adodb/drivers/adodb-postgres64.inc.php | 1065 ---- .../adodb/drivers/adodb-postgres7.inc.php | 313 -- .../adodb/drivers/adodb-postgres8.inc.php | 12 - includes/adodb/drivers/adodb-proxy.inc.php | 33 - includes/adodb/drivers/adodb-sapdb.inc.php | 184 - .../adodb/drivers/adodb-sqlanywhere.inc.php | 169 - includes/adodb/drivers/adodb-sqlite.inc.php | 398 -- includes/adodb/drivers/adodb-sqlitepo.inc.php | 62 - includes/adodb/drivers/adodb-sybase.inc.php | 418 -- .../adodb/drivers/adodb-sybase_ase.inc.php | 119 - includes/adodb/drivers/adodb-vfp.inc.php | 107 - includes/adodb/lang/adodb-ar.inc.php | 33 - includes/adodb/lang/adodb-bg.inc.php | 37 - includes/adodb/lang/adodb-bgutf8.inc.php | 37 - includes/adodb/lang/adodb-ca.inc.php | 34 - includes/adodb/lang/adodb-cn.inc.php | 35 - includes/adodb/lang/adodb-cz.inc.php | 40 - includes/adodb/lang/adodb-da.inc.php | 33 - includes/adodb/lang/adodb-de.inc.php | 33 - includes/adodb/lang/adodb-en.inc.php | 33 - includes/adodb/lang/adodb-es.inc.php | 33 - includes/adodb/lang/adodb-esperanto.inc.php | 35 - includes/adodb/lang/adodb-fa.inc.php | 35 - includes/adodb/lang/adodb-fr.inc.php | 33 - includes/adodb/lang/adodb-hu.inc.php | 34 - includes/adodb/lang/adodb-it.inc.php | 34 - includes/adodb/lang/adodb-nl.inc.php | 33 - includes/adodb/lang/adodb-pl.inc.php | 35 - includes/adodb/lang/adodb-pt-br.inc.php | 35 - includes/adodb/lang/adodb-ro.inc.php | 35 - includes/adodb/lang/adodb-ru1251.inc.php | 35 - includes/adodb/lang/adodb-sv.inc.php | 33 - includes/adodb/lang/adodb-uk1251.inc.php | 35 - includes/adodb/lang/adodb_th.inc.php | 33 - includes/adodb/license.txt | 182 - includes/adodb/pear/Auth/Container/ADOdb.php | 413 -- includes/adodb/pear/readme.Auth.txt | 20 - includes/adodb/pivottable.inc.php | 187 - includes/adodb/readme.txt | 62 - includes/adodb/rsfilter.inc.php | 61 - includes/adodb/server.php | 100 - includes/adodb/toexport.inc.php | 134 - includes/smarty/Config_File.class.php | 393 -- includes/smarty/Smarty.class.php | 1961 -------- includes/smarty/Smarty_Compiler.class.php | 2365 --------- includes/smarty/debug.tpl | 157 - .../core.assemble_plugin_filepath.php | 67 - .../core.assign_smarty_interface.php | 43 - .../internals/core.create_dir_structure.php | 79 - .../internals/core.display_debug_console.php | 61 - .../internals/core.get_include_path.php | 44 - .../smarty/internals/core.get_microtime.php | 23 - .../internals/core.get_php_resource.php | 80 - includes/smarty/internals/core.is_secure.php | 59 - includes/smarty/internals/core.is_trusted.php | 47 - .../smarty/internals/core.load_plugins.php | 125 - .../internals/core.load_resource_plugin.php | 74 - .../internals/core.process_cached_inserts.php | 71 - .../core.process_compiled_include.php | 37 - .../smarty/internals/core.read_cache_file.php | 101 - includes/smarty/internals/core.rm_auto.php | 71 - includes/smarty/internals/core.rmdir.php | 54 - .../internals/core.run_insert_handler.php | 71 - .../internals/core.smarty_include_php.php | 50 - .../internals/core.write_cache_file.php | 96 - .../internals/core.write_compiled_include.php | 91 - .../core.write_compiled_resource.php | 35 - includes/smarty/internals/core.write_file.php | 54 - includes/smarty/plugins/block.t.php | 126 - includes/smarty/plugins/block.textformat.php | 103 - includes/smarty/plugins/block.translate.php | 11 - includes/smarty/plugins/compiler.assign.php | 40 - .../plugins/function.assign_debug_info.php | 40 - .../smarty/plugins/function.config_load.php | 142 - includes/smarty/plugins/function.counter.php | 80 - includes/smarty/plugins/function.cycle.php | 102 - includes/smarty/plugins/function.debug.php | 35 - includes/smarty/plugins/function.eval.php | 49 - includes/smarty/plugins/function.fetch.php | 221 - .../smarty/plugins/function.grid_paginate.php | 22 - .../plugins/function.html_checkboxes.php | 143 - .../smarty/plugins/function.html_image.php | 142 - .../smarty/plugins/function.html_options.php | 122 - .../smarty/plugins/function.html_radios.php | 156 - .../plugins/function.html_select_date.php | 331 -- .../plugins/function.html_select_time.php | 194 - .../smarty/plugins/function.html_table.php | 177 - .../smarty/plugins/function.html_textarea.php | 39 - includes/smarty/plugins/function.mailto.php | 165 - includes/smarty/plugins/function.math.php | 85 - includes/smarty/plugins/function.osb.php | 445 -- includes/smarty/plugins/function.popup.php | 119 - .../smarty/plugins/function.popup_init.php | 40 - includes/smarty/plugins/function.voip_did.php | 29 - .../smarty/plugins/function.voip_did_id.php | 38 - includes/smarty/plugins/modifier.bool.php | 10 - .../smarty/plugins/modifier.capitalize.php | 43 - includes/smarty/plugins/modifier.cat.php | 33 - .../plugins/modifier.count_characters.php | 32 - .../plugins/modifier.count_paragraphs.php | 29 - .../plugins/modifier.count_sentences.php | 29 - .../smarty/plugins/modifier.count_words.php | 33 - .../smarty/plugins/modifier.date_format.php | 58 - .../plugins/modifier.debug_print_var.php | 90 - includes/smarty/plugins/modifier.default.php | 32 - includes/smarty/plugins/modifier.escape.php | 93 - includes/smarty/plugins/modifier.indent.php | 28 - includes/smarty/plugins/modifier.lower.php | 26 - includes/smarty/plugins/modifier.nl2br.php | 35 - .../smarty/plugins/modifier.regex_replace.php | 48 - includes/smarty/plugins/modifier.replace.php | 30 - includes/smarty/plugins/modifier.spacify.php | 30 - .../smarty/plugins/modifier.string_format.php | 29 - includes/smarty/plugins/modifier.strip.php | 33 - .../smarty/plugins/modifier.strip_tags.php | 32 - includes/smarty/plugins/modifier.truncate.php | 50 - includes/smarty/plugins/modifier.upper.php | 26 - includes/smarty/plugins/modifier.wordwrap.php | 29 - .../plugins/outputfilter.trimwhitespace.php | 75 - .../plugins/shared.escape_special_chars.php | 31 - .../smarty/plugins/shared.make_timestamp.php | 46 - includes/smarty/tsmarty2c.php | 124 - modules/core/auth.inc.php | 304 -- modules/core/auth_generate_admin_menu.inc.php | 150 - modules/core/calendar.inc.php | 194 - modules/core/core.inc.php | 444 -- modules/core/crypt.inc.php | 333 -- modules/core/database.inc.php | 369 -- modules/core/database_add.inc.php | 236 - modules/core/database_delete.inc.php | 58 - modules/core/database_join_fields.inc.php | 94 - modules/core/database_mass_delete.inc.php | 105 - modules/core/database_search.inc.php | 282 -- modules/core/database_search_form.inc.php | 71 - modules/core/database_search_show.inc.php | 252 - modules/core/database_update.inc.php | 202 - modules/core/database_view.inc.php | 111 - modules/core/easyadmin.inc.php | 345 -- modules/core/email.inc.php | 217 - modules/core/email_piping.inc.php | 269 - modules/core/export.inc.php | 1213 ----- modules/core/file_extensions.inc.php | 66 - modules/core/fpdf.inc.php | 219 - modules/core/ftp.inc.php | 171 - modules/core/graph.inc.php | 405 -- modules/core/helm.inc.php | 219 - modules/core/import.inc.php | 342 -- modules/core/list.inc.php | 518 -- modules/core/list_calendar.inc.php | 77 - modules/core/list_card_type_menu.inc.php | 83 - modules/core/list_check.inc.php | 81 - modules/core/list_currency.inc.php | 72 - modules/core/list_menu_files.inc.php | 87 - modules/core/list_menu_multi.inc.php | 88 - modules/core/list_menu_theme.inc.php | 85 - modules/core/list_radio.inc.php | 57 - modules/core/list_select_groups.inc.php | 180 - modules/core/list_setup_default_date.inc.php | 57 - modules/core/list_staticlist.inc.php | 288 -- modules/core/login.inc.php | 208 - modules/core/method.inc.php | 156 - modules/core/method_ajax.inc.php | 84 - modules/core/post.inc.php | 67 - modules/core/search.inc.php | 617 --- modules/core/service_domain.inc.php | 83 - modules/core/service_group.inc.php | 260 - modules/core/session.inc.php | 409 -- modules/core/setup.inc.php | 169 - modules/core/sort_array.inc.php | 89 - modules/core/ssl.inc.php | 186 - modules/core/static_var.inc.php | 1452 ------ modules/core/theme.inc.php | 204 - modules/core/translate.inc.php | 313 -- modules/core/trigger.inc.php | 57 - modules/core/validate.inc.php | 734 --- modules/core/vars.inc.php | 82 - modules/core/version.inc.php | 71 - modules/core/weblog.inc.php | 226 - modules/core/webmin.inc.php | 228 - modules/core/xml.inc.php | 274 -- modules/module.inc.php | 572 --- themes/default.user_theme | 0 themes/default/IEFrameWarningBypass.htm | 5 - themes/default/blocks/core/add_tr_submit.tpl | 15 - themes/default/blocks/core/alert.tpl | 27 - themes/default/blocks/core/alert_fields.tpl | 26 - themes/default/blocks/core/blank.tpl | 1 - themes/default/blocks/core/bottom_clean.tpl | 2 - themes/default/blocks/core/bottom_print.tpl | 18 - themes/default/blocks/core/debug.tpl | 34 - themes/default/blocks/core/error.tpl | 44 - themes/default/blocks/core/export_search.tpl | 119 - .../blocks/core/export_search_display.tpl | 4 - .../blocks/core/export_search_download.tpl | 4 - themes/default/blocks/core/graph.tpl | 1 - themes/default/blocks/core/graphview.tpl | 1 - themes/default/blocks/core/group.tpl | 3 - themes/default/blocks/core/import.tpl | 87 - themes/default/blocks/core/import2.tpl | 64 - themes/default/blocks/core/import2_new.tpl | 71 - themes/default/blocks/core/import_new.tpl | 56 - themes/default/blocks/core/invalid_page.tpl | 1 - themes/default/blocks/core/language.tpl | 6 - themes/default/blocks/core/logout.tpl | 18 - themes/default/blocks/core/method_error.tpl | 8 - .../default/blocks/core/popup_list_search.tpl | 53 - .../default/blocks/core/recent_searches.tpl | 34 - themes/default/blocks/core/save_search.tpl | 61 - .../default/blocks/core/save_search_done.tpl | 19 - themes/default/blocks/core/saved_searches.tpl | 34 - themes/default/blocks/core/search.tpl | 59 - themes/default/blocks/core/search_iframe.tpl | 54 - themes/default/blocks/core/search_post.tpl | 23 - .../blocks/core/search_show_post-1.tpl | 16 - .../blocks/core/search_show_post-2.tpl | 20 - .../default/blocks/core/search_show_pre.tpl | 34 - .../blocks/core/search_show_tr_record.tpl | 8 - themes/default/blocks/core/sess_renew.tpl | 22 - themes/default/blocks/core/sess_timeout.tpl | 51 - themes/default/blocks/core/top_clean.tpl | 47 - themes/default/blocks/core/url.tpl | 1 - themes/default/blocks/core/user_search.tpl | 4 - .../blocks/core/user_search_show_pre.tpl | 33 - .../core/user_search_show_tr_record.tpl | 4 - themes/default/blocks/core/user_view_pre.tpl | 7 - themes/default/blocks/core/view_post.tpl | 8 - themes/default/blocks/core/view_pre.tpl | 7 - themes/default/blocks/core/view_td_delete.tpl | 4 - themes/default/blocks/core/view_td_submit.tpl | 1 - .../blocks/core/view_tr_submit_delete.tpl | 11 - themes/default/iframe.css | 231 - themes/default/images/logo-big.png | Bin 26666 -> 0 bytes themes/default/images/logo-small.png | Bin 2225 -> 0 bytes themes/default/images/logo.gif | Bin 5213 -> 0 bytes themes/default/style.css | 187 - themes/default/template.tpl | 102 - themes/default/top.js | 124 - themes/default/user_search.js | 262 - themes/default/user_view.js | 68 - 310 files changed, 67791 deletions(-) delete mode 100644 includes/adodb/adodb-csvlib.inc.php delete mode 100644 includes/adodb/adodb-datadict.inc.php delete mode 100644 includes/adodb/adodb-error.inc.php delete mode 100644 includes/adodb/adodb-errorhandler.inc.php delete mode 100644 includes/adodb/adodb-errorpear.inc.php delete mode 100644 includes/adodb/adodb-exceptions.inc.php delete mode 100644 includes/adodb/adodb-iterator.inc.php delete mode 100644 includes/adodb/adodb-lib.inc.php delete mode 100644 includes/adodb/adodb-pager.inc.php delete mode 100644 includes/adodb/adodb-pear.inc.php delete mode 100644 includes/adodb/adodb-perf.inc.php delete mode 100644 includes/adodb/adodb-php4.inc.php delete mode 100644 includes/adodb/adodb-time.inc.php delete mode 100644 includes/adodb/adodb-xmlschema.inc.php delete mode 100644 includes/adodb/adodb-xmlschema03.inc.php delete mode 100644 includes/adodb/adodb.inc.php delete mode 100644 includes/adodb/datadict/datadict-access.inc.php delete mode 100644 includes/adodb/datadict/datadict-db2.inc.php delete mode 100644 includes/adodb/datadict/datadict-firebird.inc.php delete mode 100644 includes/adodb/datadict/datadict-generic.inc.php delete mode 100644 includes/adodb/datadict/datadict-ibase.inc.php delete mode 100644 includes/adodb/datadict/datadict-informix.inc.php delete mode 100644 includes/adodb/datadict/datadict-mssql.inc.php delete mode 100644 includes/adodb/datadict/datadict-mssqlnative.inc.php delete mode 100644 includes/adodb/datadict/datadict-mysql.inc.php delete mode 100644 includes/adodb/datadict/datadict-oci8.inc.php delete mode 100644 includes/adodb/datadict/datadict-postgres.inc.php delete mode 100644 includes/adodb/datadict/datadict-postgres.inc.php.bak delete mode 100644 includes/adodb/datadict/datadict-sapdb.inc.php delete mode 100644 includes/adodb/datadict/datadict-sybase.inc.php delete mode 100644 includes/adodb/drivers/adodb-access.inc.php delete mode 100644 includes/adodb/drivers/adodb-ado.inc.php delete mode 100644 includes/adodb/drivers/adodb-ado5.inc.php delete mode 100644 includes/adodb/drivers/adodb-ado_access.inc.php delete mode 100644 includes/adodb/drivers/adodb-ado_mssql.inc.php delete mode 100644 includes/adodb/drivers/adodb-borland_ibase.inc.php delete mode 100644 includes/adodb/drivers/adodb-csv.inc.php delete mode 100644 includes/adodb/drivers/adodb-db2.inc.php delete mode 100644 includes/adodb/drivers/adodb-fbsql.inc.php delete mode 100644 includes/adodb/drivers/adodb-firebird.inc.php delete mode 100644 includes/adodb/drivers/adodb-ibase.inc.php delete mode 100644 includes/adodb/drivers/adodb-informix.inc.php delete mode 100644 includes/adodb/drivers/adodb-informix72.inc.php delete mode 100644 includes/adodb/drivers/adodb-ldap.inc.php delete mode 100644 includes/adodb/drivers/adodb-mssql.inc.php delete mode 100644 includes/adodb/drivers/adodb-mssql_n.inc.php delete mode 100644 includes/adodb/drivers/adodb-mssqlnative.inc.php delete mode 100644 includes/adodb/drivers/adodb-mssqlpo.inc.php delete mode 100644 includes/adodb/drivers/adodb-mysql.inc.php delete mode 100644 includes/adodb/drivers/adodb-mysqli.inc.php delete mode 100644 includes/adodb/drivers/adodb-mysqlpo.inc.php delete mode 100644 includes/adodb/drivers/adodb-mysqlt.inc.php delete mode 100644 includes/adodb/drivers/adodb-netezza.inc.php delete mode 100644 includes/adodb/drivers/adodb-oci8.inc.php delete mode 100644 includes/adodb/drivers/adodb-oci8.old.inc.php delete mode 100644 includes/adodb/drivers/adodb-oci805.inc.php delete mode 100644 includes/adodb/drivers/adodb-oci8po.inc.php delete mode 100644 includes/adodb/drivers/adodb-odbc.inc.php delete mode 100644 includes/adodb/drivers/adodb-odbc_db2.inc.php delete mode 100644 includes/adodb/drivers/adodb-odbc_mssql.inc.php delete mode 100644 includes/adodb/drivers/adodb-odbc_oracle.inc.php delete mode 100644 includes/adodb/drivers/adodb-odbtp.inc.php delete mode 100644 includes/adodb/drivers/adodb-odbtp_unicode.inc.php delete mode 100644 includes/adodb/drivers/adodb-oracle.inc.php delete mode 100644 includes/adodb/drivers/adodb-pdo.inc.php delete mode 100644 includes/adodb/drivers/adodb-pdo_mssql.inc.php delete mode 100644 includes/adodb/drivers/adodb-pdo_mysql.inc.php delete mode 100644 includes/adodb/drivers/adodb-pdo_oci.inc.php delete mode 100644 includes/adodb/drivers/adodb-pdo_pgsql.inc.php delete mode 100644 includes/adodb/drivers/adodb-pdo_sqlite.inc.php delete mode 100644 includes/adodb/drivers/adodb-postgres.inc.php delete mode 100644 includes/adodb/drivers/adodb-postgres64.inc.php delete mode 100644 includes/adodb/drivers/adodb-postgres7.inc.php delete mode 100644 includes/adodb/drivers/adodb-postgres8.inc.php delete mode 100644 includes/adodb/drivers/adodb-proxy.inc.php delete mode 100644 includes/adodb/drivers/adodb-sapdb.inc.php delete mode 100644 includes/adodb/drivers/adodb-sqlanywhere.inc.php delete mode 100644 includes/adodb/drivers/adodb-sqlite.inc.php delete mode 100644 includes/adodb/drivers/adodb-sqlitepo.inc.php delete mode 100644 includes/adodb/drivers/adodb-sybase.inc.php delete mode 100644 includes/adodb/drivers/adodb-sybase_ase.inc.php delete mode 100644 includes/adodb/drivers/adodb-vfp.inc.php delete mode 100644 includes/adodb/lang/adodb-ar.inc.php delete mode 100644 includes/adodb/lang/adodb-bg.inc.php delete mode 100644 includes/adodb/lang/adodb-bgutf8.inc.php delete mode 100644 includes/adodb/lang/adodb-ca.inc.php delete mode 100644 includes/adodb/lang/adodb-cn.inc.php delete mode 100644 includes/adodb/lang/adodb-cz.inc.php delete mode 100644 includes/adodb/lang/adodb-da.inc.php delete mode 100644 includes/adodb/lang/adodb-de.inc.php delete mode 100644 includes/adodb/lang/adodb-en.inc.php delete mode 100644 includes/adodb/lang/adodb-es.inc.php delete mode 100644 includes/adodb/lang/adodb-esperanto.inc.php delete mode 100644 includes/adodb/lang/adodb-fa.inc.php delete mode 100644 includes/adodb/lang/adodb-fr.inc.php delete mode 100644 includes/adodb/lang/adodb-hu.inc.php delete mode 100644 includes/adodb/lang/adodb-it.inc.php delete mode 100644 includes/adodb/lang/adodb-nl.inc.php delete mode 100644 includes/adodb/lang/adodb-pl.inc.php delete mode 100644 includes/adodb/lang/adodb-pt-br.inc.php delete mode 100644 includes/adodb/lang/adodb-ro.inc.php delete mode 100644 includes/adodb/lang/adodb-ru1251.inc.php delete mode 100644 includes/adodb/lang/adodb-sv.inc.php delete mode 100644 includes/adodb/lang/adodb-uk1251.inc.php delete mode 100644 includes/adodb/lang/adodb_th.inc.php delete mode 100644 includes/adodb/license.txt delete mode 100644 includes/adodb/pear/Auth/Container/ADOdb.php delete mode 100644 includes/adodb/pear/readme.Auth.txt delete mode 100644 includes/adodb/pivottable.inc.php delete mode 100644 includes/adodb/readme.txt delete mode 100644 includes/adodb/rsfilter.inc.php delete mode 100644 includes/adodb/server.php delete mode 100644 includes/adodb/toexport.inc.php delete mode 100644 includes/smarty/Config_File.class.php delete mode 100644 includes/smarty/Smarty.class.php delete mode 100644 includes/smarty/Smarty_Compiler.class.php delete mode 100644 includes/smarty/debug.tpl delete mode 100644 includes/smarty/internals/core.assemble_plugin_filepath.php delete mode 100644 includes/smarty/internals/core.assign_smarty_interface.php delete mode 100644 includes/smarty/internals/core.create_dir_structure.php delete mode 100644 includes/smarty/internals/core.display_debug_console.php delete mode 100644 includes/smarty/internals/core.get_include_path.php delete mode 100644 includes/smarty/internals/core.get_microtime.php delete mode 100644 includes/smarty/internals/core.get_php_resource.php delete mode 100644 includes/smarty/internals/core.is_secure.php delete mode 100644 includes/smarty/internals/core.is_trusted.php delete mode 100644 includes/smarty/internals/core.load_plugins.php delete mode 100644 includes/smarty/internals/core.load_resource_plugin.php delete mode 100644 includes/smarty/internals/core.process_cached_inserts.php delete mode 100644 includes/smarty/internals/core.process_compiled_include.php delete mode 100644 includes/smarty/internals/core.read_cache_file.php delete mode 100644 includes/smarty/internals/core.rm_auto.php delete mode 100644 includes/smarty/internals/core.rmdir.php delete mode 100644 includes/smarty/internals/core.run_insert_handler.php delete mode 100644 includes/smarty/internals/core.smarty_include_php.php delete mode 100644 includes/smarty/internals/core.write_cache_file.php delete mode 100644 includes/smarty/internals/core.write_compiled_include.php delete mode 100644 includes/smarty/internals/core.write_compiled_resource.php delete mode 100644 includes/smarty/internals/core.write_file.php delete mode 100644 includes/smarty/plugins/block.t.php delete mode 100644 includes/smarty/plugins/block.textformat.php delete mode 100644 includes/smarty/plugins/block.translate.php delete mode 100644 includes/smarty/plugins/compiler.assign.php delete mode 100644 includes/smarty/plugins/function.assign_debug_info.php delete mode 100644 includes/smarty/plugins/function.config_load.php delete mode 100644 includes/smarty/plugins/function.counter.php delete mode 100644 includes/smarty/plugins/function.cycle.php delete mode 100644 includes/smarty/plugins/function.debug.php delete mode 100644 includes/smarty/plugins/function.eval.php delete mode 100644 includes/smarty/plugins/function.fetch.php delete mode 100644 includes/smarty/plugins/function.grid_paginate.php delete mode 100644 includes/smarty/plugins/function.html_checkboxes.php delete mode 100644 includes/smarty/plugins/function.html_image.php delete mode 100644 includes/smarty/plugins/function.html_options.php delete mode 100644 includes/smarty/plugins/function.html_radios.php delete mode 100644 includes/smarty/plugins/function.html_select_date.php delete mode 100644 includes/smarty/plugins/function.html_select_time.php delete mode 100644 includes/smarty/plugins/function.html_table.php delete mode 100644 includes/smarty/plugins/function.html_textarea.php delete mode 100644 includes/smarty/plugins/function.mailto.php delete mode 100644 includes/smarty/plugins/function.math.php delete mode 100644 includes/smarty/plugins/function.osb.php delete mode 100644 includes/smarty/plugins/function.popup.php delete mode 100644 includes/smarty/plugins/function.popup_init.php delete mode 100644 includes/smarty/plugins/function.voip_did.php delete mode 100644 includes/smarty/plugins/function.voip_did_id.php delete mode 100644 includes/smarty/plugins/modifier.bool.php delete mode 100644 includes/smarty/plugins/modifier.capitalize.php delete mode 100644 includes/smarty/plugins/modifier.cat.php delete mode 100644 includes/smarty/plugins/modifier.count_characters.php delete mode 100644 includes/smarty/plugins/modifier.count_paragraphs.php delete mode 100644 includes/smarty/plugins/modifier.count_sentences.php delete mode 100644 includes/smarty/plugins/modifier.count_words.php delete mode 100644 includes/smarty/plugins/modifier.date_format.php delete mode 100644 includes/smarty/plugins/modifier.debug_print_var.php delete mode 100644 includes/smarty/plugins/modifier.default.php delete mode 100644 includes/smarty/plugins/modifier.escape.php delete mode 100644 includes/smarty/plugins/modifier.indent.php delete mode 100644 includes/smarty/plugins/modifier.lower.php delete mode 100644 includes/smarty/plugins/modifier.nl2br.php delete mode 100644 includes/smarty/plugins/modifier.regex_replace.php delete mode 100644 includes/smarty/plugins/modifier.replace.php delete mode 100644 includes/smarty/plugins/modifier.spacify.php delete mode 100644 includes/smarty/plugins/modifier.string_format.php delete mode 100644 includes/smarty/plugins/modifier.strip.php delete mode 100644 includes/smarty/plugins/modifier.strip_tags.php delete mode 100644 includes/smarty/plugins/modifier.truncate.php delete mode 100644 includes/smarty/plugins/modifier.upper.php delete mode 100644 includes/smarty/plugins/modifier.wordwrap.php delete mode 100644 includes/smarty/plugins/outputfilter.trimwhitespace.php delete mode 100644 includes/smarty/plugins/shared.escape_special_chars.php delete mode 100644 includes/smarty/plugins/shared.make_timestamp.php delete mode 100755 includes/smarty/tsmarty2c.php delete mode 100644 modules/core/auth.inc.php delete mode 100644 modules/core/auth_generate_admin_menu.inc.php delete mode 100644 modules/core/calendar.inc.php delete mode 100644 modules/core/core.inc.php delete mode 100644 modules/core/crypt.inc.php delete mode 100644 modules/core/database.inc.php delete mode 100644 modules/core/database_add.inc.php delete mode 100644 modules/core/database_delete.inc.php delete mode 100644 modules/core/database_join_fields.inc.php delete mode 100644 modules/core/database_mass_delete.inc.php delete mode 100644 modules/core/database_search.inc.php delete mode 100644 modules/core/database_search_form.inc.php delete mode 100644 modules/core/database_search_show.inc.php delete mode 100644 modules/core/database_update.inc.php delete mode 100644 modules/core/database_view.inc.php delete mode 100644 modules/core/easyadmin.inc.php delete mode 100644 modules/core/email.inc.php delete mode 100644 modules/core/email_piping.inc.php delete mode 100644 modules/core/export.inc.php delete mode 100644 modules/core/file_extensions.inc.php delete mode 100644 modules/core/fpdf.inc.php delete mode 100644 modules/core/ftp.inc.php delete mode 100644 modules/core/graph.inc.php delete mode 100644 modules/core/helm.inc.php delete mode 100644 modules/core/import.inc.php delete mode 100644 modules/core/list.inc.php delete mode 100644 modules/core/list_calendar.inc.php delete mode 100644 modules/core/list_card_type_menu.inc.php delete mode 100644 modules/core/list_check.inc.php delete mode 100644 modules/core/list_currency.inc.php delete mode 100644 modules/core/list_menu_files.inc.php delete mode 100644 modules/core/list_menu_multi.inc.php delete mode 100644 modules/core/list_menu_theme.inc.php delete mode 100644 modules/core/list_radio.inc.php delete mode 100644 modules/core/list_select_groups.inc.php delete mode 100644 modules/core/list_setup_default_date.inc.php delete mode 100644 modules/core/list_staticlist.inc.php delete mode 100644 modules/core/login.inc.php delete mode 100644 modules/core/method.inc.php delete mode 100644 modules/core/method_ajax.inc.php delete mode 100644 modules/core/post.inc.php delete mode 100644 modules/core/search.inc.php delete mode 100644 modules/core/service_domain.inc.php delete mode 100644 modules/core/service_group.inc.php delete mode 100644 modules/core/session.inc.php delete mode 100644 modules/core/setup.inc.php delete mode 100644 modules/core/sort_array.inc.php delete mode 100644 modules/core/ssl.inc.php delete mode 100644 modules/core/static_var.inc.php delete mode 100644 modules/core/theme.inc.php delete mode 100644 modules/core/translate.inc.php delete mode 100644 modules/core/trigger.inc.php delete mode 100644 modules/core/validate.inc.php delete mode 100644 modules/core/vars.inc.php delete mode 100644 modules/core/version.inc.php delete mode 100644 modules/core/weblog.inc.php delete mode 100644 modules/core/webmin.inc.php delete mode 100644 modules/core/xml.inc.php delete mode 100644 modules/module.inc.php delete mode 100644 themes/default.user_theme delete mode 100644 themes/default/IEFrameWarningBypass.htm delete mode 100644 themes/default/blocks/core/add_tr_submit.tpl delete mode 100644 themes/default/blocks/core/alert.tpl delete mode 100644 themes/default/blocks/core/alert_fields.tpl delete mode 100644 themes/default/blocks/core/blank.tpl delete mode 100644 themes/default/blocks/core/bottom_clean.tpl delete mode 100644 themes/default/blocks/core/bottom_print.tpl delete mode 100644 themes/default/blocks/core/debug.tpl delete mode 100644 themes/default/blocks/core/error.tpl delete mode 100644 themes/default/blocks/core/export_search.tpl delete mode 100644 themes/default/blocks/core/export_search_display.tpl delete mode 100644 themes/default/blocks/core/export_search_download.tpl delete mode 100644 themes/default/blocks/core/graph.tpl delete mode 100644 themes/default/blocks/core/graphview.tpl delete mode 100644 themes/default/blocks/core/group.tpl delete mode 100644 themes/default/blocks/core/import.tpl delete mode 100644 themes/default/blocks/core/import2.tpl delete mode 100644 themes/default/blocks/core/import2_new.tpl delete mode 100644 themes/default/blocks/core/import_new.tpl delete mode 100644 themes/default/blocks/core/invalid_page.tpl delete mode 100644 themes/default/blocks/core/language.tpl delete mode 100644 themes/default/blocks/core/logout.tpl delete mode 100644 themes/default/blocks/core/method_error.tpl delete mode 100644 themes/default/blocks/core/popup_list_search.tpl delete mode 100644 themes/default/blocks/core/recent_searches.tpl delete mode 100644 themes/default/blocks/core/save_search.tpl delete mode 100644 themes/default/blocks/core/save_search_done.tpl delete mode 100644 themes/default/blocks/core/saved_searches.tpl delete mode 100644 themes/default/blocks/core/search.tpl delete mode 100644 themes/default/blocks/core/search_iframe.tpl delete mode 100644 themes/default/blocks/core/search_post.tpl delete mode 100644 themes/default/blocks/core/search_show_post-1.tpl delete mode 100644 themes/default/blocks/core/search_show_post-2.tpl delete mode 100644 themes/default/blocks/core/search_show_pre.tpl delete mode 100644 themes/default/blocks/core/search_show_tr_record.tpl delete mode 100644 themes/default/blocks/core/sess_renew.tpl delete mode 100644 themes/default/blocks/core/sess_timeout.tpl delete mode 100644 themes/default/blocks/core/top_clean.tpl delete mode 100644 themes/default/blocks/core/url.tpl delete mode 100644 themes/default/blocks/core/user_search.tpl delete mode 100644 themes/default/blocks/core/user_search_show_pre.tpl delete mode 100644 themes/default/blocks/core/user_search_show_tr_record.tpl delete mode 100644 themes/default/blocks/core/user_view_pre.tpl delete mode 100644 themes/default/blocks/core/view_post.tpl delete mode 100644 themes/default/blocks/core/view_pre.tpl delete mode 100644 themes/default/blocks/core/view_td_delete.tpl delete mode 100644 themes/default/blocks/core/view_td_submit.tpl delete mode 100644 themes/default/blocks/core/view_tr_submit_delete.tpl delete mode 100644 themes/default/iframe.css delete mode 100644 themes/default/images/logo-big.png delete mode 100644 themes/default/images/logo-small.png delete mode 100644 themes/default/images/logo.gif delete mode 100644 themes/default/style.css delete mode 100644 themes/default/template.tpl delete mode 100644 themes/default/top.js delete mode 100644 themes/default/user_search.js delete mode 100644 themes/default/user_view.js diff --git a/includes/adodb/adodb-csvlib.inc.php b/includes/adodb/adodb-csvlib.inc.php deleted file mode 100644 index 86d9af84..00000000 --- a/includes/adodb/adodb-csvlib.inc.php +++ /dev/null @@ -1,317 +0,0 @@ -FieldCount() : 0; - - if ($sql) $sql = urlencode($sql); - // metadata setup - - if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete - if (is_object($conn)) { - $sql .= ','.$conn->Affected_Rows(); - $sql .= ','.$conn->Insert_ID(); - } else - $sql .= ',,'; - - $text = "====-1,0,$sql\n"; - return $text; - } - $tt = ($rs->timeCreated) ? $rs->timeCreated : time(); - - ## changed format from ====0 to ====1 - $line = "====1,$tt,$sql\n"; - - if ($rs->databaseType == 'array') { - $rows = $rs->_array; - } else { - $rows = array(); - while (!$rs->EOF) { - $rows[] = $rs->fields; - $rs->MoveNext(); - } - } - - for($i=0; $i < $max; $i++) { - $o = $rs->FetchField($i); - $flds[] = $o; - } - - $savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode; - $class = $rs->connection->arrayClass; - $rs2 = new $class(); - $rs2->sql = $rs->sql; - $rs2->oldProvider = $rs->dataProvider; - $rs2->InitArrayFields($rows,$flds); - $rs2->fetchMode = $savefetch; - return $line.serialize($rs2); - } - - -/** -* Open CSV file and convert it into Data. -* -* @param url file/ftp/http url -* @param err returns the error message -* @param timeout dispose if recordset has been alive for $timeout secs -* -* @return recordset, or false if error occured. If no -* error occurred in sql INSERT/UPDATE/DELETE, -* empty recordset is returned -*/ - function csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') - { - $false = false; - $err = false; - $fp = @fopen($url,'rb'); - if (!$fp) { - $err = $url.' file/URL not found'; - return $false; - } - @flock($fp, LOCK_SH); - $arr = array(); - $ttl = 0; - - if ($meta = fgetcsv($fp, 32000, ",")) { - // check if error message - if (strncmp($meta[0],'****',4) === 0) { - $err = trim(substr($meta[0],4,1024)); - fclose($fp); - return $false; - } - // check for meta data - // $meta[0] is -1 means return an empty recordset - // $meta[1] contains a time - - if (strncmp($meta[0], '====',4) === 0) { - - if ($meta[0] == "====-1") { - if (sizeof($meta) < 5) { - $err = "Corrupt first line for format -1"; - fclose($fp); - return $false; - } - fclose($fp); - - if ($timeout > 0) { - $err = " Illegal Timeout $timeout "; - return $false; - } - - $rs = new $rsclass($val=true); - $rs->fields = array(); - $rs->timeCreated = $meta[1]; - $rs->EOF = true; - $rs->_numOfFields = 0; - $rs->sql = urldecode($meta[2]); - $rs->affectedrows = (integer)$meta[3]; - $rs->insertid = $meta[4]; - return $rs; - } - # Under high volume loads, we want only 1 thread/process to _write_file - # so that we don't have 50 processes queueing to write the same data. - # We use probabilistic timeout, ahead of time. - # - # -4 sec before timeout, give processes 1/32 chance of timing out - # -2 sec before timeout, give processes 1/16 chance of timing out - # -1 sec after timeout give processes 1/4 chance of timing out - # +0 sec after timeout, give processes 100% chance of timing out - if (sizeof($meta) > 1) { - if($timeout >0){ - $tdiff = (integer)( $meta[1]+$timeout - time()); - if ($tdiff <= 2) { - switch($tdiff) { - case 4: - case 3: - if ((rand() & 31) == 0) { - fclose($fp); - $err = "Timeout 3"; - return $false; - } - break; - case 2: - if ((rand() & 15) == 0) { - fclose($fp); - $err = "Timeout 2"; - return $false; - } - break; - case 1: - if ((rand() & 3) == 0) { - fclose($fp); - $err = "Timeout 1"; - return $false; - } - break; - default: - fclose($fp); - $err = "Timeout 0"; - return $false; - } // switch - - } // if check flush cache - }// (timeout>0) - $ttl = $meta[1]; - } - //================================================ - // new cache format - use serialize extensively... - if ($meta[0] === '====1') { - // slurp in the data - $MAXSIZE = 128000; - - $text = fread($fp,$MAXSIZE); - if (strlen($text)) { - while ($txt = fread($fp,$MAXSIZE)) { - $text .= $txt; - } - } - fclose($fp); - $rs = unserialize($text); - if (is_object($rs)) $rs->timeCreated = $ttl; - else { - $err = "Unable to unserialize recordset"; - //echo htmlspecialchars($text),' !--END--!

'; - } - return $rs; - } - - $meta = false; - $meta = fgetcsv($fp, 32000, ","); - if (!$meta) { - fclose($fp); - $err = "Unexpected EOF 1"; - return $false; - } - } - - // Get Column definitions - $flds = array(); - foreach($meta as $o) { - $o2 = explode(':',$o); - if (sizeof($o2)!=3) { - $arr[] = $meta; - $flds = false; - break; - } - $fld = new ADOFieldObject(); - $fld->name = urldecode($o2[0]); - $fld->type = $o2[1]; - $fld->max_length = $o2[2]; - $flds[] = $fld; - } - } else { - fclose($fp); - $err = "Recordset had unexpected EOF 2"; - return $false; - } - - // slurp in the data - $MAXSIZE = 128000; - - $text = ''; - while ($txt = fread($fp,$MAXSIZE)) { - $text .= $txt; - } - - fclose($fp); - @$arr = unserialize($text); - //var_dump($arr); - if (!is_array($arr)) { - $err = "Recordset had unexpected EOF (in serialized recordset)"; - if (get_magic_quotes_runtime()) $err .= ". Magic Quotes Runtime should be disabled!"; - return $false; - } - $rs = new $rsclass(); - $rs->timeCreated = $ttl; - $rs->InitArrayFields($arr,$flds); - return $rs; - } - - - /** - * Save a file $filename and its $contents (normally for caching) with file locking - * Returns true if ok, false if fopen/fwrite error, 0 if rename error (eg. file is locked) - */ - function adodb_write_file($filename, $contents,$debug=false) - { - # http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows - # So to simulate locking, we assume that rename is an atomic operation. - # First we delete $filename, then we create a $tempfile write to it and - # rename to the desired $filename. If the rename works, then we successfully - # modified the file exclusively. - # What a stupid need - having to simulate locking. - # Risks: - # 1. $tempfile name is not unique -- very very low - # 2. unlink($filename) fails -- ok, rename will fail - # 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs - # 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and cache updated - if (strncmp(PHP_OS,'WIN',3) === 0) { - // skip the decimal place - $mtime = substr(str_replace(' ','_',microtime()),2); - // getmypid() actually returns 0 on Win98 - never mind! - $tmpname = $filename.uniqid($mtime).getmypid(); - if (!($fd = @fopen($tmpname,'w'))) return false; - if (fwrite($fd,$contents)) $ok = true; - else $ok = false; - fclose($fd); - - if ($ok) { - @chmod($tmpname,0644); - // the tricky moment - @unlink($filename); - if (!@rename($tmpname,$filename)) { - unlink($tmpname); - $ok = 0; - } - if (!$ok) { - if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed')); - } - } - return $ok; - } - if (!($fd = @fopen($filename, 'a'))) return false; - if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) { - if (fwrite( $fd, $contents )) $ok = true; - else $ok = false; - fclose($fd); - @chmod($filename,0644); - }else { - fclose($fd); - if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename
\n"); - $ok = false; - } - - return $ok; - } -?> \ No newline at end of file diff --git a/includes/adodb/adodb-datadict.inc.php b/includes/adodb/adodb-datadict.inc.php deleted file mode 100644 index 88b1f83d..00000000 --- a/includes/adodb/adodb-datadict.inc.php +++ /dev/null @@ -1,1001 +0,0 @@ -$str

"; -$a= Lens_ParseArgs($str); -print "
";
-print_r($a);
-print "
"; -} - - -if (!function_exists('ctype_alnum')) { - function ctype_alnum($text) { - return preg_match('/^[a-z0-9]*$/i', $text); - } -} - -//Lens_ParseTest(); - -/** - Parse arguments, treat "text" (text) and 'text' as quotation marks. - To escape, use "" or '' or )) - - Will read in "abc def" sans quotes, as: abc def - Same with 'abc def'. - However if `abc def`, then will read in as `abc def` - - @param endstmtchar Character that indicates end of statement - @param tokenchars Include the following characters in tokens apart from A-Z and 0-9 - @returns 2 dimensional array containing parsed tokens. -*/ -function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') -{ - $pos = 0; - $intoken = false; - $stmtno = 0; - $endquote = false; - $tokens = array(); - $tokens[$stmtno] = array(); - $max = strlen($args); - $quoted = false; - $tokarr = array(); - - while ($pos < $max) { - $ch = substr($args,$pos,1); - switch($ch) { - case ' ': - case "\t": - case "\n": - case "\r": - if (!$quoted) { - if ($intoken) { - $intoken = false; - $tokens[$stmtno][] = implode('',$tokarr); - } - break; - } - - $tokarr[] = $ch; - break; - - case '`': - if ($intoken) $tokarr[] = $ch; - case '(': - case ')': - case '"': - case "'": - - if ($intoken) { - if (empty($endquote)) { - $tokens[$stmtno][] = implode('',$tokarr); - if ($ch == '(') $endquote = ')'; - else $endquote = $ch; - $quoted = true; - $intoken = true; - $tokarr = array(); - } else if ($endquote == $ch) { - $ch2 = substr($args,$pos+1,1); - if ($ch2 == $endquote) { - $pos += 1; - $tokarr[] = $ch2; - } else { - $quoted = false; - $intoken = false; - $tokens[$stmtno][] = implode('',$tokarr); - $endquote = ''; - } - } else - $tokarr[] = $ch; - - }else { - - if ($ch == '(') $endquote = ')'; - else $endquote = $ch; - $quoted = true; - $intoken = true; - $tokarr = array(); - if ($ch == '`') $tokarr[] = '`'; - } - break; - - default: - - if (!$intoken) { - if ($ch == $endstmtchar) { - $stmtno += 1; - $tokens[$stmtno] = array(); - break; - } - - $intoken = true; - $quoted = false; - $endquote = false; - $tokarr = array(); - - } - - if ($quoted) $tokarr[] = $ch; - else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch; - else { - if ($ch == $endstmtchar) { - $tokens[$stmtno][] = implode('',$tokarr); - $stmtno += 1; - $tokens[$stmtno] = array(); - $intoken = false; - $tokarr = array(); - break; - } - $tokens[$stmtno][] = implode('',$tokarr); - $tokens[$stmtno][] = $ch; - $intoken = false; - } - } - $pos += 1; - } - if ($intoken) $tokens[$stmtno][] = implode('',$tokarr); - - return $tokens; -} - - -class ADODB_DataDict { - var $connection; - var $debug = false; - var $dropTable = 'DROP TABLE %s'; - var $renameTable = 'RENAME TABLE %s TO %s'; - var $dropIndex = 'DROP INDEX %s'; - var $addCol = ' ADD'; - var $alterCol = ' ALTER COLUMN'; - var $dropCol = ' DROP COLUMN'; - var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s'; // table, old-column, new-column, column-definitions (not used by default) - var $nameRegex = '\w'; - var $nameRegexBrackets = 'a-zA-Z0-9_\(\)'; - var $schema = false; - var $serverInfo = array(); - var $autoIncrement = false; - var $dataProvider; - var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql - var $blobSize = 100; /// any varchar/char field this size or greater is treated as a blob - /// in other words, we use a text area for editting. - - function GetCommentSQL($table,$col) - { - return false; - } - - function SetCommentSQL($table,$col,$cmt) - { - return false; - } - - function MetaTables() - { - if (!$this->connection->IsConnected()) return array(); - return $this->connection->MetaTables(); - } - - function MetaColumns($tab, $upper=true, $schema=false) - { - if (!$this->connection->IsConnected()) return array(); - return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema); - } - - function MetaPrimaryKeys($tab,$owner=false,$intkey=false) - { - if (!$this->connection->IsConnected()) return array(); - return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey); - } - - function MetaIndexes($table, $primary = false, $owner = false) - { - if (!$this->connection->IsConnected()) return array(); - return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner); - } - - function MetaType($t,$len=-1,$fieldobj=false) - { - static $typeMap = array( - 'VARCHAR' => 'C', - 'VARCHAR2' => 'C', - 'CHAR' => 'C', - 'C' => 'C', - 'STRING' => 'C', - 'NCHAR' => 'C', - 'NVARCHAR' => 'C', - 'VARYING' => 'C', - 'BPCHAR' => 'C', - 'CHARACTER' => 'C', - 'INTERVAL' => 'C', # Postgres - 'MACADDR' => 'C', # postgres - 'VAR_STRING' => 'C', # mysql - ## - 'LONGCHAR' => 'X', - 'TEXT' => 'X', - 'NTEXT' => 'X', - 'M' => 'X', - 'X' => 'X', - 'CLOB' => 'X', - 'NCLOB' => 'X', - 'LVARCHAR' => 'X', - ## - 'BLOB' => 'B', - 'IMAGE' => 'B', - 'BINARY' => 'B', - 'VARBINARY' => 'B', - 'LONGBINARY' => 'B', - 'B' => 'B', - ## - 'YEAR' => 'D', // mysql - 'DATE' => 'D', - 'D' => 'D', - ## - 'UNIQUEIDENTIFIER' => 'C', # MS SQL Server - ## - 'TIME' => 'T', - 'TIMESTAMP' => 'T', - 'DATETIME' => 'T', - 'TIMESTAMPTZ' => 'T', - 'SMALLDATETIME' => 'T', - 'T' => 'T', - 'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql - ## - 'BOOL' => 'L', - 'BOOLEAN' => 'L', - 'BIT' => 'L', - 'L' => 'L', - ## - 'COUNTER' => 'R', - 'R' => 'R', - 'SERIAL' => 'R', // ifx - 'INT IDENTITY' => 'R', - ## - 'INT' => 'I', - 'INT2' => 'I', - 'INT4' => 'I', - 'INT8' => 'I', - 'INTEGER' => 'I', - 'INTEGER UNSIGNED' => 'I', - 'SHORT' => 'I', - 'TINYINT' => 'I', - 'SMALLINT' => 'I', - 'I' => 'I', - ## - 'LONG' => 'N', // interbase is numeric, oci8 is blob - 'BIGINT' => 'N', // this is bigger than PHP 32-bit integers - 'DECIMAL' => 'N', - 'DEC' => 'N', - 'REAL' => 'N', - 'DOUBLE' => 'N', - 'DOUBLE PRECISION' => 'N', - 'SMALLFLOAT' => 'N', - 'FLOAT' => 'N', - 'NUMBER' => 'N', - 'NUM' => 'N', - 'NUMERIC' => 'N', - 'MONEY' => 'N', - - ## informix 9.2 - 'SQLINT' => 'I', - 'SQLSERIAL' => 'I', - 'SQLSMINT' => 'I', - 'SQLSMFLOAT' => 'N', - 'SQLFLOAT' => 'N', - 'SQLMONEY' => 'N', - 'SQLDECIMAL' => 'N', - 'SQLDATE' => 'D', - 'SQLVCHAR' => 'C', - 'SQLCHAR' => 'C', - 'SQLDTIME' => 'T', - 'SQLINTERVAL' => 'N', - 'SQLBYTES' => 'B', - 'SQLTEXT' => 'X', - ## informix 10 - "SQLINT8" => 'I8', - "SQLSERIAL8" => 'I8', - "SQLNCHAR" => 'C', - "SQLNVCHAR" => 'C', - "SQLLVARCHAR" => 'X', - "SQLBOOL" => 'L' - ); - - if (!$this->connection->IsConnected()) { - $t = strtoupper($t); - if (isset($typeMap[$t])) return $typeMap[$t]; - return 'N'; - } - return $this->connection->MetaType($t,$len,$fieldobj); - } - - function NameQuote($name = NULL,$allowBrackets=false) - { - if (!is_string($name)) { - return FALSE; - } - - $name = trim($name); - - if ( !is_object($this->connection) ) { - return $name; - } - - $quote = $this->connection->nameQuote; - - // if name is of the form `name`, quote it - if ( preg_match('/^`(.+)`$/', $name, $matches) ) { - return $quote . $matches[1] . $quote; - } - - // if name contains special characters, quote it - $regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex; - - if ( !preg_match('/^[' . $regex . ']+$/', $name) ) { - return $quote . $name . $quote; - } - - return $name; - } - - function TableName($name) - { - if ( $this->schema ) { - return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name); - } - return $this->NameQuote($name); - } - - // Executes the sql array returned by GetTableSQL and GetIndexSQL - function ExecuteSQLArray($sql, $continueOnError = true) - { - $rez = 2; - $conn = $this->connection; - $saved = $conn->debug; - foreach($sql as $line) { - - if ($this->debug) $conn->debug = true; - $ok = $conn->Execute($line); - $conn->debug = $saved; - if (!$ok) { - if ($this->debug) ADOConnection::outp($conn->ErrorMsg()); - if (!$continueOnError) return 0; - $rez = 1; - } - } - return $rez; - } - - /** - Returns the actual type given a character code. - - C: varchar - X: CLOB (character large object) or largest varchar size if CLOB is not supported - C2: Multibyte varchar - X2: Multibyte CLOB - - B: BLOB (binary large object) - - D: Date - T: Date-time - L: Integer field suitable for storing booleans (0 or 1) - I: Integer - F: Floating point number - N: Numeric or decimal number - */ - - function ActualType($meta) - { - return $meta; - } - - function CreateDatabase($dbname,$options=false) - { - $options = $this->_Options($options); - $sql = array(); - - $s = 'CREATE DATABASE ' . $this->NameQuote($dbname); - if (isset($options[$this->upperName])) - $s .= ' '.$options[$this->upperName]; - - $sql[] = $s; - return $sql; - } - - /* - Generates the SQL to create index. Returns an array of sql strings. - */ - function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false) - { - if (!is_array($flds)) { - $flds = explode(',',$flds); - } - - foreach($flds as $key => $fld) { - # some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32) - $flds[$key] = $this->NameQuote($fld,$allowBrackets=true); - } - - return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions)); - } - - function DropIndexSQL ($idxname, $tabname = NULL) - { - return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname))); - } - - function SetSchema($schema) - { - $this->schema = $schema; - } - - function AddColumnSQL($tabname, $flds) - { - $tabname = $this->TableName ($tabname); - $sql = array(); - list($lines,$pkey,$idxs) = $this->_GenFields($flds); - // genfields can return FALSE at times - if ($lines == null) $lines = array(); - $alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' '; - foreach($lines as $v) { - $sql[] = $alter . $v; - } - if (is_array($idxs)) { - foreach($idxs as $idx => $idxdef) { - $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); - $sql = array_merge($sql, $sql_idxs); - } - } - return $sql; - } - - /** - * Change the definition of one column - * - * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table, - * to allow, recreating the table and copying the content over to the new table - * @param string $tabname table-name - * @param string $flds column-name and type for the changed column - * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default '' - * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default '' - * @return array with SQL strings - */ - function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') - { - $tabname = $this->TableName ($tabname); - $sql = array(); - list($lines,$pkey,$idxs) = $this->_GenFields($flds); - // genfields can return FALSE at times - if ($lines == null) $lines = array(); - $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' '; - foreach($lines as $v) { - $sql[] = $alter . $v; - } - if (is_array($idxs)) { - foreach($idxs as $idx => $idxdef) { - $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); - $sql = array_merge($sql, $sql_idxs); - } - - } - return $sql; - } - - /** - * Rename one column - * - * Some DBM's can only do this together with changeing the type of the column (even if that stays the same, eg. mysql) - * @param string $tabname table-name - * @param string $oldcolumn column-name to be renamed - * @param string $newcolumn new column-name - * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default='' - * @return array with SQL strings - */ - function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='') - { - $tabname = $this->TableName ($tabname); - if ($flds) { - list($lines,$pkey,$idxs) = $this->_GenFields($flds); - // genfields can return FALSE at times - if ($lines == null) $lines = array(); - list(,$first) = each($lines); - list(,$column_def) = split("[\t ]+",$first,2); - } - return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def)); - } - - /** - * Drop one column - * - * Some DBM's can't do that on there own, you need to supply the complete defintion of the new table, - * to allow, recreating the table and copying the content over to the new table - * @param string $tabname table-name - * @param string $flds column-name and type for the changed column - * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default '' - * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default '' - * @return array with SQL strings - */ - function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') - { - $tabname = $this->TableName ($tabname); - if (!is_array($flds)) $flds = explode(',',$flds); - $sql = array(); - $alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' '; - foreach($flds as $v) { - $sql[] = $alter . $this->NameQuote($v); - } - return $sql; - } - - function DropTableSQL($tabname) - { - return array (sprintf($this->dropTable, $this->TableName($tabname))); - } - - function RenameTableSQL($tabname,$newname) - { - return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname))); - } - - /** - Generate the SQL to create table. Returns an array of sql strings. - */ - function CreateTableSQL($tabname, $flds, $tableoptions=array()) - { - list($lines,$pkey,$idxs) = $this->_GenFields($flds, true); - // genfields can return FALSE at times - if ($lines == null) $lines = array(); - - $taboptions = $this->_Options($tableoptions); - $tabname = $this->TableName ($tabname); - $sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions); - - // ggiunta - 2006/10/12 - KLUDGE: - // if we are on autoincrement, and table options includes REPLACE, the - // autoincrement sequence has already been dropped on table creation sql, so - // we avoid passing REPLACE to trigger creation code. This prevents - // creating sql that double-drops the sequence - if ($this->autoIncrement && isset($taboptions['REPLACE'])) - unset($taboptions['REPLACE']); - $tsql = $this->_Triggers($tabname,$taboptions); - foreach($tsql as $s) $sql[] = $s; - - if (is_array($idxs)) { - foreach($idxs as $idx => $idxdef) { - $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); - $sql = array_merge($sql, $sql_idxs); - } - } - - return $sql; - } - - function _GenFields($flds,$widespacing=false) - { - if (is_string($flds)) { - $padding = ' '; - $txt = $flds.$padding; - $flds = array(); - $flds0 = Lens_ParseArgs($txt,','); - $hasparam = false; - foreach($flds0 as $f0) { - $f1 = array(); - foreach($f0 as $token) { - switch (strtoupper($token)) { - case 'INDEX': - $f1['INDEX'] = ''; - // fall through intentionally - case 'CONSTRAINT': - case 'DEFAULT': - $hasparam = $token; - break; - default: - if ($hasparam) $f1[$hasparam] = $token; - else $f1[] = $token; - $hasparam = false; - break; - } - } - // 'index' token without a name means single column index: name it after column - if (array_key_exists('INDEX', $f1) && $f1['INDEX'] == '') { - $f1['INDEX'] = isset($f0['NAME']) ? $f0['NAME'] : $f0[0]; - // check if column name used to create an index name was quoted - if (($f1['INDEX'][0] == '"' || $f1['INDEX'][0] == "'" || $f1['INDEX'][0] == "`") && - ($f1['INDEX'][0] == substr($f1['INDEX'], -1))) { - $f1['INDEX'] = $f1['INDEX'][0].'idx_'.substr($f1['INDEX'], 1, -1).$f1['INDEX'][0]; - } - else - $f1['INDEX'] = 'idx_'.$f1['INDEX']; - } - // reset it, so we don't get next field 1st token as INDEX... - $hasparam = false; - - $flds[] = $f1; - - } - } - $this->autoIncrement = false; - $lines = array(); - $pkey = array(); - $idxs = array(); - foreach($flds as $fld) { - $fld = _array_change_key_case($fld); - - $fname = false; - $fdefault = false; - $fautoinc = false; - $ftype = false; - $fsize = false; - $fprec = false; - $fprimary = false; - $fnoquote = false; - $fdefts = false; - $fdefdate = false; - $fconstraint = false; - $fnotnull = false; - $funsigned = false; - $findex = ''; - $funiqueindex = false; - - //----------------- - // Parse attributes - foreach($fld as $attr => $v) { - if ($attr == 2 && is_numeric($v)) $attr = 'SIZE'; - else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v); - - switch($attr) { - case '0': - case 'NAME': $fname = $v; break; - case '1': - case 'TYPE': $ty = $v; $ftype = $this->ActualType(strtoupper($v)); break; - - case 'SIZE': - $dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,','); - if ($dotat === false) $fsize = $v; - else { - $fsize = substr($v,0,$dotat); - $fprec = substr($v,$dotat+1); - } - break; - case 'UNSIGNED': $funsigned = true; break; - case 'AUTOINCREMENT': - case 'AUTO': $fautoinc = true; $fnotnull = true; break; - case 'KEY': - // a primary key col can be non unique in itself (if key spans many cols...) - case 'PRIMARY': $fprimary = $v; $fnotnull = true; /*$funiqueindex = true;*/ break; - case 'DEF': - case 'DEFAULT': $fdefault = $v; break; - case 'NOTNULL': $fnotnull = $v; break; - case 'NOQUOTE': $fnoquote = $v; break; - case 'DEFDATE': $fdefdate = $v; break; - case 'DEFTIMESTAMP': $fdefts = $v; break; - case 'CONSTRAINT': $fconstraint = $v; break; - // let INDEX keyword create a 'very standard' index on column - case 'INDEX': $findex = $v; break; - case 'UNIQUE': $funiqueindex = true; break; - } //switch - } // foreach $fld - - //-------------------- - // VALIDATE FIELD INFO - if (!strlen($fname)) { - if ($this->debug) ADOConnection::outp("Undefined NAME"); - return false; - } - - $fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname)); - $fname = $this->NameQuote($fname); - - if (!strlen($ftype)) { - if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'"); - return false; - } else { - $ftype = strtoupper($ftype); - } - - $ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec); - - if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls - - if ($fprimary) $pkey[] = $fname; - - // some databases do not allow blobs to have defaults - if ($ty == 'X') $fdefault = false; - - // build list of indexes - if ($findex != '') { - if (array_key_exists($findex, $idxs)) { - $idxs[$findex]['cols'][] = ($fname); - if (in_array('UNIQUE', $idxs[$findex]['opts']) != $funiqueindex) { - if ($this->debug) ADOConnection::outp("Index $findex defined once UNIQUE and once not"); - } - if ($funiqueindex && !in_array('UNIQUE', $idxs[$findex]['opts'])) - $idxs[$findex]['opts'][] = 'UNIQUE'; - } - else - { - $idxs[$findex] = array(); - $idxs[$findex]['cols'] = array($fname); - if ($funiqueindex) - $idxs[$findex]['opts'] = array('UNIQUE'); - else - $idxs[$findex]['opts'] = array(); - } - } - - //-------------------- - // CONSTRUCT FIELD SQL - if ($fdefts) { - if (substr($this->connection->databaseType,0,5) == 'mysql') { - $ftype = 'TIMESTAMP'; - } else { - $fdefault = $this->connection->sysTimeStamp; - } - } else if ($fdefdate) { - if (substr($this->connection->databaseType,0,5) == 'mysql') { - $ftype = 'TIMESTAMP'; - } else { - $fdefault = $this->connection->sysDate; - } - } else if ($fdefault !== false && !$fnoquote) { - if ($ty == 'C' or $ty == 'X' or - ( substr($fdefault,0,1) != "'" && !is_numeric($fdefault))) { - - if (($ty == 'D' || $ty == 'T') && strtolower($fdefault) != 'null') { - // convert default date into database-aware code - if ($ty == 'T') - { - $fdefault = $this->connection->DBTimeStamp($fdefault); - } - else - { - $fdefault = $this->connection->DBDate($fdefault); - } - } - else - if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') - $fdefault = trim($fdefault); - else if (strtolower($fdefault) != 'null') - $fdefault = $this->connection->qstr($fdefault); - } - } - $suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned); - - // add index creation - if ($widespacing) $fname = str_pad($fname,24); - - // check for field names appearing twice - if (array_key_exists($fid, $lines)) { - ADOConnection::outp("Field '$fname' defined twice"); - } - - $lines[$fid] = $fname.' '.$ftype.$suffix; - - if ($fautoinc) $this->autoIncrement = true; - } // foreach $flds - - return array($lines,$pkey,$idxs); - } - - /** - GENERATE THE SIZE PART OF THE DATATYPE - $ftype is the actual type - $ty is the type defined originally in the DDL - */ - function _GetSize($ftype, $ty, $fsize, $fprec) - { - if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) { - $ftype .= "(".$fsize; - if (strlen($fprec)) $ftype .= ",".$fprec; - $ftype .= ')'; - } - return $ftype; - } - - - // return string must begin with space - function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned) - { - $suffix = ''; - if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault"; - if ($fnotnull) $suffix .= ' NOT NULL'; - if ($fconstraint) $suffix .= ' '.$fconstraint; - return $suffix; - } - - function _IndexSQL($idxname, $tabname, $flds, $idxoptions) - { - $sql = array(); - - if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) { - $sql[] = sprintf ($this->dropIndex, $idxname); - if ( isset($idxoptions['DROP']) ) - return $sql; - } - - if ( empty ($flds) ) { - return $sql; - } - - $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : ''; - - $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' '; - - if ( isset($idxoptions[$this->upperName]) ) - $s .= $idxoptions[$this->upperName]; - - if ( is_array($flds) ) - $flds = implode(', ',$flds); - $s .= '(' . $flds . ')'; - $sql[] = $s; - - return $sql; - } - - function _DropAutoIncrement($tabname) - { - return false; - } - - function _TableSQL($tabname,$lines,$pkey,$tableoptions) - { - $sql = array(); - - if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) { - $sql[] = sprintf($this->dropTable,$tabname); - if ($this->autoIncrement) { - $sInc = $this->_DropAutoIncrement($tabname); - if ($sInc) $sql[] = $sInc; - } - if ( isset ($tableoptions['DROP']) ) { - return $sql; - } - } - $s = "CREATE TABLE $tabname (\n"; - $s .= implode(",\n", $lines); - if (sizeof($pkey)>0) { - $s .= ",\n PRIMARY KEY ("; - $s .= implode(", ",$pkey).")"; - } - if (isset($tableoptions['CONSTRAINTS'])) - $s .= "\n".$tableoptions['CONSTRAINTS']; - - if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) - $s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS']; - - $s .= "\n)"; - if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName]; - $sql[] = $s; - - return $sql; - } - - /** - GENERATE TRIGGERS IF NEEDED - used when table has auto-incrementing field that is emulated using triggers - */ - function _Triggers($tabname,$taboptions) - { - return array(); - } - - /** - Sanitize options, so that array elements with no keys are promoted to keys - */ - function _Options($opts) - { - if (!is_array($opts)) return array(); - $newopts = array(); - foreach($opts as $k => $v) { - if (is_numeric($k)) $newopts[strtoupper($v)] = $v; - else $newopts[strtoupper($k)] = $v; - } - return $newopts; - } - - /** - "Florian Buzin [ easywe ]" - - This function changes/adds new fields to your table. You don't - have to know if the col is new or not. It will check on its own. - */ - function ChangeTableSQL($tablename, $flds, $tableoptions = false) - { - global $ADODB_FETCH_MODE; - - $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; - if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false); - - // check table exists - $save_handler = $this->connection->raiseErrorFn; - $this->connection->raiseErrorFn = ''; - $cols = $this->MetaColumns($tablename); - $this->connection->raiseErrorFn = $save_handler; - - if (isset($savem)) $this->connection->SetFetchMode($savem); - $ADODB_FETCH_MODE = $save; - - if ( empty($cols)) { - return $this->CreateTableSQL($tablename, $flds, $tableoptions); - } - - if (is_array($flds)) { - // Cycle through the update fields, comparing - // existing fields to fields to update. - // if the Metatype and size is exactly the - // same, ignore - by Mark Newham - $holdflds = array(); - foreach($flds as $k=>$v) { - if ( isset($cols[$k]) && is_object($cols[$k]) ) { - // If already not allowing nulls, then don't change - $obj = $cols[$k]; - if (isset($obj->not_null) && $obj->not_null) - $v = str_replace('NOT NULL','',$v); - - $c = $cols[$k]; - $ml = $c->max_length; - $mt = $this->MetaType($c->type,$ml); - if ($ml == -1) $ml = ''; - if ($mt == 'X') $ml = $v['SIZE']; - if (($mt != $v['TYPE']) || $ml != $v['SIZE']) { - $holdflds[$k] = $v; - } - } else { - $holdflds[$k] = $v; - } - } - $flds = $holdflds; - } - - - // already exists, alter table instead - list($lines,$pkey,$idxs) = $this->_GenFields($flds); - // genfields can return FALSE at times - if ($lines == null) $lines = array(); - $alter = 'ALTER TABLE ' . $this->TableName($tablename); - $sql = array(); - - foreach ( $lines as $id => $v ) { - if ( isset($cols[$id]) && is_object($cols[$id]) ) { - - $flds = Lens_ParseArgs($v,','); - - // We are trying to change the size of the field, if not allowed, simply ignore the request. - // $flds[1] holds the type, $flds[2] holds the size -postnuke addition - if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4) - && (isset($flds[0][2]) && is_numeric($flds[0][2]))) { - if ($this->debug) ADOConnection::outp(sprintf("

%s cannot be changed to %s currently

", $flds[0][0], $flds[0][1])); - #echo "

$this->alterCol cannot be changed to $flds currently

"; - continue; - } - $sql[] = $alter . $this->alterCol . ' ' . $v; - } else { - $sql[] = $alter . $this->addCol . ' ' . $v; - } - } - - return $sql; - } -} // class -?> \ No newline at end of file diff --git a/includes/adodb/adodb-error.inc.php b/includes/adodb/adodb-error.inc.php deleted file mode 100644 index ba1cd2ac..00000000 --- a/includes/adodb/adodb-error.inc.php +++ /dev/null @@ -1,258 +0,0 @@ - DB_ERROR_NOSUCHTABLE, - '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/i' => DB_ERROR_ALREADY_EXISTS, - '/divide by zero$/i' => DB_ERROR_DIVZERO, - '/pg_atoi: error in .*: can\'t parse /i' => DB_ERROR_INVALID_NUMBER, - '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/i' => DB_ERROR_NOSUCHFIELD, - '/parser: parse error at or near \"/i' => DB_ERROR_SYNTAX, - '/referential integrity violation/i' => DB_ERROR_CONSTRAINT, - '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key violates unique constraint/i' - => DB_ERROR_ALREADY_EXISTS - ); - reset($error_regexps); - while (list($regexp,$code) = each($error_regexps)) { - if (preg_match($regexp, $errormsg)) { - return $code; - } - } - // Fall back to DB_ERROR if there was no mapping. - return DB_ERROR; -} - -function adodb_error_odbc() -{ -static $MAP = array( - '01004' => DB_ERROR_TRUNCATED, - '07001' => DB_ERROR_MISMATCH, - '21S01' => DB_ERROR_MISMATCH, - '21S02' => DB_ERROR_MISMATCH, - '22003' => DB_ERROR_INVALID_NUMBER, - '22008' => DB_ERROR_INVALID_DATE, - '22012' => DB_ERROR_DIVZERO, - '23000' => DB_ERROR_CONSTRAINT, - '24000' => DB_ERROR_INVALID, - '34000' => DB_ERROR_INVALID, - '37000' => DB_ERROR_SYNTAX, - '42000' => DB_ERROR_SYNTAX, - 'IM001' => DB_ERROR_UNSUPPORTED, - 'S0000' => DB_ERROR_NOSUCHTABLE, - 'S0001' => DB_ERROR_NOT_FOUND, - 'S0002' => DB_ERROR_NOSUCHTABLE, - 'S0011' => DB_ERROR_ALREADY_EXISTS, - 'S0012' => DB_ERROR_NOT_FOUND, - 'S0021' => DB_ERROR_ALREADY_EXISTS, - 'S0022' => DB_ERROR_NOT_FOUND, - 'S1000' => DB_ERROR_NOSUCHTABLE, - 'S1009' => DB_ERROR_INVALID, - 'S1090' => DB_ERROR_INVALID, - 'S1C00' => DB_ERROR_NOT_CAPABLE - ); - return $MAP; -} - -function adodb_error_ibase() -{ -static $MAP = array( - -104 => DB_ERROR_SYNTAX, - -150 => DB_ERROR_ACCESS_VIOLATION, - -151 => DB_ERROR_ACCESS_VIOLATION, - -155 => DB_ERROR_NOSUCHTABLE, - -157 => DB_ERROR_NOSUCHFIELD, - -158 => DB_ERROR_VALUE_COUNT_ON_ROW, - -170 => DB_ERROR_MISMATCH, - -171 => DB_ERROR_MISMATCH, - -172 => DB_ERROR_INVALID, - -204 => DB_ERROR_INVALID, - -205 => DB_ERROR_NOSUCHFIELD, - -206 => DB_ERROR_NOSUCHFIELD, - -208 => DB_ERROR_INVALID, - -219 => DB_ERROR_NOSUCHTABLE, - -297 => DB_ERROR_CONSTRAINT, - -530 => DB_ERROR_CONSTRAINT, - -803 => DB_ERROR_CONSTRAINT, - -551 => DB_ERROR_ACCESS_VIOLATION, - -552 => DB_ERROR_ACCESS_VIOLATION, - -922 => DB_ERROR_NOSUCHDB, - -923 => DB_ERROR_CONNECT_FAILED, - -924 => DB_ERROR_CONNECT_FAILED - ); - - return $MAP; -} - -function adodb_error_ifx() -{ -static $MAP = array( - '-201' => DB_ERROR_SYNTAX, - '-206' => DB_ERROR_NOSUCHTABLE, - '-217' => DB_ERROR_NOSUCHFIELD, - '-329' => DB_ERROR_NODBSELECTED, - '-1204' => DB_ERROR_INVALID_DATE, - '-1205' => DB_ERROR_INVALID_DATE, - '-1206' => DB_ERROR_INVALID_DATE, - '-1209' => DB_ERROR_INVALID_DATE, - '-1210' => DB_ERROR_INVALID_DATE, - '-1212' => DB_ERROR_INVALID_DATE - ); - - return $MAP; -} - -function adodb_error_oci8() -{ -static $MAP = array( - 1 => DB_ERROR_ALREADY_EXISTS, - 900 => DB_ERROR_SYNTAX, - 904 => DB_ERROR_NOSUCHFIELD, - 923 => DB_ERROR_SYNTAX, - 942 => DB_ERROR_NOSUCHTABLE, - 955 => DB_ERROR_ALREADY_EXISTS, - 1476 => DB_ERROR_DIVZERO, - 1722 => DB_ERROR_INVALID_NUMBER, - 2289 => DB_ERROR_NOSUCHTABLE, - 2291 => DB_ERROR_CONSTRAINT, - 2449 => DB_ERROR_CONSTRAINT - ); - - return $MAP; -} - -function adodb_error_mssql() -{ -static $MAP = array( - 208 => DB_ERROR_NOSUCHTABLE, - 2601 => DB_ERROR_ALREADY_EXISTS - ); - - return $MAP; -} - -function adodb_error_sqlite() -{ -static $MAP = array( - 1 => DB_ERROR_SYNTAX - ); - - return $MAP; -} - -function adodb_error_mysql() -{ -static $MAP = array( - 1004 => DB_ERROR_CANNOT_CREATE, - 1005 => DB_ERROR_CANNOT_CREATE, - 1006 => DB_ERROR_CANNOT_CREATE, - 1007 => DB_ERROR_ALREADY_EXISTS, - 1008 => DB_ERROR_CANNOT_DROP, - 1045 => DB_ERROR_ACCESS_VIOLATION, - 1046 => DB_ERROR_NODBSELECTED, - 1049 => DB_ERROR_NOSUCHDB, - 1050 => DB_ERROR_ALREADY_EXISTS, - 1051 => DB_ERROR_NOSUCHTABLE, - 1054 => DB_ERROR_NOSUCHFIELD, - 1062 => DB_ERROR_ALREADY_EXISTS, - 1064 => DB_ERROR_SYNTAX, - 1100 => DB_ERROR_NOT_LOCKED, - 1136 => DB_ERROR_VALUE_COUNT_ON_ROW, - 1146 => DB_ERROR_NOSUCHTABLE, - 1048 => DB_ERROR_CONSTRAINT, - 2002 => DB_ERROR_CONNECT_FAILED, - 2005 => DB_ERROR_CONNECT_FAILED - ); - - return $MAP; -} -?> \ No newline at end of file diff --git a/includes/adodb/adodb-errorhandler.inc.php b/includes/adodb/adodb-errorhandler.inc.php deleted file mode 100644 index ad8f3b4f..00000000 --- a/includes/adodb/adodb-errorhandler.inc.php +++ /dev/null @@ -1,79 +0,0 @@ -$s

"; - trigger_error($s,ADODB_ERROR_HANDLER_TYPE); -} -?> diff --git a/includes/adodb/adodb-errorpear.inc.php b/includes/adodb/adodb-errorpear.inc.php deleted file mode 100644 index 10f98cd1..00000000 --- a/includes/adodb/adodb-errorpear.inc.php +++ /dev/null @@ -1,88 +0,0 @@ -!$s

"; -} - -/** -* Returns last PEAR_Error object. This error might be for an error that -* occured several sql statements ago. -*/ -function ADODB_PEAR_Error() -{ -global $ADODB_Last_PEAR_Error; - - return $ADODB_Last_PEAR_Error; -} - -?> \ No newline at end of file diff --git a/includes/adodb/adodb-exceptions.inc.php b/includes/adodb/adodb-exceptions.inc.php deleted file mode 100644 index a2a81553..00000000 --- a/includes/adodb/adodb-exceptions.inc.php +++ /dev/null @@ -1,82 +0,0 @@ -sql = $p1; - $this->params = $p2; - $s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n"; - break; - - case 'PCONNECT': - case 'CONNECT': - $user = $thisConnection->user; - $s = "$dbms error: [$errno: $errmsg] in $fn($p1, '$user', '****', $p2)\n"; - break; - default: - $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n"; - break; - } - - $this->dbms = $dbms; - if ($thisConnection) { - $this->host = $thisConnection->host; - $this->database = $thisConnection->database; - } - $this->fn = $fn; - $this->msg = $errmsg; - - if (!is_numeric($errno)) $errno = -1; - parent::__construct($s,$errno); - } -} - -/** -* Default Error Handler. This will be called with the following params -* -* @param $dbms the RDBMS you are connecting to -* @param $fn the name of the calling function (in uppercase) -* @param $errno the native error number from the database -* @param $errmsg the native error msg from the database -* @param $p1 $fn specific parameter - see below -* @param $P2 $fn specific parameter - see below -*/ - -function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection) -{ -global $ADODB_EXCEPTION; - - if (error_reporting() == 0) return; // obey @ protocol - if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION; - else $errfn = 'ADODB_EXCEPTION'; - throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection); -} - - -?> \ No newline at end of file diff --git a/includes/adodb/adodb-iterator.inc.php b/includes/adodb/adodb-iterator.inc.php deleted file mode 100644 index ae239257..00000000 --- a/includes/adodb/adodb-iterator.inc.php +++ /dev/null @@ -1,30 +0,0 @@ -Execute("select * from adoxyz"); - foreach($rs as $k => $v) { - echo $k; print_r($v); echo "
"; - } - - - Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2 - - - Moved to adodb.inc.php to improve performance. - */ - - - - - -?> \ No newline at end of file diff --git a/includes/adodb/adodb-lib.inc.php b/includes/adodb/adodb-lib.inc.php deleted file mode 100644 index 835ccd59..00000000 --- a/includes/adodb/adodb-lib.inc.php +++ /dev/null @@ -1,1180 +0,0 @@ - sizeof($array)) $max = sizeof($array); - else $max = $probe; - - - for ($j=0;$j < $max; $j++) { - $row = $array[$j]; - if (!$row) break; - $i = -1; - foreach($row as $v) { - $i += 1; - - if (isset($types[$i]) && $types[$i]=='C') continue; - - //print " ($i ".$types[$i]. "$v) "; - $v = trim($v); - - if (!preg_match('/^[+-]{0,1}[0-9\.]+$/',$v)) { - $types[$i] = 'C'; // once C, always C - - continue; - } - if ($j == 0) { - // If empty string, we presume is character - // test for integer for 1st row only - // after that it is up to testing other rows to prove - // that it is not an integer - if (strlen($v) == 0) $types[$i] = 'C'; - if (strpos($v,'.') !== false) $types[$i] = 'N'; - else $types[$i] = 'I'; - continue; - } - - if (strpos($v,'.') !== false) $types[$i] = 'N'; - - } - } - -} - -function adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs) -{ - $oldX = sizeof(reset($arr)); - $oldY = sizeof($arr); - - if ($hdr) { - $startx = 1; - $hdr = array('Fields'); - for ($y = 0; $y < $oldY; $y++) { - $hdr[] = $arr[$y][0]; - } - } else - $startx = 0; - - for ($x = $startx; $x < $oldX; $x++) { - if ($fobjs) { - $o = $fobjs[$x]; - $newarr[] = array($o->name); - } else - $newarr[] = array(); - - for ($y = 0; $y < $oldY; $y++) { - $newarr[$x-$startx][] = $arr[$y][$x]; - } - } -} - -// Force key to upper. -// See also http://www.php.net/manual/en/function.array-change-key-case.php -function _array_change_key_case($an_array) -{ - if (is_array($an_array)) { - $new_array = array(); - foreach($an_array as $key=>$value) - $new_array[strtoupper($key)] = $value; - - return $new_array; - } - - return $an_array; -} - -function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc) -{ - if (count($fieldArray) == 0) return 0; - $first = true; - $uSet = ''; - - if (!is_array($keyCol)) { - $keyCol = array($keyCol); - } - foreach($fieldArray as $k => $v) { - if ($v === null) { - $v = 'NULL'; - $fieldArray[$k] = $v; - } else if ($autoQuote && !is_numeric($v) /*and strncmp($v,"'",1) !== 0 -- sql injection risk*/ and strcasecmp($v,$zthis->null2null)!=0) { - $v = $zthis->qstr($v); - $fieldArray[$k] = $v; - } - if (in_array($k,$keyCol)) continue; // skip UPDATE if is key - - if ($first) { - $first = false; - $uSet = "$k=$v"; - } else - $uSet .= ",$k=$v"; - } - - $where = false; - foreach ($keyCol as $v) { - if (isset($fieldArray[$v])) { - if ($where) $where .= ' and '.$v.'='.$fieldArray[$v]; - else $where = $v.'='.$fieldArray[$v]; - } - } - - if ($uSet && $where) { - $update = "UPDATE $table SET $uSet WHERE $where"; - - $rs = $zthis->Execute($update); - - - if ($rs) { - if ($zthis->poorAffectedRows) { - /* - The Select count(*) wipes out any errors that the update would have returned. - http://phplens.com/lens/lensforum/msgs.php?id=5696 - */ - if ($zthis->ErrorNo()<>0) return 0; - - # affected_rows == 0 if update field values identical to old values - # for mysql - which is silly. - - $cnt = $zthis->GetOne("select count(*) from $table where $where"); - if ($cnt > 0) return 1; // record already exists - } else { - if (($zthis->Affected_Rows()>0)) return 1; - } - } else - return 0; - } - - // print "

Error=".$this->ErrorNo().'

'; - $first = true; - foreach($fieldArray as $k => $v) { - if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col - - if ($first) { - $first = false; - $iCols = "$k"; - $iVals = "$v"; - } else { - $iCols .= ",$k"; - $iVals .= ",$v"; - } - } - $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; - $rs = $zthis->Execute($insert); - return ($rs) ? 2 : 0; -} - -// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM -function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false, - $size=0, $selectAttr='',$compareFields0=true) -{ - $hasvalue = false; - - if ($multiple or is_array($defstr)) { - if ($size==0) $size=5; - $attr = ' multiple size="'.$size.'"'; - if (!strpos($name,'[]')) $name .= '[]'; - } else if ($size) $attr = ' size="'.$size.'"'; - else $attr =''; - - $s = '\n"; -} - -// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM -function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false, - $size=0, $selectAttr='',$compareFields0=true) -{ - $hasvalue = false; - - if ($multiple or is_array($defstr)) { - if ($size==0) $size=5; - $attr = ' multiple size="'.$size.'"'; - if (!strpos($name,'[]')) $name .= '[]'; - } else if ($size) $attr = ' size="'.$size.'"'; - else $attr =''; - - $s = '\n"; -} - - -/* - Count the number of records this sql statement will return by using - query rewriting heuristics... - - Does not work with UNIONs, except with postgresql and oracle. - - Usage: - - $conn->Connect(...); - $cnt = _adodb_getcount($conn, $sql); - -*/ -function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) -{ - $qryRecs = 0; - - if (!empty($zthis->_nestedSQL) || preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || - preg_match('/\s+GROUP\s+BY\s+/is',$sql) || - preg_match('/\s+UNION\s+/is',$sql)) { - - $rewritesql = adodb_strip_order_by($sql); - - // ok, has SELECT DISTINCT or GROUP BY so see if we can use a table alias - // but this is only supported by oracle and postgresql... - if ($zthis->dataProvider == 'oci8') { - // Allow Oracle hints to be used for query optimization, Chris Wrye - if (preg_match('#/\\*+.*?\\*\\/#', $sql, $hint)) { - $rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")"; - } else - $rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")"; - - } else if (strncmp($zthis->databaseType,'postgres',8) == 0 || strncmp($zthis->databaseType,'mysql',5) == 0) { - $rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_"; - } else { - $rewritesql = "SELECT COUNT(*) FROM ($rewritesql)"; - } - } else { - // now replace SELECT ... FROM with SELECT COUNT(*) FROM - $rewritesql = preg_replace( - '/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql); - // fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails - // with mssql, access and postgresql. Also a good speedup optimization - skips sorting! - // also see http://phplens.com/lens/lensforum/msgs.php?id=12752 - $rewritesql = adodb_strip_order_by($rewritesql); - } - - if (isset($rewritesql) && $rewritesql != $sql) { - if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0]; - - if ($secs2cache) { - // we only use half the time of secs2cache because the count can quickly - // become inaccurate if new records are added - $qryRecs = $zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr); - - } else { - $qryRecs = $zthis->GetOne($rewritesql,$inputarr); - } - if ($qryRecs !== false) return $qryRecs; - } - //-------------------------------------------- - // query rewrite failed - so try slower way... - - - // strip off unneeded ORDER BY if no UNION - if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql; - else $rewritesql = $rewritesql = adodb_strip_order_by($sql); - - if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0]; - - $rstest = $zthis->Execute($rewritesql,$inputarr); - if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr); - - if ($rstest) { - $qryRecs = $rstest->RecordCount(); - if ($qryRecs == -1) { - global $ADODB_EXTENSION; - // some databases will return -1 on MoveLast() - change to MoveNext() - if ($ADODB_EXTENSION) { - while(!$rstest->EOF) { - adodb_movenext($rstest); - } - } else { - while(!$rstest->EOF) { - $rstest->MoveNext(); - } - } - $qryRecs = $rstest->_currentRow; - } - $rstest->Close(); - if ($qryRecs == -1) return 0; - } - return $qryRecs; -} - -/* - Code originally from "Cornel G" - - This code might not work with SQL that has UNION in it - - Also if you are using CachePageExecute(), there is a strong possibility that - data will get out of synch. use CachePageExecute() only with tables that - rarely change. -*/ -function _adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, - $inputarr=false, $secs2cache=0) -{ - $atfirstpage = false; - $atlastpage = false; - $lastpageno=1; - - // If an invalid nrows is supplied, - // we assume a default value of 10 rows per page - if (!isset($nrows) || $nrows <= 0) $nrows = 10; - - $qryRecs = false; //count records for no offset - - $qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache); - $lastpageno = (int) ceil($qryRecs / $nrows); - $zthis->_maxRecordCount = $qryRecs; - - - - // ***** Here we check whether $page is the last page or - // whether we are trying to retrieve - // a page number greater than the last page number. - if ($page >= $lastpageno) { - $page = $lastpageno; - $atlastpage = true; - } - - // If page number <= 1, then we are at the first page - if (empty($page) || $page <= 1) { - $page = 1; - $atfirstpage = true; - } - - // We get the data we want - $offset = $nrows * ($page-1); - if ($secs2cache > 0) - $rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr); - else - $rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); - - - // Before returning the RecordSet, we set the pagination properties we need - if ($rsreturn) { - $rsreturn->_maxRecordCount = $qryRecs; - $rsreturn->rowsPerPage = $nrows; - $rsreturn->AbsolutePage($page); - $rsreturn->AtFirstPage($atfirstpage); - $rsreturn->AtLastPage($atlastpage); - $rsreturn->LastPageNo($lastpageno); - } - return $rsreturn; -} - -// Iván Oliva version -function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0) -{ - - $atfirstpage = false; - $atlastpage = false; - - if (!isset($page) || $page <= 1) { // If page number <= 1, then we are at the first page - $page = 1; - $atfirstpage = true; - } - if ($nrows <= 0) $nrows = 10; // If an invalid nrows is supplied, we assume a default value of 10 rows per page - - // ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than - // the last page number. - $pagecounter = $page + 1; - $pagecounteroffset = ($pagecounter * $nrows) - $nrows; - if ($secs2cache>0) $rstest = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr); - else $rstest = $zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache); - if ($rstest) { - while ($rstest && $rstest->EOF && $pagecounter>0) { - $atlastpage = true; - $pagecounter--; - $pagecounteroffset = $nrows * ($pagecounter - 1); - $rstest->Close(); - if ($secs2cache>0) $rstest = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr); - else $rstest = $zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache); - } - if ($rstest) $rstest->Close(); - } - if ($atlastpage) { // If we are at the last page or beyond it, we are going to retrieve it - $page = $pagecounter; - if ($page == 1) $atfirstpage = true; // We have to do this again in case the last page is the same as the first - //... page, that is, the recordset has only 1 page. - } - - // We get the data we want - $offset = $nrows * ($page-1); - if ($secs2cache > 0) $rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr); - else $rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); - - // Before returning the RecordSet, we set the pagination properties we need - if ($rsreturn) { - $rsreturn->rowsPerPage = $nrows; - $rsreturn->AbsolutePage($page); - $rsreturn->AtFirstPage($atfirstpage); - $rsreturn->AtLastPage($atlastpage); - } - return $rsreturn; -} - -function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=2) -{ - global $ADODB_QUOTE_FIELDNAMES; - - if (!$rs) { - printf(ADODB_BAD_RS,'GetUpdateSQL'); - return false; - } - - $fieldUpdatedCount = 0; - $arrFields = _array_change_key_case($arrFields); - - $hasnumeric = isset($rs->fields[0]); - $setFields = ''; - - // Loop through all of the fields in the recordset - for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) { - // Get the field from the recordset - $field = $rs->FetchField($i); - - // If the recordset field is one - // of the fields passed in then process. - $upperfname = strtoupper($field->name); - if (adodb_key_exists($upperfname,$arrFields,$force)) { - - // If the existing field value in the recordset - // is different from the value passed in then - // go ahead and append the field name and new value to - // the update query. - - if ($hasnumeric) $val = $rs->fields[$i]; - else if (isset($rs->fields[$upperfname])) $val = $rs->fields[$upperfname]; - else if (isset($rs->fields[$field->name])) $val = $rs->fields[$field->name]; - else if (isset($rs->fields[strtolower($upperfname)])) $val = $rs->fields[strtolower($upperfname)]; - else $val = ''; - - - if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) { - // Set the counter for the number of fields that will be updated. - $fieldUpdatedCount++; - - // Based on the datatype of the field - // Format the value properly for the database - $type = $rs->MetaType($field->type); - - - if ($type == 'null') { - $type = 'C'; - } - - if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) - $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote; - else - $fnameq = $upperfname; - - - // is_null requires php 4.0.4 - //********************************************************// - if (is_null($arrFields[$upperfname]) - || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0) - || $arrFields[$upperfname] === $zthis->null2null - ) - { - switch ($force) { - - //case 0: - // //Ignore empty values. This is allready handled in "adodb_key_exists" function. - //break; - - case 1: - //Set null - $setFields .= $field->name . " = null, "; - break; - - case 2: - //Set empty - $arrFields[$upperfname] = ""; - $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,$arrFields, $magicq); - break; - default: - case 3: - //Set the value that was given in array, so you can give both null and empty values - if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) { - $setFields .= $field->name . " = null, "; - } else { - $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,$arrFields, $magicq); - } - break; - } - //********************************************************// - } else { - //we do this so each driver can customize the sql for - //DB specific column types. - //Oracle needs BLOB types to be handled with a returning clause - //postgres has special needs as well - $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq, - $arrFields, $magicq); - } - } - } - } - - // If there were any modified fields then build the rest of the update query. - if ($fieldUpdatedCount > 0 || $forceUpdate) { - // Get the table name from the existing query. - if (!empty($rs->tableName)) $tableName = $rs->tableName; - else { - preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName); - $tableName = $tableName[1]; - } - // Get the full where clause excluding the word "WHERE" from - // the existing query. - preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause); - - $discard = false; - // not a good hack, improvements? - if ($whereClause) { - #var_dump($whereClause); - if (preg_match('/\s(ORDER\s.*)/is', $whereClause[1], $discard)); - else if (preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard)); - else if (preg_match('/\s(FOR UPDATE.*)/is', $whereClause[1], $discard)); - else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see http://sourceforge.net/tracker/index.php?func=detail&aid=1379638&group_id=42718&atid=433976 - } else - $whereClause = array(false,false); - - if ($discard) - $whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1])); - - $sql = 'UPDATE '.$tableName.' SET '.substr($setFields, 0, -2); - if (strlen($whereClause[1]) > 0) - $sql .= ' WHERE '.$whereClause[1]; - - return $sql; - - } else { - return false; - } -} - -function adodb_key_exists($key, &$arr,$force=2) -{ - if ($force<=0) { - // the following is the old behaviour where null or empty fields are ignored - return (!empty($arr[$key])) || (isset($arr[$key]) && strlen($arr[$key])>0); - } - - if (isset($arr[$key])) return true; - ## null check below - if (ADODB_PHPVER >= 0x4010) return array_key_exists($key,$arr); - return false; -} - -/** - * There is a special case of this function for the oci8 driver. - * The proper way to handle an insert w/ a blob in oracle requires - * a returning clause with bind variables and a descriptor blob. - * - * - */ -function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2) -{ -static $cacheRS = false; -static $cacheSig = 0; -static $cacheCols; - global $ADODB_QUOTE_FIELDNAMES; - - $tableName = ''; - $values = ''; - $fields = ''; - $recordSet = null; - $arrFields = _array_change_key_case($arrFields); - $fieldInsertedCount = 0; - - if (is_string($rs)) { - //ok we have a table name - //try and get the column info ourself. - $tableName = $rs; - - //we need an object for the recordSet - //because we have to call MetaType. - //php can't do a $rsclass::MetaType() - $rsclass = $zthis->rsPrefix.$zthis->databaseType; - $recordSet = new $rsclass(-1,$zthis->fetchMode); - $recordSet->connection = $zthis; - - if (is_string($cacheRS) && $cacheRS == $rs) { - $columns = $cacheCols; - } else { - $columns = $zthis->MetaColumns( $tableName ); - $cacheRS = $tableName; - $cacheCols = $columns; - } - } else if (is_subclass_of($rs, 'adorecordset')) { - if (isset($rs->insertSig) && is_integer($cacheRS) && $cacheRS == $rs->insertSig) { - $columns = $cacheCols; - } else { - for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) - $columns[] = $rs->FetchField($i); - $cacheRS = $cacheSig; - $cacheCols = $columns; - $rs->insertSig = $cacheSig++; - } - $recordSet = $rs; - - } else { - printf(ADODB_BAD_RS,'GetInsertSQL'); - return false; - } - - // Loop through all of the fields in the recordset - foreach( $columns as $field ) { - $upperfname = strtoupper($field->name); - if (adodb_key_exists($upperfname,$arrFields,$force)) { - $bad = false; - if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) - $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote; - else - $fnameq = $upperfname; - - $type = $recordSet->MetaType($field->type); - - /********************************************************/ - if (is_null($arrFields[$upperfname]) - || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0) - || $arrFields[$upperfname] === $zthis->null2null - ) - { - switch ($force) { - - case 0: // we must always set null if missing - $bad = true; - break; - - case 1: - $values .= "null, "; - break; - - case 2: - //Set empty - $arrFields[$upperfname] = ""; - $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq,$arrFields, $magicq); - break; - - default: - case 3: - //Set the value that was given in array, so you can give both null and empty values - if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) { - $values .= "null, "; - } else { - $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields, $magicq); - } - break; - } // switch - - /*********************************************************/ - } else { - //we do this so each driver can customize the sql for - //DB specific column types. - //Oracle needs BLOB types to be handled with a returning clause - //postgres has special needs as well - $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, - $arrFields, $magicq); - } - - if ($bad) continue; - // Set the counter for the number of fields that will be inserted. - $fieldInsertedCount++; - - - // Get the name of the fields to insert - $fields .= $fnameq . ", "; - } - } - - - // If there were any inserted fields then build the rest of the insert query. - if ($fieldInsertedCount <= 0) return false; - - // Get the table name from the existing query. - if (!$tableName) { - if (!empty($rs->tableName)) $tableName = $rs->tableName; - else if (preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName)) - $tableName = $tableName[1]; - else - return false; - } - - // Strip off the comma and space on the end of both the fields - // and their values. - $fields = substr($fields, 0, -2); - $values = substr($values, 0, -2); - - // Append the fields and their values to the insert query. - return 'INSERT INTO '.$tableName.' ( '.$fields.' ) VALUES ( '.$values.' )'; -} - - -/** - * This private method is used to help construct - * the update/sql which is generated by GetInsertSQL and GetUpdateSQL. - * It handles the string construction of 1 column -> sql string based on - * the column type. We want to do 'safe' handling of BLOBs - * - * @param string the type of sql we are trying to create - * 'I' or 'U'. - * @param string column data type from the db::MetaType() method - * @param string the column name - * @param array the column value - * - * @return string - * - */ -function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFields, $magicq) -{ - $sql = ''; - - // Based on the datatype of the field - // Format the value properly for the database - switch($type) { - case 'B': - //in order to handle Blobs correctly, we need - //to do some magic for Oracle - - //we need to create a new descriptor to handle - //this properly - if (!empty($zthis->hasReturningInto)) { - if ($action == 'I') { - $sql = 'empty_blob(), '; - } else { - $sql = $fnameq. '=empty_blob(), '; - } - //add the variable to the returning clause array - //so the user can build this later in - //case they want to add more to it - $zthis->_returningArray[$fname] = ':xx'.$fname.'xx'; - } else if (empty($arrFields[$fname])){ - if ($action == 'I') { - $sql = 'empty_blob(), '; - } else { - $sql = $fnameq. '=empty_blob(), '; - } - } else { - //this is to maintain compatibility - //with older adodb versions. - $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false); - } - break; - - case "X": - //we need to do some more magic here for long variables - //to handle these correctly in oracle. - - //create a safe bind var name - //to avoid conflicts w/ dupes. - if (!empty($zthis->hasReturningInto)) { - if ($action == 'I') { - $sql = ':xx'.$fname.'xx, '; - } else { - $sql = $fnameq.'=:xx'.$fname.'xx, '; - } - //add the variable to the returning clause array - //so the user can build this later in - //case they want to add more to it - $zthis->_returningArray[$fname] = ':xx'.$fname.'xx'; - } else { - //this is to maintain compatibility - //with older adodb versions. - $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false); - } - break; - - default: - $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false); - break; - } - - return $sql; -} - -function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq, $recurse=true) -{ - - if ($recurse) { - switch($zthis->dataProvider) { - case 'postgres': - if ($type == 'L') $type = 'C'; - break; - case 'oci8': - return _adodb_column_sql_oci8($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq); - - } - } - - switch($type) { - case "C": - case "X": - case 'B': - $val = $zthis->qstr($arrFields[$fname],$magicq); - break; - - case "D": - $val = $zthis->DBDate($arrFields[$fname]); - break; - - case "T": - $val = $zthis->DBTimeStamp($arrFields[$fname]); - break; - - case "N": - $val = $arrFields[$fname]; - if (!is_numeric($val)) $val = str_replace(',', '.', (float)$val); - break; - - case "I": - case "R": - $val = $arrFields[$fname]; - if (!is_numeric($val)) $val = (integer) $val; - break; - - default: - $val = str_replace(array("'"," ","("),"",$arrFields[$fname]); // basic sql injection defence - if (empty($val)) $val = '0'; - break; - } - - if ($action == 'I') return $val . ", "; - - - return $fnameq . "=" . $val . ", "; - -} - - - -function _adodb_debug_execute(&$zthis, $sql, $inputarr) -{ - $ss = ''; - if ($inputarr) { - foreach($inputarr as $kk=>$vv) { - if (is_string($vv) && strlen($vv)>64) $vv = substr($vv,0,64).'...'; - if (is_null($vv)) $ss .= "($kk=>null) "; - else $ss .= "($kk=>'$vv') "; - } - $ss = "[ $ss ]"; - } - $sqlTxt = is_array($sql) ? $sql[0] : $sql; - /*str_replace(', ','##1#__^LF',is_array($sql) ? $sql[0] : $sql); - $sqlTxt = str_replace(',',', ',$sqlTxt); - $sqlTxt = str_replace('##1#__^LF', ', ' ,$sqlTxt); - */ - // check if running from browser or command-line - $inBrowser = isset($_SERVER['HTTP_USER_AGENT']); - - $dbt = $zthis->databaseType; - if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType; - if ($inBrowser) { - if ($ss) { - $ss = ''.htmlspecialchars($ss).''; - } - if ($zthis->debug === -1) - ADOConnection::outp( "
\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); - else - ADOConnection::outp( "

\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); - } else { - ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false); - } - - $qID = $zthis->_query($sql,$inputarr); - - /* - Alexios Fakios notes that ErrorMsg() must be called before ErrorNo() for mssql - because ErrorNo() calls Execute('SELECT @ERROR'), causing recursion - */ - if ($zthis->databaseType == 'mssql') { - // ErrorNo is a slow function call in mssql, and not reliable in PHP 4.0.6 - if($emsg = $zthis->ErrorMsg()) { - if ($err = $zthis->ErrorNo()) ADOConnection::outp($err.': '.$emsg); - } - } else if (!$qID) { - ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg()); - } - - if ($zthis->debug === 99) _adodb_backtrace(true,9999,2); - return $qID; -} - -# pretty print the debug_backtrace function -function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0,$ishtml=null) -{ - if (!function_exists('debug_backtrace')) return ''; - - if ($ishtml === null) $html = (isset($_SERVER['HTTP_USER_AGENT'])); - else $html = $ishtml; - - $fmt = ($html) ? " %% line %4d, file: %s" : "%% line %4d, file: %s"; - - $MAXSTRLEN = 128; - - $s = ($html) ? '
' : '';
-	
-	if (is_array($printOrArr)) $traceArr = $printOrArr;
-	else $traceArr = debug_backtrace();
-	array_shift($traceArr);
-	array_shift($traceArr);
-	$tabs = sizeof($traceArr)-2;
-	
-	foreach ($traceArr as $arr) {
-		if ($skippy) {$skippy -= 1; continue;}
-		$levels -= 1;
-		if ($levels < 0) break;
-		
-		$args = array();
-		for ($i=0; $i < $tabs; $i++) $s .=  ($html) ? '   ' : "\t";
-		$tabs -= 1;
-		if ($html) $s .= '';
-		if (isset($arr['class'])) $s .= $arr['class'].'.';
-		if (isset($arr['args']))
-		 foreach($arr['args'] as $v) {
-			if (is_null($v)) $args[] = 'null';
-			else if (is_array($v)) $args[] = 'Array['.sizeof($v).']';
-			else if (is_object($v)) $args[] = 'Object:'.get_class($v);
-			else if (is_bool($v)) $args[] = $v ? 'true' : 'false';
-			else {
-				$v = (string) @$v;
-				$str = htmlspecialchars(substr($v,0,$MAXSTRLEN));
-				if (strlen($v) > $MAXSTRLEN) $str .= '...';
-				$args[] = $str;
-			}
-		}
-		$s .= $arr['function'].'('.implode(', ',$args).')';
-		
-		
-		$s .= @sprintf($fmt, $arr['line'],$arr['file'],basename($arr['file']));
-			
-		$s .= "\n";
-	}	
-	if ($html) $s .= '
'; - if ($printOrArr) print $s; - - return $s; -} -/* -function _adodb_find_from($sql) -{ - - $sql = str_replace(array("\n","\r"), ' ', $sql); - $charCount = strlen($sql); - - $inString = false; - $quote = ''; - $parentheseCount = 0; - $prevChars = ''; - $nextChars = ''; - - - for($i = 0; $i < $charCount; $i++) { - - $char = substr($sql,$i,1); - $prevChars = substr($sql,0,$i); - $nextChars = substr($sql,$i+1); - - if((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === false) { - $quote = $char; - $inString = true; - } - - elseif((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === true && $quote == $char) { - $quote = ""; - $inString = false; - } - - elseif($char == "(" && $inString === false) - $parentheseCount++; - - elseif($char == ")" && $inString === false && $parentheseCount > 0) - $parentheseCount--; - - elseif($parentheseCount <= 0 && $inString === false && $char == " " && strtoupper(substr($prevChars,-5,5)) == " FROM") - return $i; - - } -} -*/ - -?> \ No newline at end of file diff --git a/includes/adodb/adodb-pager.inc.php b/includes/adodb/adodb-pager.inc.php deleted file mode 100644 index db25880d..00000000 --- a/includes/adodb/adodb-pager.inc.php +++ /dev/null @@ -1,290 +0,0 @@ - implemented Render_PageLinks(). - - Please note, this class is entirely unsupported, - and no free support requests except for bug reports - will be entertained by the author. - -*/ -class ADODB_Pager { - var $id; // unique id for pager (defaults to 'adodb') - var $db; // ADODB connection object - var $sql; // sql used - var $rs; // recordset generated - var $curr_page; // current page number before Render() called, calculated in constructor - var $rows; // number of rows per page - var $linksPerPage=10; // number of links per page in navigation bar - var $showPageLinks; - - var $gridAttributes = 'width=100% border=1 bgcolor=white'; - - // Localize text strings here - var $first = '|<'; - var $prev = '<<'; - var $next = '>>'; - var $last = '>|'; - var $moreLinks = '...'; - var $startLinks = '...'; - var $gridHeader = false; - var $htmlSpecialChars = true; - var $page = 'Page'; - var $linkSelectedColor = 'red'; - var $cache = 0; #secs to cache with CachePageExecute() - - //---------------------------------------------- - // constructor - // - // $db adodb connection object - // $sql sql statement - // $id optional id to identify which pager, - // if you have multiple on 1 page. - // $id should be only be [a-z0-9]* - // - function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false) - { - global $PHP_SELF; - - $curr_page = $id.'_curr_page'; - if (empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks - - $this->sql = $sql; - $this->id = $id; - $this->db = $db; - $this->showPageLinks = $showPageLinks; - - $next_page = $id.'_next_page'; - - if (isset($_GET[$next_page])) { - $_SESSION[$curr_page] = (integer) $_GET[$next_page]; - } - if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page - - $this->curr_page = $_SESSION[$curr_page]; - - } - - //--------------------------- - // Display link to first page - function Render_First($anchor=true) - { - global $PHP_SELF; - if ($anchor) { - ?> - first;?>   - first   "; - } - } - - //-------------------------- - // Display link to next page - function render_next($anchor=true) - { - global $PHP_SELF; - - if ($anchor) { - ?> - next;?>   - next   "; - } - } - - //------------------ - // Link to last page - // - // for better performance with large recordsets, you can set - // $this->db->pageExecuteCountRows = false, which disables - // last page counting. - function render_last($anchor=true) - { - global $PHP_SELF; - - if (!$this->db->pageExecuteCountRows) return; - - if ($anchor) { - ?> - last;?>   - last   "; - } - } - - //--------------------------------------------------- - // original code by "Pablo Costa" - function render_pagelinks() - { - global $PHP_SELF; - $pages = $this->rs->LastPageNo(); - $linksperpage = $this->linksPerPage ? $this->linksPerPage : $pages; - for($i=1; $i <= $pages; $i+=$linksperpage) - { - if($this->rs->AbsolutePage() >= $i) - { - $start = $i; - } - } - $numbers = ''; - $end = $start+$linksperpage-1; - $link = $this->id . "_next_page"; - if($end > $pages) $end = $pages; - - - if ($this->startLinks && $start > 1) { - $pos = $start - 1; - $numbers .= "$this->startLinks "; - } - - for($i=$start; $i <= $end; $i++) { - if ($this->rs->AbsolutePage() == $i) - $numbers .= "linkSelectedColor>$i "; - else - $numbers .= "$i "; - - } - if ($this->moreLinks && $end < $pages) - $numbers .= "$this->moreLinks "; - print $numbers . '   '; - } - // Link to previous page - function render_prev($anchor=true) - { - global $PHP_SELF; - if ($anchor) { - ?> - prev;?>   - prev   "; - } - } - - //-------------------------------------------------------- - // Simply rendering of grid. You should override this for - // better control over the format of the grid - // - // We use output buffering to keep code clean and readable. - function RenderGrid() - { - global $gSQLBlockRows; // used by rs2html to indicate how many rows to display - include_once(ADODB_DIR.'/tohtml.inc.php'); - ob_start(); - $gSQLBlockRows = $this->rows; - rs2html($this->rs,$this->gridAttributes,$this->gridHeader,$this->htmlSpecialChars); - $s = ob_get_contents(); - ob_end_clean(); - return $s; - } - - //------------------------------------------------------- - // Navigation bar - // - // we use output buffering to keep the code easy to read. - function RenderNav() - { - ob_start(); - if (!$this->rs->AtFirstPage()) { - $this->Render_First(); - $this->Render_Prev(); - } else { - $this->Render_First(false); - $this->Render_Prev(false); - } - if ($this->showPageLinks){ - $this->Render_PageLinks(); - } - if (!$this->rs->AtLastPage()) { - $this->Render_Next(); - $this->Render_Last(); - } else { - $this->Render_Next(false); - $this->Render_Last(false); - } - $s = ob_get_contents(); - ob_end_clean(); - return $s; - } - - //------------------- - // This is the footer - function RenderPageCount() - { - if (!$this->db->pageExecuteCountRows) return ''; - $lastPage = $this->rs->LastPageNo(); - if ($lastPage == -1) $lastPage = 1; // check for empty rs. - if ($this->curr_page > $lastPage) $this->curr_page = 1; - return "$this->page ".$this->curr_page."/".$lastPage.""; - } - - //----------------------------------- - // Call this class to draw everything. - function Render($rows=10) - { - global $ADODB_COUNTRECS; - - $this->rows = $rows; - - if ($this->db->dataProvider == 'informix') $this->db->cursorType = IFX_SCROLL; - - $savec = $ADODB_COUNTRECS; - if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true; - if ($this->cache) - $rs = $this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page); - else - $rs = $this->db->PageExecute($this->sql,$rows,$this->curr_page); - $ADODB_COUNTRECS = $savec; - - $this->rs = $rs; - if (!$rs) { - print "

Query failed: $this->sql

"; - return; - } - - if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) - $header = $this->RenderNav(); - else - $header = " "; - - $grid = $this->RenderGrid(); - $footer = $this->RenderPageCount(); - - $this->RenderLayout($header,$grid,$footer); - - $rs->Close(); - $this->rs = false; - } - - //------------------------------------------------------ - // override this to control overall layout and formating - function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige') - { - echo "
", - $header, - "
", - $grid, - "
", - $footer, - "
"; - } -} - - -?> \ No newline at end of file diff --git a/includes/adodb/adodb-pear.inc.php b/includes/adodb/adodb-pear.inc.php deleted file mode 100644 index 8dc4460c..00000000 --- a/includes/adodb/adodb-pear.inc.php +++ /dev/null @@ -1,374 +0,0 @@ - | - * and Tomas V.V.Cox . Portions (c)1997-2002 The PHP Group. - */ - - /* - We support: - - DB_Common - --------- - query - returns PEAR_Error on error - limitQuery - return PEAR_Error on error - prepare - does not return PEAR_Error on error - execute - does not return PEAR_Error on error - setFetchMode - supports ASSOC and ORDERED - errorNative - quote - nextID - disconnect - - getOne - getAssoc - getRow - getCol - getAll - - DB_Result - --------- - numRows - returns -1 if not supported - numCols - fetchInto - does not support passing of fetchmode - fetchRows - does not support passing of fetchmode - free - */ - -define('ADODB_PEAR',dirname(__FILE__)); -include_once "PEAR.php"; -include_once ADODB_PEAR."/adodb-errorpear.inc.php"; -include_once ADODB_PEAR."/adodb.inc.php"; - -if (!defined('DB_OK')) { -define("DB_OK", 1); -define("DB_ERROR",-1); - -// autoExecute constants -define('DB_AUTOQUERY_INSERT', 1); -define('DB_AUTOQUERY_UPDATE', 2); - -/** - * This is a special constant that tells DB the user hasn't specified - * any particular get mode, so the default should be used. - */ - -define('DB_FETCHMODE_DEFAULT', 0); - -/** - * Column data indexed by numbers, ordered from 0 and up - */ - -define('DB_FETCHMODE_ORDERED', 1); - -/** - * Column data indexed by column names - */ - -define('DB_FETCHMODE_ASSOC', 2); - -/* for compatibility */ - -define('DB_GETMODE_ORDERED', DB_FETCHMODE_ORDERED); -define('DB_GETMODE_ASSOC', DB_FETCHMODE_ASSOC); - -/** - * these are constants for the tableInfo-function - * they are bitwised or'ed. so if there are more constants to be defined - * in the future, adjust DB_TABLEINFO_FULL accordingly - */ - -define('DB_TABLEINFO_ORDER', 1); -define('DB_TABLEINFO_ORDERTABLE', 2); -define('DB_TABLEINFO_FULL', 3); -} - -/** - * The main "DB" class is simply a container class with some static - * methods for creating DB objects as well as some utility functions - * common to all parts of DB. - * - */ - -class DB -{ - /** - * Create a new DB object for the specified database type - * - * @param $type string database type, for example "mysql" - * - * @return object a newly created DB object, or a DB error code on - * error - */ - - function factory($type) - { - include_once(ADODB_DIR."/drivers/adodb-$type.inc.php"); - $obj = NewADOConnection($type); - if (!is_object($obj)) $obj = new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1); - return $obj; - } - - /** - * Create a new DB object and connect to the specified database - * - * @param $dsn mixed "data source name", see the DB::parseDSN - * method for a description of the dsn format. Can also be - * specified as an array of the format returned by DB::parseDSN. - * - * @param $options mixed if boolean (or scalar), tells whether - * this connection should be persistent (for backends that support - * this). This parameter can also be an array of options, see - * DB_common::setOption for more information on connection - * options. - * - * @return object a newly created DB connection object, or a DB - * error object on error - * - * @see DB::parseDSN - * @see DB::isError - */ - function connect($dsn, $options = false) - { - if (is_array($dsn)) { - $dsninfo = $dsn; - } else { - $dsninfo = DB::parseDSN($dsn); - } - switch ($dsninfo["phptype"]) { - case 'pgsql': $type = 'postgres7'; break; - case 'ifx': $type = 'informix9'; break; - default: $type = $dsninfo["phptype"]; break; - } - - if (is_array($options) && isset($options["debug"]) && - $options["debug"] >= 2) { - // expose php errors with sufficient debug level - @include_once("adodb-$type.inc.php"); - } else { - @include_once("adodb-$type.inc.php"); - } - - @$obj = NewADOConnection($type); - if (!is_object($obj)) { - $obj = new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1); - return $obj; - } - if (is_array($options)) { - foreach($options as $k => $v) { - switch(strtolower($k)) { - case 'persist': - case 'persistent': $persist = $v; break; - #ibase - case 'dialect': $obj->dialect = $v; break; - case 'charset': $obj->charset = $v; break; - case 'buffers': $obj->buffers = $v; break; - #ado - case 'charpage': $obj->charPage = $v; break; - #mysql - case 'clientflags': $obj->clientFlags = $v; break; - } - } - } else { - $persist = false; - } - - if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= ':'.$dsninfo['socket']; - else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= ':'.$dsninfo['port']; - - if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']); - else $ok = $obj->Connect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']); - - if (!$ok) $obj = ADODB_PEAR_Error(); - return $obj; - } - - /** - * Return the DB API version - * - * @return int the DB API version number - */ - function apiVersion() - { - return 2; - } - - /** - * Tell whether a result code from a DB method is an error - * - * @param $value int result code - * - * @return bool whether $value is an error - */ - function isError($value) - { - if (!is_object($value)) return false; - $class = strtolower(get_class($value)); - return $class == 'pear_error' || is_subclass_of($value, 'pear_error') || - $class == 'db_error' || is_subclass_of($value, 'db_error'); - } - - - /** - * Tell whether a result code from a DB method is a warning. - * Warnings differ from errors in that they are generated by DB, - * and are not fatal. - * - * @param $value mixed result value - * - * @return bool whether $value is a warning - */ - function isWarning($value) - { - return false; - /* - return is_object($value) && - (get_class( $value ) == "db_warning" || - is_subclass_of($value, "db_warning"));*/ - } - - /** - * Parse a data source name - * - * @param $dsn string Data Source Name to be parsed - * - * @return array an associative array with the following keys: - * - * phptype: Database backend used in PHP (mysql, odbc etc.) - * dbsyntax: Database used with regards to SQL syntax etc. - * protocol: Communication protocol to use (tcp, unix etc.) - * hostspec: Host specification (hostname[:port]) - * database: Database to use on the DBMS server - * username: User name for login - * password: Password for login - * - * The format of the supplied DSN is in its fullest form: - * - * phptype(dbsyntax)://username:password@protocol+hostspec/database - * - * Most variations are allowed: - * - * phptype://username:password@protocol+hostspec:110//usr/db_file.db - * phptype://username:password@hostspec/database_name - * phptype://username:password@hostspec - * phptype://username@hostspec - * phptype://hostspec/database - * phptype://hostspec - * phptype(dbsyntax) - * phptype - * - * @author Tomas V.V.Cox - */ - function parseDSN($dsn) - { - if (is_array($dsn)) { - return $dsn; - } - - $parsed = array( - 'phptype' => false, - 'dbsyntax' => false, - 'protocol' => false, - 'hostspec' => false, - 'database' => false, - 'username' => false, - 'password' => false - ); - - // Find phptype and dbsyntax - if (($pos = strpos($dsn, '://')) !== false) { - $str = substr($dsn, 0, $pos); - $dsn = substr($dsn, $pos + 3); - } else { - $str = $dsn; - $dsn = NULL; - } - - // Get phptype and dbsyntax - // $str => phptype(dbsyntax) - if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) { - $parsed['phptype'] = $arr[1]; - $parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2]; - } else { - $parsed['phptype'] = $str; - $parsed['dbsyntax'] = $str; - } - - if (empty($dsn)) { - return $parsed; - } - - // Get (if found): username and password - // $dsn => username:password@protocol+hostspec/database - if (($at = strpos($dsn,'@')) !== false) { - $str = substr($dsn, 0, $at); - $dsn = substr($dsn, $at + 1); - if (($pos = strpos($str, ':')) !== false) { - $parsed['username'] = urldecode(substr($str, 0, $pos)); - $parsed['password'] = urldecode(substr($str, $pos + 1)); - } else { - $parsed['username'] = urldecode($str); - } - } - - // Find protocol and hostspec - // $dsn => protocol+hostspec/database - if (($pos=strpos($dsn, '/')) !== false) { - $str = substr($dsn, 0, $pos); - $dsn = substr($dsn, $pos + 1); - } else { - $str = $dsn; - $dsn = NULL; - } - - // Get protocol + hostspec - // $str => protocol+hostspec - if (($pos=strpos($str, '+')) !== false) { - $parsed['protocol'] = substr($str, 0, $pos); - $parsed['hostspec'] = urldecode(substr($str, $pos + 1)); - } else { - $parsed['hostspec'] = urldecode($str); - } - - // Get dabase if any - // $dsn => database - if (!empty($dsn)) { - $parsed['database'] = $dsn; - } - - return $parsed; - } - - /** - * Load a PHP database extension if it is not loaded already. - * - * @access public - * - * @param $name the base name of the extension (without the .so or - * .dll suffix) - * - * @return bool true if the extension was already or successfully - * loaded, false if it could not be loaded - */ - function assertExtension($name) - { - if (!extension_loaded($name)) { - $dlext = (strncmp(PHP_OS,'WIN',3) === 0) ? '.dll' : '.so'; - @dl($name . $dlext); - } - if (!extension_loaded($name)) { - return false; - } - return true; - } -} - -?> \ No newline at end of file diff --git a/includes/adodb/adodb-perf.inc.php b/includes/adodb/adodb-perf.inc.php deleted file mode 100644 index 39fdf2ed..00000000 --- a/includes/adodb/adodb-perf.inc.php +++ /dev/null @@ -1,1089 +0,0 @@ -= minimum number of secs to run - - -// returns in K the memory of current process, or 0 if not known -function adodb_getmem() -{ - if (function_exists('memory_get_usage')) - return (integer) ((memory_get_usage()+512)/1024); - - $pid = getmypid(); - - if ( strncmp(strtoupper(PHP_OS),'WIN',3)==0) { - $output = array(); - - exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output); - return substr($output[5], strpos($output[5], ':') + 1); - } - - /* Hopefully UNIX */ - exec("ps --pid $pid --no-headers -o%mem,size", $output); - if (sizeof($output) == 0) return 0; - - $memarr = explode(' ',$output[0]); - if (sizeof($memarr)>=2) return (integer) $memarr[1]; - - return 0; -} - -// avoids localization problems where , is used instead of . -function adodb_round($n,$prec) -{ - return number_format($n, $prec, '.', ''); -} - -/* return microtime value as a float */ -function adodb_microtime() -{ - $t = microtime(); - $t = explode(' ',$t); - return (float)$t[1]+ (float)$t[0]; -} - -/* sql code timing */ -function adodb_log_sql(&$connx,$sql,$inputarr) -{ - $perf_table = adodb_perf::table(); - $connx->fnExecute = false; - $t0 = microtime(); - $rs = $connx->Execute($sql,$inputarr); - $t1 = microtime(); - - if (!empty($connx->_logsql) && (empty($connx->_logsqlErrors) || !$rs)) { - global $ADODB_LOG_CONN; - - if (!empty($ADODB_LOG_CONN)) { - $conn = $ADODB_LOG_CONN; - if ($conn->databaseType != $connx->databaseType) - $prefix = '/*dbx='.$connx->databaseType .'*/ '; - else - $prefix = ''; - } else { - $conn = $connx; - $prefix = ''; - } - - $conn->_logsql = false; // disable logsql error simulation - $dbT = $conn->databaseType; - - $a0 = split(' ',$t0); - $a0 = (float)$a0[1]+(float)$a0[0]; - - $a1 = split(' ',$t1); - $a1 = (float)$a1[1]+(float)$a1[0]; - - $time = $a1 - $a0; - - if (!$rs) { - $errM = $connx->ErrorMsg(); - $errN = $connx->ErrorNo(); - $conn->lastInsID = 0; - $tracer = substr('ERROR: '.htmlspecialchars($errM),0,250); - } else { - $tracer = ''; - $errM = ''; - $errN = 0; - $dbg = $conn->debug; - $conn->debug = false; - if (!is_object($rs) || $rs->dataProvider == 'empty') - $conn->_affected = $conn->affected_rows(true); - $conn->lastInsID = @$conn->Insert_ID(); - $conn->debug = $dbg; - } - if (isset($_SERVER['HTTP_HOST'])) { - $tracer .= '
'.$_SERVER['HTTP_HOST']; - if (isset($_SERVER['PHP_SELF'])) $tracer .= htmlspecialchars($_SERVER['PHP_SELF']); - } else - if (isset($_SERVER['PHP_SELF'])) $tracer .= '
'.htmlspecialchars($_SERVER['PHP_SELF']); - //$tracer .= (string) adodb_backtrace(false); - - $tracer = (string) substr($tracer,0,500); - - if (is_array($inputarr)) { - if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr); - else { - // Quote string parameters so we can see them in the - // performance stats. This helps spot disabled indexes. - $xar_params = $inputarr; - foreach ($xar_params as $xar_param_key => $xar_param) { - if (gettype($xar_param) == 'string') - $xar_params[$xar_param_key] = '"' . $xar_param . '"'; - } - $params = implode(', ', $xar_params); - if (strlen($params) >= 3000) $params = substr($params, 0, 3000); - } - } else { - $params = ''; - } - - if (is_array($sql)) $sql = $sql[0]; - if ($prefix) $sql = $prefix.$sql; - $arr = array('b'=>strlen($sql).'.'.crc32($sql), - 'c'=>substr($sql,0,3900), 'd'=>$params,'e'=>$tracer,'f'=>adodb_round($time,6)); - //var_dump($arr); - $saved = $conn->debug; - $conn->debug = 0; - - $d = $conn->sysTimeStamp; - if (empty($d)) $d = date("'Y-m-d H:i:s'"); - if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') { - $isql = "insert into $perf_table values($d,:b,:c,:d,:e,:f)"; - } else if ($dbT == 'odbc_mssql' || $dbT == 'informix' || strncmp($dbT,'odbtp',4)==0) { - $timer = $arr['f']; - if ($dbT == 'informix') $sql2 = substr($sql2,0,230); - - $sql1 = $conn->qstr($arr['b']); - $sql2 = $conn->qstr($arr['c']); - $params = $conn->qstr($arr['d']); - $tracer = $conn->qstr($arr['e']); - - $isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($d,$sql1,$sql2,$params,$tracer,$timer)"; - if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql); - $arr = false; - } else { - if ($dbT == 'db2') $arr['f'] = (float) $arr['f']; - $isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)"; - } - - global $ADODB_PERF_MIN; - if ($errN != 0 || $time >= $ADODB_PERF_MIN) { - $ok = $conn->Execute($isql,$arr); - } else - $ok = true; - - $conn->debug = $saved; - - if ($ok) { - $conn->_logsql = true; - } else { - $err2 = $conn->ErrorMsg(); - $conn->_logsql = true; // enable logsql error simulation - $perf = NewPerfMonitor($conn); - if ($perf) { - if ($perf->CreateLogTable()) $ok = $conn->Execute($isql,$arr); - } else { - $ok = $conn->Execute("create table $perf_table ( - created varchar(50), - sql0 varchar(250), - sql1 varchar(4000), - params varchar(3000), - tracer varchar(500), - timer decimal(16,6))"); - } - if (!$ok) { - ADOConnection::outp( "

LOGSQL Insert Failed: $isql
$err2

"); - $conn->_logsql = false; - } - } - $connx->_errorMsg = $errM; - $connx->_errorCode = $errN; - } - $connx->fnExecute = 'adodb_log_sql'; - return $rs; -} - - -/* -The settings data structure is an associative array that database parameter per element. - -Each database parameter element in the array is itself an array consisting of: - -0: category code, used to group related db parameters -1: either - a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'", - b. array holding sql string and field to look for, e.g. array('show variables','table_cache'), - c. a string prefixed by =, then a PHP method of the class is invoked, - e.g. to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue', -2: description of the database parameter -*/ - -class adodb_perf { - var $conn; - var $color = '#F0F0F0'; - var $table = ''; - var $titles = ''; - var $warnRatio = 90; - var $tablesSQL = false; - var $cliFormat = "%32s => %s \r\n"; - var $sql1 = 'sql1'; // used for casting sql1 to text for mssql - var $explain = true; - var $helpurl = "LogSQL help"; - var $createTableSQL = false; - var $maxLength = 2000; - - // Sets the tablename to be used - static function table($newtable = false) - { - static $_table; - - if (!empty($newtable)) $_table = $newtable; - if (empty($_table)) $_table = 'adodb_logsql'; - return $_table; - } - - // returns array with info to calculate CPU Load - function _CPULoad() - { -/* - -cpu 524152 2662 2515228 336057010 -cpu0 264339 1408 1257951 168025827 -cpu1 259813 1254 1257277 168031181 -page 622307 25475680 -swap 24 1891 -intr 890153570 868093576 6 0 4 4 0 6 1 2 0 0 0 124 0 8098760 2 13961053 0 0 0 0 0 0 0 0 0 0 0 0 0 16 16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -disk_io: (3,0):(3144904,54369,610378,3090535,50936192) (3,1):(3630212,54097,633016,3576115,50951320) -ctxt 66155838 -btime 1062315585 -processes 69293 - -*/ - // Algorithm is taken from - // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp - if (strncmp(PHP_OS,'WIN',3)==0) { - if (PHP_VERSION == '5.0.0') return false; - if (PHP_VERSION == '5.0.1') return false; - if (PHP_VERSION == '5.0.2') return false; - if (PHP_VERSION == '5.0.3') return false; - if (PHP_VERSION == '4.3.10') return false; # see http://bugs.php.net/bug.php?id=31737 - - @$c = new COM("WinMgmts:{impersonationLevel=impersonate}!Win32_PerfRawData_PerfOS_Processor.Name='_Total'"); - if (!$c) return false; - - $info[0] = $c->PercentProcessorTime; - $info[1] = 0; - $info[2] = 0; - $info[3] = $c->TimeStamp_Sys100NS; - //print_r($info); - return $info; - } - - // Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com) - $statfile = '/proc/stat'; - if (!file_exists($statfile)) return false; - - $fd = fopen($statfile,"r"); - if (!$fd) return false; - - $statinfo = explode("\n",fgets($fd, 1024)); - fclose($fd); - foreach($statinfo as $line) { - $info = explode(" ",$line); - if($info[0]=="cpu") { - array_shift($info); // pop off "cpu" - if(!$info[0]) array_shift($info); // pop off blank space (if any) - return $info; - } - } - - return false; - - } - - /* NOT IMPLEMENTED */ - function MemInfo() - { - /* - - total: used: free: shared: buffers: cached: -Mem: 1055289344 917299200 137990144 0 165437440 599773184 -Swap: 2146775040 11055104 2135719936 -MemTotal: 1030556 kB -MemFree: 134756 kB -MemShared: 0 kB -Buffers: 161560 kB -Cached: 581384 kB -SwapCached: 4332 kB -Active: 494468 kB -Inact_dirty: 322856 kB -Inact_clean: 24256 kB -Inact_target: 168316 kB -HighTotal: 131064 kB -HighFree: 1024 kB -LowTotal: 899492 kB -LowFree: 133732 kB -SwapTotal: 2096460 kB -SwapFree: 2085664 kB -Committed_AS: 348732 kB - */ - } - - - /* - Remember that this is client load, not db server load! - */ - var $_lastLoad; - function CPULoad() - { - $info = $this->_CPULoad(); - if (!$info) return false; - - if (empty($this->_lastLoad)) { - sleep(1); - $this->_lastLoad = $info; - $info = $this->_CPULoad(); - } - - $last = $this->_lastLoad; - $this->_lastLoad = $info; - - $d_user = $info[0] - $last[0]; - $d_nice = $info[1] - $last[1]; - $d_system = $info[2] - $last[2]; - $d_idle = $info[3] - $last[3]; - - //printf("Delta - User: %f Nice: %f System: %f Idle: %f
",$d_user,$d_nice,$d_system,$d_idle); - - if (strncmp(PHP_OS,'WIN',3)==0) { - if ($d_idle < 1) $d_idle = 1; - return 100*(1-$d_user/$d_idle); - }else { - $total=$d_user+$d_nice+$d_system+$d_idle; - if ($total<1) $total=1; - return 100*($d_user+$d_nice+$d_system)/$total; - } - } - - function Tracer($sql) - { - $perf_table = adodb_perf::table(); - $saveE = $this->conn->fnExecute; - $this->conn->fnExecute = false; - - global $ADODB_FETCH_MODE; - $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); - - $sqlq = $this->conn->qstr($sql); - $arr = $this->conn->GetArray( -"select count(*),tracer - from $perf_table where sql1=$sqlq - group by tracer - order by 1 desc"); - $s = ''; - if ($arr) { - $s .= '

Scripts Affected

'; - foreach($arr as $k) { - $s .= sprintf("%4d",$k[0]).'   '.strip_tags($k[1]).'
'; - } - } - - if (isset($savem)) $this->conn->SetFetchMode($savem); - $ADODB_CACHE_MODE = $save; - $this->conn->fnExecute = $saveE; - return $s; - } - - /* - Explain Plan for $sql. - If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the - actual sql. - */ - function Explain($sql,$partial=false) - { - return false; - } - - function InvalidSQL($numsql = 10) - { - - if (isset($_GET['sql'])) return; - $s = '

Invalid SQL

'; - $saveE = $this->conn->fnExecute; - $this->conn->fnExecute = false; - $perf_table = adodb_perf::table(); - $rs = $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql); - $this->conn->fnExecute = $saveE; - if ($rs) { - $s .= rs2html($rs,false,false,false,false); - } else - return "

$this->helpurl. ".$this->conn->ErrorMsg()."

"; - - return $s; - } - - - /* - This script identifies the longest running SQL - */ - function _SuspiciousSQL($numsql = 10) - { - global $ADODB_FETCH_MODE; - - $perf_table = adodb_perf::table(); - $saveE = $this->conn->fnExecute; - $this->conn->fnExecute = false; - - if (isset($_GET['exps']) && isset($_GET['sql'])) { - $partial = !empty($_GET['part']); - echo "".$this->Explain($_GET['sql'],$partial)."\n"; - } - - if (isset($_GET['sql'])) return; - $sql1 = $this->sql1; - - $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); - //$this->conn->debug=1; - $rs = $this->conn->SelectLimit( - "select avg(timer) as avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer - from $perf_table - where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT') - and (tracer is null or tracer not like 'ERROR:%') - group by sql1 - order by 1 desc",$numsql); - if (isset($savem)) $this->conn->SetFetchMode($savem); - $ADODB_FETCH_MODE = $save; - $this->conn->fnExecute = $saveE; - - if (!$rs) return "

$this->helpurl. ".$this->conn->ErrorMsg()."

"; - $s = "

Suspicious SQL

-The following SQL have high average execution times
-
ParameterValueDescription
\n"; - $max = $this->maxLength; - while (!$rs->EOF) { - $sql = $rs->fields[1]; - $raw = urlencode($sql); - if (strlen($raw)>$max-100) { - $sql2 = substr($sql,0,$max-500); - $raw = urlencode($sql2).'&part='.crc32($sql); - } - $prefix = ""; - $suffix = ""; - if ($this->explain == false || strlen($prefix)>$max) { - $suffix = ' ... String too long for GET parameter: '.strlen($prefix).''; - $prefix = ''; - } - $s .= ""; - $rs->MoveNext(); - } - return $s."
Avg TimeCountSQLMaxMin
".adodb_round($rs->fields[0],6)."".$rs->fields[2]."".$prefix.htmlspecialchars($sql).$suffix."". - "".$rs->fields[3]."".$rs->fields[4]."
"; - - } - - function CheckMemory() - { - return ''; - } - - - function SuspiciousSQL($numsql=10) - { - return adodb_perf::_SuspiciousSQL($numsql); - } - - function ExpensiveSQL($numsql=10) - { - return adodb_perf::_ExpensiveSQL($numsql); - } - - - /* - This reports the percentage of load on the instance due to the most - expensive few SQL statements. Tuning these statements can often - make huge improvements in overall system performance. - */ - function _ExpensiveSQL($numsql = 10) - { - global $ADODB_FETCH_MODE; - - $perf_table = adodb_perf::table(); - $saveE = $this->conn->fnExecute; - $this->conn->fnExecute = false; - - if (isset($_GET['expe']) && isset($_GET['sql'])) { - $partial = !empty($_GET['part']); - echo "".$this->Explain($_GET['sql'],$partial)."\n"; - } - - if (isset($_GET['sql'])) return; - - $sql1 = $this->sql1; - $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); - - $rs = $this->conn->SelectLimit( - "select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer - from $perf_table - where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT') - and (tracer is null or tracer not like 'ERROR:%') - group by sql1 - having count(*)>1 - order by 1 desc",$numsql); - if (isset($savem)) $this->conn->SetFetchMode($savem); - $this->conn->fnExecute = $saveE; - $ADODB_FETCH_MODE = $save; - if (!$rs) return "

$this->helpurl. ".$this->conn->ErrorMsg()."

"; - $s = "

Expensive SQL

-Tuning the following SQL could reduce the server load substantially
-\n"; - $max = $this->maxLength; - while (!$rs->EOF) { - $sql = $rs->fields[1]; - $raw = urlencode($sql); - if (strlen($raw)>$max-100) { - $sql2 = substr($sql,0,$max-500); - $raw = urlencode($sql2).'&part='.crc32($sql); - } - $prefix = ""; - $suffix = ""; - if($this->explain == false || strlen($prefix>$max)) { - $prefix = ''; - $suffix = ''; - } - $s .= ""; - $rs->MoveNext(); - } - return $s."
LoadCountSQLMaxMin
".adodb_round($rs->fields[0],6)."".$rs->fields[2]."".$prefix.htmlspecialchars($sql).$suffix."". - "".$rs->fields[3]."".$rs->fields[4]."
"; - } - - /* - Raw function to return parameter value from $settings. - */ - function DBParameter($param) - { - if (empty($this->settings[$param])) return false; - $sql = $this->settings[$param][1]; - return $this->_DBParameter($sql); - } - - /* - Raw function returning array of poll paramters - */ - function PollParameters() - { - $arr[0] = (float)$this->DBParameter('data cache hit ratio'); - $arr[1] = (float)$this->DBParameter('data reads'); - $arr[2] = (float)$this->DBParameter('data writes'); - $arr[3] = (integer) $this->DBParameter('current connections'); - return $arr; - } - - /* - Low-level Get Database Parameter - */ - function _DBParameter($sql) - { - $savelog = $this->conn->LogSQL(false); - if (is_array($sql)) { - global $ADODB_FETCH_MODE; - - $sql1 = $sql[0]; - $key = $sql[1]; - if (sizeof($sql)>2) $pos = $sql[2]; - else $pos = 1; - if (sizeof($sql)>3) $coef = $sql[3]; - else $coef = false; - $ret = false; - $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); - - $rs = $this->conn->Execute($sql1); - - if (isset($savem)) $this->conn->SetFetchMode($savem); - $ADODB_FETCH_MODE = $save; - if ($rs) { - while (!$rs->EOF) { - $keyf = reset($rs->fields); - if (trim($keyf) == $key) { - $ret = $rs->fields[$pos]; - if ($coef) $ret *= $coef; - break; - } - $rs->MoveNext(); - } - $rs->Close(); - } - $this->conn->LogSQL($savelog); - return $ret; - } else { - if (strncmp($sql,'=',1) == 0) { - $fn = substr($sql,1); - return $this->$fn(); - } - $sql = str_replace('$DATABASE',$this->conn->database,$sql); - $ret = $this->conn->GetOne($sql); - $this->conn->LogSQL($savelog); - - return $ret; - } - } - - /* - Warn if cache ratio falls below threshold. Displayed in "Description" column. - */ - function WarnCacheRatio($val) - { - if ($val < $this->warnRatio) - return 'Cache ratio should be at least '.$this->warnRatio.'%'; - else return ''; - } - - function clearsql() - { - $perf_table = adodb_perf::table(); - $this->conn->Execute("delete from $perf_table where created<".$this->conn->sysTimeStamp); - } - /***********************************************************************************************/ - // HIGH LEVEL UI FUNCTIONS - /***********************************************************************************************/ - - - function UI($pollsecs=5) - { - global $ADODB_LOG_CONN; - - $perf_table = adodb_perf::table(); - $conn = $this->conn; - - $app = $conn->host; - if ($conn->host && $conn->database) $app .= ', db='; - $app .= $conn->database; - - if ($app) $app .= ', '; - $savelog = $this->conn->LogSQL(false); - $info = $conn->ServerInfo(); - if (isset($_GET['clearsql'])) { - $this->clearsql(); - } - $this->conn->LogSQL($savelog); - - // magic quotes - - if (isset($_GET['sql']) && get_magic_quotes_gpc()) { - $_GET['sql'] = $_GET['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$_GET['sql']); - } - - if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10; - else $nsql = $_SESSION['ADODB_PERF_SQL']; - - $app .= $info['description']; - - - if (isset($_GET['do'])) $do = $_GET['do']; - else if (isset($_POST['do'])) $do = $_POST['do']; - else if (isset($_GET['sql'])) $do = 'viewsql'; - else $do = 'stats'; - - if (isset($_GET['nsql'])) { - if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $_GET['nsql']; - } - echo "ADOdb Performance Monitor on $app"; - if ($do == 'viewsql') $form = "
# SQL:
"; - else $form = " "; - - $allowsql = !defined('ADODB_PERF_NO_RUN_SQL'); - global $ADODB_PERF_MIN; - $app .= " (Min sql timing \$ADODB_PERF_MIN=$ADODB_PERF_MIN secs)"; - - if (empty($_GET['hidem'])) - echo "
- ADOdb Performance Monitor for $app
- Performance Stats   View SQL -   View Tables   Poll Stats", - $allowsql ? '   Run SQL' : '', - "$form", - "
"; - - - switch ($do) { - default: - case 'stats': - if (empty($ADODB_LOG_CONN)) - echo "

  Clear SQL Log
"; - echo $this->HealthCheck(); - //$this->conn->debug=1; - echo $this->CheckMemory(); - break; - case 'poll': - $self = htmlspecialchars($_SERVER['PHP_SELF']); - echo ""; - break; - case 'poll2': - echo "

";
-			$this->Poll($pollsecs);
-			break;
-		
-		case 'dosql':
-			if (!$allowsql) break;
-			
-			$this->DoSQLForm();
-			break;
-		case 'viewsql':
-			if (empty($_GET['hidem']))
-				echo "  Clear SQL Log
";
-			echo($this->SuspiciousSQL($nsql));
-			echo($this->ExpensiveSQL($nsql));
-			echo($this->InvalidSQL($nsql));
-			break;
-		case 'tables': 
-			echo $this->Tables(); break;
-		}
-		global $ADODB_vers;
-		echo "
$ADODB_vers Sponsored by phpLens
";
-	}
-	
-	/*
-		Runs in infinite loop, returning real-time statistics
-	*/
-	function Poll($secs=5)
-	{
-		$this->conn->fnExecute = false;
-		//$this->conn->debug=1;
-		if ($secs <= 1) $secs = 1;
-		echo "Accumulating statistics, every $secs seconds...\n";flush();
-		$arro = $this->PollParameters();
-		$cnt = 0;
-		set_time_limit(0);
-		sleep($secs);
-		while (1) {
-
-			$arr = $this->PollParameters();
-			
-			$hits   = sprintf('%2.2f',$arr[0]);
-			$reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
-			$writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
-			$sess = sprintf('%5d',$arr[3]);
-			
-			$load = $this->CPULoad();
-			if ($load !== false) {
-				$oslabel = 'WS-CPU%';
-				$osval = sprintf(" %2.1f  ",(float) $load);
-			}else {
-				$oslabel = '';
-				$osval = '';
-			}
-			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n"; 
-			$cnt += 1;
-			echo date('H:i:s').'  '.$osval."$hits  $sess $reads $writes\n";
-			flush();
-			
-			if (connection_aborted()) return;
-			
-			sleep($secs);
-			$arro = $arr;
-		}
-	}
-	
-	/*
-		Returns basic health check in a command line interface
-	*/
-	function HealthCheckCLI()
-	{
-		return $this->HealthCheck(true);
-	}
-	
-		
-	/*
-		Returns basic health check as HTML
-	*/
-	function HealthCheck($cli=false)
-	{
-		$saveE = $this->conn->fnExecute;
-		$this->conn->fnExecute = false;	
-		if ($cli) $html = '';
-		else $html = $this->table.'
'.$this->conn->databaseType.'
'.$this->titles;
-		
-		$oldc = false;
-		$bgc = '';
-		foreach($this->settings as $name => $arr) {
-			if ($arr === false) break;
-			
-			if (!is_string($name)) {
-				if ($cli) $html .= " -- $arr -- \n";
-				else $html .= "color>$arr  ";
-				continue;
-			}
-			
-			if (!is_array($arr)) break;
-			$category = $arr[0];
-			$how = $arr[1];
-			if (sizeof($arr)>2) $desc = $arr[2];
-			else $desc = '   ';
-			
-			
-			if ($category == 'HIDE') continue;
-			
-			$val = $this->_DBParameter($how);
-			
-			if ($desc && strncmp($desc,"=",1) === 0) {
-				$fn = substr($desc,1);
-				$desc = $this->$fn($val);
-			}
-			
-			if ($val === false) {
-				$m = $this->conn->ErrorMsg();
-				$val = "Error: $m"; 
-			} else {
-				if (is_numeric($val) && $val >= 256*1024) {
-					if ($val % (1024*1024) == 0) {
-						$val /= (1024*1024);
-						$val .= 'M';
-					} else if ($val % 1024 == 0) {
-						$val /= 1024;
-						$val .= 'K';
-					}
-					//$val = htmlspecialchars($val);
-				}
-			}
-			if ($category != $oldc) {
-				$oldc = $category;
-				//$bgc = ($bgc == ' bgcolor='.$this->color) ? ' bgcolor=white' : ' bgcolor='.$this->color;
-			}
-			if (strlen($desc)==0) $desc = ' ';
-			if (strlen($val)==0) $val = ' ';
-			if ($cli) {
-				$html  .= str_replace(' ','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
-				
-			}else {
-				$html .= "".$name.''.$val.''.$desc."\n";
-			}
-		}
-		
-		if (!$cli) $html .= "\n";
-		$this->conn->fnExecute = $saveE;
-			
-		return $html;	
-	}
-	
-	function Tables($orderby='1')
-	{
-		if (!$this->tablesSQL) return false;
-		
-		$savelog = $this->conn->LogSQL(false);
-		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);
-		$this->conn->LogSQL($savelog);
-		$html = rs2html($rs,false,false,false,false);
-		return $html;
-	}
-	
-
-	function CreateLogTable()
-	{
-		if (!$this->createTableSQL) return false;
-		
-		$table = $this->table();
-		$sql = str_replace('adodb_logsql',$table,$this->createTableSQL);
-		$savelog = $this->conn->LogSQL(false);
-		$ok = $this->conn->Execute($sql);
-		$this->conn->LogSQL($savelog);
-		return ($ok) ? true : false;
-	}
-	
-	function DoSQLForm()
-	{
-	
-		
-		$PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']);
-		$sql = isset($_REQUEST['sql']) ? $_REQUEST['sql'] : '';
-
-		if (isset($_SESSION['phplens_sqlrows'])) $rows = $_SESSION['phplens_sqlrows'];
-		else $rows = 3;
-		
-		if (isset($_REQUEST['SMALLER'])) {
-			$rows /= 2;
-			if ($rows < 3) $rows = 3;
-			$_SESSION['phplens_sqlrows'] = $rows;
-		}
-		if (isset($_REQUEST['BIGGER'])) {
-			$rows *= 2;
-			$_SESSION['phplens_sqlrows'] = $rows;
-		}
-		
-?>
-
-

-
-
-
-  
-  
-  
- 
 Form size: 
-
-
-

-  

-

-
-undomq(trim($sql));
-		if (substr($sql,strlen($sql)-1) === ';') {
-			$print = true;
-			$sqla = $this->SplitSQL($sql);
-		} else  {
-			$print = false;
-			$sqla = array($sql);
-		}
-		foreach($sqla as $sqls) {
-
-			if (!$sqls) continue;
-			
-			if ($print) {
-				print "
".htmlspecialchars($sqls)."
";
-				flush();
-			}
-			$savelog = $this->conn->LogSQL(false);
-			$rs = $this->conn->Execute($sqls);
-			$this->conn->LogSQL($savelog);
-			if ($rs && is_object($rs) && !$rs->EOF) {
-				rs2html($rs);
-				while ($rs->NextRecordSet()) {
-					print "
 
";
-					rs2html($rs);
-				}
-			} else {
-				$e1 = (integer) $this->conn->ErrorNo();
-				$e2 = $this->conn->ErrorMsg();
-				if (($e1) || ($e2)) {
-					if (empty($e1)) $e1 = '-1'; // postgresql fix
-					print '   '.$e1.': '.$e2;
-				} else {
-					print "
No Recordset returned
";
-				}
-			}
-		} // foreach
-	}
-	
-	function SplitSQL($sql)
-	{
-		$arr = explode(';',$sql);
-		return $arr;
-	}
-	
-	function undomq($m) 
-	{
-	if (get_magic_quotes_gpc()) {
-		// undo the damage
-		$m = str_replace('\\\\','\\',$m);
-		$m = str_replace('\"','"',$m);
-		$m = str_replace('\\\'','\'',$m);
-	}
-	return $m;
-}
-
-    
-   /************************************************************************/
-   
-    /** 
-     * Reorganise multiple table-indices/statistics/..
-     * OptimizeMode could be given by last Parameter
-     * 
-     * @example
-     *      
-     *          optimizeTables( 'tableA');
-     *      

-     *      
-     *          optimizeTables( 'tableA', 'tableB', 'tableC');
-     *      

-     *      
-     *          optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);
-     *      

-     * 
-     * @param string table name of the table to optimize
-     * @param int mode optimization-mode
-     *      ADODB_OPT_HIGH for full optimization 
-     *      ADODB_OPT_LOW for CPU-less optimization
-     *      Default is LOW ADODB_OPT_LOW 
-     * @author Markus Staab
-     * @return Returns true on success and false on error
-     */
-    function OptimizeTables()
-    {
-        $args = func_get_args();
-        $numArgs = func_num_args();
-        
-        if ( $numArgs == 0) return false;
-        
-        $mode = ADODB_OPT_LOW; 
-        $lastArg = $args[ $numArgs - 1];
-        if ( !is_string($lastArg)) {
-            $mode = $lastArg;
-            unset( $args[ $numArgs - 1]);
-        }
-        
-        foreach( $args as $table) {
-            $this->optimizeTable( $table, $mode);
-        }
-	}
-
-    /** 
-     * Reorganise the table-indices/statistics/.. depending on the given mode.
-     * Default Implementation throws an error.
-     * 
-     * @param string table name of the table to optimize
-     * @param int mode optimization-mode
-     *      ADODB_OPT_HIGH for full optimization 
-     *      ADODB_OPT_LOW for CPU-less optimization
-     *      Default is LOW ADODB_OPT_LOW 
-     * @author Markus Staab
-     * @return Returns true on success and false on error
-     */
-    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
-    {
-        ADOConnection::outp( sprintf( "
%s: '%s' not implemented for driver '%s'
", __CLASS__, __FUNCTION__, $this->conn->databaseType));
-        return false;
-    }
-    
-    /** 
-     * Reorganise current database.
-     * Default implementation loops over all MetaTables() and 
-     * optimize each using optmizeTable()
-     * 
-     * @author Markus Staab
-     * @return Returns true on success and false on error
-     */
-    function optimizeDatabase() 
-    {
-        $conn = $this->conn;
-        if ( !$conn) return false;
-        
-        $tables = $conn->MetaTables( 'TABLES');
-        if ( !$tables ) return false;
-
-        foreach( $tables as $table) {
-            if ( !$this->optimizeTable( $table)) {
-                return false;
-            }
-        }
-      
-        return true;
-    }
-    // end hack 
-}
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/adodb-php4.inc.php b/includes/adodb/adodb-php4.inc.php
deleted file mode 100644
index 1b4796b9..00000000
--- a/includes/adodb/adodb-php4.inc.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/includes/adodb/adodb-time.inc.php b/includes/adodb/adodb-time.inc.php
deleted file mode 100644
index 06374216..00000000
--- a/includes/adodb/adodb-time.inc.php
+++ /dev/null
@@ -1,1426 +0,0 @@
- 4 digit year conversion. The maximum is billions of years in the 
-future, but this is a theoretical limit as the computation of that year 
-would take too long with the current implementation of adodb_mktime().
-
-This library replaces native functions as follows:
-
-
	
-	getdate()  with  adodb_getdate()
-	date()     with  adodb_date() 
-	gmdate()   with  adodb_gmdate()
-	mktime()   with  adodb_mktime()
-	gmmktime() with  adodb_gmmktime()
-	strftime() with  adodb_strftime()
-	strftime() with  adodb_gmstrftime()
-

-	
-The parameters are identical, except that adodb_date() accepts a subset
-of date()'s field formats. Mktime() will convert from local time to GMT, 
-and date() will convert from GMT to local time, but daylight savings is 
-not handled currently.
-
-This library is independant of the rest of ADOdb, and can be used
-as standalone code.
-
-PERFORMANCE
-
-For high speed, this library uses the native date functions where
-possible, and only switches to PHP code when the dates fall outside 
-the 32-bit signed integer range.
-
-GREGORIAN CORRECTION
-
-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday, 
-October 4, 1582 (Julian) was followed immediately by Friday, October 15, 
-1582 (Gregorian). 
-
-Since 0.06, we handle this correctly, so:
-
-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) 
-	== 24 * 3600 (1 day)
-
-=============================================================================
-
-COPYRIGHT
-
-(c) 2003-2005 John Lim and released under BSD-style license except for code by 
-jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
-and originally found at http://www.php.net/manual/en/function.mktime.php
-
-=============================================================================
-
-BUG REPORTS
-
-These should be posted to the ADOdb forums at
-
-	http://phplens.com/lens/lensforum/topics.php?id=4
-
-=============================================================================
-
-FUNCTION DESCRIPTIONS
-
-
-** FUNCTION adodb_getdate($date=false)
-
-Returns an array containing date information, as getdate(), but supports
-dates greater than 1901 to 2038. The local date/time format is derived from a 
-heuristic the first time adodb_getdate is called. 
-	 
-	 
-** FUNCTION adodb_date($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted local date. If $timestamp is not defined, the
-current timestamp is used. Unlike the function date(), it supports dates
-outside the 1901 to 2038 range.
-
-The format fields that adodb_date supports:
-
-
-	a - "am" or "pm" 
-	A - "AM" or "PM" 
-	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 
-	D - day of the week, textual, 3 letters; e.g. "Fri" 
-	F - month, textual, long; e.g. "January" 
-	g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 
-	G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 
-	h - hour, 12-hour format; i.e. "01" to "12" 
-	H - hour, 24-hour format; i.e. "00" to "23" 
-	i - minutes; i.e. "00" to "59" 
-	j - day of the month without leading zeros; i.e. "1" to "31" 
-	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"  
-	L - boolean for whether it is a leap year; i.e. "0" or "1" 
-	m - month; i.e. "01" to "12" 
-	M - month, textual, 3 letters; e.g. "Jan" 
-	n - month without leading zeros; i.e. "1" to "12" 
-	O - Difference to Greenwich time in hours; e.g. "+0200" 
-	Q - Quarter, as in 1, 2, 3, 4 
-	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" 
-	s - seconds; i.e. "00" to "59" 
-	S - English ordinal suffix for the day of the month, 2 characters; 
-	   			i.e. "st", "nd", "rd" or "th" 
-	t - number of days in the given month; i.e. "28" to "31"
-	T - Timezone setting of this machine; e.g. "EST" or "MDT" 
-	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)  
-	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 
-	Y - year, 4 digits; e.g. "1999" 
-	y - year, 2 digits; e.g. "99" 
-	z - day of the year; i.e. "0" to "365" 
-	Z - timezone offset in seconds (i.e. "-43200" to "43200"). 
-	   			The offset for timezones west of UTC is always negative, 
-				and for those east of UTC is always positive. 
-

-
-Unsupported:
-
-	B - Swatch Internet time 
-	I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
-	W - ISO-8601 week number of year, weeks starting on Monday 
-
-

-
-
-** FUNCTION adodb_date2($fmt, $isoDateString = false)
-Same as adodb_date, but 2nd parameter accepts iso date, eg.
-
-  adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
-
-  
-** FUNCTION adodb_gmdate($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
-current timestamp is used. Unlike the function date(), it supports dates
-outside the 1901 to 2038 range.
-
-
-** FUNCTION adodb_mktime($hr, $min, $sec[, $month, $day, $year])
-
-Converts a local date to a unix timestamp.  Unlike the function mktime(), it supports
-dates outside the 1901 to 2038 range. All parameters are optional.
-
-
-** FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year])
-
-Converts a gmt date to a unix timestamp.  Unlike the function gmmktime(), it supports
-dates outside the 1901 to 2038 range. Differs from gmmktime() in that all parameters
-are currently compulsory.
-
-** FUNCTION adodb_gmstrftime($fmt, $timestamp = false)
-Convert a timestamp to a formatted GMT date.
-
-** FUNCTION adodb_strftime($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted local date. Internally converts $fmt into 
-adodb_date format, then echo result.
-
-For best results, you can define the local date format yourself. Define a global
-variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using
-adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.
-
-    eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
-	
-	Supported format codes:
-
-
-	%a - abbreviated weekday name according to the current locale 
-	%A - full weekday name according to the current locale 
-	%b - abbreviated month name according to the current locale 
-	%B - full month name according to the current locale 
-	%c - preferred date and time representation for the current locale 
-	%d - day of the month as a decimal number (range 01 to 31) 
-	%D - same as %m/%d/%y 
-	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31') 
-	%h - same as %b
-	%H - hour as a decimal number using a 24-hour clock (range 00 to 23) 
-	%I - hour as a decimal number using a 12-hour clock (range 01 to 12) 
-	%m - month as a decimal number (range 01 to 12) 
-	%M - minute as a decimal number 
-	%n - newline character 
-	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale 
-	%r - time in a.m. and p.m. notation 
-	%R - time in 24 hour notation 
-	%S - second as a decimal number 
-	%t - tab character 
-	%T - current time, equal to %H:%M:%S 
-	%x - preferred date representation for the current locale without the time 
-	%X - preferred time representation for the current locale without the date 
-	%y - year as a decimal number without a century (range 00 to 99) 
-	%Y - year as a decimal number including the century 
-	%Z - time zone or name or abbreviation 
-	%% - a literal `%' character 
-
	
-
-	Unsupported codes:
-
-	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99) 
-	%g - like %G, but without the century. 
-	%G - The 4-digit year corresponding to the ISO week number (see %V). 
-	     This has the same format and value as %Y, except that if the ISO week number belongs 
-		 to the previous or next year, that year is used instead. 
-	%j - day of the year as a decimal number (range 001 to 366) 
-	%u - weekday as a decimal number [1,7], with 1 representing Monday 
-	%U - week number of the current year as a decimal number, starting 
-	    with the first Sunday as the first day of the first week 
-	%V - The ISO 8601:1988 week number of the current year as a decimal number, 
-	     range 01 to 53, where week 1 is the first week that has at least 4 days in the 
-		 current year, and with Monday as the first day of the week. (Use %G or %g for 
-		 the year component that corresponds to the week number for the specified timestamp.) 
-	%w - day of the week as a decimal, Sunday being 0 
-	%W - week number of the current year as a decimal number, starting with the 
-	     first Monday as the first day of the first week 
-

-
-=============================================================================
-
-NOTES
-
-Useful url for generating test timestamps:
-	http://www.4webhelp.net/us/timestamp.php
-
-Possible future optimizations include 
-
-a. Using an algorithm similar to Plauger's in "The Standard C Library" 
-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not 
-work outside 32-bit signed range, so i decided not to implement it.
-
-b. Implement daylight savings, which looks awfully complicated, see
-	http://webexhibits.org/daylightsaving/
-
-
-CHANGELOG
-
-- 11 Feb 2008 0.33
-* Bug in 0.32 fix for hour handling. Fixed.
-
-- 1 Feb 2008 0.32
-* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly. 
-
-- 10 Jan 2008 0.31
-* Now adodb_mktime(0,0,0,24,1,2037) works correctly.
-
-- 15 July 2007 0.30
-Added PHP 5.2.0 compatability fixes. 
- * gmtime behaviour for 1970 has changed. We use the actual date if it is between 1970 to 2038 to get the
- * timezone, otherwise we use the current year as the baseline to retrieve the timezone.
- * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but 
-   in 1970 it was +7:30, then php 5.2 return +7:30, while this library will use +8.
- * 
- 
-- 19 March 2006 0.24
-Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
-
-- 10 Feb 2006 0.23
-PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000. 
-	In PHP4, we will still use -0000 for 100% compat with PHP4.
-
-- 08 Sept 2005 0.22
-In adodb_date2(), $is_gmt not supported properly. Fixed.
-
-- 18 July  2005 0.21
-In PHP 4.3.11, the 'r' format has changed. Leading 0 in day is added. Changed for compat.
-Added support for negative months in adodb_mktime().
-
-- 24 Feb 2005 0.20
-Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().
-
-- 21 Dec 2004 0.17
-In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false. 
-Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
-
-- 17 Nov 2004 0.16
-Removed intval typecast in adodb_mktime() for secs, allowing:
-	 adodb_mktime(0,0,0 + 2236672153,1,1,1934);
-Suggested by Ryan.
-
-- 18 July 2004 0.15
-All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory. 
-This brings it more in line with mktime (still not identical).
-
-- 23 June 2004 0.14
-
-Allow you to define your own daylights savings function, adodb_daylight_sv.
-If the function is defined (somewhere in an include), then you can correct for daylights savings.
-
-In this example, we apply daylights savings in June or July, adding one hour. This is extremely
-unrealistic as it does not take into account time-zone, geographic location, current year.
-
-function adodb_daylight_sv(&$arr, $is_gmt)
-{
-	if ($is_gmt) return;
-	$m = $arr['mon'];
-	if ($m == 6 || $m == 7) $arr['hours'] += 1;
-}
-
-This is only called by adodb_date() and not by adodb_mktime(). 
-
-The format of $arr is
-Array ( 
-   [seconds] => 0 
-   [minutes] => 0 
-   [hours] => 0 
-   [mday] => 1      # day of month, eg 1st day of the month
-   [mon] => 2       # month (eg. Feb)
-   [year] => 2102 
-   [yday] => 31     # days in current year
-   [leap] =>        # true if leap year
-   [ndays] => 28    # no of days in current month
-   ) 
-   
-
-- 28 Apr 2004 0.13
-Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
-
-- 20 Mar 2004 0.12
-Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
-
-- 26 Oct 2003 0.11
-Because of daylight savings problems (some systems apply daylight savings to 
-January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
-
-- 9 Aug 2003 0.10
-Fixed bug with dates after 2038. 
-See http://phplens.com/lens/lensforum/msgs.php?id=6980
-
-- 1 July 2003 0.09
-Added support for Q (Quarter).
-Added adodb_date2(), which accepts ISO date in 2nd param
-
-- 3 March 2003 0.08
-Added support for 'S' adodb_date() format char. Added constant ADODB_ALLOW_NEGATIVE_TS
-if you want PHP to handle negative timestamps between 1901 to 1969.
-
-- 27 Feb 2003 0.07
-All negative numbers handled by adodb now because of RH 7.3+ problems.
-See http://bugs.php.net/bug.php?id=20048&edit=2
-
-- 4 Feb 2003 0.06
-Fixed a typo, 1852 changed to 1582! This means that pre-1852 dates
-are now correctly handled.
-
-- 29 Jan 2003 0.05
-
-Leap year checking differs under Julian calendar (pre 1582). Also
-leap year code optimized by checking for most common case first.
-
-We also handle month overflow correctly in mktime (eg month set to 13).
-
-Day overflow for less than one month's days is supported.
-
-- 28 Jan 2003 0.04
-
-Gregorian correction handled. In PHP5, we might throw an error if 
-mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
-Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
-
-- 27 Jan 2003 0.03
-
-Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.
-Fixed calculation of days since start of year for <1970. 
-
-- 27 Jan 2003 0.02
-
-Changed _adodb_getdate() to inline leap year checking for better performance.
-Fixed problem with time-zones west of GMT +0000.
-
-- 24 Jan 2003 0.01
-
-First implementation.
-*/
-
-
-/* Initialization */
-
-/*
-	Version Number
-*/
-define('ADODB_DATE_VERSION',0.33);
-
-$ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2);
-
-/*
-	This code was originally for windows. But apparently this problem happens 
-	also with Linux, RH 7.3 and later!
-	
-	glibc-2.2.5-34 and greater has been changed to return -1 for dates <
-	1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0
-	echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1
-	
-	References:
-	 http://bugs.php.net/bug.php?id=20048&edit=2
-	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
-*/
-
-if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
-
-function adodb_date_test_date($y1,$m,$d=13)
-{
-	$h = round(rand()% 24);
-	$t = adodb_mktime($h,0,0,$m,$d,$y1);
-	$rez = adodb_date('Y-n-j H:i:s',$t);
-	if ($h == 0) $h = '00';
-	else if ($h < 10) $h = '0'.$h;
-	if ("$y1-$m-$d $h:00:00" != $rez) {
-		print "$y1 error, expected=$y1-$m-$d $h:00:00, adodb=$rez
";
-		return false;
-	}
-	return true;
-}
-
-function adodb_date_test_strftime($fmt)
-{
-	$s1 = strftime($fmt);
-	$s2 = adodb_strftime($fmt);
-	
-	if ($s1 == $s2) return true;
-	
-	echo "error for $fmt,  strftime=$s1, adodb=$s2
";
-	return false;
-}
-
-/**
-	 Test Suite
-*/	
-function adodb_date_test()
-{
-	
-	for ($m=-24; $m<=24; $m++)
-		echo "$m :",adodb_date('d-m-Y',adodb_mktime(0,0,0,1+$m,20,2040)),"
";
-	
-	error_reporting(E_ALL);
-	print "
Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."
";
-	@set_time_limit(0);
-	$fail = false;
-	
-	// This flag disables calling of PHP native functions, so we can properly test the code
-	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
-	
-	$t = time();
-	
-	
-	$fmt = 'Y-m-d H:i:s';
-	echo '
';
-	echo 'adodb: ',adodb_date($fmt,$t),'
';
-	echo 'php  : ',date($fmt,$t),'
';
-	echo '
';
-	
-	adodb_date_test_strftime('%Y %m %x %X');
-	adodb_date_test_strftime("%A %d %B %Y");
-	adodb_date_test_strftime("%H %M S");
-	
-	$t = adodb_mktime(0,0,0);
-	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'
';
-	
-	$t = adodb_mktime(0,0,0,6,1,2102);
-	if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'
';
-	
-	$t = adodb_mktime(0,0,0,2,1,2102);
-	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'
';
-	
-	
-	print "
Testing gregorian <=> julian conversion
";
-	$t = adodb_mktime(0,0,0,10,11,1492);
-	//http://www.holidayorigins.com/html/columbus_day.html - Friday check
-	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing
';
-	
-	$t = adodb_mktime(0,0,0,2,29,1500);
-	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years
';
-	
-	$t = adodb_mktime(0,0,0,2,29,1700);
-	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years
';
-	
-	print  adodb_mktime(0,0,0,10,4,1582).' ';
-	print adodb_mktime(0,0,0,10,15,1582);
-	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));
-	if ($diff != 3600*24) print " Error in gregorian correction = ".($diff/3600/24)." days 
";
-		
-	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : 'Error')."
";
-	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : 'Error')."
";
-	
-	print "
Testing overflow
";
-	
-	$t = adodb_mktime(0,0,0,3,33,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 
';
-	$t = adodb_mktime(0,0,0,4,33,1971);
-	if (!(adodb_date('Y-m-d',$t) == '1971-05-03')) print 'Error in day overflow 2 
';
-	$t = adodb_mktime(0,0,0,1,60,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1965-03-01')) print 'Error in day overflow 3 '.adodb_date('Y-m-d',$t).' 
';
-	$t = adodb_mktime(0,0,0,12,32,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-01-01')) print 'Error in day overflow 4 '.adodb_date('Y-m-d',$t).' 
';
-	$t = adodb_mktime(0,0,0,12,63,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' 
';
-	$t = adodb_mktime(0,0,0,13,3,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 
';
-	
-	print "Testing 2-digit => 4-digit year conversion
";
-	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000
";
-	if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010
";
-	if (adodb_year_digit_check(20) != 2020) print "Err 2-digit 2020
";
-	if (adodb_year_digit_check(30) != 2030) print "Err 2-digit 2030
";
-	if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940
";
-	if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950
";
-	if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990
";
-	
-	// Test string formating
-	print "
Testing date formating
";
-	
-	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003';
-	$s1 = date($fmt,0);
-	$s2 = adodb_date($fmt,0);
-	if ($s1 != $s2) {
-		print " date() 0 failed
$s1
$s2
";
-	}
-	flush();
-	for ($i=100; --$i > 0; ) {
-
-		$ts = 3600.0*((rand()%60000)+(rand()%60000))+(rand()%60000);
-		$s1 = date($fmt,$ts);
-		$s2 = adodb_date($fmt,$ts);
-		//print "$s1 
$s2 
";
-		$pos = strcmp($s1,$s2);
-
-		if (($s1) != ($s2)) {
-			for ($j=0,$k=strlen($s1); $j < $k; $j++) {
-				if ($s1[$j] != $s2[$j]) {
-					print substr($s1,$j).' ';
-					break;
-				}
-			}
-			print "Error date(): $ts
 
-  \"$s1\" (date len=".strlen($s1).")
-  \"$s2\" (adodb_date len=".strlen($s2).")

";
-			$fail = true;
-		}
-		
-		$a1 = getdate($ts);
-		$a2 = adodb_getdate($ts);
-		$rez = array_diff($a1,$a2);
-		if (sizeof($rez)>0) {
-			print "Error getdate() $ts
";
-				print_r($a1);
-			print "
";
-				print_r($a2);
-			print "
";
-			$fail = true;
-		}
-	}
-	
-	// Test generation of dates outside 1901-2038
-	print "
Testing random dates between 100 and 4000
";
-	adodb_date_test_date(100,1);
-	for ($i=100; --$i >= 0;) {
-		$y1 = 100+rand(0,1970-100);
-		$m = rand(1,12);
-		adodb_date_test_date($y1,$m);
-		
-		$y1 = 3000-rand(0,3000-1970);
-		adodb_date_test_date($y1,$m);
-	}
-	print '
';
-	$start = 1960+rand(0,10);
-	$yrs = 12;
-	$i = 365.25*86400*($start-1970);
-	$offset = 36000+rand(10000,60000);
-	$max = 365*$yrs*86400;
-	$lastyear = 0;
-	
-	// we generate a timestamp, convert it to a date, and convert it back to a timestamp
-	// and check if the roundtrip broke the original timestamp value.
-	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
-	$cnt = 0;
-	for ($max += $i; $i < $max; $i += $offset) {
-		$ret = adodb_date('m,d,Y,H,i,s',$i);
-		$arr = explode(',',$ret);
-		if ($lastyear != $arr[2]) {
-			$lastyear = $arr[2];
-			print " $lastyear ";
-			flush();
-		}
-		$newi = adodb_mktime($arr[3],$arr[4],$arr[5],$arr[0],$arr[1],$arr[2]);
-		if ($i != $newi) {
-			print "Error at $i, adodb_mktime returned $newi ($ret)";
-			$fail = true;
-			break;
-		}
-		$cnt += 1;
-	}
-	echo "Tested $cnt dates
";
-	if (!$fail) print "
Passed !
";
-	else print "
Failed :-(
";
-}
-
-/**
-	Returns day of week, 0 = Sunday,... 6=Saturday. 
-	Algorithm from PEAR::Date_Calc
-*/
-function adodb_dow($year, $month, $day)
-{
-/*
-Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and 
-proclaimed that from that time onwards 3 days would be dropped from the calendar 
-every 400 years.
-
-Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian). 
-*/
-	if ($year <= 1582) {
-		if ($year < 1582 || 
-			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;
-		 else
-			$greg_correction = 0;
-	} else
-		$greg_correction = 0;
-	
-	if($month > 2)
-	    $month -= 2;
-	else {
-	    $month += 10;
-	    $year--;
-	}
-	
-	$day =  floor((13 * $month - 1) / 5) +
-	        $day + ($year % 100) +
-	        floor(($year % 100) / 4) +
-	        floor(($year / 100) / 4) - 2 *
-	        floor($year / 100) + 77 + $greg_correction;
-	
-	return $day - 7 * floor($day / 7);
-}
-
-
-/**
- Checks for leap year, returns true if it is. No 2-digit year check. Also 
- handles julian calendar correctly.
-*/
-function _adodb_is_leap_year($year) 
-{
-	if ($year % 4 != 0) return false;
-	
-	if ($year % 400 == 0) {
-		return true;
-	// if gregorian calendar (>1582), century not-divisible by 400 is not leap
-	} else if ($year > 1582 && $year % 100 == 0 ) {
-		return false;
-	} 
-	
-	return true;
-}
-
-
-/**
- checks for leap year, returns true if it is. Has 2-digit year check
-*/
-function adodb_is_leap_year($year) 
-{
-	return  _adodb_is_leap_year(adodb_year_digit_check($year));
-}
-
-/**
-	Fix 2-digit years. Works for any century.
- 	Assumes that if 2-digit is more than 30 years in future, then previous century.
-*/
-function adodb_year_digit_check($y) 
-{
-	if ($y < 100) {
-	
-		$yr = (integer) date("Y");
-		$century = (integer) ($yr /100);
-		
-		if ($yr%100 > 50) {
-			$c1 = $century + 1;
-			$c0 = $century;
-		} else {
-			$c1 = $century;
-			$c0 = $century - 1;
-		}
-		$c1 *= 100;
-		// if 2-digit year is less than 30 years in future, set it to this century
-		// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-		if (($y + $c1) < $yr+30) $y = $y + $c1;
-		else $y = $y + $c0*100;
-	}
-	return $y;
-}
-
-function adodb_get_gmt_diff_ts($ts) 
-{
-	if (0 <= $ts && $ts <= 0x7FFFFFFF) { // check if number in 32-bit signed range) {
-		$arr = getdate($ts);
-		$y = $arr['year'];
-		$m = $arr['mon'];
-		$d = $arr['mday'];
-		return adodb_get_gmt_diff($y,$m,$d);	
-	} else {
-		return adodb_get_gmt_diff(false,false,false);
-	}
-	
-}
-
-/**
- get local time zone offset from GMT. Does not handle historical timezones before 1970.
-*/
-function adodb_get_gmt_diff($y,$m,$d) 
-{
-static $TZ,$tzo;
-global $ADODB_DATETIME_CLASS;
-
-	if (!defined('ADODB_TEST_DATES')) $y = false;
-	else if ($y < 1970 || $y >= 2038) $y = false;
-
-	if ($ADODB_DATETIME_CLASS && $y !== false) {
-		$dt = new DateTime();
-		$dt->setISODate($y,$m,$d);
-		if (empty($tzo)) {
-			$tzo = new DateTimeZone(date_default_timezone_get());
-		#	$tzt = timezone_transitions_get( $tzo );
-		}
-		return -$tzo->getOffset($dt);
-	} else {
-		if (isset($TZ)) return $TZ;
-		$y = date('Y');
-		$TZ = mktime(0,0,0,12,2,$y,0) - gmmktime(0,0,0,12,2,$y,0);
-	}
-	
-	return $TZ;
-}
-
-/**
-	Returns an array with date info.
-*/
-function adodb_getdate($d=false,$fast=false)
-{
-	if ($d === false) return getdate();
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
-				return @getdate($d);
-		}
-	}
-	return _adodb_getdate($d);
-}
-
-/*
-// generate $YRS table for _adodb_getdate()
-function adodb_date_gentable($out=true)
-{
-
-	for ($i=1970; $i >= 1600; $i-=10) {
-		$s = adodb_gmmktime(0,0,0,1,1,$i);
-		echo "$i => $s,
";	
-	}
-}
-adodb_date_gentable();
-
-for ($i=1970; $i > 1500; $i--) {
-
-echo "
$i ";
-	adodb_date_test_date($i,1,1);
-}
-
-*/
-
-
-$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
-function adodb_validdate($y,$m,$d)
-{
-global $_month_table_normal,$_month_table_leaf;
-
-	if (_adodb_is_leap_year($y)) $marr = $_month_table_leaf;
-	else $marr = $_month_table_normal;
-	
-	if ($m > 12 || $m < 1) return false;
-	
-	if ($d > 31 || $d < 1) return false;
-	
-	if ($marr[$m] < $d) return false;
-	
-	if ($y < 1000 && $y > 3000) return false;
-	
-	return true;
-}
-
-/**
-	Low-level function that returns the getdate() array. We have a special
-	$fast flag, which if set to true, will return fewer array values,
-	and is much faster as it does not calculate dow, etc.
-*/
-function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
-{
-static $YRS;
-global $_month_table_normal,$_month_table_leaf;
-
-	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff_ts($origd));
-	$_day_power = 86400;
-	$_hour_power = 3600;
-	$_min_power = 60;
-	
-	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction 
-	
-	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
-	$d366 = $_day_power * 366;
-	$d365 = $_day_power * 365;
-	
-	if ($d < 0) {
-		
-		if (empty($YRS)) $YRS = array(
-			1970 => 0,
-			1960 => -315619200,
-			1950 => -631152000,
-			1940 => -946771200,
-			1930 => -1262304000,
-			1920 => -1577923200,
-			1910 => -1893456000,
-			1900 => -2208988800,
-			1890 => -2524521600,
-			1880 => -2840140800,
-			1870 => -3155673600,
-			1860 => -3471292800,
-			1850 => -3786825600,
-			1840 => -4102444800,
-			1830 => -4417977600,
-			1820 => -4733596800,
-			1810 => -5049129600,
-			1800 => -5364662400,
-			1790 => -5680195200,
-			1780 => -5995814400,
-			1770 => -6311347200,
-			1760 => -6626966400,
-			1750 => -6942499200,
-			1740 => -7258118400,
-			1730 => -7573651200,
-			1720 => -7889270400,
-			1710 => -8204803200,
-			1700 => -8520336000,
-			1690 => -8835868800,
-			1680 => -9151488000,
-			1670 => -9467020800,
-			1660 => -9782640000,
-			1650 => -10098172800,
-			1640 => -10413792000,
-			1630 => -10729324800,
-			1620 => -11044944000,
-			1610 => -11360476800,
-			1600 => -11676096000);
-
-		if ($is_gmt) $origd = $d;
-		// The valid range of a 32bit signed timestamp is typically from 
-		// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
-		//
-		
-		# old algorithm iterates through all years. new algorithm does it in
-		# 10 year blocks
-		
-		/*
-		# old algo
-		for ($a = 1970 ; --$a >= 0;) {
-			$lastd = $d;
-			
-			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
-			else $d += $d365;
-			
-			if ($d >= 0) {
-				$year = $a;
-				break;
-			}
-		}
-		*/
-		
-		$lastsecs = 0;
-		$lastyear = 1970;
-		foreach($YRS as $year => $secs) {
-			if ($d >= $secs) {
-				$a = $lastyear;
-				break;
-			}
-			$lastsecs = $secs;
-			$lastyear = $year;
-		}
-		
-		$d -= $lastsecs;
-		if (!isset($a)) $a = $lastyear;
-		
-		//echo ' yr=',$a,' ', $d,'.';
-		
-		for (; --$a >= 0;) {
-			$lastd = $d;
-			
-			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
-			else $d += $d365;
-			
-			if ($d >= 0) {
-				$year = $a;
-				break;
-			}
-		}
-		/**/
-		
-		$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
-		
-		$d = $lastd;
-		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-		for ($a = 13 ; --$a > 0;) {
-			$lastd = $d;
-			$d += $mtab[$a] * $_day_power;
-			if ($d >= 0) {
-				$month = $a;
-				$ndays = $mtab[$a];
-				break;
-			}
-		}
-		
-		$d = $lastd;
-		$day = $ndays + ceil(($d+1) / ($_day_power));
-
-		$d += ($ndays - $day+1)* $_day_power;
-		$hour = floor($d/$_hour_power);
-	
-	} else {
-		for ($a = 1970 ;; $a++) {
-			$lastd = $d;
-			
-			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
-			else $d -= $d365;
-			if ($d < 0) {
-				$year = $a;
-				break;
-			}
-		}
-		$secsInYear = $lastd;
-		$d = $lastd;
-		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-		for ($a = 1 ; $a <= 12; $a++) {
-			$lastd = $d;
-			$d -= $mtab[$a] * $_day_power;
-			if ($d < 0) {
-				$month = $a;
-				$ndays = $mtab[$a];
-				break;
-			}
-		}
-		$d = $lastd;
-		$day = ceil(($d+1) / $_day_power);
-		$d = $d - ($day-1) * $_day_power;
-		$hour = floor($d /$_hour_power);
-	}
-	
-	$d -= $hour * $_hour_power;
-	$min = floor($d/$_min_power);
-	$secs = $d - $min * $_min_power;
-	if ($fast) {
-		return array(
-		'seconds' => $secs,
-		'minutes' => $min,
-		'hours' => $hour,
-		'mday' => $day,
-		'mon' => $month,
-		'year' => $year,
-		'yday' => floor($secsInYear/$_day_power),
-		'leap' => $leaf,
-		'ndays' => $ndays
-		);
-	}
-	
-	
-	$dow = adodb_dow($year,$month,$day);
-
-	return array(
-		'seconds' => $secs,
-		'minutes' => $min,
-		'hours' => $hour,
-		'mday' => $day,
-		'wday' => $dow,
-		'mon' => $month,
-		'year' => $year,
-		'yday' => floor($secsInYear/$_day_power),
-		'weekday' => gmdate('l',$_day_power*(3+$dow)),
-		'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),
-		0 => $origd
-	);
-}
-/*
-		if ($isphp5)
-				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
-			else
-				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
-			break;*/
-function adodb_tz_offset($gmt,$isphp5)
-{
-	$zhrs = abs($gmt)/3600;
-	$hrs = floor($zhrs);
-	if ($isphp5) 
-		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
-	else
-		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
-}
-
-
-function adodb_gmdate($fmt,$d=false)
-{
-	return adodb_date($fmt,$d,true);
-}
-
-// accepts unix timestamp and iso date format in $d
-function adodb_date2($fmt, $d=false, $is_gmt=false)
-{
-	if ($d !== false) {
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
-			($d), $rr)) return adodb_date($fmt,false,$is_gmt);
-
-		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);
-	
-		// h-m-s-MM-DD-YY
-		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1],false,$is_gmt);
-		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1],false,$is_gmt);
-	}
-	
-	return adodb_date($fmt,$d,$is_gmt);
-}
-
-
-/**
-	Return formatted date based on timestamp $d
-*/
-function adodb_date($fmt,$d=false,$is_gmt=false)
-{
-static $daylight;
-global $ADODB_DATETIME_CLASS;
-
-	if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
-				return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d);
-
-		}
-	}
-	$_day_power = 86400;
-	
-	$arr = _adodb_getdate($d,true,$is_gmt);
-	
-	if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');
-	if ($daylight) adodb_daylight_sv($arr, $is_gmt);
-	
-	$year = $arr['year'];
-	$month = $arr['mon'];
-	$day = $arr['mday'];
-	$hour = $arr['hours'];
-	$min = $arr['minutes'];
-	$secs = $arr['seconds'];
-	
-	$max = strlen($fmt);
-	$dates = '';
-	
-	$isphp5 = PHP_VERSION >= 5;
-	
-	/*
-		at this point, we have the following integer vars to manipulate:
-		$year, $month, $day, $hour, $min, $secs
-	*/
-	for ($i=0; $i < $max; $i++) {
-		switch($fmt[$i]) {
-		case 'T': 
-			if ($ADODB_DATETIME_CLASS) {
-				$dt = new DateTime();
-				$dt->SetDate($year,$month,$day);
-				$dates .= $dt->Format('T');
-			} else
-				$dates .= date('T');
-			break;
-		// YEAR
-		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
-		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
-		
-			// 4.3.11 uses '04 Jun 2004'
-			// 4.3.8 uses  ' 4 Jun 2004'
-			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
-				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
-			
-			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
-			
-			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
-			
-			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
-			
-			$gmt = adodb_get_gmt_diff($year,$month,$day);
-			
-			$dates .= ' '.adodb_tz_offset($gmt,$isphp5);
-			break;
-			
-		case 'Y': $dates .= $year; break;
-		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
-		// MONTH
-		case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;
-		case 'Q': $dates .= ($month+3)>>2; break;
-		case 'n': $dates .= $month; break;
-		case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;
-		case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break;
-		// DAY
-		case 't': $dates .= $arr['ndays']; break;
-		case 'z': $dates .= $arr['yday']; break;
-		case 'w': $dates .= adodb_dow($year,$month,$day); break;
-		case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-		case 'j': $dates .= $day; break;
-		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
-		case 'S': 
-			$d10 = $day % 10;
-			if ($d10 == 1) $dates .= 'st';
-			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
-			else if ($d10 == 3) $dates .= 'rd';
-			else $dates .= 'th';
-			break;
-			
-		// HOUR
-		case 'Z':
-			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff($year,$month,$day); break;
-		case 'O': 
-			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day);
-			
-			$dates .= adodb_tz_offset($gmt,$isphp5);
-			break;
-			
-		case 'H': 
-			if ($hour < 10) $dates .= '0'.$hour; 
-			else $dates .= $hour; 
-			break;
-		case 'h': 
-			if ($hour > 12) $hh = $hour - 12; 
-			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour;
-			}
-			
-			if ($hh < 10) $dates .= '0'.$hh;
-			else $dates .= $hh;
-			break;
-			
-		case 'G': 
-			$dates .= $hour;
-			break;
-			
-		case 'g':
-			if ($hour > 12) $hh = $hour - 12; 
-			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour; 
-			}
-			$dates .= $hh;
-			break;
-		// MINUTES
-		case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break;
-		// SECONDS
-		case 'U': $dates .= $d; break;
-		case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break;
-		// AM/PM
-		// Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
-		case 'a':
-			if ($hour>=12) $dates .= 'pm';
-			else $dates .= 'am';
-			break;
-		case 'A':
-			if ($hour>=12) $dates .= 'PM';
-			else $dates .= 'AM';
-			break;
-		default:
-			$dates .= $fmt[$i]; break;
-		// ESCAPE
-		case "\\": 
-			$i++;
-			if ($i < $max) $dates .= $fmt[$i];
-			break;
-		}
-	}
-	return $dates;
-}
-
-/**
-	Returns a timestamp given a GMT/UTC time. 
-	Note that $is_dst is not implemented and is ignored.
-*/
-function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)
-{
-	return adodb_mktime($hr,$min,$sec,$mon,$day,$year,$is_dst,true);
-}
-
-/**
-	Return a timestamp given a local time. Originally by jackbbs.
-	Note that $is_dst is not implemented and is ignored.
-	
-	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
-*/
-function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false) 
-{
-	if (!defined('ADODB_TEST_DATES')) {
-
-		if ($mon === false) {
-			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
-		}
-		
-		// for windows, we don't check 1970 because with timezone differences, 
-		// 1 Jan 1970 could generate negative timestamp, which is illegal
-		$usephpfns = (1971 < $year && $year < 2038
-			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
-			); 
-			
-		
-		if ($usephpfns && ($year + $mon/12+$day/365.25+$hr/(24*365.25) >= 2038)) $usephpfns = false;
-			
-		if ($usephpfns) {
-				return $is_gmt ?
-					@gmmktime($hr,$min,$sec,$mon,$day,$year):
-					@mktime($hr,$min,$sec,$mon,$day,$year);
-		}
-	}
-	
-	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$mon,$day);
-
-	/*
-	# disabled because some people place large values in $sec.
-	# however we need it for $mon because we use an array...
-	$hr = intval($hr);
-	$min = intval($min);
-	$sec = intval($sec);
-	*/
-	$mon = intval($mon);
-	$day = intval($day);
-	$year = intval($year);
-	
-	
-	$year = adodb_year_digit_check($year);
-
-	if ($mon > 12) {
-		$y = floor(($mon-1)/ 12);
-		$year += $y;
-		$mon -= $y*12;
-	} else if ($mon < 1) {
-		$y = ceil((1-$mon) / 12);
-		$year -= $y;
-		$mon += $y*12;
-	}
-	
-	$_day_power = 86400;
-	$_hour_power = 3600;
-	$_min_power = 60;
-	
-	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
-	$_total_date = 0;
-	if ($year >= 1970) {
-		for ($a = 1970 ; $a <= $year; $a++) {
-			$leaf = _adodb_is_leap_year($a);
-			if ($leaf == true) {
-				$loop_table = $_month_table_leaf;
-				$_add_date = 366;
-			} else {
-				$loop_table = $_month_table_normal;
-				$_add_date = 365;
-			}
-			if ($a < $year) { 
-				$_total_date += $_add_date;
-			} else {
-				for($b=1;$b<$mon;$b++) {
-					$_total_date += $loop_table[$b];
-				}
-			}
-		}
-		$_total_date +=$day-1;
-		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
-	
-	} else {
-		for ($a = 1969 ; $a >= $year; $a--) {
-			$leaf = _adodb_is_leap_year($a);
-			if ($leaf == true) {
-				$loop_table = $_month_table_leaf;
-				$_add_date = 366;
-			} else {
-				$loop_table = $_month_table_normal;
-				$_add_date = 365;
-			}
-			if ($a > $year) { $_total_date += $_add_date;
-			} else {
-				for($b=12;$b>$mon;$b--) {
-					$_total_date += $loop_table[$b];
-				}
-			}
-		}
-		$_total_date += $loop_table[$mon] - $day;
-		
-		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
-		$_day_time = $_day_power - $_day_time;
-		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);
-		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction
-		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.
-	} 
-	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
-	return $ret;
-}
-
-function adodb_gmstrftime($fmt, $ts=false)
-{
-	return adodb_strftime($fmt,$ts,true);
-}
-
-// hack - convert to adodb_date
-function adodb_strftime($fmt, $ts=false,$is_gmt=false)
-{
-global $ADODB_DATE_LOCALE;
-
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $ts >= 0) // if windows, must be +ve integer
-				return ($is_gmt)? @gmstrftime($fmt,$ts): @strftime($fmt,$ts);
-
-		}
-	}
-	
-	if (empty($ADODB_DATE_LOCALE)) {
-	/*
-		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
-		$sep = substr($tstr,2,1);
-		$hasAM = strrpos($tstr,'M') !== false;
-	*/
-		# see http://phplens.com/lens/lensforum/msgs.php?id=14865 for reasoning, and changelog for version 0.24
-		$dstr = gmstrftime('%x',31366800); // 30 Dec 1970, 1 am
-		$sep = substr($dstr,2,1);
-		$tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
-		$hasAM = strrpos($tstr,'M') !== false;
-		
-		$ADODB_DATE_LOCALE = array();
-		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';	
-		$ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';
-			
-	}
-	$inpct = false;
-	$fmtdate = '';
-	for ($i=0,$max = strlen($fmt); $i < $max; $i++) {
-		$ch = $fmt[$i];
-		if ($ch == '%') {
-			if ($inpct) {
-				$fmtdate .= '%';
-				$inpct = false;
-			} else
-				$inpct = true;
-		} else if ($inpct) {
-		
-			$inpct = false;
-			switch($ch) {
-			case '0':
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-			case 'E':
-			case 'O':
-				/* ignore format modifiers */
-				$inpct = true; 
-				break;
-				
-			case 'a': $fmtdate .= 'D'; break;
-			case 'A': $fmtdate .= 'l'; break;
-			case 'h':
-			case 'b': $fmtdate .= 'M'; break;
-			case 'B': $fmtdate .= 'F'; break;
-			case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break;
-			case 'C': $fmtdate .= '\C?'; break; // century
-			case 'd': $fmtdate .= 'd'; break;
-			case 'D': $fmtdate .= 'm/d/y'; break;
-			case 'e': $fmtdate .= 'j'; break;
-			case 'g': $fmtdate .= '\g?'; break; //?
-			case 'G': $fmtdate .= '\G?'; break; //?
-			case 'H': $fmtdate .= 'H'; break;
-			case 'I': $fmtdate .= 'h'; break;
-			case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd
-			case 'm': $fmtdate .= 'm'; break;
-			case 'M': $fmtdate .= 'i'; break;
-			case 'n': $fmtdate .= "\n"; break;
-			case 'p': $fmtdate .= 'a'; break;
-			case 'r': $fmtdate .= 'h:i:s a'; break;
-			case 'R': $fmtdate .= 'H:i:s'; break;
-			case 'S': $fmtdate .= 's'; break;
-			case 't': $fmtdate .= "\t"; break;
-			case 'T': $fmtdate .= 'H:i:s'; break;
-			case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-based
-			case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based
-			case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;
-			case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;
-			case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-based
-			case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based
-			case 'y': $fmtdate .= 'y'; break;
-			case 'Y': $fmtdate .= 'Y'; break;
-			case 'Z': $fmtdate .= 'T'; break;
-			}
-		} else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' ))
-			$fmtdate .= "\\".$ch;
-		else
-			$fmtdate .= $ch;
-	}
-	//echo "fmt=",$fmtdate,"
";
-	if ($ts === false) $ts = time();
-	$ret = adodb_date($fmtdate, $ts, $is_gmt);
-	return $ret;
-}
-
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/adodb-xmlschema.inc.php b/includes/adodb/adodb-xmlschema.inc.php
deleted file mode 100644
index b2f0ddc5..00000000
--- a/includes/adodb/adodb-xmlschema.inc.php
+++ /dev/null
@@ -1,2223 +0,0 @@
-parent = $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	function create() {
-		return array();
-	}
-	
-	/**
-	* Destroys the object
-	*/
-	function destroy() {
-		unset( $this );
-	}
-	
-	/**
-	* Checks whether the specified RDBMS is supported by the current
-	* database object or its ranking ancestor.
-	*
-	* @param string $platform RDBMS platform name (from ADODB platform list).
-	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
-	}
-	
-	/**
-	* Returns the prefix set by the ranking ancestor of the database object.
-	*
-	* @param string $name Prefix string.
-	* @return string Prefix.
-	*/
-	function prefix( $name = '' ) {
-		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
-	}
-	
-	/**
-	* Extracts a field ID from the specified field.
-	*
-	* @param string $field Field.
-	* @return string Field ID.
-	*/
-	function FieldID( $field ) {
-		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
-	}
-}
-
-/**
-* Creates a table object in ADOdb's datadict format
-*
-* This class stores information about a database table. As charactaristics
-* of the table are loaded from the external source, methods and properties
-* of this class are used to build up the table description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbTable extends dbObject {
-	
-	/**
-	* @var string Table name
-	*/
-	var $name;
-	
-	/**
-	* @var array Field specifier: Meta-information about each field
-	*/
-	var $fields = array();
-	
-	/**
-	* @var array List of table indexes.
-	*/
-	var $indexes = array();
-	
-	/**
-	* @var array Table options: Table-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var string Field index: Keeps track of which field is currently being processed
-	*/
-	var $current_field;
-	
-	/**
-	* @var boolean Mark table for destruction
-	* @access private
-	*/
-	var $drop_table;
-	
-	/**
-	* @var boolean Mark field for destruction (not yet implemented)
-	* @access private
-	*/
-	var $drop_field = array();
-	
-	/**
-	* Iniitializes a new table object.
-	*
-	* @param string $prefix DB Object prefix
-	* @param array $attributes Array of table attributes.
-	*/
-	function dbTable( &$parent, $attributes = NULL ) {
-		$this->parent = $parent;
-		$this->name = $this->prefix($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'INDEX':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addIndex( $attributes ) );
-				}
-				break;
-			case 'DATA':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addData( $attributes ) );
-				}
-				break;
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'FIELD':
-				// Add a field
-				$fieldName = $attributes['NAME'];
-				$fieldType = $attributes['TYPE'];
-				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
-				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
-				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
-				break;
-			case 'KEY':
-			case 'NOTNULL':
-			case 'AUTOINCREMENT':
-				// Add a field option
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
-				break;
-			case 'DEFAULT':
-				// Add a field option to the table object
-				
-				// Work around ADOdb datadict issue that misinterprets empty strings.
-				if( $attributes['VALUE'] == '' ) {
-					$attributes['VALUE'] = " '' ";
-				}
-				
-				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
-				break;
-			case 'DEFDATE':
-			case 'DEFTIMESTAMP':
-				// Add a field option to the table object
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Table constraint
-			case 'CONSTRAINT':
-				if( isset( $this->current_field ) ) {
-					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
-				} else {
-					$this->addTableOpt( $cdata );
-				}
-				break;
-			// Table option
-			case 'OPT':
-				$this->addTableOpt( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			case 'FIELD':
-				unset($this->current_field);
-				break;
-
-		}
-	}
-	
-	/**
-	* Adds an index to a table object
-	*
-	* @param array $attributes Index attributes
-	* @return object dbIndex object
-	*/
-	function addIndex( $attributes ) {
-		$name = strtoupper( $attributes['NAME'] );
-		$this->indexes[$name] = new dbIndex( $this, $attributes );
-		return $this->indexes[$name];
-	}
-	
-	/**
-	* Adds data to a table object
-	*
-	* @param array $attributes Data attributes
-	* @return object dbData object
-	*/
-	function addData( $attributes ) {
-		if( !isset( $this->data ) ) {
-			$this->data = new dbData( $this, $attributes );
-		}
-		return $this->data;
-	}
-	
-	/**
-	* Adds a field to a table object
-	*
-	* $name is the name of the table to which the field should be added. 
-	* $type is an ADODB datadict field type. The following field types
-	* are supported as of ADODB 3.40:
-	* 	- C:  varchar
-	*	- X:  CLOB (character large object) or largest varchar size
-	*	   if CLOB is not supported
-	*	- C2: Multibyte varchar
-	*	- X2: Multibyte CLOB
-	*	- B:  BLOB (binary large object)
-	*	- D:  Date (some databases do not support this, and we return a datetime type)
-	*	- T:  Datetime or Timestamp
-	*	- L:  Integer field suitable for storing booleans (0 or 1)
-	*	- I:  Integer (mapped to I4)
-	*	- I1: 1-byte integer
-	*	- I2: 2-byte integer
-	*	- I4: 4-byte integer
-	*	- I8: 8-byte integer
-	*	- F:  Floating point number
-	*	- N:  Numeric or decimal number
-	*
-	* @param string $name Name of the table to which the field will be added.
-	* @param string $type	ADODB datadict field type.
-	* @param string $size	Field size
-	* @param array $opts	Field options array
-	* @return array Field specifier array
-	*/
-	function addField( $name, $type, $size = NULL, $opts = NULL ) {
-		$field_id = $this->FieldID( $name );
-		
-		// Set the field index so we know where we are
-		$this->current_field = $field_id;
-		
-		// Set the field name (required)
-		$this->fields[$field_id]['NAME'] = $name;
-		
-		// Set the field type (required)
-		$this->fields[$field_id]['TYPE'] = $type;
-		
-		// Set the field size (optional)
-		if( isset( $size ) ) {
-			$this->fields[$field_id]['SIZE'] = $size;
-		}
-		
-		// Set the field options
-		if( isset( $opts ) ) {
-			$this->fields[$field_id]['OPTS'][] = $opts;
-		}
-	}
-	
-	/**
-	* Adds a field option to the current field specifier
-	*
-	* This method adds a field option allowed by the ADOdb datadict 
-	* and appends it to the given field.
-	*
-	* @param string $field	Field name
-	* @param string $opt ADOdb field option
-	* @param mixed $value Field option value
-	* @return array Field specifier array
-	*/
-	function addFieldOpt( $field, $opt, $value = NULL ) {
-		if( !isset( $value ) ) {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
-		// Add the option and value
-		} else {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
-		}
-	}
-	
-	/**
-	* Adds an option to the table
-	*
-	* This method takes a comma-separated list of table-level options
-	* and appends them to the table object.
-	*
-	* @param string $opt Table option
-	* @return array Options
-	*/
-	function addTableOpt( $opt ) {
-		if(isset($this->currentPlatform)) {
-			$this->opts[$this->parent->db->databaseType] = $opt;
-		}
-		return $this->opts;
-	}
-
-	
-	/**
-	* Generates the SQL that will create the table in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing table creation SQL
-	*/
-	function create( &$xmls ) {
-		$sql = array();
-		
-		// drop any existing indexes
-		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
-			foreach( $legacy_indexes as $index => $index_details ) {
-				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
-			}
-		}
-		
-		// remove fields to be dropped from table object
-		foreach( $this->drop_field as $field ) {
-			unset( $this->fields[$field] );
-		}
-		
-		// if table exists
-		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
-			// drop table
-			if( $this->drop_table ) {
-				$sql[] = $xmls->dict->DropTableSQL( $this->name );
-				
-				return $sql;
-			}
-			
-			// drop any existing fields not in schema
-			foreach( $legacy_fields as $field_id => $field ) {
-				if( !isset( $this->fields[$field_id] ) ) {
-					$sql[] = $xmls->dict->DropColumnSQL( $this->name, '`'.$field->name.'`' );
-				}
-			}
-		// if table doesn't exist
-		} else {
-			if( $this->drop_table ) {
-				return $sql;
-			}
-			
-			$legacy_fields = array();
-		}
-		
-		// Loop through the field specifier array, building the associative array for the field options
-		$fldarray = array();
-		
-		foreach( $this->fields as $field_id => $finfo ) {
-			// Set an empty size if it isn't supplied
-			if( !isset( $finfo['SIZE'] ) ) {
-				$finfo['SIZE'] = '';
-			}
-			
-			// Initialize the field array with the type and size
-			$fldarray[$field_id] = array(
-				'NAME' => $finfo['NAME'],
-				'TYPE' => $finfo['TYPE'],
-				'SIZE' => $finfo['SIZE']
-			);
-			
-			// Loop through the options array and add the field options. 
-			if( isset( $finfo['OPTS'] ) ) {
-				foreach( $finfo['OPTS'] as $opt ) {
-					// Option has an argument.
-					if( is_array( $opt ) ) {
-						$key = key( $opt );
-						$value = $opt[key( $opt )];
-						@$fldarray[$field_id][$key] .= $value;
-					// Option doesn't have arguments
-					} else {
-						$fldarray[$field_id][$opt] = $opt;
-					}
-				}
-			}
-		}
-		
-		if( empty( $legacy_fields ) ) {
-			// Create the new table
-			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-			logMsg( end( $sql ), 'Generated CreateTableSQL' );
-		} else {
-			// Upgrade an existing table
-			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
-			switch( $xmls->upgrade ) {
-				// Use ChangeTableSQL
-				case 'ALTER':
-					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
-					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				case 'REPLACE':
-					logMsg( 'Doing upgrade REPLACE (testing)' );
-					$sql[] = $xmls->dict->DropTableSQL( $this->name );
-					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				// ignore table
-				default:
-					return array();
-			}
-		}
-		
-		foreach( $this->indexes as $index ) {
-			$sql[] = $index->create( $xmls );
-		}
-		
-		if( isset( $this->data ) ) {
-			$sql[] = $this->data->create( $xmls );
-		}
-		
-		return $sql;
-	}
-	
-	/**
-	* Marks a field or table for destruction
-	*/
-	function drop() {
-		if( isset( $this->current_field ) ) {
-			// Drop the current field
-			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
-			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
-			$this->drop_field[$this->current_field] = $this->current_field;
-		} else {
-			// Drop the current table
-			logMsg( "Dropping table '{$this->name}'" );
-			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
-			$this->drop_table = TRUE;
-		}
-	}
-}
-
-/**
-* Creates an index object in ADOdb's datadict format
-*
-* This class stores information about a database index. As charactaristics
-* of the index are loaded from the external source, methods and properties
-* of this class are used to build up the index description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbIndex extends dbObject {
-	
-	/**
-	* @var string	Index name
-	*/
-	var $name;
-	
-	/**
-	* @var array	Index options: Index-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var array	Indexed fields: Table columns included in this index
-	*/
-	var $columns = array();
-	
-	/**
-	* @var boolean Mark index for destruction
-	* @access private
-	*/
-	var $drop = FALSE;
-	
-	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbIndex( &$parent, $attributes = NULL ) {
-		$this->parent = $parent;
-		
-		$this->name = $this->prefix ($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'CLUSTERED':
-			case 'BITMAP':
-			case 'UNIQUE':
-			case 'FULLTEXT':
-			case 'HASH':
-				// Add index Option
-				$this->addIndexOpt( $this->currentElement );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'COL':
-				$this->addField( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'INDEX':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $name ) {
-		$this->columns[$this->FieldID( $name )] = $name;
-		
-		// Return the field list
-		return $this->columns;
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addIndexOpt( $opt ) {
-		$this->opts[] = $opt;
-		
-		// Return the options list
-		return $this->opts;
-	}
-	
-	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		if( $this->drop ) {
-			return NULL;
-		}
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->columns as $id => $col ) {
-			if( !isset( $this->parent->fields[$id] ) ) {
-				unset( $this->columns[$id] );
-			}
-		}
-		
-		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
-	}
-	
-	/**
-	* Marks an index for destruction
-	*/
-	function drop() {
-		$this->drop = TRUE;
-	}
-}
-
-/**
-* Creates a data object in ADOdb's datadict format
-*
-* This class stores information about table data.
-*
-* @package axmls
-* @access private
-*/
-class dbData extends dbObject {
-	
-	var $data = array();
-	
-	var $row;
-	
-	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbData( &$parent, $attributes = NULL ) {
-		$this->parent = $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'ROW':
-				$this->row = count( $this->data );
-				$this->data[$this->row] = array();
-				break;
-			case 'F':
-				$this->addField($attributes);
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'F':
-				$this->addData( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'DATA':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $attributes ) {
-		if( isset( $attributes['NAME'] ) ) {
-			$name = $attributes['NAME'];
-		} else {
-			$name = count($this->data[$this->row]);
-		}
-		
-		// Set the field index so we know where we are
-		$this->current_field = $this->FieldID( $name );
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addData( $cdata ) {
-		if( !isset( $this->data[$this->row] ) ) {
-			$this->data[$this->row] = array();
-		}
-		
-		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
-			$this->data[$this->row][$this->current_field] = '';
-		}
-		
-		$this->data[$this->row][$this->current_field] .= $cdata;
-	}
-	
-	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		$table = $xmls->dict->TableName($this->parent->name);
-		$table_field_count = count($this->parent->fields);
-		$sql = array();
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->data as $row ) {
-			$table_fields = $this->parent->fields;
-			$fields = array();
-			
-			foreach( $row as $field_id => $field_data ) {
-				if( !array_key_exists( $field_id, $table_fields ) ) {
-					if( is_numeric( $field_id ) ) {
-						$field_id = reset( array_keys( $table_fields ) );
-					} else {
-						continue;
-					}
-				}
-				
-				$name = $table_fields[$field_id]['NAME'];
-				
-				switch( $table_fields[$field_id]['TYPE'] ) {
-					case 'C':
-					case 'C2':
-					case 'X':
-					case 'X2':
-						$fields[$name] = $xmls->db->qstr( $field_data );
-						break;
-					case 'I':
-					case 'I1':
-					case 'I2':
-					case 'I4':
-					case 'I8':
-						$fields[$name] = intval($field_data);
-						break;
-					default:
-						$fields[$name] = $field_data;
-				}
-				
-				unset($table_fields[$field_id]);
-			}
-			
-			// check that at least 1 column is specified
-			if( empty( $fields ) ) {
-				continue;
-			}
-			
-			// check that no required columns are missing
-			if( count( $fields ) < $table_field_count ) {
-				foreach( $table_fields as $field ) {
-					if (isset( $field['OPTS'] ))
-						if( ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
-							continue(2);
-						}
-				}
-			}
-			
-			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
-		}
-		
-		return $sql;
-	}
-}
-
-/**
-* Creates the SQL to execute a list of provided SQL queries
-*
-* @package axmls
-* @access private
-*/
-class dbQuerySet extends dbObject {
-	
-	/**
-	* @var array	List of SQL queries
-	*/
-	var $queries = array();
-	
-	/**
-	* @var string	String used to build of a query line by line
-	*/
-	var $query;
-	
-	/**
-	* @var string	Query prefix key
-	*/
-	var $prefixKey = '';
-	
-	/**
-	* @var boolean	Auto prefix enable (TRUE)
-	*/
-	var $prefixMethod = 'AUTO';
-	
-	/**
-	* Initializes the query set.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*/
-	function dbQuerySet( &$parent, $attributes = NULL ) {
-		$this->parent = $parent;
-			
-		// Overrides the manual prefix key
-		if( isset( $attributes['KEY'] ) ) {
-			$this->prefixKey = $attributes['KEY'];
-		}
-		
-		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
-		// Enables or disables automatic prefix prepending
-		switch( $prefixMethod ) {
-			case 'AUTO':
-				$this->prefixMethod = 'AUTO';
-				break;
-			case 'MANUAL':
-				$this->prefixMethod = 'MANUAL';
-				break;
-			case 'NONE':
-				$this->prefixMethod = 'NONE';
-				break;
-		}
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'QUERY':
-				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
-				// current connection platform.
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->newQuery();
-				} else {
-					$this->discardQuery();
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Line of queryset SQL data
-			case 'QUERY':
-				$this->buildQuery( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'QUERY':
-				// Add the finished query to the open query set.
-				$this->addQuery();
-				break;
-			case 'SQL':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* Re-initializes the query.
-	*
-	* @return boolean TRUE
-	*/
-	function newQuery() {
-		$this->query = '';
-		
-		return TRUE;
-	}
-	
-	/**
-	* Discards the existing query.
-	*
-	* @return boolean TRUE
-	*/
-	function discardQuery() {
-		unset( $this->query );
-		
-		return TRUE;
-	}
-	
-	/** 
-	* Appends a line to a query that is being built line by line
-	*
-	* @param string $data Line of SQL data or NULL to initialize a new query
-	* @return string SQL query string.
-	*/
-	function buildQuery( $sql = NULL ) {
-		if( !isset( $this->query ) OR empty( $sql ) ) {
-			return FALSE;
-		}
-		
-		$this->query .= $sql;
-		
-		return $this->query;
-	}
-	
-	/**
-	* Adds a completed query to the query list
-	*
-	* @return string	SQL of added query
-	*/
-	function addQuery() {
-		if( !isset( $this->query ) ) {
-			return FALSE;
-		}
-		
-		$this->queries[] = $return = trim($this->query);
-		
-		unset( $this->query );
-		
-		return $return;
-	}
-	
-	/**
-	* Creates and returns the current query set
-	*
-	* @param object $xmls adoSchema object
-	* @return array Query set
-	*/
-	function create( &$xmls ) {
-		foreach( $this->queries as $id => $query ) {
-			switch( $this->prefixMethod ) {
-				case 'AUTO':
-					// Enable auto prefix replacement
-					
-					// Process object prefix.
-					// Evaluate SQL statements to prepend prefix to objects
-					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					
-					// SELECT statements aren't working yet
-					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-					
-				case 'MANUAL':
-					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
-					// If prefixKey is not set, we use the default constant XMLS_PREFIX
-					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
-						// Enable prefix override
-						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
-					} else {
-						// Use default replacement
-						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
-					}
-			}
-			
-			$this->queries[$id] = trim( $query );
-		}
-		
-		// Return the query set array
-		return $this->queries;
-	}
-	
-	/**
-	* Rebuilds the query with the prefix attached to any objects
-	*
-	* @param string $regex Regex used to add prefix
-	* @param string $query SQL query string
-	* @param string $prefix Prefix to be appended to tables, indices, etc.
-	* @return string Prefixed SQL query string.
-	*/
-	function prefixQuery( $regex, $query, $prefix = NULL ) {
-		if( !isset( $prefix ) ) {
-			return $query;
-		}
-		
-		if( preg_match( $regex, $query, $match ) ) {
-			$preamble = $match[1];
-			$postamble = $match[5];
-			$objectList = explode( ',', $match[3] );
-			// $prefix = $prefix . '_';
-			
-			$prefixedList = '';
-			
-			foreach( $objectList as $object ) {
-				if( $prefixedList !== '' ) {
-					$prefixedList .= ', ';
-				}
-				
-				$prefixedList .= $prefix . trim( $object );
-			}
-			
-			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
-		}
-		
-		return $query;
-	}
-}
-
-/**
-* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
-* This class is used to load and parse the XML file, to create an array of SQL statements
-* that can be used to build a database, and to build the database using the SQL array.
-*
-* @tutorial getting_started.pkg
-*
-* @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.12 $
-*
-* @package axmls
-*/
-class adoSchema {
-	
-	/**
-	* @var array	Array containing SQL queries to generate all objects
-	* @access private
-	*/
-	var $sqlArray;
-	
-	/**
-	* @var object	ADOdb connection object
-	* @access private
-	*/
-	var $db;
-	
-	/**
-	* @var object	ADOdb Data Dictionary
-	* @access private
-	*/
-	var $dict;
-	
-	/**
-	* @var string Current XML element
-	* @access private
-	*/
-	var $currentElement = '';
-	
-	/**
-	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
-	* @access private
-	*/
-	var $upgrade = '';
-	
-	/**
-	* @var string Optional object prefix
-	* @access private
-	*/
-	var $objectPrefix = '';
-	
-	/**
-	* @var long	Original Magic Quotes Runtime value
-	* @access private
-	*/
-	var $mgq;
-	
-	/**
-	* @var long	System debug
-	* @access private
-	*/
-	var $debug;
-	
-	/**
-	* @var string Regular expression to find schema version
-	* @access private
-	*/
-	var $versionRegex = '//';
-	
-	/**
-	* @var string Current schema version
-	* @access private
-	*/
-	var $schemaVersion;
-	
-	/**
-	* @var int	Success of last Schema execution
-	*/
-	var $success;
-	
-	/**
-	* @var bool	Execute SQL inline as it is generated
-	*/
-	var $executeInline;
-	
-	/**
-	* @var bool	Continue SQL execution if errors occur
-	*/
-	var $continueOnError;
-	
-	/**
-	* Creates an adoSchema object
-	*
-	* Creating an adoSchema object is the first step in processing an XML schema.
-	* The only parameter is an ADOdb database connection object, which must already
-	* have been created.
-	*
-	* @param object $db ADOdb database connection object.
-	*/
-	function adoSchema( &$db ) {
-		// Initialize the environment
-		$this->mgq = get_magic_quotes_runtime();
-		set_magic_quotes_runtime(0);
-		
-		$this->db = $db;
-		$this->debug = $this->db->debug;
-		$this->dict = NewDataDictionary( $this->db );
-		$this->sqlArray = array();
-		$this->schemaVersion = XMLS_SCHEMA_VERSION;
-		$this->executeInline( XMLS_EXECUTE_INLINE );
-		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
-		$this->setUpgradeMethod();
-	}
-	
-	/**
-	* Sets the method to be used for upgrading an existing database
-	*
-	* Use this method to specify how existing database objects should be upgraded.
-	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
-	* alter each database object directly, REPLACE attempts to rebuild each object
-	* from scratch, BEST attempts to determine the best upgrade method for each
-	* object, and NONE disables upgrading.
-	*
-	* This method is not yet used by AXMLS, but exists for backward compatibility.
-	* The ALTER method is automatically assumed when the adoSchema object is
-	* instantiated; other upgrade methods are not currently supported.
-	*
-	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
-	* @returns string Upgrade method used
-	*/
-	function SetUpgradeMethod( $method = '' ) {
-		if( !is_string( $method ) ) {
-			return FALSE;
-		}
-		
-		$method = strtoupper( $method );
-		
-		// Handle the upgrade methods
-		switch( $method ) {
-			case 'ALTER':
-				$this->upgrade = $method;
-				break;
-			case 'REPLACE':
-				$this->upgrade = $method;
-				break;
-			case 'BEST':
-				$this->upgrade = 'ALTER';
-				break;
-			case 'NONE':
-				$this->upgrade = 'NONE';
-				break;
-			default:
-				// Use default if no legitimate method is passed.
-				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
-		}
-		
-		return $this->upgrade;
-	}
-	
-	/**
-	* Enables/disables inline SQL execution.
-	*
-	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
-	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
-	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
-	* to apply the schema to the database.
-	*
-	* @param bool $mode execute
-	* @return bool current execution mode
-	*
-	* @see ParseSchema(), ExecuteSchema()
-	*/
-	function ExecuteInline( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->executeInline = $mode;
-		}
-		
-		return $this->executeInline;
-	}
-	
-	/**
-	* Enables/disables SQL continue on error.
-	*
-	* Call this method to enable or disable continuation of SQL execution if an error occurs.
-	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
-	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
-	* of the schema will continue.
-	*
-	* @param bool $mode execute
-	* @return bool current continueOnError mode
-	*
-	* @see addSQL(), ExecuteSchema()
-	*/
-	function ContinueOnError( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->continueOnError = $mode;
-		}
-		
-		return $this->continueOnError;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to create the database described. 
-	* @see ParseSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function ParseSchema( $filename, $returnSchema = FALSE ) {
-		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
-	* and generate the SQL necessary to create the database described by the schema.
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*
-	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
-	* @see ParseSchema(), ParseSchemaString()
-	*/
-	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			// die( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
-			return FALSE;
-		}
-		
-		if ( $returnSchema )
-		{
-			$xmlstring = '';
-			while( $data = fread( $fp, 100000 ) ) {
-				$xmlstring .= $data;
-			}
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
-				die( sprintf(
-					"XML error: %s at line %d",
-					xml_error_string( xml_get_error_code( $xmlParser) ),
-					xml_get_current_line_number( $xmlParser)
-				) );
-			}
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Converts an XML schema string to SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to create the database described by the schema. 
-	* @see ParseSchema()
-	*
-	* @param string $xmlstring XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
-			return FALSE;
-		}
-		
-		if ( $returnSchema )
-		{
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
-			die( sprintf(
-				"XML error: %s at line %d",
-				xml_error_string( xml_get_error_code( $xmlParser) ),
-				xml_get_current_line_number( $xmlParser)
-			) );
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to uninstallation SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to remove the database described.
-	* @see RemoveSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function RemoveSchema( $filename, $returnSchema = FALSE ) {
-		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Converts an XML schema string to uninstallation SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to uninstall the database described by the schema. 
-	* @see RemoveSchema()
-	*
-	* @param string $schema XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
-	}
-	
-	/**
-	* Applies the current XML schema to the database (post execution).
-	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
-	* and executing other SQL specified in the schema) after parsing.
-	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
-	*
-	* @param array $sqlArray Array of SQL statements that will be applied rather than
-	*		the current schema.
-	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
-	* @returns integer 0 if failure, 1 if errors, 2 if successful.
-	*/
-	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
-		if( !is_bool( $continueOnErr ) ) {
-			$continueOnErr = $this->ContinueOnError();
-		}
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			$this->success = 0;
-		} else {
-			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
-		}
-		
-		return $this->success;
-	}
-	
-	/**
-	* Returns the current SQL array. 
-	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
-	*
-	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
-	* @return array Array of SQL statements or FALSE if an error occurs
-	*/
-	function PrintSQL( $format = 'NONE' ) {
-		$sqlArray = null;
-		return $this->getSQL( $format, $sqlArray );
-	}
-	
-	/**
-	* Saves the current SQL array to the local filesystem as a list of SQL queries.
-	*
-	* Call this method to save the array of SQL queries (generally resulting from a
-	* parsed XML schema) to the filesystem.
-	*
-	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
-	*/
-	function SaveSQL( $filename = './schema.sql' ) {
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		if( !isset( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		$fp = fopen( $filename, "w" );
-		
-		foreach( $sqlArray as $key => $query ) {
-			fwrite( $fp, $query . ";\n" );
-		}
-		fclose( $fp );
-	}
-	
-	/**
-	* Create an xml parser
-	*
-	* @return object PHP XML parser object
-	*
-	* @access private
-	*/
-	function create_parser() {
-		// Create the parser
-		$xmlParser = xml_parser_create();
-		xml_set_object( $xmlParser, $this );
-		
-		// Initialize the XML callback functions
-		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
-		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
-		return $xmlParser;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				$this->obj = new dbTable( $this, $attributes );
-				xml_set_object( $parser, $this->obj );
-				break;
-			case 'SQL':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->obj = new dbQuerySet( $this, $attributes );
-					xml_set_object( $parser, $this->obj );
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	* @internal
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	/**
-	* Converts an XML schema string to the specified DTD version.
-	*
-	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaFile()
-	*
-	* @param string $schema String containing XML schema that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = $schema;
-		} else {
-			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-	
-	// compat for pre-4.3 - jlim
-	function _file_get_contents($path)
-	{
-		if (function_exists('file_get_contents')) return file_get_contents($path);
-		return join('',file($path));
-	}
-	
-	/**
-	* Converts an XML schema file to the specified DTD version.
-	*
-	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaString()
-	*
-	* @param string $filename Name of XML schema file that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = _file_get_contents( $filename );
-			
-			// remove unicode BOM if present
-			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
-				$result = substr( $result, 3 );
-			}
-		} else {
-			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-	
-	function TransformSchema( $schema, $xsl, $schematype='string' )
-	{
-		// Fail if XSLT extension is not available
-		if( ! function_exists( 'xslt_create' ) ) {
-			return FALSE;
-		}
-		
-		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-		
-		// look for xsl
-		if( !is_readable( $xsl_file ) ) {
-			return FALSE;
-		}
-		
-		switch( $schematype )
-		{
-			case 'file':
-				if( !is_readable( $schema ) ) {
-					return FALSE;
-				}
-				
-				$schema = _file_get_contents( $schema );
-				break;
-			case 'string':
-			default:
-				if( !is_string( $schema ) ) {
-					return FALSE;
-				}
-		}
-		
-		$arguments = array (
-			'/_xml' => $schema,
-			'/_xsl' => _file_get_contents( $xsl_file )
-		);
-		
-		// create an XSLT processor
-		$xh = xslt_create ();
-		
-		// set error handler
-		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-		
-		// process the schema
-		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
-		
-		xslt_free ($xh);
-		
-		return $result;
-	}
-	
-	/**
-	* Processes XSLT transformation errors
-	*
-	* @param object $parser XML parser object
-	* @param integer $errno Error number
-	* @param integer $level Error level
-	* @param array $fields Error information fields
-	*
-	* @access private
-	*/
-	function xslt_error_handler( $parser, $errno, $level, $fields ) {
-		if( is_array( $fields ) ) {
-			$msg = array(
-				'Message Type' => ucfirst( $fields['msgtype'] ),
-				'Message Code' => $fields['code'],
-				'Message' => $fields['msg'],
-				'Error Number' => $errno,
-				'Level' => $level
-			);
-			
-			switch( $fields['URI'] ) {
-				case 'arg:/_xml':
-					$msg['Input'] = 'XML';
-					break;
-				case 'arg:/_xsl':
-					$msg['Input'] = 'XSL';
-					break;
-				default:
-					$msg['Input'] = $fields['URI'];
-			}
-			
-			$msg['Line'] = $fields['line'];
-		} else {
-			$msg = array(
-				'Message Type' => 'Error',
-				'Error Number' => $errno,
-				'Level' => $level,
-				'Fields' => var_export( $fields, TRUE )
-			);
-		}
-		
-		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
-					   . '' . "\n";
-		
-		foreach( $msg as $label => $details ) {
-			$error_details .= '' . "\n";
-		}
-		
-		$error_details .= '
' . $label . ': ' . htmlentities( $details ) . '
';
-		
-		trigger_error( $error_details, E_USER_ERROR );
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the requested XML schema file.
-	*
-	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
-	* @see SchemaStringVersion()
-	*
-	* @param string $filename AXMLS schema file
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaFileVersion( $filename ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			// die( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( preg_match( $this->versionRegex, $data, $matches ) ) {
-				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-			}
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the provided XML schema string.
-	*
-	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
-	* @see SchemaFileVersion()
-	*
-	* @param string $xmlstring XML schema string
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaStringVersion( $xmlstring ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			return FALSE;
-		}
-		
-		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
-			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Extracts an XML schema from an existing database.
-	*
-	* Call this method to create an XML schema string from an existing database.
-	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
-	*
-	* @param boolean $data Include data in schema dump
-	* @return string Generated XML schema
-	*/
-	function ExtractSchema( $data = FALSE ) {
-		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-		
-		$schema = '' . "\n"
-				. '' . "\n";
-		
-		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
-			foreach( $tables as $table ) {
-				$schema .= '	' . "\n";
-				
-				// grab details from database
-				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
-				$fields = $this->db->MetaColumns( $table );
-				$indexes = $this->db->MetaIndexes( $table );
-				
-				if( is_array( $fields ) ) {
-					foreach( $fields as $details ) {
-						$extra = '';
-						$content = array();
-						
-						if( $details->max_length > 0 ) {
-							$extra .= ' size="' . $details->max_length . '"';
-						}
-						
-						if( $details->primary_key ) {
-							$content[] = '';
-						} elseif( $details->not_null ) {
-							$content[] = '';
-						}
-						
-						if( $details->has_default ) {
-							$content[] = '';
-						}
-						
-						if( $details->auto_increment ) {
-							$content[] = '';
-						}
-						
-						// this stops the creation of 'R' columns,
-						// AUTOINCREMENT is used to create auto columns
-						$details->primary_key = 0;
-						$type = $rs->MetaType( $details );
-						
-						$schema .= '		';
-						
-						if( !empty( $content ) ) {
-							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
-						}
-						
-						$schema .= '' . "\n";
-					}
-				}
-				
-				if( is_array( $indexes ) ) {
-					foreach( $indexes as $index => $details ) {
-						$schema .= '		' . "\n";
-						
-						if( $details['unique'] ) {
-							$schema .= '			' . "\n";
-						}
-						
-						foreach( $details['columns'] as $column ) {
-							$schema .= '			' . $column . '' . "\n";
-						}
-						
-						$schema .= '		' . "\n";
-					}
-				}
-				
-				if( $data ) {
-					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
-					if( is_object( $rs ) ) {
-						$schema .= '		' . "\n";
-						
-						while( $row = $rs->FetchRow() ) {
-							foreach( $row as $key => $val ) {
-								$row[$key] = htmlentities($val);
-							}
-							
-							$schema .= '			' . implode( '', $row ) . '' . "\n";
-						}
-						
-						$schema .= '		' . "\n";
-					}
-				}
-				
-				$schema .= '	
' . "\n";
-			}
-		}
-		
-		$this->db->SetFetchMode( $old_mode );
-		
-		$schema .= '';
-		return $schema;
-	}
-	
-	/**
-	* Sets a prefix for database objects
-	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
-	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
-	*
-	* @param string $prefix Prefix that will be prepended.
-	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
-	* @return boolean TRUE if successful, else FALSE
-	*/
-	function SetPrefix( $prefix = '', $underscore = TRUE ) {
-		switch( TRUE ) {
-			// clear prefix
-			case empty( $prefix ):
-				logMsg( 'Cleared prefix' );
-				$this->objectPrefix = '';
-				return TRUE;
-			// prefix too long
-			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
-			// prefix contains invalid characters
-			case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
-				logMsg( 'Invalid prefix: ' . $prefix );
-				return FALSE;
-		}
-		
-		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
-			$prefix .= '_';
-		}
-		
-		// prefix valid
-		logMsg( 'Set prefix: ' . $prefix );
-		$this->objectPrefix = $prefix;
-		return TRUE;
-	}
-	
-	/**
-	* Returns an object name with the current prefix prepended.
-	*
-	* @param string	$name Name
-	* @return string	Prefixed name
-	*
-	* @access private
-	*/
-	function prefix( $name = '' ) {
-		// if prefix is set
-		if( !empty( $this->objectPrefix ) ) {
-			// Prepend the object prefix to the table name
-			// prepend after quote if used
-			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
-		}
-		
-		// No prefix set. Use name provided.
-		return $name;
-	}
-	
-	/**
-	* Checks if element references a specific platform
-	*
-	* @param string $platform Requested platform
-	* @returns boolean TRUE if platform check succeeds
-	*
-	* @access private
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
-		
-		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
-			logMsg( "Platform $platform is supported" );
-			return TRUE;
-		} else {
-			logMsg( "Platform $platform is NOT supported" );
-			return FALSE;
-		}
-	}
-	
-	/**
-	* Clears the array of generated SQL.
-	*
-	* @access private
-	*/
-	function clearSQL() {
-		$this->sqlArray = array();
-	}
-	
-	/**
-	* Adds SQL into the SQL array.
-	*
-	* @param mixed $sql SQL to Add
-	* @return boolean TRUE if successful, else FALSE.
-	*
-	* @access private
-	*/	
-	function addSQL( $sql = NULL ) {
-		if( is_array( $sql ) ) {
-			foreach( $sql as $line ) {
-				$this->addSQL( $line );
-			}
-			
-			return TRUE;
-		}
-		
-		if( is_string( $sql ) ) {
-			$this->sqlArray[] = $sql;
-			
-			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
-			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
-				$saved = $this->db->debug;
-				$this->db->debug = $this->debug;
-				$ok = $this->db->Execute( $sql );
-				$this->db->debug = $saved;
-				
-				if( !$ok ) {
-					if( $this->debug ) {
-						ADOConnection::outp( $this->db->ErrorMsg() );
-					}
-					
-					$this->success = 1;
-				}
-			}
-			
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Gets the SQL array in the specified format.
-	*
-	* @param string $format Format
-	* @return mixed SQL
-	*	
-	* @access private
-	*/
-	function getSQL( $format = NULL, $sqlArray = NULL ) {
-		if( !is_array( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		switch( strtolower( $format ) ) {
-			case 'string':
-			case 'text':
-				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
-			case'html':
-				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
-		}
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Destroys an adoSchema object.
-	*
-	* Call this method to clean up after an adoSchema object that is no longer in use.
-	* @deprecated adoSchema now cleans up automatically.
-	*/
-	function Destroy() {
-		set_magic_quotes_runtime( $this->mgq );
-		unset( $this );
-	}
-}
-
-/**
-* Message logging function
-*
-* @access private
-*/
-function logMsg( $msg, $title = NULL, $force = FALSE ) {
-	if( XMLS_DEBUG or $force ) {
-		echo '
';
-		
-		if( isset( $title ) ) {
-			echo '
' . htmlentities( $title ) . '
';
-		}
-		
-		if( is_object( $this ) ) {
-			echo '[' . get_class( $this ) . '] ';
-		}
-		
-		print_r( $msg );
-		
-		echo '
';
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/adodb-xmlschema03.inc.php b/includes/adodb/adodb-xmlschema03.inc.php
deleted file mode 100644
index 83984a68..00000000
--- a/includes/adodb/adodb-xmlschema03.inc.php
+++ /dev/null
@@ -1,2404 +0,0 @@
-parent = $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	function create() {
-		return array();
-	}
-	
-	/**
-	* Destroys the object
-	*/
-	function destroy() {
-		unset( $this );
-	}
-	
-	/**
-	* Checks whether the specified RDBMS is supported by the current
-	* database object or its ranking ancestor.
-	*
-	* @param string $platform RDBMS platform name (from ADODB platform list).
-	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
-	}
-	
-	/**
-	* Returns the prefix set by the ranking ancestor of the database object.
-	*
-	* @param string $name Prefix string.
-	* @return string Prefix.
-	*/
-	function prefix( $name = '' ) {
-		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
-	}
-	
-	/**
-	* Extracts a field ID from the specified field.
-	*
-	* @param string $field Field.
-	* @return string Field ID.
-	*/
-	function FieldID( $field ) {
-		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
-	}
-}
-
-/**
-* Creates a table object in ADOdb's datadict format
-*
-* This class stores information about a database table. As charactaristics
-* of the table are loaded from the external source, methods and properties
-* of this class are used to build up the table description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbTable extends dbObject {
-	
-	/**
-	* @var string Table name
-	*/
-	var $name;
-	
-	/**
-	* @var array Field specifier: Meta-information about each field
-	*/
-	var $fields = array();
-	
-	/**
-	* @var array List of table indexes.
-	*/
-	var $indexes = array();
-	
-	/**
-	* @var array Table options: Table-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var string Field index: Keeps track of which field is currently being processed
-	*/
-	var $current_field;
-	
-	/**
-	* @var boolean Mark table for destruction
-	* @access private
-	*/
-	var $drop_table;
-	
-	/**
-	* @var boolean Mark field for destruction (not yet implemented)
-	* @access private
-	*/
-	var $drop_field = array();
-	
-	/**
-	* @var array Platform-specific options
-	* @access private
-	*/
-	var $currentPlatform = true;
-	
-	
-	/**
-	* Iniitializes a new table object.
-	*
-	* @param string $prefix DB Object prefix
-	* @param array $attributes Array of table attributes.
-	*/
-	function dbTable( &$parent, $attributes = NULL ) {
-		$this->parent = $parent;
-		$this->name = $this->prefix($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'INDEX':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addIndex( $attributes ) );
-				}
-				break;
-			case 'DATA':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addData( $attributes ) );
-				}
-				break;
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'FIELD':
-				// Add a field
-				$fieldName = $attributes['NAME'];
-				$fieldType = $attributes['TYPE'];
-				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
-				$fieldOpts = !empty( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
-				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
-				break;
-			case 'KEY':
-			case 'NOTNULL':
-			case 'AUTOINCREMENT':
-			case 'DEFDATE':
-			case 'DEFTIMESTAMP':
-			case 'UNSIGNED':
-				// Add a field option
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
-				break;
-			case 'DEFAULT':
-				// Add a field option to the table object
-				
-				// Work around ADOdb datadict issue that misinterprets empty strings.
-				if( $attributes['VALUE'] == '' ) {
-					$attributes['VALUE'] = " '' ";
-				}
-				
-				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
-				break;
-			case 'OPT':
-			case 'CONSTRAINT':
-				// Accept platform-specific options
-				$this->currentPlatform = ( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Table/field constraint
-			case 'CONSTRAINT':
-				if( isset( $this->current_field ) ) {
-					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
-				} else {
-					$this->addTableOpt( $cdata );
-				}
-				break;
-			// Table/field option
-			case 'OPT':
-				if( isset( $this->current_field ) ) {
-					$this->addFieldOpt( $this->current_field, $cdata );
-				} else {
-				$this->addTableOpt( $cdata );
-				}
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			case 'FIELD':
-				unset($this->current_field);
-				break;
-			case 'OPT':
-			case 'CONSTRAINT':
-				$this->currentPlatform = true;
-				break;
-			default:
-
-		}
-	}
-	
-	/**
-	* Adds an index to a table object
-	*
-	* @param array $attributes Index attributes
-	* @return object dbIndex object
-	*/
-	function addIndex( $attributes ) {
-		$name = strtoupper( $attributes['NAME'] );
-		$this->indexes[$name] = new dbIndex( $this, $attributes );
-		return $this->indexes[$name];
-	}
-	
-	/**
-	* Adds data to a table object
-	*
-	* @param array $attributes Data attributes
-	* @return object dbData object
-	*/
-	function addData( $attributes ) {
-		if( !isset( $this->data ) ) {
-			$this->data = new dbData( $this, $attributes );
-		}
-		return $this->data;
-	}
-	
-	/**
-	* Adds a field to a table object
-	*
-	* $name is the name of the table to which the field should be added. 
-	* $type is an ADODB datadict field type. The following field types
-	* are supported as of ADODB 3.40:
-	* 	- C:  varchar
-	*	- X:  CLOB (character large object) or largest varchar size
-	*	   if CLOB is not supported
-	*	- C2: Multibyte varchar
-	*	- X2: Multibyte CLOB
-	*	- B:  BLOB (binary large object)
-	*	- D:  Date (some databases do not support this, and we return a datetime type)
-	*	- T:  Datetime or Timestamp
-	*	- L:  Integer field suitable for storing booleans (0 or 1)
-	*	- I:  Integer (mapped to I4)
-	*	- I1: 1-byte integer
-	*	- I2: 2-byte integer
-	*	- I4: 4-byte integer
-	*	- I8: 8-byte integer
-	*	- F:  Floating point number
-	*	- N:  Numeric or decimal number
-	*
-	* @param string $name Name of the table to which the field will be added.
-	* @param string $type	ADODB datadict field type.
-	* @param string $size	Field size
-	* @param array $opts	Field options array
-	* @return array Field specifier array
-	*/
-	function addField( $name, $type, $size = NULL, $opts = NULL ) {
-		$field_id = $this->FieldID( $name );
-		
-		// Set the field index so we know where we are
-		$this->current_field = $field_id;
-		
-		// Set the field name (required)
-		$this->fields[$field_id]['NAME'] = $name;
-		
-		// Set the field type (required)
-		$this->fields[$field_id]['TYPE'] = $type;
-		
-		// Set the field size (optional)
-		if( isset( $size ) ) {
-			$this->fields[$field_id]['SIZE'] = $size;
-		}
-		
-		// Set the field options
-		if( isset( $opts ) ) {
-			$this->fields[$field_id]['OPTS'] = array($opts);
-		} else {
-			$this->fields[$field_id]['OPTS'] = array();
-		}
-	}
-	
-	/**
-	* Adds a field option to the current field specifier
-	*
-	* This method adds a field option allowed by the ADOdb datadict 
-	* and appends it to the given field.
-	*
-	* @param string $field	Field name
-	* @param string $opt ADOdb field option
-	* @param mixed $value Field option value
-	* @return array Field specifier array
-	*/
-	function addFieldOpt( $field, $opt, $value = NULL ) {
-		if( $this->currentPlatform ) {
-		if( !isset( $value ) ) {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
-		// Add the option and value
-		} else {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
-		}
-	}
-	}
-	
-	/**
-	* Adds an option to the table
-	*
-	* This method takes a comma-separated list of table-level options
-	* and appends them to the table object.
-	*
-	* @param string $opt Table option
-	* @return array Options
-	*/
-	function addTableOpt( $opt ) {
-		if(isset($this->currentPlatform)) {
-			$this->opts[$this->parent->db->databaseType] = $opt;
-		}
-		return $this->opts;
-	}
-
-	
-	/**
-	* Generates the SQL that will create the table in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing table creation SQL
-	*/
-	function create( &$xmls ) {
-		$sql = array();
-		
-		// drop any existing indexes
-		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
-			foreach( $legacy_indexes as $index => $index_details ) {
-				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
-			}
-		}
-		
-		// remove fields to be dropped from table object
-		foreach( $this->drop_field as $field ) {
-			unset( $this->fields[$field] );
-		}
-		
-		// if table exists
-		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
-			// drop table
-			if( $this->drop_table ) {
-				$sql[] = $xmls->dict->DropTableSQL( $this->name );
-				
-				return $sql;
-			}
-			
-			// drop any existing fields not in schema
-			foreach( $legacy_fields as $field_id => $field ) {
-				if( !isset( $this->fields[$field_id] ) ) {
-					$sql[] = $xmls->dict->DropColumnSQL( $this->name, $field->name );
-				}
-			}
-		// if table doesn't exist
-		} else {
-			if( $this->drop_table ) {
-				return $sql;
-			}
-			
-			$legacy_fields = array();
-		}
-		
-		// Loop through the field specifier array, building the associative array for the field options
-		$fldarray = array();
-		
-		foreach( $this->fields as $field_id => $finfo ) {
-			// Set an empty size if it isn't supplied
-			if( !isset( $finfo['SIZE'] ) ) {
-				$finfo['SIZE'] = '';
-			}
-			
-			// Initialize the field array with the type and size
-			$fldarray[$field_id] = array(
-				'NAME' => $finfo['NAME'],
-				'TYPE' => $finfo['TYPE'],
-				'SIZE' => $finfo['SIZE']
-			);
-			
-			// Loop through the options array and add the field options. 
-			if( isset( $finfo['OPTS'] ) ) {
-				foreach( $finfo['OPTS'] as $opt ) {
-					// Option has an argument.
-					if( is_array( $opt ) ) {
-						$key = key( $opt );
-						$value = $opt[key( $opt )];
-						@$fldarray[$field_id][$key] .= $value;
-					// Option doesn't have arguments
-					} else {
-						$fldarray[$field_id][$opt] = $opt;
-					}
-				}
-			}
-		}
-		
-		if( empty( $legacy_fields ) ) {
-			// Create the new table
-			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-			logMsg( end( $sql ), 'Generated CreateTableSQL' );
-		} else {
-			// Upgrade an existing table
-			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
-			switch( $xmls->upgrade ) {
-				// Use ChangeTableSQL
-				case 'ALTER':
-					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
-					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				case 'REPLACE':
-					logMsg( 'Doing upgrade REPLACE (testing)' );
-					$sql[] = $xmls->dict->DropTableSQL( $this->name );
-					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				// ignore table
-				default:
-					return array();
-			}
-		}
-		
-		foreach( $this->indexes as $index ) {
-			$sql[] = $index->create( $xmls );
-		}
-		
-		if( isset( $this->data ) ) {
-			$sql[] = $this->data->create( $xmls );
-		}
-		
-		return $sql;
-	}
-	
-	/**
-	* Marks a field or table for destruction
-	*/
-	function drop() {
-		if( isset( $this->current_field ) ) {
-			// Drop the current field
-			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
-			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
-			$this->drop_field[$this->current_field] = $this->current_field;
-		} else {
-			// Drop the current table
-			logMsg( "Dropping table '{$this->name}'" );
-			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
-			$this->drop_table = TRUE;
-		}
-	}
-}
-
-/**
-* Creates an index object in ADOdb's datadict format
-*
-* This class stores information about a database index. As charactaristics
-* of the index are loaded from the external source, methods and properties
-* of this class are used to build up the index description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbIndex extends dbObject {
-	
-	/**
-	* @var string	Index name
-	*/
-	var $name;
-	
-	/**
-	* @var array	Index options: Index-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var array	Indexed fields: Table columns included in this index
-	*/
-	var $columns = array();
-	
-	/**
-	* @var boolean Mark index for destruction
-	* @access private
-	*/
-	var $drop = FALSE;
-	
-	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbIndex( &$parent, $attributes = NULL ) {
-		$this->parent = $parent;
-		
-		$this->name = $this->prefix ($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'CLUSTERED':
-			case 'BITMAP':
-			case 'UNIQUE':
-			case 'FULLTEXT':
-			case 'HASH':
-				// Add index Option
-				$this->addIndexOpt( $this->currentElement );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'COL':
-				$this->addField( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'INDEX':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $name ) {
-		$this->columns[$this->FieldID( $name )] = $name;
-		
-		// Return the field list
-		return $this->columns;
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addIndexOpt( $opt ) {
-		$this->opts[] = $opt;
-		
-		// Return the options list
-		return $this->opts;
-	}
-	
-	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		if( $this->drop ) {
-			return NULL;
-		}
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->columns as $id => $col ) {
-			if( !isset( $this->parent->fields[$id] ) ) {
-				unset( $this->columns[$id] );
-			}
-		}
-		
-		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
-	}
-	
-	/**
-	* Marks an index for destruction
-	*/
-	function drop() {
-		$this->drop = TRUE;
-	}
-}
-
-/**
-* Creates a data object in ADOdb's datadict format
-*
-* This class stores information about table data, and is called
-* when we need to load field data into a table.
-*
-* @package axmls
-* @access private
-*/
-class dbData extends dbObject {
-	
-	var $data = array();
-	
-	var $row;
-	
-	/**
-	* Initializes the new dbData object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbData( &$parent, $attributes = NULL ) {
-		$this->parent = $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: ROW and F (field). 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'ROW':
-				$this->row = count( $this->data );
-				$this->data[$this->row] = array();
-				break;
-			case 'F':
-				$this->addField($attributes);
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'F':
-				$this->addData( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'DATA':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the insert
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $attributes ) {
-		// check we're in a valid row
-		if( !isset( $this->row ) || !isset( $this->data[$this->row] ) ) {
-			return;
-		}
-		
-		// Set the field index so we know where we are
-		if( isset( $attributes['NAME'] ) ) {
-			$this->current_field = $this->FieldID( $attributes['NAME'] );
-		} else {
-			$this->current_field = count( $this->data[$this->row] );
-		}
-		
-		// initialise data
-		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
-			$this->data[$this->row][$this->current_field] = '';
-		}
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addData( $cdata ) {
-		// check we're in a valid field
-		if ( isset( $this->data[$this->row][$this->current_field] ) ) {
-			// add data to field
-			$this->data[$this->row][$this->current_field] .= $cdata;
-		}
-	}
-	
-	/**
-	* Generates the SQL that will add/update the data in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		$table = $xmls->dict->TableName($this->parent->name);
-		$table_field_count = count($this->parent->fields);
-		$tables = $xmls->db->MetaTables(); 
-		$sql = array();
-		
-		$ukeys = $xmls->db->MetaPrimaryKeys( $table );
-		if( !empty( $this->parent->indexes ) and !empty( $ukeys ) ) {
-			foreach( $this->parent->indexes as $indexObj ) {
-				if( !in_array( $indexObj->name, $ukeys ) ) $ukeys[] = $indexObj->name;
-			}
-		}
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->data as $row ) {
-			$table_fields = $this->parent->fields;
-			$fields = array();
-			$rawfields = array(); // Need to keep some of the unprocessed data on hand.
-			
-			foreach( $row as $field_id => $field_data ) {
-				if( !array_key_exists( $field_id, $table_fields ) ) {
-					if( is_numeric( $field_id ) ) {
-						$field_id = reset( array_keys( $table_fields ) );
-					} else {
-						continue;
-					}
-				}
-				
-				$name = $table_fields[$field_id]['NAME'];
-				
-				switch( $table_fields[$field_id]['TYPE'] ) {
-					case 'I':
-					case 'I1':
-					case 'I2':
-					case 'I4':
-					case 'I8':
-						$fields[$name] = intval($field_data);
-						break;
-					case 'C':
-					case 'C2':
-					case 'X':
-					case 'X2':
-					default:
-						$fields[$name] = $xmls->db->qstr( $field_data );
-						$rawfields[$name] = $field_data;
-				}
-				
-				unset($table_fields[$field_id]);
-				
-			}
-			
-			// check that at least 1 column is specified
-			if( empty( $fields ) ) {
-				continue;
-			}
-			
-			// check that no required columns are missing
-			if( count( $fields ) < $table_field_count ) {
-				foreach( $table_fields as $field ) {
-					if( isset( $field['OPTS'] ) and ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
-							continue(2);
-						}
-				}
-			}
-			
-			// The rest of this method deals with updating existing data records.
-			
-			if( !in_array( $table, $tables ) or ( $mode = $xmls->existingData() ) == XMLS_MODE_INSERT ) {
-				// Table doesn't yet exist, so it's safe to insert.
-				logMsg( "$table doesn't exist, inserting or mode is INSERT" );
-			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
-				continue;
-		}
-		
-			// Prepare to test for potential violations. Get primary keys and unique indexes
-			$mfields = array_merge( $fields, $rawfields );
-			$keyFields = array_intersect( $ukeys, array_keys( $mfields ) );
-			
-			if( empty( $ukeys ) or count( $keyFields ) == 0 ) {
-				// No unique keys in schema, so safe to insert
-				logMsg( "Either schema or data has no unique keys, so safe to insert" );
-				$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
-				continue;
-			}
-			
-			// Select record containing matching unique keys.
-			$where = '';
-			foreach( $ukeys as $key ) {
-				if( isset( $mfields[$key] ) and $mfields[$key] ) {
-					if( $where ) $where .= ' AND ';
-					$where .= $key . ' = ' . $xmls->db->qstr( $mfields[$key] );
-				}
-			}
-			$records = $xmls->db->Execute( 'SELECT * FROM ' . $table . ' WHERE ' . $where );
-			switch( $records->RecordCount() ) {
-				case 0:
-					// No matching record, so safe to insert.
-					logMsg( "No matching records. Inserting new row with unique data" );
-					$sql[] = $xmls->db->GetInsertSQL( $records, $mfields );
-					break;
-				case 1:
-					// Exactly one matching record, so we can update if the mode permits.
-					logMsg( "One matching record..." );
-					if( $mode == XMLS_MODE_UPDATE ) {
-						logMsg( "...Updating existing row from unique data" );
-						$sql[] = $xmls->db->GetUpdateSQL( $records, $mfields );
-					}
-					break;
-				default:
-					// More than one matching record; the result is ambiguous, so we must ignore the row.
-					logMsg( "More than one matching record. Ignoring row." );
-			}
-		}
-		return $sql;
-	}
-}
-
-/**
-* Creates the SQL to execute a list of provided SQL queries
-*
-* @package axmls
-* @access private
-*/
-class dbQuerySet extends dbObject {
-	
-	/**
-	* @var array	List of SQL queries
-	*/
-	var $queries = array();
-	
-	/**
-	* @var string	String used to build of a query line by line
-	*/
-	var $query;
-	
-	/**
-	* @var string	Query prefix key
-	*/
-	var $prefixKey = '';
-	
-	/**
-	* @var boolean	Auto prefix enable (TRUE)
-	*/
-	var $prefixMethod = 'AUTO';
-	
-	/**
-	* Initializes the query set.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*/
-	function dbQuerySet( &$parent, $attributes = NULL ) {
-		$this->parent = $parent;
-			
-		// Overrides the manual prefix key
-		if( isset( $attributes['KEY'] ) ) {
-			$this->prefixKey = $attributes['KEY'];
-		}
-		
-		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
-		// Enables or disables automatic prefix prepending
-		switch( $prefixMethod ) {
-			case 'AUTO':
-				$this->prefixMethod = 'AUTO';
-				break;
-			case 'MANUAL':
-				$this->prefixMethod = 'MANUAL';
-				break;
-			case 'NONE':
-				$this->prefixMethod = 'NONE';
-				break;
-		}
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'QUERY':
-				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
-				// current connection platform.
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->newQuery();
-				} else {
-					$this->discardQuery();
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Line of queryset SQL data
-			case 'QUERY':
-				$this->buildQuery( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'QUERY':
-				// Add the finished query to the open query set.
-				$this->addQuery();
-				break;
-			case 'SQL':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* Re-initializes the query.
-	*
-	* @return boolean TRUE
-	*/
-	function newQuery() {
-		$this->query = '';
-		
-		return TRUE;
-	}
-	
-	/**
-	* Discards the existing query.
-	*
-	* @return boolean TRUE
-	*/
-	function discardQuery() {
-		unset( $this->query );
-		
-		return TRUE;
-	}
-	
-	/** 
-	* Appends a line to a query that is being built line by line
-	*
-	* @param string $data Line of SQL data or NULL to initialize a new query
-	* @return string SQL query string.
-	*/
-	function buildQuery( $sql = NULL ) {
-		if( !isset( $this->query ) OR empty( $sql ) ) {
-			return FALSE;
-		}
-		
-		$this->query .= $sql;
-		
-		return $this->query;
-	}
-	
-	/**
-	* Adds a completed query to the query list
-	*
-	* @return string	SQL of added query
-	*/
-	function addQuery() {
-		if( !isset( $this->query ) ) {
-			return FALSE;
-		}
-		
-		$this->queries[] = $return = trim($this->query);
-		
-		unset( $this->query );
-		
-		return $return;
-	}
-	
-	/**
-	* Creates and returns the current query set
-	*
-	* @param object $xmls adoSchema object
-	* @return array Query set
-	*/
-	function create( &$xmls ) {
-		foreach( $this->queries as $id => $query ) {
-			switch( $this->prefixMethod ) {
-				case 'AUTO':
-					// Enable auto prefix replacement
-					
-					// Process object prefix.
-					// Evaluate SQL statements to prepend prefix to objects
-					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					
-					// SELECT statements aren't working yet
-					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-					
-				case 'MANUAL':
-					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
-					// If prefixKey is not set, we use the default constant XMLS_PREFIX
-					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
-						// Enable prefix override
-						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
-					} else {
-						// Use default replacement
-						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
-					}
-			}
-			
-			$this->queries[$id] = trim( $query );
-		}
-		
-		// Return the query set array
-		return $this->queries;
-	}
-	
-	/**
-	* Rebuilds the query with the prefix attached to any objects
-	*
-	* @param string $regex Regex used to add prefix
-	* @param string $query SQL query string
-	* @param string $prefix Prefix to be appended to tables, indices, etc.
-	* @return string Prefixed SQL query string.
-	*/
-	function prefixQuery( $regex, $query, $prefix = NULL ) {
-		if( !isset( $prefix ) ) {
-			return $query;
-		}
-		
-		if( preg_match( $regex, $query, $match ) ) {
-			$preamble = $match[1];
-			$postamble = $match[5];
-			$objectList = explode( ',', $match[3] );
-			// $prefix = $prefix . '_';
-			
-			$prefixedList = '';
-			
-			foreach( $objectList as $object ) {
-				if( $prefixedList !== '' ) {
-					$prefixedList .= ', ';
-				}
-				
-				$prefixedList .= $prefix . trim( $object );
-			}
-			
-			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
-		}
-		
-		return $query;
-	}
-}
-
-/**
-* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
-* This class is used to load and parse the XML file, to create an array of SQL statements
-* that can be used to build a database, and to build the database using the SQL array.
-*
-* @tutorial getting_started.pkg
-*
-* @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.62 $
-*
-* @package axmls
-*/
-class adoSchema {
-	
-	/**
-	* @var array	Array containing SQL queries to generate all objects
-	* @access private
-	*/
-	var $sqlArray;
-	
-	/**
-	* @var object	ADOdb connection object
-	* @access private
-	*/
-	var $db;
-	
-	/**
-	* @var object	ADOdb Data Dictionary
-	* @access private
-	*/
-	var $dict;
-	
-	/**
-	* @var string Current XML element
-	* @access private
-	*/
-	var $currentElement = '';
-	
-	/**
-	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
-	* @access private
-	*/
-	var $upgrade = '';
-	
-	/**
-	* @var string Optional object prefix
-	* @access private
-	*/
-	var $objectPrefix = '';
-	
-	/**
-	* @var long	Original Magic Quotes Runtime value
-	* @access private
-	*/
-	var $mgq;
-	
-	/**
-	* @var long	System debug
-	* @access private
-	*/
-	var $debug;
-	
-	/**
-	* @var string Regular expression to find schema version
-	* @access private
-	*/
-	var $versionRegex = '//';
-	
-	/**
-	* @var string Current schema version
-	* @access private
-	*/
-	var $schemaVersion;
-	
-	/**
-	* @var int	Success of last Schema execution
-	*/
-	var $success;
-	
-	/**
-	* @var bool	Execute SQL inline as it is generated
-	*/
-	var $executeInline;
-	
-	/**
-	* @var bool	Continue SQL execution if errors occur
-	*/
-	var $continueOnError;
-	
-	/**
-	* @var int	How to handle existing data rows (insert, update, or ignore)
-	*/
-	var $existingData;
-	
-	/**
-	* Creates an adoSchema object
-	*
-	* Creating an adoSchema object is the first step in processing an XML schema.
-	* The only parameter is an ADOdb database connection object, which must already
-	* have been created.
-	*
-	* @param object $db ADOdb database connection object.
-	*/
-	function adoSchema( &$db ) {
-		// Initialize the environment
-		$this->mgq = get_magic_quotes_runtime();
-		set_magic_quotes_runtime(0);
-		
-		$this->db = $db;
-		$this->debug = $this->db->debug;
-		$this->dict = NewDataDictionary( $this->db );
-		$this->sqlArray = array();
-		$this->schemaVersion = XMLS_SCHEMA_VERSION;
-		$this->executeInline( XMLS_EXECUTE_INLINE );
-		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
-		$this->existingData( XMLS_EXISTING_DATA );
-		$this->setUpgradeMethod();
-	}
-	
-	/**
-	* Sets the method to be used for upgrading an existing database
-	*
-	* Use this method to specify how existing database objects should be upgraded.
-	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
-	* alter each database object directly, REPLACE attempts to rebuild each object
-	* from scratch, BEST attempts to determine the best upgrade method for each
-	* object, and NONE disables upgrading.
-	*
-	* This method is not yet used by AXMLS, but exists for backward compatibility.
-	* The ALTER method is automatically assumed when the adoSchema object is
-	* instantiated; other upgrade methods are not currently supported.
-	*
-	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
-	* @returns string Upgrade method used
-	*/
-	function SetUpgradeMethod( $method = '' ) {
-		if( !is_string( $method ) ) {
-			return FALSE;
-		}
-		
-		$method = strtoupper( $method );
-		
-		// Handle the upgrade methods
-		switch( $method ) {
-			case 'ALTER':
-				$this->upgrade = $method;
-				break;
-			case 'REPLACE':
-				$this->upgrade = $method;
-				break;
-			case 'BEST':
-				$this->upgrade = 'ALTER';
-				break;
-			case 'NONE':
-				$this->upgrade = 'NONE';
-				break;
-			default:
-				// Use default if no legitimate method is passed.
-				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
-		}
-		
-		return $this->upgrade;
-	}
-	
-	/**
-	* Specifies how to handle existing data row when there is a unique key conflict.
-	*
-	* The existingData setting specifies how the parser should handle existing rows
-	* when a unique key violation occurs during the insert. This can happen when inserting
-	* data into an existing table with one or more primary keys or unique indexes.
-	* The existingData method takes one of three options: XMLS_MODE_INSERT attempts
-	* to always insert the data as a new row. In the event of a unique key violation,
-	* the database will generate an error.  XMLS_MODE_UPDATE attempts to update the 
-	* any existing rows with the new data based upon primary or unique key fields in
-	* the schema. If the data row in the schema specifies no unique fields, the row
-	* data will be inserted as a new row. XMLS_MODE_IGNORE specifies that any data rows
-	* that would result in a unique key violation be ignored; no inserts or updates will
-	* take place. For backward compatibility, the default setting is XMLS_MODE_INSERT,
-	* but XMLS_MODE_UPDATE will generally be the most appropriate setting.
-	*
-	* @param int $mode XMLS_MODE_INSERT, XMLS_MODE_UPDATE, or XMLS_MODE_IGNORE
-	* @return int current mode
-	*/
-	function ExistingData( $mode = NULL ) {
-		if( is_int( $mode ) ) {
-			switch( $mode ) {
-				case XMLS_MODE_UPDATE:
-					$mode = XMLS_MODE_UPDATE;
-					break;
-				case XMLS_MODE_IGNORE:
-					$mode = XMLS_MODE_IGNORE;
-					break;
-				case XMLS_MODE_INSERT:
-					$mode = XMLS_MODE_INSERT;
-					break;
-				default:
-					$mode = XMLS_EXISITNG_DATA;
-					break;
-			}
-			$this->existingData = $mode;
-		}
-		
-		return $this->existingData;
-	}
-	
-	/**
-	* Enables/disables inline SQL execution.
-	*
-	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
-	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
-	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
-	* to apply the schema to the database.
-	*
-	* @param bool $mode execute
-	* @return bool current execution mode
-	*
-	* @see ParseSchema(), ExecuteSchema()
-	*/
-	function ExecuteInline( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->executeInline = $mode;
-		}
-		
-		return $this->executeInline;
-	}
-	
-	/**
-	* Enables/disables SQL continue on error.
-	*
-	* Call this method to enable or disable continuation of SQL execution if an error occurs.
-	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
-	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
-	* of the schema will continue.
-	*
-	* @param bool $mode execute
-	* @return bool current continueOnError mode
-	*
-	* @see addSQL(), ExecuteSchema()
-	*/
-	function ContinueOnError( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->continueOnError = $mode;
-		}
-		
-		return $this->continueOnError;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to create the database
-	* described. This method automatically converts the schema to the latest
-	* axmls schema version.
-	* @see ParseSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function ParseSchema( $filename, $returnSchema = FALSE ) {
-		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema directly from a file (see
-	* the DTD for the proper format) and generate the SQL necessary to create
-	* the database described by the schema. Use this method when you are dealing
-	* with large schema files. Otherwise, ParseSchema() is faster.
-	* This method does not automatically convert the schema to the latest axmls
-	* schema version. You must convert the schema manually using either the
-	* ConvertSchemaFile() or ConvertSchemaString() method.
-	* @see ParseSchema()
-	* @see ConvertSchemaFile()
-	* @see ConvertSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*
-	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
-	* @see ParseSchema(), ParseSchemaString()
-	*/
-	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			logMsg( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
-			logMsg( 'Invalid Schema Version' );
-			return FALSE;
-		}
-		
-		if( $returnSchema ) {
-			$xmlstring = '';
-			while( $data = fread( $fp, 4096 ) ) {
-				$xmlstring .= $data . "\n";
-			}
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
-				die( sprintf(
-					"XML error: %s at line %d",
-					xml_error_string( xml_get_error_code( $xmlParser) ),
-					xml_get_current_line_number( $xmlParser)
-				) );
-			}
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Converts an XML schema string to SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to create the database described by the schema. 
-	* @see ParseSchema()
-	*
-	* @param string $xmlstring XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			logMsg( 'Empty or Invalid Schema' );
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
-			logMsg( 'Invalid Schema Version' );
-			return FALSE;
-		}
-		
-		if( $returnSchema ) {
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
-			die( sprintf(
-				"XML error: %s at line %d",
-				xml_error_string( xml_get_error_code( $xmlParser) ),
-				xml_get_current_line_number( $xmlParser)
-			) );
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to uninstallation SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to remove the database described.
-	* @see RemoveSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function RemoveSchema( $filename, $returnSchema = FALSE ) {
-		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Converts an XML schema string to uninstallation SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to uninstall the database described by the schema. 
-	* @see RemoveSchema()
-	*
-	* @param string $schema XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
-	}
-	
-	/**
-	* Applies the current XML schema to the database (post execution).
-	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
-	* and executing other SQL specified in the schema) after parsing.
-	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
-	*
-	* @param array $sqlArray Array of SQL statements that will be applied rather than
-	*		the current schema.
-	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
-	* @returns integer 0 if failure, 1 if errors, 2 if successful.
-	*/
-	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
-		if( !is_bool( $continueOnErr ) ) {
-			$continueOnErr = $this->ContinueOnError();
-		}
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			$this->success = 0;
-		} else {
-			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
-		}
-		
-		return $this->success;
-	}
-	
-	/**
-	* Returns the current SQL array. 
-	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
-	*
-	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
-	* @return array Array of SQL statements or FALSE if an error occurs
-	*/
-	function PrintSQL( $format = 'NONE' ) {
-		$sqlArray = null;
-		return $this->getSQL( $format, $sqlArray );
-	}
-	
-	/**
-	* Saves the current SQL array to the local filesystem as a list of SQL queries.
-	*
-	* Call this method to save the array of SQL queries (generally resulting from a
-	* parsed XML schema) to the filesystem.
-	*
-	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
-	*/
-	function SaveSQL( $filename = './schema.sql' ) {
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		if( !isset( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		$fp = fopen( $filename, "w" );
-		
-		foreach( $sqlArray as $key => $query ) {
-			fwrite( $fp, $query . ";\n" );
-		}
-		fclose( $fp );
-	}
-	
-	/**
-	* Create an xml parser
-	*
-	* @return object PHP XML parser object
-	*
-	* @access private
-	*/
-	function create_parser() {
-		// Create the parser
-		$xmlParser = xml_parser_create();
-		xml_set_object( $xmlParser, $this );
-		
-		// Initialize the XML callback functions
-		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
-		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
-		return $xmlParser;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-				$this->obj = new dbTable( $this, $attributes );
-				xml_set_object( $parser, $this->obj );
-				}
-				break;
-			case 'SQL':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->obj = new dbQuerySet( $this, $attributes );
-					xml_set_object( $parser, $this->obj );
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	* @internal
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	/**
-	* Converts an XML schema string to the specified DTD version.
-	*
-	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaFile()
-	*
-	* @param string $schema String containing XML schema that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = $schema;
-		} else {
-			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-
-	/*
-	// compat for pre-4.3 - jlim
-	function _file_get_contents($path)
-	{
-		if (function_exists('file_get_contents')) return file_get_contents($path);
-		return join('',file($path));
-	}*/
-	
-	/**
-	* Converts an XML schema file to the specified DTD version.
-	*
-	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaString()
-	*
-	* @param string $filename Name of XML schema file that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = _file_get_contents( $filename );
-			
-			// remove unicode BOM if present
-			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
-				$result = substr( $result, 3 );
-			}
-		} else {
-			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-	
-	function TransformSchema( $schema, $xsl, $schematype='string' )
-	{
-		// Fail if XSLT extension is not available
-		if( ! function_exists( 'xslt_create' ) ) {
-			return FALSE;
-		}
-		
-		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-		
-		// look for xsl
-		if( !is_readable( $xsl_file ) ) {
-			return FALSE;
-		}
-		
-		switch( $schematype )
-		{
-			case 'file':
-				if( !is_readable( $schema ) ) {
-					return FALSE;
-				}
-				
-				$schema = _file_get_contents( $schema );
-				break;
-			case 'string':
-			default:
-				if( !is_string( $schema ) ) {
-					return FALSE;
-				}
-		}
-		
-		$arguments = array (
-			'/_xml' => $schema,
-			'/_xsl' => _file_get_contents( $xsl_file )
-		);
-		
-		// create an XSLT processor
-		$xh = xslt_create ();
-		
-		// set error handler
-		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-		
-		// process the schema
-		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
-		
-		xslt_free ($xh);
-		
-		return $result;
-	}
-	
-	/**
-	* Processes XSLT transformation errors
-	*
-	* @param object $parser XML parser object
-	* @param integer $errno Error number
-	* @param integer $level Error level
-	* @param array $fields Error information fields
-	*
-	* @access private
-	*/
-	function xslt_error_handler( $parser, $errno, $level, $fields ) {
-		if( is_array( $fields ) ) {
-			$msg = array(
-				'Message Type' => ucfirst( $fields['msgtype'] ),
-				'Message Code' => $fields['code'],
-				'Message' => $fields['msg'],
-				'Error Number' => $errno,
-				'Level' => $level
-			);
-			
-			switch( $fields['URI'] ) {
-				case 'arg:/_xml':
-					$msg['Input'] = 'XML';
-					break;
-				case 'arg:/_xsl':
-					$msg['Input'] = 'XSL';
-					break;
-				default:
-					$msg['Input'] = $fields['URI'];
-			}
-			
-			$msg['Line'] = $fields['line'];
-		} else {
-			$msg = array(
-				'Message Type' => 'Error',
-				'Error Number' => $errno,
-				'Level' => $level,
-				'Fields' => var_export( $fields, TRUE )
-			);
-		}
-		
-		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
-					   . '' . "\n";
-		
-		foreach( $msg as $label => $details ) {
-			$error_details .= '' . "\n";
-		}
-		
-		$error_details .= '
' . $label . ': ' . htmlentities( $details ) . '
';
-		
-		trigger_error( $error_details, E_USER_ERROR );
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the requested XML schema file.
-	*
-	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
-	* @see SchemaStringVersion()
-	*
-	* @param string $filename AXMLS schema file
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaFileVersion( $filename ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			// die( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( preg_match( $this->versionRegex, $data, $matches ) ) {
-				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-			}
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the provided XML schema string.
-	*
-	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
-	* @see SchemaFileVersion()
-	*
-	* @param string $xmlstring XML schema string
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaStringVersion( $xmlstring ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			return FALSE;
-		}
-		
-		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
-			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Extracts an XML schema from an existing database.
-	*
-	* Call this method to create an XML schema string from an existing database.
-	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
-	*
-	* @param boolean $data Include data in schema dump
-	* @indent string indentation to use
-	* @prefix string extract only tables with given prefix
-	* @stripprefix strip prefix string when storing in XML schema
-	* @return string Generated XML schema
-	*/
-	function ExtractSchema( $data = FALSE, $indent = '  ', $prefix = '' , $stripprefix=false) {
-		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-		
-		$schema = '' . "\n"
-				. '' . "\n";
-		
-		if( is_array( $tables = $this->db->MetaTables( 'TABLES' , ($prefix) ? $prefix.'%' : '') ) ) {
-			foreach( $tables as $table ) {
-				if ($stripprefix) $table = str_replace(str_replace('\\_', '_', $pfx ), '', $table);
-				$schema .= $indent . '' . "\n";
-				
-				// grab details from database
-				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE -1' );
-				$fields = $this->db->MetaColumns( $table );
-				$indexes = $this->db->MetaIndexes( $table );
-				
-				if( is_array( $fields ) ) {
-					foreach( $fields as $details ) {
-						$extra = '';
-						$content = array();
-						
-						if( isset($details->max_length) && $details->max_length > 0 ) {
-							$extra .= ' size="' . $details->max_length . '"';
-						}
-						
-						if( isset($details->primary_key) && $details->primary_key ) {
-							$content[] = '';
-						} elseif( isset($details->not_null) && $details->not_null ) {
-							$content[] = '';
-						}
-						
-						if( isset($details->has_default) && $details->has_default ) {
-							$content[] = '';
-						}
-						
-						if( isset($details->auto_increment) && $details->auto_increment ) {
-							$content[] = '';
-						}
-						
-						if( isset($details->unsigned) && $details->unsigned ) {
-							$content[] = '';
-						}
-						
-						// this stops the creation of 'R' columns,
-						// AUTOINCREMENT is used to create auto columns
-						$details->primary_key = 0;
-						$type = $rs->MetaType( $details );
-						
-						$schema .= str_repeat( $indent, 2 ) . '' . "\n";
-						} else {
-							$schema .= "/>\n";
-						}
-					}
-				}
-				
-				if( is_array( $indexes ) ) {
-					foreach( $indexes as $index => $details ) {
-						$schema .= str_repeat( $indent, 2 ) . '' . "\n";
-						
-						if( $details['unique'] ) {
-							$schema .= str_repeat( $indent, 3 ) . '' . "\n";
-						}
-						
-						foreach( $details['columns'] as $column ) {
-							$schema .= str_repeat( $indent, 3 ) . '' . htmlentities( $column ) . '' . "\n";
-						}
-						
-						$schema .= str_repeat( $indent, 2 ) . '' . "\n";
-					}
-				}
-				
-				if( $data ) {
-					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
-					if( is_object( $rs ) && !$rs->EOF ) {
-						$schema .= str_repeat( $indent, 2 ) . "\n";
-						
-						while( $row = $rs->FetchRow() ) {
-							foreach( $row as $key => $val ) {
-								if ( $val != htmlentities( $val ) ) {
-									$row[$key] = '';
-								}
-							}
-							
-							$schema .= str_repeat( $indent, 3 ) . '' . implode( '', $row ) . "\n";
-						}
-						
-						$schema .= str_repeat( $indent, 2 ) . "\n";
-					}
-				}
-				
-				$schema .= $indent . "
\n";
-			}
-		}
-		
-		$this->db->SetFetchMode( $old_mode );
-		
-		$schema .= '';
-		return $schema;
-	}
-	
-	/**
-	* Sets a prefix for database objects
-	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
-	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
-	*
-	* @param string $prefix Prefix that will be prepended.
-	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
-	* @return boolean TRUE if successful, else FALSE
-	*/
-	function SetPrefix( $prefix = '', $underscore = TRUE ) {
-		switch( TRUE ) {
-			// clear prefix
-			case empty( $prefix ):
-				logMsg( 'Cleared prefix' );
-				$this->objectPrefix = '';
-				return TRUE;
-			// prefix too long
-			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
-			// prefix contains invalid characters
-			case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
-				logMsg( 'Invalid prefix: ' . $prefix );
-				return FALSE;
-		}
-		
-		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
-			$prefix .= '_';
-		}
-		
-		// prefix valid
-		logMsg( 'Set prefix: ' . $prefix );
-		$this->objectPrefix = $prefix;
-		return TRUE;
-	}
-	
-	/**
-	* Returns an object name with the current prefix prepended.
-	*
-	* @param string	$name Name
-	* @return string	Prefixed name
-	*
-	* @access private
-	*/
-	function prefix( $name = '' ) {
-		// if prefix is set
-		if( !empty( $this->objectPrefix ) ) {
-			// Prepend the object prefix to the table name
-			// prepend after quote if used
-			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
-		}
-		
-		// No prefix set. Use name provided.
-		return $name;
-	}
-	
-	/**
-	* Checks if element references a specific platform
-	*
-	* @param string $platform Requested platform
-	* @returns boolean TRUE if platform check succeeds
-	*
-	* @access private
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		if( !empty( $platform ) ) {
-			$regex = '/(^|\|)' . $this->db->databaseType . '(\||$)/i';
-		
-			if( preg_match( '/^- /', $platform ) ) {
-				if (preg_match ( $regex, substr( $platform, 2 ) ) ) {
-					logMsg( 'Platform ' . $platform . ' is NOT supported' );
-					return FALSE;
-				}
-		} else {
-				if( !preg_match ( $regex, $platform ) ) {
-					logMsg( 'Platform ' . $platform . ' is NOT supported' );
-			return FALSE;
-		}
-	}
-		}
-		
-		logMsg( 'Platform ' . $platform . ' is supported' );
-		return TRUE;
-	}
-	
-	/**
-	* Clears the array of generated SQL.
-	*
-	* @access private
-	*/
-	function clearSQL() {
-		$this->sqlArray = array();
-	}
-	
-	/**
-	* Adds SQL into the SQL array.
-	*
-	* @param mixed $sql SQL to Add
-	* @return boolean TRUE if successful, else FALSE.
-	*
-	* @access private
-	*/	
-	function addSQL( $sql = NULL ) {
-		if( is_array( $sql ) ) {
-			foreach( $sql as $line ) {
-				$this->addSQL( $line );
-			}
-			
-			return TRUE;
-		}
-		
-		if( is_string( $sql ) ) {
-			$this->sqlArray[] = $sql;
-			
-			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
-			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
-				$saved = $this->db->debug;
-				$this->db->debug = $this->debug;
-				$ok = $this->db->Execute( $sql );
-				$this->db->debug = $saved;
-				
-				if( !$ok ) {
-					if( $this->debug ) {
-						ADOConnection::outp( $this->db->ErrorMsg() );
-					}
-					
-					$this->success = 1;
-				}
-			}
-			
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Gets the SQL array in the specified format.
-	*
-	* @param string $format Format
-	* @return mixed SQL
-	*	
-	* @access private
-	*/
-	function getSQL( $format = NULL, $sqlArray = NULL ) {
-		if( !is_array( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		switch( strtolower( $format ) ) {
-			case 'string':
-			case 'text':
-				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
-			case'html':
-				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
-		}
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Destroys an adoSchema object.
-	*
-	* Call this method to clean up after an adoSchema object that is no longer in use.
-	* @deprecated adoSchema now cleans up automatically.
-	*/
-	function Destroy() {
-		set_magic_quotes_runtime( $this->mgq );
-		unset( $this );
-	}
-}
-
-/**
-* Message logging function
-*
-* @access private
-*/
-function logMsg( $msg, $title = NULL, $force = FALSE ) {
-	if( XMLS_DEBUG or $force ) {
-		echo '
';
-		
-		if( isset( $title ) ) {
-			echo '
' . htmlentities( $title ) . '
';
-		}
-		
-		if( @is_object( $this ) ) {
-			echo '[' . get_class( $this ) . '] ';
-		}
-		
-		print_r( $msg );
-		
-		echo '
';
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/adodb.inc.php b/includes/adodb/adodb.inc.php
deleted file mode 100644
index 57d92004..00000000
--- a/includes/adodb/adodb.inc.php
+++ /dev/null
@@ -1,4376 +0,0 @@
-fields is available on EOF
-	 	$ADODB_FETCH_MODE,	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
-		$ADODB_GETONE_EOF,
-		$ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes (backticks) around field names in queries generated by getinsertsql and getupdatesql.	
-	
-	//==============================================================================================	
-	// GLOBAL SETUP
-	//==============================================================================================	
-	
-	$ADODB_EXTENSION = defined('ADODB_EXTENSION');
-	
-	//********************************************************//
-	/*
-	Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
-	Used in GetUpdateSql and GetInsertSql functions. Thx to Niko, nuko#mbnet.fi
-
- 		0 = ignore empty fields. All empty fields in array are ignored.
-		1 = force null. All empty, php null and string 'null' fields are changed to sql NULL values.
-		2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.
-		3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and empty fields '' are set to empty '' sql values.
-	*/
-        define('ADODB_FORCE_IGNORE',0);
-        define('ADODB_FORCE_NULL',1);
-        define('ADODB_FORCE_EMPTY',2);
-        define('ADODB_FORCE_VALUE',3);
-    //********************************************************//
-
-
-	if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
-		
-		define('ADODB_BAD_RS','
Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;
');
-	
-	// allow [ ] @ ` " and . in table names
-		define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)');
-	
-	// prefetching used by oracle
-		if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
-	
-	
-	/*
-	Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
-	This currently works only with mssql, odbc, oci8po and ibase derived drivers.
-	
- 		0 = assoc lowercase field names. $rs->fields['orderid']
-		1 = assoc uppercase field names. $rs->fields['ORDERID']
-		2 = use native-case field names. $rs->fields['OrderID']
-	*/
-	
-		define('ADODB_FETCH_DEFAULT',0);
-		define('ADODB_FETCH_NUM',1);
-		define('ADODB_FETCH_ASSOC',2);
-		define('ADODB_FETCH_BOTH',3);
-		
-		if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100);
-	
-		// PHP's version scheme makes converting to numbers difficult - workaround
-		$_adodb_ver = (float) PHP_VERSION;
-		if ($_adodb_ver >= 5.2) {
-			define('ADODB_PHPVER',0x5200);
-		} else if ($_adodb_ver >= 5.0) {
-			define('ADODB_PHPVER',0x5000);
-		} else 
-			die("PHP5 or later required. You are running ".PHP_VERSION);
-	}
-	
-	
-	//if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
-
-	
-	/**
-	 	Accepts $src and $dest arrays, replacing string $data
-	*/
-	function ADODB_str_replace($src, $dest, $data)
-	{
-		if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data);
-		
-		$s = reset($src);
-		$d = reset($dest);
-		while ($s !== false) {
-			$data = str_replace($s,$d,$data);
-			$s = next($src);
-			$d = next($dest);
-		}
-		return $data;
-	}
-	
-	function ADODB_Setup()
-	{
-	GLOBAL 
-		$ADODB_vers, 		// database version
-		$ADODB_COUNTRECS,	// count number of records returned - slows down query
-		$ADODB_CACHE_DIR,	// directory to cache recordsets
-	 	$ADODB_FETCH_MODE,
-		$ADODB_CACHE,
-		$ADODB_CACHE_CLASS,
-		$ADODB_FORCE_TYPE,
-		$ADODB_GETONE_EOF,
-		$ADODB_QUOTE_FIELDNAMES;
-		
-		$ADODB_CACHE_CLASS = 'ADODB_Cache_File';
-		$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
-		$ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
-		$ADODB_GETONE_EOF = null;
-
-		if (!isset($ADODB_CACHE_DIR)) {
-			$ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? $_ENV['TMP'] : '/tmp';
-		} else {
-			// do not accept url based paths, eg. http:/ or ftp:/
-			if (strpos($ADODB_CACHE_DIR,'://') !== false) 
-				die("Illegal path http:// or ftp://");
-		}
-		
-			
-		// Initialize random number generator for randomizing cache flushes
-		// -- note Since PHP 4.2.0, the seed  becomes optional and defaults to a random value if omitted.
-		 srand(((double)microtime())*1000000);
-		
-		/**
-		 * ADODB version as a string.
-		 */
-		$ADODB_vers = 'V5.06 16 Oct 2008  (c) 2000-2008 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
-	
-		/**
-		 * Determines whether recordset->RecordCount() is used. 
-		 * Set to false for highest performance -- RecordCount() will always return -1 then
-		 * for databases that provide "virtual" recordcounts...
-		 */
-		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
-	}
-	
-	
-	//==============================================================================================	
-	// CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
-	//==============================================================================================	
-	
-	ADODB_Setup();
-
-	//==============================================================================================	
-	// CLASS ADOFieldObject
-	//==============================================================================================	
-	/**
-	 * Helper class for FetchFields -- holds info on a column
-	 */
-	class ADOFieldObject { 
-		var $name = '';
-		var $max_length=0;
-		var $type="";
-/*
-		// additional fields by dannym... (danny_milo@yahoo.com)
-		var $not_null = false; 
-		// actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^
-		// so we can as well make not_null standard (leaving it at "false" does not harm anyways)
-
-		var $has_default = false; // this one I have done only in mysql and postgres for now ... 
-			// others to come (dannym)
-		var $default_value; // default, if any, and supported. Check has_default first.
-*/
-	}
-	
-	// for transaction handling
-	
-	function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
-	{
-		//print "Errorno ($fn errno=$errno m=$errmsg) ";
-		$thisConnection->_transOK = false;
-		if ($thisConnection->_oldRaiseFn) {
-			$fn = $thisConnection->_oldRaiseFn;
-			$fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
-		}
-	}
-	
-	//------------------
-	// class for caching
-	class ADODB_Cache_File {
-	
-		var $createdir = true; // requires creation of temp dirs
-		
-		function ADODB_Cache_File()
-		{
-		global $ADODB_INCLUDED_CSV;
-			if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
-		}
-		
-		// write serialised recordset to cache item/file
-		function writecache($filename, $contents,  $debug, $secs2cache)
-		{
-			return adodb_write_file($filename, $contents,$debug);
-		}
-		
-		// load serialised recordset and unserialise it
-		function &readcache($filename, &$err, $secs2cache, $rsClass)
-		{
-			$rs = csv2rs($filename,$err,$secs2cache,$rsClass);
-			return $rs;
-		}
-		
-		// flush all items in cache
-		function flushall($debug=false)
-		{
-		global $ADODB_CACHE_DIR;
-
-		$rez = false;
-		
-			if (strlen($ADODB_CACHE_DIR) > 1) {
-				$rez = $this->_dirFlush($ADODB_CACHE_DIR);
-	         	if ($debug) DOConnection::outp( "flushall: $dir
\n". $rez."
");
-	   		}
-			return $rez;
-		}
-		
-		// flush one file in cache
-		function flushcache($f, $debug=false)
-		{
-			if (!@unlink($f)) {
-		   		if ($debug) ADOConnection::outp( "flushcache: failed for $f");
-			}
-		}
-		
-		function getdirname($hash)
-		{
-		global $ADODB_CACHE_DIR;
-			if (!isset($this->notSafeMode)) $this->notSafeMode = !ini_get('safe_mode');
-			return ($this->notSafeMode) ? $ADODB_CACHE_DIR.'/'.substr($hash,0,2) : $ADODB_CACHE_DIR;
-		}
-		
-		// create temp directories
-		function createdir($hash, $debug)
-		{
-			$dir = $this->getdirname($hash);
-			if ($this->notSafeMode && !file_exists($dir)) {
-				$oldu = umask(0);
-				if (!@mkdir($dir,0771)) if(!is_dir($dir) && $debug) ADOConnection::outp("Cannot create $dir");
-				umask($oldu);
-			}
-		
-			return $dir;
-		}
-		
-		/**
-		* Private function to erase all of the files and subdirectories in a directory.
-		*
-		* Just specify the directory, and tell it if you want to delete the directory or just clear it out.
-		* Note: $kill_top_level is used internally in the function to flush subdirectories.
-		*/
-		function _dirFlush($dir, $kill_top_level = false) 
-		{
-		   if(!$dh = @opendir($dir)) return;
-		   
-		   while (($obj = readdir($dh))) {
-		   		if($obj=='.' || $obj=='..') continue;
-				$f = $dir.'/'.$obj;
-		
-				if (strpos($obj,'.cache')) @unlink($f);
-				if (is_dir($f)) $this->_dirFlush($f, true);
-		   }
-		   if ($kill_top_level === true) @rmdir($dir);
-		   return true;
-		}
-	}
-	
-	//==============================================================================================	
-	// CLASS ADOConnection
-	//==============================================================================================	
-	
-	/**
-	 * Connection object. For connecting to databases, and executing queries.
-	 */ 
-	class ADOConnection {
-	//
-	// PUBLIC VARS 
-	//
-	var $dataProvider = 'native';
-	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql					
-	var $database = '';			/// Name of database to be used.	
-	var $host = ''; 			/// The hostname of the database server	
-	var $user = ''; 			/// The username which is used to connect to the database server. 
-	var $password = ''; 		/// Password for the username. For security, we no longer store it.
-	var $debug = false; 		/// if set to true will output sql statements
-	var $maxblobsize = 262144; 	/// maximum size of blobs or large text fields (262144 = 256K)-- some db's die otherwise like foxpro
-	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase	
-	var $substr = 'substr';		/// substring operator
-	var $length = 'length';		/// string length ofperator
-	var $random = 'rand()';		/// random function
-	var $upperCase = 'upper';		/// uppercase function
-	var $fmtDate = "'Y-m-d'";	/// used by DBDate() as the default date format used by the database
-	var $fmtTimeStamp = "'Y-m-d, h:i:s A'"; /// used by DBTimeStamp as the default timestamp fmt.
-	var $true = '1'; 			/// string that represents TRUE for a database
-	var $false = '0'; 			/// string that represents FALSE for a database
-	var $replaceQuote = "\\'"; 	/// string to use to replace quotes
-	var $nameQuote = '"';		/// string to use to quote identifiers and names
-	var $charSet=false; 		/// character set to use - only for interbase, postgres and oci8
-	var $metaDatabasesSQL = '';
-	var $metaTablesSQL = '';
-	var $uniqueOrderBy = false; /// All order by columns have to be unique
-	var $emptyDate = ' ';
-	var $emptyTimeStamp = ' ';
-	var $lastInsID = false;
-	//--
-	var $hasInsertID = false; 		/// supports autoincrement ID?
-	var $hasAffectedRows = false; 	/// supports affected rows for update/delete?
-	var $hasTop = false;			/// support mssql/access SELECT TOP 10 * FROM TABLE
-	var $hasLimit = false;			/// support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	var $readOnly = false; 			/// this is a readonly database - used by phpLens
-	var $hasMoveFirst = false;  /// has ability to run MoveFirst(), scrolling backwards
-	var $hasGenID = false; 		/// can generate sequences using GenID();
-	var $hasTransactions = true; /// has transactions
-	//--
-	var $genID = 0; 			/// sequence id used by GenID();
-	var $raiseErrorFn = false; 	/// error function to call
-	var $isoDates = false; /// accepts dates in ISO format
-	var $cacheSecs = 3600; /// cache for 1 hour
-
-	// memcache
-	var $memCache = false; /// should we use memCache instead of caching in files
-	var $memCacheHost; /// memCache host
-	var $memCachePort = 11211; /// memCache port
-	var $memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib)
-
-	var $sysDate = false; /// name of function that returns the current date
-	var $sysTimeStamp = false; /// name of function that returns the current timestamp
-	var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets
-	
-	var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' '
-	var $numCacheHits = 0; 
-	var $numCacheMisses = 0;
-	var $pageExecuteCountRows = true;
-	var $uniqueSort = false; /// indicates that all fields in order by must be unique
-	var $leftOuter = false; /// operator to use for left outer join in WHERE clause
-	var $rightOuter = false; /// operator to use for right outer join in WHERE clause
-	var $ansiOuter = false; /// whether ansi outer join syntax supported
-	var $autoRollback = false; // autoRollback on PConnect().
-	var $poorAffectedRows = false; // affectedRows not working or unreliable
-	
-	var $fnExecute = false;
-	var $fnCacheExecute = false;
-	var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char
-	var $rsPrefix = "ADORecordSet_";
-	
-	var $autoCommit = true; 	/// do not modify this yourself - actually private
-	var $transOff = 0; 			/// temporarily disable transactions
-	var $transCnt = 0; 			/// count of nested transactions
-	
-	var $fetchMode=false;
-	
-	var $null2null = 'null'; // in autoexecute/getinsertsql/getupdatesql, this value will be converted to a null
-	 //
-	 // PRIVATE VARS
-	 //
-	var $_oldRaiseFn =  false;
-	var $_transOK = null;
-	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.	
-	var $_errorMsg = false;		/// A variable which was used to keep the returned last error message.  The value will
-								/// then returned by the errorMsg() function	
-	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8					
-	var $_queryID = false;		/// This variable keeps the last created result link identifier
-	
-	var $_isPersistentConnection = false;	/// A boolean variable to state whether its a persistent connection or normal connection.	*/
-	var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
-	var $_evalAll = false;
-	var $_affected = false;
-	var $_logsql = false;
-	var $_transmode = ''; // transaction mode
-	
-
-	
-	/**
-	 * Constructor
-	 */
-	function ADOConnection()			
-	{
-		die('Virtual Class -- cannot instantiate');
-	}
-	
-	static function Version()
-	{
-	global $ADODB_vers;
-	
-		return (float) substr($ADODB_vers,1);
-	}
-	
-	/**
-		Get server version info...
-		
-		@returns An array with 2 elements: $arr['string'] is the description string, 
-			and $arr[version] is the version (also a string).
-	*/
-	function ServerInfo()
-	{
-		return array('description' => '', 'version' => '');
-	}
-	
-	function IsConnected()
-	{
-    	return !empty($this->_connectionID);
-	}
-	
-	function _findvers($str)
-	{
-		if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1];
-		else return '';
-	}
-	
-	/**
-	* All error messages go through this bottleneck function.
-	* You can define your own handler by defining the function name in ADODB_OUTP.
-	*/
-	static function outp($msg,$newline=true)
-	{
-	global $ADODB_FLUSH,$ADODB_OUTP;
-	
-		if (defined('ADODB_OUTP')) {
-			$fn = ADODB_OUTP;
-			$fn($msg,$newline);
-			return;
-		} else if (isset($ADODB_OUTP)) {
-			$fn = $ADODB_OUTP;
-			$fn($msg,$newline);
-			return;
-		}
-		
-		if ($newline) $msg .= "
\n";
-		
-		if (isset($_SERVER['HTTP_USER_AGENT']) || !$newline) echo $msg;
-		else echo strip_tags($msg);
-	
-		
-		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan 
-		
-	}
-	
-	function Time()
-	{
-		$rs = $this->_Execute("select $this->sysTimeStamp");
-		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
-		return false;
-	}
-	
-	/**
-	 * Connect to database
-	 *
-	 * @param [argHostname]		Host to connect to
-	 * @param [argUsername]		Userid to login
-	 * @param [argPassword]		Associated password
-	 * @param [argDatabaseName]	database
-	 * @param [forceNew]		force new connection
-	 *
-	 * @return true or false
-	 */	  
-	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) 
-	{
-		if ($argHostname != "") $this->host = $argHostname;
-		if ($argUsername != "") $this->user = $argUsername;
-		if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-		
-		$this->_isPersistentConnection = false;	
-			
-		global $ADODB_CACHE;
-		if (empty($ADODB_CACHE)) $this->_CreateCache();
-		
-		if ($forceNew) {
-			if ($rez=$this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true;
-		} else {
-			 if ($rez=$this->_connect($this->host, $this->user, $this->password, $this->database)) return true;
-		}
-		if (isset($rez)) {
-			$err = $this->ErrorMsg();
-			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
-			$ret = false;
-		} else {
-			$err = "Missing extension for ".$this->dataProvider;
-			$ret = 0;
-		}
-		if ($fn = $this->raiseErrorFn) 
-			$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-		
-		
-		$this->_connectionID = false;
-		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
-		return $ret;
-	}	
-	
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
-	}
-	
-	
-	/**
-	 * Always force a new connection to database - currently only works with oracle
-	 *
-	 * @param [argHostname]		Host to connect to
-	 * @param [argUsername]		Userid to login
-	 * @param [argPassword]		Associated password
-	 * @param [argDatabaseName]	database
-	 *
-	 * @return true or false
-	 */	  
-	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") 
-	{
-		return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true);
-	}
-	
-	/**
-	 * Establish persistent connect to database
-	 *
-	 * @param [argHostname]		Host to connect to
-	 * @param [argUsername]		Userid to login
-	 * @param [argPassword]		Associated password
-	 * @param [argDatabaseName]	database
-	 *
-	 * @return return true or false
-	 */	
-	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
-	{
-		
-		if (defined('ADODB_NEVER_PERSIST')) 
-			return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
-		
-		if ($argHostname != "") $this->host = $argHostname;
-		if ($argUsername != "") $this->user = $argUsername;
-		if ($argPassword != "") $this->password = $argPassword;
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-			
-		$this->_isPersistentConnection = true;	
-		
-		global $ADODB_CACHE;
-		if (empty($ADODB_CACHE)) $this->_CreateCache();
-		
-		if ($rez = $this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true;
-		if (isset($rez)) {
-			$err = $this->ErrorMsg();
-			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
-			$ret = false;
-		} else {
-			$err = "Missing extension for ".$this->dataProvider;
-			$ret = 0;
-		}
-		if ($fn = $this->raiseErrorFn) {
-			$fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-		}
-		
-		$this->_connectionID = false;
-		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
-		return $ret;
-	}
-
-	function outp_throw($msg,$src='WARN',$sql='')
-	{
-		if (defined('ADODB_ERROR_HANDLER') &&  ADODB_ERROR_HANDLER == 'adodb_throw') {
-			adodb_throw($this->databaseType,$src,-9999,$msg,$sql,false,$this);
-			return;
-		} 
-		ADOConnection::outp($msg);
-	}
-	
-	// create cache class. Code is backward compat with old memcache implementation
-	function _CreateCache()
-	{
-	global $ADODB_CACHE, $ADODB_CACHE_CLASS;
-	
-		if ($this->memCache) {
-		global $ADODB_INCLUDED_MEMCACHE;
-		
-			if (empty($ADODB_INCLUDED_MEMCACHE)) include(ADODB_DIR.'/adodb-memcache.lib.inc.php');
-				$ADODB_CACHE = new ADODB_Cache_MemCache($this);
-		} else
-				$ADODB_CACHE = new $ADODB_CACHE_CLASS($this);
-		
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysDate;
-		return $col; // child class implement
-	}
-	
-	/**
-	 * Should prepare the sql statement and return the stmt resource.
-	 * For databases that do not support this, we return the $sql. To ensure
-	 * compatibility with databases that do not support prepare:
-	 *
-	 *   $stmt = $db->Prepare("insert into table (id, name) values (?,?)");
-	 *   $db->Execute($stmt,array(1,'Jill')) or die('insert failed');
-	 *   $db->Execute($stmt,array(2,'Joe')) or die('insert failed');
-	 *
-	 * @param sql	SQL to send to database
-	 *
-	 * @return return FALSE, or the prepared statement, or the original sql if
-	 * 			if the database does not support prepare.
-	 *
-	 */	
-	function Prepare($sql)
-	{
-		return $sql;
-	}
-
-	/**
-	 * Some databases, eg. mssql require a different function for preparing
-	 * stored procedures. So we cannot use Prepare().
-	 *
-	 * Should prepare the stored procedure  and return the stmt resource.
-	 * For databases that do not support this, we return the $sql. To ensure
-	 * compatibility with databases that do not support prepare:
-	 *
-	 * @param sql	SQL to send to database
-	 *
-	 * @return return FALSE, or the prepared statement, or the original sql if
-	 * 			if the database does not support prepare.
-	 *
-	 */	
-	function PrepareSP($sql,$param=true)
-	{
-		return $this->Prepare($sql,$param);
-	}
-
-	/**
-	* PEAR DB Compat
-	*/
-	function Quote($s)
-	{
-		return $this->qstr($s,false);
-	}
-	
-	/**
-	 Requested by "Karsten Dambekalns" 
-	*/
-	function QMagic($s)
-	{
-		return $this->qstr($s,get_magic_quotes_gpc());
-	}
-
-	function q(&$s)
-	{
-		#if (!empty($this->qNull)) if ($s == 'null') return $s;
-		$s = $this->qstr($s,false);
-	}
-	
-	/**
-	* PEAR DB Compat - do not use internally. 
-	*/
-	function ErrorNative()
-	{
-		return $this->ErrorNo();
-	}
-
-	
-   /**
-	* PEAR DB Compat - do not use internally. 
-	*/
-	function nextId($seq_name)
-	{
-		return $this->GenID($seq_name);
-	}
-
-	/**
-	*	 Lock a row, will escalate and lock the table if row locking not supported
-	*	will normally free the lock at the end of the transaction
-	*
-	*  @param $table	name of table to lock
-	*  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
-	*/
-	function RowLock($table,$where)
-	{
-		return false;
-	}
-	
-	function CommitLock($table)
-	{
-		return $this->CommitTrans();
-	}
-	
-	function RollbackLock($table)
-	{
-		return $this->RollbackTrans();
-	}
-	
-	/**
-	* PEAR DB Compat - do not use internally. 
-	*
-	* The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
-	* 	for easy porting :-)
-	*
-	* @param mode	The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
-	* @returns		The previous fetch mode
-	*/
-	function SetFetchMode($mode)
-	{	
-		$old = $this->fetchMode;
-		$this->fetchMode = $mode;
-		
-		if ($old === false) {
-		global $ADODB_FETCH_MODE;
-			return $ADODB_FETCH_MODE;
-		}
-		return $old;
-	}
-	
-
-	/**
-	* PEAR DB Compat - do not use internally. 
-	*/
-	function Query($sql, $inputarr=false)
-	{
-		$rs = $this->Execute($sql, $inputarr);
-		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
-		return $rs;
-	}
-
-	
-	/**
-	* PEAR DB Compat - do not use internally
-	*/
-	function LimitQuery($sql, $offset, $count, $params=false)
-	{
-		$rs = $this->SelectLimit($sql, $count, $offset, $params); 
-		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
-		return $rs;
-	}
-
-	
-	/**
-	* PEAR DB Compat - do not use internally
-	*/
-	function Disconnect()
-	{
-		return $this->Close();
-	}
-	
-	/*
-		 Returns placeholder for parameter, eg.
-		 $DB->Param('a')
-		 
-		 will return ':a' for Oracle, and '?' for most other databases...
-		 
-		 For databases that require positioned params, eg $1, $2, $3 for postgresql,
-		 	pass in Param(false) before setting the first parameter.
-	*/
-	function Param($name,$type='C')
-	{
-		return '?';
-	}
-	
-	/*
-		InParameter and OutParameter are self-documenting versions of Parameter().
-	*/
-	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-	{
-		return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
-	}
-	
-	/*
-	*/
-	function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-	{
-		return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
-	
-	}
-
-	
-	/* 
-	Usage in oracle
-		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group',64);
-		$db->Execute();
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-
-	*/
-	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
-	{
-		return false;
-	}
-	
-	
-	function IgnoreErrors($saveErrs=false)
-	{
-		if (!$saveErrs) {
-			$saveErrs = array($this->raiseErrorFn,$this->_transOK);
-			$this->raiseErrorFn = false;
-			return $saveErrs;
-		} else {
-			$this->raiseErrorFn = $saveErrs[0];
-			$this->_transOK = $saveErrs[1];
-		}
-	}
-	
-	/**
-		Improved method of initiating a transaction. Used together with CompleteTrans().
-		Advantages include:
-		
-		a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans.
-		   Only the outermost block is treated as a transaction.

-		b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.

-		c. All BeginTrans/CommitTrans/RollbackTrans inside a StartTrans/CompleteTrans block
-		   are disabled, making it backward compatible.
-	*/
-	function StartTrans($errfn = 'ADODB_TransMonitor')
-	{
-		if ($this->transOff > 0) {
-			$this->transOff += 1;
-			return;
-		}
-		
-		$this->_oldRaiseFn = $this->raiseErrorFn;
-		$this->raiseErrorFn = $errfn;
-		$this->_transOK = true;
-		
-		if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
-		$this->BeginTrans();
-		$this->transOff = 1;
-	}
-	
-	
-	/**
-		Used together with StartTrans() to end a transaction. Monitors connection
-		for sql errors, and will commit or rollback as appropriate.
-		
-		@autoComplete if true, monitor sql errors and commit and rollback as appropriate, 
-		and if set to false force rollback even if no SQL error detected.
-		@returns true on commit, false on rollback.
-	*/
-	function CompleteTrans($autoComplete = true)
-	{
-		if ($this->transOff > 1) {
-			$this->transOff -= 1;
-			return true;
-		}
-		$this->raiseErrorFn = $this->_oldRaiseFn;
-		
-		$this->transOff = 0;
-		if ($this->_transOK && $autoComplete) {
-			if (!$this->CommitTrans()) {
-				$this->_transOK = false;
-				if ($this->debug) ADOConnection::outp("Smart Commit failed");
-			} else
-				if ($this->debug) ADOConnection::outp("Smart Commit occurred");
-		} else {
-			$this->_transOK = false;
-			$this->RollbackTrans();
-			if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred");
-		}
-		
-		return $this->_transOK;
-	}
-	
-	/*
-		At the end of a StartTrans/CompleteTrans block, perform a rollback.
-	*/
-	function FailTrans()
-	{
-		if ($this->debug) 
-			if ($this->transOff == 0) {
-				ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans");
-			} else {
-				ADOConnection::outp("FailTrans was called");
-				adodb_backtrace();
-			}
-		$this->_transOK = false;
-	}
-	
-	/**
-		Check if transaction has failed, only for Smart Transactions.
-	*/
-	function HasFailedTrans()
-	{
-		if ($this->transOff > 0) return $this->_transOK == false;
-		return false;
-	}
-	
-	/**
-	 * Execute SQL 
-	 *
-	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
-	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
-	 * @return 		RecordSet or false
-	 */
-	function Execute($sql,$inputarr=false) 
-	{
-		if ($this->fnExecute) {
-			$fn = $this->fnExecute;
-			$ret = $fn($this,$sql,$inputarr);
-			if (isset($ret)) return $ret;
-		}
-		if ($inputarr) {
-			if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
-			$element0 = reset($inputarr);
-			# is_object check because oci8 descriptors can be passed in
-			$array_2d = is_array($element0) && !is_object(reset($element0));
-			//remove extra memory copy of input -mikefedyk
-			unset($element0);
-			
-			if (!is_array($sql) && !$this->_bindInputArray) {
-				$sqlarr = explode('?',$sql);
-					
-				if (!$array_2d) $inputarr = array($inputarr);
-				foreach($inputarr as $arr) {
-					$sql = ''; $i = 0;
-					//Use each() instead of foreach to reduce memory usage -mikefedyk
-					while(list(, $v) = each($arr)) {
-						$sql .= $sqlarr[$i];
-						// from Ron Baldwin 
-						// Only quote string types	
-						$typ = gettype($v);
-						if ($typ == 'string')
-							//New memory copy of input created here -mikefedyk
-							$sql .= $this->qstr($v);
-						else if ($typ == 'double')
-							$sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1
-						else if ($typ == 'boolean')
-							$sql .= $v ? $this->true : $this->false;
-						else if ($typ == 'object') {
-							if (method_exists($v, '__toString')) $sql .= $this->qstr($v->__toString());
-							else $sql .= $this->qstr((string) $v);
-						} else if ($v === null)
-							$sql .= 'NULL';
-						else
-							$sql .= $v;
-						$i += 1;
-					}
-					if (isset($sqlarr[$i])) {
-						$sql .= $sqlarr[$i];
-						if ($i+1 != sizeof($sqlarr)) $this->outp_throw( "Input Array does not match ?: ".htmlspecialchars($sql),'Execute');
-					} else if ($i != sizeof($sqlarr))	
-						$this->outp_throw( "Input array does not match ?: ".htmlspecialchars($sql),'Execute');
-		
-					$ret = $this->_Execute($sql);
-					if (!$ret) return $ret;
-				}	
-			} else {
-				if ($array_2d) {
-					if (is_string($sql))
-						$stmt = $this->Prepare($sql);
-					else
-						$stmt = $sql;
-						
-					foreach($inputarr as $arr) {
-						$ret = $this->_Execute($stmt,$arr);
-						if (!$ret) return $ret;
-					}
-				} else {
-					$ret = $this->_Execute($sql,$inputarr);
-				}
-			}
-		} else {
-			$ret = $this->_Execute($sql,false);
-		}
-
-		return $ret;
-	}
-	
-	
-	function _Execute($sql,$inputarr=false)
-	{
-		if ($this->debug) {
-			global $ADODB_INCLUDED_LIB;
-			if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-			$this->_queryID = _adodb_debug_execute($this, $sql,$inputarr);
-		} else {
-			$this->_queryID = @$this->_query($sql,$inputarr);
-		}
-		
-		/************************
-		// OK, query executed
-		*************************/
-
-		if ($this->_queryID === false) { // error handling if query fails
-			if ($this->debug == 99) adodb_backtrace(true,5);	
-			$fn = $this->raiseErrorFn;
-			if ($fn) {
-				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
-			} 
-			$false = false;
-			return $false;
-		} 
-		
-		if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
-			$rsclass = $this->rsPrefix.'empty';
-			$rs = (class_exists($rsclass)) ? new $rsclass():  new ADORecordSet_empty();
-			
-			return $rs;
-		}
-		
-		// return real recordset from select statement
-		$rsclass = $this->rsPrefix.$this->databaseType;
-		$rs = new $rsclass($this->_queryID,$this->fetchMode);
-		$rs->connection = $this; // Pablo suggestion
-		$rs->Init();
-		if (is_array($sql)) $rs->sql = $sql[0];
-		else $rs->sql = $sql;
-		if ($rs->_numOfRows <= 0) {
-		global $ADODB_COUNTRECS;
-			if ($ADODB_COUNTRECS) {
-				if (!$rs->EOF) { 
-					$rs = $this->_rs2rs($rs,-1,-1,!is_array($sql));
-					$rs->_queryID = $this->_queryID;
-				} else
-					$rs->_numOfRows = 0;
-			}
-		}
-		return $rs;
-	}
-
-	function CreateSequence($seqname='adodbseq',$startID=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
-	}
-
-	function DropSequence($seqname='adodbseq')
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-
-	/**
-	 * Generates a sequence id and stores it in $this->genID;
-	 * GenID is only available if $this->hasGenID = true;
-	 *
-	 * @param seqname		name of sequence to use
-	 * @param startID		if sequence does not exist, start at this ID
-	 * @return		0 if not supported, otherwise a sequence id
-	 */
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		if (!$this->hasGenID) {
-			return 0; // formerly returns false pre 1.60
-		}
-		
-		$getnext = sprintf($this->_genIDSQL,$seqname);
-		
-		$holdtransOK = $this->_transOK;
-		
-		$save_handler = $this->raiseErrorFn;
-		$this->raiseErrorFn = '';
-		@($rs = $this->Execute($getnext));
-		$this->raiseErrorFn = $save_handler;
-		
-		if (!$rs) {
-			$this->_transOK = $holdtransOK; //if the status was ok before reset
-			$createseq = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
-			$rs = $this->Execute($getnext);
-		}
-		if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
-		else $this->genID = 0; // false
-	
-		if ($rs) $rs->Close();
-
-		return $this->genID;
-	}	
-
-	/**
-	 * @param $table string name of the table, not needed by all databases (eg. mysql), default ''
-	 * @param $column string name of the column, not needed by all databases (eg. mysql), default ''
-	 * @return  the last inserted ID. Not all databases support this.
-	 */ 
-	function Insert_ID($table='',$column='')
-	{
-		if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
-		if ($this->hasInsertID) return $this->_insertid($table,$column);
-		if ($this->debug) {
-			ADOConnection::outp( '
Insert_ID error
');
-			adodb_backtrace();
-		}
-		return false;
-	}
-
-
-	/**
-	 * Portable Insert ID. Pablo Roca 
-	 *
-	 * @return  the last inserted ID. All databases support this. But aware possible
-	 * problems in multiuser environments. Heavy test this before deploying.
-	 */ 
-	function PO_Insert_ID($table="", $id="") 
-	{
-	   if ($this->hasInsertID){
-		   return $this->Insert_ID($table,$id);
-	   } else {
-		   return $this->GetOne("SELECT MAX($id) FROM $table");
-	   }
-	}
-
-	/**
-	* @return # rows affected by UPDATE/DELETE
-	*/ 
-	function Affected_Rows()
-	{
-		if ($this->hasAffectedRows) {
-			if ($this->fnExecute === 'adodb_log_sql') {
-				if ($this->_logsql && $this->_affected !== false) return $this->_affected;
-			}
-			$val = $this->_affectedrows();
-			return ($val < 0) ? false : $val;
-		}
-				  
-		if ($this->debug) ADOConnection::outp( '
Affected_Rows error
',false);
-		return false;
-	}
-	
-	
-	/**
-	 * @return  the last error message
-	 */
-	function ErrorMsg()
-	{
-		if ($this->_errorMsg) return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
-		else return '';
-	}
-	
-	
-	/**
-	 * @return the last error number. Normally 0 means no error.
-	 */
-	function ErrorNo() 
-	{
-		return ($this->_errorMsg) ? -1 : 0;
-	}
-	
-	function MetaError($err=false)
-	{
-		include_once(ADODB_DIR."/adodb-error.inc.php");
-		if ($err === false) $err = $this->ErrorNo();
-		return adodb_error($this->dataProvider,$this->databaseType,$err);
-	}
-	
-	function MetaErrorMsg($errno)
-	{
-		include_once(ADODB_DIR."/adodb-error.inc.php");
-		return adodb_errormsg($errno);
-	}
-	
-	/**
-	 * @returns an array with the primary key columns in it.
-	 */
-	function MetaPrimaryKeys($table, $owner=false)
-	{
-	// owner not used in base class - see oci8
-		$p = array();
-		$objs = $this->MetaColumns($table);
-		if ($objs) {
-			foreach($objs as $v) {
-				if (!empty($v->primary_key))
-					$p[] = $v->name;
-			}
-		}
-		if (sizeof($p)) return $p;
-		if (function_exists('ADODB_VIEW_PRIMARYKEYS'))
-			return ADODB_VIEW_PRIMARYKEYS($this->databaseType, $this->database, $table, $owner);
-		return false;
-	}
-	
-	/**
-	 * @returns assoc array where keys are tables, and values are foreign keys
-	 */
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-		return false;
-	}
-	/**
-	 * Choose a database to connect to. Many databases do not support this.
-	 *
-	 * @param dbName 	is the name of the database to select
-	 * @return 		true or false
-	 */
-	function SelectDB($dbName) 
-	{return false;}
-	
-	
-	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
-	*  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
-	* BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]		is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
-	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		if ($this->hasTop && $nrows > 0) {
-		// suggested by Reinhard Balling. Access requires top after distinct 
-		 // Informix requires first before distinct - F Riosa
-			$ismssql = (strpos($this->databaseType,'mssql') !== false);
-			if ($ismssql) $isaccess = false;
-			else $isaccess = (strpos($this->databaseType,'access') !== false);
-			
-			if ($offset <= 	0) {
-				
-					// access includes ties in result
-					if ($isaccess) {
-						$sql = preg_replace(
-						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
-
-						if ($secs2cache != 0) {
-							$ret = $this->CacheExecute($secs2cache, $sql,$inputarr);
-						} else {
-							$ret = $this->Execute($sql,$inputarr);
-						}
-						return $ret; // PHP5 fix
-					} else if ($ismssql){
-						$sql = preg_replace(
-						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
-					} else {
-						$sql = preg_replace(
-						'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
-					}
-			} else {
-				$nn = $nrows + $offset;
-				if ($isaccess || $ismssql) {
-					$sql = preg_replace(
-					'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql);
-				} else {
-					$sql = preg_replace(
-					'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql);
-				}
-			}
-		}
-		
-		// if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is set, we buffer  rows
-		// 0 to offset-1 which will be discarded anyway. So we disable $ADODB_COUNTRECS.
-		global $ADODB_COUNTRECS;
-		
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-			
-
-		if ($secs2cache != 0) $rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
-		else $rs = $this->Execute($sql,$inputarr);
-		
-		$ADODB_COUNTRECS = $savec;
-		if ($rs && !$rs->EOF) {
-			$rs = $this->_rs2rs($rs,$nrows,$offset);
-		}
-		//print_r($rs);
-		return $rs;
-	}
-	
-	/**
-	* Create serializable recordset. Breaks rs link to connection.
-	*
-	* @param rs			the recordset to serialize
-	*/
-	function SerializableRS(&$rs)
-	{
-		$rs2 = $this->_rs2rs($rs);
-		$ignore = false;
-		$rs2->connection = $ignore;
-		
-		return $rs2;
-	}
-	
-	/**
-	* Convert database recordset to an array recordset
-	* input recordset's cursor should be at beginning, and
-	* old $rs will be closed.
-	*
-	* @param rs			the recordset to copy
-	* @param [nrows]  	number of rows to retrieve (optional)
-	* @param [offset] 	offset by number of rows (optional)
-	* @return 			the new recordset
-	*/
-	function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true)
-	{
-		if (! $rs) {
-			$false = false;
-			return $false;
-		}
-		$dbtype = $rs->databaseType;
-		if (!$dbtype) {
-			$rs = $rs;  // required to prevent crashing in 4.2.1, but does not happen in 4.3.1 -- why ?
-			return $rs;
-		}
-		if (($dbtype == 'array' || $dbtype == 'csv') && $nrows == -1 && $offset == -1) {
-			$rs->MoveFirst();
-			$rs = $rs; // required to prevent crashing in 4.2.1, but does not happen in 4.3.1-- why ?
-			return $rs;
-		}
-		$flds = array();
-		for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
-			$flds[] = $rs->FetchField($i);
-		}
-
-		$arr = $rs->GetArrayLimit($nrows,$offset);
-		//print_r($arr);
-		if ($close) $rs->Close();
-		
-		$arrayClass = $this->arrayClass;
-		
-		$rs2 = new $arrayClass();
-		$rs2->connection = $this;
-		$rs2->sql = $rs->sql;
-		$rs2->dataProvider = $this->dataProvider;
-		$rs2->InitArrayFields($arr,$flds);
-		$rs2->fetchMode = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
-		return $rs2;
-	}
-	
-	/*
-	* Return all rows. Compat with PEAR DB
-	*/
-	function GetAll($sql, $inputarr=false)
-	{
-		$arr = $this->GetArray($sql,$inputarr);
-		return $arr;
-	}
-	
-	function GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
-	{
-		$rs = $this->Execute($sql, $inputarr);
-		if (!$rs) {
-			$false = false;
-			return $false;
-		}
-		$arr = $rs->GetAssoc($force_array,$first2cols);
-		return $arr;
-	}
-	
-	function CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = false, $first2cols = false)
-	{
-		if (!is_numeric($secs2cache)) {
-			$first2cols = $force_array;
-			$force_array = $inputarr;
-		}
-		$rs = $this->CacheExecute($secs2cache, $sql, $inputarr);
-		if (!$rs) {
-			$false = false;
-			return $false;
-		}
-		$arr = $rs->GetAssoc($force_array,$first2cols);
-		return $arr;
-	}
-	
-	/**
-	* Return first element of first row of sql statement. Recordset is disposed
-	* for you.
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
-	function GetOne($sql,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS,$ADODB_GETONE_EOF;
-		$crecs = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		
-		$ret = false;
-		$rs = $this->Execute($sql,$inputarr);
-		if ($rs) {	
-			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
-			else $ret = reset($rs->fields);
-			
-			$rs->Close();
-		}
-		$ADODB_COUNTRECS = $crecs;
-		return $ret;
-	}
-	
-	// $where should include 'WHERE fld=value'
-	function GetMedian($table, $field,$where = '')
-	{
-		$total = $this->GetOne("select count(*) from $table $where");
-		if (!$total) return false;
-	
-		$midrow = (integer) ($total/2);
-		$rs = $this->SelectLimit("select $field from $table $where order by 1",1,$midrow);
-		if ($rs && !$rs->EOF) return reset($rs->fields);
-		return false;
-	}
-	
-	
-	function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
-	{
-	global $ADODB_GETONE_EOF;
-		$ret = false;
-		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
-		if ($rs) {
-			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
-			else $ret = reset($rs->fields);
-			$rs->Close();
-		} 
-		
-		return $ret;
-	}
-	
-	function GetCol($sql, $inputarr = false, $trim = false)
-	{
-	  	
-	  	$rs = $this->Execute($sql, $inputarr);
-	  	if ($rs) {
-			$rv = array();
-	   		if ($trim) {
-				while (!$rs->EOF) {
-					$rv[] = trim(reset($rs->fields));
-					$rs->MoveNext();
-		   		}
-			} else {
-				while (!$rs->EOF) {
-					$rv[] = reset($rs->fields);
-					$rs->MoveNext();
-		   		}
-			}
-	   		$rs->Close();
-	  	} else
-			$rv = false;
-	  	return $rv;
-	}
-	
-	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
-	{
-	  	$rs = $this->CacheExecute($secs, $sql, $inputarr);
-	  	if ($rs) {
-			$rv = array();
-			if ($trim) {
-				while (!$rs->EOF) {
-					$rv[] = trim(reset($rs->fields));
-					$rs->MoveNext();
-		   		}
-			} else {
-				while (!$rs->EOF) {
-					$rv[] = reset($rs->fields);
-					$rs->MoveNext();
-		   		}
-			}
-	   		$rs->Close();
-	  	} else
-			$rv = false;
-			
-	  	return $rv;
-	}
-	
-	function Transpose(&$rs,$addfieldnames=true)
-	{
-		$rs2 = $this->_rs2rs($rs);
-		$false = false;
-		if (!$rs2) return $false;
-		
-		$rs2->_transpose($addfieldnames);
-		return $rs2;
-	}
- 
-	/*
-		Calculate the offset of a date for a particular database and generate
-			appropriate SQL. Useful for calculating future/past dates and storing
-			in a database.
-			
-		If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
-	*/
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		return  '('.$date.'+'.$dayFraction.')';
-	}
-	
-	
-	/**
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
-	function GetArray($sql,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		$rs = $this->Execute($sql,$inputarr);
-		$ADODB_COUNTRECS = $savec;
-		if (!$rs) 
-			if (defined('ADODB_PEAR')) {
-				$cls = ADODB_PEAR_Error();
-				return $cls;
-			} else {
-				$false = false;
-				return $false;
-			}
-		$arr = $rs->GetArray();
-		$rs->Close();
-		return $arr;
-	}
-	
-	function CacheGetAll($secs2cache,$sql=false,$inputarr=false)
-	{
-		$arr = $this->CacheGetArray($secs2cache,$sql,$inputarr);
-		return $arr;
-	}
-	
-	function CacheGetArray($secs2cache,$sql=false,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
-		$ADODB_COUNTRECS = $savec;
-		
-		if (!$rs) 
-			if (defined('ADODB_PEAR')) {
-				$cls = ADODB_PEAR_Error();
-				return $cls;
-			} else {
-				$false = false;
-				return $false;
-			}
-		$arr = $rs->GetArray();
-		$rs->Close();
-		return $arr;
-	}
-	
-	function GetRandRow($sql, $arr= false)
-	{
-		$rezarr = $this->GetAll($sql, $arr);
-		$sz = sizeof($rezarr);
-		return $rezarr[abs(rand()) % $sz];
-	}
-	
-	/**
-	* Return one row of sql statement. Recordset is disposed for you.
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
-	function GetRow($sql,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		$crecs = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		
-		$rs = $this->Execute($sql,$inputarr);
-		
-		$ADODB_COUNTRECS = $crecs;
-		if ($rs) {
-			if (!$rs->EOF) $arr = $rs->fields;
-			else $arr = array();
-			$rs->Close();
-			return $arr;
-		}
-		
-		$false = false;
-		return $false;
-	}
-	
-	function CacheGetRow($secs2cache,$sql=false,$inputarr=false)
-	{
-		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
-		if ($rs) {
-			if (!$rs->EOF) $arr = $rs->fields;
-			else $arr = array();
-			
-			$rs->Close();
-			return $arr;
-		}
-		$false = false;
-		return $false;
-	}
-	
-	/**
-	* Insert or replace a single record. Note: this is not the same as MySQL's replace. 
-	* ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
-	* Also note that no table locking is done currently, so it is possible that the
-	* record be inserted twice by two programs...
-	*
-	* $this->Replace('products', array('prodname' =>"'Nails'","price" => 3.99), 'prodname');
-	*
-	* $table		table name
-	* $fieldArray	associative array of data (you must quote strings yourself).
-	* $keyCol		the primary key field name or if compound key, array of field names
-	* autoQuote		set to true to use a hueristic to quote strings. Works with nulls and numbers
-	*					but does not work with dates nor SQL functions.
-	* has_autoinc	the primary key is an auto-inc field, so skip in insert.
-	*
-	* Currently blob replace not supported
-	*
-	* returns 0 = fail, 1 = update, 2 = insert 
-	*/
-	
-	function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		
-		return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc);
-	}
-	
-	
-	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
-	*  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]	is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
-	function CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
-	{	
-		if (!is_numeric($secs2cache)) {
-			if ($sql === false) $sql = -1;
-			if ($offset == -1) $offset = false;
-									  // sql,	nrows, offset,inputarr
-			$rs = $this->SelectLimit($secs2cache,$sql,$nrows,$offset,$this->cacheSecs);
-		} else {
-			if ($sql === false) $this->outp_throw("Warning: \$sql missing from CacheSelectLimit()",'CacheSelectLimit');
-			$rs = $this->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		}
-		return $rs;
-	}
-	
-	
-	/**
-	* Flush cached recordsets that match a particular $sql statement. 
-	* If $sql == false, then we purge all files in the cache.
- 	*/
-	
-	/**
-   * Flush cached recordsets that match a particular $sql statement. 
-   * If $sql == false, then we purge all files in the cache.
-    */
-	function CacheFlush($sql=false,$inputarr=false)
-	{
-	global $ADODB_CACHE_DIR, $ADODB_CACHE;
-		
-		if (!$sql) {
-			 $ADODB_CACHE->flushall($this->debug);
-	         return;
-	    }
-		
-		$f = $this->_gencachename($sql.serialize($inputarr),false);
-		return $ADODB_CACHE->flushcache($f, $this->debug);
-	}
-   
-	
-	/**
-	* Private function to generate filename for caching.
-	* Filename is generated based on:
-	*
-	*  - sql statement
-	*  - database type (oci8, ibase, ifx, etc)
-	*  - database name
-	*  - userid
-	*  - setFetchMode (adodb 4.23)
-	*
-	* When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR). 
-	* Assuming that we can have 50,000 files per directory with good performance, 
-	* then we can scale to 12.8 million unique cached recordsets. Wow!
- 	*/
-	function _gencachename($sql,$createdir)
-	{
-	global $ADODB_CACHE, $ADODB_CACHE_DIR;
-		
-		if ($this->fetchMode === false) { 
-		global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		} else {
-			$mode = $this->fetchMode;
-		}
-		$m = md5($sql.$this->databaseType.$this->database.$this->user.$mode);
-		if (!$ADODB_CACHE->createdir) return $m;
-		if (!$createdir) $dir = $ADODB_CACHE->getdirname($m);
-		else $dir = $ADODB_CACHE->createdir($m, $this->debug);
-		
-		return $dir.'/adodb_'.$m.'.cache';
-	}
-	
-	
-	/**
-	 * Execute SQL, caching recordsets.
-	 *
-	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. 
-	 *					  This is an optional parameter.
-	 * @param sql		SQL statement to execute
-	 * @param [inputarr]	holds the input data  to bind to
-	 * @return 		RecordSet or false
-	 */
-	function CacheExecute($secs2cache,$sql=false,$inputarr=false)
-	{
-	global $ADODB_CACHE;
-	
-		if (!is_numeric($secs2cache)) {
-			$inputarr = $sql;
-			$sql = $secs2cache;
-			$secs2cache = $this->cacheSecs;
-		}
-		
-		if (is_array($sql)) {
-			$sqlparam = $sql;
-			$sql = $sql[0];
-		} else
-			$sqlparam = $sql;
-			
-		
-		$md5file = $this->_gencachename($sql.serialize($inputarr),true);
-		$err = '';
-		
-		if ($secs2cache > 0){
-			$rs = &$ADODB_CACHE->readcache($md5file,$err,$secs2cache,$this->arrayClass);
-			$this->numCacheHits += 1;
-		} else {
-			$err='Timeout 1';
-			$rs = false;
-			$this->numCacheMisses += 1;
-		}
-		
-		if (!$rs) {
-		// no cached rs found
-			if ($this->debug) {
-				if (get_magic_quotes_runtime() && !$this->memCache) {
-					ADOConnection::outp("Please disable magic_quotes_runtime - it corrupts cache files :(");
-				}
-				if ($this->debug !== -1) ADOConnection::outp( " $md5file cache failure: $err (see sql below)");
-			}
-			
-			$rs = $this->Execute($sqlparam,$inputarr);
-
-			if ($rs) {
-
-				$eof = $rs->EOF;
-				$rs = $this->_rs2rs($rs); // read entire recordset into memory immediately
-				$rs->timeCreated = time(); // used by caching
-				$txt = _rs2serialize($rs,false,$sql); // serialize
-	
-				$ok = $ADODB_CACHE->writecache($md5file,$txt,$this->debug, $secs2cache);
-				if (!$ok) {
-					if ($ok === false) {
-						$em = 'Cache write error';
-						$en = -32000;
-						
-						if ($fn = $this->raiseErrorFn) {
-							$fn($this->databaseType,'CacheExecute', $en, $em, $md5file,$sql,$this);
-						}
-					} else {
-						$em = 'Cache file locked warning';
-						$en = -32001;
-						// do not call error handling for just a warning
-					}
-					
-					if ($this->debug) ADOConnection::outp( " ".$em);
-				}
-				if ($rs->EOF && !$eof) {
-					$rs->MoveFirst();
-					//$rs = csv2rs($md5file,$err);		
-					$rs->connection = $this; // Pablo suggestion
-				}  
-				
-			} else if (!$this->memCache)
-				$ADODB_CACHE->flushcache($md5file);
-		} else {
-			$this->_errorMsg = '';
-			$this->_errorCode = 0;
-			
-			if ($this->fnCacheExecute) {
-				$fn = $this->fnCacheExecute;
-				$fn($this, $secs2cache, $sql, $inputarr);
-			}
-		// ok, set cached object found
-			$rs->connection = $this; // Pablo suggestion
-			if ($this->debug){ 			
-				if ($this->debug == 99) adodb_backtrace();
-				$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
-				$ttl = $rs->timeCreated + $secs2cache - time();
-				$s = is_array($sql) ? $sql[0] : $sql;
-				if ($inBrowser) $s = ''.htmlspecialchars($s).'';
-				
-				ADOConnection::outp( " $md5file reloaded, ttl=$ttl [ $s ]");
-			}
-		}
-		return $rs;
-	}
-	
-	
-	/* 
-		Similar to PEAR DB's autoExecute(), except that 
-		$mode can be 'INSERT' or 'UPDATE' or DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
-		If $mode == 'UPDATE', then $where is compulsory as a safety measure.
-		
-		$forceUpdate means that even if the data has not changed, perform update.
-	 */
-	function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false) 
-	{
-		$false = false;
-		$sql = 'SELECT * FROM '.$table;  
-		if ($where!==FALSE) $sql .= ' WHERE '.$where;
-		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
-			$this->outp_throw('AutoExecute: Illegal mode=UPDATE with empty WHERE clause','AutoExecute');
-			return $false;
-		}
-
-		$rs = $this->SelectLimit($sql,1);
-		if (!$rs) return $false; // table does not exist
-		$rs->tableName = $table;
-		
-		switch((string) $mode) {
-		case 'UPDATE':
-		case '2':
-			$sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate, $magicq);
-			break;
-		case 'INSERT':
-		case '1':
-			$sql = $this->GetInsertSQL($rs, $fields_values, $magicq);
-			break;
-		default:
-			$this->outp_throw("AutoExecute: Unknown mode=$mode",'AutoExecute');
-			return $false;
-		}
-		$ret = false;
-		if ($sql) $ret = $this->Execute($sql);
-		if ($ret) $ret = true;
-		return $ret;
-	}
-	
-	
-	/**
-	 * Generates an Update Query based on an existing recordset.
-	 * $arrFields is an associative array of fields with the value
-	 * that should be assigned.
-	 *
-	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table and sql should only 
-	 *		 be a simple select stmt with no groupby/orderby/limit
-	 *
-	 * "Jonathan Younger" 
-  	 */
-	function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=null)
-	{
-		global $ADODB_INCLUDED_LIB;
-
-        //********************************************************//
-        //This is here to maintain compatibility
-        //with older adodb versions. Sets force type to force nulls if $forcenulls is set.
-		if (!isset($force)) {
-				global $ADODB_FORCE_TYPE;
-			    $force = $ADODB_FORCE_TYPE;
-		}
-		//********************************************************//
-
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
-	}
-
-	/**
-	 * Generates an Insert Query based on an existing recordset.
-	 * $arrFields is an associative array of fields with the value
-	 * that should be assigned.
-	 *
-	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table.
-  	 */
-	function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null)
-	{	
-		global $ADODB_INCLUDED_LIB;
-		if (!isset($force)) {
-			global $ADODB_FORCE_TYPE;
-			$force = $ADODB_FORCE_TYPE;
-			
-		}
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
-	}
-	
-
-	/**
-	* Update a blob column, given a where clause. There are more sophisticated
-	* blob handling functions that we could have implemented, but all require
-	* a very complex API. Instead we have chosen something that is extremely
-	* simple to understand and use. 
-	*
-	* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
-	*
-	* Usage to update a $blobvalue which has a primary key blob_id=1 into a 
-	* field blobtable.blobcolumn:
-	*
-	*	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
-	*
-	* Insert example:
-	*
-	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-	*	$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-	
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
-	}
-
-	/**
-	* Usage:
-	*	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
-	*	
-	*	$blobtype supports 'BLOB' and 'CLOB'
-	*
-	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-	*	$conn->UpdateBlob('blobtable','blobcol',$blobpath,'id=1');
-	*/
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
-	{
-		$fd = fopen($path,'rb');
-		if ($fd === false) return false;
-		$val = fread($fd,filesize($path));
-		fclose($fd);
-		return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
-	}
-	
-	function BlobDecode($blob)
-	{
-		return $blob;
-	}
-	
-	function BlobEncode($blob)
-	{
-		return $blob;
-	}
-	
-	function SetCharSet($charset)
-	{
-		return false;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
-	}
-	
-	function LogSQL($enable=true)
-	{
-		include_once(ADODB_DIR.'/adodb-perf.inc.php');
-		
-		if ($enable) $this->fnExecute = 'adodb_log_sql';
-		else $this->fnExecute = false;
-		
-		$old = $this->_logsql;	
-		$this->_logsql = $enable;
-		if ($enable && !$old) $this->_affected = false;
-		return $old;
-	}
-	
-	function GetCharSet()
-	{
-		return false;
-	}
-	
-	/**
-	* Usage:
-	*	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
-	*
-	*	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
-	*	$conn->UpdateClob('clobtable','clobcol',$clob,'id=1');
-	*/
-	function UpdateClob($table,$column,$val,$where)
-	{
-		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
-	}
-	
-	// not the fastest implementation - quick and dirty - jlim
-	// for best performance, use the actual $rs->MetaType().
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		
-		if (empty($this->_metars)) {
-			$rsclass = $this->rsPrefix.$this->databaseType;
-			$this->_metars = new $rsclass(false,$this->fetchMode); 
-			$this->_metars->connection = $this;
-		}
-		return $this->_metars->MetaType($t,$len,$fieldobj);
-	}
-	
-	
-	/**
-	*  Change the SQL connection locale to a specified locale.
-	*  This is used to get the date formats written depending on the client locale.
-	*/
-	function SetDateLocale($locale = 'En')
-	{
-		$this->locale = $locale;
-		switch (strtoupper($locale))
-		{
-			case 'EN':
-				$this->fmtDate="'Y-m-d'";
-				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
-				break;
-				
-			case 'US':
-				$this->fmtDate = "'m-d-Y'";
-				$this->fmtTimeStamp = "'m-d-Y H:i:s'";
-				break;
-				
-			case 'PT_BR': 	
-			case 'NL':
-			case 'FR':
-			case 'RO':
-			case 'IT':
-				$this->fmtDate="'d-m-Y'";
-				$this->fmtTimeStamp = "'d-m-Y H:i:s'";
-				break;
-				
-			case 'GE':
-				$this->fmtDate="'d.m.Y'";
-				$this->fmtTimeStamp = "'d.m.Y H:i:s'";
-				break;
-				
-			default:
-				$this->fmtDate="'Y-m-d'";
-				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
-				break;
-		}
-	}
-
-	/**
-	 * GetActiveRecordsClass Performs an 'ALL' query 
-	 * 
-	 * @param mixed $class This string represents the class of the current active record
-	 * @param mixed $table Table used by the active record object
-	 * @param mixed $whereOrderBy Where, order, by clauses
-	 * @param mixed $bindarr 
-	 * @param mixed $primkeyArr 
-	 * @param array $extra Query extras: limit, offset...
-	 * @param mixed $relations Associative array: table's foreign name, "hasMany", "belongsTo"
-	 * @access public
-	 * @return void
-	 */
-	function GetActiveRecordsClass(
-			$class, $table,$whereOrderBy=false,$bindarr=false, $primkeyArr=false,
-			$extra=array(),
-			$relations=array())
-	{
-	global $_ADODB_ACTIVE_DBS;
-		## reduce overhead of adodb.inc.php -- moved to adodb-active-record.inc.php
-		## if adodb-active-recordx is loaded -- should be no issue as they will probably use Find()
-		if (!isset($_ADODB_ACTIVE_DBS))include_once(ADODB_DIR.'/adodb-active-record.inc.php');
-		return adodb_GetActiveRecordsClass($this, $class, $table, $whereOrderBy, $bindarr, $primkeyArr, $extra, $relations);
-	}
-	
-	function GetActiveRecords($table,$where=false,$bindarr=false,$primkeyArr=false)
-	{
-		$arr = $this->GetActiveRecordsClass('ADODB_Active_Record', $table, $where, $bindarr, $primkeyArr);
-		return $arr;
-	}
-	
-	/**
-	 * Close Connection
-	 */
-	function Close()
-	{
-		$rez = $this->_close();
-		$this->_connectionID = false;
-		return $rez;
-	}
-	
-	/**
-	 * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
-	 *
-	 * @return true if succeeded or false if database does not support transactions
-	 */
-	function BeginTrans() 
-	{
-		if ($this->debug) ADOConnection::outp("BeginTrans: Transactions not supported for this driver");
-		return false;
-	}
-	
-	/* set transaction mode */
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$transaction_mode = $this->MetaTransaction($transaction_mode, $this->dataProvider);
-		$this->_transmode  = $transaction_mode;
-	}
-/*
-http://msdn2.microsoft.com/en-US/ms173763.aspx
-http://dev.mysql.com/doc/refman/5.0/en/innodb-transaction-isolation.html
-http://www.postgresql.org/docs/8.1/interactive/sql-set-transaction.html
-http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_10005.htm
-*/
-	function MetaTransaction($mode,$db)
-	{
-		$mode = strtoupper($mode);
-		$mode = str_replace('ISOLATION LEVEL ','',$mode);
-		
-		switch($mode) {
-
-		case 'READ UNCOMMITTED':
-			switch($db) { 
-			case 'oci8':
-			case 'oracle':
-				return 'ISOLATION LEVEL READ COMMITTED';
-			default:
-				return 'ISOLATION LEVEL READ UNCOMMITTED';
-			}
-			break;
-					
-		case 'READ COMMITTED':
-				return 'ISOLATION LEVEL READ COMMITTED';
-			break;
-			
-		case 'REPEATABLE READ':
-			switch($db) {
-			case 'oci8':
-			case 'oracle':
-				return 'ISOLATION LEVEL SERIALIZABLE';
-			default:
-				return 'ISOLATION LEVEL REPEATABLE READ';
-			}
-			break;
-			
-		case 'SERIALIZABLE':
-				return 'ISOLATION LEVEL SERIALIZABLE';
-			break;
-			
-		default:
-			return $mode;
-		}
-	}
-	
-	/**
-	 * If database does not support transactions, always return true as data always commited
-	 *
-	 * @param $ok  set to false to rollback transaction, true to commit
-	 *
-	 * @return true/false.
-	 */
-	function CommitTrans($ok=true) 
-	{ return true;}
-	
-	
-	/**
-	 * If database does not support transactions, rollbacks always fail, so return false
-	 *
-	 * @return true/false.
-	 */
-	function RollbackTrans() 
-	{ return false;}
-
-
-	/**
-	 * return the databases that the driver can connect to. 
-	 * Some databases will return an empty array.
-	 *
-	 * @return an array of database names.
-	 */
-		function MetaDatabases() 
-		{
-		global $ADODB_FETCH_MODE;
-		
-			if ($this->metaDatabasesSQL) {
-				$save = $ADODB_FETCH_MODE; 
-				$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-				
-				if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-				
-				$arr = $this->GetCol($this->metaDatabasesSQL);
-				if (isset($savem)) $this->SetFetchMode($savem);
-				$ADODB_FETCH_MODE = $save; 
-			
-				return $arr;
-			}
-			
-			return false;
-		}
-	
-		
-	/**
-	 * @param ttype can either be 'VIEW' or 'TABLE' or false. 
-	 * 		If false, both views and tables are returned.
-	 *		"VIEW" returns only views
-	 *		"TABLE" returns only tables
-	 * @param showSchema returns the schema/user with the table name, eg. USER.TABLE
-	 * @param mask  is the input mask - only supported by oci8 and postgresql
-	 *
-	 * @return  array of tables for current database.
-	 */ 
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		
-		$false = false;
-		if ($mask) {
-			return $false;
-		}
-		if ($this->metaTablesSQL) {
-			$save = $ADODB_FETCH_MODE; 
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-			
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			
-			$rs = $this->Execute($this->metaTablesSQL);
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save; 
-			
-			if ($rs === false) return $false;
-			$arr = $rs->GetArray();
-			$arr2 = array();
-			
-			if ($hast = ($ttype && isset($arr[0][1]))) { 
-				$showt = strncmp($ttype,'T',1);
-			}
-			
-			for ($i=0; $i < sizeof($arr); $i++) {
-				if ($hast) {
-					if ($showt == 0) {
-						if (strncmp($arr[$i][1],'T',1) == 0) $arr2[] = trim($arr[$i][0]);
-					} else {
-						if (strncmp($arr[$i][1],'V',1) == 0) $arr2[] = trim($arr[$i][0]);
-					}
-				} else
-					$arr2[] = trim($arr[$i][0]);
-			}
-			$rs->Close();
-			return $arr2;
-		}
-		return $false;
-	}
-	
-	
-	function _findschema(&$table,&$schema)
-	{
-		if (!$schema && ($at = strpos($table,'.')) !== false) {
-			$schema = substr($table,0,$at);
-			$table = substr($table,$at+1);
-		}
-	}
-	
-	/**
-	 * List columns in a database as an array of ADOFieldObjects. 
-	 * See top of file for definition of object.
-	 *
-	 * @param $table	table name to query
-	 * @param $normalize	makes table name case-insensitive (required by some databases)
-	 * @schema is optional database schema to use - not supported by all databases.
-	 *
-	 * @return  array of ADOFieldObjects for current table.
-	 */
-	function MetaColumns($table,$normalize=true) 
-	{
-	global $ADODB_FETCH_MODE;
-		
-		$false = false;
-		
-		if (!empty($this->metaColumnsSQL)) {
-		
-			$schema = false;
-			$this->_findschema($table,$schema);
-		
-			$save = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			$rs = $this->Execute(sprintf($this->metaColumnsSQL,($normalize)?strtoupper($table):$table));
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			if ($rs === false || $rs->EOF) return $false;
-
-			$retarr = array();
-			while (!$rs->EOF) { //print_r($rs->fields);
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[0];
-				$fld->type = $rs->fields[1];
-				if (isset($rs->fields[3]) && $rs->fields[3]) {
-					if ($rs->fields[3]>0) $fld->max_length = $rs->fields[3];
-					$fld->scale = $rs->fields[4];
-					if ($fld->scale>0) $fld->max_length += 1;
-				} else
-					$fld->max_length = $rs->fields[2];
-					
-				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-				else $retarr[strtoupper($fld->name)] = $fld;
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			return $retarr;	
-		}
-		return $false;
-	}
-	
-    /**
-      * List indexes on a table as an array.
-      * @param table  table name to query
-      * @param primary true to only show primary keys. Not actually used for most databases
-	  *
-      * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
-	  
-		 Array (
-		    [name_of_index] => Array
-		      (
-	          [unique] => true or false
-	          [columns] => Array
-	          (
-	          	[0] => firstname
-		      	[1] => lastname
-	          )
-		)		
-      */
-     function MetaIndexes($table, $primary = false, $owner = false)
-     {
-	 		$false = false;
-            return $false;
-     }
-
-	/**
-	 * List columns names in a table as an array. 
-	 * @param table	table name to query
-	 *
-	 * @return  array of column names for current table.
-	 */ 
-	function MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) 
-	{
-		$objarr = $this->MetaColumns($table);
-		if (!is_array($objarr)) {
-			$false = false;
-			return $false;
-		}
-		$arr = array();
-		if ($numIndexes) {
-			$i = 0;
-			if ($useattnum) {
-				foreach($objarr as $v) 
-					$arr[$v->attnum] = $v->name;
-				
-			} else
-				foreach($objarr as $v) $arr[$i++] = $v->name;
-		} else
-			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
-		
-		return $arr;
-	}
-			
-	/**
-	 * Different SQL databases used different methods to combine strings together.
-	 * This function provides a wrapper. 
-	 * 
-	 * param s	variable number of string parameters
-	 *
-	 * Usage: $db->Concat($str1,$str2);
-	 * 
-	 * @return concatenated string
-	 */ 	 
-	function Concat()
-	{	
-		$arr = func_get_args();
-		return implode($this->concat_operator, $arr);
-	}
-	
-	
-	/**
-	 * Converts a date "d" to a string that the database can understand.
-	 *
-	 * @param d	a date in Unix date time format.
-	 *
-	 * @return  date string in database date format
-	 */
-	function DBDate($d, $isfld=false)
-	{
-		if (empty($d) && $d !== 0) return 'null';
-		if ($isfld) return $d;
-		
-		if (is_string($d) && !is_numeric($d)) {
-			if ($d === 'null' || strncmp($d,"'",1) === 0) return $d;
-			if ($this->isoDates) return "'$d'";
-			$d = ADOConnection::UnixDate($d);
-		}
-
-		return adodb_date($this->fmtDate,$d);
-	}
-	
-	function BindDate($d)
-	{
-		$d = $this->DBDate($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	function BindTimeStamp($d)
-	{
-		$d = $this->DBTimeStamp($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	
-	/**
-	 * Converts a timestamp "ts" to a string that the database can understand.
-	 *
-	 * @param ts	a timestamp in Unix date time format.
-	 *
-	 * @return  timestamp string in database timestamp format
-	 */
-	function DBTimeStamp($ts,$isfld=false)
-	{
-		if (empty($ts) && $ts !== 0) return 'null';
-		if ($isfld) return $ts;
-		
-		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
-			return adodb_date($this->fmtTimeStamp,$ts);
-		
-		if ($ts === 'null') return $ts;
-		if ($this->isoDates && strlen($ts) !== 14) return "'$ts'";
-		
-		$ts = ADOConnection::UnixTimeStamp($ts);
-		return adodb_date($this->fmtTimeStamp,$ts);
-	}
-	
-	/**
-	 * Also in ADORecordSet.
-	 * @param $v is a date string in YYYY-MM-DD format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	static function UnixDate($v)
-	{
-		if (is_object($v)) {
-		// odbtp support
-		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
-			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
-		}
-	
-		if (is_numeric($v) && strlen($v) !== 8) return $v;
-		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
-			($v), $rr)) return false;
-
-		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
-		// h-m-s-MM-DD-YY
-		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-	}
-	
-
-	/**
-	 * Also in ADORecordSet.
-	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	static function UnixTimeStamp($v)
-	{
-		if (is_object($v)) {
-		// odbtp support
-		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
-			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
-		}
-		
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
-			($v), $rr)) return false;
-			
-		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
-	
-		// h-m-s-MM-DD-YY
-		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
-	}
-	
-	/**
-	 * Also in ADORecordSet.
-	 *
-	 * Format database date based on user defined format.
-	 *
-	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a date formated as user desires
-	 */
-	 
-	function UserDate($v,$fmt='Y-m-d',$gmt=false)
-	{
-		$tt = $this->UnixDate($v);
-
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		else if ($tt == 0) return $this->emptyDate;
-		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
-		}
-		
-		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-	
-	}
-	
-		/**
-	 *
-	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a timestamp formated as user desires
-	 */
-	function UserTimeStamp($v,$fmt='Y-m-d H:i:s',$gmt=false)
-	{
-		if (!isset($v)) return $this->emptyTimeStamp;
-		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (is_numeric($v) && strlen($v)<14) return ($gmt) ? adodb_gmdate($fmt,$v) : adodb_date($fmt,$v);
-		$tt = $this->UnixTimeStamp($v);
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		if ($tt == 0) return $this->emptyTimeStamp;
-		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-	}
-	
-	function escape($s,$magic_quotes=false)
-	{
-		return $this->addq($s,$magic_quotes);
-	}
-	
-	/**
-	* Quotes a string, without prefixing nor appending quotes. 
-	*/
-	function addq($s,$magic_quotes=false)
-	{
-		if (!$magic_quotes) {
-		
-			if ($this->replaceQuote[0] == '\\'){
-				// only since php 4.0.5
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-				//$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s));
-			}
-			return  str_replace("'",$this->replaceQuote,$s);
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		
-		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
-			return $s;
-		else {// change \' to '' for sybase/mssql
-			$s = str_replace('\\\\','\\',$s);
-			return str_replace("\\'",$this->replaceQuote,$s);
-		}
-	}
-	
-	/**
-	 * Correctly quotes a string so that all strings are escaped. We prefix and append
-	 * to the string single-quotes.
-	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
-	 * @param s			the string to quote
-	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
-	 *				This undoes the stupidity of magic quotes for GPC.
-	 *
-	 * @return  quoted string to be sent back to database
-	 */
-	function qstr($s,$magic_quotes=false)
-	{	
-		if (!$magic_quotes) {
-		
-			if ($this->replaceQuote[0] == '\\'){
-				// only since php 4.0.5
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-				//$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s));
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		
-		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
-			return "'$s'";
-		else {// change \' to '' for sybase/mssql
-			$s = str_replace('\\\\','\\',$s);
-			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
-		}
-	}
-	
-	
-	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
-	*
-	* See readme.htm#ex8 for an example of usage.
-	*
-	* @param sql
-	* @param nrows		is the number of rows per page to get
-	* @param page		is the page number to get (1-based)
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
-	*
-	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
-	*
-	*/
-	function PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		if ($this->pageExecuteCountRows) $rs = _adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache);
-		else $rs = _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
-		return $rs;
-	}
-	
-		
-	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
-	*
-	* @param secs2cache	seconds to cache data, set to 0 to force query
-	* @param sql
-	* @param nrows		is the number of rows per page to get
-	* @param page		is the page number to get (1-based)
-	* @param [inputarr]	array of bind variables
-	* @return		the recordset ($rs->databaseType == 'array')
-	*/
-	function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) 
-	{
-		/*switch($this->dataProvider) {
-		case 'postgres':
-		case 'mysql': 
-			break;
-		default: $secs2cache = 0; break;
-		}*/
-		$rs = $this->PageExecute($sql,$nrows,$page,$inputarr,$secs2cache);
-		return $rs;
-	}
-
-} // end class ADOConnection
-	
-	
-	
-	//==============================================================================================	
-	// CLASS ADOFetchObj
-	//==============================================================================================	
-		
-	/**
-	* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
-	*/
-	class ADOFetchObj {
-	};
-	
-	//==============================================================================================	
-	// CLASS ADORecordSet_empty
-	//==============================================================================================	
-	
-	class ADODB_Iterator_empty implements Iterator {
-	
-	    private $rs;
-	
-	    function __construct($rs) 
-		{
-	        $this->rs = $rs;
-	    }
-	    function rewind() 
-		{
-	    }
-	
-		function valid() 
-		{
-	        return !$this->rs->EOF;
-	    }
-		
-	    function key() 
-		{
-	        return false;
-	    }
-		
-	    function current() 
-		{
-	        return false;
-	    }
-		
-	    function next() 
-		{
-	    }
-		
-		function __call($func, $params)
-		{
-			return call_user_func_array(array($this->rs, $func), $params);
-		}
-		
-		function hasMore()
-		{
-			return false;
-		}
-	
-	}
-
-	
-	/**
-	* Lightweight recordset when there are no records to be returned
-	*/
-	class ADORecordSet_empty implements IteratorAggregate
-	{
-		var $dataProvider = 'empty';
-		var $databaseType = false;
-		var $EOF = true;
-		var $_numOfRows = 0;
-		var $fields = false;
-		var $connection = false;
-		function RowCount() {return 0;}
-		function RecordCount() {return 0;}
-		function PO_RecordCount(){return 0;}
-		function Close(){return true;}
-		function FetchRow() {return false;}
-		function FieldCount(){ return 0;}
-		function Init() {}
-		function getIterator() {return new ADODB_Iterator_empty($this);}
-	}
-	
-	//==============================================================================================	
-	// DATE AND TIME FUNCTIONS
-	//==============================================================================================	
-	if (!defined('ADODB_DATE_VERSION')) include(ADODB_DIR.'/adodb-time.inc.php');
-	
-	//==============================================================================================	
-	// CLASS ADORecordSet
-	//==============================================================================================	
-
-	class ADODB_Iterator implements Iterator {
-	
-	    private $rs;
-	
-	    function __construct($rs) 
-		{
-	        $this->rs = $rs;
-	    }
-	    function rewind() 
-		{
-	        $this->rs->MoveFirst();
-	    }
-	
-		function valid() 
-		{
-	        return !$this->rs->EOF;
-	    }
-		
-	    function key() 
-		{
-	        return $this->rs->_currentRow;
-	    }
-		
-	    function current() 
-		{
-	        return $this->rs->fields;
-	    }
-		
-	    function next() 
-		{
-	        $this->rs->MoveNext();
-	    }
-		
-		function __call($func, $params)
-		{
-			return call_user_func_array(array($this->rs, $func), $params);
-		}
-	
-		
-		function hasMore()
-		{
-			return !$this->rs->EOF;
-		}
-	
-	}
-
-
-
-   /**
-	 * RecordSet class that represents the dataset returned by the database.
-	 * To keep memory overhead low, this class holds only the current row in memory.
-	 * No prefetching of data is done, so the RecordCount() can return -1 ( which
-	 * means recordcount not known).
-	 */
-	class ADORecordSet implements IteratorAggregate {
-	/*
-	 * public variables	
-	 */
-	var $dataProvider = "native";
-	var $fields = false; 	/// holds the current row data
-	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
-							/// in other words, we use a text area for editing.
-	var $canSeek = false; 	/// indicates that seek is supported
-	var $sql; 				/// sql text
-	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object. 
-	
-	var $emptyTimeStamp = ' '; /// what to display when $time==0
-	var $emptyDate = ' '; /// what to display when $time==0
-	var $debug = false;
-	var $timeCreated=0; 	/// datetime in Unix format rs created -- for cached recordsets
-
-	var $bind = false; 		/// used by Fields() to hold array - should be private?
-	var $fetchMode;			/// default fetch mode
-	var $connection = false; /// the parent connection
-	/*
-	 *	private variables	
-	 */
-	var $_numOfRows = -1;	/** number of rows, or -1 */
-	var $_numOfFields = -1;	/** number of fields in recordset */
-	var $_queryID = -1;		/** This variable keeps the result link identifier.	*/
-	var $_currentRow = -1;	/** This variable keeps the current row in the Recordset.	*/
-	var $_closed = false; 	/** has recordset been closed */
-	var $_inited = false; 	/** Init() should only be called once */
-	var $_obj; 				/** Used by FetchObj */
-	var $_names;			/** Used by FetchObj */
-	
-	var $_currentPage = -1;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_atFirstPage = false;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_atLastPage = false;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_lastPageNo = -1; 
-	var $_maxRecordCount = 0;
-	var $datetime = false;
-	
-	/**
-	 * Constructor
-	 *
-	 * @param queryID  	this is the queryID returned by ADOConnection->_query()
-	 *
-	 */
-	function ADORecordSet($queryID) 
-	{
-		$this->_queryID = $queryID;
-	}
-	
-	function getIterator() 
-	{
-        return new ADODB_Iterator($this);
-    }
-	
-	/* this is experimental - i don't really know what to return... */
-	function __toString()
-	{
-		include_once(ADODB_DIR.'/toexport.inc.php');
-		return _adodb_export($this,',',',',false,true);
-	}
-	
-	
-	function Init()
-	{
-		if ($this->_inited) return;
-		$this->_inited = true;
-		if ($this->_queryID) @$this->_initrs();
-		else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-		}
-		if ($this->_numOfRows != 0 && $this->_numOfFields && $this->_currentRow == -1) {
-			
-			$this->_currentRow = 0;
-			if ($this->EOF = ($this->_fetch() === false)) {
-				$this->_numOfRows = 0; // _numOfRows could be -1
-			}
-		} else {
-			$this->EOF = true;
-		}
-	}
-	
-	
-	/**
-	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
-	 * the text to display to the user, and 2nd col as the return value. Default
-	 * strings are compared with the FIRST column.
-	 *
-	 * @param name  		name of SELECT tag
-	 * @param [defstr]		the value to hilite. Use an array for multiple hilites for listbox.
-	 * @param [blank1stItem]	true to leave the 1st item in list empty
-	 * @param [multiple]		true for listbox, false for popup
-	 * @param [size]		#rows to show for listbox. not used by popup
-	 * @param [selectAttr]		additional attributes to defined for SELECT tag.
-	 *				useful for holding javascript onChange='...' handlers.
-	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with 
-	 *				column 0 (1st col) if this is true. This is not documented.
-	 *
-	 * @return HTML
-	 *
-	 * changes by glen.davies@cce.ac.nz to support multiple hilited items
-	 */
-	function GetMenu($name,$defstr='',$blank1stItem=true,$multiple=false,
-			$size=0, $selectAttr='',$compareFields0=true)
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,$compareFields0);
-	}
-	
-
-	
-	/**
-	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
-	 * the text to display to the user, and 2nd col as the return value. Default
-	 * strings are compared with the SECOND column.
-	 *
-	 */
-	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')	
-	{
-		return $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,false);
-	}
-	
-	/*
-		Grouped Menu
-	*/
-	function GetMenu3($name,$defstr='',$blank1stItem=true,$multiple=false,
-			$size=0, $selectAttr='')
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getmenu_gp($this, $name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,false);
-	}
-
-	/**
-	 * return recordset as a 2-dimensional array.
-	 *
-	 * @param [nRows]  is the number of rows to return. -1 means every row.
-	 *
-	 * @return an array indexed by the rows (0-based) from the recordset
-	 */
-	function GetArray($nRows = -1) 
-	{
-	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) {
-		$results = adodb_getall($this,$nRows);
-		return $results;
-	}
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nRows != $cnt) {
-			$results[] = $this->fields;
-			$this->MoveNext();
-			$cnt++;
-		}
-		return $results;
-	}
-	
-	function GetAll($nRows = -1)
-	{
-		$arr = $this->GetArray($nRows);
-		return $arr;
-	}
-	
-	/*
-	* Some databases allow multiple recordsets to be returned. This function
-	* will return true if there is a next recordset, or false if no more.
-	*/
-	function NextRecordSet()
-	{
-		return false;
-	}
-	
-	/**
-	 * return recordset as a 2-dimensional array. 
-	 * Helper function for ADOConnection->SelectLimit()
-	 *
-	 * @param offset	is the row to start calculations from (1-based)
-	 * @param [nrows]	is the number of rows to return
-	 *
-	 * @return an array indexed by the rows (0-based) from the recordset
-	 */
-	function GetArrayLimit($nrows,$offset=-1) 
-	{	
-		if ($offset <= 0) {
-			$arr = $this->GetArray($nrows);
-			return $arr;
-		} 
-		
-		$this->Move($offset);
-		
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-	
-	
-	/**
-	 * Synonym for GetArray() for compatibility with ADO.
-	 *
-	 * @param [nRows]  is the number of rows to return. -1 means every row.
-	 *
-	 * @return an array indexed by the rows (0-based) from the recordset
-	 */
-	function GetRows($nRows = -1) 
-	{
-		$arr = $this->GetArray($nRows);
-		return $arr;
-	}
-	
-	/**
-	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns. 
-	 * The first column is treated as the key and is not included in the array. 
-	 * If there is only 2 columns, it will return a 1 dimensional array of key-value pairs unless
-	 * $force_array == true.
-	 *
-	 * @param [force_array] has only meaning if we have 2 data columns. If false, a 1 dimensional
-	 * 	array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing,
-	 * 	read the source.
-	 *
-	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and 
-	 * instead of returning array[col0] => array(remaining cols), return array[col0] => col1
-	 *
-	 * @return an associative array indexed by the first column of the array, 
-	 * 	or false if the  data has less than 2 cols.
-	 */
-	function GetAssoc($force_array = false, $first2cols = false) 
-	{
-	global $ADODB_EXTENSION;
-	
-		$cols = $this->_numOfFields;
-		if ($cols < 2) {
-			$false = false;
-			return $false;
-		}
-		$numIndex = isset($this->fields[0]);
-		$results = array();
-		
-		if (!$first2cols && ($cols > 2 || $force_array)) {
-			if ($ADODB_EXTENSION) {
-				if ($numIndex) {
-					while (!$this->EOF) {
-						$results[trim($this->fields[0])] = array_slice($this->fields, 1);
-						adodb_movenext($this);
-					}
-				} else {
-					while (!$this->EOF) {
-					// Fix for array_slice re-numbering numeric associative keys
-						$keys = array_slice(array_keys($this->fields), 1);
-						$sliced_array = array();
-
-						foreach($keys as $key) {
-							$sliced_array[$key] = $this->fields[$key];
-						}
-						
-						$results[trim(reset($this->fields))] = $sliced_array;
-						adodb_movenext($this);
-					}
-				}
-			} else {
-				if ($numIndex) {
-					while (!$this->EOF) {
-						$results[trim($this->fields[0])] = array_slice($this->fields, 1);
-						$this->MoveNext();
-					}
-				} else {
-					while (!$this->EOF) {
-					// Fix for array_slice re-numbering numeric associative keys
-						$keys = array_slice(array_keys($this->fields), 1);
-						$sliced_array = array();
-
-						foreach($keys as $key) {
-							$sliced_array[$key] = $this->fields[$key];
-						}
-						
-						$results[trim(reset($this->fields))] = $sliced_array;
-						$this->MoveNext();
-					}
-				}
-			}
-		} else {
-			if ($ADODB_EXTENSION) {
-				// return scalar values
-				if ($numIndex) {
-					while (!$this->EOF) {
-					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
-						$results[trim(($this->fields[0]))] = $this->fields[1];
-						adodb_movenext($this);
-					}
-				} else {
-					while (!$this->EOF) {
-					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
-						$v1 = trim(reset($this->fields));
-						$v2 = ''.next($this->fields); 
-						$results[$v1] = $v2;
-						adodb_movenext($this);
-					}
-				}
-			} else {
-				if ($numIndex) {
-					while (!$this->EOF) {
-					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
-						$results[trim(($this->fields[0]))] = $this->fields[1];
-						$this->MoveNext();
-					}
-				} else {
-					while (!$this->EOF) {
-					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
-						$v1 = trim(reset($this->fields));
-						$v2 = ''.next($this->fields); 
-						$results[$v1] = $v2;
-						$this->MoveNext();
-					}
-				}
-			}
-		}
-		
-		$ref = $results; # workaround accelerator incompat with PHP 4.4 :(
-		return $ref; 
-	}
-	
-	
-	/**
-	 *
-	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a timestamp formated as user desires
-	 */
-	function UserTimeStamp($v,$fmt='Y-m-d H:i:s')
-	{
-		if (is_numeric($v) && strlen($v)<14) return adodb_date($fmt,$v);
-		$tt = $this->UnixTimeStamp($v);
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		if ($tt === 0) return $this->emptyTimeStamp;
-		return adodb_date($fmt,$tt);
-	}
-	
-	
-	/**
-	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a date formated as user desires
-	 */
-	function UserDate($v,$fmt='Y-m-d')
-	{
-		$tt = $this->UnixDate($v);
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		else if ($tt == 0) return $this->emptyDate;
-		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
-		}
-		return adodb_date($fmt,$tt);
-	}
-	
-	
-	/**
-	 * @param $v is a date string in YYYY-MM-DD format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	static function UnixDate($v)
-	{
-		return ADOConnection::UnixDate($v);
-	}
-	
-
-	/**
-	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	static function UnixTimeStamp($v)
-	{
-		return ADOConnection::UnixTimeStamp($v);
-	}
-	
-	
-	/**
-	* PEAR DB Compat - do not use internally
-	*/
-	function Free()
-	{
-		return $this->Close();
-	}
-	
-	
-	/**
-	* PEAR DB compat, number of rows
-	*/
-	function NumRows()
-	{
-		return $this->_numOfRows;
-	}
-	
-	
-	/**
-	* PEAR DB compat, number of cols
-	*/
-	function NumCols()
-	{
-		return $this->_numOfFields;
-	}
-	
-	/**
-	* Fetch a row, returning false if no more rows. 
-	* This is PEAR DB compat mode.
-	*
-	* @return false or array containing the current record
-	*/
-	function FetchRow()
-	{
-		if ($this->EOF) {
-			$false = false;
-			return $false;
-		}
-		$arr = $this->fields;
-		$this->_currentRow++;
-		if (!$this->_fetch()) $this->EOF = true;
-		return $arr;
-	}
-	
-	
-	/**
-	* Fetch a row, returning PEAR_Error if no more rows. 
-	* This is PEAR DB compat mode.
-	*
-	* @return DB_OK or error object
-	*/
-	function FetchInto(&$arr)
-	{
-		if ($this->EOF) return (defined('PEAR_ERROR_RETURN')) ? new PEAR_Error('EOF',-1): false;
-		$arr = $this->fields;
-		$this->MoveNext();
-		return 1; // DB_OK
-	}
-	
-	
-	/**
-	 * Move to the first row in the recordset. Many databases do NOT support this.
-	 *
-	 * @return true or false
-	 */
-	function MoveFirst() 
-	{
-		if ($this->_currentRow == 0) return true;
-		return $this->Move(0);			
-	}			
-
-	
-	/**
-	 * Move to the last row in the recordset. 
-	 *
-	 * @return true or false
-	 */
-	function MoveLast() 
-	{
-		if ($this->_numOfRows >= 0) return $this->Move($this->_numOfRows-1);
-		if ($this->EOF) return false;
-		while (!$this->EOF) {
-			$f = $this->fields;
-			$this->MoveNext();
-		}
-		$this->fields = $f;
-		$this->EOF = false;
-		return true;
-	}
-	
-	
-	/**
-	 * Move to next record in the recordset.
-	 *
-	 * @return true if there still rows available, or false if there are no more rows (EOF).
-	 */
-	function MoveNext() 
-	{
-		if (!$this->EOF) {
-			$this->_currentRow++;
-			if ($this->_fetch()) return true;
-		}
-		$this->EOF = true;
-		/* -- tested error handling when scrolling cursor -- seems useless.
-		$conn = $this->connection;
-		if ($conn && $conn->raiseErrorFn && ($errno = $conn->ErrorNo())) {
-			$fn = $conn->raiseErrorFn;
-			$fn($conn->databaseType,'MOVENEXT',$errno,$conn->ErrorMsg().' ('.$this->sql.')',$conn->host,$conn->database);
-		}
-		*/
-		return false;
-	}
-	
-	
-	/**
-	 * Random access to a specific row in the recordset. Some databases do not support
-	 * access to previous rows in the databases (no scrolling backwards).
-	 *
-	 * @param rowNumber is the row to move to (0-based)
-	 *
-	 * @return true if there still rows available, or false if there are no more rows (EOF).
-	 */
-	function Move($rowNumber = 0) 
-	{
-		$this->EOF = false;
-		if ($rowNumber == $this->_currentRow) return true;
-		if ($rowNumber >= $this->_numOfRows)
-	   		if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-2;
-  				
-		if ($this->canSeek) { 
-	
-			if ($this->_seek($rowNumber)) {
-				$this->_currentRow = $rowNumber;
-				if ($this->_fetch()) {
-					return true;
-				}
-			} else {
-				$this->EOF = true;
-				return false;
-			}
-		} else {
-			if ($rowNumber < $this->_currentRow) return false;
-			global $ADODB_EXTENSION;
-			if ($ADODB_EXTENSION) {
-				while (!$this->EOF && $this->_currentRow < $rowNumber) {
-					adodb_movenext($this);
-				}
-			} else {
-			
-				while (! $this->EOF && $this->_currentRow < $rowNumber) {
-					$this->_currentRow++;
-					
-					if (!$this->_fetch()) $this->EOF = true;
-				}
-			}
-			return !($this->EOF);
-		}
-		
-		$this->fields = false;	
-		$this->EOF = true;
-		return false;
-	}
-	
-		
-	/**
-	 * Get the value of a field in the current row by column name.
-	 * Will not work if ADODB_FETCH_MODE is set to ADODB_FETCH_NUM.
-	 * 
-	 * @param colname  is the field to access
-	 *
-	 * @return the value of $colname column
-	 */
-	function Fields($colname)
-	{
-		return $this->fields[$colname];
-	}
-	
-	function GetAssocKeys($upper=true)
-	{
-		$this->bind = array();
-		for ($i=0; $i < $this->_numOfFields; $i++) {
-			$o = $this->FetchField($i);
-			if ($upper === 2) $this->bind[$o->name] = $i;
-			else $this->bind[($upper) ? strtoupper($o->name) : strtolower($o->name)] = $i;
-		}
-	}
-	
-  /**
-   * Use associative array to get fields array for databases that do not support
-   * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
-   *
-   * If you don't want uppercase cols, set $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC
-   * before you execute your SQL statement, and access $rs->fields['col'] directly.
-   *
-   * $upper  0 = lowercase, 1 = uppercase, 2 = whatever is returned by FetchField
-   */
-	function GetRowAssoc($upper=1)
-	{
-		$record = array();
-	 //	if (!$this->fields) return $record;
-		
-	   	if (!$this->bind) {
-			$this->GetAssocKeys($upper);
-		}
-		
-		foreach($this->bind as $k => $v) {
-			$record[$k] = $this->fields[$v];
-		}
-
-		return $record;
-	}
-	
-	
-	/**
-	 * Clean up recordset
-	 *
-	 * @return true or false
-	 */
-	function Close() 
-	{
-		// free connection object - this seems to globally free the object
-		// and not merely the reference, so don't do this...
-		// $this->connection = false; 
-		if (!$this->_closed) {
-			$this->_closed = true;
-			return $this->_close();		
-		} else
-			return true;
-	}
-	
-	/**
-	 * synonyms RecordCount and RowCount	
-	 *
-	 * @return the number of rows or -1 if this is not supported
-	 */
-	function RecordCount() {return $this->_numOfRows;}
-	
-	
-	/*
-	* If we are using PageExecute(), this will return the maximum possible rows
-	* that can be returned when paging a recordset.
-	*/
-	function MaxRecordCount()
-	{
-		return ($this->_maxRecordCount) ? $this->_maxRecordCount : $this->RecordCount();
-	}
-	
-	/**
-	 * synonyms RecordCount and RowCount	
-	 *
-	 * @return the number of rows or -1 if this is not supported
-	 */
-	function RowCount() {return $this->_numOfRows;} 
-	
-
-	 /**
-	 * Portable RecordCount. Pablo Roca 
-	 *
-	 * @return  the number of records from a previous SELECT. All databases support this.
-	 *
-	 * But aware possible problems in multiuser environments. For better speed the table
-	 * must be indexed by the condition. Heavy test this before deploying.
-	 */ 
-	function PO_RecordCount($table="", $condition="") {
-		
-		$lnumrows = $this->_numOfRows;
-		// the database doesn't support native recordcount, so we do a workaround
-		if ($lnumrows == -1 && $this->connection) {
-			IF ($table) {
-				if ($condition) $condition = " WHERE " . $condition; 
-				$resultrows = $this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
-				if ($resultrows) $lnumrows = reset($resultrows->fields);
-			}
-		}
-		return $lnumrows;
-	}
-	
-	
-	/**
-	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
-	 */
-	function CurrentRow() {return $this->_currentRow;}
-	
-	/**
-	 * synonym for CurrentRow -- for ADO compat
-	 *
-	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
-	 */
-	function AbsolutePosition() {return $this->_currentRow;}
-	
-	/**
-	 * @return the number of columns in the recordset. Some databases will set this to 0
-	 * if no records are returned, others will return the number of columns in the query.
-	 */
-	function FieldCount() {return $this->_numOfFields;}   
-
-
-	/**
-	 * Get the ADOFieldObject of a specific column.
-	 *
-	 * @param fieldoffset	is the column position to access(0-based).
-	 *
-	 * @return the ADOFieldObject for that column, or false.
-	 */
-	function FetchField($fieldoffset = -1) 
-	{
-		// must be defined by child class
-		
-		$false = false;
-		return $false;
-	}	
-	
-	/**
-	 * Get the ADOFieldObjects of all columns in an array.
-	 *
-	 */
-	function FieldTypesArray()
-	{
-		$arr = array();
-		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) 
-			$arr[] = $this->FetchField($i);
-		return $arr;
-	}
-	
-	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default case is lowercase field names.
-	*
-	* @return the object with the properties set to the fields of the current row
-	*/
-	function FetchObj()
-	{
-		$o = $this->FetchObject(false);
-		return $o;
-	}
-	
-	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default case is uppercase.
-	* 
-	* @param $isupper to set the object property names to uppercase
-	*
-	* @return the object with the properties set to the fields of the current row
-	*/
-	function FetchObject($isupper=true)
-	{
-		if (empty($this->_obj)) {
-			$this->_obj = new ADOFetchObj();
-			$this->_names = array();
-			for ($i=0; $i <$this->_numOfFields; $i++) {
-				$f = $this->FetchField($i);
-				$this->_names[] = $f->name;
-			}
-		}
-		$i = 0;
-		if (PHP_VERSION >= 5) $o = clone($this->_obj);
-		else $o = $this->_obj;
-	
-		for ($i=0; $i <$this->_numOfFields; $i++) {
-			$name = $this->_names[$i];
-			if ($isupper) $n = strtoupper($name);
-			else $n = $name;
-			
-			$o->$n = $this->Fields($name);
-		}
-		return $o;
-	}
-	
-	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default is lower-case field names.
-	* 
-	* @return the object with the properties set to the fields of the current row,
-	* 	or false if EOF
-	*
-	* Fixed bug reported by tim@orotech.net
-	*/
-	function FetchNextObj()
-	{
-		$o = $this->FetchNextObject(false);
-		return $o;
-	}
-	
-	
-	/**
-	* Return the fields array of the current row as an object for convenience. 
-	* The default is upper case field names.
-	* 
-	* @param $isupper to set the object property names to uppercase
-	*
-	* @return the object with the properties set to the fields of the current row,
-	* 	or false if EOF
-	*
-	* Fixed bug reported by tim@orotech.net
-	*/
-	function FetchNextObject($isupper=true)
-	{
-		$o = false;
-		if ($this->_numOfRows != 0 && !$this->EOF) {
-			$o = $this->FetchObject($isupper);	
-			$this->_currentRow++;
-			if ($this->_fetch()) return $o;
-		}
-		$this->EOF = true;
-		return $o;
-	}
-	
-	/**
-	 * Get the metatype of the column. This is used for formatting. This is because
-	 * many databases use different names for the same type, so we transform the original
-	 * type to our standardised version which uses 1 character codes:
-	 *
-	 * @param t  is the type passed in. Normally is ADOFieldObject->type.
-	 * @param len is the maximum length of that field. This is because we treat character
-	 * 	fields bigger than a certain size as a 'B' (blob).
-	 * @param fieldobj is the field object returned by the database driver. Can hold
-	 *	additional info (eg. primary_key for mysql).
-	 * 
-	 * @return the general type of the data: 
-	 *	C for character < 250 chars
-	 *	X for teXt (>= 250 chars)
-	 *	B for Binary
-	 * 	N for numeric or floating point
-	 *	D for date
-	 *	T for timestamp
-	 * 	L for logical/Boolean
-	 *	I for integer
-	 *	R for autoincrement counter/integer
-	 * 
-	 *
-	*/
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-	// changed in 2.32 to hashing instead of switch stmt for speed...
-	static $typeMap = array(
-		'VARCHAR' => 'C',
-		'VARCHAR2' => 'C',
-		'CHAR' => 'C',
-		'C' => 'C',
-		'STRING' => 'C',
-		'NCHAR' => 'C',
-		'NVARCHAR' => 'C',
-		'VARYING' => 'C',
-		'BPCHAR' => 'C',
-		'CHARACTER' => 'C',
-		'INTERVAL' => 'C',  # Postgres
-		'MACADDR' => 'C', # postgres
-		'VAR_STRING' => 'C', # mysql
-		##
-		'LONGCHAR' => 'X',
-		'TEXT' => 'X',
-		'NTEXT' => 'X',
-		'M' => 'X',
-		'X' => 'X',
-		'CLOB' => 'X',
-		'NCLOB' => 'X',
-		'LVARCHAR' => 'X',
-		##
-		'BLOB' => 'B',
-		'IMAGE' => 'B',
-		'BINARY' => 'B',
-		'VARBINARY' => 'B',
-		'LONGBINARY' => 'B',
-		'B' => 'B',
-		##
-		'YEAR' => 'D', // mysql
-		'DATE' => 'D',
-		'D' => 'D',
-		##
-		'UNIQUEIDENTIFIER' => 'C', # MS SQL Server
-		##
-		'SMALLDATETIME' => 'T',
-		'TIME' => 'T',
-		'TIMESTAMP' => 'T',
-		'DATETIME' => 'T',
-		'TIMESTAMPTZ' => 'T',
-		'T' => 'T',
-		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
-		##
-		'BOOL' => 'L',
-		'BOOLEAN' => 'L', 
-		'BIT' => 'L',
-		'L' => 'L',
-		##
-		'COUNTER' => 'R',
-		'R' => 'R',
-		'SERIAL' => 'R', // ifx
-		'INT IDENTITY' => 'R',
-		##
-		'INT' => 'I',
-		'INT2' => 'I',
-		'INT4' => 'I',
-		'INT8' => 'I',
-		'INTEGER' => 'I',
-		'INTEGER UNSIGNED' => 'I',
-		'SHORT' => 'I',
-		'TINYINT' => 'I',
-		'SMALLINT' => 'I',
-		'I' => 'I',
-		##
-		'LONG' => 'N', // interbase is numeric, oci8 is blob
-		'BIGINT' => 'N', // this is bigger than PHP 32-bit integers
-		'DECIMAL' => 'N',
-		'DEC' => 'N',
-		'REAL' => 'N',
-		'DOUBLE' => 'N',
-		'DOUBLE PRECISION' => 'N',
-		'SMALLFLOAT' => 'N',
-		'FLOAT' => 'N',
-		'NUMBER' => 'N',
-		'NUM' => 'N',
-		'NUMERIC' => 'N',
-		'MONEY' => 'N',
-		
-		## informix 9.2
-		'SQLINT' => 'I', 
-		'SQLSERIAL' => 'I', 
-		'SQLSMINT' => 'I', 
-		'SQLSMFLOAT' => 'N', 
-		'SQLFLOAT' => 'N', 
-		'SQLMONEY' => 'N', 
-		'SQLDECIMAL' => 'N', 
-		'SQLDATE' => 'D', 
-		'SQLVCHAR' => 'C', 
-		'SQLCHAR' => 'C', 
-		'SQLDTIME' => 'T', 
-		'SQLINTERVAL' => 'N', 
-		'SQLBYTES' => 'B', 
-		'SQLTEXT' => 'X',
-		 ## informix 10
-		"SQLINT8" => 'I8',
-		"SQLSERIAL8" => 'I8',
-		"SQLNCHAR" => 'C',
-		"SQLNVCHAR" => 'C',
-		"SQLLVARCHAR" => 'X',
-		"SQLBOOL" => 'L'
-		);
-		
-		$tmap = false;
-		$t = strtoupper($t);
-		$tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N';
-		switch ($tmap) {
-		case 'C':
-		
-			// is the char field is too long, return as text field... 
-			if ($this->blobSize >= 0) {
-				if ($len > $this->blobSize) return 'X';
-			} else if ($len > 250) {
-				return 'X';
-			}
-			return 'C';
-			
-		case 'I':
-			if (!empty($fieldobj->primary_key)) return 'R';
-			return 'I';
-		
-		case false:
-			return 'N';
-			
-		case 'B':
-			 if (isset($fieldobj->binary)) 
-				 return ($fieldobj->binary) ? 'B' : 'X';
-			return 'B';
-		
-		case 'D':
-			if (!empty($this->connection) && !empty($this->connection->datetime)) return 'T';
-			return 'D';
-			
-		default: 
-			if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B';
-			return $tmap;
-		}
-	}
-	
-	
-	function _close() {}
-	
-	/**
-	 * set/returns the current recordset page when paginating
-	 */
-	function AbsolutePage($page=-1)
-	{
-		if ($page != -1) $this->_currentPage = $page;
-		return $this->_currentPage;
-	}
-	
-	/**
-	 * set/returns the status of the atFirstPage flag when paginating
-	 */
-	function AtFirstPage($status=false)
-	{
-		if ($status != false) $this->_atFirstPage = $status;
-		return $this->_atFirstPage;
-	}
-	
-	function LastPageNo($page = false)
-	{
-		if ($page != false) $this->_lastPageNo = $page;
-		return $this->_lastPageNo;
-	}
-	
-	/**
-	 * set/returns the status of the atLastPage flag when paginating
-	 */
-	function AtLastPage($status=false)
-	{
-		if ($status != false) $this->_atLastPage = $status;
-		return $this->_atLastPage;
-	}
-	
-} // end class ADORecordSet
-	
-	//==============================================================================================	
-	// CLASS ADORecordSet_array
-	//==============================================================================================	
-	
-	/**
-	 * This class encapsulates the concept of a recordset created in memory
-	 * as an array. This is useful for the creation of cached recordsets.
-	 * 
-	 * Note that the constructor is different from the standard ADORecordSet
-	 */
-	
-	class ADORecordSet_array extends ADORecordSet
-	{
-		var $databaseType = 'array';
-
-		var $_array; 	// holds the 2-dimensional data array
-		var $_types;	// the array of types of each column (C B I L M)
-		var $_colnames;	// names of each column in array
-		var $_skiprow1;	// skip 1st row because it holds column names
-		var $_fieldobjects; // holds array of field objects
-		var $canSeek = true;
-		var $affectedrows = false;
-		var $insertid = false;
-		var $sql = '';
-		var $compat = false;
-		/**
-		 * Constructor
-		 *
-		 */
-		function ADORecordSet_array($fakeid=1)
-		{
-		global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
-		
-			// fetch() on EOF does not delete $this->fields
-			$this->compat = !empty($ADODB_COMPAT_FETCH);
-			$this->ADORecordSet($fakeid); // fake queryID		
-			$this->fetchMode = $ADODB_FETCH_MODE;
-		}
-		
-		function _transpose($addfieldnames=true)
-		{
-		global $ADODB_INCLUDED_LIB;
-			
-			if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-			$hdr = true;
-			
-			$fobjs = $addfieldnames ? $this->_fieldobjects : false;
-			adodb_transpose($this->_array, $newarr, $hdr, $fobjs);
-			//adodb_pr($newarr);
-			
-			$this->_skiprow1 = false;
-			$this->_array = $newarr;
-			$this->_colnames = $hdr;
-			
-			adodb_probetypes($newarr,$this->_types);
-		
-			$this->_fieldobjects = array();
-			
-			foreach($hdr as $k => $name) {
-				$f = new ADOFieldObject();
-				$f->name = $name;
-				$f->type = $this->_types[$k];
-				$f->max_length = -1;
-				$this->_fieldobjects[] = $f;
-			}
-			$this->fields = reset($this->_array);
-			
-			$this->_initrs();
-			
-		}
-		
-		/**
-		 * Setup the array.
-		 *
-		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
-		 *			unless paramter $colnames is used.
-		 * @param typearr	holds an array of types. These are the same types 
-		 *			used in MetaTypes (C,B,L,I,N).
-		 * @param [colnames]	array of column names. If set, then the first row of
-		 *			$array should not hold the column names.
-		 */
-		function InitArray($array,$typearr,$colnames=false)
-		{
-			$this->_array = $array;
-			$this->_types = $typearr;	
-			if ($colnames) {
-				$this->_skiprow1 = false;
-				$this->_colnames = $colnames;
-			} else  {
-				$this->_skiprow1 = true;
-				$this->_colnames = $array[0];
-			}
-			$this->Init();
-		}
-		/**
-		 * Setup the Array and datatype file objects
-		 *
-		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
-		 *			unless paramter $colnames is used.
-		 * @param fieldarr	holds an array of ADOFieldObject's.
-		 */
-		function InitArrayFields(&$array,&$fieldarr)
-		{
-			$this->_array = $array;
-			$this->_skiprow1= false;
-			if ($fieldarr) {
-				$this->_fieldobjects = $fieldarr;
-			} 
-			$this->Init();
-		}
-		
-		function GetArray($nRows=-1)
-		{
-			if ($nRows == -1 && $this->_currentRow <= 0 && !$this->_skiprow1) {
-				return $this->_array;
-			} else {
-				$arr = ADORecordSet::GetArray($nRows);
-				return $arr;
-			}
-		}
-		
-		function _initrs()
-		{
-			$this->_numOfRows =  sizeof($this->_array);
-			if ($this->_skiprow1) $this->_numOfRows -= 1;
-		
-			$this->_numOfFields =(isset($this->_fieldobjects)) ?
-				 sizeof($this->_fieldobjects):sizeof($this->_types);
-		}
-		
-		/* Use associative array to get fields array */
-		function Fields($colname)
-		{
-			$mode = isset($this->adodbFetchMode) ? $this->adodbFetchMode : $this->fetchMode;
-			
-			if ($mode & ADODB_FETCH_ASSOC) {
-				if (!isset($this->fields[$colname]) && !is_null($this->fields[$colname])) $colname = strtolower($colname);
-				return $this->fields[$colname];
-			}
-			if (!$this->bind) {
-				$this->bind = array();
-				for ($i=0; $i < $this->_numOfFields; $i++) {
-					$o = $this->FetchField($i);
-					$this->bind[strtoupper($o->name)] = $i;
-				}
-			}
-			return $this->fields[$this->bind[strtoupper($colname)]];
-		}
-		
-		function FetchField($fieldOffset = -1) 
-		{
-			if (isset($this->_fieldobjects)) {
-				return $this->_fieldobjects[$fieldOffset];
-			}
-			$o =  new ADOFieldObject();
-			$o->name = $this->_colnames[$fieldOffset];
-			$o->type =  $this->_types[$fieldOffset];
-			$o->max_length = -1; // length not known
-			
-			return $o;
-		}
-			
-		function _seek($row)
-		{
-			if (sizeof($this->_array) && 0 <= $row && $row < $this->_numOfRows) {
-				$this->_currentRow = $row;
-				if ($this->_skiprow1) $row += 1;
-				$this->fields = $this->_array[$row];
-				return true;
-			}
-			return false;
-		}
-		
-		function MoveNext() 
-		{
-			if (!$this->EOF) {		
-				$this->_currentRow++;
-				
-				$pos = $this->_currentRow;
-				
-				if ($this->_numOfRows <= $pos) {
-					if (!$this->compat) $this->fields = false;
-				} else {
-					if ($this->_skiprow1) $pos += 1;
-					$this->fields = $this->_array[$pos];
-					return true;
-				}		
-				$this->EOF = true;
-			}
-			
-			return false;
-		}	
-	
-		function _fetch()
-		{
-			$pos = $this->_currentRow;
-			
-			if ($this->_numOfRows <= $pos) {
-				if (!$this->compat) $this->fields = false;
-				return false;
-			}
-			if ($this->_skiprow1) $pos += 1;
-			$this->fields = $this->_array[$pos];
-			return true;
-		}
-		
-		function _close() 
-		{
-			return true;	
-		}
-	
-	} // ADORecordSet_array
-
-	//==============================================================================================	
-	// HELPER FUNCTIONS
-	//==============================================================================================			
-	
-	/**
-	 * Synonym for ADOLoadCode. Private function. Do not use.
-	 *
-	 * @deprecated
-	 */
-	function ADOLoadDB($dbType) 
-	{ 
-		return ADOLoadCode($dbType);
-	}
-		
-	/**
-	 * Load the code for a specific database driver. Private function. Do not use.
-	 */
-	function ADOLoadCode($dbType) 
-	{
-	global $ADODB_LASTDB;
-	
-		if (!$dbType) return false;
-		$db = strtolower($dbType);
-		switch ($db) {
-			case 'ado': 
-				if (PHP_VERSION >= 5) $db = 'ado5';
-				$class = 'ado'; 
-				break;
-			case 'ifx':
-			case 'maxsql': $class = $db = 'mysqlt'; break;
-			case 'postgres':
-			case 'postgres8':
-			case 'pgsql': $class = $db = 'postgres7'; break;
-			default:
-				$class = $db; break;
-		}
-		
-		$file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
-		@include_once($file);
-		$ADODB_LASTDB = $class;
-		if (class_exists("ADODB_" . $class)) return $class;
-		
-		//ADOConnection::outp(adodb_pr(get_declared_classes(),true));
-		if (!file_exists($file)) ADOConnection::outp("Missing file: $file");
-		else ADOConnection::outp("Syntax error in file: $file");
-		return false;
-	}
-
-	/**
-	 * synonym for ADONewConnection for people like me who cannot remember the correct name
-	 */
-	function NewADOConnection($db='')
-	{
-		$tmp = ADONewConnection($db);
-		return $tmp;
-	}
-	
-	/**
-	 * Instantiate a new Connection class for a specific database driver.
-	 *
-	 * @param [db]  is the database Connection object to create. If undefined,
-	 * 	use the last database driver that was loaded by ADOLoadCode().
-	 *
-	 * @return the freshly created instance of the Connection class.
-	 */
-	function ADONewConnection($db='')
-	{
-	GLOBAL $ADODB_NEWCONNECTION, $ADODB_LASTDB;
-		
-		if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
-		$errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
-		$false = false;
-		if (($at = strpos($db,'://')) !== FALSE) {
-			$origdsn = $db;
-			$fakedsn = 'fake'.substr($origdsn,$at);
-			if (($at2 = strpos($origdsn,'@/')) !== FALSE) {
-				// special handling of oracle, which might not have host
-				$fakedsn = str_replace('@/','@adodb-fakehost/',$fakedsn);
-			}
-				$dsna = @parse_url($fakedsn);
-			if (!$dsna) {
-				return $false;
-			}
-				$dsna['scheme'] = substr($origdsn,0,$at);
-			if ($at2 !== FALSE) {
-				$dsna['host'] = '';
-			}
-			
-			if (strncmp($origdsn,'pdo',3) == 0) {
-				$sch = explode('_',$dsna['scheme']);
-				if (sizeof($sch)>1) {
-					$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
-					$dsna['host'] = rawurlencode($sch[1].':host='.rawurldecode($dsna['host']));
-					$dsna['scheme'] = 'pdo';
-				}
-			}
-			
-			$db = @$dsna['scheme'];
-			if (!$db) return $false;
-			$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
-			$dsna['user'] = isset($dsna['user']) ? rawurldecode($dsna['user']) : '';
-			$dsna['pass'] = isset($dsna['pass']) ? rawurldecode($dsna['pass']) : '';
-			$dsna['path'] = isset($dsna['path']) ? rawurldecode(substr($dsna['path'],1)) : ''; # strip off initial /
-			
-			if (isset($dsna['query'])) {
-				$opt1 = explode('&',$dsna['query']);
-				foreach($opt1 as $k => $v) {
-					$arr = explode('=',$v);
-					$opt[$arr[0]] = isset($arr[1]) ? rawurldecode($arr[1]) : 1;
-				}
-			} else $opt = array();
-		}
-	/*
-	 *  phptype: Database backend used in PHP (mysql, odbc etc.)
-	 *  dbsyntax: Database used with regards to SQL syntax etc.
-	 *  protocol: Communication protocol to use (tcp, unix etc.)
-	 *  hostspec: Host specification (hostname[:port])
-	 *  database: Database to use on the DBMS server
-	 *  username: User name for login
-	 *  password: Password for login
-	 */
-		if (!empty($ADODB_NEWCONNECTION)) {
-			$obj = $ADODB_NEWCONNECTION($db);
-
-		} 
-		
-		if(empty($obj)) {
-		
-			if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
-			if (empty($db)) $db = $ADODB_LASTDB;
-			
-			if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
-			
-			if (!$db) {
-				if (isset($origdsn)) $db = $origdsn;
-				if ($errorfn) {
-					// raise an error
-					$ignore = false;
-					$errorfn('ADONewConnection', 'ADONewConnection', -998,
-							 "could not load the database driver for '$db'",
-							 $db,false,$ignore);
-				} else
-					 ADOConnection::outp( "
ADONewConnection: Unable to load database driver '$db'
",false);
-					
-				return $false;
-			}
-			
-			$cls = 'ADODB_'.$db;
-			if (!class_exists($cls)) {
-				adodb_backtrace();
-				return $false;
-			}
-			
-			$obj = new $cls();
-		}
-		
-		# constructor should not fail
-		if ($obj) {
-			if ($errorfn)  $obj->raiseErrorFn = $errorfn;
-			if (isset($dsna)) {
-				if (isset($dsna['port'])) $obj->port = $dsna['port'];
-				foreach($opt as $k => $v) {
-					switch(strtolower($k)) {
-					case 'new':
-										$nconnect = true; $persist = true; break;
-					case 'persist':
-					case 'persistent': 	$persist = $v; break;
-					case 'debug':		$obj->debug = (integer) $v; break;
-					#ibase
-					case 'role':		$obj->role = $v; break;
-					case 'dialect': 	$obj->dialect = (integer) $v; break;
-					case 'charset':		$obj->charset = $v; $obj->charSet=$v; break;
-					case 'buffers':		$obj->buffers = $v; break;
-					case 'fetchmode':   $obj->SetFetchMode($v); break;
-					#ado
-					case 'charpage':	$obj->charPage = $v; break;
-					#mysql, mysqli
-					case 'clientflags': $obj->clientFlags = $v; break;
-					#mysql, mysqli, postgres
-					case 'port': $obj->port = $v; break;
-					#mysqli
-					case 'socket': $obj->socket = $v; break;
-					#oci8
-					case 'nls_date_format': $obj->NLS_DATE_FORMAT = $v; break;
-					}
-				}
-				if (empty($persist))
-					$ok = $obj->Connect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-				else if (empty($nconnect))
-					$ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-				else
-					$ok = $obj->NConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-					
-				if (!$ok) return $false;
-			}
-		}
-		return $obj;
-	}
-	
-	
-	
-	// $perf == true means called by NewPerfMonitor(), otherwise for data dictionary
-	function _adodb_getdriver($provider,$drivername,$perf=false)
-	{
-		switch ($provider) {
-		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6); 
-		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5); 
-		case 'ado'  :   if (strncmp('ado_',$drivername,4)==0) return substr($drivername,4);
-		case 'native':  break;
-		default:
-			return $provider;
-		}
-		
-		switch($drivername) {
-		case 'mysqlt':
-		case 'mysqli': 
-				$drivername='mysql'; 
-				break;
-		case 'postgres7':
-		case 'postgres8':
-				$drivername = 'postgres'; 
-				break;	
-		case 'firebird15': $drivername = 'firebird'; break;
-		case 'oracle': $drivername = 'oci8'; break;
-		case 'access': if ($perf) $drivername = ''; break;
-		case 'db2'   : break;
-		case 'sapdb' : break;
-		default:
-			$drivername = 'generic';
-			break;
-		}
-		return $drivername;
-	}
-	
-	function NewPerfMonitor(&$conn)
-	{
-		$false = false;
-		$drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType,true);
-		if (!$drivername || $drivername == 'generic') return $false;
-		include_once(ADODB_DIR.'/adodb-perf.inc.php');
-		@include_once(ADODB_DIR."/perf/perf-$drivername.inc.php");
-		$class = "Perf_$drivername";
-		if (!class_exists($class)) return $false;
-		$perf = new $class($conn);
-		
-		return $perf;
-	}
-	
-	function NewDataDictionary(&$conn,$drivername=false)
-	{
-		$false = false;
-		if (!$drivername) $drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType);
-
-		include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		include_once(ADODB_DIR.'/adodb-datadict.inc.php');
-		$path = ADODB_DIR."/datadict/datadict-$drivername.inc.php";
-
-		if (!file_exists($path)) {
-			ADOConnection::outp("Dictionary driver '$path' not available");
-			return $false;
-		}
-		include_once($path);
-		$class = "ADODB2_$drivername";
-		$dict = new $class();
-		$dict->dataProvider = $conn->dataProvider;
-		$dict->connection = $conn;
-		$dict->upperName = strtoupper($drivername);
-		$dict->quote = $conn->nameQuote;
-		if (!empty($conn->_connectionID))
-			$dict->serverInfo = $conn->ServerInfo();
-		
-		return $dict;
-	}
-
-
-	
-	/*
-		Perform a print_r, with pre tags for better formatting.
-	*/
-	function adodb_pr($var,$as_string=false)
-	{
-		if ($as_string) ob_start();
-		
-		if (isset($_SERVER['HTTP_USER_AGENT'])) { 
-			echo " 
\n";print_r($var);echo "
\n";
-		} else
-			print_r($var);
-			
-		if ($as_string) {
-			$s = ob_get_contents();
-			ob_end_clean();
-			return $s;
-		}
-	}
-	
-	/*
-		Perform a stack-crawl and pretty print it.
-		
-		@param printOrArr  Pass in a boolean to indicate print, or an $exception->trace array (assumes that print is true then).
-		@param levels Number of levels to display
-	*/
-	function adodb_backtrace($printOrArr=true,$levels=9999,$ishtml=null)
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_backtrace($printOrArr,$levels,0,$ishtml);
-	}
-
-
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-access.inc.php b/includes/adodb/datadict/datadict-access.inc.php
deleted file mode 100644
index 9007c769..00000000
--- a/includes/adodb/datadict/datadict-access.inc.php
+++ /dev/null
@@ -1,95 +0,0 @@
-debug) ADOConnection::outp("Warning: Access does not supported DEFAULT values (field $fname)");
-		}
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	function CreateDatabase($dbname,$options=false)
-	{
-		return array();
-	}
-	
-	
-	function SetSchema($schema)
-	{
-	}
-
-	function AlterColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-db2.inc.php b/includes/adodb/datadict/datadict-db2.inc.php
deleted file mode 100644
index bb7886ee..00000000
--- a/includes/adodb/datadict/datadict-db2.inc.php
+++ /dev/null
@@ -1,143 +0,0 @@
-debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function ChangeTableSQL($tablename, $flds, $tableoptions = false)
-	{
-		
-		/**
-		  Allow basic table changes to DB2 databases
-		  DB2 will fatally reject changes to non character columns 
-
-		*/
-		
-		$validTypes = array("CHAR","VARC");
-		$invalidTypes = array("BIGI","BLOB","CLOB","DATE", "DECI","DOUB", "INTE", "REAL","SMAL", "TIME");
-		// check table exists
-		$cols = $this->MetaColumns($tablename);
-		if ( empty($cols)) { 
-			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
-		}
-		
-		// already exists, alter table instead
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
-		$sql = array();
-		
-		foreach ( $lines as $id => $v ) {
-			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
-				/**
-				  If the first field of $v is the fieldname, and
-				  the second is the field type/size, we assume its an
-				  attempt to modify the column size, so check that it is allowed
-				  $v can have an indeterminate number of blanks between the
-				  fields, so account for that too
-				 */
-				$vargs = explode(' ' , $v);
-				// assume that $vargs[0] is the field name.
-				$i=0;
-				// Find the next non-blank value;
-				for ($i=1;$ialterCol . ' ' . $v;
-			} else {
-				$sql[] = $alter . $this->addCol . ' ' . $v;
-			}
-		}
-		
-		return $sql;
-	}
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-firebird.inc.php b/includes/adodb/datadict/datadict-firebird.inc.php
deleted file mode 100644
index c5df6cd8..00000000
--- a/includes/adodb/datadict/datadict-firebird.inc.php
+++ /dev/null
@@ -1,151 +0,0 @@
-connection) ) {
-			return $name;
-		}
-		
-		$quote = $this->connection->nameQuote;
-		
-		// if name is of the form `name`, quote it
-		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
-			return $quote . $matches[1] . $quote;
-		}
-		
-		// if name contains special characters, quote it
-		if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
-			return $quote . $name . $quote;
-		}
-		
-		return $quote . $name . $quote;
-	}
-
-	function CreateDatabase($dbname, $options=false)
-	{
-		$options = $this->_Options($options);
-		$sql = array();
-		
-		$sql[] = "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) RETURNS CSTRING(80) FREE_IT ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf'";
-		
-		return $sql;
-	}
-	
-	function _DropAutoIncrement($t)
-	{
-		if (strpos($t,'.') !== false) {
-			$tarr = explode('.',$t);
-			return 'DROP GENERATOR '.$tarr[0].'."gen_'.$tarr[1].'"';
-		}
-		return 'DROP GENERATOR "GEN_'.$t;
-	}
-	
-
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{
-		$suffix = '';
-		
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fautoinc) $this->seqField = $fname;
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
-		return $suffix;
-	}
-	
-/*
-CREATE or replace TRIGGER jaddress_insert
-before insert on jaddress
-for each row
-begin
-IF ( NEW."seqField" IS NULL OR NEW."seqField" = 0 ) THEN
-  NEW."seqField" = GEN_ID("GEN_tabname", 1);
-end;
-*/
-	function _Triggers($tabname,$tableoptions)
-	{	
-		if (!$this->seqField) return array();
-		
-		$tab1 = preg_replace( '/"/', '', $tabname );
-		if ($this->schema) {
-			$t = strpos($tab1,'.');
-			if ($t !== false) $tab = substr($tab1,$t+1);
-			else $tab = $tab1;
-			$seqField = $this->seqField;
-			$seqname = $this->schema.'.'.$this->seqPrefix.$tab;
-			$trigname = $this->schema.'.trig_'.$this->seqPrefix.$tab;
-		} else {
-			$seqField = $this->seqField;
-			$seqname = $this->seqPrefix.$tab1;
-			$trigname = 'trig_'.$seqname;
-		}
-		if (isset($tableoptions['REPLACE']))
-		{ $sql[] = "DROP GENERATOR \"$seqname\"";
-		  $sql[] = "CREATE GENERATOR \"$seqname\"";
-		  $sql[] = "ALTER TRIGGER \"$trigname\" BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
-		}
-		else
-		{ $sql[] = "CREATE GENERATOR \"$seqname\"";
-		  $sql[] = "CREATE TRIGGER \"$trigname\" FOR $tabname BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
-		}
-		
-		$this->seqField = false;
-		return $sql;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-generic.inc.php b/includes/adodb/datadict/datadict-generic.inc.php
deleted file mode 100644
index f3222f27..00000000
--- a/includes/adodb/datadict/datadict-generic.inc.php
+++ /dev/null
@@ -1,125 +0,0 @@
-debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-}
-
-/*
-//db2
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'X': return 'VARCHAR'; 
-		
-		case 'C2': return 'VARCHAR'; // up to 32K
-		case 'X2': return 'VARCHAR';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
-		
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'DOUBLE';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}
-	}
-	
-// ifx
-function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';// 255
-		case 'X': return 'TEXT'; 
-		
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'TEXT';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'DATETIME';
-		
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'DECIMAL(20)';
-		
-		case 'F': return 'FLOAT';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}
-	}
-*/
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-ibase.inc.php b/includes/adodb/datadict/datadict-ibase.inc.php
deleted file mode 100644
index a1c2c017..00000000
--- a/includes/adodb/datadict/datadict-ibase.inc.php
+++ /dev/null
@@ -1,67 +0,0 @@
-debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-informix.inc.php b/includes/adodb/datadict/datadict-informix.inc.php
deleted file mode 100644
index 1c6f78bb..00000000
--- a/includes/adodb/datadict/datadict-informix.inc.php
+++ /dev/null
@@ -1,80 +0,0 @@
-debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{
-		if ($fautoinc) {
-			$ftype = 'SERIAL';
-			return '';
-		}
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-}
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-mssql.inc.php b/includes/adodb/datadict/datadict-mssql.inc.php
deleted file mode 100644
index 2081bf77..00000000
--- a/includes/adodb/datadict/datadict-mssql.inc.php
+++ /dev/null
@@ -1,282 +0,0 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'R':
-		case 'INT': 
-		case 'INTEGER': return  'I';
-		case 'BIT':
-		case 'TINYINT': return  'I1';
-		case 'SMALLINT': return 'I2';
-		case 'BIGINT':  return  'I8';
-		case 'SMALLDATETIME': return 'T';
-		case 'REAL':
-		case 'FLOAT': return 'F';
-		default: return parent::MetaType($t,$len,$fieldobj);
-		}
-	}
-	
-	function ActualType($meta)
-	{
-		switch(strtoupper($meta)) {
-
-		case 'C': return 'VARCHAR';
-		case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
-		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'NTEXT';
-		
-		case 'B': return 'IMAGE';
-			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
-		case 'L': return 'BIT';
-		
-		case 'R':		
-		case 'I': return 'INT'; 
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INT';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'REAL';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname $this->addCol";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		$s .= implode(', ',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	/*
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		foreach($lines as $v) {
-			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
-		}
-
-		return $sql;
-	}
-	*/
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds))
-			$flds = explode(',',$flds);
-		$f = array();
-		$s = 'ALTER TABLE ' . $tabname;
-		foreach($flds as $v) {
-			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
-		}
-		$s .= implode(', ',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		else if ($suffix == '') $suffix .= ' NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
-        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
-
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
-
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
-
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
-        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
-
-
-	*/
-	
-	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
-		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
-		}
-*/
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	
-	function _GetSize($ftype, $ty, $fsize, $fprec)
-	{
-		switch ($ftype) {
-		case 'INT':
-		case 'SMALLINT':
-		case 'TINYINT':
-		case 'BIGINT':
-			return $ftype;
-		}
-    	if ($ty == 'T') return $ftype;
-    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
-
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-mssqlnative.inc.php b/includes/adodb/datadict/datadict-mssqlnative.inc.php
deleted file mode 100644
index 603f30e5..00000000
--- a/includes/adodb/datadict/datadict-mssqlnative.inc.php
+++ /dev/null
@@ -1,282 +0,0 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'R':
-		case 'INT': 
-		case 'INTEGER': return  'I';
-		case 'BIT':
-		case 'TINYINT': return  'I1';
-		case 'SMALLINT': return 'I2';
-		case 'BIGINT':  return  'I8';
-		
-		case 'REAL':
-		case 'FLOAT': return 'F';
-		default: return parent::MetaType($t,$len,$fieldobj);
-		}
-	}
-	
-	function ActualType($meta)
-	{
-		switch(strtoupper($meta)) {
-
-		case 'C': return 'VARCHAR';
-		case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
-		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'NTEXT';
-		
-		case 'B': return 'IMAGE';
-			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
-		case 'L': return 'BIT';
-		
-		case 'R':		
-		case 'I': return 'INT'; 
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INT';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'REAL';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname $this->addCol";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		$s .= implode(', ',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	/*
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		foreach($lines as $v) {
-			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
-		}
-
-		return $sql;
-	}
-	*/
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds))
-			$flds = explode(',',$flds);
-		$f = array();
-		$s = 'ALTER TABLE ' . $tabname;
-		foreach($flds as $v) {
-			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
-		}
-		$s .= implode(', ',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		else if ($suffix == '') $suffix .= ' NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
-        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
-
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
-
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
-
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
-        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
-
-
-	*/
-	
-	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
-		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
-		}
-*/
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	
-	function _GetSize($ftype, $ty, $fsize, $fprec)
-	{
-		switch ($ftype) {
-		case 'INT':
-		case 'SMALLINT':
-		case 'TINYINT':
-		case 'BIGINT':
-			return $ftype;
-		}
-    	if ($ty == 'T') return $ftype;
-    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
-
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-mysql.inc.php b/includes/adodb/datadict/datadict-mysql.inc.php
deleted file mode 100644
index 4b9e0df1..00000000
--- a/includes/adodb/datadict/datadict-mysql.inc.php
+++ /dev/null
@@ -1,181 +0,0 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->auto_increment;
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'STRING': 
-		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
-		case 'SET':
-			if ($len <= $this->blobSize) return 'C';
-			
-		case 'TEXT':
-		case 'LONGTEXT': 
-		case 'MEDIUMTEXT':
-			return 'X';
-			
-		// php_mysql extension always returns 'blob' even if 'text'
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
-		case 'YEAR':
-		case 'DATE': return 'D';
-		
-		case 'TIME':
-		case 'DATETIME':
-		case 'TIMESTAMP': return 'T';
-		
-		case 'FLOAT':
-		case 'DOUBLE':
-			return 'F';
-			
-		case 'INT': 
-		case 'INTEGER': return $is_serial ? 'R' : 'I';
-		case 'TINYINT': return $is_serial ? 'R' : 'I1';
-		case 'SMALLINT': return $is_serial ? 'R' : 'I2';
-		case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
-		case 'BIGINT':  return $is_serial ? 'R' : 'I8';
-		default: return 'N';
-		}
-	}
-
-	function ActualType($meta)
-	{
-		switch(strtoupper($meta)) {
-		case 'C': return 'VARCHAR';
-		case 'XL':return 'LONGTEXT';
-		case 'X': return 'TEXT';
-		
-		case 'C2': return 'VARCHAR';
-		case 'X2': return 'LONGTEXT';
-		
-		case 'B': return 'LONGBLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'DATETIME';
-		case 'L': return 'TINYINT';
-		
-		case 'R':
-		case 'I4':
-		case 'I': return 'INTEGER';
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'DOUBLE';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
-		$suffix = '';
-		if ($funsigned) $suffix .= ' UNSIGNED';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fautoinc) $suffix .= ' AUTO_INCREMENT';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	/*
-	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
-		[table_options] [select_statement]
-		create_definition:
-		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
-		[PRIMARY KEY] [reference_definition]
-		or PRIMARY KEY (index_col_name,...)
-		or KEY [index_name] (index_col_name,...)
-		or INDEX [index_name] (index_col_name,...)
-		or UNIQUE [INDEX] [index_name] (index_col_name,...)
-		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
-		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
-		[reference_definition]
-		or CHECK (expr)
-	*/
-	
-	/*
-	CREATE [UNIQUE|FULLTEXT] INDEX index_name
-		ON tbl_name (col_name[(length)],... )
-	*/
-	
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE $tabname DROP INDEX $idxname";
-			else $sql[] = sprintf($this->dropIndex, $idxname, $tabname);
-
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		if (isset($idxoptions['FULLTEXT'])) {
-			$unique = ' FULLTEXT';
-		} elseif (isset($idxoptions['UNIQUE'])) {
-			$unique = ' UNIQUE';
-		} else {
-			$unique = '';
-		}
-		
-		if ( is_array($flds) ) $flds = implode(', ',$flds);
-		
-		if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD $unique INDEX $idxname ";
-		else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname;
-		
-		$s .= ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		$sql[] = $s;
-		
-		return $sql;
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-oci8.inc.php b/includes/adodb/datadict/datadict-oci8.inc.php
deleted file mode 100644
index b48e8546..00000000
--- a/includes/adodb/datadict/datadict-oci8.inc.php
+++ /dev/null
@@ -1,291 +0,0 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-	 	case 'VARCHAR':
-	 	case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-			if (isset($this) && $len <= $this->blobSize) return 'C';
-			return 'X';
-		
-		case 'NCHAR':
-		case 'NVARCHAR2':
-		case 'NVARCHAR':
-			if (isset($this) && $len <= $this->blobSize) return 'C2';
-			return 'X2';
-			
-		case 'NCLOB':
-		case 'CLOB':
-			return 'XL';
-		
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-			return 'B';
-		
-		case 'DATE': 
-			return 'T';
-		
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': 
-			return 'I';
-			
-		default:
-			return 'N';
-		}
-	}
-	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'X': return $this->typeX;
-		case 'XL': return $this->typeXL;
-		
-		case 'C2': return 'NVARCHAR2';
-		case 'X2': return 'NVARCHAR2(4000)';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': 
-		case 'T': return 'DATE';
-		case 'L': return 'NUMBER(1)';
-		case 'I1': return 'NUMBER(3)';
-		case 'I2': return 'NUMBER(5)';
-		case 'I':
-		case 'I4': return 'NUMBER(10)';
-		
-		case 'I8': return 'NUMBER(20)';
-		case 'F': return 'NUMBER';
-		case 'N': return 'NUMBER';
-		case 'R': return 'NUMBER(20)';
-		default:
-			return $meta;
-		}	
-	}
-	
-	function CreateDatabase($dbname, $options=false)
-	{
-		$options = $this->_Options($options);
-		$password = isset($options['PASSWORD']) ? $options['PASSWORD'] : 'tiger';
-		$tablespace = isset($options["TABLESPACE"]) ? " DEFAULT TABLESPACE ".$options["TABLESPACE"] : '';
-		$sql[] = "CREATE USER ".$dbname." IDENTIFIED BY ".$password.$tablespace;
-		$sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO $dbname";
-		
-		return $sql;
-	}
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname ADD (";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		
-		$s .= implode(', ',$f).')';
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname MODIFY(";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		$s .= implode(', ',$f).')';
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if (!is_array($flds)) $flds = explode(',',$flds);
-		foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);
-		
-		$sql = array();
-		$s = "ALTER TABLE $tabname DROP(";
-		$s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	function _DropAutoIncrement($t)
-	{
-		if (strpos($t,'.') !== false) {
-			$tarr = explode('.',$t);
-			return "drop sequence ".$tarr[0].".seq_".$tarr[1];
-		}
-		return "drop sequence seq_".$t;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{
-		$suffix = '';
-		
-		if ($fdefault == "''" && $fnotnull) {// this is null in oracle
-			$fnotnull = false;
-			if ($this->debug) ADOConnection::outp("NOT NULL and DEFAULT='' illegal in Oracle");
-		}
-		
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		
-		if ($fautoinc) $this->seqField = $fname;
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
-		return $suffix;
-	}
-	
-/*
-CREATE or replace TRIGGER jaddress_insert
-before insert on jaddress
-for each row
-begin
-select seqaddress.nextval into :new.A_ID from dual;
-end;
-*/
-	function _Triggers($tabname,$tableoptions)
-	{
-		if (!$this->seqField) return array();
-		
-		if ($this->schema) {
-			$t = strpos($tabname,'.');
-			if ($t !== false) $tab = substr($tabname,$t+1);
-			else $tab = $tabname;
-			$seqname = $this->schema.'.'.$this->seqPrefix.$tab;
-			$trigname = $this->schema.'.'.$this->trigPrefix.$this->seqPrefix.$tab;
-		} else {
-			$seqname = $this->seqPrefix.$tabname;
-			$trigname = $this->trigPrefix.$seqname;
-		}
-		
-		if (strlen($seqname) > 30) {
-			$seqname = $this->seqPrefix.uniqid('');
-		} // end if
-		if (strlen($trigname) > 30) {
-			$trigname = $this->trigPrefix.uniqid('');
-		} // end if
-
-		if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE $seqname";
-		$seqCache = '';
-		if (isset($tableoptions['SEQUENCE_CACHE'])){$seqCache = $tableoptions['SEQUENCE_CACHE'];}
-		$seqIncr = '';
-		if (isset($tableoptions['SEQUENCE_INCREMENT'])){$seqIncr = ' INCREMENT BY '.$tableoptions['SEQUENCE_INCREMENT'];}
-		$seqStart = '';
-		if (isset($tableoptions['SEQUENCE_START'])){$seqIncr = ' START WITH '.$tableoptions['SEQUENCE_START'];}
-		$sql[] = "CREATE SEQUENCE $seqname $seqStart $seqIncr $seqCache";
-		$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField = 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
-		
-		$this->seqField = false;
-		return $sql;
-	}
-	
-	/*
-	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
-		[table_options] [select_statement]
-		create_definition:
-		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
-		[PRIMARY KEY] [reference_definition]
-		or PRIMARY KEY (index_col_name,...)
-		or KEY [index_name] (index_col_name,...)
-		or INDEX [index_name] (index_col_name,...)
-		or UNIQUE [INDEX] [index_name] (index_col_name,...)
-		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
-		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
-		[reference_definition]
-		or CHECK (expr)
-	*/
-	
-
-	
-	function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		if (isset($idxoptions['BITMAP'])) {
-			$unique = ' BITMAP'; 
-		} elseif (isset($idxoptions['UNIQUE'])) {
-			$unique = ' UNIQUE';
-		} else {
-			$unique = '';
-		}
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		if (isset($idxoptions['oci8']))
-			$s .= $idxoptions['oci8'];
-		
-
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	function GetCommentSQL($table,$col)
-	{
-		$table = $this->connection->qstr($table);
-		$col = $this->connection->qstr($col);	
-		return "select comments from USER_COL_COMMENTS where TABLE_NAME=$table and COLUMN_NAME=$col";
-	}
-	
-	function SetCommentSQL($table,$col,$cmt)
-	{
-		$cmt = $this->connection->qstr($cmt);
-		return  "COMMENT ON COLUMN $table.$col IS $cmt";
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-postgres.inc.php b/includes/adodb/datadict/datadict-postgres.inc.php
deleted file mode 100644
index eb76566e..00000000
--- a/includes/adodb/datadict/datadict-postgres.inc.php
+++ /dev/null
@@ -1,447 +0,0 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->unique && 
-			$fieldobj->has_default && substr($fieldobj->default_value,0,8) == 'nextval(';
-		
-		switch (strtoupper($t)) {
-			case 'INTERVAL':
-			case 'CHAR':
-			case 'CHARACTER':
-			case 'VARCHAR':
-			case 'NAME':
-	   		case 'BPCHAR':
-				if ($len <= $this->blobSize) return 'C';
-			
-			case 'TEXT':
-				return 'X';
-	
-			case 'IMAGE': // user defined type
-			case 'BLOB': // user defined type
-			case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
-			case 'VARBIT':
-			case 'BYTEA':
-				return 'B';
-			
-			case 'BOOL':
-			case 'BOOLEAN':
-				return 'L';
-			
-			case 'DATE':
-				return 'D';
-			
-			case 'TIME':
-			case 'DATETIME':
-			case 'TIMESTAMP':
-			case 'TIMESTAMPTZ':
-				return 'T';
-			
-			case 'INTEGER': return !$is_serial ? 'I' : 'R';
-			case 'SMALLINT': 
-			case 'INT2': return !$is_serial ? 'I2' : 'R';
-			case 'INT4': return !$is_serial ? 'I4' : 'R';
-			case 'BIGINT': 
-			case 'INT8': return !$is_serial ? 'I8' : 'R';
-				
-			case 'OID':
-			case 'SERIAL':
-				return 'R';
-			
-			case 'FLOAT4':
-			case 'FLOAT8':
-			case 'DOUBLE PRECISION':
-			case 'REAL':
-				return 'F';
-				
-			 default:
-			 	return 'N';
-		}
-	}
- 	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'TEXT';
-		
-		case 'C2': return 'VARCHAR';
-		case 'X2': return 'TEXT';
-		
-		case 'B': return 'BYTEA';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
-		
-		case 'L': return 'BOOLEAN';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'INT2';
-		case 'I4': return 'INT4';
-		case 'I8': return 'INT8';
-		
-		case 'F': return 'FLOAT8';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	/**
-	 * Adding a new Column 
-	 *
-	 * reimplementation of the default function as postgres does NOT allow to set the default in the same statement
-	 *
-	 * @param string $tabname table-name
-	 * @param string $flds column-names and types for the changed columns
-	 * @return array with SQL strings
-	 */
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-		foreach($lines as $v) {
-			if (($not_null = preg_match('/NOT NULL/i',$v))) {
-				$v = preg_replace('/NOT NULL/i','',$v);
-			}
-			if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
-				list(,$colname,$default) = $matches;
-				$sql[] = $alter . str_replace('DEFAULT '.$default,'',$v);
-				$sql[] = 'UPDATE '.$tabname.' SET '.$colname.'='.$default;
-				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-			} else {				
-				$sql[] = $alter . $v;
-			}
-			if ($not_null) {
-				list($colname) = explode(' ',$v);
-				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
-			}
-		}
-		return $sql;
-	}
-
-
-	function DropIndexSQL ($idxname, $tabname = NULL)
-	{
-	   return array(sprintf($this->dropIndex, $this->TableName($idxname), $this->TableName($tabname)));
-	}
-	
-	/**
-	 * Change the definition of one column
-	 *
-	 * Postgres can't do that on it's own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	 /*
-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		if (!$tableflds) {
-			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
-			return array();
-		}
-		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
-	}*/
-	
-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-	   // Check if alter single column datatype available - works with 8.0+
-	   $has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
-	
-	   if ($has_alter_column) {
-	      $tabname = $this->TableName($tabname);
-	      $sql = array();
-	      list($lines,$pkey) = $this->_GenFields($flds);
-	      $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
-	      foreach($lines as $v) {
-	         if ($not_null = preg_match('/NOT NULL/i',$v)) {
-	            $v = preg_replace('/NOT NULL/i','',$v);
-	         }
-	         // this next block doesn't work - there is no way that I can see to 
-	         // explicitly ask a column to be null using $flds
-	         else if ($set_null = preg_match('/NULL/i',$v)) {
-	            // if they didn't specify not null, see if they explicitely asked for null
-	            $v = preg_replace('/\sNULL/i','',$v);
-	         }
-	         
-	         if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
-	            list(,$colname,$default) = $matches;
-	            $v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v);
-	            $sql[] = $alter . $colname . ' TYPE ' . str_replace('DEFAULT '.$default,'',$v);
-	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-	         } 
-	         else {
-	            // drop default?
-	            preg_match ('/^\s*(\S+)\s+(.*)$/',$v,$matches);
-	            list (,$colname,$rest) = $matches;
-	            $sql[] = $alter . $colname . ' TYPE ' . $rest;
-	         }
-	
-	         list($colname) = explode(' ',$v);
-	         if ($not_null) {
-	            // this does not error out if the column is already not null
-	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
-	         }
-	         if ($set_null) {
-	            // this does not error out if the column is already null
-	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' DROP NOT NULL';
-	         }
-	      }
-	      return $sql;
-	   }
-	
-	   // does not have alter column
-	   if (!$tableflds) {
-	      if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
-	      return array();
-	   }
-	   return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
-	}
-	
-	/**
-	 * Drop one column
-	 *
-	 * Postgres < 7.3 can't do that on it's own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		$has_drop_column = 7.3 <= (float) @$this->serverInfo['version'];
-		if (!$has_drop_column && !$tableflds) {
-			if ($this->debug) ADOConnection::outp("DropColumnSQL needs complete table-definiton for PostgreSQL < 7.3");
-		return array();
-	}
-		if ($has_drop_column) {
-			return ADODB_DataDict::DropColumnSQL($tabname, $flds);
-		}
-		return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
-	}
-	
-	/**
-	 * Save the content into a temp. table, drop and recreate the original table and copy the content back in
-	 *
-	 * We also take care to set the values of the sequenz and recreate the indexes.
-	 * All this is done in a transaction, to not loose the content of the table, if something went wrong!
-	 * @internal
-	 * @param string $tabname table-name
-	 * @param string $dropflds column-names to drop
-	 * @param string $tableflds complete defintion of the new table, eg. for postgres
-	 * @param array/string $tableoptions options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function _recreate_copy_table($tabname,$dropflds,$tableflds,$tableoptions='')
-	{
-		if ($dropflds && !is_array($dropflds)) $dropflds = explode(',',$dropflds);
-		$copyflds = array();
-		foreach($this->MetaColumns($tabname) as $fld) {
-			if (!$dropflds || !in_array($fld->name,$dropflds)) {
-				// we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
-				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) && 
-					in_array($fld->type,array('varchar','char','text','bytea'))) {
-					$copyflds[] = "to_number($fld->name,'S9999999999999D99')";
-				} else {
-					$copyflds[] = $fld->name;
-				}
-				// identify the sequence name and the fld its on
-				if ($fld->primary_key && $fld->has_default && 
-					preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
-					$seq_name = $matches[1];
-					$seq_fld = $fld->name;
-				}
-			}
-		}
-		$copyflds = implode(', ',$copyflds);
-		
-		$tempname = $tabname.'_tmp';
-		$aSql[] = 'BEGIN';		// we use a transaction, to make sure not to loose the content of the table
-		$aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM $tabname";
-		$aSql = array_merge($aSql,$this->DropTableSQL($tabname));
-		$aSql = array_merge($aSql,$this->CreateTableSQL($tabname,$tableflds,$tableoptions));
-		$aSql[] = "INSERT INTO $tabname SELECT $copyflds FROM $tempname";
-		if ($seq_name && $seq_fld) {	// if we have a sequence we need to set it again
-			$seq_name = $tabname.'_'.$seq_fld.'_seq';	// has to be the name of the new implicit sequence
-			$aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) FROM $tabname";
-		}
-		$aSql[] = "DROP TABLE $tempname";
-		// recreate the indexes, if they not contain one of the droped columns
-		foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data)
-		{
-			if (substr($idx_name,-5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds,$idx_data['columns'])))) {
-				$aSql = array_merge($aSql,$this->CreateIndexSQL($idx_name,$tabname,$idx_data['columns'],
-					$idx_data['unique'] ? array('UNIQUE') : False));
-			}
-		}
-		$aSql[] = 'COMMIT';
-		return $aSql;
-	}
-	
-	function DropTableSQL($tabname)
-	{
-		$sql = ADODB_DataDict::DropTableSQL($tabname);
-		
-		$drop_seq = $this->_DropAutoIncrement($tabname);
-		if ($drop_seq) $sql[] = $drop_seq;
-		
-		return $sql;
-	}
-
-	// return string must begin with space
-	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{
-		if ($fautoinc) {
-			$ftype = 'SERIAL';
-			return '';
-		}
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	// search for a sequece for the given table (asumes the seqence-name contains the table-name!)
-	// if yes return sql to drop it
-	// this is still necessary if postgres < 7.3 or the SERIAL was created on an earlier version!!!
-	function _DropAutoIncrement($tabname)
-	{
-		$tabname = $this->connection->quote('%'.$tabname.'%');
-
-		$seq = $this->connection->GetOne("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'");
-
-		// check if a tables depends on the sequenz and it therefor cant and dont need to be droped separatly
-		if (!$seq || $this->connection->GetOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND deptype='i'")) {
-			return False;
-		}
-		return "DROP SEQUENCE ".$seq;
-	}
-	
-	function RenameTableSQL($tabname,$newname)
-	{
-		if (!empty($this->schema)) {
-			$rename_from = $this->TableName($tabname);
-			$schema_save = $this->schema;
-			$this->schema = false;
-			$rename_to = $this->TableName($newname);
-			$this->schema = $schema_save;
-			return array (sprintf($this->renameTable, $rename_from, $rename_to));
-		}
-
-		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
-	}
-	
-	/*
-	CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
-	{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [, ... ] ]
-	| table_constraint } [, ... ]
-	)
-	[ INHERITS ( parent_table [, ... ] ) ]
-	[ WITH OIDS | WITHOUT OIDS ]
-	where column_constraint is:
-	[ CONSTRAINT constraint_name ]
-	{ NOT NULL | NULL | UNIQUE | PRIMARY KEY |
-	CHECK (expression) |
-	REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL ]
-	[ ON DELETE action ] [ ON UPDATE action ] }
-	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
-	and table_constraint is:
-	[ CONSTRAINT constraint_name ]
-	{ UNIQUE ( column_name [, ... ] ) |
-	PRIMARY KEY ( column_name [, ... ] ) |
-	CHECK ( expression ) |
-	FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn [, ... ] ) ]
-	[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
-	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
-	*/
-	
-	
-	/*
-	CREATE [ UNIQUE ] INDEX index_name ON table
-[ USING acc_method ] ( column [ ops_name ] [, ...] )
-[ WHERE predicate ]
-CREATE [ UNIQUE ] INDEX index_name ON table
-[ USING acc_method ] ( func_name( column [, ... ]) [ ops_name ] )
-[ WHERE predicate ]
-	*/
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
-		
-		if (isset($idxoptions['HASH']))
-			$s .= 'USING HASH ';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s .= '(' . $flds . ')';
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	function _GetSize($ftype, $ty, $fsize, $fprec)
-	{
-		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && $ty  != 'I' && strpos($ftype,'(') === false) {
-			$ftype .= "(".$fsize;
-			if (strlen($fprec)) $ftype .= ",".$fprec;
-			$ftype .= ')';
-		}
-		return $ftype;
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-postgres.inc.php.bak b/includes/adodb/datadict/datadict-postgres.inc.php.bak
deleted file mode 100644
index ce63858a..00000000
--- a/includes/adodb/datadict/datadict-postgres.inc.php.bak
+++ /dev/null
@@ -1,441 +0,0 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->unique && 
-			$fieldobj->has_default && substr($fieldobj->default_value,0,8) == 'nextval(';
-		
-		switch (strtoupper($t)) {
-			case 'INTERVAL':
-			case 'CHAR':
-			case 'CHARACTER':
-			case 'VARCHAR':
-			case 'NAME':
-	   		case 'BPCHAR':
-				if ($len <= $this->blobSize) return 'C';
-			
-			case 'TEXT':
-				return 'X';
-	
-			case 'IMAGE': // user defined type
-			case 'BLOB': // user defined type
-			case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
-			case 'VARBIT':
-			case 'BYTEA':
-				return 'B';
-			
-			case 'BOOL':
-			case 'BOOLEAN':
-				return 'L';
-			
-			case 'DATE':
-				return 'D';
-			
-			case 'TIME':
-			case 'DATETIME':
-			case 'TIMESTAMP':
-			case 'TIMESTAMPTZ':
-				return 'T';
-			
-			case 'INTEGER': return !$is_serial ? 'I' : 'R';
-			case 'SMALLINT': 
-			case 'INT2': return !$is_serial ? 'I2' : 'R';
-			case 'INT4': return !$is_serial ? 'I4' : 'R';
-			case 'BIGINT': 
-			case 'INT8': return !$is_serial ? 'I8' : 'R';
-				
-			case 'OID':
-			case 'SERIAL':
-				return 'R';
-			
-			case 'FLOAT4':
-			case 'FLOAT8':
-			case 'DOUBLE PRECISION':
-			case 'REAL':
-				return 'F';
-				
-			 default:
-			 	return 'N';
-		}
-	}
- 	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'TEXT';
-		
-		case 'C2': return 'VARCHAR';
-		case 'X2': return 'TEXT';
-		
-		case 'B': return 'BYTEA';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
-		
-		case 'L': return 'BOOLEAN';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'INT2';
-		case 'I4': return 'INT4';
-		case 'I8': return 'INT8';
-		
-		case 'F': return 'FLOAT8';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	/**
-	 * Adding a new Column 
-	 *
-	 * reimplementation of the default function as postgres does NOT allow to set the default in the same statement
-	 *
-	 * @param string $tabname table-name
-	 * @param string $flds column-names and types for the changed columns
-	 * @return array with SQL strings
-	 */
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-		foreach($lines as $v) {
-			if (($not_null = preg_match('/NOT NULL/i',$v))) {
-				$v = preg_replace('/NOT NULL/i','',$v);
-			}
-			if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
-				list(,$colname,$default) = $matches;
-				$sql[] = $alter . str_replace('DEFAULT '.$default,'',$v);
-				$sql[] = 'UPDATE '.$tabname.' SET '.$colname.'='.$default;
-				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-			} else {				
-				$sql[] = $alter . $v;
-			}
-			if ($not_null) {
-				list($colname) = explode(' ',$v);
-				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
-			}
-		}
-		return $sql;
-	}
-	
-	/**
-	 * Change the definition of one column
-	 *
-	 * Postgres can't do that on it's own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	 /*
-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		if (!$tableflds) {
-			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
-			return array();
-		}
-		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
-	}*/
-	
-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-	   // Check if alter single column datatype available - works with 8.0+
-	   $has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
-	
-	   if ($has_alter_column) {
-	      $tabname = $this->TableName($tabname);
-	      $sql = array();
-	      list($lines,$pkey) = $this->_GenFields($flds);
-	      $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
-	      foreach($lines as $v) {
-	         if ($not_null = preg_match('/NOT NULL/i',$v)) {
-	            $v = preg_replace('/NOT NULL/i','',$v);
-	         }
-	         // this next block doesn't work - there is no way that I can see to 
-	         // explicitly ask a column to be null using $flds
-	         else if ($set_null = preg_match('/NULL/i',$v)) {
-	            // if they didn't specify not null, see if they explicitely asked for null
-	            $v = preg_replace('/\sNULL/i','',$v);
-	         }
-	         
-	         if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
-	            list(,$colname,$default) = $matches;
-	            $v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v);
-	            $sql[] = $alter . $colname . ' TYPE ' . str_replace('DEFAULT '.$default,'',$v);
-	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-	         } 
-	         else {
-	            // drop default?
-	            preg_match ('/^\s*(\S+)\s+(.*)$/',$v,$matches);
-	            list (,$colname,$rest) = $matches;
-	            $sql[] = $alter . $colname . ' TYPE ' . $rest;
-	         }
-	
-	         list($colname) = explode(' ',$v);
-	         if ($not_null) {
-	            // this does not error out if the column is already not null
-	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
-	         }
-	         if ($set_null) {
-	            // this does not error out if the column is already null
-	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' DROP NOT NULL';
-	         }
-	      }
-	      return $sql;
-	   }
-	
-	   // does not have alter column
-	   if (!$tableflds) {
-	      if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
-	      return array();
-	   }
-	   return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
-	}
-	
-	/**
-	 * Drop one column
-	 *
-	 * Postgres < 7.3 can't do that on it's own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		$has_drop_column = 7.3 <= (float) @$this->serverInfo['version'];
-		if (!$has_drop_column && !$tableflds) {
-			if ($this->debug) ADOConnection::outp("DropColumnSQL needs complete table-definiton for PostgreSQL < 7.3");
-		return array();
-	}
-		if ($has_drop_column) {
-			return ADODB_DataDict::DropColumnSQL($tabname, $flds);
-		}
-		return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
-	}
-	
-	/**
-	 * Save the content into a temp. table, drop and recreate the original table and copy the content back in
-	 *
-	 * We also take care to set the values of the sequenz and recreate the indexes.
-	 * All this is done in a transaction, to not loose the content of the table, if something went wrong!
-	 * @internal
-	 * @param string $tabname table-name
-	 * @param string $dropflds column-names to drop
-	 * @param string $tableflds complete defintion of the new table, eg. for postgres
-	 * @param array/string $tableoptions options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function _recreate_copy_table($tabname,$dropflds,$tableflds,$tableoptions='')
-	{
-		if ($dropflds && !is_array($dropflds)) $dropflds = explode(',',$dropflds);
-		$copyflds = array();
-		foreach($this->MetaColumns($tabname) as $fld) {
-			if (!$dropflds || !in_array($fld->name,$dropflds)) {
-				// we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
-				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) && 
-					in_array($fld->type,array('varchar','char','text','bytea'))) {
-					$copyflds[] = "to_number($fld->name,'S9999999999999D99')";
-				} else {
-					$copyflds[] = $fld->name;
-				}
-				// identify the sequence name and the fld its on
-				if ($fld->primary_key && $fld->has_default && 
-					preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
-					$seq_name = $matches[1];
-					$seq_fld = $fld->name;
-				}
-			}
-		}
-		$copyflds = implode(', ',$copyflds);
-		
-		$tempname = $tabname.'_tmp';
-		$aSql[] = 'BEGIN';		// we use a transaction, to make sure not to loose the content of the table
-		$aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM $tabname";
-		$aSql = array_merge($aSql,$this->DropTableSQL($tabname));
-		$aSql = array_merge($aSql,$this->CreateTableSQL($tabname,$tableflds,$tableoptions));
-		$aSql[] = "INSERT INTO $tabname SELECT $copyflds FROM $tempname";
-		if ($seq_name && $seq_fld) {	// if we have a sequence we need to set it again
-			$seq_name = $tabname.'_'.$seq_fld.'_seq';	// has to be the name of the new implicit sequence
-			$aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) FROM $tabname";
-		}
-		$aSql[] = "DROP TABLE $tempname";
-		// recreate the indexes, if they not contain one of the droped columns
-		foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data)
-		{
-			if (substr($idx_name,-5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds,$idx_data['columns'])))) {
-				$aSql = array_merge($aSql,$this->CreateIndexSQL($idx_name,$tabname,$idx_data['columns'],
-					$idx_data['unique'] ? array('UNIQUE') : False));
-			}
-		}
-		$aSql[] = 'COMMIT';
-		return $aSql;
-	}
-	
-	function DropTableSQL($tabname)
-	{
-		$sql = ADODB_DataDict::DropTableSQL($tabname);
-		
-		$drop_seq = $this->_DropAutoIncrement($tabname);
-		if ($drop_seq) $sql[] = $drop_seq;
-		
-		return $sql;
-	}
-
-	// return string must begin with space
-	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{
-		if ($fautoinc) {
-			$ftype = 'SERIAL';
-			return '';
-		}
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	// search for a sequece for the given table (asumes the seqence-name contains the table-name!)
-	// if yes return sql to drop it
-	// this is still necessary if postgres < 7.3 or the SERIAL was created on an earlier version!!!
-	function _DropAutoIncrement($tabname)
-	{
-		$tabname = $this->connection->quote('%'.$tabname.'%');
-
-		$seq = $this->connection->GetOne("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'");
-
-		// check if a tables depends on the sequenz and it therefor cant and dont need to be droped separatly
-		if (!$seq || $this->connection->GetOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND deptype='i'")) {
-			return False;
-		}
-		return "DROP SEQUENCE ".$seq;
-	}
-	
-	function RenameTableSQL($tabname,$newname)
-	{
-		if (!empty($this->schema)) {
-			$rename_from = $this->TableName($tabname);
-			$schema_save = $this->schema;
-			$this->schema = false;
-			$rename_to = $this->TableName($newname);
-			$this->schema = $schema_save;
-			return array (sprintf($this->renameTable, $rename_from, $rename_to));
-		}
-
-		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
-	}
-	
-	/*
-	CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
-	{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [, ... ] ]
-	| table_constraint } [, ... ]
-	)
-	[ INHERITS ( parent_table [, ... ] ) ]
-	[ WITH OIDS | WITHOUT OIDS ]
-	where column_constraint is:
-	[ CONSTRAINT constraint_name ]
-	{ NOT NULL | NULL | UNIQUE | PRIMARY KEY |
-	CHECK (expression) |
-	REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL ]
-	[ ON DELETE action ] [ ON UPDATE action ] }
-	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
-	and table_constraint is:
-	[ CONSTRAINT constraint_name ]
-	{ UNIQUE ( column_name [, ... ] ) |
-	PRIMARY KEY ( column_name [, ... ] ) |
-	CHECK ( expression ) |
-	FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn [, ... ] ) ]
-	[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
-	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
-	*/
-	
-	
-	/*
-	CREATE [ UNIQUE ] INDEX index_name ON table
-[ USING acc_method ] ( column [ ops_name ] [, ...] )
-[ WHERE predicate ]
-CREATE [ UNIQUE ] INDEX index_name ON table
-[ USING acc_method ] ( func_name( column [, ... ]) [ ops_name ] )
-[ WHERE predicate ]
-	*/
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
-		
-		if (isset($idxoptions['HASH']))
-			$s .= 'USING HASH ';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s .= '(' . $flds . ')';
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	function _GetSize($ftype, $ty, $fsize, $fprec)
-	{
-		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && $ty  != 'I' && strpos($ftype,'(') === false) {
-			$ftype .= "(".$fsize;
-			if (strlen($fprec)) $ftype .= ",".$fprec;
-			$ftype .= ')';
-		}
-		return $ftype;
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-sapdb.inc.php b/includes/adodb/datadict/datadict-sapdb.inc.php
deleted file mode 100644
index d9006296..00000000
--- a/includes/adodb/datadict/datadict-sapdb.inc.php
+++ /dev/null
@@ -1,121 +0,0 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		static $maxdb_type2adodb = array(
-			'VARCHAR'	=> 'C',
-			'CHARACTER'	=> 'C',
-			'LONG'		=> 'X',		// no way to differ between 'X' and 'B' :-(
-			'DATE'		=> 'D',
-			'TIMESTAMP'	=> 'T',
-			'BOOLEAN'	=> 'L',
-			'INTEGER'	=> 'I4',
-			'SMALLINT'	=> 'I2',
-			'FLOAT'		=> 'F',
-			'FIXED'		=> 'N',
-		);
-		$type = isset($maxdb_type2adodb[$t]) ? $maxdb_type2adodb[$t] : 'C';
-
-		// convert integer-types simulated with fixed back to integer
-		if ($t == 'FIXED' && !$fieldobj->scale && ($len == 20 || $len == 3)) {
-			$type = $len == 20 ? 'I8' : 'I1';
-		}
-		if ($fieldobj->auto_increment) $type = 'R';
-
-		return $type;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
-		$suffix = '';
-		if ($funsigned) $suffix .= ' UNSIGNED';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fautoinc) $suffix .= ' DEFAULT SERIAL';
-		elseif (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		return array( 'ALTER TABLE ' . $tabname . ' ADD (' . implode(', ',$lines) . ')' );
-	}
-	
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		return array( 'ALTER TABLE ' . $tabname . ' MODIFY (' . implode(', ',$lines) . ')' );
-	}
-
-	function DropColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds)) $flds = explode(',',$flds);
-		foreach($flds as $k => $v) {
-			$flds[$k] = $this->NameQuote($v);
-		}
-		return array( 'ALTER TABLE ' . $tabname . ' DROP (' . implode(', ',$flds) . ')' );
-	}	
-}
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/datadict/datadict-sybase.inc.php b/includes/adodb/datadict/datadict-sybase.inc.php
deleted file mode 100644
index 5d6f5629..00000000
--- a/includes/adodb/datadict/datadict-sybase.inc.php
+++ /dev/null
@@ -1,228 +0,0 @@
-type;
-			$len = $fieldobj->max_length;
-		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-
-		case 'INT': 
-		case 'INTEGER': return  'I';
-		case 'BIT':
-		case 'TINYINT': return  'I1';
-		case 'SMALLINT': return 'I2';
-		case 'BIGINT':  return  'I8';
-		
-		case 'REAL':
-		case 'FLOAT': return 'F';
-		default: return parent::MetaType($t,$len,$fieldobj);
-		}
-	}
-	
-	function ActualType($meta)
-	{
-		switch(strtoupper($meta)) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'TEXT';
-		
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'NTEXT';
-		
-		case 'B': return 'IMAGE';
-			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
-		case 'L': return 'BIT';
-		
-		case 'I': return 'INT'; 
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INT';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'REAL';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname $this->addCol";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		$s .= implode(', ',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		foreach($lines as $v) {
-			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
-		}
-
-		return $sql;
-	}
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName($tabname);
-		if (!is_array($flds)) $flds = explode(',',$flds);
-		$f = array();
-		$s = "ALTER TABLE $tabname";
-		foreach($flds as $v) {
-			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
-		}
-		$s .= implode(', ',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		else if ($suffix == '') $suffix .= ' NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
-        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
-
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
-
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
-
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
-        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
-
-
-	*/
-	
-	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
-		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
-		}
-*/
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-
-		$sql[] = $s;
-		
-		return $sql;
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-access.inc.php b/includes/adodb/drivers/adodb-access.inc.php
deleted file mode 100644
index 59a6fa9e..00000000
--- a/includes/adodb/drivers/adodb-access.inc.php
+++ /dev/null
@@ -1,87 +0,0 @@
-ADODB_odbc();
-	}
-	
-	function Time()
-	{
-		return time();
-	}
-	
-	function BeginTrans() { return false;}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " IIF(IsNull($field), $ifNull, $field) "; // if Access
-	}
-/*
-	function MetaTables()
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = odbc_tables($this->_connectionID);
-		$rs = new ADORecordSet_odbc($qid);
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) return false;
-		
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr = $rs->GetArray();
-		//print_pre($arr);
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][2] && $arr[$i][3] != 'SYSTEM TABLE')
-				$arr2[] = $arr[$i][2];
-		}
-		return $arr2;
-	}*/
-}
-
- 
-class  ADORecordSet_access extends ADORecordSet_odbc {	
-	
-	var $databaseType = "access";		
-	
-	function ADORecordSet_access($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}
-}// class
-} 
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-ado.inc.php b/includes/adodb/drivers/adodb-ado.inc.php
deleted file mode 100644
index 75ea4c3a..00000000
--- a/includes/adodb/drivers/adodb-ado.inc.php
+++ /dev/null
@@ -1,644 +0,0 @@
-_affectedRows = new VARIANT;
-	}
-
-	function ServerInfo()
-	{
-		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
-		return array('description' => $desc, 'version' => '');
-	}
-	
-	function _affectedrows()
-	{
-		if (PHP_VERSION >= 5) return $this->_affectedRows;
-		
-		return $this->_affectedRows->value;
-	}
-	
-	// you can also pass a connection string like this:
-	//
-	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
-	function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDASQL')
-	{
-		$u = 'UID';
-		$p = 'PWD';
-	
-		if (!empty($this->charPage))
-			$dbc = new COM('ADODB.Connection',null,$this->charPage);
-		else
-			$dbc = new COM('ADODB.Connection');
-			
-		if (! $dbc) return false;
-
-		/* special support if provider is mssql or access */
-		if ($argProvider=='mssql') {
-			$u = 'User Id';  //User parameter name for OLEDB
-			$p = 'Password'; 
-			$argProvider = "SQLOLEDB"; // SQL Server Provider
-			
-			// not yet
-			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
-			
-			//use trusted conection for SQL if username not specified
-			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
-		} else if ($argProvider=='access')
-			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
-		
-		if ($argProvider) $dbc->Provider = $argProvider;	
-		
-		if ($argUsername) $argHostname .= ";$u=$argUsername";
-		if ($argPassword)$argHostname .= ";$p=$argPassword";
-		
-		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."
\n version=$dbc->version");
-		// @ added below for php 4.0.1 and earlier
-		@$dbc->Open((string) $argHostname);
-		
-		$this->_connectionID = $dbc;
-		
-		$dbc->CursorLocation = $this->_cursor_location;
-		return  $dbc->State > 0;
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
-	{
-		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
-	}	
-	
-/*
-	adSchemaCatalogs	= 1,
-	adSchemaCharacterSets	= 2,
-	adSchemaCollations	= 3,
-	adSchemaColumns	= 4,
-	adSchemaCheckConstraints	= 5,
-	adSchemaConstraintColumnUsage	= 6,
-	adSchemaConstraintTableUsage	= 7,
-	adSchemaKeyColumnUsage	= 8,
-	adSchemaReferentialContraints	= 9,
-	adSchemaTableConstraints	= 10,
-	adSchemaColumnsDomainUsage	= 11,
-	adSchemaIndexes	= 12,
-	adSchemaColumnPrivileges	= 13,
-	adSchemaTablePrivileges	= 14,
-	adSchemaUsagePrivileges	= 15,
-	adSchemaProcedures	= 16,
-	adSchemaSchemata	= 17,
-	adSchemaSQLLanguages	= 18,
-	adSchemaStatistics	= 19,
-	adSchemaTables	= 20,
-	adSchemaTranslations	= 21,
-	adSchemaProviderTypes	= 22,
-	adSchemaViews	= 23,
-	adSchemaViewColumnUsage	= 24,
-	adSchemaViewTableUsage	= 25,
-	adSchemaProcedureParameters	= 26,
-	adSchemaForeignKeys	= 27,
-	adSchemaPrimaryKeys	= 28,
-	adSchemaProcedureColumns	= 29,
-	adSchemaDBInfoKeywords	= 30,
-	adSchemaDBInfoLiterals	= 31,
-	adSchemaCubes	= 32,
-	adSchemaDimensions	= 33,
-	adSchemaHierarchies	= 34,
-	adSchemaLevels	= 35,
-	adSchemaMeasures	= 36,
-	adSchemaProperties	= 37,
-	adSchemaMembers	= 38
-
-*/
-	
-	function MetaTables()
-	{
-		$arr= array();
-		$dbc = $this->_connectionID;
-		
-		$adors=@$dbc->OpenSchema(20);//tables
-		if ($adors){
-			$f = $adors->Fields(2);//table/view name
-			$t = $adors->Fields(3);//table type
-			while (!$adors->EOF){
-				$tt=substr($t->value,0,6);
-				if ($tt!='SYSTEM' && $tt !='ACCESS')
-					$arr[]=$f->value;
-				//print $f->value . ' ' . $t->value.'
';
-				$adors->MoveNext();
-			}
-			$adors->Close();
-		}
-		
-		return $arr;
-	}
-	
-	function MetaColumns($table)
-	{
-		$table = strtoupper($table);
-		$arr = array();
-		$dbc = $this->_connectionID;
-		
-		$adors=@$dbc->OpenSchema(4);//tables
-	
-		if ($adors){
-			$t = $adors->Fields(2);//table/view name
-			while (!$adors->EOF){
-				
-				
-				if (strtoupper($t->Value) == $table) {
-				
-					$fld = new ADOFieldObject();
-					$c = $adors->Fields(3);
-					$fld->name = $c->Value;
-					$fld->type = 'CHAR'; // cannot discover type in ADO!
-					$fld->max_length = -1;
-					$arr[strtoupper($fld->name)]=$fld;
-				}
-		
-				$adors->MoveNext();
-			}
-			$adors->Close();
-		}
-		$false = false;
-		return empty($arr) ? $false : $arr;
-	}
-	
-
-
-	
-	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
-	{
-		
-		$dbc = $this->_connectionID;
-		$false = false;
-		
-	//	return rs	
-		if ($inputarr) {
-			
-			if (!empty($this->charPage))
-				$oCmd = new COM('ADODB.Command',null,$this->charPage);
-			else
-				$oCmd = new COM('ADODB.Command');
-			$oCmd->ActiveConnection = $dbc;
-			$oCmd->CommandText = $sql;
-			$oCmd->CommandType = 1;
-
-			foreach($inputarr as $val) {
-				// name, type, direction 1 = input, len,
-				$this->adoParameterType = 130;
-				$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,strlen($val),$val);
-				//print $p->Type.' '.$p->value;
-				$oCmd->Parameters->Append($p);
-			}
-			$p = false;
-			$rs = $oCmd->Execute();
-			$e = $dbc->Errors;
-			if ($dbc->Errors->Count > 0) return $false;
-			return $rs;
-		}
-		
-		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
-
-		if ($dbc->Errors->Count > 0) return $false;
-		if (! $rs) return $false;
-		
-		if ($rs->State == 0) {
-			$true = true;
-			return $true; // 0 = adStateClosed means no records returned
-		}
-		return $rs;
-	}
-
-	
-	function BeginTrans() 
-	{ 
-		if ($this->transOff) return true;
-		
-		if (isset($this->_thisTransactions))
-			if (!$this->_thisTransactions) return false;
-		else {
-			$o = $this->_connectionID->Properties("Transaction DDL");
-			$this->_thisTransactions = $o ? true : false;
-			if (!$o) return false;
-		}
-		@$this->_connectionID->BeginTrans();
-		$this->transCnt += 1;
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		
-		@$this->_connectionID->CommitTrans();
-		if ($this->transCnt) @$this->transCnt -= 1;
-		return true;
-	}
-	function RollbackTrans() {
-		if ($this->transOff) return true;
-		@$this->_connectionID->RollbackTrans();
-		if ($this->transCnt) @$this->transCnt -= 1;
-		return true;
-	}
-	
-	/*	Returns: the last error message from previous database operation	*/	
-
-	function ErrorMsg() 
-	{
-		if (!$this->_connectionID) return "No connection established";
-		$errc = $this->_connectionID->Errors;
-		if (!$errc) return "No Errors object found";
-		if ($errc->Count == 0) return '';
-		$err = $errc->Item($errc->Count-1);
-		return $err->Description;
-	}
-	
-	function ErrorNo() 
-	{
-		$errc = $this->_connectionID->Errors;
-		if ($errc->Count == 0) return 0;
-		$err = $errc->Item($errc->Count-1);
-		return $err->NativeError;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		if ($this->_connectionID) $this->_connectionID->Close();
-		$this->_connectionID = false;
-		return true;
-	}
-	
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_ado extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "ado";	
-	var $dataProvider = "ado";	
-	var $_tarr = false; // caches the types
-	var $_flds; // and field objects
-	var $canSeek = true;
-  	var $hideErrors = true;
-		  
-	function ADORecordSet_ado($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id,$mode);
-	}
-
-
-	// returns the field object
-	function FetchField($fieldOffset = -1) {
-		$off=$fieldOffset+1; // offsets begin at 1
-		
-		$o= new ADOFieldObject();
-		$rs = $this->_queryID;
-		$f = $rs->Fields($fieldOffset);
-		$o->name = $f->Name;
-		$t = $f->Type;
-		$o->type = $this->MetaType($t);
-		$o->max_length = $f->DefinedSize;
-		$o->ado_type = $t;	
-
-		//print "off=$off name=$o->name type=$o->type len=$o->max_length
";
-		return $o;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-		
-	function _initrs()
-	{
-		$rs = $this->_queryID;
-		$this->_numOfRows = $rs->RecordCount;
-		
-		$f = $rs->Fields;
-		$this->_numOfFields = $f->Count;
-	}
-	
-	
-	 // should only be used to move forward as we normally use forward-only cursors
-	function _seek($row)
-	{
-	   $rs = $this->_queryID; 
-		// absoluteposition doesn't work -- my maths is wrong ?
-		//	$rs->AbsolutePosition->$row-2;
-		//	return true;
-		if ($this->_currentRow > $row) return false;
-		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
-		return true;
-	}
-	
-/*
-	OLEDB types
-	
-	 enum DBTYPEENUM
-	{	DBTYPE_EMPTY	= 0,
-	DBTYPE_NULL	= 1,
-	DBTYPE_I2	= 2,
-	DBTYPE_I4	= 3,
-	DBTYPE_R4	= 4,
-	DBTYPE_R8	= 5,
-	DBTYPE_CY	= 6,
-	DBTYPE_DATE	= 7,
-	DBTYPE_BSTR	= 8,
-	DBTYPE_IDISPATCH	= 9,
-	DBTYPE_ERROR	= 10,
-	DBTYPE_BOOL	= 11,
-	DBTYPE_VARIANT	= 12,
-	DBTYPE_IUNKNOWN	= 13,
-	DBTYPE_DECIMAL	= 14,
-	DBTYPE_UI1	= 17,
-	DBTYPE_ARRAY	= 0x2000,
-	DBTYPE_BYREF	= 0x4000,
-	DBTYPE_I1	= 16,
-	DBTYPE_UI2	= 18,
-	DBTYPE_UI4	= 19,
-	DBTYPE_I8	= 20,
-	DBTYPE_UI8	= 21,
-	DBTYPE_GUID	= 72,
-	DBTYPE_VECTOR	= 0x1000,
-	DBTYPE_RESERVED	= 0x8000,
-	DBTYPE_BYTES	= 128,
-	DBTYPE_STR	= 129,
-	DBTYPE_WSTR	= 130,
-	DBTYPE_NUMERIC	= 131,
-	DBTYPE_UDT	= 132,
-	DBTYPE_DBDATE	= 133,
-	DBTYPE_DBTIME	= 134,
-	DBTYPE_DBTIMESTAMP	= 135
-	
-	ADO Types
-	
-   	adEmpty	= 0,
-	adTinyInt	= 16,
-	adSmallInt	= 2,
-	adInteger	= 3,
-	adBigInt	= 20,
-	adUnsignedTinyInt	= 17,
-	adUnsignedSmallInt	= 18,
-	adUnsignedInt	= 19,
-	adUnsignedBigInt	= 21,
-	adSingle	= 4,
-	adDouble	= 5,
-	adCurrency	= 6,
-	adDecimal	= 14,
-	adNumeric	= 131,
-	adBoolean	= 11,
-	adError	= 10,
-	adUserDefined	= 132,
-	adVariant	= 12,
-	adIDispatch	= 9,
-	adIUnknown	= 13,	
-	adGUID	= 72,
-	adDate	= 7,
-	adDBDate	= 133,
-	adDBTime	= 134,
-	adDBTimeStamp	= 135,
-	adBSTR	= 8,
-	adChar	= 129,
-	adVarChar	= 200,
-	adLongVarChar	= 201,
-	adWChar	= 130,
-	adVarWChar	= 202,
-	adLongVarWChar	= 203,
-	adBinary	= 128,
-	adVarBinary	= 204,
-	adLongVarBinary	= 205,
-	adChapter	= 136,
-	adFileTime	= 64,
-	adDBFileTime	= 137,
-	adPropVariant	= 138,
-	adVarNumeric	= 139
-*/
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		if (!is_numeric($t)) return $t;
-		
-		switch ($t) {
-		case 0:
-		case 12: // variant
-		case 8: // bstr
-		case 129: //char
-		case 130: //wc
-		case 200: // varc
-		case 202:// varWC
-		case 128: // bin
-		case 204: // varBin
-		case 72: // guid
-			if ($len <= $this->blobSize) return 'C';
-		
-		case 201:
-		case 203:
-			return 'X';
-		case 128:
-		case 204:
-		case 205:
-			 return 'B';
-		case 7:
-		case 133: return 'D';
-		
-		case 134:
-		case 135: return 'T';
-		
-		case 11: return 'L';
-		
-		case 16://	adTinyInt	= 16,
-		case 2://adSmallInt	= 2,
-		case 3://adInteger	= 3,
-		case 4://adBigInt	= 20,
-		case 17://adUnsignedTinyInt	= 17,
-		case 18://adUnsignedSmallInt	= 18,
-		case 19://adUnsignedInt	= 19,
-		case 20://adUnsignedBigInt	= 21,
-			return 'I';
-		default: return 'N';
-		}
-	}
-	
-	// time stamp not supported yet
-	function _fetch()
-	{	
-		$rs = $this->_queryID;
-		if (!$rs or $rs->EOF) {
-			$this->fields = false;
-			return false;
-		}
-		$this->fields = array();
-	
-		if (!$this->_tarr) {
-			$tarr = array();
-			$flds = array();
-			for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
-				$f = $rs->Fields($i);
-				$flds[] = $f;
-				$tarr[] = $f->Type;
-			}
-			// bind types and flds only once
-			$this->_tarr = $tarr; 
-			$this->_flds = $flds;
-		}
-		$t = reset($this->_tarr);
-		$f = reset($this->_flds);
-		
-		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
-		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
-			//echo "
",$t,' ';var_dump($f->value); echo '
';
-			switch($t) {
-			case 135: // timestamp
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
-						// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
-						$val=(float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
-					else 
-						$val = $f->value;
-					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;			
-			case 133:// A date value (yyyymmdd) 
-				if ($val = $f->value) {
-					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
-				} else
-					$this->fields[] = false;
-				break;
-			case 7: // adDate
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
-					else $val = $f->value;
-					
-					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
-					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;
-			case 1: // null
-				$this->fields[] = false;
-				break;
-			case 6: // currency is not supported properly;
-				ADOConnection::outp( ''.$f->Name.': currency type not supported by PHP');
-				$this->fields[] = (float) $f->value;
-				break;
-			case 11: //BIT;
-				$val = "";
-				if(is_bool($f->value))	{
-					if($f->value==true) $val = 1;
-					else $val = 0;
-				}
-				if(is_null($f->value)) $val = null;
-				
-				$this->fields[] = $val;
-				break;
-			default:
-				$this->fields[] = $f->value; 
-				break;
-			}
-			//print " $f->value $t, ";
-			$f = next($this->_flds);
-			$t = next($this->_tarr);
-		} // for
-		if ($this->hideErrors) error_reporting($olde);
-		@$rs->MoveNext(); // @ needed for some versions of PHP!
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-		}
-		return true;
-	}
-	
-		function NextRecordSet()
-		{
-			$rs = $this->_queryID;
-			$this->_queryID = $rs->NextRecordSet();
-			//$this->_queryID = $this->_QueryId->NextRecordSet();
-			if ($this->_queryID == null) return false;
-			
-			$this->_currentRow = -1;
-			$this->_currentPage = -1;
-			$this->bind = false;
-			$this->fields = false;
-			$this->_flds = false;
-			$this->_tarr = false;
-			
-			$this->_inited = false;
-			$this->Init();
-			return true;
-		}
-
-	function _close() {
-		$this->_flds = false;
-		@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
-		$this->_queryID = false;	
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-ado5.inc.php b/includes/adodb/drivers/adodb-ado5.inc.php
deleted file mode 100644
index 9c11b767..00000000
--- a/includes/adodb/drivers/adodb-ado5.inc.php
+++ /dev/null
@@ -1,678 +0,0 @@
-_affectedRows = new VARIANT;
-	}
-
-	function ServerInfo()
-	{
-		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
-		return array('description' => $desc, 'version' => '');
-	}
-	
-	function _affectedrows()
-	{
-		if (PHP_VERSION >= 5) return $this->_affectedRows;
-		
-		return $this->_affectedRows->value;
-	}
-	
-	// you can also pass a connection string like this:
-	//
-	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
-	function _connect($argHostname, $argUsername, $argPassword,$argDBorProvider, $argProvider= '')
-	{
-	// two modes
-	//	-	if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat
-	//	- 	if $argProvider is not empty, then $argDBorProvider holds db
-	
-		
-		 if ($argProvider) {
-		 	$argDatabasename = $argDBorProvider;
-		 } else {
-		 	$argDatabasename = '';
-		 	if ($argDBorProvider) $argProvider = $argDBorProvider;
-			else $argProvider = 'MSDASQL';
-		}
-		
-		
-		try {
-		$u = 'UID';
-		$p = 'PWD';
-	
-		if (!empty($this->charPage))
-			$dbc = new COM('ADODB.Connection',null,$this->charPage);
-		else
-			$dbc = new COM('ADODB.Connection');
-			
-		if (! $dbc) return false;
-
-		/* special support if provider is mssql or access */
-		if ($argProvider=='mssql') {
-			$u = 'User Id';  //User parameter name for OLEDB
-			$p = 'Password'; 
-			$argProvider = "SQLOLEDB"; // SQL Server Provider
-			
-			// not yet
-			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
-			
-			//use trusted conection for SQL if username not specified
-			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
-		} else if ($argProvider=='access')
-			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
-		
-		if ($argProvider) $dbc->Provider = $argProvider;	
-
-		if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname";	
-		
-
-		if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename";		
-		if ($argUsername) $argHostname .= ";$u=$argUsername";
-		if ($argPassword)$argHostname .= ";$p=$argPassword";
-		
-		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."
\n version=$dbc->version");
-		// @ added below for php 4.0.1 and earlier
-		@$dbc->Open((string) $argHostname);
-		
-		$this->_connectionID = $dbc;
-		
-		$dbc->CursorLocation = $this->_cursor_location;
-		return  $dbc->State > 0;
-		} catch (exception $e) {
-		}
-		
-		return false;
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
-	{
-		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
-	}	
-	
-/*
-	adSchemaCatalogs	= 1,
-	adSchemaCharacterSets	= 2,
-	adSchemaCollations	= 3,
-	adSchemaColumns	= 4,
-	adSchemaCheckConstraints	= 5,
-	adSchemaConstraintColumnUsage	= 6,
-	adSchemaConstraintTableUsage	= 7,
-	adSchemaKeyColumnUsage	= 8,
-	adSchemaReferentialContraints	= 9,
-	adSchemaTableConstraints	= 10,
-	adSchemaColumnsDomainUsage	= 11,
-	adSchemaIndexes	= 12,
-	adSchemaColumnPrivileges	= 13,
-	adSchemaTablePrivileges	= 14,
-	adSchemaUsagePrivileges	= 15,
-	adSchemaProcedures	= 16,
-	adSchemaSchemata	= 17,
-	adSchemaSQLLanguages	= 18,
-	adSchemaStatistics	= 19,
-	adSchemaTables	= 20,
-	adSchemaTranslations	= 21,
-	adSchemaProviderTypes	= 22,
-	adSchemaViews	= 23,
-	adSchemaViewColumnUsage	= 24,
-	adSchemaViewTableUsage	= 25,
-	adSchemaProcedureParameters	= 26,
-	adSchemaForeignKeys	= 27,
-	adSchemaPrimaryKeys	= 28,
-	adSchemaProcedureColumns	= 29,
-	adSchemaDBInfoKeywords	= 30,
-	adSchemaDBInfoLiterals	= 31,
-	adSchemaCubes	= 32,
-	adSchemaDimensions	= 33,
-	adSchemaHierarchies	= 34,
-	adSchemaLevels	= 35,
-	adSchemaMeasures	= 36,
-	adSchemaProperties	= 37,
-	adSchemaMembers	= 38
-
-*/
-	
-	function MetaTables()
-	{
-		$arr= array();
-		$dbc = $this->_connectionID;
-		
-		$adors=@$dbc->OpenSchema(20);//tables
-		if ($adors){
-			$f = $adors->Fields(2);//table/view name
-			$t = $adors->Fields(3);//table type
-			while (!$adors->EOF){
-				$tt=substr($t->value,0,6);
-				if ($tt!='SYSTEM' && $tt !='ACCESS')
-					$arr[]=$f->value;
-				//print $f->value . ' ' . $t->value.'
';
-				$adors->MoveNext();
-			}
-			$adors->Close();
-		}
-		
-		return $arr;
-	}
-	
-	function MetaColumns($table)
-	{
-		$table = strtoupper($table);
-		$arr= array();
-		$dbc = $this->_connectionID;
-		
-		$adors=@$dbc->OpenSchema(4);//tables
-	
-		if ($adors){
-			$t = $adors->Fields(2);//table/view name
-			while (!$adors->EOF){
-				
-				
-				if (strtoupper($t->Value) == $table) {
-				
-					$fld = new ADOFieldObject();
-					$c = $adors->Fields(3);
-					$fld->name = $c->Value;
-					$fld->type = 'CHAR'; // cannot discover type in ADO!
-					$fld->max_length = -1;
-					$arr[strtoupper($fld->name)]=$fld;
-				}
-		
-				$adors->MoveNext();
-			}
-			$adors->Close();
-		}
-		
-		return $arr;
-	}
-	
-	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
-	{
-		try { // In PHP5, all COM errors are exceptions, so to maintain old behaviour...
-		
-		$dbc = $this->_connectionID;
-		
-	//	return rs	
-	
-		$false = false;
-		
-		if ($inputarr) {
-			
-			if (!empty($this->charPage))
-				$oCmd = new COM('ADODB.Command',null,$this->charPage);
-			else
-				$oCmd = new COM('ADODB.Command');
-			$oCmd->ActiveConnection = $dbc;
-			$oCmd->CommandText = $sql;
-			$oCmd->CommandType = 1;
-
-			foreach($inputarr as $val) {
-				// name, type, direction 1 = input, len,
-				$this->adoParameterType = 130;
-				$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,strlen($val),$val);
-				//print $p->Type.' '.$p->value;
-				$oCmd->Parameters->Append($p);
-			}
-			$p = false;
-			$rs = $oCmd->Execute();
-			$e = $dbc->Errors;
-			if ($dbc->Errors->Count > 0) return $false;
-			return $rs;
-		}
-		
-		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
-			
-		if ($dbc->Errors->Count > 0) return $false;
-		if (! $rs) return $false;
-		
-		if ($rs->State == 0) {
-			$true = true;
-			return $true; // 0 = adStateClosed means no records returned
-		}
-		return $rs;
-		
-		} catch (exception $e) {
-			
-		}
-		return $false;
-	}
-
-	
-	function BeginTrans() 
-	{ 
-		if ($this->transOff) return true;
-		
-		if (isset($this->_thisTransactions))
-			if (!$this->_thisTransactions) return false;
-		else {
-			$o = $this->_connectionID->Properties("Transaction DDL");
-			$this->_thisTransactions = $o ? true : false;
-			if (!$o) return false;
-		}
-		@$this->_connectionID->BeginTrans();
-		$this->transCnt += 1;
-		return true;
-	}
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		
-		@$this->_connectionID->CommitTrans();
-		if ($this->transCnt) @$this->transCnt -= 1;
-		return true;
-	}
-	function RollbackTrans() {
-		if ($this->transOff) return true;
-		@$this->_connectionID->RollbackTrans();
-		if ($this->transCnt) @$this->transCnt -= 1;
-		return true;
-	}
-	
-	/*	Returns: the last error message from previous database operation	*/	
-
-	function ErrorMsg() 
-	{
-		if (!$this->_connectionID) return "No connection established";
-		$errmsg = '';
-		
-		try {
-			$errc = $this->_connectionID->Errors;
-			if (!$errc) return "No Errors object found";
-			if ($errc->Count == 0) return '';
-			$err = $errc->Item($errc->Count-1);
-			$errmsg = $err->Description;
-		}catch(exception $e) {
-		}
-		return $errmsg;
-	}
-	
-	function ErrorNo() 
-	{
-		$errc = $this->_connectionID->Errors;
-		if ($errc->Count == 0) return 0;
-		$err = $errc->Item($errc->Count-1);
-		return $err->NativeError;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		if ($this->_connectionID) $this->_connectionID->Close();
-		$this->_connectionID = false;
-		return true;
-	}
-	
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_ado extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "ado";	
-	var $dataProvider = "ado";	
-	var $_tarr = false; // caches the types
-	var $_flds; // and field objects
-	var $canSeek = true;
-  	var $hideErrors = true;
-		  
-	function ADORecordSet_ado($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id,$mode);
-	}
-
-
-	// returns the field object
-	function FetchField($fieldOffset = -1) {
-		$off=$fieldOffset+1; // offsets begin at 1
-		
-		$o= new ADOFieldObject();
-		$rs = $this->_queryID;
-		$f = $rs->Fields($fieldOffset);
-		$o->name = $f->Name;
-		$t = $f->Type;
-		$o->type = $this->MetaType($t);
-		$o->max_length = $f->DefinedSize;
-		$o->ado_type = $t;
-		
-
-		//print "off=$off name=$o->name type=$o->type len=$o->max_length
";
-		return $o;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-		
-	function _initrs()
-	{
-		$rs = $this->_queryID;
-		$this->_numOfRows = $rs->RecordCount;
-		
-		$f = $rs->Fields;
-		$this->_numOfFields = $f->Count;
-	}
-	
-	
-	 // should only be used to move forward as we normally use forward-only cursors
-	function _seek($row)
-	{
-	   $rs = $this->_queryID; 
-		// absoluteposition doesn't work -- my maths is wrong ?
-		//	$rs->AbsolutePosition->$row-2;
-		//	return true;
-		if ($this->_currentRow > $row) return false;
-		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
-		return true;
-	}
-	
-/*
-	OLEDB types
-	
-	 enum DBTYPEENUM
-	{	DBTYPE_EMPTY	= 0,
-	DBTYPE_NULL	= 1,
-	DBTYPE_I2	= 2,
-	DBTYPE_I4	= 3,
-	DBTYPE_R4	= 4,
-	DBTYPE_R8	= 5,
-	DBTYPE_CY	= 6,
-	DBTYPE_DATE	= 7,
-	DBTYPE_BSTR	= 8,
-	DBTYPE_IDISPATCH	= 9,
-	DBTYPE_ERROR	= 10,
-	DBTYPE_BOOL	= 11,
-	DBTYPE_VARIANT	= 12,
-	DBTYPE_IUNKNOWN	= 13,
-	DBTYPE_DECIMAL	= 14,
-	DBTYPE_UI1	= 17,
-	DBTYPE_ARRAY	= 0x2000,
-	DBTYPE_BYREF	= 0x4000,
-	DBTYPE_I1	= 16,
-	DBTYPE_UI2	= 18,
-	DBTYPE_UI4	= 19,
-	DBTYPE_I8	= 20,
-	DBTYPE_UI8	= 21,
-	DBTYPE_GUID	= 72,
-	DBTYPE_VECTOR	= 0x1000,
-	DBTYPE_RESERVED	= 0x8000,
-	DBTYPE_BYTES	= 128,
-	DBTYPE_STR	= 129,
-	DBTYPE_WSTR	= 130,
-	DBTYPE_NUMERIC	= 131,
-	DBTYPE_UDT	= 132,
-	DBTYPE_DBDATE	= 133,
-	DBTYPE_DBTIME	= 134,
-	DBTYPE_DBTIMESTAMP	= 135
-	
-	ADO Types
-	
-   	adEmpty	= 0,
-	adTinyInt	= 16,
-	adSmallInt	= 2,
-	adInteger	= 3,
-	adBigInt	= 20,
-	adUnsignedTinyInt	= 17,
-	adUnsignedSmallInt	= 18,
-	adUnsignedInt	= 19,
-	adUnsignedBigInt	= 21,
-	adSingle	= 4,
-	adDouble	= 5,
-	adCurrency	= 6,
-	adDecimal	= 14,
-	adNumeric	= 131,
-	adBoolean	= 11,
-	adError	= 10,
-	adUserDefined	= 132,
-	adVariant	= 12,
-	adIDispatch	= 9,
-	adIUnknown	= 13,	
-	adGUID	= 72,
-	adDate	= 7,
-	adDBDate	= 133,
-	adDBTime	= 134,
-	adDBTimeStamp	= 135,
-	adBSTR	= 8,
-	adChar	= 129,
-	adVarChar	= 200,
-	adLongVarChar	= 201,
-	adWChar	= 130,
-	adVarWChar	= 202,
-	adLongVarWChar	= 203,
-	adBinary	= 128,
-	adVarBinary	= 204,
-	adLongVarBinary	= 205,
-	adChapter	= 136,
-	adFileTime	= 64,
-	adDBFileTime	= 137,
-	adPropVariant	= 138,
-	adVarNumeric	= 139
-*/
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		if (!is_numeric($t)) return $t;
-		
-		switch ($t) {
-		case 0:
-		case 12: // variant
-		case 8: // bstr
-		case 129: //char
-		case 130: //wc
-		case 200: // varc
-		case 202:// varWC
-		case 128: // bin
-		case 204: // varBin
-		case 72: // guid
-			if ($len <= $this->blobSize) return 'C';
-		
-		case 201:
-		case 203:
-			return 'X';
-		case 128:
-		case 204:
-		case 205:
-			 return 'B';
-		case 7:
-		case 133: return 'D';
-		
-		case 134:
-		case 135: return 'T';
-		
-		case 11: return 'L';
-		
-		case 16://	adTinyInt	= 16,
-		case 2://adSmallInt	= 2,
-		case 3://adInteger	= 3,
-		case 4://adBigInt	= 20,
-		case 17://adUnsignedTinyInt	= 17,
-		case 18://adUnsignedSmallInt	= 18,
-		case 19://adUnsignedInt	= 19,
-		case 20://adUnsignedBigInt	= 21,
-			return 'I';
-		default: return 'N';
-		}
-	}
-	
-	// time stamp not supported yet
-	function _fetch()
-	{	
-		$rs = $this->_queryID;
-		if (!$rs or $rs->EOF) {
-			$this->fields = false;
-			return false;
-		}
-		$this->fields = array();
-	
-		if (!$this->_tarr) {
-			$tarr = array();
-			$flds = array();
-			for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
-				$f = $rs->Fields($i);
-				$flds[] = $f;
-				$tarr[] = $f->Type;
-			}
-			// bind types and flds only once
-			$this->_tarr = $tarr; 
-			$this->_flds = $flds;
-		}
-		$t = reset($this->_tarr);
-		$f = reset($this->_flds);
-		
-		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
-		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
-			//echo "
",$t,' ';var_dump($f->value); echo '
';
-			switch($t) {
-			case 135: // timestamp
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
-						// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
-						$val= (float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
-					else 
-						$val = $f->value;
-					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;			
-			case 133:// A date value (yyyymmdd) 
-				if ($val = $f->value) {
-					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
-				} else
-					$this->fields[] = false;
-				break;
-			case 7: // adDate
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
-					else $val = $f->value;
-					
-					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
-					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;
-			case 1: // null
-				$this->fields[] = false;
-				break;
-			case 6: // currency is not supported properly;
-				ADOConnection::outp( ''.$f->Name.': currency type not supported by PHP');
-				$this->fields[] = (float) $f->value;
-				break;
-			case 11: //BIT;
-				$val = "";
-				if(is_bool($f->value))	{
-					if($f->value==true) $val = 1;
-					else $val = 0;
-				}
-				if(is_null($f->value)) $val = null;
-				
-				$this->fields[] = $val;
-				break;
-			default:
-				$this->fields[] = $f->value; 
-				break;
-			}
-			//print " $f->value $t, ";
-			$f = next($this->_flds);
-			$t = next($this->_tarr);
-		} // for
-		if ($this->hideErrors) error_reporting($olde);
-		@$rs->MoveNext(); // @ needed for some versions of PHP!
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-		}
-		return true;
-	}
-	
-		function NextRecordSet()
-		{
-			$rs = $this->_queryID;
-			$this->_queryID = $rs->NextRecordSet();
-			//$this->_queryID = $this->_QueryId->NextRecordSet();
-			if ($this->_queryID == null) return false;
-			
-			$this->_currentRow = -1;
-			$this->_currentPage = -1;
-			$this->bind = false;
-			$this->fields = false;
-			$this->_flds = false;
-			$this->_tarr = false;
-			
-			$this->_inited = false;
-			$this->Init();
-			return true;
-		}
-
-	function _close() {
-		$this->_flds = false;
-		@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
-		$this->_queryID = false;	
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-ado_access.inc.php b/includes/adodb/drivers/adodb-ado_access.inc.php
deleted file mode 100644
index 1b4045f9..00000000
--- a/includes/adodb/drivers/adodb-ado_access.inc.php
+++ /dev/null
@@ -1,55 +0,0 @@
-= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
-	else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
-}
-
-class  ADODB_ado_access extends ADODB_ado {	
-	var $databaseType = 'ado_access';
-	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
-	var $fmtDate = "#Y-m-d#";
-	var $fmtTimeStamp = "#Y-m-d h:i:sA#";// note no comma
-	var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
-	var $sysTimeStamp = 'NOW';
-	var $hasTransactions = false;
-	var $upperCase = 'ucase';
-	
-	function ADODB_ado_access()
-	{
-		$this->ADODB_ado();
-	}
-	
-	function BeginTrans() { return false;}
-	
-	function CommitTrans() { return false;}
-	
-	function RollbackTrans() { return false;}
-
-}
-
- 
-class  ADORecordSet_ado_access extends ADORecordSet_ado {	
-	
-	var $databaseType = "ado_access";		
-	
-	function ADORecordSet_ado_access($id,$mode=false)
-	{
-		return $this->ADORecordSet_ado($id,$mode);
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-ado_mssql.inc.php b/includes/adodb/drivers/adodb-ado_mssql.inc.php
deleted file mode 100644
index 089bc001..00000000
--- a/includes/adodb/drivers/adodb-ado_mssql.inc.php
+++ /dev/null
@@ -1,154 +0,0 @@
-= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
-	else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
-}
-
-
-class  ADODB_ado_mssql extends ADODB_ado {        
-	var $databaseType = 'ado_mssql';
-	var $hasTop = 'top';
-	var $hasInsertID = true;
-	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
-	var $sysTimeStamp = 'GetDate()';
-	var $leftOuter = '*=';
-	var $rightOuter = '=*';
-	var $ansiOuter = true; // for mssql7 or later
-	var $substr = "substring";
-	var $length = 'len';
-	var $_dropSeqSQL = "drop table %s";
-	
-	//var $_inTransaction = 1; // always open recordsets, so no transaction problems.
-	
-	function ADODB_ado_mssql()
-	{
-	        $this->ADODB_ado();
-	}
-	
-	function _insertid()
-	{
-	        return $this->GetOne('select SCOPE_IDENTITY()');
-	}
-	
-	function _affectedrows()
-	{
-	        return $this->GetOne('select @@rowcount');
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET TRANSACTION ".$transaction_mode);
-	}
-	
-	function qstr($s,$magic_quotes=false)
-	{
-		$s = ADOConnection::qstr($s, $magic_quotes);
-		return str_replace("\0", "\\\\000", $s);
-	}
-	
-	function MetaColumns($table)
-	{
-        $table = strtoupper($table);
-        $arr= array();
-        $dbc = $this->_connectionID;
-        
-        $osoptions = array();
-        $osoptions[0] = null;
-        $osoptions[1] = null;
-        $osoptions[2] = $table;
-        $osoptions[3] = null;
-        
-        $adors=@$dbc->OpenSchema(4, $osoptions);//tables
-
-        if ($adors){
-                while (!$adors->EOF){
-                        $fld = new ADOFieldObject();
-                        $c = $adors->Fields(3);
-                        $fld->name = $c->Value;
-                        $fld->type = 'CHAR'; // cannot discover type in ADO!
-                        $fld->max_length = -1;
-                        $arr[strtoupper($fld->name)]=$fld;
-        
-                        $adors->MoveNext();
-                }
-                $adors->Close();
-        }
-        $false = false;
-		return empty($arr) ? $false : $arr;
-	}
-	
-	function CreateSequence($seq='adodbseq',$start=1)
-	{
-		
-		$this->Execute('BEGIN TRANSACTION adodbseq');
-		$start -= 1;
-		$this->Execute("create table $seq (id float(53))");
-		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-		if (!$ok) {
-				$this->Execute('ROLLBACK TRANSACTION adodbseq');
-				return false;
-		}
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
-		return true;
-	}
-
-	function GenID($seq='adodbseq',$start=1)
-	{
-		//$this->debug=1;
-		$this->Execute('BEGIN TRANSACTION adodbseq');
-		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
-		if (!$ok) {
-			$this->Execute("create table $seq (id float(53))");
-			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-			if (!$ok) {
-				$this->Execute('ROLLBACK TRANSACTION adodbseq');
-				return false;
-			}
-			$this->Execute('COMMIT TRANSACTION adodbseq'); 
-			return $start;
-		}
-		$num = $this->GetOne("select id from $seq");
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
-		return $num;
-		
-		// in old implementation, pre 1.90, we returned GUID...
-		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
-	}
-	
-	} // end class 
-	
-	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {        
-	
-	var $databaseType = 'ado_mssql';
-	
-	function ADORecordSet_ado_mssql($id,$mode=false)
-	{
-	        return $this->ADORecordSet_ado($id,$mode);
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-borland_ibase.inc.php b/includes/adodb/drivers/adodb-borland_ibase.inc.php
deleted file mode 100644
index 3d0c6e72..00000000
--- a/includes/adodb/drivers/adodb-borland_ibase.inc.php
+++ /dev/null
@@ -1,92 +0,0 @@
-ADODB_ibase();
-	}
-	
-	function BeginTrans()
-	{	 
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->autoCommit = false;
-	 	$this->_transactionID = ibase_trans($this->ibasetrans, $this->_connectionID);
-		return $this->_transactionID;
-	}
-	
-	function ServerInfo()
-	{
-		$arr['dialect'] = $this->dialect;
-		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Interbase 6.5, Dialect 1'; break;
-		case '2': $s = 'Interbase 6.5, Dialect 2'; break;
-		default:
-		case '3': $s = 'Interbase 6.5, Dialect 3'; break;
-		}
-		$arr['version'] = '6.5';
-		$arr['description'] = $s;
-		return $arr;
-	}
-	
-	// Note that Interbase 6.5 uses ROWS instead - don't you love forking wars!
-	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
-	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
-	// Firebird uses
-	//		SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
-	{
-		if ($nrows > 0) {
-			if ($offset <= 0) $str = " ROWS $nrows "; 
-			else {
-				$a = $offset+1;
-				$b = $offset+$nrows;
-				$str = " ROWS $a TO $b";
-			}
-		} else {
-			// ok, skip 
-			$a = $offset + 1;
-			$str = " ROWS $a TO 999999999"; // 999 million
-		}
-		$sql .= $str;
-		
-		return ($secs2cache) ? 
-				$this->CacheExecute($secs2cache,$sql,$inputarr)
-			:
-				$this->Execute($sql,$inputarr);
-	}
-	
-};
- 
-
-class  ADORecordSet_borland_ibase extends ADORecordSet_ibase {	
-	
-	var $databaseType = "borland_ibase";		
-	
-	function ADORecordSet_borland_ibase($id,$mode=false)
-	{
-		$this->ADORecordSet_ibase($id,$mode);
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-csv.inc.php b/includes/adodb/drivers/adodb-csv.inc.php
deleted file mode 100644
index 41652273..00000000
--- a/includes/adodb/drivers/adodb-csv.inc.php
+++ /dev/null
@@ -1,207 +0,0 @@
-_insertid;
-	}
-	
-	function _affectedrows()
-	{
-			return $this->_affectedrows;
-	}
-  
-  	function MetaDatabases()
-	{
-		return false;
-	}
-
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
-		$this->_url = $argHostname;
-		return true;	
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
-		$this->_url = $argHostname;
-		return true;
-	}
-	
- 	function MetaColumns($table) 
-	{
-		return false;
-	}
-		
-		
-	// parameters use PostgreSQL convention, not MySQL
-	function SelectLimit($sql,$nrows=-1,$offset=-1)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$url = $this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=".
-			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE).
-			"&offset=$offset";
-		$err = false;
-		$rs = csv2rs($url,$err,false);
-		
-		if ($this->debug) print "$url
$err
";
-
-		$at = strpos($err,'::::');
-		if ($at === false) {
-			$this->_errorMsg = $err;
-			$this->_errorNo = (integer)$err;
-		} else {
-			$this->_errorMsg = substr($err,$at+4,1024);
-			$this->_errorNo = -9999;
-		}
-		if ($this->_errorNo) 
-			if ($fn = $this->raiseErrorFn) {
-				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,'');
-			}
-			
-		if (is_object($rs)) {	
-		
-			$rs->databaseType='csv';		
-			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
-			$rs->connection = $this;
-		}
-		return $rs;
-	}
-	
-	// returns queryID or false
-	function _Execute($sql,$inputarr=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		if (!$this->_bindInputArray && $inputarr) {
-			$sqlarr = explode('?',$sql);
-			$sql = '';
-			$i = 0;
-			foreach($inputarr as $v) {
-
-				$sql .= $sqlarr[$i];
-				if (gettype($v) == 'string')
-					$sql .= $this->qstr($v);
-				else if ($v === null)
-					$sql .= 'NULL';
-				else
-					$sql .= $v;
-				$i += 1;
-	
-			}
-			$sql .= $sqlarr[$i];
-			if ($i+1 != sizeof($sqlarr))	
-				print "Input Array does not match ?: ".htmlspecialchars($sql);
-			$inputarr = false;
-		}
-		
-		$url =  $this->_url.'?sql='.urlencode($sql)."&fetch=".
-			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE);
-		$err = false;
-		
-		
-		$rs = csv2rs($url,$err,false);
-		if ($this->debug) print urldecode($url)."
$err
";
-		$at = strpos($err,'::::');
-		if ($at === false) {		
-			$this->_errorMsg = $err;
-			$this->_errorNo = (integer)$err;
-		} else {
-			$this->_errorMsg = substr($err,$at+4,1024);
-			$this->_errorNo = -9999;
-		}
-		
-		if ($this->_errorNo) 
-			if ($fn = $this->raiseErrorFn) {
-				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr);
-			}
-		if (is_object($rs)) {
-			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
-			
-			$this->_affectedrows = $rs->affectedrows;
-			$this->_insertid = $rs->insertid;
-			$rs->databaseType='csv';
-			$rs->connection = $this;
-		}
-		return $rs;
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-			return $this->_errorMsg;
-	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	{
-		return $this->_errorNo;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		return true;
-	}
-} // class
-
-class ADORecordset_csv extends ADORecordset {
-	function ADORecordset_csv($id,$mode=false)
-	{
-		$this->ADORecordset($id,$mode);
-	}
-	
-	function _close()
-	{
-		return true;
-	}
-}
-
-} // define
-	
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-db2.inc.php b/includes/adodb/drivers/adodb-db2.inc.php
deleted file mode 100644
index 7691be88..00000000
--- a/includes/adodb/drivers/adodb-db2.inc.php
+++ /dev/null
@@ -1,828 +0,0 @@
-_haserrorfunctions = ADODB_PHPVER >= 0x4050;
-	}
-	
-		// returns true or false
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-		global $php_errormsg;
-		
-		if (!function_exists('db2_connect')) {
-			ADOConnection::outp("Warning: The old ODBC based DB2 driver has been renamed 'odbc_db2'. This ADOdb driver calls PHP's native db2 extension.");
-			return null;
-		}
-		// This needs to be set before the connect().
-		// Replaces the odbc_binmode() call that was in Execute()
-		ini_set('ibm_db2.binmode', $this->binmode);
-
-		if ($argDatabasename) {
-			$this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword);
-		} else {
-			$this->_connectionID = db2_connect($argDSN,$argUsername,$argPassword);
-		}
-		if (isset($php_errormsg)) $php_errormsg = '';
-
-		// For db2_connect(), there is an optional 4th arg.  If present, it must be
-		// an array of valid options.  So far, we don't use them.
-
-		$this->_errorMsg = @db2_conn_errormsg();
- 
-		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
-		return $this->_connectionID != false;
-	}
-	
-	// returns true or false
-	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-		global $php_errormsg;
-	
-		if (!function_exists('db2_connect')) return null;
-		
-		// This needs to be set before the connect().
-		// Replaces the odbc_binmode() call that was in Execute()
-		ini_set('ibm_db2.binmode', $this->binmode);
-
-		if (isset($php_errormsg)) $php_errormsg = '';
-		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		
-		if ($argDatabasename) {
-			$this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword);
-		} else {
-			$this->_connectionID = db2_pconnect($argDSN,$argUsername,$argPassword);
-		}
-		if (isset($php_errormsg)) $php_errormsg = '';
-
-		$this->_errorMsg = @db2_conn_errormsg();
-		if ($this->_connectionID && $this->autoRollback) @db2_rollback($this->_connectionID);
-		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
-		return $this->_connectionID != false;
-	}
-
-	// format and return date string in database timestamp format
-	function DBTimeStamp($ts)
-	{
-		if (empty($ts) && $ts !== 0) return 'null';
-		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'YYYY-MM-DD HH24:MI:SS')";
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-	// use right() and replace() ?
-		if (!$col) $col = $this->sysDate;
-
-		/* use TO_CHAR() if $fmt is TO_CHAR() allowed fmt */
-		if ($fmt== 'Y-m-d H:i:s')
-			return 'TO_CHAR('.$col.", 'YYYY-MM-DD HH24:MI:SS')";
-
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= $this->concat_operator;
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				if ($len==1) return "year($col)";
-				$s .= "char(year($col))";
-				break;
-			case 'M':
-				if ($len==1) return "monthname($col)";
-				$s .= "substr(monthname($col),1,3)";
-				break;
-			case 'm':
-				if ($len==1) return "month($col)";
-				$s .= "right(digits(month($col)),2)";
-				break;
-			case 'D':
-			case 'd':
-				if ($len==1) return "day($col)";
-				$s .= "right(digits(day($col)),2)";
-				break;
-			case 'H':
-			case 'h':
-				if ($len==1) return "hour($col)";
-				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
-				else $s .= "''";
-				break;
-			case 'i':
-			case 'I':
-				if ($len==1) return "minute($col)";
-				if ($col != $this->sysDate)
-					$s .= "right(digits(minute($col)),2)";
-					else $s .= "''";
-				break;
-			case 'S':
-			case 's':
-				if ($len==1) return "second($col)";
-				if ($col != $this->sysDate)
-					$s .= "right(digits(second($col)),2)";
-				else $s .= "''";
-				break;
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-			}
-		}
-		return $s;
-	} 
- 
-	
-	function ServerInfo()
-	{
-	
-		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
-			$dsn = strtoupper($this->host);
-			$first = true;
-			$found = false;
-			
-			if (!function_exists('db2_data_source')) return false;
-			
-			while(true) {
-				
-				$rez = @db2_data_source($this->_connectionID,
-					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
-				$first = false;
-				if (!is_array($rez)) break;
-				if (strtoupper($rez['server']) == $dsn) {
-					$found = true;
-					break;
-				}
-			} 
-			if (!$found) return ADOConnection::ServerInfo();
-			if (!isset($rez['version'])) $rez['version'] = '';
-			return $rez;
-		} else {
-			return ADOConnection::ServerInfo();
-		}
-	}
-
-	
-	function CreateSequence($seqname='adodbseq',$start=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$start));
-		if (!$ok) return false;
-		return true;
-	}
-	
-	function DropSequence($seqname)
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-	
-	/*
-		This algorithm is not very efficient, but works even if table locking
-		is not available.
-		
-		Will return false if unable to generate an ID after $MAXLOOPS attempts.
-	*/
-	function GenID($seq='adodbseq',$start=1)
-	{	
-		// if you have to modify the parameter below, your database is overloaded,
-		// or you need to implement generation of id's yourself!
-		$num = $this->GetOne("VALUES NEXTVAL FOR $seq");
-				return $num;
-			}
-
-
-	function ErrorMsg()
-	{
-		if ($this->_haserrorfunctions) {
-			if ($this->_errorMsg !== false) return $this->_errorMsg;
-			if (empty($this->_connectionID)) return @db2_conn_errormsg();
-			return @db2_conn_errormsg($this->_connectionID);
-		} else return ADOConnection::ErrorMsg();
-	}
-	
-	function ErrorNo()
-	{
-		
-		if ($this->_haserrorfunctions) {
-			if ($this->_errorCode !== false) {
-				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
-				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
-			}
-
-			if (empty($this->_connectionID)) $e = @db2_conn_error(); 
-			else $e = @db2_conn_error($this->_connectionID);
-			
-			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
-			 // so we check and patch
-			if (strlen($e)<=2) return 0;
-			return $e;
-		} else return ADOConnection::ErrorNo();
-	}
-	
-	
-
-	function BeginTrans()
-	{	
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		$this->transCnt += 1;
-		$this->_autocommit = false;
-		return db2_autocommit($this->_connectionID,false);
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		$ret = db2_commit($this->_connectionID);
-		db2_autocommit($this->_connectionID,true);
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		$ret = db2_rollback($this->_connectionID);
-		db2_autocommit($this->_connectionID,true);
-		return $ret;
-	}
-	
-	function MetaPrimaryKeys($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		if ($this->uCaseTables) $table = strtoupper($table);
-		$schema = '';
-		$this->_findschema($table,$schema);
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = @db2_primarykeys($this->_connectionID,'',$schema,$table);
-		
-		if (!$qid) {
-			$ADODB_FETCH_MODE = $savem;
-			return false;
-		}
-		$rs = new ADORecordSet_db2($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return false;
-		
-		$arr = $rs->GetArray();
-		$rs->Close();
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][3]) $arr2[] = $arr[$i][3];
-		}
-		return $arr2;
-	}
-	
-	function MetaForeignKeys($table, $owner = FALSE, $upper = FALSE, $asociative = FALSE )
-	{
-	global $ADODB_FETCH_MODE;
-	
-		if ($this->uCaseTables) $table = strtoupper($table);
-		$schema = '';
-		$this->_findschema($table,$schema);
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = @db2_foreign_keys($this->_connectionID,'',$schema,$table);
-		if (!$qid) {
-			$ADODB_FETCH_MODE = $savem;
-			return false;
-		}
-		$rs = new ADORecordSet_db2($qid);
-
-		$ADODB_FETCH_MODE = $savem;
-		/*
-		$rs->fields indices
-		0 PKTABLE_CAT
-		1 PKTABLE_SCHEM
-		2 PKTABLE_NAME
-		3 PKCOLUMN_NAME
-		4 FKTABLE_CAT
-		5 FKTABLE_SCHEM
-		6 FKTABLE_NAME
-		7 FKCOLUMN_NAME
-		*/	
-		if (!$rs) return false;
-
-		$foreign_keys = array();	 	 
-		while (!$rs->EOF) {
-			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
-				if (!is_array($foreign_keys[$rs->fields[5].'.'.$rs->fields[6]])) 
-					$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]] = array();
-				$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]][$rs->fields[7]] = $rs->fields[3];	 		
-			}
-			$rs->MoveNext();
-		}
-
-		$rs->Close();
-		return $foreign_key;
-	}
-	
-	
-	function MetaTables($ttype=false,$schema=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = db2_tables($this->_connectionID);
-		
-		$rs = new ADORecordSet_db2($qid);
-		
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) {
-			$false = false;
-			return $false;
-		}
-		
-		$arr = $rs->GetArray();
-		
-		$rs->Close();
-		$arr2 = array();
-		
-		if ($ttype) {
-			$isview = strncmp($ttype,'V',1) === 0;
-		}
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if (!$arr[$i][2]) continue;
-			$type = $arr[$i][3];
-			$schemaval = ($schema) ? $arr[$i][1].'.' : '';
-			if ($ttype) { 
-				if ($isview) {
-					if (strncmp($type,'V',1) === 0) $arr2[] = $schemaval.$arr[$i][2];
-				} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
-			} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
-		}
-		return $arr2;
-	}
-	
-/*
-See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2datetime_data_type_changes.asp
-/ SQL data type codes /
-#define	SQL_UNKNOWN_TYPE	0
-#define SQL_CHAR			1
-#define SQL_NUMERIC		 2
-#define SQL_DECIMAL		 3
-#define SQL_INTEGER		 4
-#define SQL_SMALLINT		5
-#define SQL_FLOAT		   6
-#define SQL_REAL			7
-#define SQL_DOUBLE		  8
-#if (DB2VER >= 0x0300)
-#define SQL_DATETIME		9
-#endif
-#define SQL_VARCHAR		12
-
-
-/ One-parameter shortcuts for date/time data types /
-#if (DB2VER >= 0x0300)
-#define SQL_TYPE_DATE	  91
-#define SQL_TYPE_TIME	  92
-#define SQL_TYPE_TIMESTAMP 93
-
-#define SQL_UNICODE                             (-95)
-#define SQL_UNICODE_VARCHAR                     (-96)
-#define SQL_UNICODE_LONGVARCHAR                 (-97)
-*/
-	function DB2Types($t)
-	{
-		switch ((integer)$t) {
-		case 1:	
-		case 12:
-		case 0:
-		case -95:
-		case -96:
-			return 'C';
-		case -97:
-		case -1: //text
-			return 'X';
-		case -4: //image
-			return 'B';
-				
-		case 9:	
-		case 91:
-			return 'D';
-		
-		case 10:
-		case 11:
-		case 92:
-		case 93:
-			return 'T';
-			
-		case 4:
-		case 5:
-		case -6:
-			return 'I';
-			
-		case -11: // uniqidentifier
-			return 'R';
-		case -7: //bit
-			return 'L';
-		
-		default:
-			return 'N';
-		}
-	}
-	
-	function MetaColumns($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$false = false;
-		if ($this->uCaseTables) $table = strtoupper($table);
-		$schema = '';
-		$this->_findschema($table,$schema);
-		
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-        	$colname = "%";
-	        $qid = db2_columns($this->_connectionID, "", $schema, $table, $colname);
-		if (empty($qid)) return $false;
-		
-		$rs = new ADORecordSet_db2($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return $false;
-		$rs->_fetch();
-		
-		$retarr = array();
-		
-		/*
-		$rs->fields indices
-		0 TABLE_QUALIFIER
-		1 TABLE_SCHEM
-		2 TABLE_NAME
-		3 COLUMN_NAME
-		4 DATA_TYPE
-		5 TYPE_NAME
-		6 PRECISION
-		7 LENGTH
-		8 SCALE
-		9 RADIX
-		10 NULLABLE
-		11 REMARKS
-		*/
-		while (!$rs->EOF) {
-			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[3];
-				$fld->type = $this->DB2Types($rs->fields[4]);
-				
-				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
-				// access uses precision to store length for char/varchar
-				if ($fld->type == 'C' or $fld->type == 'X') {
-					if ($rs->fields[4] <= -95) // UNICODE
-						$fld->max_length = $rs->fields[7]/2;
-					else
-						$fld->max_length = $rs->fields[7];
-				} else 
-					$fld->max_length = $rs->fields[7];
-				$fld->not_null = !empty($rs->fields[10]);
-				$fld->scale = $rs->fields[8];
-				$fld->primary_key = false;
-				$retarr[strtoupper($fld->name)] = $fld;	
-			} else if (sizeof($retarr)>0)
-				break;
-			$rs->MoveNext();
-		}
-		$rs->Close(); 
-		if (empty($retarr)) $retarr = false;
-
-	      $qid = db2_primary_keys($this->_connectionID, "", $schema, $table);
-		if (empty($qid)) return $false;
-		
-		$rs = new ADORecordSet_db2($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return $retarr;
-		$rs->_fetch();
-		
-		/*
-		$rs->fields indices
-		0 TABLE_CAT
-		1 TABLE_SCHEM
-		2 TABLE_NAME
-		3 COLUMN_NAME
-		4 KEY_SEQ
-		5 PK_NAME
-		*/
-		while (!$rs->EOF) {
-			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
-				$retarr[strtoupper($rs->fields[3])]->primary_key = true;
-			} else if (sizeof($retarr)>0)
-				break;
-			$rs->MoveNext();
-		}
-		$rs->Close(); 
-		
-		if (empty($retarr)) $retarr = false;
-		return $retarr;
-	}
-	
-	function Prepare($sql)
-	{
-		if (! $this->_bindInputArray) return $sql; // no binding
-		$stmt = db2_prepare($this->_connectionID,$sql);
-		if (!$stmt) {
-			// we don't know whether db2 driver is parsing prepared stmts, so just return sql
-			return $sql;
-		}
-		return array($sql,$stmt,false);
-	}
-
-	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
-	{
-	GLOBAL $php_errormsg;
-		if (isset($php_errormsg)) $php_errormsg = '';
-		$this->_error = '';
-		
-		if ($inputarr) {
-			if (is_array($sql)) {
-				$stmtid = $sql[1];
-			} else {
-				$stmtid = db2_prepare($this->_connectionID,$sql);
-	
-				if ($stmtid == false) {
-					$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-					return false;
-				}
-			}
-			
-			if (! db2_execute($stmtid,$inputarr)) {
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = db2_stmt_errormsg();
-					$this->_errorCode = db2_stmt_error();
-				}
-				return false;
-			}
-		
-		} else if (is_array($sql)) {
-			$stmtid = $sql[1];
-			if (!db2_execute($stmtid)) {
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = db2_stmt_errormsg();
-					$this->_errorCode = db2_stmt_error();
-				}
-				return false;
-			}
-		} else
-			$stmtid = @db2_exec($this->_connectionID,$sql);
-		
-		$this->_lastAffectedRows = 0;
-		if ($stmtid) {
-			if (@db2_num_fields($stmtid) == 0) {
-				$this->_lastAffectedRows = db2_num_rows($stmtid);
-				$stmtid = true;
-			} else {
-				$this->_lastAffectedRows = 0;
-			}
-			
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = '';
-				$this->_errorCode = 0;
-			} else
-				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		} else {
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = db2_stmt_errormsg();
-				$this->_errorCode = db2_stmt_error();
-			} else
-				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-
-		}
-		return $stmtid;
-	}
-
-	/*
-		Insert a null into the blob field of the table first.
-		Then use UpdateBlob to store the blob.
-		
-		Usage:
-		 
-		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		$ret = @db2_close($this->_connectionID);
-		$this->_connectionID = false;
-		return $ret;
-	}
-
-	function _affectedrows()
-	{
-		return $this->_lastAffectedRows;
-	}
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_db2 extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "db2";		
-	var $dataProvider = "db2";
-	var $useFetchArray;
-	
-	function ADORecordSet_db2($id,$mode=false)
-	{
-		if ($mode === false) {  
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		
-		$this->_queryID = $id;
-	}
-
-
-	// returns the field object
-	function FetchField($offset = -1) 
-	{
-		$o= new ADOFieldObject();
-		$o->name = @db2_field_name($this->_queryID,$offset);
-		$o->type = @db2_field_type($this->_queryID,$offset);
-		$o->max_length = db2_field_width($this->_queryID,$offset);
-		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-		return $o;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-		
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS) ? @db2_num_rows($this->_queryID) : -1;
-		$this->_numOfFields = @db2_num_fields($this->_queryID);
-		// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
-		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
-	}	
-	
-	function _seek($row)
-	{
-		return false;
-	}
-	
-	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
-	function GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$rs = $this->GetArray($nrows);
-			return $rs;
-		}
-		$savem = $this->fetchMode;
-		$this->fetchMode = ADODB_FETCH_NUM;
-		$this->Move($offset);
-		$this->fetchMode = $savem;
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-		}
-		
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-	
-	
-	function MoveNext() 
-	{
-		if ($this->_numOfRows != 0 && !$this->EOF) {		
-			$this->_currentRow++;
-			
-			$this->fields = @db2_fetch_array($this->_queryID);
-			if ($this->fields) {
-				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-					$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-				}
-				return true;
-			}
-		}
-		$this->fields = false;
-		$this->EOF = true;
-		return false;
-	}	
-	
-	function _fetch()
-	{
-
-		$this->fields = db2_fetch_array($this->_queryID);
-		if ($this->fields) {
-			if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-				$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-			}
-			return true;
-		}
-		$this->fields = false;
-		return false;
-	}
-	
-	function _close() 
-	{
-		return @db2_free_result($this->_queryID);		
-	}
-
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-fbsql.inc.php b/includes/adodb/drivers/adodb-fbsql.inc.php
deleted file mode 100644
index d2f11dbe..00000000
--- a/includes/adodb/drivers/adodb-fbsql.inc.php
+++ /dev/null
@@ -1,266 +0,0 @@
-. 
-  Set tabs to 8.
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (! defined("_ADODB_FBSQL_LAYER")) {
- define("_ADODB_FBSQL_LAYER", 1 );
-
-class ADODB_fbsql extends ADOConnection {
-	var $databaseType = 'fbsql';
-	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
-	var $metaTablesSQL = "SHOW TABLES";	
-	var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasLimit = false;
-	
-	function ADODB_fbsql() 
-	{			
-	}
-	
-	function _insertid()
-	{
-			return fbsql_insert_id($this->_connectionID);
-	}
-	
-	function _affectedrows()
-	{
-			return fbsql_affected_rows($this->_connectionID);
-	}
-  
-  	function MetaDatabases()
-	{
-		$qid = fbsql_list_dbs($this->_connectionID);
-		$arr = array();
-		$i = 0;
-		$max = fbsql_num_rows($qid);
-		while ($i < $max) {
-			$arr[] = fbsql_tablename($qid,$i);
-			$i += 1;
-		}
-		return $arr;
-	}
-
-	// returns concatenated string
-	function Concat()
-	{
-		$s = "";
-		$arr = func_get_args();
-		$first = true;
-
-		$s = implode(',',$arr);
-		if (sizeof($arr) > 0) return "CONCAT($s)";
-		else return '';
-	}
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		$this->_connectionID = fbsql_connect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		$this->_connectionID = fbsql_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
- 	function MetaColumns($table) 
-	{
-		if ($this->metaColumnsSQL) {
-			
-			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-			
-			if ($rs === false) return false;
-			
-			$retarr = array();
-			while (!$rs->EOF){
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[0];
-				$fld->type = $rs->fields[1];
-					
-				// split type into type(length):
-				if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array)) {
-					$fld->type = $query_array[1];
-					$fld->max_length = $query_array[2];
-				} else {
-					$fld->max_length = -1;
-				}
-				$fld->not_null = ($rs->fields[2] != 'YES');
-				$fld->primary_key = ($rs->fields[3] == 'PRI');
-				$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-				$fld->binary = (strpos($fld->type,'blob') !== false);
-				
-				$retarr[strtoupper($fld->name)] = $fld;	
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			return $retarr;	
-		}
-		return false;
-	}
-		
-	// returns true or false
-	function SelectDB($dbName) 
-	{
-		$this->database = $dbName;
-		if ($this->_connectionID) {
-			return @fbsql_select_db($dbName,$this->_connectionID);		
-		}
-		else return false;	
-	}
-	
-	
-	// returns queryID or false
-	function _query($sql,$inputarr)
-	{
-		return fbsql_query("$sql;",$this->_connectionID);
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-		$this->_errorMsg = @fbsql_error($this->_connectionID);
-			return $this->_errorMsg;
-	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	{
-		return @fbsql_errno($this->_connectionID);
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		return @fbsql_close($this->_connectionID);
-	}
-		
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_fbsql extends ADORecordSet{	
-	
-	var $databaseType = "fbsql";
-	var $canSeek = true;
-	
-	function ADORecordSet_fbsql($queryID,$mode=false) 
-	{
-		if (!$mode) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode) {
-		case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break;
-		case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break;
-		case ADODB_FETCH_BOTH: 
-		default:
-		$this->fetchMode = FBSQL_BOTH; break;
-		}
-		return $this->ADORecordSet($queryID);
-	}
-	
-	function _initrs()
-	{
-	GLOBAL $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS) ? @fbsql_num_rows($this->_queryID):-1;
-		$this->_numOfFields = @fbsql_num_fields($this->_queryID);
-	}
-	
-
-
-	function FetchField($fieldOffset = -1) {
-		if ($fieldOffset != -1) {
-			$o =  @fbsql_fetch_field($this->_queryID, $fieldOffset);
-			//$o->max_length = -1; // fbsql returns the max length less spaces -- so it is unrealiable
-			$f = @fbsql_field_flags($this->_queryID,$fieldOffset);
-			$o->binary = (strpos($f,'binary')!== false);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			$o = @fbsql_fetch_field($this->_queryID);// fbsql returns the max length less spaces -- so it is unrealiable
-			//$o->max_length = -1;
-		}
-		
-		return $o;
-	}
-		
-	function _seek($row)
-	{
-		return @fbsql_data_seek($this->_queryID,$row);
-	}
-	
-	function _fetch($ignore_fields=false)
-	{
-		$this->fields = @fbsql_fetch_array($this->_queryID,$this->fetchMode);
-		return ($this->fields == true);
-	}
-	
-	function _close() {
-		return @fbsql_free_result($this->_queryID);		
-	}
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		$len = -1; // fbsql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'CHARACTER':
-		case 'CHARACTER VARYING': 
-		case 'BLOB': 
-		case 'CLOB': 
-		case 'BIT': 
-		case 'BIT VARYING': 
-			if ($len <= $this->blobSize) return 'C';
-			
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
-		case 'DATE': return 'D';
-		
-		case 'TIME':
-		case 'TIME WITH TIME ZONE':
-		case 'TIMESTAMP': 
-		case 'TIMESTAMP WITH TIME ZONE': return 'T';
-		
-		case 'PRIMARY_KEY':
-			return 'R';
-		case 'INTEGER':
-		case 'SMALLINT': 
-		case 'BOOLEAN':
-			
-			if (!empty($fieldobj->primary_key)) return 'R';
-			else return 'I';
-		
-		default: return 'N';
-		}
-	}
-
-} //class
-} // defined
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-firebird.inc.php b/includes/adodb/drivers/adodb-firebird.inc.php
deleted file mode 100644
index 281f0caa..00000000
--- a/includes/adodb/drivers/adodb-firebird.inc.php
+++ /dev/null
@@ -1,77 +0,0 @@
-ADODB_ibase();
-	}
-	
-	function ServerInfo()
-	{
-		$arr['dialect'] = $this->dialect;
-		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Firebird Dialect 1'; break;
-		case '2': $s = 'Firebird Dialect 2'; break;
-		default:
-		case '3': $s = 'Firebird Dialect 3'; break;
-		}
-		$arr['version'] = ADOConnection::_findvers($s);
-		$arr['description'] = $s;
-		return $arr;
-	}
-	
-	// Note that Interbase 6.5 uses this ROWS instead - don't you love forking wars!
-	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
-	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0)
-	{
-		$nrows = (integer) $nrows;
-		$offset = (integer) $offset;
-		$str = 'SELECT ';
-		if ($nrows >= 0) $str .= "FIRST $nrows "; 
-		$str .=($offset>=0) ? "SKIP $offset " : '';
-		
-		$sql = preg_replace('/^[ \t]*select/i',$str,$sql); 
-		if ($secs)
-			$rs = $this->CacheExecute($secs,$sql,$inputarr);
-		else
-			$rs = $this->Execute($sql,$inputarr);
-			
-		return $rs;
-	}
-	
-	
-};
- 
-
-class  ADORecordSet_firebird extends ADORecordSet_ibase {	
-	
-	var $databaseType = "firebird";		
-	
-	function ADORecordSet_firebird($id,$mode=false)
-	{
-		$this->ADORecordSet_ibase($id,$mode);
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-ibase.inc.php b/includes/adodb/drivers/adodb-ibase.inc.php
deleted file mode 100644
index 8efebc63..00000000
--- a/includes/adodb/drivers/adodb-ibase.inc.php
+++ /dev/null
@@ -1,887 +0,0 @@
-
-  	changed transaction handling and added experimental blob stuff
-  
-  Docs to interbase at the website
-   http://www.synectics.co.za/php3/tutorial/IB_PHP3_API.html
-   
-  To use gen_id(), see
-   http://www.volny.cz/iprenosil/interbase/ip_ib_code.htm#_code_creategen
-   
-   $rs = $conn->Execute('select gen_id(adodb,1) from rdb$database');
-   $id = $rs->fields[0];
-   $conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)");
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB_ibase extends ADOConnection {
-	var $databaseType = "ibase";
-	var $dataProvider = "ibase";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $ibase_datefmt = '%Y-%m-%d'; // For hours,mins,secs change to '%Y-%m-%d %H:%M:%S';
-	var $fmtDate = "'Y-m-d'";
-	var $ibase_timestampfmt = "%Y-%m-%d %H:%M:%S";
-	var $ibase_timefmt = "%H:%M:%S";
-	var $fmtTimeStamp = "'Y-m-d, H:i:s'";
-	var $concat_operator='||';
-	var $_transactionID;
-	var $metaTablesSQL = "select rdb\$relation_name from rdb\$relations where rdb\$relation_name not like 'RDB\$%'";
-	//OPN STUFF start
-	var $metaColumnsSQL = "select a.rdb\$field_name, a.rdb\$null_flag, a.rdb\$default_source, b.rdb\$field_length, b.rdb\$field_scale, b.rdb\$field_sub_type, b.rdb\$field_precision, b.rdb\$field_type from rdb\$relation_fields a, rdb\$fields b where a.rdb\$field_source = b.rdb\$field_name and a.rdb\$relation_name = '%s' order by a.rdb\$field_position asc";
-	//OPN STUFF end
-	var $ibasetrans;
-	var $hasGenID = true;
-	var $_bindInputArray = true;
-	var $buffers = 0;
-	var $dialect = 1;
-	var $sysDate = "cast('TODAY' as timestamp)";
-	var $sysTimeStamp = "CURRENT_TIMESTAMP"; //"cast('NOW' as timestamp)";
-	var $ansiOuter = true;
-	var $hasAffectedRows = false;
-	var $poorAffectedRows = true;
-	var $blobEncodeType = 'C';
-	var $role = false;
-	
-	function ADODB_ibase() 
-	{
-		 if (defined('IBASE_DEFAULT')) $this->ibasetrans = IBASE_DEFAULT;
-  	}
-	
-	
-	   // returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$persist=false)
-	{  
-		if (!function_exists('ibase_pconnect')) return null;
-		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
-		$fn = ($persist) ? 'ibase_pconnect':'ibase_connect';
-		if ($this->role)
-			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
-					$this->charSet,$this->buffers,$this->dialect,$this->role);
-		else	
-			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
-					$this->charSet,$this->buffers,$this->dialect);
-		
-		if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html
-			$this->replaceQuote = "''";
-		}
-		if ($this->_connectionID === false) {
-			$this->_handleerror();
-			return false;
-		}
-		
-		// PHP5 change.
-		if (function_exists('ibase_timefmt')) {
-			ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
-			if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
-			else ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
-			ibase_timefmt($this->ibase_timefmt,IBASE_TIME );
-			
-		} else {
-			ini_set("ibase.timestampformat", $this->ibase_timestampfmt);
-			ini_set("ibase.dateformat", $this->ibase_datefmt);
-			ini_set("ibase.timeformat", $this->ibase_timefmt);
-		}
-		return true;
-	}
-	   // returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,true);
-	}	
-	
-	
-	function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
-	{	
-		if ($internalKey) return array('RDB$DB_KEY');
-		
-		$table = strtoupper($table);
-		
-		$sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME
-	FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME  
-	WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\'
-	ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
-
-		$a = $this->GetCol($sql,false,true);
-		if ($a && sizeof($a)>0) return $a;
-		return false;	  
-	}
-	
-	function ServerInfo()
-	{
-		$arr['dialect'] = $this->dialect;
-		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Interbase 5.5 or earlier'; break;
-		case '2': $s = 'Interbase 5.6'; break;
-		default:
-		case '3': $s = 'Interbase 6.0'; break;
-		}
-		$arr['version'] = ADOConnection::_findvers($s);
-		$arr['description'] = $s;
-		return $arr;
-	}
-
-	function BeginTrans()
-	{	 
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->autoCommit = false;
-	 	$this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
-		return $this->_transactionID;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = false;
-		$this->autoCommit = true;
-		if ($this->_transactionID) {
-			   		//print ' commit ';
-			$ret = ibase_commit($this->_transactionID);
-		}
-		$this->_transactionID = false;
-		return $ret;
-	}
-	
-	// there are some compat problems with ADODB_COUNTRECS=false and $this->_logsql currently.
-	// it appears that ibase extension cannot support multiple concurrent queryid's
-	function _Execute($sql,$inputarr=false) 
-	{
-	global $ADODB_COUNTRECS;
-	
-		if ($this->_logsql) {
-			$savecrecs = $ADODB_COUNTRECS;
-			$ADODB_COUNTRECS = true; // force countrecs
-			$ret = ADOConnection::_Execute($sql,$inputarr);
-			$ADODB_COUNTRECS = $savecrecs;
-		} else {
-			$ret = ADOConnection::_Execute($sql,$inputarr);
-		}
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = false;
-		$this->autoCommit = true;
-		if ($this->_transactionID) 
-				  $ret = ibase_rollback($this->_transactionID);
-		$this->_transactionID = false;   
-		
-		return $ret;
-	}
-	
-	function MetaIndexes ($table, $primary = FALSE, $owner=false)
-	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        $false = false;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        $table = strtoupper($table);
-        $sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = '".$table."'";
-        if (!$primary) {
-        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'";
-        } else {
-        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'";
-        }
-        // get index details
-        $rs = $this->Execute($sql);
-        if (!is_object($rs)) {
-	        // restore fetchmode
-	        if (isset($savem)) {
-	            $this->SetFetchMode($savem);
-	        }
-	        $ADODB_FETCH_MODE = $save;
-            return $false;
-        }
-        
-        $indexes = array();
-		while ($row = $rs->FetchRow()) {
-			$index = $row[0];
-             if (!isset($indexes[$index])) {
-             		if (is_null($row[3])) {$row[3] = 0;}
-                     $indexes[$index] = array(
-                             'unique' => ($row[3] == 1),
-                             'columns' => array()
-                     );
-             }
-			$sql = "SELECT * FROM RDB\$INDEX_SEGMENTS WHERE RDB\$INDEX_NAME = '".$index."' ORDER BY RDB\$FIELD_POSITION ASC";
-			$rs1 = $this->Execute($sql);
-            while ($row1 = $rs1->FetchRow()) {
-             	$indexes[$index]['columns'][$row1[2]] = $row1[1];
-        	}
-		}
-        // restore fetchmode
-        if (isset($savem)) {
-            $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-        
-        return $indexes;
-	}
-
-	
-	// See http://community.borland.com/article/0,1410,25844,00.html
-	function RowLock($tables,$where,$col)
-	{
-		if ($this->autoCommit) $this->BeginTrans();
-		$this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim?
-		return 1;
-	}
-	
-	
-	function CreateSequence($seqname,$startID=1)
-	{
-		$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
-		if (!$ok) return false;
-		return $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
-	}
-	
-	function DropSequence($seqname)
-	{
-		$seqname = strtoupper($seqname);
-		$this->Execute("delete from RDB\$GENERATORS where RDB\$GENERATOR_NAME='$seqname'");
-	}
-	
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		$getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
-		$rs = @$this->Execute($getnext);
-		if (!$rs) {
-			$this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
-			$this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
-			$rs = $this->Execute($getnext);
-		}
-		if ($rs && !$rs->EOF) $this->genID = (integer) reset($rs->fields);
-		else $this->genID = 0; // false
-		
-		if ($rs) $rs->Close();
-		
-		return $this->genID;
-	}
-
-	function SelectDB($dbName) 
-	{
-		   return false;
-	}
-
-	function _handleerror()
-	{
-		$this->_errorMsg = ibase_errmsg();
-	}
-
-	function ErrorNo() 
-	{
-		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1];
-		else return 0;
-	}
-
-	function ErrorMsg() 
-	{
-			return $this->_errorMsg;
-	}
-
-	function Prepare($sql)
-	{
-		$stmt = ibase_prepare($this->_connectionID,$sql);
-		if (!$stmt) return false;
-		return array($sql,$stmt);
-	}
-
-	   // returns query ID if successful, otherwise false
-	   // there have been reports of problems with nested queries - the code is probably not re-entrant?
-	function _query($sql,$iarr=false)
-	{ 
-
-		if (!$this->autoCommit && $this->_transactionID) {
-			$conn = $this->_transactionID;
-			$docommit = false;
-		} else {
-			$conn = $this->_connectionID;
-			$docommit = true;
-		}
-		if (is_array($sql)) {
-			$fn = 'ibase_execute';
-			$sql = $sql[1];
-			if (is_array($iarr)) {
-				if  (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
-					if ( !isset($iarr[0]) ) $iarr[0] = ''; // PHP5 compat hack
-					$fnarr = array_merge( array($sql) , $iarr);
-					$ret = call_user_func_array($fn,$fnarr);
-				} else {
-					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($sql,$iarr[0]); break;
-					case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
-					}
-				}
-			} else $ret = $fn($sql); 
-		} else {
-			$fn = 'ibase_query';
-		
-			if (is_array($iarr)) {	
-				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
-					if (sizeof($iarr) == 0) $iarr[0] = ''; // PHP5 compat hack
-					$fnarr = array_merge( array($conn,$sql) , $iarr);
-					$ret = call_user_func_array($fn,$fnarr);
-				} else {
-					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
-					case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
-					}
-				}
-			} else $ret = $fn($conn,$sql); 
-		}
-		if ($docommit && $ret === true) ibase_commit($this->_connectionID);
-
-		$this->_handleerror();
-		return $ret;
-	}
-
-	 // returns true or false
-	 function _close()
-	 {	   
-		if (!$this->autoCommit) @ibase_rollback($this->_connectionID);
-		return @ibase_close($this->_connectionID);
-	 }
-	
-	//OPN STUFF start
-	function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3)
-	{
-		$fscale = abs($fscale);
-		$fld->max_length = $flen;
-		$fld->scale = null;
-		switch($ftype){
-			case 7: 
-			case 8:
-				if ($dialect3) {
-				    switch($fsubtype){
-				    	case 0: 
-				    		$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
-				    		break;
-				    	case 1: 
-				    		$fld->type = 'numeric';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    	case 2:
-				    		$fld->type = 'decimal';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    } // switch
-				} else {
-					if ($fscale !=0) {
-					    $fld->type = 'decimal';
-						$fld->scale = $fscale;
-						$fld->max_length = ($ftype == 7 ? 4 : 9);
-					} else {
-						$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
-					}
-				}
-				break;
-			case 16: 
-				if ($dialect3) {
-				    switch($fsubtype){
-				    	case 0: 
-				    		$fld->type = 'decimal';
-							$fld->max_length = 18;
-							$fld->scale = 0;
-				    		break;
-				    	case 1: 
-				    		$fld->type = 'numeric';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    	case 2:
-				    		$fld->type = 'decimal';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    } // switch
-				}
-				break;
-			case 10:
-				$fld->type = 'float';
-				break;
-			case 14:
-				$fld->type = 'char';
-				break;
-			case 27:
-				if ($fscale !=0) {
-				    $fld->type = 'decimal';
-					$fld->max_length = 15;
-					$fld->scale = 5;
-				} else {
-					$fld->type = 'double';
-				}
-				break;
-			case 35:
-				if ($dialect3) {
-				    $fld->type = 'timestamp';
-				} else {
-					$fld->type = 'date';
-				}
-				break;
-			case 12:
-				$fld->type = 'date';
-				break;
-			case 13:
-				$fld->type = 'time';
-				break;
-			case 37:
-				$fld->type = 'varchar';
-				break;
-			case 40:
-				$fld->type = 'cstring';
-				break;
-			case 261:
-				$fld->type = 'blob';
-				$fld->max_length = -1;
-				break;
-		} // switch
-	}
-	//OPN STUFF end
-		// returns array of ADOFieldObjects for current table
-	function MetaColumns($table) 
-	{
-	global $ADODB_FETCH_MODE;
-		
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-	
-		$ADODB_FETCH_MODE = $save;
-		$false = false;
-		if ($rs === false) {
-			return $false;
-		}
-		
-		$retarr = array();
-		//OPN STUFF start
-		$dialect3 = ($this->dialect==3 ? true : false);
-		//OPN STUFF end
-		while (!$rs->EOF) { //print_r($rs->fields);
-			$fld = new ADOFieldObject();
-			$fld->name = trim($rs->fields[0]);
-			//OPN STUFF start
-			$this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $dialect3);
-			if (isset($rs->fields[1]) && $rs->fields[1]) {
-				$fld->not_null = true;
-			}				
-			if (isset($rs->fields[2])) {
-				
-				$fld->has_default = true;
-				$d = substr($rs->fields[2],strlen('default '));
-				switch ($fld->type)
-				{
-				case 'smallint':
-				case 'integer': $fld->default_value = (int) $d; break;
-				case 'char': 
-				case 'blob':
-				case 'text':
-				case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
-				case 'double':
-				case 'float': $fld->default_value = (float) $d; break;
-				default: $fld->default_value = $d; break;
-				}
-		//	case 35:$tt = 'TIMESTAMP'; break;
-			}
-			if ((isset($rs->fields[5])) && ($fld->type == 'blob')) {
-				$fld->sub_type = $rs->fields[5];
-			} else {
-				$fld->sub_type = null;
-			}
-			//OPN STUFF end
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		if ( empty($retarr)) return $false;
-		else return $retarr;	
-	}
-	
-	function BlobEncode( $blob ) 
-	{
-		$blobid = ibase_blob_create( $this->_connectionID);
-		ibase_blob_add( $blobid, $blob );
-		return ibase_blob_close( $blobid );
-	}
-	
-	// since we auto-decode all blob's since 2.42, 
-	// BlobDecode should not do any transforms
-	function BlobDecode($blob)
-	{
-		return $blob; 
-	}
-	
-	
-	
-	
-	// old blobdecode function
-	// still used to auto-decode all blob's
-	function _BlobDecode_old( $blob ) 
-	{
-		$blobid = ibase_blob_open($this->_connectionID, $blob );
-		$realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet 
-		while($string = ibase_blob_get($blobid, 8192)){ 
-			$realblob .= $string; 
-		}
-		ibase_blob_close( $blobid );
-
-		return( $realblob );
-	} 
-	
-	function _BlobDecode( $blob ) 
-    {
-        if  (ADODB_PHPVER >= 0x5000) {
-            $blob_data = ibase_blob_info($this->_connectionID, $blob );
-            $blobid = ibase_blob_open($this->_connectionID, $blob );
-        } else {
-
-            $blob_data = ibase_blob_info( $blob );
-            $blobid = ibase_blob_open( $blob );
-        }
-
-        if( $blob_data[0] > $this->maxblobsize ) {
-
-            $realblob = ibase_blob_get($blobid, $this->maxblobsize);
-
-            while($string = ibase_blob_get($blobid, 8192)){
-                $realblob .= $string; 
-            }
-        } else {
-            $realblob = ibase_blob_get($blobid, $blob_data[0]);
-        }
-
-        ibase_blob_close( $blobid );
-        return( $realblob );
-	}
-	
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
-		$fd = fopen($path,'rb'); 
-		if ($fd === false) return false; 
-		$blob_id = ibase_blob_create($this->_connectionID); 
-		
-		/* fill with data */ 
-		
-		while ($val = fread($fd,32768)){ 
-			ibase_blob_add($blob_id, $val); 
-		} 
-		
-		/* close and get $blob_id_str for inserting into table */ 
-		$blob_id_str = ibase_blob_close($blob_id); 
-		
-		fclose($fd); 
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
-	} 
-	
-	/*
-		Insert a null into the blob field of the table first.
-		Then use UpdateBlob to store the blob.
-		
-		Usage:
-		 
-		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') 
-	{ 
-	$blob_id = ibase_blob_create($this->_connectionID); 
-	
-	// ibase_blob_add($blob_id, $val); 
-	
-	// replacement that solves the problem by which only the first modulus 64K / 
-	// of $val are stored at the blob field //////////////////////////////////// 
-	// Thx Abel Berenstein  aberenstein#afip.gov.ar
-	$len = strlen($val); 
-	$chunk_size = 32768; 
-	$tail_size = $len % $chunk_size; 
-	$n_chunks = ($len - $tail_size) / $chunk_size; 
-	
-	for ($n = 0; $n < $n_chunks; $n++) { 
-		$start = $n * $chunk_size; 
-		$data = substr($val, $start, $chunk_size); 
-		ibase_blob_add($blob_id, $data); 
-	} 
-	
-	if ($tail_size) {
-		$start = $n_chunks * $chunk_size; 
-		$data = substr($val, $start, $tail_size); 
-		ibase_blob_add($blob_id, $data); 
-	}
-	// end replacement ///////////////////////////////////////////////////////// 
-	
-	$blob_id_str = ibase_blob_close($blob_id); 
-	
-	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
-	
-	} 
-	
-	
-	function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		$blob_id = ibase_blob_create($this->_connectionID);
-		ibase_blob_add($blob_id, $val);
-		$blob_id_str = ibase_blob_close($blob_id);
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	// Only since Interbase 6.0 - uses EXTRACT
-	// problem - does not zero-fill the day and month yet
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysDate;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '||';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "extract(year from $col)";
-				break;
-			case 'M':
-			case 'm':
-				$s .= "extract(month from $col)";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "cast(((extract(month from $col)+2) / 3) as integer)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "(extract(day from $col))";
-				break;
-			case 'H':
-			case 'h':
-			  $s .= "(extract(hour from $col))";
-			  break;                        
-			case 'I':
-			case 'i':
-			  $s .= "(extract(minute from $col))";
-			  break;                
-			case 'S':
-			case 's':
-			  $s .= "CAST((extract(second from $col)) AS INTEGER)";
-			  break;        
-
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
-			}
-		}
-		return $s;
-	}
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_ibase extends ADORecordSet
-{
-
-	var $databaseType = "ibase";
-	var $bind=false;
-	var $_cacheType;
-	
-	function ADORecordset_ibase($id,$mode=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-			$this->fetchMode = ($mode === false) ? $ADODB_FETCH_MODE : $mode;
-			$this->ADORecordSet($id);
-	}
-
-	/*		Returns: an object containing field information.
-			Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			fetchField() is retrieved.		*/
-
-	function FetchField($fieldOffset = -1)
-	{
-			 $fld = new ADOFieldObject;
-			 $ibf = ibase_field_info($this->_queryID,$fieldOffset);
-			 switch (ADODB_ASSOC_CASE) {
-			 case 2: // the default
-			 	$fld->name = ($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = ($ibf['name']);
-				 break;
-			 case 0: 
-				 $fld->name = strtoupper($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = strtoupper($ibf['name']);
-				 break;
-			 case 1: 
-			 	$fld->name = strtolower($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
-				 break;
-			 }
-			 
-			 $fld->type = $ibf['type'];
-			 $fld->max_length = $ibf['length'];
-			 
-			 /*       This needs to be populated from the metadata */ 
-			 $fld->not_null = false;
-			 $fld->has_default = false;
-			 $fld->default_value = 'null';
-			 return $fld;
-	}
-
-	function _initrs()
-	{
-		$this->_numOfRows = -1;
-		$this->_numOfFields = @ibase_num_fields($this->_queryID);
-
-		// cache types for blob decode check
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-			$f1 = $this->FetchField($i); 
-			$this->_cacheType[] = $f1->type;
-		}				
-	}
-
-	function _seek($row)
-	{
-		return false;
-	}
-	
-	function _fetch() 
-	{
-		$f = @ibase_fetch_row($this->_queryID); 
-		if ($f === false) {
-			$this->fields = false;
-			return false;
-		}
-		// OPN stuff start - optimized
-		// fix missing nulls and decode blobs automatically
-	
-		global $ADODB_ANSI_PADDING_OFF;
-		//$ADODB_ANSI_PADDING_OFF=1;
-		$rtrim = !empty($ADODB_ANSI_PADDING_OFF);
-		
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-			if ($this->_cacheType[$i]=="BLOB") {
-				if (isset($f[$i])) { 
-					$f[$i] = $this->connection->_BlobDecode($f[$i]); 
-				} else { 
-					$f[$i] = null; 
-				} 
-			} else { 
-				if (!isset($f[$i])) { 
-					$f[$i] = null; 
-				} else if ($rtrim && is_string($f[$i])) {
-					$f[$i] = rtrim($f[$i]);
-				}
-			} 
-		} 
-		// OPN stuff end 
-		
-		$this->fields = $f;
-		if ($this->fetchMode == ADODB_FETCH_ASSOC) {
-			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-		} else if ($this->fetchMode == ADODB_FETCH_BOTH) {
-			$this->fields = array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
-		}
-		return true;
-	}
-
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		return $this->fields[$this->bind[strtoupper($colname)]];
-		
-	}
-	
-
-	function _close() 
-	{
-			return @ibase_free_result($this->_queryID);
-	}
-
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-		case 'CHAR':
-			return 'C';
-			
-		case 'TEXT':
-		case 'VARCHAR':
-		case 'VARYING':
-		if ($len <= $this->blobSize) return 'C';
-			return 'X';
-		case 'BLOB':
-			return 'B';
-			   
-		case 'TIMESTAMP':
-		case 'DATE': return 'D';
-		case 'TIME': return 'T';
-				//case 'T': return 'T';
-
-				//case 'L': return 'L';
-		case 'INT': 
-		case 'SHORT':
-		case 'INTEGER': return 'I';
-		default: return 'N';
-		}
-	}
-
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-informix.inc.php b/includes/adodb/drivers/adodb-informix.inc.php
deleted file mode 100644
index 69c9cd1e..00000000
--- a/includes/adodb/drivers/adodb-informix.inc.php
+++ /dev/null
@@ -1,40 +0,0 @@
-ADORecordset_informix72($id,$mode);
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-informix72.inc.php b/includes/adodb/drivers/adodb-informix72.inc.php
deleted file mode 100644
index 78869514..00000000
--- a/includes/adodb/drivers/adodb-informix72.inc.php
+++ /dev/null
@@ -1,475 +0,0 @@
-
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('IFX_SCROLL')) define('IFX_SCROLL',1);
-
-class ADODB_informix72 extends ADOConnection {
-	var $databaseType = "informix72";
-	var $dataProvider = "informix";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasInsertID = true;
-	var $hasAffectedRows = true;
-    var $substr = 'substr';
-	var $metaTablesSQL="select tabname,tabtype from systables where tabtype in ('T','V') and owner!='informix'"; //Don't get informix tables and pseudo-tables
-
-
-	var $metaColumnsSQL = 
-		"select c.colname, c.coltype, c.collength, d.default,c.colno
-		from syscolumns c, systables t,outer sysdefaults d
-		where c.tabid=t.tabid and d.tabid=t.tabid and d.colno=c.colno
-		and tabname='%s' order by c.colno";
-
-	var $metaPrimaryKeySQL =
-		"select part1,part2,part3,part4,part5,part6,part7,part8 from
-		systables t,sysconstraints s,sysindexes i where t.tabname='%s'
-		and s.tabid=t.tabid and s.constrtype='P'
-		and i.idxname=s.idxname";
-
-	var $concat_operator = '||';
-
-	var $lastQuery = false;
-	var $has_insertid = true;
-
-	var $_autocommit = true;
-	var $_bindInputArray = true;  // set to true if ADOConnection.Execute() permits binding of array parameters.
-	var $sysDate = 'TODAY';
-	var $sysTimeStamp = 'CURRENT';
-	var $cursorType = IFX_SCROLL; // IFX_SCROLL or IFX_HOLD or 0
-   
-	function ADODB_informix72()
-	{
-		// alternatively, use older method:
-		//putenv("DBDATE=Y4MD-");
-		
-		// force ISO date format
-		putenv('GL_DATE=%Y-%m-%d');
-		
-		if (function_exists('ifx_byteasvarchar')) {
-			ifx_byteasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
-        	ifx_textasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
-        	ifx_blobinfile_mode(0); // Mode "0" means save Byte-Blobs in memory, and mode "1" means save Byte-Blobs in a file.
-		}
-	}
-	
-	function ServerInfo()
-	{
-	    if (isset($this->version)) return $this->version;
-	
-	    $arr['description'] = $this->GetOne("select DBINFO('version','full') from systables where tabid = 1");
-	    $arr['version'] = $this->GetOne("select DBINFO('version','major') || DBINFO('version','minor') from systables where tabid = 1");
-	    $this->version = $arr;
-	    return $arr;
-	}
-
-
-
-	function _insertid()
-	{
-		$sqlca =ifx_getsqlca($this->lastQuery);
-		return @$sqlca["sqlerrd1"];
-	}
-
-	function _affectedrows()
-	{
-		if ($this->lastQuery) {
-		   return @ifx_affected_rows ($this->lastQuery);
-		}
-		return 0;
-	}
-
-	function BeginTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->Execute('BEGIN');
-		$this->_autocommit = false;
-		return true;
-	}
-
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
-		$this->_autocommit = true;
-		return true;
-	}
-
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
-		$this->_autocommit = true;
-		return true;
-	}
-
-	function RowLock($tables,$where,$flds='1 as ignore')
-	{
-		if ($this->_autocommit) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
-	}
-
-	/*	Returns: the last error message from previous database operation
-		Note: This function is NOT available for Microsoft SQL Server.	*/
-
-	function ErrorMsg() 
-	{
-		if (!empty($this->_logsql)) return $this->_errorMsg;
-		$this->_errorMsg = ifx_errormsg();
-		return $this->_errorMsg;
-	}
-
-	function ErrorNo()
-	{
-		preg_match("/.*SQLCODE=([^\]]*)/",ifx_error(),$parse);
-		if (is_array($parse) && isset($parse[1])) return (int)$parse[1]; 
-		return 0;
-	}
-
-   
-    function MetaColumns($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$false = false;
-		if (!empty($this->metaColumnsSQL)) {
-			$save = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-          		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			if ($rs === false) return $false;
-			$rspkey = $this->Execute(sprintf($this->metaPrimaryKeySQL,$table)); //Added to get primary key colno items
-
-			$retarr = array();
-			while (!$rs->EOF) { //print_r($rs->fields);
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[0];
-/*  //!eos.
-						$rs->fields[1] is not the correct adodb type
-						$rs->fields[2] is not correct max_length, because can include not-null bit
-
-				$fld->type = $rs->fields[1];
-				$fld->primary_key=$rspkey->fields && array_search($rs->fields[4],$rspkey->fields); //Added to set primary key flag
-				$fld->max_length = $rs->fields[2];*/
-				$pr=ifx_props($rs->fields[1],$rs->fields[2]); //!eos
-				$fld->type = $pr[0] ;//!eos
-				$fld->primary_key=$rspkey->fields && array_search($rs->fields[4],$rspkey->fields);
-				$fld->max_length = $pr[1]; //!eos
-				$fld->precision = $pr[2] ;//!eos
-				$fld->not_null = $pr[3]=="N"; //!eos
-
-				if (trim($rs->fields[3]) != "AAAAAA 0") {
-	                    		$fld->has_default = 1;
-	                    		$fld->default_value = $rs->fields[3];
-				} else {
-					$fld->has_default = 0;
-				}
-
-                $retarr[strtolower($fld->name)] = $fld;	
-				$rs->MoveNext();
-			}
-
-			$rs->Close();
-			$rspkey->Close(); //!eos
-			return $retarr;	
-		}
-
-		return $false;
-	}
-	
-   function xMetaColumns($table)
-   {
-		return ADOConnection::MetaColumns($table,false);
-   }
-
-	 function MetaForeignKeys($table, $owner=false, $upper=false) //!Eos
-	{
-		$sql = "
-			select tr.tabname,updrule,delrule,
-			i.part1 o1,i2.part1 d1,i.part2 o2,i2.part2 d2,i.part3 o3,i2.part3 d3,i.part4 o4,i2.part4 d4,
-			i.part5 o5,i2.part5 d5,i.part6 o6,i2.part6 d6,i.part7 o7,i2.part7 d7,i.part8 o8,i2.part8 d8
-			from systables t,sysconstraints s,sysindexes i,
-			sysreferences r,systables tr,sysconstraints s2,sysindexes i2
-			where t.tabname='$table'
-			and s.tabid=t.tabid and s.constrtype='R' and r.constrid=s.constrid
-			and i.idxname=s.idxname and tr.tabid=r.ptabid
-			and s2.constrid=r.primary and i2.idxname=s2.idxname";
-
-		$rs = $this->Execute($sql);
-		if (!$rs || $rs->EOF)  return false;
-		$arr = $rs->GetArray();
-		$a = array();
-		foreach($arr as $v) {
-			$coldest=$this->metaColumnNames($v["tabname"]);
-			$colorig=$this->metaColumnNames($table);
-			$colnames=array();
-			for($i=1;$i<=8 && $v["o$i"] ;$i++) {
-				$colnames[]=$coldest[$v["d$i"]-1]."=".$colorig[$v["o$i"]-1];
-			}
-			if($upper)
-				$a[strtoupper($v["tabname"])] =  $colnames;
-			else
-				$a[$v["tabname"]] =  $colnames;
-		}
-		return $a;
-	 }
-
-   function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB')
-   {
-   		$type = ($blobtype == 'TEXT') ? 1 : 0;
-		$blobid = ifx_create_blob($type,0,$val);
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blobid));
-   }
-
-   function BlobDecode($blobid)
-   {
-   		return function_exists('ifx_byteasvarchar') ? $blobid : @ifx_get_blob($blobid);
-   }
-   
-	// returns true or false
-   function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('ifx_connect')) return null;
-		
-		$dbs = $argDatabasename . "@" . $argHostname;
-		if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); 
-		putenv("INFORMIXSERVER=".trim($argHostname)); 
-		$this->_connectionID = ifx_connect($dbs,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;
-	}
-
-	// returns true or false
-   function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('ifx_connect')) return null;
-		
-		$dbs = $argDatabasename . "@" . $argHostname;
-		putenv("INFORMIXSERVER=".trim($argHostname)); 
-		$this->_connectionID = ifx_pconnect($dbs,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;
-	}
-/*
-	// ifx_do does not accept bind parameters - weird ???
-	function Prepare($sql)
-	{
-		$stmt = ifx_prepare($sql);
-		if (!$stmt) return $sql;
-		else return array($sql,$stmt);
-	}
-*/
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
-	{
-	global $ADODB_COUNTRECS;
-	
-	  // String parameters have to be converted using ifx_create_char
-	  if ($inputarr) {
-		 foreach($inputarr as $v) {
-			if (gettype($v) == 'string') {
-			   $tab[] = ifx_create_char($v);
-			}
-			else {
-			   $tab[] = $v;
-			}
-		 }
-	  }
-
-	  // In case of select statement, we use a scroll cursor in order
-	  // to be able to call "move", or "movefirst" statements
-	  if (!$ADODB_COUNTRECS && preg_match("/^\s*select/is", $sql)) {
-		 if ($inputarr) {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID, $this->cursorType, $tab);
-		 }
-		 else {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID, $this->cursorType);
-		 }
-	  }
-	  else {
-		 if ($inputarr) {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID, $tab);
-		 }
-		 else {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID);
-		 }
-	  }
-
-	  // Following line have been commented because autocommit mode is
-	  // not supported by informix SE 7.2
-
-	  //if ($this->_autocommit) ifx_query('COMMIT',$this->_connectionID);
-
-		return $this->lastQuery;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		$this->lastQuery = false;
-		return ifx_close($this->_connectionID);
-	}
-}
-
-
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_informix72 extends ADORecordSet {
-
-	var $databaseType = "informix72";
-	var $canSeek = true;
-	var $_fieldprops = false;
-
-	function ADORecordset_informix72($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id);
-	}
-
-
-
-	/*	Returns: an object containing field information.
-		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-		fetchField() is retrieved.	*/
-	function FetchField($fieldOffset = -1)
-	{
-		if (empty($this->_fieldprops)) {
-			$fp = ifx_fieldproperties($this->_queryID);
-			foreach($fp as $k => $v) {
-				$o = new ADOFieldObject;
-				$o->name = $k;
-				$arr = split(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE"
-				$o->type = $arr[0];
-				$o->max_length = $arr[1];
-				$this->_fieldprops[] = $o;
-				$o->not_null = $arr[4]=="N";
-			}
-		}
-		$ret = $this->_fieldprops[$fieldOffset];
-		return $ret;
-	}
-
-	function _initrs()
-	{
-		$this->_numOfRows = -1; // ifx_affected_rows not reliable, only returns estimate -- ($ADODB_COUNTRECS)? ifx_affected_rows($this->_queryID):-1;
-		$this->_numOfFields = ifx_num_fields($this->_queryID);
-	}
-
-	function _seek($row)
-	{
-		return @ifx_fetch_row($this->_queryID, (int) $row);
-	}
-
-   function MoveLast()
-   {
-	  $this->fields = @ifx_fetch_row($this->_queryID, "LAST");
-	  if ($this->fields) $this->EOF = false;
-	  $this->_currentRow = -1;
-
-	  if ($this->fetchMode == ADODB_FETCH_NUM) {
-		 foreach($this->fields as $v) {
-			$arr[] = $v;
-		 }
-		 $this->fields = $arr;
-	  }
-
-	  return true;
-   }
-
-   function MoveFirst()
-	{
-	  $this->fields = @ifx_fetch_row($this->_queryID, "FIRST");
-	  if ($this->fields) $this->EOF = false;
-	  $this->_currentRow = 0;
-
-	  if ($this->fetchMode == ADODB_FETCH_NUM) {
-		 foreach($this->fields as $v) {
-			$arr[] = $v;
-		 }
-		 $this->fields = $arr;
-	  }
-
-	  return true;
-   }
-
-   function _fetch($ignore_fields=false)
-   {
-
-		$this->fields = @ifx_fetch_row($this->_queryID);
-
-		if (!is_array($this->fields)) return false;
-
-		if ($this->fetchMode == ADODB_FETCH_NUM) {
-			foreach($this->fields as $v) {
-				$arr[] = $v;
-			}
-			$this->fields = $arr;
-		}
-		return true;
-	}
-
-	/*	close() only needs to be called if you are worried about using too much memory while your script
-		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-	function _close()
-	{
-		return ifx_free_result($this->_queryID);
-	}
-
-}
-/** !Eos
-* Auxiliar function to Parse coltype,collength. Used by Metacolumns
-* return: array ($mtype,$length,$precision,$nullable) (similar to ifx_fieldpropierties)
-*/
-function ifx_props($coltype,$collength){
-	$itype=fmod($coltype+1,256);
-	$nullable=floor(($coltype+1) /256) ?"N":"Y";
-	$mtype=substr(" CIIFFNNDN TBXCC     ",$itype,1);
-	switch ($itype){
-		case 2:
-			$length=4;
-		case 6:
-		case 9:
-		case 14:
-			$length=floor($collength/256);
-			$precision=fmod($collength,256);
-			break;
-		default:
-			$precision=0;
-			$length=$collength;
-	}
-	return array($mtype,$length,$precision,$nullable);
-}
-
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-ldap.inc.php b/includes/adodb/drivers/adodb-ldap.inc.php
deleted file mode 100644
index b0237e3c..00000000
--- a/includes/adodb/drivers/adodb-ldap.inc.php
+++ /dev/null
@@ -1,419 +0,0 @@
-port);
-		
-		if ( strstr( $host, ':' ) ) {
-		    $conn_info = split( ':', $host );
-		} 
-		
-		$this->_connectionID = @ldap_connect( $conn_info[0], $conn_info[1] );
-		if (!$this->_connectionID) {
-			$e = 'Could not connect to ' . $conn_info[0];
-			$this->_errorMsg = $e;
-			if ($this->debug) ADOConnection::outp($e);
-			return false;
-		}
-		if( count( $LDAP_CONNECT_OPTIONS ) > 0 ) {
-			$this->_inject_bind_options( $LDAP_CONNECT_OPTIONS );
-		}
-		
-		if ($username) {
-		    $bind = @ldap_bind( $this->_connectionID, $username, $password );
-		} else {
-			$username = 'anonymous';
-		    $bind = @ldap_bind( $this->_connectionID );		
-		}
-		
-		if (!$bind) {
-			$e = sprintf($this->_bind_errmsg,ldap_error($this->_connectionID));
-			$this->_errorMsg = $e;
-			if ($this->debug) ADOConnection::outp($e);
-			return false;
-		}
-		$this->_errorMsg = '';
-		$this->database = $ldapbase;
-		return $this->_connectionID;
-	}
-    
-/*
-	Valid Domain Values for LDAP Options:
-
-	LDAP_OPT_DEREF (integer)
-	LDAP_OPT_SIZELIMIT (integer)
-	LDAP_OPT_TIMELIMIT (integer)
-	LDAP_OPT_PROTOCOL_VERSION (integer)
-	LDAP_OPT_ERROR_NUMBER (integer)
-	LDAP_OPT_REFERRALS (boolean)
-	LDAP_OPT_RESTART (boolean)
-	LDAP_OPT_HOST_NAME (string)
-	LDAP_OPT_ERROR_STRING (string)
-	LDAP_OPT_MATCHED_DN (string)
-	LDAP_OPT_SERVER_CONTROLS (array)
-	LDAP_OPT_CLIENT_CONTROLS (array)
-
-	Make sure to set this BEFORE calling Connect()
-
-	Example:
-
-	$LDAP_CONNECT_OPTIONS = Array(
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_DEREF,
-			"OPTION_VALUE"=>2
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_SIZELIMIT,
-			"OPTION_VALUE"=>100
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_TIMELIMIT,
-			"OPTION_VALUE"=>30
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_PROTOCOL_VERSION,
-			"OPTION_VALUE"=>3
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_ERROR_NUMBER,
-			"OPTION_VALUE"=>13
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_REFERRALS,
-			"OPTION_VALUE"=>FALSE
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_RESTART,
-			"OPTION_VALUE"=>FALSE
-		)
-	);
-*/
-
-	function _inject_bind_options( $options ) {
-		foreach( $options as $option ) {
-			ldap_set_option( $this->_connectionID, $option["OPTION_NAME"], $option["OPTION_VALUE"] )
-				or die( "Unable to set server option: " . $option["OPTION_NAME"] );
-		}
-	}
-	
-	/* returns _queryID or false */
-	function _query($sql,$inputarr)
-	{
-		$rs = @ldap_search( $this->_connectionID, $this->database, $sql );
-		$this->_errorMsg = ($rs) ? '' : 'Search error on '.$sql.': '.ldap_error($this->_connectionID);
-		return $rs; 
-	}
-
-	function ErrorMsg()
-	{
-		return $this->_errorMsg;
-	}
-	
-	function ErrorNo()
-	{
-		return @ldap_errno($this->_connectionID);
-	}
-	
-    /* closes the LDAP connection */
-	function _close()
-	{
-		@ldap_close( $this->_connectionID );
-		$this->_connectionID = false;
-	}
-    
-	function SelectDB($db) {
-		$this->database = $db;
-		return true;
-	} // SelectDB
-
-    function ServerInfo()
-    {
-        if( !empty( $this->version ) ) return $this->version;
-        $version = array();
-        /*
-        Determines how aliases are handled during search. 
-        LDAP_DEREF_NEVER (0x00)
-        LDAP_DEREF_SEARCHING (0x01)
-        LDAP_DEREF_FINDING (0x02)
-        LDAP_DEREF_ALWAYS (0x03)
-        The LDAP_DEREF_SEARCHING value means aliases are dereferenced during the search but 
-        not when locating the base object of the search. The LDAP_DEREF_FINDING value means 
-        aliases are dereferenced when locating the base object but not during the search.  
-        Default: LDAP_DEREF_NEVER
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_DEREF, $version['LDAP_OPT_DEREF'] ) ;
-        switch ( $version['LDAP_OPT_DEREF'] ) {
-          case 0:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_NEVER';
-          case 1:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_SEARCHING';
-          case 2:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_FINDING';
-          case 3:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_ALWAYS';
-        }
-        
-        /* 
-        A limit on the number of entries to return from a search. 
-        LDAP_NO_LIMIT (0) means no limit.
-        Default: LDAP_NO_LIMIT
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_SIZELIMIT, $version['LDAP_OPT_SIZELIMIT'] );
-        if ( $version['LDAP_OPT_SIZELIMIT'] == 0 ) {
-           $version['LDAP_OPT_SIZELIMIT'] = 'LDAP_NO_LIMIT';
-        }
-        
-        /*
-        A limit on the number of seconds to spend on a search. 
-        LDAP_NO_LIMIT (0) means no limit.
-        Default: LDAP_NO_LIMIT
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_TIMELIMIT, $version['LDAP_OPT_TIMELIMIT'] );
-        if ( $version['LDAP_OPT_TIMELIMIT'] == 0 ) {
-           $version['LDAP_OPT_TIMELIMIT'] = 'LDAP_NO_LIMIT';
-        }
-        
-        /*
-        Determines whether the LDAP library automatically follows referrals returned by LDAP servers or not. 
-        LDAP_OPT_ON
-        LDAP_OPT_OFF
-        Default: ON
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_REFERRALS, $version['LDAP_OPT_REFERRALS'] );
-        if ( $version['LDAP_OPT_REFERRALS'] == 0 ) {
-           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_OFF';
-        } else {
-           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_ON';
-        
-        }
-        /*
-        Determines whether LDAP I/O operations are automatically restarted if they abort prematurely. 
-        LDAP_OPT_ON
-        LDAP_OPT_OFF
-        Default: OFF
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_RESTART, $version['LDAP_OPT_RESTART'] );
-        if ( $version['LDAP_OPT_RESTART'] == 0 ) {
-           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_OFF';
-        } else {
-           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_ON';
-        
-        }
-        /*
-        This option indicates the version of the LDAP protocol used when communicating with the primary LDAP server.
-        LDAP_VERSION2 (2)
-        LDAP_VERSION3 (3)
-        Default: LDAP_VERSION2 (2)
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_PROTOCOL_VERSION, $version['LDAP_OPT_PROTOCOL_VERSION'] );
-        if ( $version['LDAP_OPT_PROTOCOL_VERSION'] == 2 ) {
-           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION2';
-        } else {
-           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION3';
-        
-        }
-        /* The host name (or list of hosts) for the primary LDAP server. */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] ); 
-        
-        return $this->version = $version;
-    
-    }
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_ldap extends ADORecordSet{	
-	
-	var $databaseType = "ldap";
-	var $canSeek = false;
-	var $_entryID; /* keeps track of the entry resource identifier */
-	
-	function ADORecordSet_ldap($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: 
-		  $this->fetchMode = LDAP_NUM; 
-		break;
-		case ADODB_FETCH_ASSOC: 
-		  $this->fetchMode = LDAP_ASSOC; 
-		break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH: 
-		default:
-		  $this->fetchMode = LDAP_BOTH; 
-		break;
-		}
-	
-		$this->ADORecordSet($queryID);	
-	}
-	
-	function _initrs()
-	{
-	   /* 
-	   This could be teaked to respect the $COUNTRECS directive from ADODB
-	   It's currently being used in the _fetch() function and the
-	   GetAssoc() function
-       */
-	    $this->_numOfRows = ldap_count_entries( $this->connection->_connectionID, $this->_queryID );
-
-	}
-
-    /*
-    Return whole recordset as a multi-dimensional associative array
-	*/
-	function GetAssoc($force_array = false, $first2cols = false) 
-	{
-		$records = $this->_numOfRows;
-        $results = array();
-            for ( $i=0; $i < $records; $i++ ) {
-                foreach ( $this->fields as $k=>$v ) {
-                    if ( is_array( $v ) ) {
-                        if ( $v['count'] == 1 ) {
-                            $results[$i][$k] = $v[0];
-                        } else {
-                            array_shift( $v );
-                            $results[$i][$k] = $v;
-                        } 
-                    }
-                }
-            }
-        
-		return $results; 
-	}
-    
-    function GetRowAssoc()
-	{
-        $results = array();
-        foreach ( $this->fields as $k=>$v ) {
-            if ( is_array( $v ) ) {
-                if ( $v['count'] == 1 ) {
-                    $results[$k] = $v[0];
-                } else {
-                    array_shift( $v );
-                    $results[$k] = $v;
-                } 
-            }
-        }
- 
-		return $results; 
-	}
-		
-    function GetRowNums()
-    {
-        $results = array();
-        foreach ( $this->fields as $k=>$v ) {
-        static $i = 0;
-            if (is_array( $v )) {
-                if ( $v['count'] == 1 ) {
-                    $results[$i] = $v[0];
-                } else {
-                    array_shift( $v );
-                    $results[$i] = $v;
-                } 
-            $i++;
-            }
-        }
-        return $results;
-    }
-	
-	function _fetch()
-	{		
-		if ( $this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0 )
-        	return false;
-        	
-        if ( $this->_currentRow == 0 ) {
-		  $this->_entryID = ldap_first_entry( $this->connection->_connectionID, $this->_queryID );
-        } else {
-          $this->_entryID = ldap_next_entry( $this->connection->_connectionID, $this->_entryID );
-        }
-	    
-	    $this->fields = ldap_get_attributes( $this->connection->_connectionID, $this->_entryID );
-	    $this->_numOfFields = $this->fields['count'];	
-	    switch ( $this->fetchMode ) {
-            
-            case LDAP_ASSOC:
-            $this->fields = $this->GetRowAssoc();
-            break;
-            
-            case LDAP_NUM:
-			$this->fields = array_merge($this->GetRowNums(),$this->GetRowAssoc());
-            break;
-            
-            case LDAP_BOTH:
-            default:
-			$this->fields = $this->GetRowNums();
-            break;
-        }
-        return ( is_array( $this->fields ) );        
-	}
-	
-	function _close() {
-		@ldap_free_result( $this->_queryID );	
-		$this->_queryID = false;
-	}
-	
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-mssql.inc.php b/includes/adodb/drivers/adodb-mssql.inc.php
deleted file mode 100644
index fd951f43..00000000
--- a/includes/adodb/drivers/adodb-mssql.inc.php
+++ /dev/null
@@ -1,1054 +0,0 @@
-= 0x4300) {
-// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
-	ini_set('mssql.datetimeconvert',0); 
-} else {
-global $ADODB_mssql_mths;		// array, months must be upper-case
-
-
-	$ADODB_mssql_date_order = 'mdy'; 
-	$ADODB_mssql_mths = array(
-		'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
-		'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
-}
-
-//---------------------------------------------------------------------------
-// Call this to autoset $ADODB_mssql_date_order at the beginning of your code,
-// just after you connect to the database. Supports mdy and dmy only.
-// Not required for PHP 4.2.0 and above.
-function AutoDetect_MSSQL_Date_Order($conn)
-{
-global $ADODB_mssql_date_order;
-	$adate = $conn->GetOne('select getdate()');
-	if ($adate) {
-		$anum = (int) $adate;
-		if ($anum > 0) {
-			if ($anum > 31) {
-				//ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently");
-			} else
-				$ADODB_mssql_date_order = 'dmy';
-		} else
-			$ADODB_mssql_date_order = 'mdy';
-	}
-}
-
-class ADODB_mssql extends ADOConnection {
-	var $databaseType = "mssql";	
-	var $dataProvider = "mssql";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasInsertID = true;
-	var $substr = "substring";
-	var $length = 'len';
-	var $hasAffectedRows = true;
-	var $metaDatabasesSQL = "select name from sysdatabases where name <> 'master'";
-	var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))";
-	var $metaColumnsSQL = # xtype==61 is datetime
-"select c.name,t.name,c.length,
-	(case when c.xusertype=61 then 0 else c.xprec end),
-	(case when c.xusertype=61 then 0 else c.xscale end) 
-	from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
-	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
-	var $hasGenID = true;
-	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
-	var $sysTimeStamp = 'GetDate()';
-	var $_has_mssql_init;
-	var $maxParameterLen = 4000;
-	var $arrayClass = 'ADORecordSet_array_mssql';
-	var $uniqueSort = true;
-	var $leftOuter = '*=';
-	var $rightOuter = '=*';
-	var $ansiOuter = true; // for mssql7 or later
-	var $poorAffectedRows = true;
-	var $identitySQL = 'select SCOPE_IDENTITY()'; // 'select SCOPE_IDENTITY'; # for mssql 2000
-	var $uniqueOrderBy = true;
-	var $_bindInputArray = true;
-	
-	function ADODB_mssql() 
-	{		
-		$this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
-	}
-
-	function ServerInfo()
-	{
-	global $ADODB_FETCH_MODE;
-	
-	
-		if ($this->fetchMode === false) {
-			$savem = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		} else 
-			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
-				
-		if (0) {
-			$stmt = $this->PrepareSP('sp_server_info');
-			$val = 2;
-			$this->Parameter($stmt,$val,'attribute_id');
-			$row = $this->GetRow($stmt);
-		}
-		
-		$row = $this->GetRow("execute sp_server_info 2");
-		
-		
-		if ($this->fetchMode === false) {
-			$ADODB_FETCH_MODE = $savem;
-		} else
-			$this->SetFetchMode($savem);
-		
-		$arr['description'] = $row[2];
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " ISNULL($field, $ifNull) "; // if MS SQL Server
-	}
-	
-	function _insertid()
-	{
-	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
-	// they are in the same stored procedure, function, or batch.
-        if ($this->lastInsID !== false) {
-            return $this->lastInsID; // InsID from sp_executesql call
-        } else {
-			return $this->GetOne($this->identitySQL);
-		}
-	}
-
-	function _affectedrows()
-	{
-		return $this->GetOne('select @@rowcount');
-	}
-
-	var $_dropSeqSQL = "drop table %s";
-	
-	function CreateSequence($seq='adodbseq',$start=1)
-	{
-		
-		$this->Execute('BEGIN TRANSACTION adodbseq');
-		$start -= 1;
-		$this->Execute("create table $seq (id float(53))");
-		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-		if (!$ok) {
-				$this->Execute('ROLLBACK TRANSACTION adodbseq');
-				return false;
-		}
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
-		return true;
-	}
-
-	function GenID($seq='adodbseq',$start=1)
-	{
-		//$this->debug=1;
-		$this->Execute('BEGIN TRANSACTION adodbseq');
-		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
-		if (!$ok) {
-			$this->Execute("create table $seq (id float(53))");
-			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-			if (!$ok) {
-				$this->Execute('ROLLBACK TRANSACTION adodbseq');
-				return false;
-			}
-			$this->Execute('COMMIT TRANSACTION adodbseq'); 
-			return $start;
-		}
-		$num = $this->GetOne("select id from $seq");
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
-		return $num;
-		
-		// in old implementation, pre 1.90, we returned GUID...
-		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
-	}
-	
-
-	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		if ($nrows > 0 && $offset <= 0) {
-			$sql = preg_replace(
-				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
-			$rs = $this->Execute($sql,$inputarr);
-		} else
-			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-	
-		return $rs;
-	}
-	
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '+';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "datename(yyyy,$col)";
-				break;
-			case 'M':
-				$s .= "convert(char(3),$col,0)";
-				break;
-			case 'm':
-				$s .= "replace(str(month($col),2),' ','0')";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "datename(quarter,$col)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "replace(str(day($col),2),' ','0')";
-				break;
-			case 'h':
-				$s .= "substring(convert(char(14),$col,0),13,2)";
-				break;
-			
-			case 'H':
-				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
-				break;
-				
-			case 'i':
-				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
-				break;
-			case 's':
-				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
-				break;
-			case 'a':
-			case 'A':
-				$s .= "substring(convert(char(19),$col,0),18,2)";
-				break;
-				
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
-			}
-		}
-		return $s;
-	}
-
-	
-	function BeginTrans()
-	{
-		if ($this->transOff) return true; 
-		$this->transCnt += 1;
-	   	$this->Execute('BEGIN TRAN');
-	   	return true;
-	}
-		
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT TRAN');
-		return true;
-	}
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK TRAN');
-		return true;
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET TRANSACTION ".$transaction_mode);
-	}
-	
-	/*
-		Usage:
-		
-		$this->BeginTrans();
-		$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
-		
-		# some operation on both tables table1 and table2
-		
-		$this->CommitTrans();
-		
-		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
-	*/
-	function RowLock($tables,$where,$flds='top 1 null as ignore') 
-	{
-		if (!$this->transCnt) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables with (ROWLOCK,HOLDLOCK) where $where");
-	}
-	
-	
-	function MetaIndexes($table,$primary=false)
-	{
-		$table = $this->qstr($table);
-
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
-			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
-			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
-			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
-			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
-			ORDER BY O.name, I.Name, K.keyno";
-
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-        if (!is_object($rs)) {
-        	return FALSE;
-        }
-
-		$indexes = array();
-		while ($row = $rs->FetchRow()) {
-			if ($primary && !$row[5]) continue;
-			
-            $indexes[$row[0]]['unique'] = $row[6];
-            $indexes[$row[0]]['columns'][] = $row[1];
-    	}
-        return $indexes;
-	}
-	
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
-"select object_name(constid) as constraint_name,
-	col_name(fkeyid, fkey) as column_name,
-	object_name(rkeyid) as referenced_table_name,
-   	col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where upper(object_name(fkeyid)) = $table
-order by constraint_name, referenced_table_name, keyno";
-		
-		$constraints = $this->GetArray($sql);
-		
-		$ADODB_FETCH_MODE = $save;
-		
-		$arr = false;
-		foreach($constraints as $constr) {
-			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
-		}
-		if (!$arr) return false;
-		
-		$arr2 = false;
-		
-		foreach($arr as $k => $v) {
-			foreach($v as $a => $b) {
-				if ($upper) $a = strtoupper($a);
-				$arr2[$a] = $b;
-			}
-		}
-		return $arr2;
-	}
-
-	//From: Fernando Moreira 
-	function MetaDatabases() 
-	{ 
-		if(@mssql_select_db("master")) { 
-				 $qry=$this->metaDatabasesSQL; 
-				 if($rs=@mssql_query($qry,$this->_connectionID)){ 
-						 $tmpAr=$ar=array(); 
-						 while($tmpAr=@mssql_fetch_row($rs)) 
-								 $ar[]=$tmpAr[0]; 
-						@mssql_select_db($this->database); 
-						 if(sizeof($ar)) 
-								 return($ar); 
-						 else 
-								 return(false); 
-				 } else { 
-						 @mssql_select_db($this->database); 
-						 return(false); 
-				 } 
-		 } 
-		 return(false); 
-	} 
-
-	// "Stein-Aksel Basma" 
-	// tested with MSSQL 2000
-	function MetaPrimaryKeys($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$schema = '';
-		$this->_findschema($table,$schema);
-		if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
-
-		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
-		information_schema.table_constraints tc 
-		where tc.constraint_name = k.constraint_name and tc.constraint_type =
-		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
-		
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$a = $this->GetCol($sql);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if ($a && sizeof($a)>0) return $a;
-		$false = false;
-		return $false;	  
-	}
-
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(($mask));
-			$this->metaTablesSQL .= " AND name like $mask";
-		}
-		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
- 
-	function SelectDB($dbName) 
-	{
-		$this->database = $dbName;
-		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		if ($this->_connectionID) {
-			return @mssql_select_db($dbName);		
-		}
-		else return false;	
-	}
-	
-	function ErrorMsg() 
-	{
-		if (empty($this->_errorMsg)){
-			$this->_errorMsg = mssql_get_last_message();
-		}
-		return $this->_errorMsg;
-	}
-	
-	function ErrorNo() 
-	{
-		if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
-		if (empty($this->_errorMsg)) {
-			$this->_errorMsg = mssql_get_last_message();
-		}
-		$id = @mssql_query("select @@ERROR",$this->_connectionID);
-		if (!$id) return false;
-		$arr = mssql_fetch_array($id);
-		@mssql_free_result($id);
-		if (is_array($arr)) return $arr[0];
-	   else return -1;
-	}
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('mssql_pconnect')) return null;
-		$this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('mssql_pconnect')) return null;
-		$this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		
-		// persistent connections can forget to rollback on crash, so we do it here.
-		if ($this->autoRollback) {
-			$cnt = $this->GetOne('select @@TRANCOUNT');
-			while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); 
-		}
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	function Prepare($sql)
-	{
-		$sqlarr = explode('?',$sql);
-		if (sizeof($sqlarr) <= 1) return $sql;
-		$sql2 = $sqlarr[0];
-		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
-			$sql2 .=  '@P'.($i-1) . $sqlarr[$i];
-		} 
-		return array($sql,$this->qstr($sql2),$max,$sql2);
-	}
-	
-	function PrepareSP($sql)
-	{
-		if (!$this->_has_mssql_init) {
-			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
-			return $sql;
-		}
-		$stmt = mssql_init($sql,$this->_connectionID);
-		if (!$stmt)  return $sql;
-		return array($sql,$stmt);
-	}
-	
-	// returns concatenated string
-    // MSSQL requires integers to be cast as strings
-    // automatically cast every datatype to VARCHAR(255)
-    // @author David Rogers (introspectshun)
-    function Concat()
-    {
-            $s = "";
-            $arr = func_get_args();
-
-            // Split single record on commas, if possible
-            if (sizeof($arr) == 1) {
-                foreach ($arr as $arg) {
-                    $args = explode(',', $arg);
-                }
-                $arr = $args;
-            }
-
-            array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
-            $s = implode('+',$arr);
-            if (sizeof($arr) > 0) return "$s";
-            
-			return '';
-    }
-	
-	/* 
-	Usage:
-		$stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group
-		
-		# note that the parameter does not have @ in front!
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group',false,64);
-		$db->Execute($stmt);
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to. Can set to null (for isNull support).
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-		
-		See mssql_bind documentation at php.net.
-	*/
-	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false)
-	{
-		if (!$this->_has_mssql_init) {
-			ADOConnection::outp( "Parameter: mssql_bind only available since PHP 4.1.0");
-			return false;
-		}
-
-		$isNull = is_null($var); // php 4.0.4 and above...
-			
-		if ($type === false) 
-			switch(gettype($var)) {
-			default:
-			case 'string': $type = SQLVARCHAR; break;
-			case 'double': $type = SQLFLT8; break;
-			case 'integer': $type = SQLINT4; break;
-			case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
-			}
-		
-		if  ($this->debug) {
-			$prefix = ($isOutput) ? 'Out' : 'In';
-			$ztype = (empty($type)) ? 'false' : $type;
-			ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
-		}
-		/*
-			See http://phplens.com/lens/lensforum/msgs.php?id=7231
-			
-			RETVAL is HARD CODED into php_mssql extension:
-			The return value (a long integer value) is treated like a special OUTPUT parameter, 
-			called "RETVAL" (without the @). See the example at mssql_execute to 
-			see how it works. - type: one of this new supported PHP constants. 
-				SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8 
-		*/
-		if ($name !== 'RETVAL') $name = '@'.$name;
-		return mssql_bind($stmt[1], $name, $var, $type, $isOutput, $isNull, $maxLen);
-	}
-	
-	/* 
-		Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
-		So all your blobs must be of type "image".
-		
-		Remember to set in php.ini the following...
-		
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textlimit = 0 ; zero to pass through 
-
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textsize = 0 ; zero to pass through 
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-	
-		if (strtoupper($blobtype) == 'CLOB') {
-			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
-			return $this->Execute($sql) != false;
-		}
-		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
-		return $this->Execute($sql) != false;
-	}
-	
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
-	{
-		$this->_errorMsg = false;
-		if (is_array($inputarr)) {
-			
-			# bind input params with sp_executesql: 
-			# see http://www.quest-pipelines.com/newsletter-v3/0402_F.htm
-			# works only with sql server 7 and newer
-            $getIdentity = false;
-            if (!is_array($sql) && preg_match('/^\\s*insert/i', $sql)) {
-                $getIdentity = true;
-                $sql .= (preg_match('/;\\s*$/i', $sql) ? ' ' : '; ') . $this->identitySQL;
-            }
-			if (!is_array($sql)) $sql = $this->Prepare($sql);
-			$params = '';
-			$decl = '';
-			$i = 0;
-			foreach($inputarr as $v) {
-				if ($decl) {
-					$decl .= ', ';
-					$params .= ', ';
-				}	
-				if (is_string($v)) {
-					$len = strlen($v);
-					if ($len == 0) $len = 1;
-					
-					if ($len > 4000 ) {
-						// NVARCHAR is max 4000 chars. Let's use NTEXT
-						$decl .= "@P$i NTEXT";
-					} else {
-						$decl .= "@P$i NVARCHAR($len)";
-					}
-
-					$params .= "@P$i=N". (strncmp($v,"'",1)==0? $v : $this->qstr($v));
-				} else if (is_integer($v)) {
-					$decl .= "@P$i INT";
-					$params .= "@P$i=".$v;
-				} else if (is_float($v)) {
-					$decl .= "@P$i FLOAT";
-					$params .= "@P$i=".$v;
-				} else if (is_bool($v)) {
-					$decl .= "@P$i INT"; # Used INT just in case BIT in not supported on the user's MSSQL version. It will cast appropriately.
-					$params .= "@P$i=".(($v)?'1':'0'); # True == 1 in MSSQL BIT fields and acceptable for storing logical true in an int field
-				} else {
-					$decl .= "@P$i CHAR"; # Used char because a type is required even when the value is to be NULL.
-					$params .= "@P$i=NULL";
-					}
-				$i += 1;
-			}
-			$decl = $this->qstr($decl);
-			if ($this->debug) ADOConnection::outp("sp_executesql N{$sql[1]},N$decl,$params");
-			$rez = mssql_query("sp_executesql N{$sql[1]},N$decl,$params", $this->_connectionID);
-            if ($getIdentity) {
-                $arr = @mssql_fetch_row($rez);
-                $this->lastInsID = isset($arr[0]) ? $arr[0] : false;
-                @mssql_data_seek($rez, 0);
-            }
-			
-		} else if (is_array($sql)) {
-			# PrepareSP()
-			$rez = mssql_execute($sql[1]);
-            $this->lastInsID = false;
-			
-		} else {
-			$rez = mssql_query($sql,$this->_connectionID);
-            $this->lastInsID = false;
-		}
-		return $rez;
-	}
-	
-	// returns true or false
-	function _close()
-	{ 
-		if ($this->transCnt) $this->RollbackTrans();
-		$rez = @mssql_close($this->_connectionID);
-		$this->_connectionID = false;
-		return $rez;
-	}
-	
-	// mssql uses a default date like Dec 30 2000 12:00AM
-	static function UnixDate($v)
-	{
-		return ADORecordSet_array_mssql::UnixDate($v);
-	}
-	
-	static function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_mssql::UnixTimeStamp($v);
-	}	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_mssql extends ADORecordSet {	
-
-	var $databaseType = "mssql";
-	var $canSeek = true;
-	var $hasFetchAssoc; // see http://phplens.com/lens/lensforum/msgs.php?id=6083
-	// _mths works only in non-localised system
-	
-	function ADORecordset_mssql($id,$mode=false)
-	{
-		// freedts check...
-		$this->hasFetchAssoc = function_exists('mssql_fetch_assoc');
-
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id,$mode);
-	}
-	
-	
-	function _initrs()
-	{
-	GLOBAL $ADODB_COUNTRECS;	
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1;
-		$this->_numOfFields = @mssql_num_fields($this->_queryID);
-	}
-	
-
-	//Contributed by "Sven Axelsson" 
-	// get next resultset - requires PHP 4.0.5 or later
-	function NextRecordSet()
-	{
-		if (!mssql_next_result($this->_queryID)) return false;
-		$this->_inited = false;
-		$this->bind = false;
-		$this->_currentRow = -1;
-		$this->Init();
-		return true;
-	}
-
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode != ADODB_FETCH_NUM) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	/*	Returns: an object containing field information. 
-		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-		fetchField() is retrieved.	*/
-
-	function FetchField($fieldOffset = -1) 
-	{
-		if ($fieldOffset != -1) {
-			$f = @mssql_fetch_field($this->_queryID, $fieldOffset);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			$f = @mssql_fetch_field($this->_queryID);
-		}
-		$false = false;
-		if (empty($f)) return $false;
-		return $f;
-	}
-	
-	function _seek($row) 
-	{
-		return @mssql_data_seek($this->_queryID, $row);
-	}
-
-	// speedup
-	function MoveNext() 
-	{
-		if ($this->EOF) return false;
-		
-		$this->_currentRow++;
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			if ($this->fetchMode & ADODB_FETCH_NUM) {
-				//ADODB_FETCH_BOTH mode
-				$this->fields = @mssql_fetch_array($this->_queryID);
-			}
-			else {
-				if ($this->hasFetchAssoc) {// only for PHP 4.2.0 or later
-					 $this->fields = @mssql_fetch_assoc($this->_queryID);
-				} else {
-					$flds = @mssql_fetch_array($this->_queryID);
-					if (is_array($flds)) {
-						$fassoc = array();
-						foreach($flds as $k => $v) {
-							if (is_numeric($k)) continue;
-							$fassoc[$k] = $v;
-						}
-						$this->fields = $fassoc;
-					} else
-						$this->fields = false;
-				}
-			}
-			
-			if (is_array($this->fields)) {
-				if (ADODB_ASSOC_CASE == 0) {
-					foreach($this->fields as $k=>$v) {
-						$this->fields[strtolower($k)] = $v;
-					}
-				} else if (ADODB_ASSOC_CASE == 1) {
-					foreach($this->fields as $k=>$v) {
-						$this->fields[strtoupper($k)] = $v;
-					}
-				}
-			}
-		} else {
-			$this->fields = @mssql_fetch_row($this->_queryID);
-		}
-		if ($this->fields) return true;
-		$this->EOF = true;
-		
-		return false;
-	}
-
-	
-	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
-	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
-	function _fetch($ignore_fields=false) 
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			if ($this->fetchMode & ADODB_FETCH_NUM) {
-				//ADODB_FETCH_BOTH mode
-				$this->fields = @mssql_fetch_array($this->_queryID);
-			} else {
-				if ($this->hasFetchAssoc) // only for PHP 4.2.0 or later
-					$this->fields = @mssql_fetch_assoc($this->_queryID);
-				else {
-					$this->fields = @mssql_fetch_array($this->_queryID);
-					if (@is_array($$this->fields)) {
-						$fassoc = array();
-						foreach($$this->fields as $k => $v) {
-							if (is_integer($k)) continue;
-							$fassoc[$k] = $v;
-						}
-						$this->fields = $fassoc;
-					}
-				}
-			}
-			
-			if (!$this->fields) {
-			} else if (ADODB_ASSOC_CASE == 0) {
-				foreach($this->fields as $k=>$v) {
-					$this->fields[strtolower($k)] = $v;
-				}
-			} else if (ADODB_ASSOC_CASE == 1) {
-				foreach($this->fields as $k=>$v) {
-					$this->fields[strtoupper($k)] = $v;
-				}
-			}
-		} else {
-			$this->fields = @mssql_fetch_row($this->_queryID);
-		}
-		return $this->fields;
-	}
-	
-	/*	close() only needs to be called if you are worried about using too much memory while your script
-		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-
-	function _close() 
-	{
-		$rez = mssql_free_result($this->_queryID);	
-		$this->_queryID = false;
-		return $rez;
-	}
-	// mssql uses a default date like Dec 30 2000 12:00AM
-	static function UnixDate($v)
-	{
-		return ADORecordSet_array_mssql::UnixDate($v);
-	}
-	
-	static function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_mssql::UnixTimeStamp($v);
-	}
-	
-}
-
-
-class ADORecordSet_array_mssql extends ADORecordSet_array {
-	function ADORecordSet_array_mssql($id=-1,$mode=false) 
-	{
-		$this->ADORecordSet_array($id,$mode);
-	}
-	
-		// mssql uses a default date like Dec 30 2000 12:00AM
-	static function UnixDate($v)
-	{
-	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
-		
-	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
-		//Dec 30 2000 12:00AM 
-		if ($ADODB_mssql_date_order == 'dmy') {
-			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-				return parent::UnixDate($v);
-			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
-			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-				return parent::UnixDate($v);
-			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
-			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
-		}
-		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
-		// h-m-s-MM-DD-YY
-		return  mktime(0,0,0,$themth,$theday,$rr[3]);
-	}
-	
-	static function UnixTimeStamp($v)
-	{
-	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
-		
-	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
-		//Dec 30 2000 12:00AM
-		 if ($ADODB_mssql_date_order == 'dmy') {
-			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
-		}
-		
-		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
-		
-		switch (strtoupper($rr[6])) {
-		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
-			break;
-		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
-			break;
-		default:
-			break;
-		}
-		// h-m-s-MM-DD-YY
-		return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
-	}
-}
-
-/*
-Code Example 1:
-
-select 	object_name(constid) as constraint_name,
-       	object_name(fkeyid) as table_name, 
-        col_name(fkeyid, fkey) as column_name,
-	object_name(rkeyid) as referenced_table_name,
-   	col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where object_name(fkeyid) = x
-order by constraint_name, table_name, referenced_table_name,  keyno
-
-Code Example 2:
-select 	constraint_name,
-	column_name,
-	ordinal_position
-from information_schema.key_column_usage
-where constraint_catalog = db_name()
-and table_name = x
-order by constraint_name, ordinal_position
-
-http://www.databasejournal.com/scripts/article.php/1440551
-*/
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-mssql_n.inc.php b/includes/adodb/drivers/adodb-mssql_n.inc.php
deleted file mode 100644
index 38082982..00000000
--- a/includes/adodb/drivers/adodb-mssql_n.inc.php
+++ /dev/null
@@ -1,171 +0,0 @@
-_appendN($sql);
-		return ADODB_mssql::_query($sql,$inputarr);
-	}
-
-    /**
-     * This function will intercept all the literals used in the SQL, prepending the "N" char to them
-     * in order to allow mssql to store properly data sent in the correct UCS-2 encoding (by freeTDS
-     * and ODBTP) keeping SQL compatibility at ADOdb level (instead of hacking every project to add
-     * the "N" notation when working against MSSQL.
-     *
-     * Note that this hack only must be used if ALL the char-based columns in your DB are of type nchar,
-     * nvarchar and ntext
-     */
-    function _appendN($sql) {
-
-        $result = $sql;
-
-    /// Check we have some single quote in the query. Exit ok.
-        if (strpos($sql, SINGLEQUOTE) === false) {
-            return $sql;
-        }
-
-    /// Check we haven't an odd number of single quotes (this can cause problems below
-    /// and should be considered one wrong SQL). Exit with debug info.
-        if ((substr_count($sql, SINGLEQUOTE) & 1)) {
-            if ($this->debug) {
-                ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Wrong number of quotes (odd)");
-            }
-            return $sql;
-        }
-
-    /// Check we haven't any backslash + single quote combination. It should mean wrong
-    /// backslashes use (bad magic_quotes_sybase?). Exit with debug info.
-        $regexp = '/(\\\\' . SINGLEQUOTE . '[^' . SINGLEQUOTE . '])/';
-        if (preg_match($regexp, $sql)) {
-            if ($this->debug) {
-                ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Found bad use of backslash + single quote");
-            }
-            return $sql;
-        }
-
-    /// Remove pairs of single-quotes
-        $pairs = array();
-        $regexp = '/(' . SINGLEQUOTE . SINGLEQUOTE . ')/';
-        preg_match_all($regexp, $result, $list_of_pairs);
-        if ($list_of_pairs) {
-            foreach (array_unique($list_of_pairs[0]) as $key=>$value) {
-                $pairs['<@#@#@PAIR-'.$key.'@#@#@>'] = $value;
-            }
-            if (!empty($pairs)) {
-                $result = str_replace($pairs, array_keys($pairs), $result);
-            }
-        }
-
-    /// Remove the rest of literals present in the query
-        $literals = array();
-        $regexp = '/(N?' . SINGLEQUOTE . '.*?' . SINGLEQUOTE . ')/is';
-        preg_match_all($regexp, $result, $list_of_literals);
-        if ($list_of_literals) {
-            foreach (array_unique($list_of_literals[0]) as $key=>$value) {
-                $literals['<#@#@#LITERAL-'.$key.'#@#@#>'] = $value;
-            }
-            if (!empty($literals)) {
-                $result = str_replace($literals, array_keys($literals), $result);
-            }
-        }
-
-
-    /// Analyse literals to prepend the N char to them if their contents aren't numeric
-        if (!empty($literals)) {
-            foreach ($literals as $key=>$value) {
-                if (!is_numeric(trim($value, SINGLEQUOTE))) {
-                /// Non numeric string, prepend our dear N
-                    $literals[$key] = 'N' . trim($value, 'N'); //Trimming potentially existing previous "N"
-                }
-            }
-        }
-
-    /// Re-apply literals to the text
-        if (!empty($literals)) {
-            $result = str_replace(array_keys($literals), $literals, $result);
-        }
-
-    /// Any pairs followed by N' must be switched to N' followed by those pairs
-    /// (or strings beginning with single quotes will fail)
-        $result = preg_replace("/((<@#@#@PAIR-(\d+)@#@#@>)+)N'/", "N'$1", $result);
-
-    /// Re-apply pairs of single-quotes to the text
-        if (!empty($pairs)) {
-            $result = str_replace(array_keys($pairs), $pairs, $result);
-        }
-
-    /// Print transformation if debug = on
-        if ($result != $sql && $this->debug) {
-            ADOConnection::outp("{$this->databaseType} internal transformation:
{$sql}
to
{$result}");
-        }
-
-        return $result;
-    }
-}
-
-class ADORecordset_mssql_n extends ADORecordset_mssql {
-	var $databaseType = "mssql_n";
-	function ADORecordset_mssql_n($id,$mode=false)
-	{
-		$this->ADORecordset_mssql($id,$mode);
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-mssqlnative.inc.php b/includes/adodb/drivers/adodb-mssqlnative.inc.php
deleted file mode 100644
index f1f91f1d..00000000
--- a/includes/adodb/drivers/adodb-mssqlnative.inc.php
+++ /dev/null
@@ -1,902 +0,0 @@
-= 0x4300) {
-// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
-	ini_set('mssql.datetimeconvert',0); 
-} else {
-    global $ADODB_mssql_mths;		// array, months must be upper-case
-	$ADODB_mssql_date_order = 'mdy'; 
-	$ADODB_mssql_mths = array(
-		'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
-		'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
-}
-
-//---------------------------------------------------------------------------
-// Call this to autoset $ADODB_mssql_date_order at the beginning of your code,
-// just after you connect to the database. Supports mdy and dmy only.
-// Not required for PHP 4.2.0 and above.
-function AutoDetect_MSSQL_Date_Order($conn)
-{
-    global $ADODB_mssql_date_order;
-	$adate = $conn->GetOne('select getdate()');
-	if ($adate) {
-		$anum = (int) $adate;
-		if ($anum > 0) {
-			if ($anum > 31) {
-				//ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently");
-			} else
-				$ADODB_mssql_date_order = 'dmy';
-		} else
-			$ADODB_mssql_date_order = 'mdy';
-	}
-}
-
-class ADODB_mssqlnative extends ADOConnection {
-	var $databaseType = "mssqlnative";	
-	var $dataProvider = "mssqlnative";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasInsertID = true;
-	var $substr = "substring";
-	var $length = 'len';
-	var $hasAffectedRows = true;
-	var $poorAffectedRows = false;
-	var $metaDatabasesSQL = "select name from sys.sysdatabases where name <> 'master'";
-	var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))";
-	var $metaColumnsSQL = # xtype==61 is datetime
-        "select c.name,t.name,c.length,
-	    (case when c.xusertype=61 then 0 else c.xprec end),
-	    (case when c.xusertype=61 then 0 else c.xscale end) 
-	    from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
-	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
-	var $hasGenID = true;
-	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
-	var $sysTimeStamp = 'GetDate()';
-	var $maxParameterLen = 4000;
-	var $arrayClass = 'ADORecordSet_array_mssqlnative';
-	var $uniqueSort = true;
-	var $leftOuter = '*=';
-	var $rightOuter = '=*';
-	var $ansiOuter = true; // for mssql7 or later
-	var $identitySQL = 'select SCOPE_IDENTITY()'; // 'select SCOPE_IDENTITY'; # for mssql 2000
-	var $uniqueOrderBy = true;
-	var $_bindInputArray = true;
-	var $_dropSeqSQL = "drop table %s";
-	
-	function ADODB_mssqlnative() 
-	{		
-        if ($this->debug) {
-            error_log("
");
-            sqlsrv_set_error_handling( SQLSRV_ERRORS_LOG_ALL );
-            sqlsrv_log_set_severity( SQLSRV_LOG_SEVERITY_ALL );
-            sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
-            sqlsrv_configure('warnings_return_as_errors', 0);
-        } else {
-            sqlsrv_set_error_handling(0);
-            sqlsrv_log_set_severity(0);
-            sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
-            sqlsrv_configure('warnings_return_as_errors', 0);
-        }
-	}
-
-	function ServerInfo()
-	{
-    	global $ADODB_FETCH_MODE;
-		if ($this->fetchMode === false) {
-			$savem = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		} else 
-			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
-		$arrServerInfo = sqlsrv_server_info($this->_connectionID);
-		$arr['description'] = $arrServerInfo['SQLServerName'].' connected to '.$arrServerInfo['CurrentDatabase'];
-		$arr['version'] = $arrServerInfo['SQLServerVersion'];//ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " ISNULL($field, $ifNull) "; // if MS SQL Server
-	}
-	
-	function _insertid()
-	{
-	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
-	// they are in the same stored procedure, function, or batch.
-		return $this->GetOne($this->identitySQL);
-	}
-
-	function _affectedrows()
-	{
-        return sqlsrv_rows_affected($this->_queryID);
-	}
-	
-	function CreateSequence($seq='adodbseq',$start=1)
-	{
-		if($this->debug) error_log("
CreateSequence($seq,$start)");
-        sqlsrv_begin_transaction($this->_connectionID);
-		$start -= 1;
-		$this->Execute("create table $seq (id int)");//was float(53)
-		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-		if (!$ok) {
-            if($this->debug) error_log("
Error: ROLLBACK");
-            sqlsrv_rollback($this->_connectionID);
-			return false;
-		}
-        sqlsrv_commit($this->_connectionID);
-		return true;
-	}
-
-	function GenID($seq='adodbseq',$start=1)
-	{
-        if($this->debug) error_log("
GenID($seq,$start)");
-        sqlsrv_begin_transaction($this->_connectionID);
-		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
-		if (!$ok) {
-			$this->Execute("create table $seq (id int)");
-			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-			if (!$ok) {
-                if($this->debug) error_log("
Error: ROLLBACK");
-                sqlsrv_rollback($this->_connectionID);
-				return false;
-			}
-			sqlsrv_commit($this->_connectionID);
-			return $start;
-		}
-		$num = $this->GetOne("select id from $seq");
-        sqlsrv_commit($this->_connectionID);
-        if($this->debug) error_log(" Returning: $num");
-		return $num;
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '+';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "datename(yyyy,$col)";
-				break;
-			case 'M':
-				$s .= "convert(char(3),$col,0)";
-				break;
-			case 'm':
-				$s .= "replace(str(month($col),2),' ','0')";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "datename(quarter,$col)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "replace(str(day($col),2),' ','0')";
-				break;
-			case 'h':
-				$s .= "substring(convert(char(14),$col,0),13,2)";
-				break;
-			
-			case 'H':
-				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
-				break;
-				
-			case 'i':
-				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
-				break;
-			case 's':
-				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
-				break;
-			case 'a':
-			case 'A':
-				$s .= "substring(convert(char(19),$col,0),18,2)";
-				break;
-				
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
-			}
-		}
-		return $s;
-	}
-
-	
-	function BeginTrans()
-	{
-		if ($this->transOff) return true; 
-		$this->transCnt += 1;
-        if ($this->debug) error_log('
begin transaction');
-		sqlsrv_begin_transaction($this->_connectionID);
-	   	return true;
-	}
-		
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-        if ($this->debug) error_log('
commit transaction');
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		sqlsrv_commit($this->_connectionID);
-		return true;
-	}
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-        if ($this->debug) error_log('
rollback transaction');
-		if ($this->transCnt) $this->transCnt -= 1;
-		sqlsrv_rollback($this->_connectionID);
-		return true;
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET TRANSACTION ".$transaction_mode);
-	}
-	
-	/*
-		Usage:
-		
-		$this->BeginTrans();
-		$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
-		
-		# some operation on both tables table1 and table2
-		
-		$this->CommitTrans();
-		
-		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
-	*/
-	function RowLock($tables,$where,$flds='top 1 null as ignore') 
-	{
-		if (!$this->transCnt) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables with (ROWLOCK,HOLDLOCK) where $where");
-	}
-	 
-	function SelectDB($dbName) 
-	{
-		$this->database = $dbName;
-		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		if ($this->_connectionID) {
-            $rs = $this->Execute('USE '.$dbName); 
-            if($rs) {
-                return true;
-            } else return false;		
-		}
-		else return false;	
-	}
-	
-	function ErrorMsg() 
-	{
-		$retErrors = sqlsrv_errors(SQLSRV_ERR_ALL);
-		if($retErrors != null) {
-			foreach($retErrors as $arrError) {
-				$this->_errorMsg .= "SQLState: ".$arrError[ 'SQLSTATE']."\n";
-				$this->_errorMsg .= "Error Code: ".$arrError[ 'code']."\n";
-				$this->_errorMsg .= "Message: ".$arrError[ 'message']."\n";
-			}
-		} else {
-			$this->_errorMsg = "No errors found";
-		}
-		return $this->_errorMsg;
-	}
-	
-	function ErrorNo() 
-	{
-		if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
-		$err = sqlsrv_errors(SQLSRV_ERR_ALL);
-        if($err[0]) return $err[0]['code'];
-        else return -1;
-	}
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sqlsrv_connect')) return null;
-        $connectionInfo = array("Database"=>$argDatabasename,'UID'=>$argUsername,'PWD'=>$argPassword);
-        if ($this->debug) error_log("
connecting... hostname: $argHostname params: ".var_export($connectionInfo,true));
-        //if ($this->debug) error_log("
_connectionID before: ".serialize($this->_connectionID));
-        if(!($this->_connectionID = sqlsrv_connect($argHostname,$connectionInfo))) { 
-            if ($this->debug) error_log( "
errors: ".print_r( sqlsrv_errors(), true));
-            return false;
-        }
-        //if ($this->debug) error_log(" _connectionID after: ".serialize($this->_connectionID));
-        //if ($this->debug) error_log("
defined functions: 
".var_export(get_defined_functions(),true)."
");
-		return true;	
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		//return null;//not implemented. NOTE: Persistent connections have no effect if PHP is used as a CGI program. (FastCGI!)
-        return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
-	}
-	
-	function Prepare($sql)
-	{
-		$stmt = sqlsrv_prepare( $this->_connectionID, $sql);
-		if (!$stmt)  return $sql;
-		return array($sql,$stmt);
-	}
-	
-	// returns concatenated string
-    // MSSQL requires integers to be cast as strings
-    // automatically cast every datatype to VARCHAR(255)
-    // @author David Rogers (introspectshun)
-    function Concat()
-    {
-        $s = "";
-        $arr = func_get_args();
-
-        // Split single record on commas, if possible
-        if (sizeof($arr) == 1) {
-            foreach ($arr as $arg) {
-                $args = explode(',', $arg);
-            }
-            $arr = $args;
-        }
-
-        array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
-        $s = implode('+',$arr);
-        if (sizeof($arr) > 0) return "$s";
-        
-		return '';
-    }
-	
-	/* 
-		Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
-		So all your blobs must be of type "image".
-		
-		Remember to set in php.ini the following...
-		
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textlimit = 0 ; zero to pass through 
-
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textsize = 0 ; zero to pass through 
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-	
-		if (strtoupper($blobtype) == 'CLOB') {
-			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
-			return $this->Execute($sql) != false;
-		}
-		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
-		return $this->Execute($sql) != false;
-	}
-	
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
-	{
-		$this->_errorMsg = false;
-		if (is_array($inputarr)) {
-            $rez = sqlsrv_query($this->_connectionID,$sql,$inputarr);
-		} else if (is_array($sql)) {
-            $rez = sqlsrv_query($this->_connectionID,$sql[1],$inputarr);
-		} else {
-			$rez = sqlsrv_query($this->_connectionID,$sql);
-		}
-        if ($this->debug) error_log("
running query: ".var_export($sql,true)."
input array: ".var_export($inputarr,true)."
result: ".var_export($rez,true));//"
connection: ".serialize($this->_connectionID)
-        //fix for returning true on anything besides select statements
-        if (is_array($sql)) $sql = $sql[1];
-        $sql = ltrim($sql);
-        if(stripos($sql, 'SELECT') !== 0 && $rez !== false) {
-            if ($this->debug) error_log(" isn't a select query, returning boolean true");
-            return true;
-        }
-        //end fix
-        if(!$rez) $rez = false;
-		return $rez;
-	}
-	
-	// returns true or false
-	function _close()
-	{ 
-		if ($this->transCnt) $this->RollbackTrans();
-		$rez = @sqlsrv_close($this->_connectionID);
-		$this->_connectionID = false;
-		return $rez;
-	}
-	
-	// mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-		return ADORecordSet_array_mssql::UnixDate($v);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_mssql::UnixTimeStamp($v);
-	}	
-
-	function &MetaIndexes($table,$primary=false)
-	{
-		$table = $this->qstr($table);
-
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
-			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
-			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
-			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
-			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
-			ORDER BY O.name, I.Name, K.keyno";
-
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-        if (!is_object($rs)) {
-        	return FALSE;
-        }
-
-		$indexes = array();
-		while ($row = $rs->FetchRow()) {
-			if (!$primary && $row[5]) continue;
-			
-            $indexes[$row[0]]['unique'] = $row[6];
-            $indexes[$row[0]]['columns'][] = $row[1];
-    	}
-        return $indexes;
-	}
-	
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-    	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
-            "select object_name(constid) as constraint_name,
-	            col_name(fkeyid, fkey) as column_name,
-	            object_name(rkeyid) as referenced_table_name,
-   	            col_name(rkeyid, rkey) as referenced_column_name
-            from sysforeignkeys
-            where upper(object_name(fkeyid)) = $table
-            order by constraint_name, referenced_table_name, keyno";
-		
-		$constraints =& $this->GetArray($sql);
-		
-		$ADODB_FETCH_MODE = $save;
-		
-		$arr = false;
-		foreach($constraints as $constr) {
-			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
-		}
-		if (!$arr) return false;
-		
-		$arr2 = false;
-		
-		foreach($arr as $k => $v) {
-			foreach($v as $a => $b) {
-				if ($upper) $a = strtoupper($a);
-				$arr2[$a] = $b;
-			}
-		}
-		return $arr2;
-	}
-
-	//From: Fernando Moreira 
-	function MetaDatabases() 
-	{ 
-	    $this->SelectDB("master");
-        $rs =& $this->Execute($this->metaDatabasesSQL);
-        $rows = $rs->GetRows();
-        $ret = array();
-        for($i=0;$iSelectDB($this->database);
-        if($ret)
-            return $ret;
-        else 
-            return false;
-	} 
-
-	// "Stein-Aksel Basma" 
-	// tested with MSSQL 2000
-	function &MetaPrimaryKeys($table)
-	{
-    	global $ADODB_FETCH_MODE;
-	
-		$schema = '';
-		$this->_findschema($table,$schema);
-		if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
-
-		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
-		information_schema.table_constraints tc 
-		where tc.constraint_name = k.constraint_name and tc.constraint_type =
-		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
-		
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$a = $this->GetCol($sql);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if ($a && sizeof($a)>0) return $a;
-		$false = false;
-		return $false;	  
-	}
-
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-	    if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(($mask));
-			$this->metaTablesSQL .= " AND name like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_mssqlnative extends ADORecordSet {	
-
-	var $databaseType = "mssqlnative";
-	var $canSeek = false;
-	var $fieldOffset = 0;
-	// _mths works only in non-localised system
-	
-	function ADORecordset_mssqlnative($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id,$mode);
-	}
-	
-	
-	function _initrs()
-	{
-	    global $ADODB_COUNTRECS;	
-        if ($this->connection->debug) error_log("(before) ADODB_COUNTRECS: {$ADODB_COUNTRECS} _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
-        /*$retRowsAff = sqlsrv_rows_affected($this->_queryID);//"If you need to determine the number of rows a query will return before retrieving the actual results, appending a SELECT COUNT ... query would let you get that information, and then a call to next_result would move you to the "real" results."
-        error_log("rowsaff: ".serialize($retRowsAff));
-		$this->_numOfRows = ($ADODB_COUNTRECS)? $retRowsAff:-1;*/
-        $this->_numOfRows = -1;//not supported
-        $fieldmeta = sqlsrv_field_metadata($this->_queryID);
-        $this->_numOfFields = ($fieldmeta)? count($fieldmeta):-1;
-        if ($this->connection->debug) error_log("(after) _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
-	}
-	
-
-	//Contributed by "Sven Axelsson" 
-	// get next resultset - requires PHP 4.0.5 or later
-	function NextRecordSet()
-	{
-		if (!sqlsrv_next_result($this->_queryID)) return false;
-		$this->_inited = false;
-		$this->bind = false;
-		$this->_currentRow = -1;
-		$this->Init();
-		return true;
-	}
-
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode != ADODB_FETCH_NUM) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	/*	Returns: an object containing field information. 
-		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-		fetchField() is retrieved.	*/
-
-	function &FetchField($fieldOffset = -1) 
-	{
-        if ($this->connection->debug) error_log("
fetchfield: $fieldOffset, fetch array: 
".print_r($this->fields,true)."
 backtrace: ".adodb_backtrace(false));
-		if ($fieldOffset != -1) $this->fieldOffset = $fieldOffset;
-		$arrKeys = array_keys($this->fields);
-		if(array_key_exists($this->fieldOffset,$arrKeys) && !array_key_exists($arrKeys[$this->fieldOffset],$this->fields)) {
-			$f = false;
-		} else {
-			$f = $this->fields[ $arrKeys[$this->fieldOffset] ];
-			if($fieldOffset == -1) $this->fieldOffset++;
-		}
-
-        if (empty($f)) {
-            $f = false;//PHP Notice: Only variable references should be returned by reference
-        }
-		return $f;
-	}
-	
-	function _seek($row) 
-	{
-		return false;//There is no support for cursors in the driver at this time.  All data is returned via forward-only streams.
-	}
-
-	// speedup
-	function MoveNext() 
-	{
-        if ($this->connection->debug) error_log("movenext()");
-        //if ($this->connection->debug) error_log("eof (beginning): ".$this->EOF);
-		if ($this->EOF) return false;
-		
-		$this->_currentRow++;
-        if ($this->connection->debug) error_log("_currentRow: ".$this->_currentRow);
-		
-		if ($this->_fetch()) return true;
-		$this->EOF = true;
-        //if ($this->connection->debug) error_log("eof (end): ".$this->EOF);
-		
-		return false;
-	}
-
-	
-	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
-	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
-	function _fetch($ignore_fields=false) 
-	{
-        if ($this->connection->debug) error_log("_fetch()");
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			if ($this->fetchMode & ADODB_FETCH_NUM) {
-                if ($this->connection->debug) error_log("fetch mode: both");
-				$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_BOTH);
-			} else {
-                if ($this->connection->debug) error_log("fetch mode: assoc");
-				$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_ASSOC);
-			}
-			
-			if (ADODB_ASSOC_CASE == 0) {
-				foreach($this->fields as $k=>$v) {
-					$this->fields[strtolower($k)] = $v;
-				}
-			} else if (ADODB_ASSOC_CASE == 1) {
-				foreach($this->fields as $k=>$v) {
-					$this->fields[strtoupper($k)] = $v;
-				}
-			}
-		} else {
-            if ($this->connection->debug) error_log("fetch mode: num");
-			$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_NUMERIC);
-		}
-        if(is_array($this->fields) && array_key_exists(1,$this->fields) && !array_key_exists(0,$this->fields)) {//fix fetch numeric keys since they're not 0 based 
-            $arrFixed = array();
-            foreach($this->fields as $key=>$value) {
-                if(is_numeric($key)) {
-                    $arrFixed[$key-1] = $value;
-                } else {
-                    $arrFixed[$key] = $value;
-                }
-            }
-            //if($this->connection->debug) error_log("
fixing non 0 based return array, old: ".print_r($this->fields,true)." new: ".print_r($arrFixed,true));
-            $this->fields = $arrFixed;
-        }
-		if(is_array($this->fields)) {
-			foreach($this->fields as $key=>$value) {
-				if (is_object($value) && method_exists($value, 'format')) {//is DateTime object
-					$this->fields[$key] = $value->format("Y-m-d\TH:i:s\Z");
-				}
-			}
-		}
-        if($this->fields === null) $this->fields = false;
-        if ($this->connection->debug) error_log("
after _fetch, fields: 
".print_r($this->fields,true)." backtrace: ".adodb_backtrace(false));
-		return $this->fields;
-	}
-	
-    /*	close() only needs to be called if you are worried about using too much memory while your script
-		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-	function _close() 
-	{
-		$rez = sqlsrv_free_stmt($this->_queryID);	
-		$this->_queryID = false;
-		return $rez;
-	}
-
-	// mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-		return ADORecordSet_array_mssqlnative::UnixDate($v);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_mssqlnative::UnixTimeStamp($v);
-	}
-}
-
-
-class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
-	function ADORecordSet_array_mssqlnative($id=-1,$mode=false) 
-	{
-		$this->ADORecordSet_array($id,$mode);
-	}
-	
-		// mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
-		
-    	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
-		//Dec 30 2000 12:00AM 
-		if ($ADODB_mssql_date_order == 'dmy') {
-			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-				return parent::UnixDate($v);
-			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
-			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-				return parent::UnixDate($v);
-			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
-			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
-		}
-		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
-		// h-m-s-MM-DD-YY
-		return  mktime(0,0,0,$themth,$theday,$rr[3]);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
-		
-	    global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
-		//Dec 30 2000 12:00AM
-		 if ($ADODB_mssql_date_order == 'dmy') {
-			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
-		}
-		
-		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
-		
-		switch (strtoupper($rr[6])) {
-		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
-			break;
-		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
-			break;
-		default:
-			break;
-		}
-		// h-m-s-MM-DD-YY
-		return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
-	}
-}
-
-/*
-Code Example 1:
-
-select 	object_name(constid) as constraint_name,
-       	object_name(fkeyid) as table_name, 
-        col_name(fkeyid, fkey) as column_name,
-	object_name(rkeyid) as referenced_table_name,
-   	col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where object_name(fkeyid) = x
-order by constraint_name, table_name, referenced_table_name,  keyno
-
-Code Example 2:
-select 	constraint_name,
-	column_name,
-	ordinal_position
-from information_schema.key_column_usage
-where constraint_catalog = db_name()
-and table_name = x
-order by constraint_name, ordinal_position
-
-http://www.databasejournal.com/scripts/article.php/1440551
-*/
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-mssqlpo.inc.php b/includes/adodb/drivers/adodb-mssqlpo.inc.php
deleted file mode 100644
index dccb18c2..00000000
--- a/includes/adodb/drivers/adodb-mssqlpo.inc.php
+++ /dev/null
@@ -1,62 +0,0 @@
-_has_mssql_init) {
-			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
-			return $sql;
-		}
-		if (is_string($sql)) $sql = str_replace('||','+',$sql);
-		$stmt = mssql_init($sql,$this->_connectionID);
-		if (!$stmt)  return $sql;
-		return array($sql,$stmt);
-	}
-	
-	function _query($sql,$inputarr)
-	{
-		if (is_string($sql)) $sql = str_replace('||','+',$sql);
-		return ADODB_mssql::_query($sql,$inputarr);
-	}
-}
-
-class ADORecordset_mssqlpo extends ADORecordset_mssql {
-	var $databaseType = "mssqlpo";
-	function ADORecordset_mssqlpo($id,$mode=false)
-	{
-		$this->ADORecordset_mssql($id,$mode);
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-mysql.inc.php b/includes/adodb/drivers/adodb-mysql.inc.php
deleted file mode 100644
index 268e91c3..00000000
--- a/includes/adodb/drivers/adodb-mysql.inc.php
+++ /dev/null
@@ -1,791 +0,0 @@
-rsPrefix .= 'ext_';
-	}
-	
-	function ServerInfo()
-	{
-		$arr['description'] = ADOConnection::GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " IFNULL($field, $ifNull) "; // if MySQL
-	}
-	
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
-		$save = $this->metaTablesSQL;
-		if ($showSchema && is_string($showSchema)) {
-			$this->metaTablesSQL .= " from $showSchema";
-		}
-		
-		if ($mask) {
-			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " like $mask";
-		}
-		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
-		$this->metaTablesSQL = $save;
-		return $ret;
-	}
-	
-	
-	function MetaIndexes ($table, $primary = FALSE, $owner=false)
-	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        
-		$false = false;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        
-        // get index details
-        $rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
-        
-        // restore fetchmode
-        if (isset($savem)) {
-                $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-        
-        if (!is_object($rs)) {
-                return $false;
-        }
-        
-        $indexes = array ();
-        
-        // parse index data into array
-        while ($row = $rs->FetchRow()) {
-                if ($primary == FALSE AND $row[2] == 'PRIMARY') {
-                        continue;
-                }
-                
-                if (!isset($indexes[$row[2]])) {
-                        $indexes[$row[2]] = array(
-                                'unique' => ($row[1] == 0),
-                                'columns' => array()
-                        );
-                }
-                
-                $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
-        }
-        
-        // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index )
-        {
-                ksort ($indexes[$index]['columns']);
-        }
-        
-        return $indexes;
-	}
-
-	
-	// if magic quotes disabled, use mysql_real_escape_string()
-	function qstr($s,$magic_quotes=false)
-	{
-		if (is_null($s)) return 'NULL';
-		if (!$magic_quotes) {
-		
-			if (ADODB_PHPVER >= 0x4300) {
-				if (is_resource($this->_connectionID))
-					return "'".mysql_real_escape_string($s,$this->_connectionID)."'";
-			}
-			if ($this->replaceQuote[0] == '\\'){
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		return "'$s'";
-	}
-	
-	function _insertid()
-	{
-		return ADOConnection::GetOne('SELECT LAST_INSERT_ID()');
-		//return mysql_insert_id($this->_connectionID);
-	}
-	
-	function GetOne($sql,$inputarr=false)
-	{
-		if ($this->compat323 == false && strncasecmp($sql,'sele',4) == 0) {
-			$rs = $this->SelectLimit($sql,1,-1,$inputarr);
-			if ($rs) {
-				$rs->Close();
-				if ($rs->EOF) return false;
-				return reset($rs->fields);
-			}
-		} else {
-			return ADOConnection::GetOne($sql,$inputarr);
-		}
-		return false;
-	}
-	
-	function BeginTrans()
-	{
-		if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver");
-	}
-	
-	function _affectedrows()
-	{
-			return mysql_affected_rows($this->_connectionID);
-	}
-  
- 	 // See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
-	// Reference on Last_Insert_ID on the recommended way to simulate sequences
- 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
-	var $_genSeqSQL = "create table %s (id int not null)";
-	var $_genSeqCountSQL = "select count(*) from %s";
-	var $_genSeq2SQL = "insert into %s values (%s)";
-	var $_dropSeqSQL = "drop table %s";
-	
-	function CreateSequence($seqname='adodbseq',$startID=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$u = strtoupper($seqname);
-		
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-	}
-	
-
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		// post-nuke sets hasGenID to false
-		if (!$this->hasGenID) return false;
-		
-		$savelog = $this->_logsql;
-		$this->_logsql = false;
-		$getnext = sprintf($this->_genIDSQL,$seqname);
-		$holdtransOK = $this->_transOK; // save the current status
-		$rs = @$this->Execute($getnext);
-		if (!$rs) {
-			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
-			$u = strtoupper($seqname);
-			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
-			$cnt = $this->GetOne(sprintf($this->_genSeqCountSQL,$seqname));
-			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-			$rs = $this->Execute($getnext);
-		}
-		
-		if ($rs) {
-			$this->genID = mysql_insert_id($this->_connectionID);
-			$rs->Close();
-		} else
-			$this->genID = 0;
-		
-		$this->_logsql = $savelog;
-		return $this->genID;
-	}
-	
-  	function MetaDatabases()
-	{
-		$qid = mysql_list_dbs($this->_connectionID);
-		$arr = array();
-		$i = 0;
-		$max = mysql_num_rows($qid);
-		while ($i < $max) {
-			$db = mysql_tablename($qid,$i);
-			if ($db != 'mysql') $arr[] = $db;
-			$i += 1;
-		}
-		return $arr;
-	}
-	
-		
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'DATE_FORMAT('.$col.",'";
-		$concat = false;
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-				
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				/** FALL THROUGH */
-			case '-':
-			case '/':
-				$s .= $ch;
-				break;
-				
-			case 'Y':
-			case 'y':
-				$s .= '%Y';
-				break;
-			case 'M':
-				$s .= '%b';
-				break;
-				
-			case 'm':
-				$s .= '%m';
-				break;
-			case 'D':
-			case 'd':
-				$s .= '%d';
-				break;
-			
-			case 'Q':
-			case 'q':
-				$s .= "'),Quarter($col)";
-				
-				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
-				else $s .= ",('";
-				$concat = true;
-				break;
-			
-			case 'H': 
-				$s .= '%H';
-				break;
-				
-			case 'h':
-				$s .= '%I';
-				break;
-				
-			case 'i':
-				$s .= '%i';
-				break;
-				
-			case 's':
-				$s .= '%s';
-				break;
-				
-			case 'a':
-			case 'A':
-				$s .= '%p';
-				break;
-				
-			case 'w':
-				$s .= '%w';
-				break;
-				
-			 case 'W':
-				$s .= '%U';
-				break;
-				
-			case 'l':
-				$s .= '%W';
-				break;
-			}
-		}
-		$s.="')";
-		if ($concat) $s = "CONCAT($s)";
-		return $s;
-	}
-	
-
-	// returns concatenated string
-	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
-	function Concat()
-	{
-		$s = "";
-		$arr = func_get_args();
-		
-		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
-		if (strlen($s) > 0) return "CONCAT($s)";
-		else return '';
-	}
-	
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		
-		$fraction = $dayFraction * 24 * 3600;
-		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
-//		return "from_unixtime(unix_timestamp($date)+$fraction)";
-	}
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!empty($this->port)) $argHostname .= ":".$this->port;
-		
-		if (ADODB_PHPVER >= 0x4300)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect,$this->clientFlags);
-		else if (ADODB_PHPVER >= 0x4200)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect);
-		else
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
-	
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!empty($this->port)) $argHostname .= ":".$this->port;
-		
-		if (ADODB_PHPVER >= 0x4300)
-			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword,$this->clientFlags);
-		else
-			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($this->autoRollback) $this->RollbackTrans();
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		$this->forceNewConnect = true;
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
-	}
-	
- 	function MetaColumns($table) 
-	{
-		$this->_findschema($table,$schema);
-		if ($schema) {
-			$dbName = $this->database;
-			$this->SelectDB($schema);
-		}
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
-		if ($schema) {
-			$this->SelectDB($dbName);
-		}
-		
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!is_object($rs)) {
-			$false = false;
-			return $false;
-		}
-			
-		$retarr = array();
-		while (!$rs->EOF){
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$type = $rs->fields[1];
-			
-			// split type into type(length):
-			$fld->scale = null;
-			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-				$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
-			} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-			} elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$arr = explode(",",$query_array[2]);
-				$fld->enums = $arr;
-				$zlen = max(array_map("strlen",$arr)) - 2; // PHP >= 4.0.6
-				$fld->max_length = ($zlen > 0) ? $zlen : 1;
-			} else {
-				$fld->type = $type;
-				$fld->max_length = -1;
-			}
-			$fld->not_null = ($rs->fields[2] != 'YES');
-			$fld->primary_key = ($rs->fields[3] == 'PRI');
-			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-			$fld->binary = (strpos($type,'blob') !== false || strpos($type,'binary') !== false);
-			$fld->unsigned = (strpos($type,'unsigned') !== false);
-			$fld->zerofill = (strpos($type,'zerofill') !== false);
-
-			if (!$fld->binary) {
-				$d = $rs->fields[4];
-				if ($d != '' && $d != 'NULL') {
-					$fld->has_default = true;
-					$fld->default_value = $d;
-				} else {
-					$fld->has_default = false;
-				}
-			}
-			
-			if ($save == ADODB_FETCH_NUM) {
-				$retarr[] = $fld;
-			} else {
-				$retarr[strtoupper($fld->name)] = $fld;
-			}
-				$rs->MoveNext();
-			}
-		
-			$rs->Close();
-			return $retarr;	
-	}
-		
-	// returns true or false
-	function SelectDB($dbName) 
-	{
-		$this->database = $dbName;
-		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		if ($this->_connectionID) {
-			return @mysql_select_db($dbName,$this->_connectionID);		
-		}
-		else return false;	
-	}
-	
-	// parameters use PostgreSQL convention, not MySQL
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
-	{
-		$offsetStr =($offset>=0) ? ((integer)$offset)."," : '';
-		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
-		if ($nrows < 0) $nrows = '18446744073709551615'; 
-		
-		if ($secs)
-			$rs = $this->CacheExecute($secs,$sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
-		else
-			$rs = $this->Execute($sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
-		return $rs;
-	}
-	
-	// returns queryID or false
-	function _query($sql,$inputarr)
-	{
-	//global $ADODB_COUNTRECS;
-		//if($ADODB_COUNTRECS) 
-		return mysql_query($sql,$this->_connectionID);
-		//else return @mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-	
-		if ($this->_logsql) return $this->_errorMsg;
-		if (empty($this->_connectionID)) $this->_errorMsg = @mysql_error();
-		else $this->_errorMsg = @mysql_error($this->_connectionID);
-		return $this->_errorMsg;
-	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	{
-		if ($this->_logsql) return $this->_errorCode;
-		if (empty($this->_connectionID))  return @mysql_errno();
-		else return @mysql_errno($this->_connectionID);
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		@mysql_close($this->_connectionID);
-		$this->_connectionID = false;
-	}
-
-	
-	/*
-	* Maximum size of C field
-	*/
-	function CharMax()
-	{
-		return 255; 
-	}
-	
-	/*
-	* Maximum size of X field
-	*/
-	function TextMax()
-	{
-		return 4294967295; 
-	}
-	
-	// "Innox - Juan Carlos Gonzalez" 
-	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
-     {
-	 global $ADODB_FETCH_MODE;
-		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
-
-         if ( !empty($owner) ) {
-            $table = "$owner.$table";
-         }
-         $a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', $table));
-		 if ($associative) {
-		 	$create_sql = isset($a_create_table["Create Table"]) ? $a_create_table["Create Table"] : $a_create_table["Create View"];
-         } else $create_sql  = $a_create_table[1];
-
-         $matches = array();
-
-         if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
-	     $foreign_keys = array();	 	 
-         $num_keys = count($matches[0]);
-         for ( $i = 0;  $i < $num_keys;  $i ++ ) {
-             $my_field  = explode('`, `', $matches[1][$i]);
-             $ref_table = $matches[2][$i];
-             $ref_field = explode('`, `', $matches[3][$i]);
-
-             if ( $upper ) {
-                 $ref_table = strtoupper($ref_table);
-             }
-
-             $foreign_keys[$ref_table] = array();
-             $num_fields = count($my_field);
-             for ( $j = 0;  $j < $num_fields;  $j ++ ) {
-                 if ( $associative ) {
-                     $foreign_keys[$ref_table][$ref_field[$j]] = $my_field[$j];
-                 } else {
-                     $foreign_keys[$ref_table][] = "{$my_field[$j]}={$ref_field[$j]}";
-                 }
-             }
-         }
-         
-         return  $foreign_keys;
-     }
-	 
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-
-class ADORecordSet_mysql extends ADORecordSet{	
-	
-	var $databaseType = "mysql";
-	var $canSeek = true;
-	
-	function ADORecordSet_mysql($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default:
-			$this->fetchMode = MYSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
-	}
-	
-	function _initrs()
-	{
-	//GLOBAL $ADODB_COUNTRECS;
-	//	$this->_numOfRows = ($ADODB_COUNTRECS) ? @mysql_num_rows($this->_queryID):-1;
-		$this->_numOfRows = @mysql_num_rows($this->_queryID);
-		$this->_numOfFields = @mysql_num_fields($this->_queryID);
-	}
-	
-	function FetchField($fieldOffset = -1) 
-	{	
-		if ($fieldOffset != -1) {
-			$o = @mysql_fetch_field($this->_queryID, $fieldOffset);
-			$f = @mysql_field_flags($this->_queryID,$fieldOffset);
-			if ($o) $o->max_length = @mysql_field_len($this->_queryID,$fieldOffset); // suggested by: Jim Nicholson (jnich#att.com)
-			//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
-			if ($o) $o->binary = (strpos($f,'binary')!== false);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			$o = @mysql_fetch_field($this->_queryID);
-			if ($o) $o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jnich#att.com)
-		//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
-		}
-			
-		return $o;
-	}
-
-	function GetRowAssoc($upper=true)
-	{
-		if ($this->fetchMode == MYSQL_ASSOC && !$upper) $row = $this->fields;
-		else $row = ADORecordSet::GetRowAssoc($upper);
-		return $row;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{	
-		// added @ by "Michael William Miller" 
-		if ($this->fetchMode != MYSQL_NUM) return @$this->fields[$colname];
-		
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	function _seek($row)
-	{
-		if ($this->_numOfRows == 0) return false;
-		return @mysql_data_seek($this->_queryID,$row);
-	}
-	
-	function MoveNext()
-	{
-		//return adodb_movenext($this);
-		//if (defined('ADODB_EXTENSION')) return adodb_movenext($this);
-		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
-			$this->_currentRow += 1;
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->_currentRow += 1;
-			$this->EOF = true;
-		}
-		return false;
-	}
-	
-	function _fetch()
-	{
-		$this->fields =  @mysql_fetch_array($this->_queryID,$this->fetchMode);
-		return is_array($this->fields);
-	}
-	
-	function _close() {
-		@mysql_free_result($this->_queryID);	
-		$this->_queryID = false;	
-	}
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'STRING': 
-		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
-		case 'SET': 
-			if ($len <= $this->blobSize) return 'C';
-			
-		case 'TEXT':
-		case 'LONGTEXT': 
-		case 'MEDIUMTEXT':
-			return 'X';
-			
-		// php_mysql extension always returns 'blob' even if 'text'
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-		case 'BINARY':
-			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
-		case 'YEAR':
-		case 'DATE': return 'D';
-		
-		case 'TIME':
-		case 'DATETIME':
-		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
-		case 'INTEGER':
-		case 'BIGINT':
-		case 'TINYINT':
-		case 'MEDIUMINT':
-		case 'SMALLINT': 
-			
-			if (!empty($fieldobj->primary_key)) return 'R';
-			else return 'I';
-		
-		default: return 'N';
-		}
-	}
-
-}
-
-class ADORecordSet_ext_mysql extends ADORecordSet_mysql {	
-	function ADORecordSet_ext_mysql($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default:
-		$this->fetchMode = MYSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);
-	}
-	
-	function MoveNext()
-	{
-		return @adodb_movenext($this);
-	}
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-mysqli.inc.php b/includes/adodb/drivers/adodb-mysqli.inc.php
deleted file mode 100644
index be3f4e7a..00000000
--- a/includes/adodb/drivers/adodb-mysqli.inc.php
+++ /dev/null
@@ -1,1184 +0,0 @@
-_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
-	}
-
-	// returns true or false
-	// To add: parameter int $port,
-	//         parameter string $socket
-	function _connect($argHostname = NULL, 
-			  $argUsername = NULL, 
-			  $argPassword = NULL, 
-			  $argDatabasename = NULL, $persist=false)
-	  {
-	  	 if(!extension_loaded("mysqli")) {
-			return null;
-		 }
-	    $this->_connectionID = @mysqli_init();
-	    
-	    if (is_null($this->_connectionID)) {
-	      // mysqli_init only fails if insufficient memory
-	      if ($this->debug) 
-				ADOConnection::outp("mysqli_init() failed : "  . $this->ErrorMsg());
-	      return false;
-	    }
-		/*
-		I suggest a simple fix which would enable adodb and mysqli driver to
-		read connection options from the standard mysql configuration file
-		/etc/my.cnf - "Bastien Duclaux" 
-		*/
-		foreach($this->optionFlags as $arr) {	
-			mysqli_options($this->_connectionID,$arr[0],$arr[1]);
-		}
-
-		#if (!empty($this->port)) $argHostname .= ":".$this->port;
-		$ok = mysqli_real_connect($this->_connectionID,
- 				    $argHostname,
- 				    $argUsername,
- 				    $argPassword,
- 				    $argDatabasename,
-					$this->port,
-					$this->socket,
-					$this->clientFlags);
- 	     
-		if ($ok) {
-	 		if ($argDatabasename)  return $this->SelectDB($argDatabasename);
- 			return true;
- 	   } else {
-			if ($this->debug) 
-		  		ADOConnection::outp("Could't connect : "  . $this->ErrorMsg());
-			$this->_connectionID = null;
-			return false;
-	   }
-	}
-	
-	// returns true or false
-	// How to force a persistent connection
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true);
-
-	}
-	
-	// When is this used? Close old connection first?
-	// In _connect(), check $this->forceNewConnect? 
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	  {
-	    $this->forceNewConnect = true;
-	    return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
-	  }
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " IFNULL($field, $ifNull) "; // if MySQL
-	}
-	
-	// do not use $ADODB_COUNTRECS
-	function GetOne($sql,$inputarr=false)
-	{
-		$ret = false;
-		$rs = $this->Execute($sql,$inputarr);
-		if ($rs) {	
-			if (!$rs->EOF) $ret = reset($rs->fields);
-			$rs->Close();
-		}
-		return $ret;
-	}
-	
-	function ServerInfo()
-	{
-		$arr['description'] = $this->GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	
-	function BeginTrans()
-	{	  
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		
-		//$this->Execute('SET AUTOCOMMIT=0');
-		mysqli_autocommit($this->_connectionID, false);
-		$this->Execute('BEGIN');
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
-		
-		//$this->Execute('SET AUTOCOMMIT=1');
-		mysqli_autocommit($this->_connectionID, true);
-		return true;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
-		//$this->Execute('SET AUTOCOMMIT=1');
-		mysqli_autocommit($this->_connectionID, true);
-		return true;
-	}
-	
-	function RowLock($tables,$where='',$flds='1 as adodb_ignore') 
-	{
-		if ($this->transCnt==0) $this->BeginTrans();
-		if ($where) $where = ' where '.$where;
-		$rs = $this->Execute("select $flds from $tables $where for update");
-		return !empty($rs); 
-	}
-	
-	// if magic quotes disabled, use mysql_real_escape_string()
-	// From readme.htm:
-	// Quotes a string to be sent to the database. The $magic_quotes_enabled
-	// parameter may look funny, but the idea is if you are quoting a 
-	// string extracted from a POST/GET variable, then 
-	// pass get_magic_quotes_gpc() as the second parameter. This will 
-	// ensure that the variable is not quoted twice, once by qstr and once 
-	// by the magic_quotes_gpc.
-	//
-	//Eg. $s = $db->qstr(_GET['name'],get_magic_quotes_gpc());
-	function qstr($s, $magic_quotes = false)
-	{
-		if (is_null($s)) return 'NULL';
-		if (!$magic_quotes) {
-	    	if (PHP_VERSION >= 5)
-	      		return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";   
-	    
-		if ($this->replaceQuote[0] == '\\')
-			$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-	    return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
-	  }
-	  // undo magic quotes for "
-	  $s = str_replace('\\"','"',$s);
-	  return "'$s'";
-	}
-	
-	function _insertid()
-	{
-	  $result = @mysqli_insert_id($this->_connectionID);
-	  if ($result == -1){
-	      if ($this->debug) ADOConnection::outp("mysqli_insert_id() failed : "  . $this->ErrorMsg());
-	  }
-	  return $result;
-	}
-	
-	// Only works for INSERT, UPDATE and DELETE query's
-	function _affectedrows()
-	{
-	  $result =  @mysqli_affected_rows($this->_connectionID);
-	  if ($result == -1) {
-	      if ($this->debug) ADOConnection::outp("mysqli_affected_rows() failed : "  . $this->ErrorMsg());
-	  }
-	  return $result;
-	}
-  
- 	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
-	// Reference on Last_Insert_ID on the recommended way to simulate sequences
- 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
-	var $_genSeqSQL = "create table %s (id int not null)";
-	var $_genSeqCountSQL = "select count(*) from %s";
-	var $_genSeq2SQL = "insert into %s values (%s)";
-	var $_dropSeqSQL = "drop table %s";
-	
-	function CreateSequence($seqname='adodbseq',$startID=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$u = strtoupper($seqname);
-		
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-	}
-	
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		// post-nuke sets hasGenID to false
-		if (!$this->hasGenID) return false;
-		
-		$getnext = sprintf($this->_genIDSQL,$seqname);
-		$holdtransOK = $this->_transOK; // save the current status
-		$rs = @$this->Execute($getnext);
-		if (!$rs) {
-			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
-			$u = strtoupper($seqname);
-			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
-			$cnt = $this->GetOne(sprintf($this->_genSeqCountSQL,$seqname));
-			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-			$rs = $this->Execute($getnext);
-		}
-		
-		if ($rs) {
-			$this->genID = mysqli_insert_id($this->_connectionID);
-			$rs->Close();
-		} else
-			$this->genID = 0;
-			
-		return $this->genID;
-	}
-	
-  	function MetaDatabases()
-	{
-		$query = "SHOW DATABASES";
-		$ret = $this->Execute($query);
-		if ($ret && is_object($ret)){
-		   $arr = array();
-			while (!$ret->EOF){
-				$db = $ret->Fields('Database');
-				if ($db != 'mysql') $arr[] = $db;
-				$ret->MoveNext();
-			}
-   		   return $arr;
-		}
-        return $ret;
-	}
-
-	  
-	function MetaIndexes ($table, $primary = FALSE)
-	{
-		// save old fetch mode
-		global $ADODB_FETCH_MODE;
-		
-		$false = false;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== FALSE) {
-		       $savem = $this->SetFetchMode(FALSE);
-		}
-		
-		// get index details
-		$rs = $this->Execute(sprintf('SHOW INDEXES FROM %s',$table));
-		
-		// restore fetchmode
-		if (isset($savem)) {
-		        $this->SetFetchMode($savem);
-		}
-		$ADODB_FETCH_MODE = $save;
-		
-		if (!is_object($rs)) {
-		        return $false;
-		}
-		
-		$indexes = array ();
-		
-		// parse index data into array
-		while ($row = $rs->FetchRow()) {
-		        if ($primary == FALSE AND $row[2] == 'PRIMARY') {
-		                continue;
-		        }
-		        
-		        if (!isset($indexes[$row[2]])) {
-		                $indexes[$row[2]] = array(
-		                        'unique' => ($row[1] == 0),
-		                        'columns' => array()
-		                );
-		        }
-		        
-		        $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
-		}
-		
-		// sort columns by order in the index
-		foreach ( array_keys ($indexes) as $index )
-		{
-		        ksort ($indexes[$index]['columns']);
-		}
-		
-		return $indexes;
-	}
-
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'DATE_FORMAT('.$col.",'";
-		$concat = false;
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= '%Y';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "'),Quarter($col)";
-				
-				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
-				else $s .= ",('";
-				$concat = true;
-				break;
-			case 'M':
-				$s .= '%b';
-				break;
-				
-			case 'm':
-				$s .= '%m';
-				break;
-			case 'D':
-			case 'd':
-				$s .= '%d';
-				break;
-			
-			case 'H': 
-				$s .= '%H';
-				break;
-				
-			case 'h':
-				$s .= '%I';
-				break;
-				
-			case 'i':
-				$s .= '%i';
-				break;
-				
-			case 's':
-				$s .= '%s';
-				break;
-				
-			case 'a':
-			case 'A':
-				$s .= '%p';
-				break;
-			
-			case 'w':
-				$s .= '%w';
-				break;
-				
-			case 'l':
-				$s .= '%W';
-				break;
-				
-			default:
-				
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $ch;
-				break;
-			}
-		}
-		$s.="')";
-		if ($concat) $s = "CONCAT($s)";
-		return $s;
-	}
-	
-	// returns concatenated string
-	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
-	function Concat()
-	{
-		$s = "";
-		$arr = func_get_args();
-		
-		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
-		if (strlen($s) > 0) return "CONCAT($s)";
-		else return '';
-	}
-	
-	// dayFraction is a day in floating point
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		
-		$fraction = $dayFraction * 24 * 3600;
-		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
-//		return "from_unixtime(unix_timestamp($date)+$fraction)";
-	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
-		$save = $this->metaTablesSQL;
-		if ($showSchema && is_string($showSchema)) {
-			$this->metaTablesSQL .= " from $showSchema";
-		}
-		
-		if ($mask) {
-			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " like $mask";
-		}
-		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
-		$this->metaTablesSQL = $save;
-		return $ret;
-	}
-	
-	// "Innox - Juan Carlos Gonzalez" 
-	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
-	{
-	 global $ADODB_FETCH_MODE;
-		
-		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
-		
-	    if ( !empty($owner) ) {
-	       $table = "$owner.$table";
-	    }
-	    $a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', $table));
-		if ($associative) {
-			$create_sql = isset($a_create_table["Create Table"]) ? $a_create_table["Create Table"] : $a_create_table["Create View"];
-	    } else $create_sql  = $a_create_table[1];
-	
-	    $matches = array();
-	
-	    if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
-	 	$foreign_keys = array();	 	 
-	    $num_keys = count($matches[0]);
-	    for ( $i = 0;  $i < $num_keys;  $i ++ ) {
-	        $my_field  = explode('`, `', $matches[1][$i]);
-	        $ref_table = $matches[2][$i];
-	        $ref_field = explode('`, `', $matches[3][$i]);
-	
-	        if ( $upper ) {
-	            $ref_table = strtoupper($ref_table);
-	        }
-	
-	        $foreign_keys[$ref_table] = array();
-	        $num_fields               = count($my_field);
-	        for ( $j = 0;  $j < $num_fields;  $j ++ ) {
-	            if ( $associative ) {
-	                $foreign_keys[$ref_table][$ref_field[$j]] = $my_field[$j];
-	            } else {
-	                $foreign_keys[$ref_table][] = "{$my_field[$j]}={$ref_field[$j]}";
-	            }
-	        }
-	    }
-	    
-	    return  $foreign_keys;
-	}
-	
- 	function MetaColumns($table) 
-	{
-		$false = false;
-		if (!$this->metaColumnsSQL)
-			return $false;
-		
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false)
-			$savem = $this->SetFetchMode(false);
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!is_object($rs))
-			return $false;
-		
-		$retarr = array();
-		while (!$rs->EOF) {
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$type = $rs->fields[1];
-			
-			// split type into type(length):
-			$fld->scale = null;
-			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-				$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
-			} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-			} elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$arr = explode(",",$query_array[2]);
-				$fld->enums = $arr;
-				$zlen = max(array_map("strlen",$arr)) - 2; // PHP >= 4.0.6
-				$fld->max_length = ($zlen > 0) ? $zlen : 1;
-			} else {
-				$fld->type = $type;
-				$fld->max_length = -1;
-			}
-			$fld->not_null = ($rs->fields[2] != 'YES');
-			$fld->primary_key = ($rs->fields[3] == 'PRI');
-			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-			$fld->binary = (strpos($type,'blob') !== false);
-			$fld->unsigned = (strpos($type,'unsigned') !== false);
-			$fld->zerofill = (strpos($type,'zerofill') !== false);
-
-			if (!$fld->binary) {
-				$d = $rs->fields[4];
-				if ($d != '' && $d != 'NULL') {
-					$fld->has_default = true;
-					$fld->default_value = $d;
-				} else {
-					$fld->has_default = false;
-				}
-			}
-			
-			if ($save == ADODB_FETCH_NUM) {
-				$retarr[] = $fld;
-			} else {
-				$retarr[strtoupper($fld->name)] = $fld;
-			}
-			$rs->MoveNext();
-		}
-		
-		$rs->Close();
-		return $retarr;
-	}
-		
-	// returns true or false
-	function SelectDB($dbName) 
-	{
-//	    $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
-	    $this->database = $dbName;
-		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		
-	    if ($this->_connectionID) {
-        	$result = @mysqli_select_db($this->_connectionID, $dbName);
-			if (!$result) {
-		    	ADOConnection::outp("Select of database " . $dbName . " failed. " . $this->ErrorMsg());
-			}
-			return $result;		
-		}
-	    return false;	
-	}
-	
-	// parameters use PostgreSQL convention, not MySQL
-	function SelectLimit($sql,
-			      $nrows = -1,
-			      $offset = -1,
-			      $inputarr = false, 
-			      $secs = 0)
-	{
-		$offsetStr = ($offset >= 0) ? "$offset," : '';
-		if ($nrows < 0) $nrows = '18446744073709551615';
-		
-		if ($secs)
-			$rs = $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr );
-		else
-			$rs = $this->Execute($sql . " LIMIT $offsetStr$nrows" , $inputarr );
-			
-		return $rs;
-	}
-	
-	
-	function Prepare($sql)
-	{
-		return $sql;
-		$stmt = $this->_connectionID->prepare($sql);
-		if (!$stmt) {
-			echo $this->ErrorMsg();
-			return $sql;
-		}
-		return array($sql,$stmt);
-	}
-	
-	
-	// returns queryID or false
-	function _query($sql, $inputarr)
-	{
-	global $ADODB_COUNTRECS;
-		// Move to the next recordset, or return false if there is none. In a stored proc
-		// call, mysqli_next_result returns true for the last "recordset", but mysqli_store_result
-		// returns false. I think this is because the last "recordset" is actually just the
-		// return value of the stored proc (ie the number of rows affected).
-		// Commented out for reasons of performance. You should retrieve every recordset yourself.
-		//	if (!mysqli_next_result($this->connection->_connectionID))	return false;
-	
-		if (is_array($sql)) {
-		
-			// Prepare() not supported because mysqli_stmt_execute does not return a recordset, but
-			// returns as bound variables.
-		
-			$stmt = $sql[1];
-			$a = '';
-			foreach($inputarr as $k => $v) {
-				if (is_string($v)) $a .= 's';
-				else if (is_integer($v)) $a .= 'i'; 
-				else $a .= 'd';
-			}
-			
-			$fnarr = array_merge( array($stmt,$a) , $inputarr);
-			$ret = call_user_func_array('mysqli_stmt_bind_param',$fnarr);
-			$ret = mysqli_stmt_execute($stmt);
-			return $ret;
-		}
-		
-		/*
-		if (!$mysql_res =  mysqli_query($this->_connectionID, $sql, ($ADODB_COUNTRECS) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT)) {
-		    if ($this->debug) ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
-		    return false;
-		}
-		
-		return $mysql_res;
-		*/
-		
-		if( $rs = mysqli_multi_query($this->_connectionID, $sql.';') )//Contributed by "Geisel Sierote" 
-		{
-			$rs = ($ADODB_COUNTRECS) ? @mysqli_store_result( $this->_connectionID ) : @mysqli_use_result( $this->_connectionID );
-			return $rs ? $rs : true; // mysqli_more_results( $this->_connectionID )
-		} else {
-			if($this->debug)
-			ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
-			return false;
-		}
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	  {
-	    if (empty($this->_connectionID)) 
-	      $this->_errorMsg = @mysqli_connect_error();
-	    else 
-	      $this->_errorMsg = @mysqli_error($this->_connectionID);
-	    return $this->_errorMsg;
-	  }
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	  {
-	    if (empty($this->_connectionID))  
-	      return @mysqli_connect_errno();
-	    else 
-	      return @mysqli_errno($this->_connectionID);
-	  }
-	
-	// returns true or false
-	function _close()
-	  {
-	    @mysqli_close($this->_connectionID);
-	    $this->_connectionID = false;
-	  }
-
-	/*
-	* Maximum size of C field
-	*/
-	function CharMax()
-	{
-		return 255; 
-	}
-	
-	/*
-	* Maximum size of X field
-	*/
-	function TextMax()
-	{
-	  return 4294967295; 
-	}
-
-
-
-	// this is a set of functions for managing client encoding - very important if the encodings
-	// of your database and your output target (i.e. HTML) don't match
-	// for instance, you may have UTF8 database and server it on-site as latin1 etc.
-	// GetCharSet - get the name of the character set the client is using now
-	// Under Windows, the functions should work with MySQL 4.1.11 and above, the set of charsets supported
-	// depends on compile flags of mysql distribution 
-
-  function GetCharSet()
-  {
-    //we will use ADO's builtin property charSet
-    if (!method_exists($this->_connectionID,'character_set_name'))
-    	return false;
-    	
-    $this->charSet = @$this->_connectionID->character_set_name();
-    if (!$this->charSet) {
-      return false;
-    } else {
-      return $this->charSet;
-    }
-  }
-
-  // SetCharSet - switch the client encoding
-  function SetCharSet($charset_name)
-  {
-    if (!method_exists($this->_connectionID,'set_charset'))
-    	return false;
-
-    if ($this->charSet !== $charset_name) {
-      $if = @$this->_connectionID->set_charset($charset_name);
-      if ($if == "0" & $this->GetCharSet() == $charset_name) {
-        return true;
-      } else return false;
-    } else return true;
-  }
-
-
-
-
-}
- 
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_mysqli extends ADORecordSet{	
-	
-	var $databaseType = "mysqli";
-	var $canSeek = true;
-	
-	function ADORecordSet_mysqli($queryID, $mode = false) 
-	{
-	  if ($mode === false) 
-	   { 
-	      global $ADODB_FETCH_MODE;
-	      $mode = $ADODB_FETCH_MODE;
-	   }
-	   
-	  switch ($mode)
-	    {
-	    case ADODB_FETCH_NUM: 
-	      $this->fetchMode = MYSQLI_NUM; 
-	      break;
-	    case ADODB_FETCH_ASSOC:
-	      $this->fetchMode = MYSQLI_ASSOC; 
-	      break;
-	    case ADODB_FETCH_DEFAULT:
-	    case ADODB_FETCH_BOTH:
-	    default:
-	      $this->fetchMode = MYSQLI_BOTH; 
-	      break;
-	    }
-	  $this->adodbFetchMode = $mode;
-	  $this->ADORecordSet($queryID);	
-	}
-	
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-	
-		$this->_numOfRows = $ADODB_COUNTRECS ? @mysqli_num_rows($this->_queryID) : -1;
-		$this->_numOfFields = @mysqli_num_fields($this->_queryID);
-	}
-	
-/*
-1      = MYSQLI_NOT_NULL_FLAG
-2      = MYSQLI_PRI_KEY_FLAG
-4      = MYSQLI_UNIQUE_KEY_FLAG
-8      = MYSQLI_MULTIPLE_KEY_FLAG
-16     = MYSQLI_BLOB_FLAG
-32     = MYSQLI_UNSIGNED_FLAG
-64     = MYSQLI_ZEROFILL_FLAG
-128    = MYSQLI_BINARY_FLAG
-256    = MYSQLI_ENUM_FLAG
-512    = MYSQLI_AUTO_INCREMENT_FLAG
-1024   = MYSQLI_TIMESTAMP_FLAG
-2048   = MYSQLI_SET_FLAG
-32768  = MYSQLI_NUM_FLAG
-16384  = MYSQLI_PART_KEY_FLAG
-32768  = MYSQLI_GROUP_FLAG
-65536  = MYSQLI_UNIQUE_FLAG
-131072 = MYSQLI_BINCMP_FLAG
-*/
-
-	function FetchField($fieldOffset = -1) 
-	{	
-		$fieldnr = $fieldOffset;
-		if ($fieldOffset != -1) {
-		  $fieldOffset = @mysqli_field_seek($this->_queryID, $fieldnr);
-		}
-		$o = @mysqli_fetch_field($this->_queryID);
-		if (!$o) return false;
-		/* Properties of an ADOFieldObject as set by MetaColumns */
-		$o->primary_key = $o->flags & MYSQLI_PRI_KEY_FLAG;
-		$o->not_null = $o->flags & MYSQLI_NOT_NULL_FLAG;
-		$o->auto_increment = $o->flags & MYSQLI_AUTO_INCREMENT_FLAG;
-		$o->binary = $o->flags & MYSQLI_BINARY_FLAG;
-		// $o->blob = $o->flags & MYSQLI_BLOB_FLAG; /* not returned by MetaColumns */
-		$o->unsigned = $o->flags & MYSQLI_UNSIGNED_FLAG;
-
-		return $o;
-	}
-
-	function GetRowAssoc($upper = true)
-	{
-		if ($this->fetchMode == MYSQLI_ASSOC && !$upper) 
-		  return $this->fields;
-		$row = ADORecordSet::GetRowAssoc($upper);
-		return $row;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{	
-	  if ($this->fetchMode != MYSQLI_NUM) 
-	    return @$this->fields[$colname];
-		
-	  if (!$this->bind) {
-	    $this->bind = array();
-	    for ($i = 0; $i < $this->_numOfFields; $i++) {
-	      $o = $this->FetchField($i);
-	      $this->bind[strtoupper($o->name)] = $i;
-	    }
-	  }
-	  return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	function _seek($row)
-	{
-	  if ($this->_numOfRows == 0) 
-	    return false;
-
-	  if ($row < 0)
-	    return false;
-
-	  mysqli_data_seek($this->_queryID, $row);
-	  $this->EOF = false;
-	  return true;
-	}
-		
-		
-	function NextRecordSet()
-	{
-	global $ADODB_COUNTRECS;
-	
-		mysqli_free_result($this->_queryID);
-		$this->_queryID = -1;
-		// Move to the next recordset, or return false if there is none. In a stored proc
-		// call, mysqli_next_result returns true for the last "recordset", but mysqli_store_result
-		// returns false. I think this is because the last "recordset" is actually just the
-		// return value of the stored proc (ie the number of rows affected).
-		if(!mysqli_next_result($this->connection->_connectionID)) {
-		return false;
-		}
-		// CD: There is no $this->_connectionID variable, at least in the ADO version I'm using
-		$this->_queryID = ($ADODB_COUNTRECS) ? @mysqli_store_result( $this->connection->_connectionID )
-						: @mysqli_use_result( $this->connection->_connectionID );
-		if(!$this->_queryID) {
-			return false;
-		}
-		$this->_inited = false;
-		$this->bind = false;
-		$this->_currentRow = -1;
-		$this->Init();
-		return true;
-	}
-
-	// 10% speedup to move MoveNext to child class
-	// This is the only implementation that works now (23-10-2003).
-	// Other functions return no or the wrong results.
-	function MoveNext() 
-	{
-		if ($this->EOF) return false;
-		$this->_currentRow++;
-		$this->fields = @mysqli_fetch_array($this->_queryID,$this->fetchMode);
-		
-		if (is_array($this->fields)) return true;
-		$this->EOF = true;
-		return false;
-	}	
-	
-	function _fetch()
-	{
-		$this->fields = mysqli_fetch_array($this->_queryID,$this->fetchMode);  
-	  	return is_array($this->fields);
-	}
-	
-	function _close() 
-	{
-		mysqli_free_result($this->_queryID); 
-	  	$this->_queryID = false;	
-	}
-	
-/*
-
-0 = MYSQLI_TYPE_DECIMAL
-1 = MYSQLI_TYPE_CHAR
-1 = MYSQLI_TYPE_TINY
-2 = MYSQLI_TYPE_SHORT
-3 = MYSQLI_TYPE_LONG
-4 = MYSQLI_TYPE_FLOAT
-5 = MYSQLI_TYPE_DOUBLE
-6 = MYSQLI_TYPE_NULL
-7 = MYSQLI_TYPE_TIMESTAMP
-8 = MYSQLI_TYPE_LONGLONG
-9 = MYSQLI_TYPE_INT24
-10 = MYSQLI_TYPE_DATE
-11 = MYSQLI_TYPE_TIME
-12 = MYSQLI_TYPE_DATETIME
-13 = MYSQLI_TYPE_YEAR
-14 = MYSQLI_TYPE_NEWDATE
-247 = MYSQLI_TYPE_ENUM
-248 = MYSQLI_TYPE_SET
-249 = MYSQLI_TYPE_TINY_BLOB
-250 = MYSQLI_TYPE_MEDIUM_BLOB
-251 = MYSQLI_TYPE_LONG_BLOB
-252 = MYSQLI_TYPE_BLOB
-253 = MYSQLI_TYPE_VAR_STRING
-254 = MYSQLI_TYPE_STRING
-255 = MYSQLI_TYPE_GEOMETRY
-*/
-
-	function MetaType($t, $len = -1, $fieldobj = false)
-	{
-		if (is_object($t)) {
-		    $fieldobj = $t;
-		    $t = $fieldobj->type;
-		    $len = $fieldobj->max_length;
-		}
-		
-		
-		 $len = -1; // mysql max_length is not accurate
-		 switch (strtoupper($t)) {
-		 case 'STRING': 
-		 case 'CHAR':
-		 case 'VARCHAR': 
-		 case 'TINYBLOB': 
-		 case 'TINYTEXT': 
-		 case 'ENUM': 
-		 case 'SET': 
-		
-		case MYSQLI_TYPE_TINY_BLOB :
-		#case MYSQLI_TYPE_CHAR :
-		case MYSQLI_TYPE_STRING :
-		case MYSQLI_TYPE_ENUM :
-		case MYSQLI_TYPE_SET :
-		case 253 :
-		   if ($len <= $this->blobSize) return 'C';
-		   
-		case 'TEXT':
-		case 'LONGTEXT': 
-		case 'MEDIUMTEXT':
-		   return 'X';
-		
-		
-		   // php_mysql extension always returns 'blob' even if 'text'
-		   // so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-		
-		case MYSQLI_TYPE_BLOB :
-		case MYSQLI_TYPE_LONG_BLOB :
-		case MYSQLI_TYPE_MEDIUM_BLOB :
-		
-		   return !empty($fieldobj->binary) ? 'B' : 'X';
-		case 'YEAR':
-		case 'DATE': 
-		case MYSQLI_TYPE_DATE :
-		case MYSQLI_TYPE_YEAR :
-		
-		   return 'D';
-		
-		case 'TIME':
-		case 'DATETIME':
-		case 'TIMESTAMP':
-		
-		case MYSQLI_TYPE_DATETIME :
-		case MYSQLI_TYPE_NEWDATE :
-		case MYSQLI_TYPE_TIME :
-		case MYSQLI_TYPE_TIMESTAMP :
-		
-			return 'T';
-		
-		case 'INT': 
-		case 'INTEGER':
-		case 'BIGINT':
-		case 'TINYINT':
-		case 'MEDIUMINT':
-		case 'SMALLINT': 
-		
-		case MYSQLI_TYPE_INT24 :
-		case MYSQLI_TYPE_LONG :
-		case MYSQLI_TYPE_LONGLONG :
-		case MYSQLI_TYPE_SHORT :
-		case MYSQLI_TYPE_TINY :
-		
-		   if (!empty($fieldobj->primary_key)) return 'R';
-		   
-		   return 'I';
-		
-		
-		   // Added floating-point types
-		   // Maybe not necessery.
-		 case 'FLOAT':
-		 case 'DOUBLE':
-		   //		case 'DOUBLE PRECISION':
-		 case 'DECIMAL':
-		 case 'DEC':
-		 case 'FIXED':
-		 default:
-		 	//if (!is_numeric($t)) echo "
--- Error in type matching $t -----
"; 
-		 	return 'N';
-		}
-	} // function
-	
-
-} // rs class
- 
-}
-
-class ADORecordSet_array_mysqli extends ADORecordSet_array {
-  
-  function ADORecordSet_array_mysqli($id=-1,$mode=false) 
-  {
-    $this->ADORecordSet_array($id,$mode);
-  }
-  
-	function MetaType($t, $len = -1, $fieldobj = false)
-	{
-		if (is_object($t)) {
-		    $fieldobj = $t;
-		    $t = $fieldobj->type;
-		    $len = $fieldobj->max_length;
-		}
-		
-		
-		 $len = -1; // mysql max_length is not accurate
-		 switch (strtoupper($t)) {
-		 case 'STRING': 
-		 case 'CHAR':
-		 case 'VARCHAR': 
-		 case 'TINYBLOB': 
-		 case 'TINYTEXT': 
-		 case 'ENUM': 
-		 case 'SET': 
-		
-		case MYSQLI_TYPE_TINY_BLOB :
-		#case MYSQLI_TYPE_CHAR :
-		case MYSQLI_TYPE_STRING :
-		case MYSQLI_TYPE_ENUM :
-		case MYSQLI_TYPE_SET :
-		case 253 :
-		   if ($len <= $this->blobSize) return 'C';
-		   
-		case 'TEXT':
-		case 'LONGTEXT': 
-		case 'MEDIUMTEXT':
-		   return 'X';
-		
-		
-		   // php_mysql extension always returns 'blob' even if 'text'
-		   // so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-		
-		case MYSQLI_TYPE_BLOB :
-		case MYSQLI_TYPE_LONG_BLOB :
-		case MYSQLI_TYPE_MEDIUM_BLOB :
-		
-		   return !empty($fieldobj->binary) ? 'B' : 'X';
-		case 'YEAR':
-		case 'DATE': 
-		case MYSQLI_TYPE_DATE :
-		case MYSQLI_TYPE_YEAR :
-		
-		   return 'D';
-		
-		case 'TIME':
-		case 'DATETIME':
-		case 'TIMESTAMP':
-		
-		case MYSQLI_TYPE_DATETIME :
-		case MYSQLI_TYPE_NEWDATE :
-		case MYSQLI_TYPE_TIME :
-		case MYSQLI_TYPE_TIMESTAMP :
-		
-			return 'T';
-		
-		case 'INT': 
-		case 'INTEGER':
-		case 'BIGINT':
-		case 'TINYINT':
-		case 'MEDIUMINT':
-		case 'SMALLINT': 
-		
-		case MYSQLI_TYPE_INT24 :
-		case MYSQLI_TYPE_LONG :
-		case MYSQLI_TYPE_LONGLONG :
-		case MYSQLI_TYPE_SHORT :
-		case MYSQLI_TYPE_TINY :
-		
-		   if (!empty($fieldobj->primary_key)) return 'R';
-		   
-		   return 'I';
-		
-		
-		   // Added floating-point types
-		   // Maybe not necessery.
-		 case 'FLOAT':
-		 case 'DOUBLE':
-		   //		case 'DOUBLE PRECISION':
-		 case 'DECIMAL':
-		 case 'DEC':
-		 case 'FIXED':
-		 default:
-		 	//if (!is_numeric($t)) echo "
--- Error in type matching $t -----
"; 
-		 	return 'N';
-		}
-	} // function
-  
-}
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-mysqlpo.inc.php b/includes/adodb/drivers/adodb-mysqlpo.inc.php
deleted file mode 100644
index 3e0acbcf..00000000
--- a/includes/adodb/drivers/adodb-mysqlpo.inc.php
+++ /dev/null
@@ -1,138 +0,0 @@
-
-  
-  Requires mysql client. Works on Windows and Unix.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
-
-
-class ADODB_mysqlt extends ADODB_mysql {
-	var $databaseType = 'mysqlt';
-	var $ansiOuter = true; // for Version 3.23.17 or later
-	var $hasTransactions = true;
-	var $autoRollback = true; // apparently mysql does not autorollback properly 
-	
-	function ADODB_mysqlt() 
-	{			
-	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
-	}
-	
-	function BeginTrans()
-	{	  
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->Execute('SET AUTOCOMMIT=0');
-		$this->Execute('BEGIN');
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
-		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
-		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
-	}
-	
-	function RowLock($tables,$where='',$flds='1 as adodb_ignore') 
-	{
-		if ($this->transCnt==0) $this->BeginTrans();
-		if ($where) $where = ' where '.$where;
-		$rs = $this->Execute("select $flds from $tables $where for update");
-		return !empty($rs); 
-	}
-	
-}
-
-class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
-	var $databaseType = "mysqlt";
-	
-	function ADORecordSet_mysqlt($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: $this->fetchMode = MYSQL_BOTH; break;
-		}
-	
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
-	}
-	
-	function MoveNext()
-	{
-		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
-			$this->_currentRow += 1;
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->_currentRow += 1;
-			$this->EOF = true;
-		}
-		return false;
-	}
-}
-
-class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {	
-
-	function ADORecordSet_ext_mysqlt($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: 
-			$this->fetchMode = MYSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
-	}
-	
-	function MoveNext()
-	{
-		return adodb_movenext($this);
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-mysqlt.inc.php b/includes/adodb/drivers/adodb-mysqlt.inc.php
deleted file mode 100644
index 3cc809c5..00000000
--- a/includes/adodb/drivers/adodb-mysqlt.inc.php
+++ /dev/null
@@ -1,155 +0,0 @@
-
-  
-  Requires mysql client. Works on Windows and Unix.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
-
-
-class ADODB_mysqlt extends ADODB_mysql {
-	var $databaseType = 'mysqlt';
-	var $ansiOuter = true; // for Version 3.23.17 or later
-	var $hasTransactions = true;
-	var $autoRollback = true; // apparently mysql does not autorollback properly 
-	
-	function ADODB_mysqlt() 
-	{			
-	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
-	}
-	
-	/* set transaction mode
-	
-	SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
-{ READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
-
-	*/
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
-	}
-	
-	function BeginTrans()
-	{	  
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->Execute('SET AUTOCOMMIT=0');
-		$this->Execute('BEGIN');
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
-		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
-		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
-	}
-	
-	function RowLock($tables,$where='',$flds='1 as adodb_ignore') 
-	{
-		if ($this->transCnt==0) $this->BeginTrans();
-		if ($where) $where = ' where '.$where;
-		$rs = $this->Execute("select $flds from $tables $where for update");
-		return !empty($rs); 
-	}
-	
-}
-
-class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
-	var $databaseType = "mysqlt";
-	
-	function ADORecordSet_mysqlt($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: $this->fetchMode = MYSQL_BOTH; break;
-		}
-	
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
-	}
-	
-	function MoveNext()
-	{
-		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
-			$this->_currentRow += 1;
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->_currentRow += 1;
-			$this->EOF = true;
-		}
-		return false;
-	}
-}
-
-class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {	
-
-	function ADORecordSet_ext_mysqlt($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: 
-			$this->fetchMode = MYSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
-	}
-	
-	function MoveNext()
-	{
-		return adodb_movenext($this);
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-netezza.inc.php b/includes/adodb/drivers/adodb-netezza.inc.php
deleted file mode 100644
index cde287e1..00000000
--- a/includes/adodb/drivers/adodb-netezza.inc.php
+++ /dev/null
@@ -1,170 +0,0 @@
- 0 ORDER BY attnum";
-	var $metaColumnsSQL1 = "SELECT attname, atttype FROM _v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
-	// netezza doesn't have keys. it does have distributions, so maybe this is 
-	// something that can be pulled from the system tables
-	var $metaKeySQL = "";
-	var $hasAffectedRows = true;
-	var $hasLimit = true;	
-	var $true = 't';		// string that represents TRUE for a database
-	var $false = 'f';		// string that represents FALSE for a database
-	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
-	var $fmtTimeStamp = "'Y-m-d G:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
-	var $ansiOuter = true;
-	var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
-							// http://bugs.php.net/bug.php?id=25404
-
-							
-	function ADODB_netezza() 
-	{
-	
-	}
-	
-	function MetaColumns($table,$upper=true) 
-	{
-	
-	// Changed this function to support Netezza which has no concept of keys
-	// could posisbly work on other things from the system table later.
-	
-	global $ADODB_FETCH_MODE;
-	
-		$table = strtolower($table);
-
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if ($rs === false) return false;
-
-		$retarr = array();
-		while (!$rs->EOF) { 	
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			
-			// since we're returning type and length as one string, 
-			// split them out here.
-			
-			if ($first = strstr($rs->fields[1], "(")) {
-			 $fld->max_length = trim($first, "()");
-			} else {
-			 $fld->max_length = -1;
-			}
-		
-			if ($first = strpos($rs->fields[1], "(")) {
-			 $fld->type = substr($rs->fields[1], 0, $first);
-			} else {
-			 $fld->type = $rs->fields[1];
-			}
-			
-			switch ($fld->type) {
-			 case "byteint":
-			 case "boolean":
-			 $fld->max_length = 1;
-			 break;
-			 case "smallint":
-			 $fld->max_length = 2;
-			 break;
-			 case "integer":
-			 case "numeric":
-			 case "date":
-			 $fld->max_length = 4;
-			 break;
-			 case "bigint":
-			 case "time":
-			 case "timestamp":
-			 $fld->max_length = 8;
-			 break;
-			 case "timetz":
-			 case "time with time zone":
-			 $fld->max_length = 12;
-			 break;
-			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[($upper) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		return $retarr;	
-		
-	}
-
-		
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_netezza extends ADORecordSet_postgres64
-{
-	var $databaseType = "netezza";
-	var $canSeek = true;
-	
-	function ADORecordSet_netezza($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: $this->fetchMode = PGSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);
-	}
-	
-	// _initrs modified to disable blob handling
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($this->_queryID):-1;
-		$this->_numOfFields = @pg_numfields($this->_queryID);
-	}
-
-}
-?>
diff --git a/includes/adodb/drivers/adodb-oci8.inc.php b/includes/adodb/drivers/adodb-oci8.inc.php
deleted file mode 100644
index 42804e11..00000000
--- a/includes/adodb/drivers/adodb-oci8.inc.php
+++ /dev/null
@@ -1,1574 +0,0 @@
-
-  
-  13 Nov 2000 jlim - removed all ora_* references.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-/*
-NLS_Date_Format
-Allows you to use a date format other than the Oracle Lite default. When a literal
-character string appears where a date value is expected, the Oracle Lite database
-tests the string to see if it matches the formats of Oracle, SQL-92, or the value
-specified for this parameter in the POLITE.INI file. Setting this parameter also
-defines the default format used in the TO_CHAR or TO_DATE functions when no
-other format string is supplied.
-
-For Oracle the default is dd-mon-yy or dd-mon-yyyy, and for SQL-92 the default is
-yy-mm-dd or yyyy-mm-dd.
-
-Using 'RR' in the format forces two-digit years less than or equal to 49 to be
-interpreted as years in the 21st century (2000–2049), and years over 50 as years in
-the 20th century (1950–1999). Setting the RR format as the default for all two-digit
-year entries allows you to become year-2000 compliant. For example:
-NLS_DATE_FORMAT='RR-MM-DD'
-
-You can also modify the date format using the ALTER SESSION command. 
-*/
-
-# define the LOB descriptor type for the given type
-# returns false if no LOB descriptor
-function oci_lob_desc($type) {
-	switch ($type) {
-		case OCI_B_BFILE: $result = OCI_D_FILE; break;
-		case OCI_B_CFILEE: $result = OCI_D_FILE; break;
-		case OCI_B_CLOB: $result = OCI_D_LOB; break;
-		case OCI_B_BLOB: $result = OCI_D_LOB; break;
-		case OCI_B_ROWID: $result = OCI_D_ROWID; break;
-		default: $result = false; break;
-	}
-	return $result;
-}
-
-class ADODB_oci8 extends ADOConnection {
-	var $databaseType = 'oci8';
-	var $dataProvider = 'oci8';
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $concat_operator='||';
-	var $sysDate = "TRUNC(SYSDATE)";
-	var $sysTimeStamp = 'SYSDATE';
-	var $metaDatabasesSQL = "SELECT USERNAME FROM ALL_USERS WHERE USERNAME NOT IN ('SYS','SYSTEM','DBSNMP','OUTLN') ORDER BY 1";
-	var $_stmt;
-	var $_commit = OCI_COMMIT_ON_SUCCESS;
-	var $_initdate = true; // init date to YYYY-MM-DD
-	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW') and table_name not like 'BIN\$%'"; // bin$ tables are recycle bin tables
-	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
-	var $_bindInputArray = true;
-	var $hasGenID = true;
-	var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";
-	var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s";
-	var $_dropSeqSQL = "DROP SEQUENCE %s";
-	var $hasAffectedRows = true;
-	var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
-	var $noNullStrings = false;
-	var $connectSID = false;
-	var $_bind = false;
-	var $_nestedSQL = true;
-	var $_hasOCIFetchStatement = false;
-	var $_getarray = false; // currently not working
-	var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
-	var $session_sharing_force_blob = false; // alter session on updateblob if set to true 
-	var $firstrows = true; // enable first rows optimization on SelectLimit()
-	var $selectOffsetAlg1 = 100; // when to use 1st algorithm of selectlimit.
-	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
-	var $dateformat = 'YYYY-MM-DD'; // DBDate format
- 	var $useDBDateFormatForTextInput=false;
-	var $datetime = false; // MetaType('DATE') returns 'D' (datetime==false) or 'T' (datetime == true)
-	var $_refLOBs = array();
-		
-	// var $ansiOuter = true; // if oracle9
-    
-	function ADODB_oci8() 
-	{
-		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
-	}
-	
-	/*  function MetaColumns($table) added by smondino@users.sourceforge.net*/
-	function MetaColumns($table) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$false = false;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!$rs) {
-			return $false;
-		}
-		$retarr = array();
-		while (!$rs->EOF) { //print_r($rs->fields);
-			$fld = new ADOFieldObject();
-	   		$fld->name = $rs->fields[0];
-	   		$fld->type = $rs->fields[1];
-	   		$fld->max_length = $rs->fields[2];
-			$fld->scale = $rs->fields[3];
-			if ($rs->fields[1] == 'NUMBER') {
-				if ($rs->fields[3] == 0) $fld->type = 'INT';
-	     		$fld->max_length = $rs->fields[4];
-	    	}	
-		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
-			$fld->binary = (strpos($fld->type,'BLOB') !== false);
-			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		if (empty($retarr))
-			return  $false;
-		else 
-			return $retarr;
-	}
-	
-	function Time()
-	{
-		$rs = $this->Execute("select TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
-		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
-		return false;
-	}
- 
-/*
-
-  Multiple modes of connection are supported:
-  
-  a. Local Database
-    $conn->Connect(false,'scott','tiger');
-  
-  b. From tnsnames.ora
-    $conn->Connect(false,'scott','tiger',$tnsname); 
-    $conn->Connect($tnsname,'scott','tiger'); 
-  
-  c. Server + service name
-    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
-  
-  d. Server + SID
-  	$conn->connectSID = true;
-	$conn->Connect($serveraddress,'scott,'tiger',$SID);
-
-
-Example TNSName:
----------------
-NATSOFT.DOMAIN =
-  (DESCRIPTION =
-	(ADDRESS_LIST =
-	  (ADDRESS = (PROTOCOL = TCP)(HOST = kermit)(PORT = 1523))
-	)
-	(CONNECT_DATA =
-	  (SERVICE_NAME = natsoft.domain)
-	)
-  )
-  
-  There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force new connection
-	
-*/
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mode=0)
-	{
-		if (!function_exists('OCIPLogon')) return null;
-		
-		
-        $this->_errorMsg = false;
-		$this->_errorCode = false;
-		
-		if($argHostname) { // added by Jorma Tuomainen 
-			if (empty($argDatabasename)) $argDatabasename = $argHostname;
-			else {
-				if(strpos($argHostname,":")) {
-					$argHostinfo=explode(":",$argHostname);
-				   	$argHostname=$argHostinfo[0];
-					$argHostport=$argHostinfo[1];
-			 	} else {
-					$argHostport = empty($this->port)?  "1521" : $this->port;
-	   			}
-				
-				if (strncmp($argDatabasename,'SID=',4) == 0) {
-					$argDatabasename = substr($argDatabasename,4);
-					$this->connectSID = true;
-				}
-				
-				if ($this->connectSID) {
-					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-					.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
-				} else
-					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-					.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
-			}
-		}
-				
- 		//if ($argHostname) print "
Connect: 1st argument should be left blank for $this->databaseType
";
-		if ($mode==1) {
-			$this->_connectionID = ($this->charSet) ? 
-				OCIPLogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				OCIPLogon($argUsername,$argPassword, $argDatabasename)
-				;
-			if ($this->_connectionID && $this->autoRollback)  OCIrollback($this->_connectionID);
-		} else if ($mode==2) {
-			$this->_connectionID = ($this->charSet) ? 
-				OCINLogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				OCINLogon($argUsername,$argPassword, $argDatabasename);
-				
-		} else {
-			$this->_connectionID = ($this->charSet) ? 
-				OCILogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				OCILogon($argUsername,$argPassword, $argDatabasename);
-		}
-		if (!$this->_connectionID) return false;
-		if ($this->_initdate) {
-			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
-		}
-		
-		// looks like: 
-		// Oracle8i Enterprise Edition Release 8.1.7.0.0 - Production With the Partitioning option JServer Release 8.1.7.0.0 - Production
-		// $vers = OCIServerVersion($this->_connectionID);
-		// if (strpos($vers,'8i') !== false) $this->ansiOuter = true;
-		return true;
-   	}
-	
-	function ServerInfo()
-	{
-		$arr['compat'] = $this->GetOne('select value from sys.database_compatible_level');
-		$arr['description'] = @OCIServerVersion($this->_connectionID);
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-		// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
-	}
-	
-	// returns true or false
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,2);
-	}
-	
-	function _affectedrows()
-	{
-		if (is_resource($this->_stmt)) return @OCIRowCount($this->_stmt);
-		return 0;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " NVL($field, $ifNull) "; // if Oracle
-	}
-	
-	// format and return date string in database date format
-	function DBDate($d,$isfld=false)
-	{
-		if (empty($d) && $d !== 0) return 'null';
-		if ($isfld) return 'TO_DATE('.$d.",'".$this->dateformat."')";
-		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->dateformat."')";
-	}
-
-	function BindDate($d)
-	{
-		$d = ADOConnection::DBDate($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	function BindTimeStamp($d)
-	{
-		$d = ADOConnection::DBTimeStamp($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	// format and return date string in database timestamp format
-	function DBTimeStamp($ts,$isfld=false)
-	{
-		if (empty($ts) && $ts !== 0) return 'null';
-		if ($isfld) return 'TO_DATE('.$ts.",'RRRR-MM-DD, HH24:MI:SS')";
-		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date("'Y-m-d H:i:s'",$ts).",'RRRR-MM-DD, HH24:MI:SS')";
-	}
-	
-	function RowLock($tables,$where,$flds='1 as ignore') 
-	{
-		if ($this->autoCommit) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
-	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(strtoupper($mask));
-			$this->metaTablesSQL .= " AND upper(table_name) like $mask";
-		}
-		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	// Mark Newnham 
-	function MetaIndexes ($table, $primary = FALSE, $owner=false)
-	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-
-		// get index details
-		$table = strtoupper($table);
-
-		// get Primary index
-		$primary_key = '';
-
-		$false = false;
-		$rs = $this->Execute(sprintf("SELECT * FROM ALL_CONSTRAINTS WHERE UPPER(TABLE_NAME)='%s' AND CONSTRAINT_TYPE='P'",$table));
-		if ($row = $rs->FetchRow())
-		   $primary_key = $row[1]; //constraint_name
-
-		if ($primary==TRUE && $primary_key=='') {
-			 if (isset($savem)) 
-                $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			return $false; //There is no primary key
-		}
-
-        $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
-
-		
-        if (!is_object($rs)) {
-			if (isset($savem)) 
-				$this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
-
-		$indexes = array ();
-        // parse index data into array
-
-        while ($row = $rs->FetchRow()) {
-			if ($primary && $row[0] != $primary_key) continue;
-            if (!isset($indexes[$row[0]])) {
-				$indexes[$row[0]] = array(
-				   'unique' => ($row[1] == 'UNIQUE'),
-				   'columns' => array()
-				);
-            }
-            $indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
-        }
-
-        // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index ) {
-            ksort ($indexes[$index]['columns']);
-        }
-
-		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-		}
-        return $indexes;
-	}
-	
-	function BeginTrans()
-	{	
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->autoCommit = false;
-		$this->_commit = OCI_DEFAULT;
-		
-		if ($this->_transmode) $this->Execute("SET TRANSACTION ".$this->_transmode);
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = OCIcommit($this->_connectionID);
-		$this->_commit = OCI_COMMIT_ON_SUCCESS;
-		$this->autoCommit = true;
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = OCIrollback($this->_connectionID);
-		$this->_commit = OCI_COMMIT_ON_SUCCESS;
-		$this->autoCommit = true;
-		return $ret;
-	}
-	
-	
-	function SelectDB($dbName) 
-	{
-		return false;
-	}
-
-	function ErrorMsg() 
-	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
-
-		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
-		if (empty($arr)) {
-			if (is_resource($this->_connectionID)) $arr = @OCIError($this->_connectionID);
-			else $arr = @OCIError();
-			if ($arr === false) return '';
-		}
-		$this->_errorMsg = $arr['message'];
-		$this->_errorCode = $arr['code'];
-		return $this->_errorMsg;
-	}
-
-	function ErrorNo() 
-	{
-		if ($this->_errorCode !== false) return $this->_errorCode;
-		
-		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
-		if (empty($arr)) {
-			$arr = @OCIError($this->_connectionID);
-			if ($arr == false) $arr = @OCIError();
-			if ($arr == false) return '';
-		}
-		
-		$this->_errorMsg = $arr['message'];
-		$this->_errorCode = $arr['code'];
-		
-		return $arr['code'];
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'TO_CHAR('.$col.",'";
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= 'YYYY';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= 'Q';
-				break;
-				
-			case 'M':
-				$s .= 'Mon';
-				break;
-				
-			case 'm':
-				$s .= 'MM';
-				break;
-			case 'D':
-			case 'd':
-				$s .= 'DD';
-				break;
-			
-			case 'H':
-				$s.= 'HH24';
-				break;
-				
-			case 'h':
-				$s .= 'HH';
-				break;
-				
-			case 'i':
-				$s .= 'MI';
-				break;
-			
-			case 's':
-				$s .= 'SS';
-				break;
-			
-			case 'a':
-			case 'A':
-				$s .= 'AM';
-				break;
-				
-			case 'w':
-				$s .= 'D';
-				break;
-				
-			case 'l':
-				$s .= 'DAY';
-				break;
-				
-			 case 'W':
-				$s .= 'WW';
-				break;
-				
-			default:
-			// handle escape characters...
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
-				
-			}
-		}
-		return $s. "')";
-	}
-	
-	function GetRandRow($sql, $arr = false)
-	{
-		$sql = "SELECT * FROM ($sql ORDER BY dbms_random.value) WHERE rownum = 1";
-		
-		return $this->GetRow($sql,$arr);
-	}
-	
-	/*
-	This algorithm makes use of
-	
-	a. FIRST_ROWS hint
-	The FIRST_ROWS hint explicitly chooses the approach to optimize response time, 
-	that is, minimum resource usage to return the first row. Results will be returned 
-	as soon as they are identified. 
-
-	b. Uses rownum tricks to obtain only the required rows from a given offset.
-	 As this uses complicated sql statements, we only use this if the $offset >= 100. 
-	 This idea by Tomas V V Cox.
-	 
-	 This implementation does not appear to work with oracle 8.0.5 or earlier. Comment
-	 out this function then, and the slower SelectLimit() in the base class will be used.
-	*/
-	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		// seems that oracle only supports 1 hint comment in 8i
-		if ($this->firstrows) {
-			if (strpos($sql,'/*+') !== false)
-				$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
-			else
-				$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-		}
-		
-		if ($offset < $this->selectOffsetAlg1 && 0 < $nrows && $nrows < 1000) {
-			if ($nrows > 0) {	
-				if ($offset > 0) $nrows += $offset;
-				//$inputarr['adodb_rownum'] = $nrows;
-				if ($this->databaseType == 'oci8po') {
-					$sql = "select * from (".$sql.") where rownum <= ?";
-				} else {
-					$sql = "select * from (".$sql.") where rownum <= :adodb_offset";
-				} 
-				$inputarr['adodb_offset'] = $nrows;
-				$nrows = -1;
-			}
-			// note that $nrows = 0 still has to work ==> no rows returned
-
-			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			return $rs;
-			
-		} else {
-			 // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
-			
-			 // Let Oracle return the name of the columns
-			$q_fields = "SELECT * FROM (".$sql.") WHERE NULL = NULL";
-		
-			$false = false;
-			if (! $stmt_arr = $this->Prepare($q_fields)) {
-				return $false;
-			}
-			$stmt = $stmt_arr[1];
-			 
-			if (is_array($inputarr)) {
-			 	foreach($inputarr as $k => $v) {
-					if (is_array($v)) {
-						if (sizeof($v) == 2) // suggested by g.giunta@libero.
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-						else
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					} else {
-						$len = -1;
-						if ($v === ' ') $len = 1;
-						if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
-							$bindarr[$k] = $v;
-						} else { 				// dynamic sql, so rebind every time
-							OCIBindByName($stmt,":$k",$inputarr[$k],$len);
-							
-						}
-					}
-				}
-			}
-			
-			 if (!OCIExecute($stmt, OCI_DEFAULT)) {
-				 OCIFreeStatement($stmt); 
-				 return $false;
-			 }
-			 
-			 $ncols = OCINumCols($stmt);
-			 for ( $i = 1; $i <= $ncols; $i++ ) {
-				 $cols[] = '"'.OCIColumnName($stmt, $i).'"';
-			 }
-			 $result = false;
-			
-			 OCIFreeStatement($stmt); 
-			 $fields = implode(',', $cols);
-			 if ($nrows <= 0) $nrows = 999999999999;
-			 else $nrows += $offset;
-			 $offset += 1; // in Oracle rownum starts at 1
-			
-			if ($this->databaseType == 'oci8po') {
-					 $sql = "SELECT $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= ?".
-					  ") WHERE adodb_rownum >= ?";
-				} else {
-					 $sql = "SELECT $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= :adodb_nrows".
-					  ") WHERE adodb_rownum >= :adodb_offset";
-				} 
-				$inputarr['adodb_nrows'] = $nrows;
-				$inputarr['adodb_offset'] = $offset;
-				
-			if ($secs2cache>0) $rs = $this->CacheExecute($secs2cache, $sql,$inputarr);
-			else $rs = $this->Execute($sql,$inputarr);
-			return $rs;
-		}
-	
-	}
-	
-	/**
-	* Usage:
-	* Store BLOBs and CLOBs
-	*
-	* Example: to store $var in a blob
-	*
-	*	$conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
-	*	$conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
-	*	
-	*	$blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
-	*
-	*  to get length of LOB:
-	*  	select DBMS_LOB.GETLENGTH(ablob) from TABLE
-	*
-	* If you are using CURSOR_SHARING = force, it appears this will case a segfault
-	* under oracle 8.1.7.0. Run:
-	*	 $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-	* before UpdateBlob() then...
-	*/
-
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		
-		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
-		
-		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp("UpdateBlob: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
-		}
-		
-		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
-		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
-		$arr['blob'] = array($desc,-1,$type);
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-		$commit = $this->autoCommit;
-		if ($commit) $this->BeginTrans();
-		$rs = $this->_Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->save($val);
-		$desc->free();
-		if ($commit) $this->CommitTrans();
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
-		
-		if ($rez) $rs->Close();
-		return $rez;
-	}
-	
-	/**
-	* Usage:  store file pointed to by $var in a blob
-	*/
-	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp( "UpdateBlob: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
-		}
-		
-		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
-		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
-		$arr['blob'] = array($desc,-1,$type);
-		
-		$this->BeginTrans();
-		$rs = ADODB_oci8::Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->savefile($val);
-		$desc->free();
-		$this->CommitTrans();
-		
-		if ($rez) $rs->Close();
-		return $rez;
-	}
-
-		/**
-	 * Execute SQL 
-	 *
-	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
-	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
-	 * @return 		RecordSet or false
-	 */
-	function Execute($sql,$inputarr=false) 
-	{
-		if ($this->fnExecute) {
-			$fn = $this->fnExecute;
-			$ret = $fn($this,$sql,$inputarr);
-			if (isset($ret)) return $ret;
-		}
-		if ($inputarr) {
-			#if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
-			$element0 = reset($inputarr);
-			
-			if (!$this->_bindInputArray) {
-			# is_object check because oci8 descriptors can be passed in
-			if (is_array($element0) && !is_object(reset($element0))) {
-				if (is_string($sql))
-					$stmt = $this->Prepare($sql);
-				else
-					$stmt = $sql;
-					
-				foreach($inputarr as $arr) {
-					$ret = $this->_Execute($stmt,$arr);
-					if (!$ret) return $ret;
-				}
-			} else {
-				$sqlarr = explode(':',$sql);
-				$sql = '';
-				$lastnomatch = -2;
-				#var_dump($sqlarr);echo "
";var_dump($inputarr);echo"
";
-				foreach($sqlarr as $k => $str) {
-						if ($k == 0) { $sql = $str; continue; }
-						// we need $lastnomatch because of the following datetime, 
-						// eg. '10:10:01', which causes code to think that there is bind param :10 and :1
-						$ok = preg_match('/^([0-9]*)/', $str, $arr); 
-			
-						if (!$ok) $sql .= $str;
-						else {
-							$at = $arr[1];
-							if (isset($inputarr[$at]) || is_null($inputarr[$at])) {
-								if ((strlen($at) == strlen($str) && $k < sizeof($arr)-1)) {
-									$sql .= ':'.$str;
-									$lastnomatch = $k;
-								} else if ($lastnomatch == $k-1) {
-									$sql .= ':'.$str;
-								} else {
-									if (is_null($inputarr[$at])) $sql .= 'null';
-									else $sql .= $this->qstr($inputarr[$at]);
-									$sql .= substr($str, strlen($at));
-								}
-							} else {
-								$sql .= ':'.$str;
-							}
-							
-						}
-					}
-					$inputarr = false;
-				}
-			}
-			$ret = $this->_Execute($sql,$inputarr);
-			
-			
-		} else {
-			$ret = $this->_Execute($sql,false);
-		}
-
-		return $ret;
-	}
-	
-	/*
-		Example of usage:
-		
-		$stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
-	*/
-	function Prepare($sql,$cursor=false)
-	{
-	static $BINDNUM = 0;
-	
-		$stmt = OCIParse($this->_connectionID,$sql);
-
-		if (!$stmt) {
-			$this->_errorMsg = false;
-			$this->_errorCode = false;
-			$arr = @OCIError($this->_connectionID);
-			if ($arr === false) return false;
-		
-			$this->_errorMsg = $arr['message'];
-			$this->_errorCode = $arr['code'];
-			return false;
-		}
-		
-		$BINDNUM += 1;
-		
-		$sttype = @OCIStatementType($stmt);
-		if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
-			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? OCINewCursor($this->_connectionID) : false);
-		}
-		return array($sql,$stmt,0,$BINDNUM);
-	}
-	
-	/*
-		Call an oracle stored procedure and returns a cursor variable as a recordset. 
-		Concept by Robert Tuttle robert@ud.com
-		
-		Example:
-			Note: we return a cursor variable in :RS2
-			$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS2); END;",'RS2');
-			
-			$rs = $db->ExecuteCursor(
-				"BEGIN :RS2 = adodb.getdata(:VAR1); END;", 
-				'RS2',
-				array('VAR1' => 'Mr Bean'));
-			
-	*/
-	function ExecuteCursor($sql,$cursorName='rs',$params=false)
-	{
-		if (is_array($sql)) $stmt = $sql;
-		else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
-	
-		if (is_array($stmt) && sizeof($stmt) >= 5) {
-			$hasref = true;
-			$ignoreCur = false;
-			$this->Parameter($stmt, $ignoreCur, $cursorName, false, -1, OCI_B_CURSOR);
-			if ($params) {
-				foreach($params as $k => $v) {
-					$this->Parameter($stmt,$params[$k], $k);
-				}
-			}
-		} else
-			$hasref = false;
-			
-		$rs = $this->Execute($stmt);
-		if ($rs) {
-			if ($rs->databaseType == 'array') OCIFreeCursor($stmt[4]);
-			else if ($hasref) $rs->_refcursor = $stmt[4];
-		}
-		return $rs;
-	}
-	
-	/*
-		Bind a variable -- very, very fast for executing repeated statements in oracle. 
-		Better than using
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)", 
-					array($p1,$p2,$p3));
-			}
-		
-		Usage:
-			$stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
-			$DB->Bind($stmt, $p1);
-			$DB->Bind($stmt, $p2);
-			$DB->Bind($stmt, $p3);
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$DB->Execute($stmt);
-			}
-			
-		Some timings:		
-			** Test table has 3 cols, and 1 index. Test to insert 1000 records
-			Time 0.6081s (1644.60 inserts/sec) with direct OCIParse/OCIExecute
-			Time 0.6341s (1577.16 inserts/sec) with ADOdb Prepare/Bind/Execute
-			Time 1.5533s ( 643.77 inserts/sec) with pure SQL using Execute
-			
-		Now if PHP only had batch/bulk updating like Java or PL/SQL...
-	
-		Note that the order of parameters differs from OCIBindByName,
-		because we default the names to :0, :1, :2
-	*/
-	function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
-	{
-		
-		if (!is_array($stmt)) return false;
-        
-        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
-            return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
-        }
-        
-		if ($name == false) {
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
-			$stmt[2] += 1;
-		} else if (oci_lob_desc($type)) {
-			if ($this->debug) {
-				ADOConnection::outp("Bind: name = $name");
-			}
-            //we have to create a new Descriptor here
-			$numlob = count($this->_refLOBs);
-        	$this->_refLOBs[$numlob]['LOB'] = OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
-			$this->_refLOBs[$numlob]['TYPE'] = $isOutput;
-			
-			$tmp = $this->_refLOBs[$numlob]['LOB'];
-	        $rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
-			if ($this->debug) {
-				ADOConnection::outp("Bind: descriptor has been allocated, var (".$name.") binded");
-			}
-			
-			// if type is input then write data to lob now
-			if ($isOutput == false) {
-				$var = $this->BlobEncode($var);
-				$tmp->WriteTemporary($var);
-				$this->_refLOBs[$numlob]['VAR'] = &$var;
-				if ($this->debug) {
-					ADOConnection::outp("Bind: LOB has been written to temp");
-				}
-			} else {
-				$this->_refLOBs[$numlob]['VAR'] = $var;
-			}
-			$rez = $tmp;
-		} else {
-			if ($this->debug) 
-				ADOConnection::outp("Bind: name = $name");
-			
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
-		}
-		
-		return $rez;
-	}
-	
-	function Param($name,$type=false)
-	{
-		return ':'.$name;
-	}
-	
-	/* 
-	Usage:
-		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group');
-		$db->Execute($stmt);
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-		
-		See OCIBindByName documentation at php.net.
-	*/
-	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
-	{
-			if  ($this->debug) {
-				$prefix = ($isOutput) ? 'Out' : 'In';
-				$ztype = (empty($type)) ? 'false' : $type;
-				ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
-			}
-			return $this->Bind($stmt,$var,$maxLen,$type,$name,$isOutput);
-	}
-	
-	/*
-	returns query ID if successful, otherwise false
-	this version supports:
-	
-	   1. $db->execute('select * from table');
-	   
-	   2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->execute($prepared_statement, array(1,2,3));
-		  
-	   3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
-	   
-	   4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
-		  $db->execute($stmt);
-	*/ 
-	function _query($sql,$inputarr)
-	{
-		if (is_array($sql)) { // is prepared sql
-			$stmt = $sql[1];
-			
-			// we try to bind to permanent array, so that OCIBindByName is persistent
-			// and carried out once only - note that max array element size is 4000 chars
-			if (is_array($inputarr)) {
-				$bindpos = $sql[3];
-				if (isset($this->_bind[$bindpos])) {
-				// all tied up already
-					$bindarr = $this->_bind[$bindpos];
-				} else {
-				// one statement to bind them all
-					$bindarr = array();
-					foreach($inputarr as $k => $v) {
-						$bindarr[$k] = $v;
-						OCIBindByName($stmt,":$k",$bindarr[$k],is_string($v) && strlen($v)>4000 ? -1 : 4000);
-					}
-					$this->_bind[$bindpos] = $bindarr;
-				}
-			}
-		} else {
-			$stmt=OCIParse($this->_connectionID,$sql);
-		}
-			
-		$this->_stmt = $stmt;
-		if (!$stmt) return false;
-	
-		if (defined('ADODB_PREFETCH_ROWS')) @OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
-			
-		if (is_array($inputarr)) {
-			foreach($inputarr as $k => $v) {
-				if (is_array($v)) {
-					if (sizeof($v) == 2) // suggested by g.giunta@libero.
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-					else
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					
-					if ($this->debug==99) {
-						if (is_object($v[0])) 
-							echo "name=:$k",' len='.$v[1],' type='.$v[2],'
';
-						else
-							echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'
';
-						
-					}
-				} else {
-					$len = -1;
-					if ($v === ' ') $len = 1;
-					if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
-						$bindarr[$k] = $v;
-					} else { 				// dynamic sql, so rebind every time
-						OCIBindByName($stmt,":$k",$inputarr[$k],$len);
-					}
-				}
-			}
-		}
-		
-        $this->_errorMsg = false;
-		$this->_errorCode = false;
-		if (OCIExecute($stmt,$this->_commit)) {
-//OCIInternalDebug(1);			
-			if (count($this -> _refLOBs) > 0) {
-		
-				foreach ($this -> _refLOBs as $key => $value) {
-					if ($this -> _refLOBs[$key]['TYPE'] == true) {
-						$tmp = $this -> _refLOBs[$key]['LOB'] -> load();
-						if ($this -> debug) {
-							ADOConnection::outp("OUT LOB: LOB has been loaded. 
");
-						}
-						//$_GLOBALS[$this -> _refLOBs[$key]['VAR']] = $tmp;
-						$this -> _refLOBs[$key]['VAR'] = $tmp;
-					} else {
-                        $this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
-						$this -> _refLOBs[$key]['LOB']->free();
-						unset($this -> _refLOBs[$key]);
-                        if ($this->debug) {
-							ADOConnection::outp("IN LOB: LOB has been saved. 
");
-						}
-                    }					
-				}
-			}
-		
-            switch (@OCIStatementType($stmt)) {
-                case "SELECT":
-					return $stmt;
-				
-				case 'DECLARE':
-                case "BEGIN":
-                    if (is_array($sql) && !empty($sql[4])) {
-						$cursor = $sql[4];
-						if (is_resource($cursor)) {
-							$ok = OCIExecute($cursor);	
-	                        return $cursor;
-						}
-						return $stmt;
-                    } else {
-						if (is_resource($stmt)) {
-							OCIFreeStatement($stmt);
-							return true;
-						}
-                        return $stmt;
-                    }
-                    break;
-                default :
-					// ociclose -- no because it could be used in a LOB?
-                    return true;
-            }
-		}
-		return false;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		if (!$this->_connectionID) return;
-		
-		if (!$this->autoCommit) OCIRollback($this->_connectionID);
-		if (count($this->_refLOBs) > 0) {
-			foreach ($this ->_refLOBs as $key => $value) {
-				$this->_refLOBs[$key]['LOB']->free();
-				unset($this->_refLOBs[$key]);
-			}
-		}
-		OCILogoff($this->_connectionID);
-		
-		$this->_stmt = false;
-		$this->_connectionID = false;
-	}
-	
-	function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
-	{
-		if ($internalKey) return array('ROWID');
-		
-	// tested with oracle 8.1.7
-		$table = strtoupper($table);
-		if ($owner) {
-			$owner_clause = "AND ((a.OWNER = b.OWNER) AND (a.OWNER = UPPER('$owner')))";
-			$ptab = 'ALL_';
-		} else {
-			$owner_clause = '';
-			$ptab = 'USER_';
-		}
-		$sql = "
-SELECT /*+ RULE */ distinct b.column_name
-   FROM {$ptab}CONSTRAINTS a
-	  , {$ptab}CONS_COLUMNS b
-  WHERE ( UPPER(b.table_name) = ('$table'))
-	AND (UPPER(a.table_name) = ('$table') and a.constraint_type = 'P')
-	$owner_clause
-	AND (a.constraint_name = b.constraint_name)";
-
- 		$rs = $this->Execute($sql);
-		if ($rs && !$rs->EOF) {
-			$arr = $rs->GetArray();
-			$a = array();
-			foreach($arr as $v) {
-				$a[] = reset($v);
-			}
-			return $a;
-		}
-		else return false;
-	}
-	
-	// http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
-	function MetaForeignKeys($table, $owner=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$table = $this->qstr(strtoupper($table));
-		if (!$owner) {
-			$owner = $this->user;
-			$tabp = 'user_';
-		} else
-			$tabp = 'all_';
-			
-		$owner = ' and owner='.$this->qstr(strtoupper($owner));
-		
-		$sql = 
-"select constraint_name,r_owner,r_constraint_name 
-	from {$tabp}constraints
-	where constraint_type = 'R' and table_name = $table $owner";
-		
-		$constraints = $this->GetArray($sql);
-		$arr = false;
-		foreach($constraints as $constr) {
-			$cons = $this->qstr($constr[0]);
-			$rowner = $this->qstr($constr[1]);
-			$rcons = $this->qstr($constr[2]);
-			$cols = $this->GetArray("select column_name from {$tabp}cons_columns where constraint_name=$cons $owner order by position");
-			$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
-			
-			if ($cols && $tabcol) 
-				for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
-					$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
-				}
-		}
-		$ADODB_FETCH_MODE = $save;
-		
-		return $arr;
-	}
-
-	
-	function CharMax()
-	{
-		return 4000;
-	}
-	
-	function TextMax()
-	{
-		return 4000;
-	}
-	
-	/**
-	 * Quotes a string.
-	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
-	 * @param s			the string to quote
-	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
-	 *				This undoes the stupidity of magic quotes for GPC.
-	 *
-	 * @return  quoted string to be sent back to database
-	 */
-	function qstr($s,$magic_quotes=false)
-	{	
-		//$nofixquotes=false;
-	
-		if ($this->noNullStrings && strlen($s)==0)$s = ' ';
-		if (!$magic_quotes) {	
-			if ($this->replaceQuote[0] == '\\'){
-				$s = str_replace('\\','\\\\',$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		
-		$s = str_replace('\\\\','\\',$s);
-		return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
-		
-	}
-	
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oci8 extends ADORecordSet {
-
-	var $databaseType = 'oci8';
-	var $bind=false;
-	var $_fieldobjs;
-	
-	//var $_arr = false;
-		
-	function ADORecordset_oci8($queryID,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default:
-		$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		}
-		
-		$this->adodbFetchMode = $mode;
-		$this->_queryID = $queryID;
-	}
-
-
-	function Init()
-	{
-		if ($this->_inited) return;
-		
-		$this->_inited = true;
-		if ($this->_queryID) {
-			
-			$this->_currentRow = 0;
-			@$this->_initrs();
-			$this->EOF = !$this->_fetch();
-			
-			/*
-			// based on idea by Gaetano Giunta to detect unusual oracle errors
-			// see http://phplens.com/lens/lensforum/msgs.php?id=6771
-			$err = OCIError($this->_queryID);
-			if ($err && $this->connection->debug) ADOConnection::outp($err);
-			*/
-			
-			if (!is_array($this->fields)) {
-				$this->_numOfRows = 0;
-				$this->fields = array();
-			}
-		} else {
-			$this->fields = array();
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-			$this->EOF = true;
-		}
-	}
-	
-	function _initrs()
-	{
-		$this->_numOfRows = -1;
-		$this->_numOfFields = OCInumcols($this->_queryID);
-		if ($this->_numOfFields>0) {
-			$this->_fieldobjs = array();
-			$max = $this->_numOfFields;
-			for ($i=0;$i<$max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
-		}
-	}
-
-	  /*		Returns: an object containing field information.
-			  Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			  fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			  fetchField() is retrieved.		*/
-
-	function _FetchField($fieldOffset = -1)
-	{
-		$fld = new ADOFieldObject;
-		$fieldOffset += 1;
-		$fld->name =OCIcolumnname($this->_queryID, $fieldOffset);
-		$fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
-		$fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
-	 	switch($fld->type) {
-		case 'NUMBER':
-	 		$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
-			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
-			if ($p != 0 && $sc == 0) $fld->type = 'INT';
-			break;
-		
-	 	case 'CLOB':
-		case 'NCLOB':
-		case 'BLOB': 
-			$fld->max_length = -1;
-			break;
-		}
-		return $fld;
-	}
-	
-	/* For some reason, OCIcolumnname fails when called after _initrs() so we cache it */
-	function FetchField($fieldOffset = -1)
-	{
-		return $this->_fieldobjs[$fieldOffset];
-	}
-	
-	
-	/*
-	// 10% speedup to move MoveNext to child class
-	function _MoveNext() 
-	{
-	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return @adodb_movenext($this);
-		
-		if ($this->EOF) return false;
-		
-		$this->_currentRow++;
-		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
-			return true;
-		$this->EOF = true;
-		
-		return false;
-	}	*/
-	
-	
-	function MoveNext()
-	{
-		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-			$this->_currentRow += 1;
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->_currentRow += 1;
-			$this->EOF = true;
-		}
-		return false;
-	}
-	
-	/*
-	# does not work as first record is retrieved in _initrs(), so is not included in GetArray()
-	function GetArray($nRows = -1) 
-	{
-	global $ADODB_OCI8_GETARRAY;
-	
-		if (true ||  !empty($ADODB_OCI8_GETARRAY)) {
-			# does not support $ADODB_ANSI_PADDING_OFF
-	
-			//OCI_RETURN_NULLS and OCI_RETURN_LOBS is set by OCIfetchstatement
-			switch($this->adodbFetchMode) {
-			case ADODB_FETCH_NUM:
-			
-				$ncols = @OCIfetchstatement($this->_queryID, $results, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW+OCI_NUM);
-				$results = array_merge(array($this->fields),$results);
-				return $results;
-				
-			case ADODB_FETCH_ASSOC: 
-				if (ADODB_ASSOC_CASE != 2 || $this->databaseType != 'oci8') break;
-				
-				$ncols = @OCIfetchstatement($this->_queryID, $assoc, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW);
-				$results = array_merge(array($this->fields),$assoc);
-				return $results;
-			
-			default:
-				break;
-			}
-		}
-			
-		$results = ADORecordSet::GetArray($nRows);
-		return $results;
-		
-	} */
-	
-	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$arr = $this->GetArray($nrows);
-			return $arr;
-		}
-		$arr = array();
-		for ($i=1; $i < $offset; $i++) 
-			if (!@OCIFetch($this->_queryID)) return $arr;
-			
-		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return $arr;;
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-
-
-	function _seek($row)
-	{
-		return false;
-	}
-
-	function _fetch() 
-	{
-		return @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
-	}
-
-	/*		close() only needs to be called if you are worried about using too much memory while your script
-			is running. All associated result memory for the specified result identifier will automatically be freed.		*/
-
-	function _close() 
-	{
-		if ($this->connection->_stmt === $this->_queryID) $this->connection->_stmt = false;
-		if (!empty($this->_refcursor)) {
-			OCIFreeCursor($this->_refcursor);
-			$this->_refcursor = false;
-		}
-		@OCIFreeStatement($this->_queryID);
- 		$this->_queryID = false;
-		
-	}
-
-	function MetaType($t,$len=-1)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-	 	case 'VARCHAR':
-	 	case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-		case 'NCHAR':
-		case 'NVARCHAR':
-		case 'NVARCHAR2':
-				 if (isset($this) && $len <= $this->blobSize) return 'C';
-		
-		case 'NCLOB':
-		case 'LONG':
-		case 'LONG VARCHAR':
-		case 'CLOB':
-		return 'X';
-		
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-			return 'B';
-		
-		case 'DATE': 
-			return  ($this->connection->datetime) ? 'T' : 'D';
-		
-		
-		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': 
-			return 'I';
-			
-		default: return 'N';
-		}
-	}
-}
-
-class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {	
-	function ADORecordSet_ext_oci8($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->_queryID = $queryID;
-	}
-	
-	function MoveNext()
-	{
-		return adodb_movenext($this);
-	}
-}
-?>
diff --git a/includes/adodb/drivers/adodb-oci8.old.inc.php b/includes/adodb/drivers/adodb-oci8.old.inc.php
deleted file mode 100644
index 6e63c2a3..00000000
--- a/includes/adodb/drivers/adodb-oci8.old.inc.php
+++ /dev/null
@@ -1,1532 +0,0 @@
-
-  
-  13 Nov 2000 jlim - removed all ora_* references.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-/*
-NLS_Date_Format
-Allows you to use a date format other than the Oracle Lite default. When a literal
-character string appears where a date value is expected, the Oracle Lite database
-tests the string to see if it matches the formats of Oracle, SQL-92, or the value
-specified for this parameter in the POLITE.INI file. Setting this parameter also
-defines the default format used in the TO_CHAR or TO_DATE functions when no
-other format string is supplied.
-
-For Oracle the default is dd-mon-yy or dd-mon-yyyy, and for SQL-92 the default is
-yy-mm-dd or yyyy-mm-dd.
-
-Using 'RR' in the format forces two-digit years less than or equal to 49 to be
-interpreted as years in the 21st century (2000–2049), and years over 50 as years in
-the 20th century (1950–1999). Setting the RR format as the default for all two-digit
-year entries allows you to become year-2000 compliant. For example:
-NLS_DATE_FORMAT='RR-MM-DD'
-
-You can also modify the date format using the ALTER SESSION command. 
-*/
-
-# define the LOB descriptor type for the given type
-# returns false if no LOB descriptor
-function oci_lob_desc($type) {
-	switch ($type) {
-		case OCI_B_BFILE: $result = OCI_D_FILE; break;
-		case OCI_B_CFILEE: $result = OCI_D_FILE; break;
-		case OCI_B_CLOB: $result = OCI_D_LOB; break;
-		case OCI_B_BLOB: $result = OCI_D_LOB; break;
-		case OCI_B_ROWID: $result = OCI_D_ROWID; break;
-		default: $result = false; break;
-	}
-	return $result;
-}
-
-class ADODB_oci8 extends ADOConnection {
-	var $databaseType = 'oci8';
-	var $dataProvider = 'oci8';
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $concat_operator='||';
-	var $sysDate = "TRUNC(SYSDATE)";
-	var $sysTimeStamp = 'SYSDATE';
-	var $metaDatabasesSQL = "SELECT USERNAME FROM ALL_USERS WHERE USERNAME NOT IN ('SYS','SYSTEM','DBSNMP','OUTLN') ORDER BY 1";
-	var $_stmt;
-	var $_commit = OCI_COMMIT_ON_SUCCESS;
-	var $_initdate = true; // init date to YYYY-MM-DD
-	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW') and table_name not like 'BIN\$%'"; // bin$ tables are recycle bin tables
-	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
-	var $_bindInputArray = true;
-	var $hasGenID = true;
-	var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";
-	var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s";
-	var $_dropSeqSQL = "DROP SEQUENCE %s";
-	var $hasAffectedRows = true;
-	var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
-	var $noNullStrings = false;
-	var $connectSID = false;
-	var $_bind = false;
-	var $_nestedSQL = true;
-	var $_hasOCIFetchStatement = false;
-	var $_getarray = false; // currently not working
-	var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
-	var $session_sharing_force_blob = false; // alter session on updateblob if set to true 
-	var $firstrows = true; // enable first rows optimization on SelectLimit()
-	var $selectOffsetAlg1 = 100; // when to use 1st algorithm of selectlimit.
-	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
-	var $dateformat = 'YYYY-MM-DD'; // DBDate format
- 	var $useDBDateFormatForTextInput=false;
-	var $datetime = false; // MetaType('DATE') returns 'D' (datetime==false) or 'T' (datetime == true)
-	var $_refLOBs = array();
-		
-	// var $ansiOuter = true; // if oracle9
-    
-	function ADODB_oci8() 
-	{
-		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
-	}
-	
-	/*  function MetaColumns($table) added by smondino@users.sourceforge.net*/
-	function MetaColumns($table) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$false = false;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!$rs) {
-			return $false;
-		}
-		$retarr = array();
-		while (!$rs->EOF) { //print_r($rs->fields);
-			$fld = new ADOFieldObject();
-	   		$fld->name = $rs->fields[0];
-	   		$fld->type = $rs->fields[1];
-	   		$fld->max_length = $rs->fields[2];
-			$fld->scale = $rs->fields[3];
-			if ($rs->fields[1] == 'NUMBER') {
-				if ($rs->fields[3] == 0) $fld->type = 'INT';
-	     		$fld->max_length = $rs->fields[4];
-	    	}	
-		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
-			$fld->binary = (strpos($fld->type,'BLOB') !== false);
-			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		if (empty($retarr))
-			return  $false;
-		else 
-			return $retarr;
-	}
-	
-	function Time()
-	{
-		$rs = $this->Execute("select TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
-		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
-		return false;
-	}
- 
-/*
-
-  Multiple modes of connection are supported:
-  
-  a. Local Database
-    $conn->Connect(false,'scott','tiger');
-  
-  b. From tnsnames.ora
-    $conn->Connect(false,'scott','tiger',$tnsname); 
-    $conn->Connect($tnsname,'scott','tiger'); 
-  
-  c. Server + service name
-    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
-  
-  d. Server + SID
-  	$conn->connectSID = true;
-	$conn->Connect($serveraddress,'scott,'tiger',$SID);
-
-
-Example TNSName:
----------------
-NATSOFT.DOMAIN =
-  (DESCRIPTION =
-	(ADDRESS_LIST =
-	  (ADDRESS = (PROTOCOL = TCP)(HOST = kermit)(PORT = 1523))
-	)
-	(CONNECT_DATA =
-	  (SERVICE_NAME = natsoft.domain)
-	)
-  )
-  
-  There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force new connection
-	
-*/
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mode=0)
-	{
-		if (!function_exists('OCIPLogon')) return null;
-		
-		
-        $this->_errorMsg = false;
-		$this->_errorCode = false;
-		
-		if($argHostname) { // added by Jorma Tuomainen 
-			if (empty($argDatabasename)) $argDatabasename = $argHostname;
-			else {
-				if(strpos($argHostname,":")) {
-					$argHostinfo=explode(":",$argHostname);
-				   	$argHostname=$argHostinfo[0];
-					$argHostport=$argHostinfo[1];
-			 	} else {
-					$argHostport = empty($this->port)?  "1521" : $this->port;
-	   			}
-				
-				if ($this->connectSID) {
-					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-					.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
-				} else
-					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-					.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
-			}
-		}
-				
- 		//if ($argHostname) print "
Connect: 1st argument should be left blank for $this->databaseType
";
-		if ($mode==1) {
-			$this->_connectionID = ($this->charSet) ? 
-				OCIPLogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				OCIPLogon($argUsername,$argPassword, $argDatabasename)
-				;
-			if ($this->_connectionID && $this->autoRollback)  OCIrollback($this->_connectionID);
-		} else if ($mode==2) {
-			$this->_connectionID = ($this->charSet) ? 
-				OCINLogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				OCINLogon($argUsername,$argPassword, $argDatabasename);
-				
-		} else {
-			$this->_connectionID = ($this->charSet) ? 
-				OCILogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				OCILogon($argUsername,$argPassword, $argDatabasename);
-		}
-		if (!$this->_connectionID) return false;
-		if ($this->_initdate) {
-			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
-		}
-		
-		// looks like: 
-		// Oracle8i Enterprise Edition Release 8.1.7.0.0 - Production With the Partitioning option JServer Release 8.1.7.0.0 - Production
-		// $vers = OCIServerVersion($this->_connectionID);
-		// if (strpos($vers,'8i') !== false) $this->ansiOuter = true;
-		return true;
-   	}
-	
-	function ServerInfo()
-	{
-		$arr['compat'] = $this->GetOne('select value from sys.database_compatible_level');
-		$arr['description'] = @OCIServerVersion($this->_connectionID);
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-		// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
-	}
-	
-	// returns true or false
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,2);
-	}
-	
-	function _affectedrows()
-	{
-		if (is_resource($this->_stmt)) return @OCIRowCount($this->_stmt);
-		return 0;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " NVL($field, $ifNull) "; // if Oracle
-	}
-	
-	// format and return date string in database date format
-	function DBDate($d)
-	{
-		if (empty($d) && $d !== 0) return 'null';
-		
-		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->dateformat."')";
-	}
-
-	function BindDate($d)
-	{
-		$d = ADOConnection::DBDate($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	function BindTimeStamp($d)
-	{
-		$d = ADOConnection::DBTimeStamp($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	// format and return date string in database timestamp format
-	function DBTimeStamp($ts)
-	{
-		if (empty($ts) && $ts !== 0) return 'null';
-		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date("'Y-m-d H:i:s'",$ts).",'RRRR-MM-DD, HH24:MI:SS')";
-	}
-	
-	function RowLock($tables,$where,$flds='1 as ignore') 
-	{
-		if ($this->autoCommit) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
-	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(strtoupper($mask));
-			$this->metaTablesSQL .= " AND upper(table_name) like $mask";
-		}
-		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	// Mark Newnham 
-	function MetaIndexes ($table, $primary = FALSE, $owner=false)
-	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-
-		// get index details
-		$table = strtoupper($table);
-
-		// get Primary index
-		$primary_key = '';
-
-		$false = false;
-		$rs = $this->Execute(sprintf("SELECT * FROM ALL_CONSTRAINTS WHERE UPPER(TABLE_NAME)='%s' AND CONSTRAINT_TYPE='P'",$table));
-		if ($row = $rs->FetchRow())
-		   $primary_key = $row[1]; //constraint_name
-
-		if ($primary==TRUE && $primary_key=='') {
-			 if (isset($savem)) 
-                $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			return $false; //There is no primary key
-		}
-
-        $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
-
-		
-        if (!is_object($rs)) {
-			if (isset($savem)) 
-				$this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
-
-		$indexes = array ();
-        // parse index data into array
-
-        while ($row = $rs->FetchRow()) {
-			if ($primary && $row[0] != $primary_key) continue;
-            if (!isset($indexes[$row[0]])) {
-				$indexes[$row[0]] = array(
-				   'unique' => ($row[1] == 'UNIQUE'),
-				   'columns' => array()
-				);
-            }
-            $indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
-        }
-
-        // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index ) {
-            ksort ($indexes[$index]['columns']);
-        }
-
-		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-		}
-        return $indexes;
-	}
-	
-	function BeginTrans()
-	{	
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->autoCommit = false;
-		$this->_commit = OCI_DEFAULT;
-		
-		if ($this->_transmode) $this->Execute("SET TRANSACTION ".$this->_transmode);
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = OCIcommit($this->_connectionID);
-		$this->_commit = OCI_COMMIT_ON_SUCCESS;
-		$this->autoCommit = true;
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = OCIrollback($this->_connectionID);
-		$this->_commit = OCI_COMMIT_ON_SUCCESS;
-		$this->autoCommit = true;
-		return $ret;
-	}
-	
-	
-	function SelectDB($dbName) 
-	{
-		return false;
-	}
-
-	function ErrorMsg() 
-	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
-
-		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
-		if (empty($arr)) {
-			if (is_resource($this->_connectionID)) $arr = @OCIError($this->_connectionID);
-			else $arr = @OCIError();
-			if ($arr === false) return '';
-		}
-		$this->_errorMsg = $arr['message'];
-		$this->_errorCode = $arr['code'];
-		return $this->_errorMsg;
-	}
-
-	function ErrorNo() 
-	{
-		if ($this->_errorCode !== false) return $this->_errorCode;
-		
-		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
-		if (empty($arr)) {
-			$arr = @OCIError($this->_connectionID);
-			if ($arr == false) $arr = @OCIError();
-			if ($arr == false) return '';
-		}
-		
-		$this->_errorMsg = $arr['message'];
-		$this->_errorCode = $arr['code'];
-		
-		return $arr['code'];
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'TO_CHAR('.$col.",'";
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= 'YYYY';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= 'Q';
-				break;
-				
-			case 'M':
-				$s .= 'Mon';
-				break;
-				
-			case 'm':
-				$s .= 'MM';
-				break;
-			case 'D':
-			case 'd':
-				$s .= 'DD';
-				break;
-			
-			case 'H':
-				$s.= 'HH24';
-				break;
-				
-			case 'h':
-				$s .= 'HH';
-				break;
-				
-			case 'i':
-				$s .= 'MI';
-				break;
-			
-			case 's':
-				$s .= 'SS';
-				break;
-			
-			case 'a':
-			case 'A':
-				$s .= 'AM';
-				break;
-				
-			case 'w':
-				$s .= 'D';
-				break;
-				
-			case 'l':
-				$s .= 'DAY';
-				break;
-				
-			 case 'W':
-				$s .= 'WW';
-				break;
-				
-			default:
-			// handle escape characters...
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
-				
-			}
-		}
-		return $s. "')";
-	}
-	
-	function GetRandRow($sql, $arr = false)
-	{
-		$sql = "SELECT * FROM ($sql ORDER BY dbms_random.value) WHERE rownum = 1";
-		
-		return $this->GetRow($sql,$arr);
-	}
-	
-	/*
-	This algorithm makes use of
-	
-	a. FIRST_ROWS hint
-	The FIRST_ROWS hint explicitly chooses the approach to optimize response time, 
-	that is, minimum resource usage to return the first row. Results will be returned 
-	as soon as they are identified. 
-
-	b. Uses rownum tricks to obtain only the required rows from a given offset.
-	 As this uses complicated sql statements, we only use this if the $offset >= 100. 
-	 This idea by Tomas V V Cox.
-	 
-	 This implementation does not appear to work with oracle 8.0.5 or earlier. Comment
-	 out this function then, and the slower SelectLimit() in the base class will be used.
-	*/
-	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		// seems that oracle only supports 1 hint comment in 8i
-		if ($this->firstrows) {
-			if (strpos($sql,'/*+') !== false)
-				$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
-			else
-				$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-		}
-		
-		if ($offset < $this->selectOffsetAlg1 && 0 < $nrows && $nrows < 1000) {
-			if ($nrows > 0) {	
-				if ($offset > 0) $nrows += $offset;
-				//$inputarr['adodb_rownum'] = $nrows;
-				if ($this->databaseType == 'oci8po') {
-					$sql = "select * from (".$sql.") where rownum <= ?";
-				} else {
-					$sql = "select * from (".$sql.") where rownum <= :adodb_offset";
-				} 
-				$inputarr['adodb_offset'] = $nrows;
-				$nrows = -1;
-			}
-			// note that $nrows = 0 still has to work ==> no rows returned
-
-			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			return $rs;
-			
-		} else {
-			 // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
-			
-			 // Let Oracle return the name of the columns
-			$q_fields = "SELECT * FROM (".$sql.") WHERE NULL = NULL";
-			 
-			$false = false;
-			if (! $stmt_arr = $this->Prepare($q_fields)) {
-				return $false;
-			}
-			$stmt = $stmt_arr[1];
-			 
-			 if (is_array($inputarr)) {
-			 	foreach($inputarr as $k => $v) {
-					if (is_array($v)) {
-						if (sizeof($v) == 2) // suggested by g.giunta@libero.
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-						else
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					} else {
-						$len = -1;
-						if ($v === ' ') $len = 1;
-						if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
-							$bindarr[$k] = $v;
-						} else { 				// dynamic sql, so rebind every time
-							OCIBindByName($stmt,":$k",$inputarr[$k],$len);
-						}
-					}
-				}
-			}
-			
-			 if (!OCIExecute($stmt, OCI_DEFAULT)) {
-				 OCIFreeStatement($stmt); 
-				 return $false;
-			 }
-			 
-			 $ncols = OCINumCols($stmt);
-			 for ( $i = 1; $i <= $ncols; $i++ ) {
-				 $cols[] = '"'.OCIColumnName($stmt, $i).'"';
-			 }
-			 $result = false;
-			
-			 OCIFreeStatement($stmt); 
-			 $fields = implode(',', $cols);
-			 $nrows += $offset;
-			 $offset += 1; // in Oracle rownum starts at 1
-			
-			if ($this->databaseType == 'oci8po') {
-					 $sql = "SELECT $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= ?".
-					  ") WHERE adodb_rownum >= ?";
-				} else {
-					 $sql = "SELECT $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= :adodb_nrows".
-					  ") WHERE adodb_rownum >= :adodb_offset";
-				} 
-				$inputarr['adodb_nrows'] = $nrows;
-				$inputarr['adodb_offset'] = $offset;
-				
-			if ($secs2cache>0) $rs = $this->CacheExecute($secs2cache, $sql,$inputarr);
-			else $rs = $this->Execute($sql,$inputarr);
-			return $rs;
-		}
-	
-	}
-	
-	/**
-	* Usage:
-	* Store BLOBs and CLOBs
-	*
-	* Example: to store $var in a blob
-	*
-	*	$conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
-	*	$conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
-	*	
-	*	$blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
-	*
-	*  to get length of LOB:
-	*  	select DBMS_LOB.GETLENGTH(ablob) from TABLE
-	*
-	* If you are using CURSOR_SHARING = force, it appears this will case a segfault
-	* under oracle 8.1.7.0. Run:
-	*	 $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-	* before UpdateBlob() then...
-	*/
-
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		
-		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
-		
-		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp("UpdateBlob: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
-		}
-		
-		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
-		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
-		$arr['blob'] = array($desc,-1,$type);
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-		$commit = $this->autoCommit;
-		if ($commit) $this->BeginTrans();
-		$rs = $this->_Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->save($val);
-		$desc->free();
-		if ($commit) $this->CommitTrans();
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
-		
-		if ($rez) $rs->Close();
-		return $rez;
-	}
-	
-	/**
-	* Usage:  store file pointed to by $var in a blob
-	*/
-	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp( "UpdateBlob: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
-		}
-		
-		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
-		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
-		$arr['blob'] = array($desc,-1,$type);
-		
-		$this->BeginTrans();
-		$rs = ADODB_oci8::Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->savefile($val);
-		$desc->free();
-		$this->CommitTrans();
-		
-		if ($rez) $rs->Close();
-		return $rez;
-	}
-
-		/**
-	 * Execute SQL 
-	 *
-	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
-	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
-	 * @return 		RecordSet or false
-	 */
-	function Execute($sql,$inputarr=false) 
-	{
-		if ($this->fnExecute) {
-			$fn = $this->fnExecute;
-			$ret = $fn($this,$sql,$inputarr);
-			if (isset($ret)) return $ret;
-		}
-		if ($inputarr) {
-			#if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
-			$element0 = reset($inputarr);
-			
-			# is_object check because oci8 descriptors can be passed in
-			if (is_array($element0) && !is_object(reset($element0))) {
-				if (is_string($sql))
-					$stmt = $this->Prepare($sql);
-				else
-					$stmt = $sql;
-					
-				foreach($inputarr as $arr) {
-					$ret = $this->_Execute($stmt,$arr);
-					if (!$ret) return $ret;
-				}
-			} else {
-				$ret = $this->_Execute($sql,$inputarr);
-			}
-			
-		} else {
-			$ret = $this->_Execute($sql,false);
-		}
-
-		return $ret;
-	}
-	
-	/*
-		Example of usage:
-		
-		$stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
-	*/
-	function Prepare($sql,$cursor=false)
-	{
-	static $BINDNUM = 0;
-	
-		$stmt = OCIParse($this->_connectionID,$sql);
-
-		if (!$stmt) {
-			$this->_errorMsg = false;
-			$this->_errorCode = false;
-			$arr = @OCIError($this->_connectionID);
-			if ($arr === false) return false;
-		
-			$this->_errorMsg = $arr['message'];
-			$this->_errorCode = $arr['code'];
-			return false;
-		}
-		
-		$BINDNUM += 1;
-		
-		$sttype = @OCIStatementType($stmt);
-		if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
-			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? OCINewCursor($this->_connectionID) : false);
-		}
-		return array($sql,$stmt,0,$BINDNUM);
-	}
-	
-	/*
-		Call an oracle stored procedure and returns a cursor variable as a recordset. 
-		Concept by Robert Tuttle robert@ud.com
-		
-		Example:
-			Note: we return a cursor variable in :RS2
-			$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS2); END;",'RS2');
-			
-			$rs = $db->ExecuteCursor(
-				"BEGIN :RS2 = adodb.getdata(:VAR1); END;", 
-				'RS2',
-				array('VAR1' => 'Mr Bean'));
-			
-	*/
-	function ExecuteCursor($sql,$cursorName='rs',$params=false)
-	{
-		if (is_array($sql)) $stmt = $sql;
-		else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
-	
-		if (is_array($stmt) && sizeof($stmt) >= 5) {
-			$hasref = true;
-			$ignoreCur = false;
-			$this->Parameter($stmt, $ignoreCur, $cursorName, false, -1, OCI_B_CURSOR);
-			if ($params) {
-				foreach($params as $k => $v) {
-					$this->Parameter($stmt,$params[$k], $k);
-				}
-			}
-		} else
-			$hasref = false;
-			
-		$rs = $this->Execute($stmt);
-		if ($rs) {
-			if ($rs->databaseType == 'array') OCIFreeCursor($stmt[4]);
-			else if ($hasref) $rs->_refcursor = $stmt[4];
-		}
-		return $rs;
-	}
-	
-	/*
-		Bind a variable -- very, very fast for executing repeated statements in oracle. 
-		Better than using
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)", 
-					array($p1,$p2,$p3));
-			}
-		
-		Usage:
-			$stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
-			$DB->Bind($stmt, $p1);
-			$DB->Bind($stmt, $p2);
-			$DB->Bind($stmt, $p3);
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$DB->Execute($stmt);
-			}
-			
-		Some timings:		
-			** Test table has 3 cols, and 1 index. Test to insert 1000 records
-			Time 0.6081s (1644.60 inserts/sec) with direct OCIParse/OCIExecute
-			Time 0.6341s (1577.16 inserts/sec) with ADOdb Prepare/Bind/Execute
-			Time 1.5533s ( 643.77 inserts/sec) with pure SQL using Execute
-			
-		Now if PHP only had batch/bulk updating like Java or PL/SQL...
-	
-		Note that the order of parameters differs from OCIBindByName,
-		because we default the names to :0, :1, :2
-	*/
-	function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
-	{
-		
-		if (!is_array($stmt)) return false;
-        
-        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
-            return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
-        }
-        
-		if ($name == false) {
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
-			$stmt[2] += 1;
-		} else if (oci_lob_desc($type)) {
-			if ($this->debug) {
-				ADOConnection::outp("Bind: name = $name");
-			}
-            //we have to create a new Descriptor here
-			$numlob = count($this->_refLOBs);
-        	$this->_refLOBs[$numlob]['LOB'] = OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
-			$this->_refLOBs[$numlob]['TYPE'] = $isOutput;
-			
-			$tmp = $this->_refLOBs[$numlob]['LOB'];
-	        $rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
-			if ($this->debug) {
-				ADOConnection::outp("Bind: descriptor has been allocated, var (".$name.") binded");
-			}
-			
-			// if type is input then write data to lob now
-			if ($isOutput == false) {
-				$var = $this->BlobEncode($var);
-				$tmp->WriteTemporary($var);
-				$this->_refLOBs[$numlob]['VAR'] = $var;
-				if ($this->debug) {
-					ADOConnection::outp("Bind: LOB has been written to temp");
-				}
-			} else {
-				$this->_refLOBs[$numlob]['VAR'] = $var;
-			}
-			$rez = $tmp;
-		} else {
-			if ($this->debug) 
-				ADOConnection::outp("Bind: name = $name");
-			
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
-		}
-		
-		return $rez;
-	}
-	
-	function Param($name,$type=false)
-	{
-		return ':'.$name;
-	}
-	
-	/* 
-	Usage:
-		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group');
-		$db->Execute($stmt);
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-		
-		See OCIBindByName documentation at php.net.
-	*/
-	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
-	{
-			if  ($this->debug) {
-				$prefix = ($isOutput) ? 'Out' : 'In';
-				$ztype = (empty($type)) ? 'false' : $type;
-				ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
-			}
-			return $this->Bind($stmt,$var,$maxLen,$type,$name,$isOutput);
-	}
-	
-	/*
-	returns query ID if successful, otherwise false
-	this version supports:
-	
-	   1. $db->execute('select * from table');
-	   
-	   2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->execute($prepared_statement, array(1,2,3));
-		  
-	   3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
-	   
-	   4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
-		  $db->execute($stmt);
-	*/ 
-	function _query($sql,$inputarr)
-	{
-		if (is_array($sql)) { // is prepared sql
-			$stmt = $sql[1];
-			
-			// we try to bind to permanent array, so that OCIBindByName is persistent
-			// and carried out once only - note that max array element size is 4000 chars
-			if (is_array($inputarr)) {
-				$bindpos = $sql[3];
-				if (isset($this->_bind[$bindpos])) {
-				// all tied up already
-					$bindarr = $this->_bind[$bindpos];
-				} else {
-				// one statement to bind them all
-					$bindarr = array();
-					foreach($inputarr as $k => $v) {
-						$bindarr[$k] = $v;
-						OCIBindByName($stmt,":$k",$bindarr[$k],is_string($v) && strlen($v)>4000 ? -1 : 4000);
-					}
-					$this->_bind[$bindpos] = $bindarr;
-				}
-			}
-		} else {
-			$stmt=OCIParse($this->_connectionID,$sql);
-		}
-			
-		$this->_stmt = $stmt;
-		if (!$stmt) return false;
-	
-		if (defined('ADODB_PREFETCH_ROWS')) @OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
-			
-		if (is_array($inputarr)) {
-			foreach($inputarr as $k => $v) {
-				if (is_array($v)) {
-					if (sizeof($v) == 2) // suggested by g.giunta@libero.
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-					else
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					
-					if ($this->debug==99) {
-						if (is_object($v[0])) 
-							echo "name=:$k",' len='.$v[1],' type='.$v[2],'
';
-						else
-							echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'
';
-						
-					}
-				} else {
-					$len = -1;
-					if ($v === ' ') $len = 1;
-					if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
-						$bindarr[$k] = $v;
-					} else { 				// dynamic sql, so rebind every time
-						OCIBindByName($stmt,":$k",$inputarr[$k],$len);
-					}
-				}
-			}
-		}
-		
-        $this->_errorMsg = false;
-		$this->_errorCode = false;
-		if (OCIExecute($stmt,$this->_commit)) {
-//OCIInternalDebug(1);			
-			if (count($this -> _refLOBs) > 0) {
-		
-				foreach ($this -> _refLOBs as $key => $value) {
-					if ($this -> _refLOBs[$key]['TYPE'] == true) {
-						$tmp = $this -> _refLOBs[$key]['LOB'] -> load();
-						if ($this -> debug) {
-							ADOConnection::outp("OUT LOB: LOB has been loaded. 
");
-						}
-						//$_GLOBALS[$this -> _refLOBs[$key]['VAR']] = $tmp;
-						$this -> _refLOBs[$key]['VAR'] = $tmp;
-					} else {
-                        $this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
-						$this -> _refLOBs[$key]['LOB']->free();
-						unset($this -> _refLOBs[$key]);
-                        if ($this->debug) {
-							ADOConnection::outp("IN LOB: LOB has been saved. 
");
-						}
-                    }					
-				}
-			}
-		
-            switch (@OCIStatementType($stmt)) {
-                case "SELECT":
-					return $stmt;
-				
-				case 'DECLARE':
-                case "BEGIN":
-                    if (is_array($sql) && !empty($sql[4])) {
-						$cursor = $sql[4];
-						if (is_resource($cursor)) {
-							$ok = OCIExecute($cursor);	
-	                        return $cursor;
-						}
-						return $stmt;
-                    } else {
-						if (is_resource($stmt)) {
-							OCIFreeStatement($stmt);
-							return true;
-						}
-                        return $stmt;
-                    }
-                    break;
-                default :
-					// ociclose -- no because it could be used in a LOB?
-                    return true;
-            }
-		}
-		return false;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		if (!$this->_connectionID) return;
-		
-		if (!$this->autoCommit) OCIRollback($this->_connectionID);
-		if (count($this->_refLOBs) > 0) {
-			foreach ($this ->_refLOBs as $key => $value) {
-				$this->_refLOBs[$key]['LOB']->free();
-				unset($this->_refLOBs[$key]);
-			}
-		}
-		OCILogoff($this->_connectionID);
-		
-		$this->_stmt = false;
-		$this->_connectionID = false;
-	}
-	
-	function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
-	{
-		if ($internalKey) return array('ROWID');
-		
-	// tested with oracle 8.1.7
-		$table = strtoupper($table);
-		if ($owner) {
-			$owner_clause = "AND ((a.OWNER = b.OWNER) AND (a.OWNER = UPPER('$owner')))";
-			$ptab = 'ALL_';
-		} else {
-			$owner_clause = '';
-			$ptab = 'USER_';
-		}
-		$sql = "
-SELECT /*+ RULE */ distinct b.column_name
-   FROM {$ptab}CONSTRAINTS a
-	  , {$ptab}CONS_COLUMNS b
-  WHERE ( UPPER(b.table_name) = ('$table'))
-	AND (UPPER(a.table_name) = ('$table') and a.constraint_type = 'P')
-	$owner_clause
-	AND (a.constraint_name = b.constraint_name)";
-
- 		$rs = $this->Execute($sql);
-		if ($rs && !$rs->EOF) {
-			$arr = $rs->GetArray();
-			$a = array();
-			foreach($arr as $v) {
-				$a[] = reset($v);
-			}
-			return $a;
-		}
-		else return false;
-	}
-	
-	// http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
-	function MetaForeignKeys($table, $owner=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$table = $this->qstr(strtoupper($table));
-		if (!$owner) {
-			$owner = $this->user;
-			$tabp = 'user_';
-		} else
-			$tabp = 'all_';
-			
-		$owner = ' and owner='.$this->qstr(strtoupper($owner));
-		
-		$sql = 
-"select constraint_name,r_owner,r_constraint_name 
-	from {$tabp}constraints
-	where constraint_type = 'R' and table_name = $table $owner";
-		
-		$constraints = $this->GetArray($sql);
-		$arr = false;
-		foreach($constraints as $constr) {
-			$cons = $this->qstr($constr[0]);
-			$rowner = $this->qstr($constr[1]);
-			$rcons = $this->qstr($constr[2]);
-			$cols = $this->GetArray("select column_name from {$tabp}cons_columns where constraint_name=$cons $owner order by position");
-			$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
-			
-			if ($cols && $tabcol) 
-				for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
-					$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
-				}
-		}
-		$ADODB_FETCH_MODE = $save;
-		
-		return $arr;
-	}
-
-	
-	function CharMax()
-	{
-		return 4000;
-	}
-	
-	function TextMax()
-	{
-		return 4000;
-	}
-	
-	/**
-	 * Quotes a string.
-	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
-	 * @param s			the string to quote
-	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
-	 *				This undoes the stupidity of magic quotes for GPC.
-	 *
-	 * @return  quoted string to be sent back to database
-	 */
-	function qstr($s,$magic_quotes=false)
-	{	
-		//$nofixquotes=false;
-	
-		if ($this->noNullStrings && strlen($s)==0)$s = ' ';
-		if (!$magic_quotes) {	
-			if ($this->replaceQuote[0] == '\\'){
-				$s = str_replace('\\','\\\\',$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		
-		$s = str_replace('\\\\','\\',$s);
-		return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
-		
-	}
-	
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oci8 extends ADORecordSet {
-
-	var $databaseType = 'oci8';
-	var $bind=false;
-	var $_fieldobjs;
-	
-	//var $_arr = false;
-		
-	function ADORecordset_oci8($queryID,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default:
-		$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		}
-		
-		$this->adodbFetchMode = $mode;
-		$this->_queryID = $queryID;
-	}
-
-
-	function Init()
-	{
-		if ($this->_inited) return;
-		
-		$this->_inited = true;
-		if ($this->_queryID) {
-			
-			$this->_currentRow = 0;
-			@$this->_initrs();
-			$this->EOF = !$this->_fetch();
-			
-			/*
-			// based on idea by Gaetano Giunta to detect unusual oracle errors
-			// see http://phplens.com/lens/lensforum/msgs.php?id=6771
-			$err = OCIError($this->_queryID);
-			if ($err && $this->connection->debug) ADOConnection::outp($err);
-			*/
-			
-			if (!is_array($this->fields)) {
-				$this->_numOfRows = 0;
-				$this->fields = array();
-			}
-		} else {
-			$this->fields = array();
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-			$this->EOF = true;
-		}
-	}
-	
-	function _initrs()
-	{
-		$this->_numOfRows = -1;
-		$this->_numOfFields = OCInumcols($this->_queryID);
-		if ($this->_numOfFields>0) {
-			$this->_fieldobjs = array();
-			$max = $this->_numOfFields;
-			for ($i=0;$i<$max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
-		}
-	}
-
-	  /*		Returns: an object containing field information.
-			  Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			  fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			  fetchField() is retrieved.		*/
-
-	function _FetchField($fieldOffset = -1)
-	{
-		$fld = new ADOFieldObject;
-		$fieldOffset += 1;
-		$fld->name =OCIcolumnname($this->_queryID, $fieldOffset);
-		$fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
-		$fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
-	 	switch($fld->type) {
-		case 'NUMBER':
-	 		$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
-			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
-			if ($p != 0 && $sc == 0) $fld->type = 'INT';
-			break;
-		
-	 	case 'CLOB':
-		case 'NCLOB':
-		case 'BLOB': 
-			$fld->max_length = -1;
-			break;
-		}
-		return $fld;
-	}
-	
-	/* For some reason, OCIcolumnname fails when called after _initrs() so we cache it */
-	function FetchField($fieldOffset = -1)
-	{
-		return $this->_fieldobjs[$fieldOffset];
-	}
-	
-	
-	/*
-	// 10% speedup to move MoveNext to child class
-	function _MoveNext() 
-	{
-	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return @adodb_movenext($this);
-		
-		if ($this->EOF) return false;
-		
-		$this->_currentRow++;
-		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
-			return true;
-		$this->EOF = true;
-		
-		return false;
-	}	*/
-	
-	
-	function MoveNext()
-	{
-		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-			$this->_currentRow += 1;
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->_currentRow += 1;
-			$this->EOF = true;
-		}
-		return false;
-	}
-	
-	/*
-	# does not work as first record is retrieved in _initrs(), so is not included in GetArray()
-	function GetArray($nRows = -1) 
-	{
-	global $ADODB_OCI8_GETARRAY;
-	
-		if (true ||  !empty($ADODB_OCI8_GETARRAY)) {
-			# does not support $ADODB_ANSI_PADDING_OFF
-	
-			//OCI_RETURN_NULLS and OCI_RETURN_LOBS is set by OCIfetchstatement
-			switch($this->adodbFetchMode) {
-			case ADODB_FETCH_NUM:
-			
-				$ncols = @OCIfetchstatement($this->_queryID, $results, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW+OCI_NUM);
-				$results = array_merge(array($this->fields),$results);
-				return $results;
-				
-			case ADODB_FETCH_ASSOC: 
-				if (ADODB_ASSOC_CASE != 2 || $this->databaseType != 'oci8') break;
-				
-				$ncols = @OCIfetchstatement($this->_queryID, $assoc, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW);
-				$results = array_merge(array($this->fields),$assoc);
-				return $results;
-			
-			default:
-				break;
-			}
-		}
-			
-		$results = ADORecordSet::GetArray($nRows);
-		return $results;
-		
-	} */
-	
-	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$arr = $this->GetArray($nrows);
-			return $arr;
-		}
-		$arr = array();
-		for ($i=1; $i < $offset; $i++) 
-			if (!@OCIFetch($this->_queryID)) return $arr;
-			
-		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return $arr;;
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-
-
-	function _seek($row)
-	{
-		return false;
-	}
-
-	function _fetch() 
-	{
-		return @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
-	}
-
-	/*		close() only needs to be called if you are worried about using too much memory while your script
-			is running. All associated result memory for the specified result identifier will automatically be freed.		*/
-
-	function _close() 
-	{
-		if ($this->connection->_stmt === $this->_queryID) $this->connection->_stmt = false;
-		if (!empty($this->_refcursor)) {
-			OCIFreeCursor($this->_refcursor);
-			$this->_refcursor = false;
-		}
-		@OCIFreeStatement($this->_queryID);
- 		$this->_queryID = false;
-		
-	}
-
-	function MetaType($t,$len=-1)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-	 	case 'VARCHAR':
-	 	case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-		case 'NCHAR':
-		case 'NVARCHAR':
-		case 'NVARCHAR2':
-				 if (isset($this) && $len <= $this->blobSize) return 'C';
-		
-		case 'NCLOB':
-		case 'LONG':
-		case 'LONG VARCHAR':
-		case 'CLOB':
-		return 'X';
-		
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-			return 'B';
-		
-		case 'DATE': 
-			return  ($this->connection->datetime) ? 'T' : 'D';
-		
-		
-		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': 
-			return 'I';
-			
-		default: return 'N';
-		}
-	}
-}
-
-class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {	
-	function ADORecordSet_ext_oci8($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->_queryID = $queryID;
-	}
-	
-	function MoveNext()
-	{
-		return adodb_movenext($this);
-	}
-}
-?>
diff --git a/includes/adodb/drivers/adodb-oci805.inc.php b/includes/adodb/drivers/adodb-oci805.inc.php
deleted file mode 100644
index 3498f750..00000000
--- a/includes/adodb/drivers/adodb-oci805.inc.php
+++ /dev/null
@@ -1,59 +0,0 @@
-ADODB_oci8();
-	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		// seems that oracle only supports 1 hint comment in 8i
-		if (strpos($sql,'/*+') !== false)
-			$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
-		else
-			$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-		
-		/* 
-			The following is only available from 8.1.5 because order by in inline views not 
-			available before then...
-			http://www.jlcomp.demon.co.uk/faq/top_sql.html
-		if ($nrows > 0) {	
-			if ($offset > 0) $nrows += $offset;
-			$sql = "select * from ($sql) where rownum <= $nrows";
-			$nrows = -1;
-		}
-		*/
-
-		return ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-	}
-}
-
-class ADORecordset_oci805 extends ADORecordset_oci8 {	
-	var $databaseType = "oci805";
-	function ADORecordset_oci805($id,$mode=false)
-	{
-		$this->ADORecordset_oci8($id,$mode);
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-oci8po.inc.php b/includes/adodb/drivers/adodb-oci8po.inc.php
deleted file mode 100644
index 89246908..00000000
--- a/includes/adodb/drivers/adodb-oci8po.inc.php
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-   Should some emulation of RecordCount() be implemented?
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
-
-class ADODB_oci8po extends ADODB_oci8 {
-	var $databaseType = 'oci8po';
-	var $dataProvider = 'oci8';
-	var $metaColumnsSQL = "select lower(cname),coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
-	var $metaTablesSQL = "select lower(table_name),table_type from cat where table_type in ('TABLE','VIEW')";
-	
-	function ADODB_oci8po()
-	{
-		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-		# oci8po does not support adodb extension: adodb_movenext()
-	}
-	
-	function Param($name)
-	{
-		return '?';
-	}
-	
-	function Prepare($sql,$cursor=false)
-	{
-		$sqlarr = explode('?',$sql);
-		$sql = $sqlarr[0];
-		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
-			$sql .=  ':'.($i-1) . $sqlarr[$i];
-		} 
-		return ADODB_oci8::Prepare($sql,$cursor);
-	}
-	
-	// emulate handling of parameters ? ?, replacing with :bind0 :bind1
-	function _query($sql,$inputarr)
-	{
-		if (is_array($inputarr)) {
-			$i = 0;
-			if (is_array($sql)) {
-				foreach($inputarr as $v) {
-					$arr['bind'.$i++] = $v;
-				} 
-			} else {
-				$sqlarr = explode('?',$sql);
-				$sql = $sqlarr[0];
-				foreach($inputarr as $k => $v) {
-					$sql .=  ":$k" . $sqlarr[++$i];
-				}
-			}
-		}
-		return ADODB_oci8::_query($sql,$inputarr);
-	}
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oci8po extends ADORecordset_oci8 {
-
-	var $databaseType = 'oci8po';
-	
-	function ADORecordset_oci8po($queryID,$mode=false)
-	{
-		$this->ADORecordset_oci8($queryID,$mode);
-	}
-
-	function Fields($colname)
-	{
-		if ($this->fetchMode & OCI_ASSOC) return $this->fields[$colname];
-		
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	// lowercase field names...
-	function _FetchField($fieldOffset = -1)
-	{
-		 $fld = new ADOFieldObject;
- 		 $fieldOffset += 1;
-		 $fld->name = OCIcolumnname($this->_queryID, $fieldOffset);
-		 if (ADODB_ASSOC_CASE == 0) $fld->name = strtolower($fld->name);
-		 $fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
-		 $fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
-		 if ($fld->type == 'NUMBER') {
-		 	//$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
-			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
-			if ($sc == 0) $fld->type = 'INT';
-		 }
-		 return $fld;
-	}
-	/*
-	function MoveNext()
-	{
-		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-			$this->_currentRow += 1;
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->_currentRow += 1;
-			$this->EOF = true;
-		}
-		return false;
-	}*/
-
-	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
-	{
-		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-		global $ADODB_ANSI_PADDING_OFF;
-			$this->_currentRow++;
-			
-			if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
-			if (!empty($ADODB_ANSI_PADDING_OFF)) {
-				foreach($this->fields as $k => $v) {
-					if (is_string($v)) $this->fields[$k] = rtrim($v);
-				}
-			}
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->EOF = true;
-			$this->_currentRow++;
-		}
-		return false;
-	}	
-	
-	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$arr = $this->GetArray($nrows);
-			return $arr;
-		}
-		for ($i=1; $i < $offset; $i++) 
-			if (!@OCIFetch($this->_queryID)) {
-				$arr = array();
-				return $arr;
-			}
-		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-			$arr = array();
-			return $arr;
-		}
-		if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-
-	// Create associative array
-	function _updatefields()
-	{
-		if (ADODB_ASSOC_CASE == 2) return; // native
-	
-		$arr = array();
-		$lowercase = (ADODB_ASSOC_CASE == 0);
-		
-		foreach($this->fields as $k => $v) {
-			if (is_integer($k)) $arr[$k] = $v;
-			else {
-				if ($lowercase)
-					$arr[strtolower($k)] = $v;
-				else
-					$arr[strtoupper($k)] = $v;
-			}
-		}
-		$this->fields = $arr;
-	}
-	
-	function _fetch() 
-	{
-		$ret = @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
-		if ($ret) {
-		global $ADODB_ANSI_PADDING_OFF;
-	
-				if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
-				if (!empty($ADODB_ANSI_PADDING_OFF)) {
-					foreach($this->fields as $k => $v) {
-						if (is_string($v)) $this->fields[$k] = rtrim($v);
-					}
-				}
-		}
-		return $ret;
-	}
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-odbc.inc.php b/includes/adodb/drivers/adodb-odbc.inc.php
deleted file mode 100644
index fc198a6c..00000000
--- a/includes/adodb/drivers/adodb-odbc.inc.php
+++ /dev/null
@@ -1,738 +0,0 @@
-_haserrorfunctions = ADODB_PHPVER >= 0x4050;
-		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
-	}
-	
-		// returns true or false
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-		
-		if (!function_exists('odbc_connect')) return null;
-		
-		if ($this->debug && $argDatabasename && $this->databaseType != 'vfp') {
-			ADOConnection::outp("For odbc Connect(), $argDatabasename is not used. Place dsn in 1st parameter.");
-		}
-		if (isset($php_errormsg)) $php_errormsg = '';
-		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
-		else $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
-		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
-		return $this->_connectionID != false;
-	}
-	
-	// returns true or false
-	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-	
-		if (!function_exists('odbc_connect')) return null;
-		
-		if (isset($php_errormsg)) $php_errormsg = '';
-		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		if ($this->debug && $argDatabasename) {
-			ADOConnection::outp("For odbc PConnect(), $argDatabasename is not used. Place dsn in 1st parameter.");
-		}
-	//	print "dsn=$argDSN u=$argUsername p=$argPassword
"; flush();
-		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
-		else $this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
-		
-		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		if ($this->_connectionID && $this->autoRollback) @odbc_rollback($this->_connectionID);
-		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
-		return $this->_connectionID != false;
-	}
-
-	
-	function ServerInfo()
-	{
-	
-		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
-			$dsn = strtoupper($this->host);
-			$first = true;
-			$found = false;
-			
-			if (!function_exists('odbc_data_source')) return false;
-			
-			while(true) {
-				
-				$rez = @odbc_data_source($this->_connectionID,
-					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
-				$first = false;
-				if (!is_array($rez)) break;
-				if (strtoupper($rez['server']) == $dsn) {
-					$found = true;
-					break;
-				}
-			} 
-			if (!$found) return ADOConnection::ServerInfo();
-			if (!isset($rez['version'])) $rez['version'] = '';
-			return $rez;
-		} else {
-			return ADOConnection::ServerInfo();
-		}
-	}
-
-	
-	function CreateSequence($seqname='adodbseq',$start=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		$start -= 1;
-		return $this->Execute("insert into $seqname values($start)");
-	}
-	
-	var $_dropSeqSQL = 'drop table %s';
-	function DropSequence($seqname)
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-	
-	/*
-		This algorithm is not very efficient, but works even if table locking
-		is not available.
-		
-		Will return false if unable to generate an ID after $MAXLOOPS attempts.
-	*/
-	function GenID($seq='adodbseq',$start=1)
-	{	
-		// if you have to modify the parameter below, your database is overloaded,
-		// or you need to implement generation of id's yourself!
-		$MAXLOOPS = 100;
-		//$this->debug=1;
-		while (--$MAXLOOPS>=0) {
-			$num = $this->GetOne("select id from $seq");
-			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
-				$start -= 1;
-				$num = '0';
-				$ok = $this->Execute("insert into $seq values($start)");
-				if (!$ok) return false;
-			} 
-			$this->Execute("update $seq set id=id+1 where id=$num");
-			
-			if ($this->affected_rows() > 0) {
-				$num += 1;
-				$this->genID = $num;
-				return $num;
-			}
-		}
-		if ($fn = $this->raiseErrorFn) {
-			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
-		}
-		return false;
-	}
-
-
-	function ErrorMsg()
-	{
-		if ($this->_haserrorfunctions) {
-			if ($this->_errorMsg !== false) return $this->_errorMsg;
-			if (empty($this->_connectionID)) return @odbc_errormsg();
-			return @odbc_errormsg($this->_connectionID);
-		} else return ADOConnection::ErrorMsg();
-	}
-	
-	function ErrorNo()
-	{
-		
-		if ($this->_haserrorfunctions) {
-			if ($this->_errorCode !== false) {
-				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
-				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
-			}
-
-			if (empty($this->_connectionID)) $e = @odbc_error(); 
-			else $e = @odbc_error($this->_connectionID);
-			
-			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
-			 // so we check and patch
-			if (strlen($e)<=2) return 0;
-			return $e;
-		} else return ADOConnection::ErrorNo();
-	}
-	
-	
-
-	function BeginTrans()
-	{	
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		$this->transCnt += 1;
-		$this->_autocommit = false;
-		return odbc_autocommit($this->_connectionID,false);
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		$ret = odbc_commit($this->_connectionID);
-		odbc_autocommit($this->_connectionID,true);
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		$ret = odbc_rollback($this->_connectionID);
-		odbc_autocommit($this->_connectionID,true);
-		return $ret;
-	}
-	
-	function MetaPrimaryKeys($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		if ($this->uCaseTables) $table = strtoupper($table);
-		$schema = '';
-		$this->_findschema($table,$schema);
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = @odbc_primarykeys($this->_connectionID,'',$schema,$table);
-		
-		if (!$qid) {
-			$ADODB_FETCH_MODE = $savem;
-			return false;
-		}
-		$rs = new ADORecordSet_odbc($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return false;
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr = $rs->GetArray();
-		$rs->Close();
-		//print_r($arr);
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][3]) $arr2[] = $arr[$i][3];
-		}
-		return $arr2;
-	}
-	
-	
-	
-	function MetaTables($ttype=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = odbc_tables($this->_connectionID);
-		
-		$rs = new ADORecordSet_odbc($qid);
-		
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) {
-			$false = false;
-			return $false;
-		}
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr = $rs->GetArray();
-		//print_r($arr);
-		
-		$rs->Close();
-		$arr2 = array();
-		
-		if ($ttype) {
-			$isview = strncmp($ttype,'V',1) === 0;
-		}
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if (!$arr[$i][2]) continue;
-			$type = $arr[$i][3];
-			if ($ttype) { 
-				if ($isview) {
-					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
-				} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
-			} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
-		}
-		return $arr2;
-	}
-	
-/*
-See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp
-/ SQL data type codes /
-#define	SQL_UNKNOWN_TYPE	0
-#define SQL_CHAR			1
-#define SQL_NUMERIC		 2
-#define SQL_DECIMAL		 3
-#define SQL_INTEGER		 4
-#define SQL_SMALLINT		5
-#define SQL_FLOAT		   6
-#define SQL_REAL			7
-#define SQL_DOUBLE		  8
-#if (ODBCVER >= 0x0300)
-#define SQL_DATETIME		9
-#endif
-#define SQL_VARCHAR		12
-
-
-/ One-parameter shortcuts for date/time data types /
-#if (ODBCVER >= 0x0300)
-#define SQL_TYPE_DATE	  91
-#define SQL_TYPE_TIME	  92
-#define SQL_TYPE_TIMESTAMP 93
-
-#define SQL_UNICODE                             (-95)
-#define SQL_UNICODE_VARCHAR                     (-96)
-#define SQL_UNICODE_LONGVARCHAR                 (-97)
-*/
-	function ODBCTypes($t)
-	{
-		switch ((integer)$t) {
-		case 1:	
-		case 12:
-		case 0:
-		case -95:
-		case -96:
-			return 'C';
-		case -97:
-		case -1: //text
-			return 'X';
-		case -4: //image
-			return 'B';
-				
-		case 9:	
-		case 91:
-			return 'D';
-		
-		case 10:
-		case 11:
-		case 92:
-		case 93:
-			return 'T';
-			
-		case 4:
-		case 5:
-		case -6:
-			return 'I';
-			
-		case -11: // uniqidentifier
-			return 'R';
-		case -7: //bit
-			return 'L';
-		
-		default:
-			return 'N';
-		}
-	}
-	
-	function MetaColumns($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$false = false;
-		if ($this->uCaseTables) $table = strtoupper($table);
-		$schema = '';
-		$this->_findschema($table,$schema);
-		
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-		/*if (false) { // after testing, confirmed that the following does not work becoz of a bug
-			$qid2 = odbc_tables($this->_connectionID);
-			$rs = new ADORecordSet_odbc($qid2);		
-			$ADODB_FETCH_MODE = $savem;
-			if (!$rs) return false;
-			$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-			$rs->_fetch();
-			
-			while (!$rs->EOF) {
-				if ($table == strtoupper($rs->fields[2])) {
-					$q = $rs->fields[0];
-					$o = $rs->fields[1];
-					break;
-				}
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			
-			$qid = odbc_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
-		} */
-		
-		switch ($this->databaseType) {
-		case 'access':
-		case 'vfp':
-			$qid = odbc_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
-			break;
-		
-		
-		case 'db2':
-            $colname = "%";
-            $qid = odbc_columns($this->_connectionID, "", $schema, $table, $colname);
-            break;
-			
-		default:
-			$qid = @odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
-			if (empty($qid)) $qid = odbc_columns($this->_connectionID);
-			break;
-		}
-		if (empty($qid)) return $false;
-		
-		$rs = new ADORecordSet_odbc($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return $false;
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		$rs->_fetch();
-		
-		$retarr = array();
-		
-		/*
-		$rs->fields indices
-		0 TABLE_QUALIFIER
-		1 TABLE_SCHEM
-		2 TABLE_NAME
-		3 COLUMN_NAME
-		4 DATA_TYPE
-		5 TYPE_NAME
-		6 PRECISION
-		7 LENGTH
-		8 SCALE
-		9 RADIX
-		10 NULLABLE
-		11 REMARKS
-		*/
-		while (!$rs->EOF) {
-		//	adodb_pr($rs->fields);
-			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[3];
-				$fld->type = $this->ODBCTypes($rs->fields[4]);
-				
-				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
-				// access uses precision to store length for char/varchar
-				if ($fld->type == 'C' or $fld->type == 'X') {
-					if ($this->databaseType == 'access') 
-						$fld->max_length = $rs->fields[6];
-					else if ($rs->fields[4] <= -95) // UNICODE
-						$fld->max_length = $rs->fields[7]/2;
-					else
-						$fld->max_length = $rs->fields[7];
-				} else 
-					$fld->max_length = $rs->fields[7];
-				$fld->not_null = !empty($rs->fields[10]);
-				$fld->scale = $rs->fields[8];
-				$retarr[strtoupper($fld->name)] = $fld;	
-			} else if (sizeof($retarr)>0)
-				break;
-			$rs->MoveNext();
-		}
-		$rs->Close(); //-- crashes 4.03pl1 -- why?
-		
-		if (empty($retarr)) $retarr = false;
-		return $retarr;
-	}
-	
-	function Prepare($sql)
-	{
-		if (! $this->_bindInputArray) return $sql; // no binding
-		$stmt = odbc_prepare($this->_connectionID,$sql);
-		if (!$stmt) {
-			// we don't know whether odbc driver is parsing prepared stmts, so just return sql
-			return $sql;
-		}
-		return array($sql,$stmt,false);
-	}
-
-	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
-	{
-	GLOBAL $php_errormsg;
-		if (isset($php_errormsg)) $php_errormsg = '';
-		$this->_error = '';
-		
-		if ($inputarr) {
-			if (is_array($sql)) {
-				$stmtid = $sql[1];
-			} else {
-				$stmtid = odbc_prepare($this->_connectionID,$sql);
-	
-				if ($stmtid == false) {
-					$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-					return false;
-				}
-			}
-			
-			if (! odbc_execute($stmtid,$inputarr)) {
-				//@odbc_free_result($stmtid);
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = odbc_errormsg();
-					$this->_errorCode = odbc_error();
-				}
-				return false;
-			}
-		
-		} else if (is_array($sql)) {
-			$stmtid = $sql[1];
-			if (!odbc_execute($stmtid)) {
-				//@odbc_free_result($stmtid);
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = odbc_errormsg();
-					$this->_errorCode = odbc_error();
-				}
-				return false;
-			}
-		} else
-			$stmtid = odbc_exec($this->_connectionID,$sql);
-		
-		$this->_lastAffectedRows = 0;
-		if ($stmtid) {
-			if (@odbc_num_fields($stmtid) == 0) {
-				$this->_lastAffectedRows = odbc_num_rows($stmtid);
-				$stmtid = true;
-			} else {
-				$this->_lastAffectedRows = 0;
-				odbc_binmode($stmtid,$this->binmode);
-				odbc_longreadlen($stmtid,$this->maxblobsize);
-			}
-			
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = '';
-				$this->_errorCode = 0;
-			} else
-				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		} else {
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = odbc_errormsg();
-				$this->_errorCode = odbc_error();
-			} else
-				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		}
-		return $stmtid;
-	}
-
-	/*
-		Insert a null into the blob field of the table first.
-		Then use UpdateBlob to store the blob.
-		
-		Usage:
-		 
-		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		$ret = @odbc_close($this->_connectionID);
-		$this->_connectionID = false;
-		return $ret;
-	}
-
-	function _affectedrows()
-	{
-		return $this->_lastAffectedRows;
-	}
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_odbc extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "odbc";		
-	var $dataProvider = "odbc";
-	var $useFetchArray;
-	var $_has_stupid_odbc_fetch_api_change;
-	
-	function ADORecordSet_odbc($id,$mode=false)
-	{
-		if ($mode === false) {  
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		
-		$this->_queryID = $id;
-		
-		// the following is required for mysql odbc driver in 4.3.1 -- why?
-		$this->EOF = false;
-		$this->_currentRow = -1;
-		//$this->ADORecordSet($id);
-	}
-
-
-	// returns the field object
-	function FetchField($fieldOffset = -1) 
-	{
-		
-		$off=$fieldOffset+1; // offsets begin at 1
-		
-		$o= new ADOFieldObject();
-		$o->name = @odbc_field_name($this->_queryID,$off);
-		$o->type = @odbc_field_type($this->_queryID,$off);
-		$o->max_length = @odbc_field_len($this->_queryID,$off);
-		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-		return $o;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-		
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS) ? @odbc_num_rows($this->_queryID) : -1;
-		$this->_numOfFields = @odbc_num_fields($this->_queryID);
-		// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
-		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
-		//$this->useFetchArray = $this->connection->useFetchArray;
-		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
-	}	
-	
-	function _seek($row)
-	{
-		return false;
-	}
-	
-	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
-	function GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$rs = $this->GetArray($nrows);
-			return $rs;
-		}
-		$savem = $this->fetchMode;
-		$this->fetchMode = ADODB_FETCH_NUM;
-		$this->Move($offset);
-		$this->fetchMode = $savem;
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-		}
-		
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-	
-	
-	function MoveNext() 
-	{
-		if ($this->_numOfRows != 0 && !$this->EOF) {		
-			$this->_currentRow++;
-			
-			if ($this->_has_stupid_odbc_fetch_api_change)
-				$rez = @odbc_fetch_into($this->_queryID,$this->fields);
-			else {
-				$row = 0;
-				$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
-			}
-			if ($rez) {
-				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-					$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-				}
-				return true;
-			}
-		}
-		$this->fields = false;
-		$this->EOF = true;
-		return false;
-	}	
-	
-	function _fetch()
-	{
-
-		if ($this->_has_stupid_odbc_fetch_api_change)
-			$rez = @odbc_fetch_into($this->_queryID,$this->fields);
-		else {
-			$row = 0;
-			$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
-		}
-		if ($rez) {
-			if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-				$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-			}
-			return true;
-		}
-		$this->fields = false;
-		return false;
-	}
-	
-	function _close() 
-	{
-		return @odbc_free_result($this->_queryID);		
-	}
-
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-odbc_db2.inc.php b/includes/adodb/drivers/adodb-odbc_db2.inc.php
deleted file mode 100644
index 6e5b2889..00000000
--- a/includes/adodb/drivers/adodb-odbc_db2.inc.php
+++ /dev/null
@@ -1,368 +0,0 @@
-curMode = SQL_CUR_USE_ODBC;
-$db->Connect($dsn, $userid, $pwd);
-
-
-
-USING CLI INTERFACE
-===================
-
-I have had reports that the $host and $database params have to be reversed in 
-Connect() when using the CLI interface. From Halmai Csongor csongor.halmai#nexum.hu:
-
-> The symptom is that if I change the database engine from postgres or any other to DB2 then the following
-> connection command becomes wrong despite being described this version to be correct in the docs. 
->
-> $connection_object->Connect( $DATABASE_HOST, $DATABASE_AUTH_USER_NAME, $DATABASE_AUTH_PASSWORD, $DATABASE_NAME )
->
-> In case of DB2 I had to swap the first and last arguments in order to connect properly. 
-
-
-System Error 5
-==============
-IF you get a System Error 5 when trying to Connect/Load, it could be a permission problem. Give the user connecting
-to DB2 full rights to the DB2 SQLLIB directory, and place the user in the DBUSERS group.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-if (!defined('ADODB_ODBC_DB2')){
-define('ADODB_ODBC_DB2',1);
-
-class ADODB_ODBC_DB2 extends ADODB_odbc {
-	var $databaseType = "db2";	
-	var $concat_operator = '||';
-	var $sysTime = 'CURRENT TIME';
-	var $sysDate = 'CURRENT DATE';
-	var $sysTimeStamp = 'CURRENT TIMESTAMP';
-	// The complete string representation of a timestamp has the form 
-	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
-	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
-	var $ansiOuter = true;
-	var $identitySQL = 'values IDENTITY_VAL_LOCAL()';
-	var $_bindInputArray = true;
-	 var $hasInsertID = true;
-	var $rsPrefix = 'ADORecordset_odbc_';
-	
-	function ADODB_DB2()
-	{
-		if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
-		$this->ADODB_odbc();
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " COALESCE($field, $ifNull) "; // if DB2 UDB
-	}
-	
-	function ServerInfo()
-	{
-		//odbc_setoption($this->_connectionID,1,101 /*SQL_ATTR_ACCESS_MODE*/, 1 /*SQL_MODE_READ_ONLY*/);
-		$vers = $this->GetOne('select versionnumber from sysibm.sysversions');
-		//odbc_setoption($this->_connectionID,1,101, 0 /*SQL_MODE_READ_WRITE*/);
-		return array('description'=>'DB2 ODBC driver', 'version'=>$vers);
-	}
-	
-	function _insertid()
-	{
-		return $this->GetOne($this->identitySQL);
-	}
-	
-	function RowLock($tables,$where,$flds='1 as ignore')
-	{
-		if ($this->_autocommit) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
-	}
-	
-	function MetaTables($ttype=false,$showSchema=false, $qtable="%", $qschema="%")
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = odbc_tables($this->_connectionID, "", $qschema, $qtable, "");
-		
-		$rs = new ADORecordSet_odbc($qid);
-		
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) {
-			$false = false;
-			return $false;
-		}
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr = $rs->GetArray();
-		//print_r($arr);
-		
-		$rs->Close();
-		$arr2 = array();
-		
-		if ($ttype) {
-			$isview = strncmp($ttype,'V',1) === 0;
-		}
-		for ($i=0; $i < sizeof($arr); $i++) {
-		
-			if (!$arr[$i][2]) continue;
-			if (strncmp($arr[$i][1],'SYS',3) === 0) continue;
-			
-			$type = $arr[$i][3];
-			
-			if ($showSchema) $arr[$i][2] = $arr[$i][1].'.'.$arr[$i][2];
-			
-			if ($ttype) { 
-				if ($isview) {
-					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
-				} else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
-			} else if (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2];
-		}
-		return $arr2;
-	}
-
-	function MetaIndexes ($table, $primary = FALSE, $owner=false)
-	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-		$false = false;
-		// get index details
-		$table = strtoupper($table);
-		$SQL="SELECT NAME, UNIQUERULE, COLNAMES FROM SYSIBM.SYSINDEXES WHERE TBNAME='$table'";
-        if ($primary) 
-			$SQL.= " AND UNIQUERULE='P'";
-		$rs = $this->Execute($SQL);
-        if (!is_object($rs)) {
-			if (isset($savem)) 
-				$this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
-		$indexes = array ();
-        // parse index data into array
-        while ($row = $rs->FetchRow()) {
-			$indexes[$row[0]] = array(
-			   'unique' => ($row[1] == 'U' || $row[1] == 'P'),
-			   'columns' => array()
-			);
-			$cols = ltrim($row[2],'+');
-			$indexes[$row[0]]['columns'] = explode('+', $cols);
-        }
-		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-		}
-        return $indexes;
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-	// use right() and replace() ?
-		if (!$col) $col = $this->sysDate;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '||';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "char(year($col))";
-				break;
-			case 'M':
-				$s .= "substr(monthname($col),1,3)";
-				break;
-			case 'm':
-				$s .= "right(digits(month($col)),2)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "right(digits(day($col)),2)";
-				break;
-			case 'H':
-			case 'h':
-				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
-				else $s .= "''";
-				break;
-			case 'i':
-			case 'I':
-				if ($col != $this->sysDate)
-					$s .= "right(digits(minute($col)),2)";
-					else $s .= "''";
-				break;
-			case 'S':
-			case 's':
-				if ($col != $this->sysDate)
-					$s .= "right(digits(second($col)),2)";
-				else $s .= "''";
-				break;
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-			}
-		}
-		return $s;
-	} 
- 
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
-	{
-		$nrows = (integer) $nrows;
-		if ($offset <= 0) {
-		// could also use " OPTIMIZE FOR $nrows ROWS "
-			if ($nrows >= 0) $sql .=  " FETCH FIRST $nrows ROWS ONLY ";
-			$rs = $this->Execute($sql,$inputArr);
-		} else {
-			if ($offset > 0 && $nrows < 0);
-			else {
-				$nrows += $offset;
-				$sql .=  " FETCH FIRST $nrows ROWS ONLY ";
-			}
-			$rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
-		}
-		
-		return $rs;
-	}
-	
-};
- 
-
-class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {	
-	
-	var $databaseType = "db2";		
-	
-	function ADORecordSet_db2($id,$mode=false)
-	{
-		$this->ADORecordSet_odbc($id,$mode);
-	}
-
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		switch (strtoupper($t)) {
-		case 'VARCHAR':
-		case 'CHAR':
-		case 'CHARACTER':
-		case 'C':
-			if ($len <= $this->blobSize) return 'C';
-		
-		case 'LONGCHAR':
-		case 'TEXT':
-		case 'CLOB':
-		case 'DBCLOB': // double-byte
-		case 'X':
-			return 'X';
-		
-		case 'BLOB':
-		case 'GRAPHIC':
-		case 'VARGRAPHIC':
-			return 'B';
-			
-		case 'DATE':
-		case 'D':
-			return 'D';
-		
-		case 'TIME':
-		case 'TIMESTAMP':
-		case 'T':
-			return 'T';
-		
-		//case 'BOOLEAN': 
-		//case 'BIT':
-		//	return 'L';
-			
-		//case 'COUNTER':
-		//	return 'R';
-			
-		case 'INT':
-		case 'INTEGER':
-		case 'BIGINT':
-		case 'SMALLINT':
-		case 'I':
-			return 'I';
-			
-		default: return 'N';
-		}
-	}
-}
-
-} //define
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-odbc_mssql.inc.php b/includes/adodb/drivers/adodb-odbc_mssql.inc.php
deleted file mode 100644
index 71e13c78..00000000
--- a/includes/adodb/drivers/adodb-odbc_mssql.inc.php
+++ /dev/null
@@ -1,306 +0,0 @@
-ADODB_odbc();
-		//$this->curmode = SQL_CUR_USE_ODBC;	
-	}
-
-	// crashes php...
-	function ServerInfo()
-	{
-	global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$row = $this->GetRow("execute sp_server_info 2");
-		$ADODB_FETCH_MODE = $save;
-		if (!is_array($row)) return false;
-		$arr['description'] = $row[2];
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-
-	function IfNull( $field, $ifNull ) 
-	{
-		return " ISNULL($field, $ifNull) "; // if MS SQL Server
-	}
-	
-	function _insertid()
-	{
-	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
-	// they are in the same stored procedure, function, or batch.
-			return $this->GetOne($this->identitySQL);
-	}
-	
-	
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
-"select object_name(constid) as constraint_name,
-	col_name(fkeyid, fkey) as column_name,
-	object_name(rkeyid) as referenced_table_name,
-   	col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where upper(object_name(fkeyid)) = $table
-order by constraint_name, referenced_table_name, keyno";
-		
-		$constraints = $this->GetArray($sql);
-		
-		$ADODB_FETCH_MODE = $save;
-		
-		$arr = false;
-		foreach($constraints as $constr) {
-			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
-		}
-		if (!$arr) return false;
-		
-		$arr2 = false;
-		
-		foreach($arr as $k => $v) {
-			foreach($v as $a => $b) {
-				if ($upper) $a = strtoupper($a);
-				$arr2[$a] = $b;
-			}
-		}
-		return $arr2;
-	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {$this->debug=1;
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " AND name like $mask";
-		}
-		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	function MetaColumns($table)
-	{
-		$arr = ADOConnection::MetaColumns($table);
-		return $arr;
-	}
-	
-	
-	function MetaIndexes($table,$primary=false)
-	{
-		$table = $this->qstr($table);
-
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
-			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
-			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
-			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
-			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
-			ORDER BY O.name, I.Name, K.keyno";
-
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-        if (!is_object($rs)) {
-        	return FALSE;
-        }
-
-		$indexes = array();
-		while ($row = $rs->FetchRow()) {
-			if (!$primary && $row[5]) continue;
-			
-            $indexes[$row[0]]['unique'] = $row[6];
-            $indexes[$row[0]]['columns'][] = $row[1];
-    	}
-        return $indexes;
-	}
-	
-	function _query($sql,$inputarr)
-	{
-		if (is_string($sql)) $sql = str_replace('||','+',$sql);
-		return ADODB_odbc::_query($sql,$inputarr);
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET TRANSACTION ".$transaction_mode);
-	}
-	
-	// "Stein-Aksel Basma" 
-	// tested with MSSQL 2000
-	function MetaPrimaryKeys($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$schema = '';
-		$this->_findschema($table,$schema);
-		//if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
-	
-		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
-		information_schema.table_constraints tc 
-		where tc.constraint_name = k.constraint_name and tc.constraint_type =
-		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
-		
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-		$a = $this->GetCol($sql);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if ($a && sizeof($a)>0) return $a;
-		$false = false;
-		return $false;	  
-	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		if ($nrows > 0 && $offset <= 0) {
-			$sql = preg_replace(
-				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
-			$rs = $this->Execute($sql,$inputarr);
-		} else
-			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			
-		return $rs;
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '+';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "datename(yyyy,$col)";
-				break;
-			case 'M':
-				$s .= "convert(char(3),$col,0)";
-				break;
-			case 'm':
-				$s .= "replace(str(month($col),2),' ','0')";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "datename(quarter,$col)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "replace(str(day($col),2),' ','0')";
-				break;
-			case 'h':
-				$s .= "substring(convert(char(14),$col,0),13,2)";
-				break;
-			
-			case 'H':
-				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
-				break;
-				
-			case 'i':
-				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
-				break;
-			case 's':
-				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
-				break;
-			case 'a':
-			case 'A':
-				$s .= "substring(convert(char(19),$col,0),18,2)";
-				break;
-				
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
-			}
-		}
-		return $s;
-	}
-
-} 
- 
-class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {	
-	
-	var $databaseType = 'odbc_mssql';
-	
-	function ADORecordSet_odbc_mssql($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}	
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-odbc_oracle.inc.php b/includes/adodb/drivers/adodb-odbc_oracle.inc.php
deleted file mode 100644
index de2349f7..00000000
--- a/includes/adodb/drivers/adodb-odbc_oracle.inc.php
+++ /dev/null
@@ -1,115 +0,0 @@
-ADODB_odbc();
-	}
-		
-	function MetaTables() 
-	{
-		$false = false;
-		$rs = $this->Execute($this->metaTablesSQL);
-		if ($rs === false) return $false;
-		$arr = $rs->GetArray();
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			$arr2[] = $arr[$i][0];
-		}
-		$rs->Close();
-		return $arr2;
-	}
-	
-	function MetaColumns($table) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		if ($rs === false) {	
-			$false = false;
-			return $false;
-		}
-		$retarr = array();
-		while (!$rs->EOF) { //print_r($rs->fields);
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$fld->type = $rs->fields[1];
-			$fld->max_length = $rs->fields[2];
-			
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		return $retarr;	
-	}
-
-	// returns true or false
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-	
-		$php_errormsg = '';
-		$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
-		$this->_errorMsg = $php_errormsg;
-		
-		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
-		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
-		return $this->_connectionID != false;
-	}
-	// returns true or false
-	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-		$php_errormsg = '';
-		$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
-		$this->_errorMsg = $php_errormsg;
-		
-		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
-		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
-		return $this->_connectionID != false;
-	}
-} 
- 
-class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {	
-	
-	var $databaseType = 'odbc_oracle';
-	
-	function ADORecordSet_odbc_oracle($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-odbtp.inc.php b/includes/adodb/drivers/adodb-odbtp.inc.php
deleted file mode 100644
index b4b6ed0b..00000000
--- a/includes/adodb/drivers/adodb-odbtp.inc.php
+++ /dev/null
@@ -1,793 +0,0 @@
-
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-define("_ADODB_ODBTP_LAYER", 2 );
-
-class ADODB_odbtp extends ADOConnection{
-	var $databaseType = "odbtp";
-	var $dataProvider = "odbtp";
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $odbc_driver = 0;
-	var $hasAffectedRows = true;
-	var $hasInsertID = false;
-	var $hasGenID = true;
-	var $hasMoveFirst = true;
-
-	var $_genSeqSQL = "create table %s (seq_name char(30) not null unique , seq_value integer not null)";
-	var $_dropSeqSQL = "delete from adodb_seq where seq_name = '%s'";
-	var $_bindInputArray = false;
-	var $_useUnicodeSQL = false;
-	var $_canPrepareSP = false;
-	var $_dontPoolDBC = true;
-
-	function ADODB_odbtp()
-	{
-	}
-
-	function ServerInfo()
-	{
-		return array('description' => @odbtp_get_attr( ODB_ATTR_DBMSNAME, $this->_connectionID),
-		             'version' => @odbtp_get_attr( ODB_ATTR_DBMSVER, $this->_connectionID));
-	}
-
-	function ErrorMsg()
-	{
-		if (empty($this->_connectionID)) return @odbtp_last_error();
-		return @odbtp_last_error($this->_connectionID);
-	}
-
-	function ErrorNo()
-	{
-		if (empty($this->_connectionID)) return @odbtp_last_error_state();
-			return @odbtp_last_error_state($this->_connectionID);
-	}
-
-	function _insertid()
-	{
-	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in
-	// the same scope. A scope is a module -- a stored procedure, trigger,
-	// function, or batch. Thus, two statements are in the same scope if
-	// they are in the same stored procedure, function, or batch.
-			return $this->GetOne($this->identitySQL);
-	}
-
-	function _affectedrows()
-	{
-		if ($this->_queryID) {
-			return @odbtp_affected_rows ($this->_queryID);
-	   } else
-		return 0;
-	}
-
-	function CreateSequence($seqname='adodbseq',$start=1)
-	{
-		//verify existence
-		$num = $this->GetOne("select seq_value from adodb_seq");
-		$seqtab='adodb_seq';
-		if( $this->odbc_driver == ODB_DRIVER_FOXPRO ) {
-			$path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, $this->_connectionID );
-			//if using vfp dbc file
-			if( !strcasecmp(strrchr($path, '.'), '.dbc') )
-                $path = substr($path,0,strrpos($path,'\/'));
-           	$seqtab = $path . '/' . $seqtab;
-        }
-		if($num == false) {
-			if (empty($this->_genSeqSQL)) return false;
-			$ok = $this->Execute(sprintf($this->_genSeqSQL ,$seqtab));
-		}
-		$num = $this->GetOne("select seq_value from adodb_seq where seq_name='$seqname'");
-		if ($num) {
-			return false;
-		}
-		$start -= 1;
-		return $this->Execute("insert into adodb_seq values('$seqname',$start)");
-	}
-
-	function DropSequence($seqname)
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-
-	function GenID($seq='adodbseq',$start=1)
-	{
-		$seqtab='adodb_seq';
-		if( $this->odbc_driver == ODB_DRIVER_FOXPRO) {
-			$path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, $this->_connectionID );
-			//if using vfp dbc file
-			if( !strcasecmp(strrchr($path, '.'), '.dbc') )
-                $path = substr($path,0,strrpos($path,'\/'));
-           	$seqtab = $path . '/' . $seqtab;
-        }
-		$MAXLOOPS = 100;
-		while (--$MAXLOOPS>=0) {
-			$num = $this->GetOne("select seq_value from adodb_seq where seq_name='$seq'");
-			if ($num === false) {
-				//verify if abodb_seq table exist
-				$ok = $this->GetOne("select seq_value from adodb_seq ");
-				if(!$ok) {
-					//creating the sequence table adodb_seq
-					$this->Execute(sprintf($this->_genSeqSQL ,$seqtab));
-				}
-				$start -= 1;
-				$num = '0';
-				$ok = $this->Execute("insert into adodb_seq values('$seq',$start)");
-				if (!$ok) return false;
-			}
-			$ok = $this->Execute("update adodb_seq set seq_value=seq_value+1 where seq_name='$seq'");
-			if($ok) {
-				$num += 1;
-				$this->genID = $num;
-				return $num;
-			}
-		}
-	if ($fn = $this->raiseErrorFn) {
-		$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
-	}
-		return false;
-	}
-
-	//example for $UserOrDSN
-	//for visual fox : DRIVER={Microsoft Visual FoxPro Driver};SOURCETYPE=DBF;SOURCEDB=c:\YourDbfFileDir;EXCLUSIVE=NO;
-	//for visual fox dbc: DRIVER={Microsoft Visual FoxPro Driver};SOURCETYPE=DBC;SOURCEDB=c:\YourDbcFileDir\mydb.dbc;EXCLUSIVE=NO;
-	//for access : DRIVER={Microsoft Access Driver (*.mdb)};DBQ=c:\path_to_access_db\base_test.mdb;UID=root;PWD=;
-	//for mssql : DRIVER={SQL Server};SERVER=myserver;UID=myuid;PWD=mypwd;DATABASE=OdbtpTest;
-	//if uid & pwd can be separate
-    function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
-	{
-		$this->_connectionID = odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
-		if ($this->_connectionID === false) {
-			$this->_errorMsg = $this->ErrorMsg() ;
-			return false;
-		}
-		
-		odbtp_convert_datetime($this->_connectionID,true);
-		
-		if ($this->_dontPoolDBC) {
-			if (function_exists('odbtp_dont_pool_dbc'))
-				@odbtp_dont_pool_dbc($this->_connectionID);
-		}
-		else {
-			$this->_dontPoolDBC = true;
-		}
-		$this->odbc_driver = @odbtp_get_attr(ODB_ATTR_DRIVER, $this->_connectionID);
-		$dbms = strtolower(@odbtp_get_attr(ODB_ATTR_DBMSNAME, $this->_connectionID));
-		$this->odbc_name = $dbms;
-		
-		// Account for inconsistent DBMS names
-		if( $this->odbc_driver == ODB_DRIVER_ORACLE )
-			$dbms = 'oracle';
-		else if( $this->odbc_driver == ODB_DRIVER_SYBASE )
-			$dbms = 'sybase';
-
-		// Set DBMS specific attributes
-		switch( $dbms ) {
-			case 'microsoft sql server':
-				$this->databaseType = 'odbtp_mssql';
-				$this->fmtDate = "'Y-m-d'";
-				$this->fmtTimeStamp = "'Y-m-d h:i:sA'";
-				$this->sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
-				$this->sysTimeStamp = 'GetDate()';
-				$this->ansiOuter = true;
-				$this->leftOuter = '*=';
-				$this->rightOuter = '=*';
-                $this->hasTop = 'top';
-				$this->hasInsertID = true;
-				$this->hasTransactions = true;
-				$this->_bindInputArray = true;
-				$this->_canSelectDb = true;
-				$this->substr = "substring";
-				$this->length = 'len';
-				$this->identitySQL = 'select SCOPE_IDENTITY()';
-				$this->metaDatabasesSQL = "select name from master..sysdatabases where name <> 'master'";
-				$this->_canPrepareSP = true;
-				break;
-			case 'access':
-				$this->databaseType = 'odbtp_access';
-				$this->fmtDate = "#Y-m-d#";
-				$this->fmtTimeStamp = "#Y-m-d h:i:sA#";
-				$this->sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
-				$this->sysTimeStamp = 'NOW';
-                $this->hasTop = 'top';
-				$this->hasTransactions = false;
-				$this->_canPrepareSP = true;  // For MS Access only.
-				break;
-			case 'visual foxpro':
-				$this->databaseType = 'odbtp_vfp';
-				$this->fmtDate = "{^Y-m-d}";
-				$this->fmtTimeStamp = "{^Y-m-d, h:i:sA}";
-				$this->sysDate = 'date()';
-				$this->sysTimeStamp = 'datetime()';
-				$this->ansiOuter = true;
-                $this->hasTop = 'top';
-				$this->hasTransactions = false;
-				$this->replaceQuote = "'+chr(39)+'";
-				$this->true = '.T.';
-				$this->false = '.F.';
-
-				break;
-			case 'oracle':
-				$this->databaseType = 'odbtp_oci8';
-				$this->fmtDate = "'Y-m-d 00:00:00'";
-				$this->fmtTimeStamp = "'Y-m-d h:i:sA'";
-				$this->sysDate = 'TRUNC(SYSDATE)';
-				$this->sysTimeStamp = 'SYSDATE';
-				$this->hasTransactions = true;
-				$this->_bindInputArray = true;
-				$this->concat_operator = '||';
-				break;
-			case 'sybase':
-				$this->databaseType = 'odbtp_sybase';
-				$this->fmtDate = "'Y-m-d'";
-				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
-				$this->sysDate = 'GetDate()';
-				$this->sysTimeStamp = 'GetDate()';
-				$this->leftOuter = '*=';
-				$this->rightOuter = '=*';
-				$this->hasInsertID = true;
-				$this->hasTransactions = true;
-				$this->identitySQL = 'select SCOPE_IDENTITY()';
-				break;
-			default:
-				$this->databaseType = 'odbtp';
-				if( @odbtp_get_attr(ODB_ATTR_TXNCAPABLE, $this->_connectionID) )
-					$this->hasTransactions = true;
-				else
-					$this->hasTransactions = false;
-		}
-        @odbtp_set_attr(ODB_ATTR_FULLCOLINFO, TRUE, $this->_connectionID );
-
-		if ($this->_useUnicodeSQL )
-			@odbtp_set_attr(ODB_ATTR_UNICODESQL, TRUE, $this->_connectionID);
-
-        return true;
-	}
-
-	function _pconnect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
-	{
-		$this->_dontPoolDBC = false;
-  		return $this->_connect($HostOrInterface, $UserOrDSN, $argPassword, $argDatabase);
-	}
-
-	function SelectDB($dbName)
-	{
-		if (!@odbtp_select_db($dbName, $this->_connectionID)) {
-			return false;
-		}
-		$this->database = $dbName;
-		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		return true;
-	}
-	
-	function MetaTables($ttype='',$showSchema=false,$mask=false)
-	{
-	global $ADODB_FETCH_MODE;
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
-		
-		$arr = $this->GetArray("||SQLTables||||$ttype");
-		
-		if (isset($savefm)) $this->SetFetchMode($savefm);
-		$ADODB_FETCH_MODE = $savem;
-
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][3] == 'SYSTEM TABLE' )	continue;
-			if ($arr[$i][2])
-				$arr2[] = $showSchema && $arr[$i][1]? $arr[$i][1].'.'.$arr[$i][2] : $arr[$i][2];
-		}
-		return $arr2;
-	}
-	
-	function MetaColumns($table,$upper=true)
-	{
-	global $ADODB_FETCH_MODE;
-
-		$schema = false;
-		$this->_findschema($table,$schema);
-		if ($upper) $table = strtoupper($table);
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
-		
-		$rs = $this->Execute( "||SQLColumns||$schema|$table" );
-		
-		if (isset($savefm)) $this->SetFetchMode($savefm);
-		$ADODB_FETCH_MODE = $savem;
-
-		if (!$rs || $rs->EOF) {
-			$false = false;
-			return $false;
-		}
-		$retarr = array();
-		while (!$rs->EOF) {
-			//print_r($rs->fields);
-			if (strtoupper($rs->fields[2]) == $table) {
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[3];
-				$fld->type = $rs->fields[5];
-				$fld->max_length = $rs->fields[6];
-    			$fld->not_null = !empty($rs->fields[9]);
- 				$fld->scale = $rs->fields[7];
-				if (isset($rs->fields[12])) // vfp does not have field 12
-	 				if (!is_null($rs->fields[12])) {
-	 					$fld->has_default = true;
-	 					$fld->default_value = $rs->fields[12];
-					}
-				$retarr[strtoupper($fld->name)] = $fld;
-			} else if (!empty($retarr))
-				break;
-			$rs->MoveNext();
-		}
-		$rs->Close();
-
-		return $retarr;
-	}
-
-	function MetaPrimaryKeys($table, $owner='')
-	{
-	global $ADODB_FETCH_MODE;
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$arr = $this->GetArray("||SQLPrimaryKeys||$owner|$table");
-		$ADODB_FETCH_MODE = $savem;
-
-		//print_r($arr);
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][3]) $arr2[] = $arr[$i][3];
-		}
-		return $arr2;
-	}
-
-	function MetaForeignKeys($table, $owner='', $upper=false)
-	{
-	global $ADODB_FETCH_MODE;
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$constraints = $this->GetArray("||SQLForeignKeys|||||$owner|$table");
-		$ADODB_FETCH_MODE = $savem;
-
-		$arr = false;
-		foreach($constraints as $constr) {
-			//print_r($constr);
-			$arr[$constr[11]][$constr[2]][] = $constr[7].'='.$constr[3];
-		}
-		if (!$arr) {
-			$false = false;
-			return $false;
-		}
-		
-		$arr2 = array();
-
-		foreach($arr as $k => $v) {
-			foreach($v as $a => $b) {
-				if ($upper) $a = strtoupper($a);
-				$arr2[$a] = $b;
-			}
-		}
-		return $arr2;
-	}
-
-	function BeginTrans()
-	{
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->autoCommit = false;
-		if (defined('ODB_TXN_DEFAULT'))
-			$txn = ODB_TXN_DEFAULT;
-		else
-			$txn = ODB_TXN_READUNCOMMITTED;
-		$rs = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS,$txn,$this->_connectionID);
-		if(!$rs) return false;
-		return true;
-	}
-
-	function CommitTrans($ok=true)
-	{
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->autoCommit = true;
-		if( ($ret = @odbtp_commit($this->_connectionID)) )
-			$ret = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS, ODB_TXN_NONE, $this->_connectionID);//set transaction off
-		return $ret;
-	}
-
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->autoCommit = true;
-		if( ($ret = @odbtp_rollback($this->_connectionID)) )
-			$ret = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS, ODB_TXN_NONE, $this->_connectionID);//set transaction off
-		return $ret;
-	}
-
-	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		// TOP requires ORDER BY for Visual FoxPro
-		if( $this->odbc_driver == ODB_DRIVER_FOXPRO ) {
-			if (!preg_match('/ORDER[ \t\r\n]+BY/is',$sql)) $sql .= ' ORDER BY 1';
-		}
-		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		return $ret;
-	}
-
-	function Prepare($sql)
-	{
-		if (! $this->_bindInputArray) return $sql; // no binding
-		$stmt = @odbtp_prepare($sql,$this->_connectionID);
-		if (!$stmt) {
-		//	print "Prepare Error for ($sql) ".$this->ErrorMsg()."
";
-			return $sql;
-		}
-		return array($sql,$stmt,false);
-	}
-
-	function PrepareSP($sql)
-	{
-		if (!$this->_canPrepareSP) return $sql; // Can't prepare procedures
-
-		$stmt = @odbtp_prepare_proc($sql,$this->_connectionID);
-		if (!$stmt) return false;
-		return array($sql,$stmt);
-	}
-
-	/*
-	Usage:
-		$stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group
-
-		# note that the parameter does not have @ in front!
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group',false,64);
-		$db->Parameter($stmt,$group,'photo',false,100000,ODB_BINARY);
-		$db->Execute($stmt);
-
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to. Can set to null (for isNull support).
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in odbtp.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-
-		See odbtp_attach_param documentation at http://odbtp.sourceforge.net.
-	*/
-	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=0, $type=0)
-	{
-		if ( $this->odbc_driver == ODB_DRIVER_JET ) {
-			$name = '['.$name.']';
-			if( !$type && $this->_useUnicodeSQL
-				&& @odbtp_param_bindtype($stmt[1], $name) == ODB_CHAR )
-			{
-				$type = ODB_WCHAR;
-			}
-		}
-		else {
-			$name = '@'.$name;
-		}
-		return @odbtp_attach_param($stmt[1], $name, $var, $type, $maxLen);
-	}
-
-	/*
-		Insert a null into the blob field of the table first.
-		Then use UpdateBlob to store the blob.
-
-		Usage:
-
-		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-
-	function UpdateBlob($table,$column,$val,$where,$blobtype='image')
-	{
-		$sql = "UPDATE $table SET $column = ? WHERE $where";
-		if( !($stmt = @odbtp_prepare($sql, $this->_connectionID)) )
-			return false;
-		if( !@odbtp_input( $stmt, 1, ODB_BINARY, 1000000, $blobtype ) )
-			return false;
-		if( !@odbtp_set( $stmt, 1, $val ) )
-			return false;
-		return @odbtp_execute( $stmt ) != false;
-	}
-
-	function MetaIndexes($table,$primary=false)
-	{
-		switch ( $this->odbc_driver) {
-			case ODB_DRIVER_MSSQL:
-				return $this->MetaIndexes_mssql($table, $primary);
-			default:
-				return array();
-		}
-	}
-	
-	function MetaIndexes_mssql($table,$primary=false)
-	{
-		$table = strtolower($this->qstr($table));
-
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
-			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
-			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
-			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
-			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND lower(O.Name) = $table
-			ORDER BY O.name, I.Name, K.keyno";
-
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-        if (!is_object($rs)) {
-        	return FALSE;
-        }
-
-		$indexes = array();
-		while ($row = $rs->FetchRow()) {
-			if ($primary && !$row[5]) continue;
-			
-            $indexes[$row[0]]['unique'] = $row[6];
-            $indexes[$row[0]]['columns'][] = $row[1];
-    	}
-        return $indexes;
-	}
-	
-	function IfNull( $field, $ifNull )
-	{
-		switch( $this->odbc_driver ) {
-			case ODB_DRIVER_MSSQL:
-				return " ISNULL($field, $ifNull) ";
-			case ODB_DRIVER_JET:
-				return " IIF(IsNull($field), $ifNull, $field) ";
-		}
-		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
-	}
-
-	function _query($sql,$inputarr=false)
-	{
-	global $php_errormsg;
-	
- 		if ($inputarr) {
-			if (is_array($sql)) {
-				$stmtid = $sql[1];
-			} else {
-				$stmtid = @odbtp_prepare($sql,$this->_connectionID);
-				if ($stmtid == false) {
-					$this->_errorMsg = $php_errormsg;
-					return false;
-				}
-			}
-			$num_params = @odbtp_num_params( $stmtid );
-			for( $param = 1; $param <= $num_params; $param++ ) {
-				@odbtp_input( $stmtid, $param );
-				@odbtp_set( $stmtid, $param, $inputarr[$param-1] );
-			}
-			if (!@odbtp_execute($stmtid) ) {
-				return false;
-			}
-		} else if (is_array($sql)) {
-			$stmtid = $sql[1];
-			if (!@odbtp_execute($stmtid)) {
-				return false;
-			}
-		} else {
-			$stmtid = odbtp_query($sql,$this->_connectionID);
-   		}
-		$this->_lastAffectedRows = 0;
-		if ($stmtid) {
-				$this->_lastAffectedRows = @odbtp_affected_rows($stmtid);
-		}
-        return $stmtid;
-	}
-
-	function _close()
-	{
-		$ret = @odbtp_close($this->_connectionID);
-		$this->_connectionID = false;
-		return $ret;
-	}
-}
-
-class ADORecordSet_odbtp extends ADORecordSet {
-
-	var $databaseType = 'odbtp';
-	var $canSeek = true;
-
-	function ADORecordSet_odbtp($queryID,$mode=false)
-	{
-		if ($mode === false) {
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		$this->ADORecordSet($queryID);
-	}
-
-	function _initrs()
-	{
-		$this->_numOfFields = @odbtp_num_fields($this->_queryID);
-		if (!($this->_numOfRows = @odbtp_num_rows($this->_queryID)))
-			$this->_numOfRows = -1;
-
-		if (!$this->connection->_useUnicodeSQL) return;
-
-		if ($this->connection->odbc_driver == ODB_DRIVER_JET) {
-			if (!@odbtp_get_attr(ODB_ATTR_MAPCHARTOWCHAR,
-			                     $this->connection->_connectionID))
-			{
-				for ($f = 0; $f < $this->_numOfFields; $f++) {
-					if (@odbtp_field_bindtype($this->_queryID, $f) == ODB_CHAR)
-						@odbtp_bind_field($this->_queryID, $f, ODB_WCHAR);
-				}
-			}
-		}
-	}
-
-	function FetchField($fieldOffset = 0)
-	{
-		$off=$fieldOffset; // offsets begin at 0
-		$o= new ADOFieldObject();
-		$o->name = @odbtp_field_name($this->_queryID,$off);
-		$o->type = @odbtp_field_type($this->_queryID,$off);
-        $o->max_length = @odbtp_field_length($this->_queryID,$off);
-		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-		return $o;
-	}
-
-	function _seek($row)
-	{
-		return @odbtp_data_seek($this->_queryID, $row);
-	}
-
-	function fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$name = @odbtp_field_name( $this->_queryID, $i );
-				$this->bind[strtoupper($name)] = $i;
-			}
-		}
-		return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-	function _fetch_odbtp($type=0)
-	{
-		switch ($this->fetchMode) {
-			case ADODB_FETCH_NUM:
-				$this->fields = @odbtp_fetch_row($this->_queryID, $type);
-				break;
-			case ADODB_FETCH_ASSOC:
-				$this->fields = @odbtp_fetch_assoc($this->_queryID, $type);
-				break;
-            default:
-				$this->fields = @odbtp_fetch_array($this->_queryID, $type);
-		}
-		if ($this->databaseType = 'odbtp_vfp') {
-			if ($this->fields)
-			foreach($this->fields as $k => $v) {
-				if (strncmp($v,'1899-12-30',10) == 0) $this->fields[$k] = '';
-			}
-		}
-		return is_array($this->fields);
-	}
-
-	function _fetch()
-	{
-		return $this->_fetch_odbtp();
-	}
-
-	function MoveFirst()
-	{
-		if (!$this->_fetch_odbtp(ODB_FETCH_FIRST)) return false;
-		$this->EOF = false;
-		$this->_currentRow = 0;
-		return true;
-    }
-
-	function MoveLast()
-	{
-		if (!$this->_fetch_odbtp(ODB_FETCH_LAST)) return false;
-		$this->EOF = false;
-		$this->_currentRow = $this->_numOfRows - 1;
-		return true;
-	}
-
-	function NextRecordSet()
-	{
-		if (!@odbtp_next_result($this->_queryID)) return false;
-		$this->_inited = false;
-		$this->bind = false;
-		$this->_currentRow = -1;
-		$this->Init();
-		return true;
-	}
-
-	function _close()
-	{
-		return @odbtp_free_query($this->_queryID);
-	}
-}
-
-class ADORecordSet_odbtp_mssql extends ADORecordSet_odbtp {
-
-	var $databaseType = 'odbtp_mssql';
-
-	function ADORecordSet_odbtp_mssql($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
-}
-
-class ADORecordSet_odbtp_access extends ADORecordSet_odbtp {
-
-	var $databaseType = 'odbtp_access';
-
-	function ADORecordSet_odbtp_access($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
-}
-
-class ADORecordSet_odbtp_vfp extends ADORecordSet_odbtp {
-
-	var $databaseType = 'odbtp_vfp';
-
-	function ADORecordSet_odbtp_vfp($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
-}
-
-class ADORecordSet_odbtp_oci8 extends ADORecordSet_odbtp {
-
-	var $databaseType = 'odbtp_oci8';
-
-	function ADORecordSet_odbtp_oci8($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
-}
-
-class ADORecordSet_odbtp_sybase extends ADORecordSet_odbtp {
-
-	var $databaseType = 'odbtp_sybase';
-
-	function ADORecordSet_odbtp_sybase($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
-}
-?>
diff --git a/includes/adodb/drivers/adodb-odbtp_unicode.inc.php b/includes/adodb/drivers/adodb-odbtp_unicode.inc.php
deleted file mode 100644
index bee5b995..00000000
--- a/includes/adodb/drivers/adodb-odbtp_unicode.inc.php
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-/*
-    Because the ODBTP server sends and reads UNICODE text data using UTF-8
-    encoding, the following HTML meta tag must be included within the HTML
-    head section of every HTML form and script page:
-
-    
-
-    Also, all SQL query strings must be submitted as UTF-8 encoded text.
-*/
-
-if (!defined('_ADODB_ODBTP_LAYER')) {
-	include(ADODB_DIR."/drivers/adodb-odbtp.inc.php");
-}
-
-class ADODB_odbtp_unicode extends ADODB_odbtp {
-	var $databaseType = 'odbtp';
-	var $_useUnicodeSQL = true;
-
-	function ADODB_odbtp_unicode()
-	{
-		$this->ADODB_odbtp();
-	}
-}
-?>
diff --git a/includes/adodb/drivers/adodb-oracle.inc.php b/includes/adodb/drivers/adodb-oracle.inc.php
deleted file mode 100644
index 142b91ea..00000000
--- a/includes/adodb/drivers/adodb-oracle.inc.php
+++ /dev/null
@@ -1,338 +0,0 @@
-fmtDate,$d).",'YYYY-MM-DD')";
-	}
-	
-	// format and return date string in database timestamp format
-	function DBTimeStamp($ts)
-	{
-
-		if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
-	}
-	
-	
-	function BindDate($d)
-	{
-		$d = ADOConnection::DBDate($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	function BindTimeStamp($d)
-	{
-		$d = ADOConnection::DBTimeStamp($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-
-	
-	function BeginTrans()
-	{	  
-		 $this->autoCommit = false;
-		 ora_commitoff($this->_connectionID);
-		 return true;
-	}
-
-	
-	function CommitTrans($ok=true) 
-	{ 
-		   if (!$ok) return $this->RollbackTrans();
-		   $ret = ora_commit($this->_connectionID);
-		   ora_commiton($this->_connectionID);
-		   return $ret;
-	}
-
-	
-	function RollbackTrans()
-	{
-		$ret = ora_rollback($this->_connectionID);
-		ora_commiton($this->_connectionID);
-		return $ret;
-	}
-
-
-	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
-	function ErrorMsg() 
- 	{   
-        if ($this->_errorMsg !== false) return $this->_errorMsg;
-
-        if (is_resource($this->_curs)) $this->_errorMsg = @ora_error($this->_curs);
- 		if (empty($this->_errorMsg)) $this->_errorMsg = @ora_error($this->_connectionID);
-		return $this->_errorMsg;
-	}
-
- 
-	function ErrorNo() 
-	{
-		if ($this->_errorCode !== false) return $this->_errorCode;
-
-		if (is_resource($this->_curs)) $this->_errorCode = @ora_errorcode($this->_curs);
-		if (empty($this->_errorCode)) $this->_errorCode = @ora_errorcode($this->_connectionID);
-        return $this->_errorCode;
-	}
-
-	
-
-		// returns true or false
-		function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
-		{
-			if (!function_exists('ora_plogon')) return null;
-				
-            //  Reset error messages before connecting
-            $this->_errorMsg = false;
-		    $this->_errorCode = false;
-        
-            // G. Giunta 2003/08/13 - This looks danegrously suspicious: why should we want to set
-            // the oracle home to the host name of remote DB?
-//			if ($argHostname) putenv("ORACLE_HOME=$argHostname");
-
-			if($argHostname) { // code copied from version submitted for oci8 by Jorma Tuomainen 
-				if (empty($argDatabasename)) $argDatabasename = $argHostname;
-				else {
-					if(strpos($argHostname,":")) {
-						$argHostinfo=explode(":",$argHostname);
-						$argHostname=$argHostinfo[0];
-						$argHostport=$argHostinfo[1];
-					} else {
-						$argHostport="1521";
-					}
-
-
-					if ($this->connectSID) {
-						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-						.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
-					} else
-						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-						.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
-				}
-
-			}
-
-			if ($argDatabasename) $argUsername .= "@$argDatabasename";
-
-		//if ($argHostname) print "
Connect: 1st argument should be left blank for $this->databaseType
";
-			if ($mode == 1)
-				$this->_connectionID = ora_plogon($argUsername,$argPassword);
-			else
-				$this->_connectionID = ora_logon($argUsername,$argPassword);
-			if ($this->_connectionID === false) return false;
-			if ($this->autoCommit) ora_commiton($this->_connectionID);
-			if ($this->_initdate) {
-				$rs = $this->_query("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD'");
-				if ($rs) ora_close($rs);
-			}
-
-			return true;
-		}
-
-
-		// returns true or false
-		function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-		{
-			return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, 1);
-		}
-
-
-		// returns query ID if successful, otherwise false
-		function _query($sql,$inputarr=false)
-		{
-            //  Reset error messages before executing
-            $this->_errorMsg = false;
-		    $this->_errorCode = false;
-
-			$curs = ora_open($this->_connectionID);
-		 
-		 	if ($curs === false) return false;
-			$this->_curs = $curs;
-			if (!ora_parse($curs,$sql)) return false;
-			if (ora_exec($curs)) return $curs;
-            //  before we close the cursor, we have to store the error message
-            // that we can obtain ONLY from the cursor (and not from the connection)
-            $this->_errorCode = @ora_errorcode($curs);
-            $this->_errorMsg = @ora_error($curs);
-            //             
-		 	@ora_close($curs);
-			return false;
-		}
-
-
-		// returns true or false
-		function _close()
-		{
-			return @ora_logoff($this->_connectionID);
-		}
-
-
-
-}
-
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oracle extends ADORecordSet {
-
-	var $databaseType = "oracle";
-	var $bind = false;
-
-	function ADORecordset_oracle($queryID,$mode=false)
-	{
-		
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		
-		$this->_queryID = $queryID;
-	
-		$this->_inited = true;
-		$this->fields = array();
-		if ($queryID) {
-			$this->_currentRow = 0;
-			$this->EOF = !$this->_fetch();
-			@$this->_initrs();
-		} else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-			$this->EOF = true;
-		}
-		
-		return $this->_queryID;
-	}
-
-
-
-	   /*		Returns: an object containing field information.
-			   Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			   fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			   fetchField() is retrieved.		*/
-
-	   function FetchField($fieldOffset = -1)
-	   {
-			$fld = new ADOFieldObject;
-			$fld->name = ora_columnname($this->_queryID, $fieldOffset);
-			$fld->type = ora_columntype($this->_queryID, $fieldOffset);
-			$fld->max_length = ora_columnsize($this->_queryID, $fieldOffset);
-			return $fld;
-	   }
-
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-   function _initrs()
-   {
-		   $this->_numOfRows = -1;
-		   $this->_numOfFields = @ora_numcols($this->_queryID);
-   }
-
-
-   function _seek($row)
-   {
-		   return false;
-   }
-
-   function _fetch($ignore_fields=false) {
-// should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
-		if ($this->fetchMode & ADODB_FETCH_ASSOC)
-			return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
-   		else 
-			return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS);
-   }
-
-   /*		close() only needs to be called if you are worried about using too much memory while your script
-		   is running. All associated result memory for the specified result identifier will automatically be freed.		*/
-
-   function _close() 
-{
-		   return @ora_close($this->_queryID);
-   }
-
-	function MetaType($t,$len=-1)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		switch (strtoupper($t)) {
-		case 'VARCHAR':
-		case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-				if ($len <= $this->blobSize) return 'C';
-		case 'LONG':
-		case 'LONG VARCHAR':
-		case 'CLOB':
-		return 'X';
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-				return 'B';
-		
-		case 'DATE': return 'D';
-		
-		//case 'T': return 'T';
-		
-		case 'BIT': return 'L';
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': return 'I';
-		default: return 'N';
-		}
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-pdo.inc.php b/includes/adodb/drivers/adodb-pdo.inc.php
deleted file mode 100644
index 6ca93dc5..00000000
--- a/includes/adodb/drivers/adodb-pdo.inc.php
+++ /dev/null
@@ -1,580 +0,0 @@
-_driver;
-		$this->fmtDate = $d->fmtDate;
-		$this->fmtTimeStamp = $d->fmtTimeStamp;
-		$this->replaceQuote = $d->replaceQuote;
-		$this->sysDate = $d->sysDate;
-		$this->sysTimeStamp = $d->sysTimeStamp;
-		$this->random = $d->random;
-		$this->concat_operator = $d->concat_operator;
-		$this->nameQuote = $d->nameQuote;
-				
-		$this->hasGenID = $d->hasGenID;
-		$this->_genIDSQL = $d->_genIDSQL;
-		$this->_genSeqSQL = $d->_genSeqSQL;
-		$this->_dropSeqSQL = $d->_dropSeqSQL;
-
-		$d->_init($this);
-	}
-	
-	function Time()
-	{
-		if (!empty($this->_driver->_hasdual)) $sql = "select $this->sysTimeStamp from dual";
-		else $sql = "select $this->sysTimeStamp";
-		
-		$rs = $this->_Execute($sql);
-		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
-		return false;
-	}
-	
-	// returns true or false
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persist=false)
-	{
-		$at = strpos($argDSN,':');
-		$this->dsnType = substr($argDSN,0,$at);
-
-		if ($argDatabasename) {
-			$argDSN .= ';dbname='.$argDatabasename;
-		}
-		try {
-			$this->_connectionID = new PDO($argDSN, $argUsername, $argPassword);
-		} catch (Exception $e) {
-			$this->_connectionID = false;
-			$this->_errorno = -1;
-			//var_dump($e);
-			$this->_errormsg = 'Connection attempt failed: '.$e->getMessage();
-			return false;
-		}
-		
-		if ($this->_connectionID) {
-			switch(ADODB_ASSOC_CASE){
-			case 0: $m = PDO::CASE_LOWER; break;
-			case 1: $m = PDO::CASE_UPPER; break;
-			default:
-			case 2: $m = PDO::CASE_NATURAL; break;
-			}
-			
-			//$this->_connectionID->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_SILENT );
-			$this->_connectionID->setAttribute(PDO::ATTR_CASE,$m);
-			
-			$class = 'ADODB_pdo_'.$this->dsnType;
-			//$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
-			switch($this->dsnType) {
-			case 'oci':
-			case 'mysql':
-			case 'pgsql':
-			case 'mssql':
-				include_once(ADODB_DIR.'/drivers/adodb-pdo_'.$this->dsnType.'.inc.php');
-				break;
-			}
-			if (class_exists($class))
-				$this->_driver = new $class();
-			else
-				$this->_driver = new ADODB_pdo_base();
-			
-			$this->_driver->_connectionID = $this->_connectionID;
-			$this->_UpdatePDO();
-			return true;
-		}
-		$this->_driver = new ADODB_pdo_base();
-		return false;
-	}
-	
-	function Concat() 
-	{
-		$args = func_get_args();
-		if(method_exists($this->_driver, 'Concat')) 
-			return call_user_func_array(array($this->_driver, 'Concat'), $args); 
-		
-		return call_user_func_array(array($this,'parent::Concat'), $args); 
-	}
-	
-	// returns true or false
-	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argDSN, $argUsername, $argPassword, $argDatabasename, true);
-	}
-	
-	/*------------------------------------------------------------------------------*/
-	
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{	
-		$save = $this->_driver->fetchMode;
-		$this->_driver->fetchMode = $this->fetchMode;
-	 	$this->_driver->debug = $this->debug;
-		$ret = $this->_driver->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		$this->_driver->fetchMode = $save;
-		return $ret;
-	}
-	
-	
-	function ServerInfo()
-	{
-		return $this->_driver->ServerInfo();
-	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false)
-	{
-		return $this->_driver->MetaTables($ttype,$showSchema,$mask);
-	}
-	
-	function MetaColumns($table,$normalize=true)
-	{
-		return $this->_driver->MetaColumns($table,$normalize);
-	}
-	
-	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-	{
-		$obj = $stmt[1];
-		if ($type) $obj->bindParam($name,$var,$type,$maxLen);
-		else $obj->bindParam($name, $var);
-	}
-	
-	
-	function ErrorMsg()
-	{
-		if ($this->_errormsg !== false) return $this->_errormsg;
-		if (!empty($this->_stmt)) $arr = $this->_stmt->errorInfo();
-		else if (!empty($this->_connectionID)) $arr = $this->_connectionID->errorInfo();
-		else return 'No Connection Established';
-		
-		
-		if ($arr) {
-		 	if (sizeof($arr)<2) return '';
-			if ((integer)$arr[1]) return $arr[2];
-			else return '';
-		} else return '-1';
-	}
-	
-
-	function ErrorNo()
-	{
-		if ($this->_errorno !== false) return $this->_errorno;
-		if (!empty($this->_stmt)) $err = $this->_stmt->errorCode();
-		else if (!empty($this->_connectionID)) {
-			$arr = $this->_connectionID->errorInfo();
-			if (isset($arr[0])) $err = $arr[0];
-			else $err = -1;
-		} else
-			return 0;
-			
-		if ($err == '00000') return 0; // allows empty check
-		return $err;
-	}
-
-	function BeginTrans()
-	{	
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		$this->transCnt += 1;
-		$this->_autocommit = false;
-		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,false);
-		return $this->_connectionID->beginTransaction();
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		
-		$ret = $this->_connectionID->commit();
-		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		
-		$ret = $this->_connectionID->rollback();
-		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
-		return $ret;
-	}
-	
-	function Prepare($sql)
-	{
-		$this->_stmt = $this->_connectionID->prepare($sql);
-		if ($this->_stmt) return array($sql,$this->_stmt);
-		
-		return false;
-	}
-	
-	function PrepareStmt($sql)
-	{
-		$stmt = $this->_connectionID->prepare($sql);
-		if (!$stmt) return false;
-		$obj = new ADOPDOStatement($stmt,$this);
-		return $obj;
-	}
-	
-	
-	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
-	{
-		if (is_array($sql)) {
-			$stmt = $sql[1];
-		} else {
-			$stmt = $this->_connectionID->prepare($sql);
-		}
-		#adodb_backtrace();
-		#var_dump($this->_bindInputArray);
-		if ($stmt) {
-			$this->_driver->debug = $this->debug;
-			if ($inputarr) $ok = $stmt->execute($inputarr);
-			else $ok = $stmt->execute();
-		} 
-		
-		
-		$this->_errormsg = false;
-		$this->_errorno = false;
-			
-		if ($ok) {
-			$this->_stmt = $stmt;
-			return $stmt;
-		}
-		
-		if ($stmt) {
-			
-			$arr = $stmt->errorinfo();
-			if ((integer)$arr[1]) {
-				$this->_errormsg = $arr[2];
-				$this->_errorno = $arr[1];
-			}
-
-		} else {
-			$this->_errormsg = false;
-			$this->_errorno = false;
-		}
-		return false;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		$this->_stmt = false;
-		return true;
-	}
-
-	function _affectedrows()
-	{
-		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
-	}
-	
-	function _insertid()
-	{
-		return ($this->_connectionID) ? $this->_connectionID->lastInsertId() : 0;
-	}
-}
-
-class ADODB_pdo_base extends ADODB_pdo {
-
-	var $sysDate = "'?'";
-	var $sysTimeStamp = "'?'";
-	
-
-	function _init($parentDriver)
-	{
-		$parentDriver->_bindInputArray = true;
-		#$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
-	}
-	
-	function ServerInfo()
-	{
-		return ADOConnection::ServerInfo();
-	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
-	{
-		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		return $ret;
-	}
-	
-	function MetaTables()
-	{
-		return false;
-	}
-	
-	function MetaColumns()
-	{
-		return false;
-	}
-}
-
-class ADOPDOStatement {
-
-	var $databaseType = "pdo";		
-	var $dataProvider = "pdo";
-	var $_stmt;
-	var $_connectionID;
-	
-	function ADOPDOStatement($stmt,$connection)
-	{
-		$this->_stmt = $stmt;
-		$this->_connectionID = $connection;
-	}
-	
-	function Execute($inputArr=false)
-	{
-		$savestmt = $this->_connectionID->_stmt;
-		$rs = $this->_connectionID->Execute(array(false,$this->_stmt),$inputArr);
-		$this->_connectionID->_stmt = $savestmt;
-		return $rs;
-	}
-	
-	function InParameter(&$var,$name,$maxLen=4000,$type=false)
-	{
-
-		if ($type) $this->_stmt->bindParam($name,$var,$type,$maxLen);
-		else $this->_stmt->bindParam($name, $var);
-	}
-	
-	function Affected_Rows()
-	{
-		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
-	}
-	
-	function ErrorMsg()
-	{
-		if ($this->_stmt) $arr = $this->_stmt->errorInfo();
-		else $arr = $this->_connectionID->errorInfo();
-
-		if (is_array($arr)) {
-			if ((integer) $arr[0] && isset($arr[2])) return $arr[2];
-			else return '';
-		} else return '-1';
-	}
-	
-	function NumCols()
-	{
-		return ($this->_stmt) ? $this->_stmt->columnCount() : 0;
-	}
-	
-	function ErrorNo()
-	{
-		if ($this->_stmt) return $this->_stmt->errorCode();
-		else return $this->_connectionID->errorInfo();
-	}
-}
-
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_pdo extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "pdo";		
-	var $dataProvider = "pdo";
-	
-	function ADORecordSet_pdo($id,$mode=false)
-	{
-		if ($mode === false) {  
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->adodbFetchMode = $mode;
-		switch($mode) {
-		case ADODB_FETCH_NUM: $mode = PDO::FETCH_NUM; break;
-		case ADODB_FETCH_ASSOC:  $mode = PDO::FETCH_ASSOC; break;
-		
-		case ADODB_FETCH_BOTH: 
-		default: $mode = PDO::FETCH_BOTH; break;
-		}
-		$this->fetchMode = $mode;
-		
-		$this->_queryID = $id;
-		$this->ADORecordSet($id);
-	}
-
-	
-	function Init()
-	{
-		if ($this->_inited) return;
-		$this->_inited = true;
-		if ($this->_queryID) @$this->_initrs();
-		else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-		}
-		if ($this->_numOfRows != 0 && $this->_currentRow == -1) {
-			$this->_currentRow = 0;
-			if ($this->EOF = ($this->_fetch() === false)) {
-				$this->_numOfRows = 0; // _numOfRows could be -1
-			}
-		} else {
-			$this->EOF = true;
-		}
-	}
-	
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-	
-		$this->_numOfRows = ($ADODB_COUNTRECS) ? @$this->_queryID->rowCount() : -1;
-		if (!$this->_numOfRows) $this->_numOfRows = -1;
-		$this->_numOfFields = $this->_queryID->columnCount();
-	}
-
-	// returns the field object
-	function FetchField($fieldOffset = -1) 
-	{
-		$off=$fieldOffset+1; // offsets begin at 1
-		
-		$o= new ADOFieldObject();
-		$arr = @$this->_queryID->getColumnMeta($fieldOffset);
-		if (!$arr) {
-			$o->name = 'bad getColumnMeta()';
-			$o->max_length = -1;
-			$o->type = 'VARCHAR';
-			$o->precision = 0;
-	#		$false = false;
-			return $o;
-		}
-		//adodb_pr($arr);
-		$o->name = $arr['name'];
-		if (isset($arr['native_type']) && $arr['native_type'] <> "null") $o->type = $arr['native_type'];
-		else $o->type = adodb_pdo_type($arr['pdo_type']);
-		$o->max_length = $arr['len'];
-		$o->precision = $arr['precision'];
-		
-		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-		return $o;
-	}
-	
-	function _seek($row)
-	{
-		return false;
-	}
-	
-	function _fetch()
-	{
-		if (!$this->_queryID) return false;
-		
-		$this->fields = $this->_queryID->fetch($this->fetchMode);
-		return !empty($this->fields);
-	}
-	
-	function _close() 
-	{
-		$this->_queryID = false;
-	}
-	
-	function Fields($colname)
-	{
-		if ($this->adodbFetchMode != ADODB_FETCH_NUM) return @$this->fields[$colname];
-		
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-pdo_mssql.inc.php b/includes/adodb/drivers/adodb-pdo_mssql.inc.php
deleted file mode 100644
index 7ecc5cf1..00000000
--- a/includes/adodb/drivers/adodb-pdo_mssql.inc.php
+++ /dev/null
@@ -1,61 +0,0 @@
-hasTransactions = false; ## <<< BUG IN PDO mssql driver
-		$parentDriver->_bindInputArray = false;
-		$parentDriver->hasInsertID = true;
-	}
-	
-	function ServerInfo()
-	{
-		return ADOConnection::ServerInfo();
-	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
-	{
-		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		return $ret;
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET TRANSACTION ".$transaction_mode);
-	}
-	
-	function MetaTables()
-	{
-		return false;
-	}
-	
-	function MetaColumns()
-	{
-		return false;
-	}
-
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-pdo_mysql.inc.php b/includes/adodb/drivers/adodb-pdo_mysql.inc.php
deleted file mode 100644
index 5263b133..00000000
--- a/includes/adodb/drivers/adodb-pdo_mysql.inc.php
+++ /dev/null
@@ -1,182 +0,0 @@
-hasTransactions = false;
-		#$parentDriver->_bindInputArray = false;
-		$parentDriver->hasInsertID = true;
-		$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
-	}
-	
-		// dayFraction is a day in floating point
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		
-		$fraction = $dayFraction * 24 * 3600;
-		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
-//		return "from_unixtime(unix_timestamp($date)+$fraction)";
-	}
-	
-	function Concat() 
-	{	
-		$s = "";
-		$arr = func_get_args();
-
-		// suggestion by andrew005#mnogo.ru
-		$s = implode(',',$arr);
-		if (strlen($s) > 0) return "CONCAT($s)"; return ''; 
-	}
-	
-	function ServerInfo()
-	{
-		$arr['description'] = ADOConnection::GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
-		$save = $this->metaTablesSQL;
-		if ($showSchema && is_string($showSchema)) {
-			$this->metaTablesSQL .= " from $showSchema";
-		}
-		
-		if ($mask) {
-			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " like $mask";
-		}
-		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
-		$this->metaTablesSQL = $save;
-		return $ret;
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET TRANSACTION ISOLATION LEVEL REPEATABLE READ');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
-	}
-	
- 	function MetaColumns($table) 
-	{
-		$this->_findschema($table,$schema);
-		if ($schema) {
-			$dbName = $this->database;
-			$this->SelectDB($schema);
-		}
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
-		if ($schema) {
-			$this->SelectDB($dbName);
-		}
-		
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!is_object($rs)) {
-			$false = false;
-			return $false;
-		}
-			
-		$retarr = array();
-		while (!$rs->EOF){
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$type = $rs->fields[1];
-			
-			// split type into type(length):
-			$fld->scale = null;
-			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-				$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
-			} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-			} elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$arr = explode(",",$query_array[2]);
-				$fld->enums = $arr;
-				$zlen = max(array_map("strlen",$arr)) - 2; // PHP >= 4.0.6
-				$fld->max_length = ($zlen > 0) ? $zlen : 1;
-			} else {
-				$fld->type = $type;
-				$fld->max_length = -1;
-			}
-			$fld->not_null = ($rs->fields[2] != 'YES');
-			$fld->primary_key = ($rs->fields[3] == 'PRI');
-			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-			$fld->binary = (strpos($type,'blob') !== false);
-			$fld->unsigned = (strpos($type,'unsigned') !== false);
-				
-			if (!$fld->binary) {
-				$d = $rs->fields[4];
-				if ($d != '' && $d != 'NULL') {
-					$fld->has_default = true;
-					$fld->default_value = $d;
-				} else {
-					$fld->has_default = false;
-				}
-			}
-			
-			if ($save == ADODB_FETCH_NUM) {
-				$retarr[] = $fld;
-			} else {
-				$retarr[strtoupper($fld->name)] = $fld;
-			}
-				$rs->MoveNext();
-			}
-		
-			$rs->Close();
-			return $retarr;	
-	}
-		
-	
-	// parameters use PostgreSQL convention, not MySQL
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
-	{
-		$offsetStr =($offset>=0) ? "$offset," : '';
-		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
-		if ($nrows < 0) $nrows = '18446744073709551615'; 
-		
-		if ($secs)
-			$rs = $this->CacheExecute($secs,$sql." LIMIT $offsetStr$nrows",$inputarr);
-		else
-			$rs = $this->Execute($sql." LIMIT $offsetStr$nrows",$inputarr);
-		return $rs;
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-pdo_oci.inc.php b/includes/adodb/drivers/adodb-pdo_oci.inc.php
deleted file mode 100644
index 837c3b13..00000000
--- a/includes/adodb/drivers/adodb-pdo_oci.inc.php
+++ /dev/null
@@ -1,93 +0,0 @@
-_bindInputArray = true;
-		$parentDriver->_nestedSQL = true;
-		if ($this->_initdate) {
-			$parentDriver->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
-		}
-	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(strtoupper($mask));
-			$this->metaTablesSQL .= " AND table_name like $mask";
-		}
-		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	function MetaColumns($table) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$false = false;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!$rs) {
-			return $false;
-		}
-		$retarr = array();
-		while (!$rs->EOF) { //print_r($rs->fields);
-			$fld = new ADOFieldObject();
-	   		$fld->name = $rs->fields[0];
-	   		$fld->type = $rs->fields[1];
-	   		$fld->max_length = $rs->fields[2];
-			$fld->scale = $rs->fields[3];
-			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
-				$fld->type ='INT';
-	     		$fld->max_length = $rs->fields[4];
-	    	}	
-		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
-			$fld->binary = (strpos($fld->type,'BLOB') !== false);
-			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		if (empty($retarr))
-			return  $false;
-		else 
-			return $retarr;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-pdo_pgsql.inc.php b/includes/adodb/drivers/adodb-pdo_pgsql.inc.php
deleted file mode 100644
index ee626503..00000000
--- a/includes/adodb/drivers/adodb-pdo_pgsql.inc.php
+++ /dev/null
@@ -1,230 +0,0 @@
- 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-
-	// used when schema defined
-	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
-WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
-	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-	
-	// get primary key etc -- from Freek Dijkstra
-	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
-	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
-	
-	var $hasAffectedRows = true;
-	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	// below suggested by Freek Dijkstra 
-	var $true = 't';		// string that represents TRUE for a database
-	var $false = 'f';		// string that represents FALSE for a database
-	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
-	var $fmtTimeStamp = "'Y-m-d G:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
-	var $hasMoveFirst = true;
-	var $hasGenID = true;
-	var $_genIDSQL = "SELECT NEXTVAL('%s')";
-	var $_genSeqSQL = "CREATE SEQUENCE %s START %s";
-	var $_dropSeqSQL = "DROP SEQUENCE %s";
-	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
-	var $random = 'random()';		/// random function
-	var $concat_operator='||';
-	
-	function _init($parentDriver)
-	{
-	
-		$parentDriver->hasTransactions = false; ## <<< BUG IN PDO pgsql driver
-		$parentDriver->hasInsertID = true;
-		$parentDriver->_nestedSQL = true;
-	}
-	
-	function ServerInfo()
-	{
-		$arr['description'] = ADOConnection::GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{
-		 $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
-		 $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';
-		 if ($secs2cache)
-		  	$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-		 else
-		  	$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-		
-		return $rs;
-	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		$info = $this->ServerInfo();
-		if ($info['version'] >= 7.3) {
-	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
-			  and schemaname  not in ( 'pg_catalog','information_schema')
-	union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
-		}
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(strtolower($mask));
-			if ($info['version']>=7.3)
-				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
- union 
-select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
-			else
-				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
-select viewname,'V' from pg_views where viewname like $mask";
-		}
-		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	function MetaColumns($table,$normalize=true) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$schema = false;
-		$this->_findschema($table,$schema);
-		
-		if ($normalize) $table = strtolower($table);
-
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		if ($schema) $rs = $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
-		else $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if ($rs === false) {
-			$false = false;
-			return $false;
-		}
-		if (!empty($this->metaKeySQL)) {
-			// If we want the primary keys, we have to issue a separate query
-			// Of course, a modified version of the metaColumnsSQL query using a 
-			// LEFT JOIN would have been much more elegant, but postgres does 
-			// not support OUTER JOINS. So here is the clumsy way.
-			
-			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			
-			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
-			// fetch all result in once for performance.
-			$keys = $rskey->GetArray();
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			
-			$rskey->Close();
-			unset($rskey);
-		}
-
-		$rsdefa = array();
-		if (!empty($this->metaDefaultsSQL)) {
-			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			$sql = sprintf($this->metaDefaultsSQL, ($table));
-			$rsdef = $this->Execute($sql);
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			
-			if ($rsdef) {
-				while (!$rsdef->EOF) {
-					$num = $rsdef->fields['num'];
-					$s = $rsdef->fields['def'];
-					if (strpos($s,'::')===false && substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
-						$s = substr($s, 1);
-						$s = substr($s, 0, strlen($s) - 1);
-					}
-
-					$rsdefa[$num] = $s;
-					$rsdef->MoveNext();
-				}
-			} else {
-				ADOConnection::outp( "==> SQL => " . $sql);
-			}
-			unset($rsdef);
-		}
-	
-		$retarr = array();
-		while (!$rs->EOF) { 	
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$fld->type = $rs->fields[1];
-			$fld->max_length = $rs->fields[2];
-			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
-			if ($fld->max_length <= 0) $fld->max_length = -1;
-			if ($fld->type == 'numeric') {
-				$fld->scale = $fld->max_length & 0xFFFF;
-				$fld->max_length >>= 16;
-			}
-			// dannym
-			// 5 hasdefault; 6 num-of-column
-			$fld->has_default = ($rs->fields[5] == 't');
-			if ($fld->has_default) {
-				$fld->default_value = $rsdefa[$rs->fields[6]];
-			}
-
-			//Freek
-			if ($rs->fields[4] == $this->true) {
-				$fld->not_null = true;
-			}
-			
-			// Freek
-			if (is_array($keys)) {
-				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true) 
-						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true) 
-						$fld->unique = true; // What name is more compatible?
-				}
-			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		if (empty($retarr)) {
-			$false = false;
-			return $false;
-		} else return $retarr;	
-		
-	}
-
-}
-
-?>
diff --git a/includes/adodb/drivers/adodb-pdo_sqlite.inc.php b/includes/adodb/drivers/adodb-pdo_sqlite.inc.php
deleted file mode 100644
index a5a1c03a..00000000
--- a/includes/adodb/drivers/adodb-pdo_sqlite.inc.php
+++ /dev/null
@@ -1,268 +0,0 @@
-_bindInputArray = true;
-	}
-
-    function _query($sql,$inputarr=false) {
-            if(strtolower(substr($sql,0,5)) != 'alter') {
-                    return parent::_query($sql,$inputarr);
-            } else {
-                    if(!$this->sqliteDropColumn($sql))
-                            return parent::_query($sql,$inputarr);
-                    else
-                            return true;
-            }
-    }
-
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persist=false) {
-	       return parent::_connect($argDatabasename,'','','',$persist);
-	}
-
-        function sqliteDropColumn($sql) {
-                $queryparts = preg_split("/[\s]+/",$sql,10,PREG_SPLIT_NO_EMPTY);
-                if(count($queryparts) == 6) {
-                        $table = $queryparts[2];
-                        $temp_table = $table.'_Temp';
-                        $removeColumn = $queryparts[5];
-                        $removeColumn = str_replace(';','',$removeColumn);
-                        if(strtolower($queryparts[1]) != 'table' || 
-                                strtolower($queryparts[3]) != 'drop' || 
-                                strtolower($queryparts[4]) != 'column') {
-                                return false;
-                        } else {
-                           // RENAME TABLE to TABLE_Temp
-                           // CREATE new table without dropped column
-                           // INSERT RECORDS from old table to new
-                           // DROP Temp table
-                           $meta = $this->MetaColumns($table);
-                           $fields = Array();
-			   $fieldNames = Array();
-                           foreach($meta as $col) {
-                                if($col->name != $removeColumn) {
-                                       $colText = $col->name;
-				       if(!empty($col->type))
-				       		$colText .= ' '.$col->type;  
-				       if($col->not_null)
-						$colText .= ' NOT NULL';
-				       if(!empty($col->default_value))
-				       		$colText .= ' DEFAULT '.$col->default_value.'';
-				       
-				        $fieldNames[] = $col->name;
-				        $fields[] = $colText;
-				}           
-                           }
-                           $fieldList = implode(',',$fields);
-			   $fieldNameList = implode(',',$fieldNames);
-                           
-                           $this->BeginTrans();
-                           $sql = "SELECT sql FROM sqlite_master WHERE type = 'index' AND tbl_name = '$table'";
-                           $result = $this->Execute($sql);
-                           while(list($index) = $result->FetchRow()) {
-                                  $indexes[] = $index;
-                           }
-
-                           $renameTempSql = 'ALTER TABLE '.$table.' RENAME TO '.$temp_table.';'; 
-                           $createTableSql = 'CREATE TABLE '.$table.'('.$fieldList.');'; 
-                           $copyTableContentsSql = 'INSERT INTO '.$table.' SELECT '.$fieldNameList.' FROM '.$temp_table.';';  
-                           $removeTableSql = 'DROP TABLE '.$temp_table.';';
-                           $vacuumSql = 'VACUUM '.$table.';'; 
-
-                           // Do the steps to drop the column by renaming and creating new table
-                           $ok = $this->Execute($renameTempSql); 
-                           if($ok) $ok = $this->Execute($createTableSql);  
-                           if($ok) $ok = $this->Execute($copyTableContentsSql);             
-                           
-                           $this->CommitTrans($ok);
-                                         
-                           if($ok) $ok = $this->Execute($removeTableSql);                                                       
-                           if($ok) $ok = $this->Execute($vacuumSql);   
-                                                      
-                           // Recreate the indexes on the new table from the old
-                           foreach($indexes as $indexSQL) {
-			       $listStart = strpos($indexSQL,'(')+1;
-			       $listEnd = strpos($indexSQL,')');
-			       $indexList = substr($indexSQL,$listStart,$listEnd-$listStart);
-			       $indexList = explode(',',$indexList);
-			       $newIndexList = Array();
-			       foreach($indexList as $listItem) {
-			           $listItem = trim($listItem);
-				   if($listItem != $removeColumn) {
-			       		$newIndexList[] = $listItem;    
-				   }
-			       }
-			       $indexSQL = substr($indexSQL,0,$listStart-1);
-			       $indexSQL .= '('.implode(',',$newIndexList).');'; 
-                               $this->Execute($indexSQL);   
-                           }
-                           return $ok; 
-                        }
-                }
-                return false;    
-        }
-
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0) {
-		$offsetStr =($offset>=0) ? "$offset," : '';
-		if ($secs)
-			$rs =& $this->CacheExecute($secs,$sql." LIMIT $offsetStr$nrows",$inputarr);
-		else
-			$rs =& $this->Execute($sql." LIMIT $offsetStr$nrows",$inputarr);
-		return $rs;
-	}
-
-	function GenID($seq='adodbseq',$start=1) {
-		// if you have to modify the parameter below, your database is overloaded,
-		// or you need to implement generation of id's yourself!
-		$MAXLOOPS = 100;
-		//$this->debug=1;
-		while (--$MAXLOOPS>=0) {
-			@($num = array_pop($this->GetCol("select id from $seq")));
-			if ($num === false || !is_numeric($num)) {
-				@$this->Execute(sprintf($this->_genSeqSQL ,$seq));
-				$start -= 1;
-				$num = '0';
-				$cnt = $this->GetOne(sprintf($this->_genSeqCountSQL,$seq));
-				if (!$cnt) {
-					$ok = $this->Execute(sprintf($this->_genSeq2SQL,$seq,$start));
-				}
-				if (!$ok) return false;
-			}
-			$this->Execute("update $seq set id=id+1");
-
-			if ($this->affected_rows() > 0) {
-                	        $num += 1;
-                		$this->genID = intval($num);
-                		return intval($num);
-			}
-		}
-		if ($fn = $this->raiseErrorFn) {
-			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
-		}
-		return false;
-	}
-
-	function BeginTrans()
-	{
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true;
-                if($this->transCnt < 1) {
-        		$this->transCnt += 1;
-        		$this->_autocommit = false;
-        		return $this->_connectionID->beginTransaction();
-                }
-	}
-	
-	function CommitTrans($ok=true)
-	{
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-
-                if($this->transCnt == 0)
-		        $ret = $this->_connectionID->commit();
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		
-		$ret = $this->_connectionID->rollback();
-		return $ret;
-	}
-
-	function CreateSequence($seqname='adodbseq',$start=1) {
-		if (empty($this->_genSeqSQL)) return false;
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		$start -= 1;
-		return $this->Execute("insert into $seqname values($start)");
-	}
-
-	function DropSequence($seqname) {
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-
-    // mark newnham
-	function &MetaColumns($tab)
-	{
-	  global $ADODB_FETCH_MODE;
-	  $false = false;
-	  $save = $ADODB_FETCH_MODE;
-	  $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	  if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-	  $rs = $this->Execute("PRAGMA table_info('$tab')");
-	  if (isset($savem)) $this->SetFetchMode($savem);
-	  if (!$rs) {
-	    $ADODB_FETCH_MODE = $save; 
-	    return $false;
-	  }
-	  $arr = array();
-	  while ($r = $rs->FetchRow()) {
-	  	$type = explode('(',$r['type']);
-	    $size = '';
-	    if (sizeof($type)==2)
-	    $size = trim($type[1],')');
-	    $fn = strtoupper($r['name']);
-	    $fld = new ADOFieldObject;
-	    $fld->name = $r['name'];
-	    $fld->type = $type[0];
-	    $fld->max_length = $size;
-	    $fld->not_null = $r['notnull'];
-	    $fld->primary_key = $r['pk'];
-	    $fld->default_value = $r['dflt_value'];
-	    $fld->scale = 0;
-	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;	
-	    else $arr[strtoupper($fld->name)] = $fld;
-	  }
-	  $rs->Close();
-	  $ADODB_FETCH_MODE = $save;
-	  return $arr;
-	}
-
-    function MetaTables($ttype=false,$showSchema=false,$mask=false) {
-        return $this->GetCol($this->metaTablesSQL);
-    }
-
-    function __sleep() {
-        unset($this->_connectionID);
-        return( array_keys( get_object_vars( $this ) ) );
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-postgres.inc.php b/includes/adodb/drivers/adodb-postgres.inc.php
deleted file mode 100644
index 3cb996eb..00000000
--- a/includes/adodb/drivers/adodb-postgres.inc.php
+++ /dev/null
@@ -1,14 +0,0 @@
-
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-postgres64.inc.php b/includes/adodb/drivers/adodb-postgres64.inc.php
deleted file mode 100644
index 5b9d1068..00000000
--- a/includes/adodb/drivers/adodb-postgres64.inc.php
+++ /dev/null
@@ -1,1065 +0,0 @@
-
-					jlim - changed concat operator to || and data types to MetaType to match documented pgsql types 
-		 	see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm  
-  22 Nov 2000 jlim - added changes to FetchField() and MetaTables() contributed by "raser" 
-  27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by "Lennie" 
-  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk. 
-  31 Jan 2002 jlim - finally installed postgresql. testing
-  01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
-  
-  See http://www.varlena.com/varlena/GeneralBits/47.php
-  
-	-- What indexes are on my table?
-	select * from pg_indexes where tablename = 'tablename';
-	
-	-- What triggers are on my table?
-	select c.relname as "Table", t.tgname as "Trigger Name", 
-	   t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
-	   t.tgisconstraint as "Is Constraint", cc.relname as "Referenced Table",
-	   p.proname as "Function Name"
-	from pg_trigger t, pg_class c, pg_class cc, pg_proc p
-	where t.tgfoid = p.oid and t.tgrelid = c.oid
-	   and t.tgconstrrelid = cc.oid
-	   and c.relname = 'tablename';
-	
-	-- What constraints are on my table?
-	select r.relname as "Table", c.conname as "Constraint Name",
-	   contype as "Constraint Type", conkey as "Key Columns",
-	   confkey as "Foreign Columns", consrc as "Source"
-	from pg_class r, pg_constraint c
-	where r.oid = c.conrelid
-	   and relname = 'tablename';
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-function adodb_addslashes($s)
-{
-	$len = strlen($s);
-	if ($len == 0) return "''";
-	if (strncmp($s,"'",1) === 0 && substr($s,$len-1) == "'") return $s; // already quoted
-	
-	return "'".addslashes($s)."'";
-}
-
-class ADODB_postgres64 extends ADOConnection{
-	var $databaseType = 'postgres64';
-	var $dataProvider = 'postgres';
-	var $hasInsertID = true;
-	var $_resultid = false;
-  	var $concat_operator='||';
-	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
-    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
-	and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
-	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles') 
-	union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'";
-	//"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
-	var $isoDates = true; // accepts dates in ISO format
-	var $sysDate = "CURRENT_DATE";
-	var $sysTimeStamp = "CURRENT_TIMESTAMP";
-	var $blobEncodeType = 'C';
-	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
-		FROM pg_class c, pg_attribute a,pg_type t 
-		WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
-AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-
-	// used when schema defined
-	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
-WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
-	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-	
-	// get primary key etc -- from Freek Dijkstra
-	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
-	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
-	
-	var $hasAffectedRows = true;
-	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	// below suggested by Freek Dijkstra 
-	var $true = 'TRUE';		// string that represents TRUE for a database
-	var $false = 'FALSE';		// string that represents FALSE for a database
-	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
-	var $fmtTimeStamp = "'Y-m-d H:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
-	var $hasMoveFirst = true;
-	var $hasGenID = true;
-	var $_genIDSQL = "SELECT NEXTVAL('%s')";
-	var $_genSeqSQL = "CREATE SEQUENCE %s START %s";
-	var $_dropSeqSQL = "DROP SEQUENCE %s";
-	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
-	var $random = 'random()';		/// random function
-	var $autoRollback = true; // apparently pgsql does not autorollback properly before php 4.3.4
-							// http://bugs.php.net/bug.php?id=25404
-							
-	var $_bindInputArray = false; // requires postgresql 7.3+ and ability to modify database
-	var $disableBlobs = false; // set to true to disable blob checking, resulting in 2-5% improvement in performance.
-	
-	// The last (fmtTimeStamp is not entirely correct: 
-	// PostgreSQL also has support for time zones, 
-	// and writes these time in this format: "2001-03-01 18:59:26+02". 
-	// There is no code for the "+02" time zone information, so I just left that out. 
-	// I'm not familiar enough with both ADODB as well as Postgres 
-	// to know what the concequences are. The other values are correct (wheren't in 0.94)
-	// -- Freek Dijkstra 
-
-	function ADODB_postgres64() 
-	{
-	// changes the metaColumnsSQL, adds columns: attnum[6]
-	}
-	
-	function ServerInfo()
-	{
-		if (isset($this->version)) return $this->version;
-		
-		$arr['description'] = $this->GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		$this->version = $arr;
-		return $arr;
-	}
-
-	function IfNull( $field, $ifNull ) 
-	{
-		return " coalesce($field, $ifNull) "; 
-	}
-
-	// get the last id - never tested
-	function pg_insert_id($tablename,$fieldname)
-	{
-		$result=pg_exec($this->_connectionID, "SELECT last_value FROM ${tablename}_${fieldname}_seq");
-		if ($result) {
-			$arr = @pg_fetch_row($result,0);
-			pg_freeresult($result);
-			if (isset($arr[0])) return $arr[0];
-		}
-		return false;
-	}
-	
-/* Warning from http://www.php.net/manual/function.pg-getlastoid.php:
-Using a OID as a unique identifier is not generally wise. 
-Unless you are very careful, you might end up with a tuple having 
-a different OID if a database must be reloaded. */
-	function _insertid($table,$column)
-	{
-		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
-		$oid = pg_getlastoid($this->_resultid);
-		// to really return the id, we need the table and column-name, else we can only return the oid != id
-		return empty($table) || empty($column) ? $oid : $this->GetOne("SELECT $column FROM $table WHERE oid=".(int)$oid);
-	}
-
-// I get this error with PHP before 4.0.6 - jlim
-// Warning: This compilation does not support pg_cmdtuples() in adodb-postgres.inc.php on line 44
-   function _affectedrows()
-   {
-   		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
-	   	return pg_cmdtuples($this->_resultid);
-   }
-   
-	
-		// returns true/false
-	function BeginTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
-	}
-	
-	function RowLock($tables,$where,$flds='1 as ignore') 
-	{
-		if (!$this->transCnt) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
-	}
-
-	// returns true/false. 
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
-		
-		$this->transCnt -= 1;
-		return @pg_Exec($this->_connectionID, "commit");
-	}
-	
-	// returns true/false
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt -= 1;
-		return @pg_Exec($this->_connectionID, "rollback");
-	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		$info = $this->ServerInfo();
-		if ($info['version'] >= 7.3) {
-	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
-			  and schemaname  not in ( 'pg_catalog','information_schema')
-	union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
-		}
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(strtolower($mask));
-			if ($info['version']>=7.3)
-				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
- union 
-select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
-			else
-				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
-select viewname,'V' from pg_views where viewname like $mask";
-		}
-		$ret = ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	
-	// if magic quotes disabled, use pg_escape_string()
-	function qstr($s,$magic_quotes=false)
-	{
-		if (!$magic_quotes) {
-			if (ADODB_PHPVER >= 0x5200) {
-				return  "'".pg_escape_string($this->_connectionID,$s)."'";
-			} 
-			if (ADODB_PHPVER >= 0x4200) {
-				return  "'".pg_escape_string($s)."'";
-			}
-			if ($this->replaceQuote[0] == '\\'){
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\\000"),$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		return "'$s'";
-	}
-	
-	
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'TO_CHAR('.$col.",'";
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= 'YYYY';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= 'Q';
-				break;
-				
-			case 'M':
-				$s .= 'Mon';
-				break;
-				
-			case 'm':
-				$s .= 'MM';
-				break;
-			case 'D':
-			case 'd':
-				$s .= 'DD';
-				break;
-			
-			case 'H':
-				$s.= 'HH24';
-				break;
-				
-			case 'h':
-				$s .= 'HH';
-				break;
-				
-			case 'i':
-				$s .= 'MI';
-				break;
-			
-			case 's':
-				$s .= 'SS';
-				break;
-			
-			case 'a':
-			case 'A':
-				$s .= 'AM';
-				break;
-				
-			case 'w':
-				$s .= 'D';
-				break;
-			
-			case 'l':
-				$s .= 'DAY';
-				break;
-			
-			 case 'W':
-				$s .= 'WW';
-				break;
-
-			default:
-			// handle escape characters...
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
-				
-			}
-		}
-		return $s. "')";
-	}
-	
-	
-	
-	/* 
-	* Load a Large Object from a file 
-	* - the procedure stores the object id in the table and imports the object using 
-	* postgres proprietary blob handling routines 
-	*
-	* contributed by Mattia Rossi mattia@technologist.com
-	* modified for safe mode by juraj chlebec
-	*/ 
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
-		pg_exec ($this->_connectionID, "begin"); 
-		
-		$fd = fopen($path,'r');
-		$contents = fread($fd,filesize($path));
-		fclose($fd);
-		
-		$oid = pg_lo_create($this->_connectionID);
-		$handle = pg_lo_open($this->_connectionID, $oid, 'w');
-		pg_lo_write($handle, $contents);
-		pg_lo_close($handle);
-		
-		// $oid = pg_lo_import ($path); 
-		pg_exec($this->_connectionID, "commit"); 
-		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype); 
-		$rez = !empty($rs); 
-		return $rez; 
-	} 
-	
-	/*
-	* Deletes/Unlinks a Blob from the database, otherwise it 
-	* will be left behind
-	*
-	* Returns TRUE on success or FALSE on failure.
-	*
-	* contributed by Todd Rogers todd#windfox.net
-	*/
-	function BlobDelete( $blob )
-	{
-		pg_exec ($this->_connectionID, "begin");
-		$result = @pg_lo_unlink($blob);
-		pg_exec ($this->_connectionID, "commit");
-		return( $result );
-	}
-
-	/*
-		Hueristic - not guaranteed to work.
-	*/
-	function GuessOID($oid)
-	{
-		if (strlen($oid)>16) return false;
-		return is_numeric($oid);
-	}
-	
-	/* 
-	* If an OID is detected, then we use pg_lo_* to open the oid file and read the
-	* real blob from the db using the oid supplied as a parameter. If you are storing
-	* blobs using bytea, we autodetect and process it so this function is not needed.
-	*
-	* contributed by Mattia Rossi mattia@technologist.com
-	*
-	* see http://www.postgresql.org/idocs/index.php?largeobjects.html
-	*
-	* Since adodb 4.54, this returns the blob, instead of sending it to stdout. Also
-	* added maxsize parameter, which defaults to $db->maxblobsize if not defined.
-	*/ 
-	function BlobDecode($blob,$maxsize=false,$hastrans=true) 
-	{
-		if (!$this->GuessOID($blob)) return $blob;
-		
-		if ($hastrans) @pg_exec($this->_connectionID,"begin"); 
-		$fd = @pg_lo_open($this->_connectionID,$blob,"r");
-		if ($fd === false) {
-			if ($hastrans) @pg_exec($this->_connectionID,"commit");
-			return $blob;
-		}
-		if (!$maxsize) $maxsize = $this->maxblobsize;
-		$realblob = @pg_loread($fd,$maxsize); 
-		@pg_loclose($fd); 
-		if ($hastrans) @pg_exec($this->_connectionID,"commit"); 
-		return $realblob;
-	}
-	
-	/* 
-		See http://www.postgresql.org/idocs/index.php?datatype-binary.html
-	 	
-		NOTE: SQL string literals (input strings) must be preceded with two backslashes 
-		due to the fact that they must pass through two parsers in the PostgreSQL 
-		backend.
-	*/
-	function BlobEncode($blob)
-	{
-		if (ADODB_PHPVER >= 0x5200) return pg_escape_bytea($this->_connectionID, $blob);
-		if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
-		
-		/*92=backslash, 0=null, 39=single-quote*/
-		$badch = array(chr(92),chr(0),chr(39)); # \  null  '
-		$fixch = array('\\\\134','\\\\000','\\\\047');
-		return adodb_str_replace($badch,$fixch,$blob);
-		
-		// note that there is a pg_escape_bytea function only for php 4.2.0 or later
-	}
-	
-	// assumes bytea for blob, and varchar for clob
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-	
-		if ($blobtype == 'CLOB') {
-    		return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
-		}
-		// do not use bind params which uses qstr(), as blobencode() already quotes data
-		return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
-	}
-	
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		else if (strncmp($date,"'",1) == 0) {
-			$len = strlen($date);
-			if (10 <= $len && $len <= 12) $date = 'date '.$date;
-			else $date = 'timestamp '.$date;
-		}
-		return "($date+interval'$dayFraction days')";
-	}
-	
-
-	// for schema support, pass in the $table param "$schema.$tabname".
-	// converts field names to lowercase, $upper is ignored
-	// see http://phplens.com/lens/lensforum/msgs.php?id=14018 for more info
-	function MetaColumns($table,$normalize=true) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$schema = false;
-		$false = false;
-		$this->_findschema($table,$schema);
-		
-		if ($normalize) $table = strtolower($table);
-
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		if ($schema) $rs = $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
-		else $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if ($rs === false) {
-			return $false;
-		}
-		if (!empty($this->metaKeySQL)) {
-			// If we want the primary keys, we have to issue a separate query
-			// Of course, a modified version of the metaColumnsSQL query using a 
-			// LEFT JOIN would have been much more elegant, but postgres does 
-			// not support OUTER JOINS. So here is the clumsy way.
-			
-			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			
-			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
-			// fetch all result in once for performance.
-			$keys = $rskey->GetArray();
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			
-			$rskey->Close();
-			unset($rskey);
-		}
-
-		$rsdefa = array();
-		if (!empty($this->metaDefaultsSQL)) {
-			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			$sql = sprintf($this->metaDefaultsSQL, ($table));
-			$rsdef = $this->Execute($sql);
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			
-			if ($rsdef) {
-				while (!$rsdef->EOF) {
-					$num = $rsdef->fields['num'];
-					$s = $rsdef->fields['def'];
-					if (strpos($s,'::')===false && substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
-						$s = substr($s, 1);
-						$s = substr($s, 0, strlen($s) - 1);
-					}
-
-					$rsdefa[$num] = $s;
-					$rsdef->MoveNext();
-				}
-			} else {
-				ADOConnection::outp( "==> SQL => " . $sql);
-			}
-			unset($rsdef);
-		}
-	
-		$retarr = array();
-		while (!$rs->EOF) { 	
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$fld->type = $rs->fields[1];
-			$fld->max_length = $rs->fields[2];
-			$fld->attnum = $rs->fields[6];
-			
-			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
-			if ($fld->max_length <= 0) $fld->max_length = -1;
-			if ($fld->type == 'numeric') {
-				$fld->scale = $fld->max_length & 0xFFFF;
-				$fld->max_length >>= 16;
-			}
-			// dannym
-			// 5 hasdefault; 6 num-of-column
-			$fld->has_default = ($rs->fields[5] == 't');
-			if ($fld->has_default) {
-				$fld->default_value = $rsdefa[$rs->fields[6]];
-			}
-
-			//Freek
-			$fld->not_null = $rs->fields[4] == 't';
-			
-			
-			// Freek
-			if (is_array($keys)) {
-				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't') 
-						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't') 
-						$fld->unique = true; // What name is more compatible?
-				}
-			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		if (empty($retarr))
-			return  $false;
-		else
-			return $retarr;	
-		
-	}
-
-	  function MetaIndexes ($table, $primary = FALSE)
-      {
-         global $ADODB_FETCH_MODE;
-                
-				$schema = false;
-				$this->_findschema($table,$schema);
-
-				if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
-					$sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns" 
-FROM pg_catalog.pg_class c 
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid 
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-	,pg_namespace n 
-WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\'';
-				} else {
-	                $sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
-FROM pg_catalog.pg_class c
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
-    			}
-				            
-                if ($primary == FALSE) {
-                	$sql .= ' AND i.indisprimary=false;';
-                }
-                
-                $save = $ADODB_FETCH_MODE;
-                $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                if ($this->fetchMode !== FALSE) {
-                        $savem = $this->SetFetchMode(FALSE);
-                }
-                
-                $rs = $this->Execute(sprintf($sql,$table,$table,$schema));
-                if (isset($savem)) {
-                        $this->SetFetchMode($savem);
-                }
-                $ADODB_FETCH_MODE = $save;
-
-                if (!is_object($rs)) {
-                	$false = false;
-					return $false;
-                }
-				
-                $col_names = $this->MetaColumnNames($table,true,true); 
-				//3rd param is use attnum, 
-				// see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
-                $indexes = array();
-                while ($row = $rs->FetchRow()) {
-                        $columns = array();
-                        foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col];
-                        }
-                        
-                        $indexes[$row[0]] = array(
-                                'unique' => ($row[1] == 't'),
-                                'columns' => $columns
-                        );
-                }
-                return $indexes;
-        }
-
-	// returns true or false
-	//
-	// examples:
-	// 	$db->Connect("host=host1 user=user1 password=secret port=4341");
-	// 	$db->Connect('host1','user1','secret');
-	function _connect($str,$user='',$pwd='',$db='',$ctype=0)
-	{
-		
-		if (!function_exists('pg_connect')) return null;
-		
-		$this->_errorMsg = false;
-		
-		if ($user || $pwd || $db) {
-			$user = adodb_addslashes($user);
-			$pwd = adodb_addslashes($pwd);
-			if (strlen($db) == 0) $db = 'template1';
-			$db = adodb_addslashes($db);
-		   	if ($str)  {
-			 	$host = split(":", $str);
-				if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
-				else $str = '';
-				if (isset($host[1])) $str .= " port=$host[1]";
-				else if (!empty($this->port)) $str .= " port=".$this->port;
-			}
-		   		if ($user) $str .= " user=".$user;
-		   		if ($pwd)  $str .= " password=".$pwd;
-				if ($db)   $str .= " dbname=".$db;
-		}
-
-		//if ($user) $linea = "user=$user host=$linea password=$pwd dbname=$db port=5432";
-		
-		if ($ctype === 1) { // persistent
-			$this->_connectionID = pg_pconnect($str);
-		} else {
-			if ($ctype === -1) { // nconnect, we trick pgsql ext by changing the connection str
-			static $ncnt;
-			
-				if (empty($ncnt)) $ncnt = 1;
-				else $ncnt += 1;
-				
-				$str .= str_repeat(' ',$ncnt);
-			}
-			$this->_connectionID = pg_connect($str);
-		}
-		if ($this->_connectionID === false) return false;
-		$this->Execute("set datestyle='ISO'");
-		
-		$info = $this->ServerInfo();
-		$this->pgVersion = (float) substr($info['version'],0,3);
-		if ($this->pgVersion >= 7.1) { // good till version 999
-			$this->_nestedSQL = true;
-		}
-		return true;
-	}
-	
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
-	{
-	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
-	}
-	 
-	// returns true or false
-	//
-	// examples:
-	// 	$db->PConnect("host=host1 user=user1 password=secret port=4341");
-	// 	$db->PConnect('host1','user1','secret');
-	function _pconnect($str,$user='',$pwd='',$db='')
-	{
-		return $this->_connect($str,$user,$pwd,$db,1);
-	}
-	
-
-	// returns queryID or false
-	function _query($sql,$inputarr)
-	{
-		$this->_errorMsg = false;
-		if ($inputarr) {
-		/*
-			It appears that PREPARE/EXECUTE is slower for many queries.
-			
-			For query executed 1000 times:
-			"select id,firstname,lastname from adoxyz 
-				where firstname not like ? and lastname not like ? and id = ?"
-				
-			with plan = 1.51861286163 secs
-			no plan =   1.26903700829 secs
-
-			
-
-		*/
-			$plan = 'P'.md5($sql);
-				
-			$execp = '';
-			foreach($inputarr as $v) {
-				if ($execp) $execp .= ',';
-				if (is_string($v)) {
-					if (strncmp($v,"'",1) !== 0) $execp .= $this->qstr($v);
-				} else {
-					$execp .= $v;
-				}
-			}
-			
-			if ($execp) $exsql = "EXECUTE $plan ($execp)";
-			else $exsql = "EXECUTE $plan";
-			
-			
-			$rez = @pg_exec($this->_connectionID,$exsql);
-			if (!$rez) {
-			# Perhaps plan does not exist? Prepare/compile plan.
-				$params = '';
-				foreach($inputarr as $v) {
-					if ($params) $params .= ',';
-					if (is_string($v)) {
-						$params .= 'VARCHAR';
-					} else if (is_integer($v)) {
-						$params .= 'INTEGER';
-					} else {
-						$params .= "REAL";
-					}
-				}
-				$sqlarr = explode('?',$sql);
-				//print_r($sqlarr);
-				$sql = '';
-				$i = 1;
-				foreach($sqlarr as $v) {
-					$sql .= $v.' $'.$i;
-					$i++;
-				}
-				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);		
-				//adodb_pr($s);
-				$rez = pg_exec($this->_connectionID,$s);
-				//echo $this->ErrorMsg();
-			}
-			if ($rez)
-				$rez = pg_exec($this->_connectionID,$exsql);
-		} else {
-			//adodb_backtrace();
-			$rez = pg_exec($this->_connectionID,$sql);
-		}
-		// check if no data returned, then no need to create real recordset
-		if ($rez && pg_numfields($rez) <= 0) {
-			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
-				pg_freeresult($this->_resultid);
-			}
-			$this->_resultid = $rez;
-			return true;
-		}
-		
-		return $rez;
-	}
-	
-	function _errconnect()
-	{
-		if (defined('DB_ERROR_CONNECT_FAILED')) return DB_ERROR_CONNECT_FAILED;
-		else return 'Database connection failed';
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
-		if (ADODB_PHPVER >= 0x4300) {
-			if (!empty($this->_resultid)) {
-				$this->_errorMsg = @pg_result_error($this->_resultid);
-				if ($this->_errorMsg) return $this->_errorMsg;
-			}
-			
-			if (!empty($this->_connectionID)) {
-				$this->_errorMsg = @pg_last_error($this->_connectionID);
-			} else $this->_errorMsg = $this->_errconnect();
-		} else {
-			if (empty($this->_connectionID)) $this->_errconnect();
-			else $this->_errorMsg = @pg_errormessage($this->_connectionID);
-		}
-		return $this->_errorMsg;
-	}
-	
-	function ErrorNo()
-	{
-		$e = $this->ErrorMsg();
-		if (strlen($e)) {
-			return ADOConnection::MetaError($e);
-		 }
-		 return 0;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		if ($this->transCnt) $this->RollbackTrans();
-		if ($this->_resultid) {
-			@pg_freeresult($this->_resultid);
-			$this->_resultid = false;
-		}
-		@pg_close($this->_connectionID);
-		$this->_connectionID = false;
-		return true;
-	}
-	
-	
-	/*
-	* Maximum size of C field
-	*/
-	function CharMax()
-	{
-		return 1000000000;  // should be 1 Gb?
-	}
-	
-	/*
-	* Maximum size of X field
-	*/
-	function TextMax()
-	{
-		return 1000000000; // should be 1 Gb?
-	}
-	
-		
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_postgres64 extends ADORecordSet{
-	var $_blobArr;
-	var $databaseType = "postgres64";
-	var $canSeek = true;
-	function ADORecordSet_postgres64($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: $this->fetchMode = PGSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);
-	}
-	
-	function GetRowAssoc($upper=true)
-	{
-		if ($this->fetchMode == PGSQL_ASSOC && !$upper) return $this->fields;
-		$row = ADORecordSet::GetRowAssoc($upper);
-		return $row;
-	}
-
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$qid = $this->_queryID;
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($qid):-1;
-		$this->_numOfFields = @pg_numfields($qid);
-		
-		// cache types for blob decode check
-		// apparently pg_fieldtype actually performs an sql query on the database to get the type.
-		if (empty($this->connection->noBlobs))
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {  
-			if (pg_fieldtype($qid,$i) == 'bytea') {
-				$this->_blobArr[$i] = pg_fieldname($qid,$i);
-			}
-		}
-	}
-
-		/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode != PGSQL_NUM) return @$this->fields[$colname];
-		
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-	function FetchField($off = 0) 
-	{
-		// offsets begin at 0
-		
-		$o= new ADOFieldObject();
-		$o->name = @pg_fieldname($this->_queryID,$off);
-		$o->type = @pg_fieldtype($this->_queryID,$off);
-		$o->max_length = @pg_fieldsize($this->_queryID,$off);
-		return $o;	
-	}
-
-	function _seek($row)
-	{
-		return @pg_fetch_row($this->_queryID,$row);
-	}
-	
-	function _decode($blob)
-	{
-		if ($blob === NULL) return NULL;
-		eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
-		return $realblob;	
-	}
-	
-	function _fixblobs()
-	{
-		if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH) {
-			foreach($this->_blobArr as $k => $v) {
-				$this->fields[$k] = ADORecordSet_postgres64::_decode($this->fields[$k]);
-			}
-		}
-		if ($this->fetchMode == PGSQL_ASSOC || $this->fetchMode == PGSQL_BOTH) {
-			foreach($this->_blobArr as $k => $v) {
-				$this->fields[$v] = ADORecordSet_postgres64::_decode($this->fields[$v]);
-			}
-		}
-	}
-	
-	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
-	{
-		if (!$this->EOF) {
-			$this->_currentRow++;
-			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
-				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-				if (is_array($this->fields) && $this->fields) {
-					if (isset($this->_blobArr)) $this->_fixblobs();
-					return true;
-				}
-			}
-			$this->fields = false;
-			$this->EOF = true;
-		}
-		return false;
-	}		
-	
-	function _fetch()
-	{
-				
-		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
-        	return false;
-
-		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-		
-		if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-			
-		return (is_array($this->fields));
-	}
-
-	function _close() 
-	{ 
-		return @pg_freeresult($this->_queryID);
-	}
-
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-				case 'MONEY': // stupid, postgres expects money to be a string
-				case 'INTERVAL':
-				case 'CHAR':
-				case 'CHARACTER':
-				case 'VARCHAR':
-				case 'NAME':
-		   		case 'BPCHAR':
-				case '_VARCHAR':
-				case 'INET':
-				case 'MACADDR':
-					if ($len <= $this->blobSize) return 'C';
-				
-				case 'TEXT':
-					return 'X';
-		
-				case 'IMAGE': // user defined type
-				case 'BLOB': // user defined type
-				case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
-				case 'VARBIT':
-				case 'BYTEA':
-					return 'B';
-				
-				case 'BOOL':
-				case 'BOOLEAN':
-					return 'L';
-				
-				case 'DATE':
-					return 'D';
-				
-				
-				case 'TIMESTAMP WITHOUT TIME ZONE':
-				case 'TIME':
-				case 'DATETIME':
-				case 'TIMESTAMP':
-				case 'TIMESTAMPTZ':
-					return 'T';
-				
-				case 'SMALLINT': 
-				case 'BIGINT': 
-				case 'INTEGER': 
-				case 'INT8': 
-				case 'INT4':
-				case 'INT2':
-					if (isset($fieldobj) &&
-				empty($fieldobj->primary_key) && empty($fieldobj->unique)) return 'I';
-				
-				case 'OID':
-				case 'SERIAL':
-					return 'R';
-				
-				 default:
-				 	return 'N';
-			}
-	}
-
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-postgres7.inc.php b/includes/adodb/drivers/adodb-postgres7.inc.php
deleted file mode 100644
index ef5ce882..00000000
--- a/includes/adodb/drivers/adodb-postgres7.inc.php
+++ /dev/null
@@ -1,313 +0,0 @@
-ADODB_postgres64();
-		if (ADODB_ASSOC_CASE !== 2) {
-			$this->rsPrefix .= 'assoc_';
-		}
-		$this->_bindInputArray = PHP_VERSION >= 5.1;
-	}
-
-	
-	// the following should be compat with postgresql 7.2, 
-	// which makes obsolete the LIMIT limit,offset syntax
-	 function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	 {
-		 $offsetStr = ($offset >= 0) ? " OFFSET ".((integer)$offset) : '';
-		 $limitStr  = ($nrows >= 0)  ? " LIMIT ".((integer)$nrows) : '';
-		 if ($secs2cache)
-		  	$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-		 else
-		  	$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-		
-		return $rs;
-	 }
- 	/*
- 	function Prepare($sql)
-	{
-		$info = $this->ServerInfo();
-		if ($info['version']>=7.3) {
-			return array($sql,false);
-		}
-		return $sql;
-	}
- 	*/
-
-	/*
-		I discovered that the MetaForeignKeys method no longer worked for Postgres 8.3.
-		I went ahead and modified it to work for both 8.2 and 8.3. 
-		Please feel free to include this change in your next release of adodb.
-		 William Kolodny [William.Kolodny#gt-t.net]
-	*/
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-	  $sql="
-	  SELECT fum.ftblname AS lookup_table, split_part(fum.rf, ')'::text, 1) AS lookup_field,
-	     fum.ltable AS dep_table, split_part(fum.lf, ')'::text, 1) AS dep_field
-	  FROM (
-	  SELECT fee.ltable, fee.ftblname, fee.consrc, split_part(fee.consrc,'('::text, 2) AS lf, 
-	    split_part(fee.consrc, '('::text, 3) AS rf
-	  FROM (
-	      SELECT foo.relname AS ltable, foo.ftblname,
-	          pg_get_constraintdef(foo.oid) AS consrc
-	      FROM (
-	          SELECT c.oid, c.conname AS name, t.relname, ft.relname AS ftblname
-	          FROM pg_constraint c 
-	          JOIN pg_class t ON (t.oid = c.conrelid) 
-	          JOIN pg_class ft ON (ft.oid = c.confrelid)
-	          JOIN pg_namespace nft ON (nft.oid = ft.relnamespace)
-	          LEFT JOIN pg_description ds ON (ds.objoid = c.oid)
-	          JOIN pg_namespace n ON (n.oid = t.relnamespace)
-	          WHERE c.contype = 'f'::\"char\"
-	          ORDER BY t.relname, n.nspname, c.conname, c.oid
-	          ) foo
-	      ) fee) fum
-	  WHERE fum.ltable='".strtolower($table)."'
-	  ORDER BY fum.ftblname, fum.ltable, split_part(fum.lf, ')'::text, 1)
-	  ";
-	  $rs = $this->Execute($sql);
-	
-	  if (!$rs || $rs->EOF) return false;
-	
-	  $a = array();
-	  while (!$rs->EOF) {
-	    if ($upper) {
-	      $a[strtoupper($rs->Fields('lookup_table'))][] = strtoupper(ereg_replace('"','',$rs->Fields('dep_field').'='.$rs->Fields('lookup_field')));
-	    } else {
-	      $a[$rs->Fields('lookup_table')][] = ereg_replace('"','',$rs->Fields('dep_field').'='.$rs->Fields('lookup_field'));
-	    }
-	    adodb_movenext($rs);
-	  }
-	
-	  return $a;
-	
-	}
-	
-	// from  Edward Jaramilla, improved version - works on pg 7.4
-	function _old_MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-		$sql = 'SELECT t.tgargs as args
-		FROM
-		pg_trigger t,pg_class c,pg_proc p
-		WHERE
-		t.tgenabled AND
-		t.tgrelid = c.oid AND
-		t.tgfoid = p.oid AND
-		p.proname = \'RI_FKey_check_ins\' AND
-		c.relname = \''.strtolower($table).'\'
-		ORDER BY
-			t.tgrelid';
-		
-		$rs = $this->Execute($sql);
-		
-		if (!$rs || $rs->EOF) return false;
-		
-		$arr = $rs->GetArray();
-		$a = array();
-		foreach($arr as $v) {
-			$data = explode(chr(0), $v['args']);
-			$size = count($data)-1; //-1 because the last node is empty
-			for($i = 4; $i < $size; $i++) {
-				if ($upper) 
-					$a[strtoupper($data[2])][] = strtoupper($data[$i].'='.$data[++$i]);
-				else 
-					$a[$data[2]][] = $data[$i].'='.$data[++$i];
-			}
-		}
-		return $a;
-	}
-
-	function _query($sql,$inputarr)
-	{
-		if (! $this->_bindInputArray) {
-			// We don't have native support for parameterized queries, so let's emulate it at the parent
-			return ADODB_postgres64::_query($sql, $inputarr);
-		}
-		$this->_errorMsg = false;
-		// -- added Cristiano da Cunha Duarte
-		if ($inputarr) {
-			$sqlarr = explode('?',trim($sql));
-			$sql = '';
-			$i = 1;
-			$last = sizeof($sqlarr)-1;
-			foreach($sqlarr as $v) {
-				if ($last < $i) $sql .= $v;
-				else $sql .= $v.' $'.$i;
-				$i++;
-			}
-			
-			$rez = pg_query_params($this->_connectionID,$sql, $inputarr);
-		} else {
-			$rez = pg_query($this->_connectionID,$sql);
-		}
-		// check if no data returned, then no need to create real recordset
-		if ($rez && pg_numfields($rez) <= 0) {
-			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
-				pg_freeresult($this->_resultid);
-			}
-			$this->_resultid = $rez;
-			return true;
-		}		
-		return $rez;
-	}
-	
- 	 // this is a set of functions for managing client encoding - very important if the encodings
-	// of your database and your output target (i.e. HTML) don't match
-	//for instance, you may have UNICODE database and server it on-site as WIN1251 etc.
-	// GetCharSet - get the name of the character set the client is using now
-	// the functions should work with Postgres 7.0 and above, the set of charsets supported
-	// depends on compile flags of postgres distribution - if no charsets were compiled into the server
-	// it will return 'SQL_ANSI' always
-	function GetCharSet()
-	{
-		//we will use ADO's builtin property charSet
-		$this->charSet = @pg_client_encoding($this->_connectionID);
-		if (!$this->charSet) {
-			return false;
-		} else {
-			return $this->charSet;
-		}
-	}
-	
-	// SetCharSet - switch the client encoding
-	function SetCharSet($charset_name)
-	{
-		$this->GetCharSet();
-		if ($this->charSet !== $charset_name) {
-			$if = pg_set_client_encoding($this->_connectionID, $charset_name);
-			if ($if == "0" & $this->GetCharSet() == $charset_name) {
-				return true;
-			} else return false;
-		} else return true;
-	}
-
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
-
-	var $databaseType = "postgres7";
-	
-	
-	function ADORecordSet_postgres7($queryID,$mode=false) 
-	{
-		$this->ADORecordSet_postgres64($queryID,$mode);
-	}
-	
-	 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
-	{
-		if (!$this->EOF) {
-			$this->_currentRow++;
-			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
-				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-			
-				if (is_array($this->fields)) {
-					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-					return true;
-				}
-			}
-			$this->fields = false;
-			$this->EOF = true;
-		}
-		return false;
-	}		
-
-}
-
-class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
-
-	var $databaseType = "postgres7";
-	
-	
-	function ADORecordSet_assoc_postgres7($queryID,$mode=false) 
-	{
-		$this->ADORecordSet_postgres64($queryID,$mode);
-	}
-	
-	function _fetch()
-	{
-		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
-        	return false;
-
-		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-		
-		if ($this->fields) {
-			if (isset($this->_blobArr)) $this->_fixblobs();
-			$this->_updatefields();
-		}
-			
-		return (is_array($this->fields));
-	}
-	
-		// Create associative array
-	function _updatefields()
-	{
-		if (ADODB_ASSOC_CASE == 2) return; // native
-	
-		$arr = array();
-		$lowercase = (ADODB_ASSOC_CASE == 0);
-		
-		foreach($this->fields as $k => $v) {
-			if (is_integer($k)) $arr[$k] = $v;
-			else {
-				if ($lowercase)
-					$arr[strtolower($k)] = $v;
-				else
-					$arr[strtoupper($k)] = $v;
-			}
-		}
-		$this->fields = $arr;
-	}
-	
-	function MoveNext() 
-	{
-		if (!$this->EOF) {
-			$this->_currentRow++;
-			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
-				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-			
-				if (is_array($this->fields)) {
-					if ($this->fields) {
-						if (isset($this->_blobArr)) $this->_fixblobs();
-					
-						$this->_updatefields();
-					}
-					return true;
-				}
-			}
-			
-			
-			$this->fields = false;
-			$this->EOF = true;
-		}
-		return false;
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-postgres8.inc.php b/includes/adodb/drivers/adodb-postgres8.inc.php
deleted file mode 100644
index dbb75117..00000000
--- a/includes/adodb/drivers/adodb-postgres8.inc.php
+++ /dev/null
@@ -1,12 +0,0 @@
-
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-proxy.inc.php b/includes/adodb/drivers/adodb-proxy.inc.php
deleted file mode 100644
index c0714ca2..00000000
--- a/includes/adodb/drivers/adodb-proxy.inc.php
+++ /dev/null
@@ -1,33 +0,0 @@
-ADORecordset($id,$mode);
-		}
-	};
-} // define
-	
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-sapdb.inc.php b/includes/adodb/drivers/adodb-sapdb.inc.php
deleted file mode 100644
index 74fc251a..00000000
--- a/includes/adodb/drivers/adodb-sapdb.inc.php
+++ /dev/null
@@ -1,184 +0,0 @@
-curmode = SQL_CUR_USE_ODBC;
-		$this->ADODB_odbc();
-	}
-	
-	function ServerInfo()
-	{
-		$info = ADODB_odbc::ServerInfo();
-		if (!$info['version'] && preg_match('/([0-9.]+)/',$info['description'],$matches)) {
-			$info['version'] = $matches[1];
-		}
-		return $info;
-	}
-
-	function MetaPrimaryKeys($table)
-	{
-		$table = $this->Quote(strtoupper($table));
-
-		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos");
-	}
-		
- 	function MetaIndexes ($table, $primary = FALSE)
-	{
-		$table = $this->Quote(strtoupper($table));
-
-		$sql = "SELECT INDEXNAME,TYPE,COLUMNNAME FROM INDEXCOLUMNS ".
-			" WHERE TABLENAME=$table".
-			" ORDER BY INDEXNAME,COLUMNNO";
-
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-        if (!is_object($rs)) {
-        	return FALSE;
-        }
-
-		$indexes = array();
-		while ($row = $rs->FetchRow()) {
-            $indexes[$row[0]]['unique'] = $row[1] == 'UNIQUE';
-            $indexes[$row[0]]['columns'][] = $row[2];
-    	}
-		if ($primary) {
-			$indexes['SYSPRIMARYKEYINDEX'] = array(
-					'unique' => True,	// by definition
-					'columns' => $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos"),
-				);
-		}
-        return $indexes;
-	}
-	
- 	function MetaColumns ($table)
-	{
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-		$table = $this->Quote(strtoupper($table));
-		
-		$retarr = array();
-		foreach($this->GetAll("SELECT COLUMNNAME,DATATYPE,LEN,DEC,NULLABLE,MODE,\"DEFAULT\",CASE WHEN \"DEFAULT\" IS NULL THEN 0 ELSE 1 END AS HAS_DEFAULT FROM COLUMNS WHERE tablename=$table ORDER BY pos") as $column)
-		{
-			$fld = new ADOFieldObject();
-			$fld->name = $column[0];
-			$fld->type = $column[1];
-			$fld->max_length = $fld->type == 'LONG' ? 2147483647 : $column[2];
-			$fld->scale = $column[3];
-			$fld->not_null = $column[4] == 'NO';
-			$fld->primary_key = $column[5] == 'KEY';
-			if ($fld->has_default = $column[7]) {
-				if ($fld->primary_key && $column[6] == 'DEFAULT SERIAL (1)') {
-					$fld->auto_increment = true;
-					$fld->has_default = false;
-				} else {
-					$fld->default_value = $column[6];
-					switch($fld->type) {
-						case 'VARCHAR':
-						case 'CHARACTER':
-						case 'LONG':
-							$fld->default_value = $column[6];
-							break;
-						default:
-							$fld->default_value = trim($column[6]);
-							break;
-					}
-				}
-			}
-			$retarr[$fld->name] = $fld;	
-		}
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-		return $retarr;
-	}
-	
-	function MetaColumnNames($table)
-	{
-		$table = $this->Quote(strtoupper($table));
-
-		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table ORDER BY pos");
-	}
-	
-	// unlike it seems, this depends on the db-session and works in a multiuser environment
-	function _insertid($table,$column)
-	{
-		return empty($table) ? False : $this->GetOne("SELECT $table.CURRVAL FROM DUAL");
-	}
-
-	/*
-		SelectLimit implementation problems:
-	
-	 	The following will return random 10 rows as order by performed after "WHERE rowno<10"
-	 	which is not ideal...
-		
-	  		select * from table where rowno < 10 order by 1
-	  
-	  	This means that we have to use the adoconnection base class SelectLimit when
-	  	there is an "order by".
-		
-		See http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
-	 */
-	
-};
- 
-
-class  ADORecordSet_sapdb extends ADORecordSet_odbc {	
-	
-	var $databaseType = "sapdb";		
-	
-	function ADORecordSet_sapdb($id,$mode=false)
-	{
-		$this->ADORecordSet_odbc($id,$mode);
-	}
-}
-
-} //define
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-sqlanywhere.inc.php b/includes/adodb/drivers/adodb-sqlanywhere.inc.php
deleted file mode 100644
index 71037010..00000000
--- a/includes/adodb/drivers/adodb-sqlanywhere.inc.php
+++ /dev/null
@@ -1,169 +0,0 @@
-create_blobvar($blobVarName);
-
-	  b) load blob var from file.  $filename must be complete path
-
-	  $dbcon->load_blobvar_from_file($blobVarName, $filename);
-
-	  c) Use the $blobVarName in SQL insert or update statement in the values
-	  clause:
-
-		$recordSet = $dbconn->Execute('INSERT INTO tabname (idcol, blobcol) '
-		.
-	   'VALUES (\'test\', ' . $blobVarName . ')');
-
-	 instead of loading blob from a file, you can also load from 
-	  an unformatted (raw) blob variable:
-	  $dbcon->load_blobvar_from_var($blobVarName, $varName);
-
-	  d) drop blob variable on db server to free up resources:
-	  $dbconn->drop_blobvar($blobVarName);
-
-  Sybase_SQLAnywhere data driver. Requires ODBC.
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
- include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-
-if (!defined('ADODB_SYBASE_SQLANYWHERE')){
-
- define('ADODB_SYBASE_SQLANYWHERE',1);
-
- class ADODB_sqlanywhere extends ADODB_odbc {
-  	var $databaseType = "sqlanywhere";	
-	var $hasInsertID = true;
-	
-	function ADODB_sqlanywhere()
-	{
-		$this->ADODB_odbc();
-	}
-
-	 function _insertid() {
-  	   return $this->GetOne('select @@identity');
-	 }
-
-  function create_blobvar($blobVarName) {
-   $this->Execute("create variable $blobVarName long binary");
-   return;
-  }
-
-  function drop_blobvar($blobVarName) {
-   $this->Execute("drop variable $blobVarName");
-   return;
-  }
-
-  function load_blobvar_from_file($blobVarName, $filename) {
-   $chunk_size = 1000;
-
-   $fd = fopen ($filename, "rb");
-
-   $integer_chunks = (integer)filesize($filename) / $chunk_size;
-   $modulus = filesize($filename) % $chunk_size;
-   if ($modulus != 0){
-	$integer_chunks += 1;
-   }
-
-   for($loop=1;$loop<=$integer_chunks;$loop++){
-	$contents = fread ($fd, $chunk_size);
-	$contents = bin2hex($contents);
-
-	$hexstring = '';
-
-	for($loop2=0;$loop2qstr($hexstring);
-
-	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
-   }
-
-   fclose ($fd);
-   return;
-  }
-
-  function load_blobvar_from_var($blobVarName, &$varName) {
-   $chunk_size = 1000;
-
-   $integer_chunks = (integer)strlen($varName) / $chunk_size;
-   $modulus = strlen($varName) % $chunk_size;
-   if ($modulus != 0){
-	$integer_chunks += 1;
-   }
-
-   for($loop=1;$loop<=$integer_chunks;$loop++){
-	$contents = substr ($varName, (($loop - 1) * $chunk_size), $chunk_size);
-	$contents = bin2hex($contents);
-
-	$hexstring = '';
-
-	for($loop2=0;$loop2qstr($hexstring);
-
-	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
-   }
-
-   return;
-  }
-
- /*
-  Insert a null into the blob field of the table first.
-  Then use UpdateBlob to store the blob.
-
-  Usage:
-
-  $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-  $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
- */
-  function UpdateBlob($table,$column,&$val,$where,$blobtype='BLOB')
-  {
-   $blobVarName = 'hold_blob';
-   $this->create_blobvar($blobVarName);
-   $this->load_blobvar_from_var($blobVarName, $val);
-   $this->Execute("UPDATE $table SET $column=$blobVarName WHERE $where");
-   $this->drop_blobvar($blobVarName);
-   return true;
-  }
- }; //class
-
- class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {	
-
-  var $databaseType = "sqlanywhere";		
-
- function ADORecordSet_sqlanywhere($id,$mode=false)
- {
-  $this->ADORecordSet_odbc($id,$mode);
- }
-
-
- }; //class
-
-
-} //define
-?>
diff --git a/includes/adodb/drivers/adodb-sqlite.inc.php b/includes/adodb/drivers/adodb-sqlite.inc.php
deleted file mode 100644
index eec75b1a..00000000
--- a/includes/adodb/drivers/adodb-sqlite.inc.php
+++ /dev/null
@@ -1,398 +0,0 @@
-fmtDate)."'";
-	case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
-	}
-  }*/
-	
-	function ServerInfo()
-	{
-		$arr['version'] = sqlite_libversion();
-		$arr['description'] = 'SQLite ';
-		$arr['encoding'] = sqlite_libencoding();
-		return $arr;
-	}
-	
-	function BeginTrans()
-	{	  
-		 if ($this->transOff) return true; 
-		 $ret = $this->Execute("BEGIN TRANSACTION");
-		 $this->transCnt += 1;
-		 return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		$ret = $this->Execute("COMMIT");
-		if ($this->transCnt>0)$this->transCnt -= 1;
-		return !empty($ret);
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-		$ret = $this->Execute("ROLLBACK");
-		if ($this->transCnt>0)$this->transCnt -= 1;
-		return !empty($ret);
-	}
-	
-	// mark newnham
-	function MetaColumns($tab)
-	{
-	  global $ADODB_FETCH_MODE;
-	  $false = false;
-	  $save = $ADODB_FETCH_MODE;
-	  $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	  if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-	  $rs = $this->Execute("PRAGMA table_info('$tab')");
-	  if (isset($savem)) $this->SetFetchMode($savem);
-	  if (!$rs) {
-	    $ADODB_FETCH_MODE = $save; 
-	    return $false;
-	  }
-	  $arr = array();
-	  while ($r = $rs->FetchRow()) {
-	    $type = explode('(',$r['type']);
-	    $size = '';
-	    if (sizeof($type)==2)
-	    $size = trim($type[1],')');
-	    $fn = strtoupper($r['name']);
-	    $fld = new ADOFieldObject;
-	    $fld->name = $r['name'];
-	    $fld->type = $type[0];
-	    $fld->max_length = $size;
-	    $fld->not_null = $r['notnull'];
-	    $fld->default_value = $r['dflt_value'];
-	    $fld->scale = 0;
-	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;	
-	    else $arr[strtoupper($fld->name)] = $fld;
-	  }
-	  $rs->Close();
-	  $ADODB_FETCH_MODE = $save;
-	  return $arr;
-	}
-	
-	function _init($parentDriver)
-	{
-	
-		$parentDriver->hasTransactions = false;
-		$parentDriver->hasInsertID = true;
-	}
-
-	function _insertid()
-	{
-		return sqlite_last_insert_rowid($this->_connectionID);
-	}
-	
-	function _affectedrows()
-	{
-        return sqlite_changes($this->_connectionID);
-    }
-	
-	function ErrorMsg() 
- 	{
-		if ($this->_logsql) return $this->_errorMsg;
-		return ($this->_errorNo) ? sqlite_error_string($this->_errorNo) : '';
-	}
- 
-	function ErrorNo() 
-	{
-		return $this->_errorNo;
-	}
-	
-	function SQLDate($fmt, $col=false)
-	{
-		$fmt = $this->qstr($fmt);
-		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
-	}
-	
-	
-	function _createFunctions()
-	{
-		@sqlite_create_function($this->_connectionID, 'adodb_date', 'adodb_date', 1);
-		@sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
-	}
-	
-
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sqlite_open')) return null;
-		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
-		$this->_connectionID = sqlite_open($argHostname);
-		if ($this->_connectionID === false) return false;
-		$this->_createFunctions();
-		return true;
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sqlite_open')) return null;
-		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
-		$this->_connectionID = sqlite_popen($argHostname);
-		if ($this->_connectionID === false) return false;
-		$this->_createFunctions();
-		return true;
-	}
-
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr=false)
-	{
-		$rez = sqlite_query($sql,$this->_connectionID);
-		if (!$rez) {
-			$this->_errorNo = sqlite_last_error($this->_connectionID);
-		}
-		
-		return $rez;
-	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{
-		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
-		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
-	  	if ($secs2cache)
-	   		$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-	  	else
-	   		$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-			
-		return $rs;
-	}
-	
-	/*
-		This algorithm is not very efficient, but works even if table locking
-		is not available.
-		
-		Will return false if unable to generate an ID after $MAXLOOPS attempts.
-	*/
-	var $_genSeqSQL = "create table %s (id integer)";
-	
-	function GenID($seq='adodbseq',$start=1)
-	{	
-		// if you have to modify the parameter below, your database is overloaded,
-		// or you need to implement generation of id's yourself!
-		$MAXLOOPS = 100;
-		//$this->debug=1;
-		while (--$MAXLOOPS>=0) {
-			@($num = $this->GetOne("select id from $seq"));
-			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
-				$start -= 1;
-				$num = '0';
-				$ok = $this->Execute("insert into $seq values($start)");
-				if (!$ok) return false;
-			} 
-			$this->Execute("update $seq set id=id+1 where id=$num");
-			
-			if ($this->affected_rows() > 0) {
-				$num += 1;
-				$this->genID = $num;
-				return $num;
-			}
-		}
-		if ($fn = $this->raiseErrorFn) {
-			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
-		}
-		return false;
-	}
-
-	function CreateSequence($seqname='adodbseq',$start=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		$start -= 1;
-		return $this->Execute("insert into $seqname values($start)");
-	}
-	
-	var $_dropSeqSQL = 'drop table %s';
-	function DropSequence($seqname)
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		return @sqlite_close($this->_connectionID);
-	}
-
-	function MetaIndexes($table, $primary = FALSE, $owner=false)
-	{
-		$false = false;
-		// save old fetch mode
-        global $ADODB_FETCH_MODE;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-		$SQL=sprintf("SELECT name,sql FROM sqlite_master WHERE type='index' AND tbl_name='%s'", strtolower($table));
-        $rs = $this->Execute($SQL);
-        if (!is_object($rs)) {
-			if (isset($savem)) 
-				$this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
-
-		$indexes = array ();
-		while ($row = $rs->FetchRow()) {
-			if ($primary && preg_match("/primary/i",$row[1]) == 0) continue;
-            if (!isset($indexes[$row[0]])) {
-
-			$indexes[$row[0]] = array(
-				   'unique' => preg_match("/unique/i",$row[1]),
-				   'columns' => array());
-			}
-			/**
-			  * There must be a more elegant way of doing this,
-			  * the index elements appear in the SQL statement
-			  * in cols[1] between parentheses
-			  * e.g CREATE UNIQUE INDEX ware_0 ON warehouse (org,warehouse)
-			  */
-			$cols = explode("(",$row[1]);
-			$cols = explode(")",$cols[1]);
-			array_pop($cols);
-			$indexes[$row[0]]['columns'] = $cols;
-		}
-		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-		}
-        return $indexes;
-	}
-
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_sqlite extends ADORecordSet {
-
-	var $databaseType = "sqlite";
-	var $bind = false;
-
-	function ADORecordset_sqlite($queryID,$mode=false)
-	{
-		
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch($mode) {
-		case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
-		case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
-		default: $this->fetchMode = SQLITE_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		
-		$this->_queryID = $queryID;
-	
-		$this->_inited = true;
-		$this->fields = array();
-		if ($queryID) {
-			$this->_currentRow = 0;
-			$this->EOF = !$this->_fetch();
-			@$this->_initrs();
-		} else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-			$this->EOF = true;
-		}
-		
-		return $this->_queryID;
-	}
-
-
-	function FetchField($fieldOffset = -1)
-	{
-		$fld = new ADOFieldObject;
-		$fld->name = sqlite_field_name($this->_queryID, $fieldOffset);
-		$fld->type = 'VARCHAR';
-		$fld->max_length = -1;
-		return $fld;
-	}
-	
-   function _initrs()
-   {
-		$this->_numOfRows = @sqlite_num_rows($this->_queryID);
-		$this->_numOfFields = @sqlite_num_fields($this->_queryID);
-   }
-
-	function Fields($colname)
-	{
-		if ($this->fetchMode != SQLITE_NUM) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-   function _seek($row)
-   {
-   		return sqlite_seek($this->_queryID, $row);
-   }
-
-	function _fetch($ignore_fields=false) 
-	{
-		$this->fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
-		return !empty($this->fields);
-	}
-	
-	function _close() 
-	{
-	}
-
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-sqlitepo.inc.php b/includes/adodb/drivers/adodb-sqlitepo.inc.php
deleted file mode 100644
index 82e159cd..00000000
--- a/includes/adodb/drivers/adodb-sqlitepo.inc.php
+++ /dev/null
@@ -1,62 +0,0 @@
-ADODB_sqlite();
-   }
-}
-
-/*--------------------------------------------------------------------------------------
-       Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_sqlitepo extends ADORecordset_sqlite {
-
-   var $databaseType = 'sqlitepo';
-
-   function ADORecordset_sqlitepo($queryID,$mode=false)
-   {
-      $this->ADORecordset_sqlite($queryID,$mode);
-   }
-   
-   // Modified to strip table names from returned fields
-   function _fetch($ignore_fields=false)
-   {
-      $this->fields = array();
-      $fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
-      if(is_array($fields))
-         foreach($fields as $n => $v)
-         {
-            if(($p = strpos($n, ".")) !== false)
-               $n = substr($n, $p+1);
-            $this->fields[$n] = $v;
-         }
-
-      return !empty($this->fields);
-   }
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-sybase.inc.php b/includes/adodb/drivers/adodb-sybase.inc.php
deleted file mode 100644
index 9c00d026..00000000
--- a/includes/adodb/drivers/adodb-sybase.inc.php
+++ /dev/null
@@ -1,418 +0,0 @@
-GetOne('select @@identity');
-	}
-	  // might require begintrans -- committrans
-	function _affectedrows()
-	{
-	   return $this->GetOne('select @@rowcount');
-	}
-
-			  
-	function BeginTrans()
-	{	
-	
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		   
-		$this->Execute('BEGIN TRAN');
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		
-		if (!$ok) return $this->RollbackTrans();
-	
-		$this->transCnt -= 1;
-		$this->Execute('COMMIT TRAN');
-		return true;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt -= 1;
-		$this->Execute('ROLLBACK TRAN');
-		return true;
-	}
-	
-	// http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
-	function RowLock($tables,$where,$flds='top 1 null as ignore') 
-	{
-		if (!$this->_hastrans) $this->BeginTrans();
-		$tables = str_replace(',',' HOLDLOCK,',$tables);
-		return $this->GetOne("select $flds from $tables HOLDLOCK where $where");
-		
-	}	
-		
-	function SelectDB($dbName) 
-	{
-		$this->database = $dbName;
-		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		if ($this->_connectionID) {
-			return @sybase_select_db($dbName);		
-		}
-		else return false;	
-	}
-
-	/*	Returns: the last error message from previous database operation
-		Note: This function is NOT available for Microsoft SQL Server.	*/	
-
-	
-	function ErrorMsg()
-	{
-		if ($this->_logsql) return $this->_errorMsg;
-		if (function_exists('sybase_get_last_message'))
-			$this->_errorMsg = sybase_get_last_message();
-		else
-			$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : 'SYBASE error messages not supported on this platform';
-		return $this->_errorMsg;
-	}
-
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sybase_connect')) return null;
-		
-		$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sybase_connect')) return null;
-		
-		$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
-	{
-	global $ADODB_COUNTRECS;
-	
-		if ($ADODB_COUNTRECS == false && ADODB_PHPVER >= 0x4300)
-			return sybase_unbuffered_query($sql,$this->_connectionID);
-		else
-			return sybase_query($sql,$this->_connectionID);
-	}
-	
-	// See http://www.isug.com/Sybase_FAQ/ASE/section6.2.html#6.2.12
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{
-		if ($secs2cache > 0) {// we do not cache rowcount, so we have to load entire recordset
-			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			return $rs;
-		}
-		
-		$nrows = (integer) $nrows;
-		$offset = (integer) $offset;
-		
-		$cnt = ($nrows >= 0) ? $nrows : 999999999;
-		if ($offset > 0 && $cnt) $cnt += $offset;
-		
-		$this->Execute("set rowcount $cnt"); 
-		$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,0);
-		$this->Execute("set rowcount 0");
-		
-		return $rs;
-	}
-
-	// returns true or false
-	function _close()
-	{ 
-		return @sybase_close($this->_connectionID);
-	}
-	
-	static function UnixDate($v)
-	{
-		return ADORecordSet_array_sybase::UnixDate($v);
-	}
-	
-	static function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_sybase::UnixTimeStamp($v);
-	}	
-	
-	
-
-	# Added 2003-10-05 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
-    // Format date column in sql string given an input format that understands Y M D
-    function SQLDate($fmt, $col=false)
-    {
-        if (!$col) $col = $this->sysTimeStamp;
-        $s = '';
-
-        $len = strlen($fmt);
-        for ($i=0; $i < $len; $i++) {
-            if ($s) $s .= '+';
-            $ch = $fmt[$i];
-            switch($ch) {
-            case 'Y':
-            case 'y':
-                $s .= "datename(yy,$col)";
-                break;
-            case 'M':
-                $s .= "convert(char(3),$col,0)";
-                break;
-            case 'm':
-                $s .= "str_replace(str(month($col),2),' ','0')";
-                break;
-            case 'Q':
-            case 'q':
-                $s .= "datename(qq,$col)";
-                break;
-            case 'D':
-            case 'd':
-                $s .= "str_replace(str(datepart(dd,$col),2),' ','0')";
-                break;
-            case 'h':
-                $s .= "substring(convert(char(14),$col,0),13,2)";
-                break;
-
-            case 'H':
-                $s .= "str_replace(str(datepart(hh,$col),2),' ','0')";
-                break;
-
-            case 'i':
-                $s .= "str_replace(str(datepart(mi,$col),2),' ','0')";
-                break;
-            case 's':
-                $s .= "str_replace(str(datepart(ss,$col),2),' ','0')";
-                break;
-            case 'a':
-            case 'A':
-                $s .= "substring(convert(char(19),$col,0),18,2)";
-                break;
-
-            default:
-                if ($ch == '\\') {
-                    $i++;
-                    $ch = substr($fmt,$i,1);
-                }
-                $s .= $this->qstr($ch);
-                break;
-            }
-        }
-        return $s;
-    }
-	
-	# Added 2003-10-07 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
-    function MetaPrimaryKeys($table)
-    {
-        $sql = "SELECT c.column_name " .
-               "FROM syscolumn c, systable t " .
-               "WHERE t.table_name='$table' AND c.table_id=t.table_id " .
-               "AND t.table_type='BASE' " .
-               "AND c.pkey = 'Y' " .
-               "ORDER BY c.column_id";
-
-        $a = $this->GetCol($sql);
-        if ($a && sizeof($a)>0) return $a;
-        return false;
-    }
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-global $ADODB_sybase_mths;
-$ADODB_sybase_mths = array(
-	'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
-	'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
-
-class ADORecordset_sybase extends ADORecordSet {	
-
-	var $databaseType = "sybase";
-	var $canSeek = true;
-	// _mths works only in non-localised system
-	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);	
-
-	function ADORecordset_sybase($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		if (!$mode) $this->fetchMode = ADODB_FETCH_ASSOC;
-		else $this->fetchMode = $mode;
-		$this->ADORecordSet($id,$mode);
-	}
-	
-	/*	Returns: an object containing field information. 
-		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-		fetchField() is retrieved.	*/
-	function FetchField($fieldOffset = -1) 
-	{
-		if ($fieldOffset != -1) {
-			$o = @sybase_fetch_field($this->_queryID, $fieldOffset);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			$o = @sybase_fetch_field($this->_queryID);
-		}
-		// older versions of PHP did not support type, only numeric
-		if ($o && !isset($o->type)) $o->type = ($o->numeric) ? 'float' : 'varchar';
-		return $o;
-	}
-	
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @sybase_num_rows($this->_queryID):-1;
-		$this->_numOfFields = @sybase_num_fields($this->_queryID);
-	}
-	
-	function _seek($row) 
-	{
-		return @sybase_data_seek($this->_queryID, $row);
-	}		
-
-	function _fetch($ignore_fields=false) 
-	{
-		if ($this->fetchMode == ADODB_FETCH_NUM) {
-			$this->fields = @sybase_fetch_row($this->_queryID);
-		} else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
-			$this->fields = @sybase_fetch_row($this->_queryID);
-			if (is_array($this->fields)) {
-				$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-				return true;
-			}
-			return false;
-		}  else {
-			$this->fields = @sybase_fetch_array($this->_queryID);
-		}
-		if ( is_array($this->fields)) {
-			return true;
-		}
-
-		return false;
-	}
-	
-	/*	close() only needs to be called if you are worried about using too much memory while your script
-		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-	function _close() {
-		return @sybase_free_result($this->_queryID);		
-	}
-	
-	// sybase/mssql uses a default date like Dec 30 2000 12:00AM
-	static function UnixDate($v)
-	{
-		return ADORecordSet_array_sybase::UnixDate($v);
-	}
-	
-	static function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_sybase::UnixTimeStamp($v);
-	}
-}
-
-class ADORecordSet_array_sybase extends ADORecordSet_array {
-	function ADORecordSet_array_sybase($id=-1)
-	{
-		$this->ADORecordSet_array($id);
-	}
-	
-		// sybase/mssql uses a default date like Dec 30 2000 12:00AM
-	static function UnixDate($v)
-	{
-	global $ADODB_sybase_mths;
-	
-		//Dec 30 2000 12:00AM
-		if (!ereg( "([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})"
-			,$v, $rr)) return parent::UnixDate($v);
-			
-		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-		$themth = substr(strtoupper($rr[1]),0,3);
-		$themth = $ADODB_sybase_mths[$themth];
-		if ($themth <= 0) return false;
-		// h-m-s-MM-DD-YY
-		return  mktime(0,0,0,$themth,$rr[2],$rr[3]);
-	}
-	
-	static function UnixTimeStamp($v)
-	{
-	global $ADODB_sybase_mths;
-		//11.02.2001 Toni Tunkkari toni.tunkkari@finebyte.com
-		//Changed [0-9] to [0-9 ] in day conversion
-		if (!ereg( "([A-Za-z]{3})[-/\. ]([0-9 ]{1,2})[-/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-		$themth = substr(strtoupper($rr[1]),0,3);
-		$themth = $ADODB_sybase_mths[$themth];
-		if ($themth <= 0) return false;
-		
-		switch (strtoupper($rr[6])) {
-		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
-			break;
-		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
-			break;
-		default:
-			break;
-		}
-		// h-m-s-MM-DD-YY
-		return  mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
-	}
-}
-?>
diff --git a/includes/adodb/drivers/adodb-sybase_ase.inc.php b/includes/adodb/drivers/adodb-sybase_ase.inc.php
deleted file mode 100644
index e3c5dfc1..00000000
--- a/includes/adodb/drivers/adodb-sybase_ase.inc.php
+++ /dev/null
@@ -1,119 +0,0 @@
-metaTablesSQL) {
-			// complicated state saving by the need for backward compat
-			
-			if ($ttype == 'VIEWS'){
-						$sql = str_replace('U', 'V', $this->metaTablesSQL);
-			}elseif (false === $ttype){
-						$sql = str_replace('U',"U' OR type='V", $this->metaTablesSQL);
-			}else{ // TABLES OR ANY OTHER 
-						$sql = $this->metaTablesSQL;
-			}
-			$rs = $this->Execute($sql);
-			
-			if ($rs === false || !method_exists($rs, 'GetArray')){
-					return $false;
-			}
-			$arr = $rs->GetArray();
-
-			$arr2 = array();
-			foreach($arr as $key=>$value){
-					$arr2[] = trim($value['name']);
-			}
-			return $arr2;
-		}
-		return $false;
-	}
-
-	function MetaDatabases()
-	{
-			$arr = array();
-			if ($this->metaDatabasesSQL!='') {
-				$rs = $this->Execute($this->metaDatabasesSQL);
-				if ($rs && !$rs->EOF){
-					while (!$rs->EOF){
-						$arr[] = $rs->Fields('name');
-						$rs->MoveNext();
-					}
-					return $arr;
-				}
-			}
-			return false;
-	}
-
-	// fix a bug which prevent the metaColumns query to be executed for Sybase ASE
-	function MetaColumns($table,$upper=false) 
-	{
-		$false = false;
-		if (!empty($this->metaColumnsSQL)) {
-		
-			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-			if ($rs === false) return $false;
-
-			$retarr = array();
-			while (!$rs->EOF) {
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->Fields('field_name');
-				$fld->type = $rs->Fields('type');
-				$fld->max_length = $rs->Fields('width');
-				$retarr[strtoupper($fld->name)] = $fld;
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			return $retarr;	
-		}
-		return $false;
-	}
-	
-	function getProcedureList($schema)
-	{
-			return false;
-	}
-
-	function ErrorMsg()
-	{
-		if (!function_exists('sybase_connect')){
-				return 'Your PHP doesn\'t contain the Sybase connection module!';
-		}
-		return parent::ErrorMsg();	
-	}
-}
-
-class adorecordset_sybase_ase extends ADORecordset_sybase {
-var $databaseType = "sybase_ase";
-function ADORecordset_sybase_ase($id,$mode=false)
-	{
-		$this->ADORecordSet_sybase($id,$mode);
-	}
-	
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/drivers/adodb-vfp.inc.php b/includes/adodb/drivers/adodb-vfp.inc.php
deleted file mode 100644
index 01ec7b82..00000000
--- a/includes/adodb/drivers/adodb-vfp.inc.php
+++ /dev/null
@@ -1,107 +0,0 @@
-ADODB_odbc();
-	}
-	
-	function Time()
-	{
-		return time();
-	}
-	
-	function BeginTrans() { return false;}
-	
-	// quote string to be sent back to database
-	function qstr($s,$nofixquotes=false)
-	{
-		if (!$nofixquotes) return  "'".str_replace("\r\n","'+chr(13)+'",str_replace("'",$this->replaceQuote,$s))."'";
-		return "'".$s."'";
-	}
-
-	
-	// TOP requires ORDER BY for VFP
-	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		$this->hasTop = preg_match('/ORDER[ \t\r\n]+BY/is',$sql) ? 'top' : false;
-		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		return $ret;
-	}
-	
-
-
-};
- 
-
-class  ADORecordSet_vfp extends ADORecordSet_odbc {	
-	
-	var $databaseType = "vfp";		
-
-	
-	function ADORecordSet_vfp($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}
-
-	function MetaType($t,$len=-1)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-		case 'C':
-			if ($len <= $this->blobSize) return 'C';
-		case 'M':
-			return 'X';
-			 
-		case 'D': return 'D';
-		
-		case 'T': return 'T';
-		
-		case 'L': return 'L';
-		
-		case 'I': return 'I';
-		
-		default: return 'N';
-		}
-	}
-}
-
-} //define
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-ar.inc.php b/includes/adodb/lang/adodb-ar.inc.php
deleted file mode 100644
index 4b750952..00000000
--- a/includes/adodb/lang/adodb-ar.inc.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'			    => 'ar',
-	    DB_ERROR			=> 'ÎØà ÛíÑ ãÍÏÏ',
-	    DB_ERROR_ALREADY_EXISTS	=> 'ãæÌæÏ ãÓÈÞÇ',
-	    DB_ERROR_CANNOT_CREATE	=> 'áÇ íãßä ÅäÔÇÁ',
-	    DB_ERROR_CANNOT_DELETE	=> 'áÇ íãßä ÍÐÝ',
-	    DB_ERROR_CANNOT_DROP	=> 'áÇ íãßä ÍÐÝ',
-	    DB_ERROR_CONSTRAINT 	=> 'ÚãáíÉ ÅÏÎÇá ããäæÚÉ',
-	    DB_ERROR_DIVZERO		=> 'ÚãáíÉ ÇáÊÞÓíã Úáì ÕÝÑ',
-	    DB_ERROR_INVALID		=> 'ÛíÑ ÕÍíÍ',
-	    DB_ERROR_INVALID_DATE	=> 'ÕíÛÉ æÞÊ Ãæ ÊÇÑíÎ ÛíÑ ÕÍíÍÉ',
-	    DB_ERROR_INVALID_NUMBER	=> 'ÕíÛÉ ÑÞã ÛíÑ ÕÍíÍÉ',
-	    DB_ERROR_MISMATCH		=> 'ÛíÑ ãÊØÇÈÞ',
-	    DB_ERROR_NODBSELECTED	=> 'áã íÊã ÅÎÊíÇÑ ÞÇÚÏÉ ÇáÈíÇäÇÊ ÈÚÏ',
-	    DB_ERROR_NOSUCHFIELD	=> 'áíÓ åäÇáß ÍÞá ÈåÐÇ ÇáÇÓã',
-	    DB_ERROR_NOSUCHTABLE	=> 'áíÓ åäÇáß ÌÏæá ÈåÐÇ ÇáÇÓã',
-	    DB_ERROR_NOT_CAPABLE	=> 'ÞÇÚÏÉ ÇáÈíÇäÇÊ ÇáãÑÊÈØ ÈåÇ ÛíÑ ÞÇÏÑÉ',
-	    DB_ERROR_NOT_FOUND		=> 'áã íÊã ÅíÌÇÏå',
-	    DB_ERROR_NOT_LOCKED 	=> 'ÛíÑ ãÞÝæá',
-	    DB_ERROR_SYNTAX		=> 'ÎØÃ Ýí ÇáÕíÛÉ',
-	    DB_ERROR_UNSUPPORTED	=> 'ÛíÑ ãÏÚæã',
-	    DB_ERROR_VALUE_COUNT_ON_ROW => 'ÚÏÏ ÇáÞíã Ýí ÇáÓÌá',
-	    DB_ERROR_INVALID_DSN	=> 'DSN ÛíÑ ÕÍíÍ',
-	    DB_ERROR_CONNECT_FAILED	=> 'ÝÔá ÚãáíÉ ÇáÅÊÕÇá',
-	    0			       => 'áíÓ åäÇáß ÃÎØÇÁ', // DB_OK
-	    DB_ERROR_NEED_MORE_DATA	=> 'ÇáÈíÇäÇÊ ÇáãÒæÏÉ ÛíÑ ßÇÝíÉ',
-	    DB_ERROR_EXTENSION_NOT_FOUND=> 'áã íÊã ÅíÌÇÏ ÇáÅÖÇÝÉ ÇáãÊÚáÞÉ',
-	    DB_ERROR_NOSUCHDB		=> 'áíÓ åäÇáß ÞÇÚÏÉ ÈíÇäÇÊ ÈåÐÇ ÇáÇÓã',
-	    DB_ERROR_ACCESS_VIOLATION	=> 'ÓãÇÍíÇÊ ÛíÑ ßÇÝíÉ'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-bg.inc.php b/includes/adodb/lang/adodb-bg.inc.php
deleted file mode 100644
index ee307c13..00000000
--- a/includes/adodb/lang/adodb-bg.inc.php
+++ /dev/null
@@ -1,37 +0,0 @@
-
-*/
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'bg',
-            DB_ERROR                    => 'íåèçâåñòíà ãðåøêà',
-            DB_ERROR_ALREADY_EXISTS     => 'âå÷å ñúùåñòâóâà',
-            DB_ERROR_CANNOT_CREATE      => 'íå ìîæå äà áúäå ñúçäàäåíà',
-            DB_ERROR_CANNOT_DELETE      => 'íå ìîæå äà áúäå èçòðèòà',
-            DB_ERROR_CANNOT_DROP        => 'íå ìîæå äà áúäå óíèùîæåíà',
-            DB_ERROR_CONSTRAINT         => 'íàðóøåíî óñëîâèå',
-            DB_ERROR_DIVZERO            => 'äåëåíèå íà íóëà',
-            DB_ERROR_INVALID            => 'íåïðàâèëíî',
-            DB_ERROR_INVALID_DATE       => 'íåêîðåêòíà äàòà èëè ÷àñ',
-            DB_ERROR_INVALID_NUMBER     => 'íåâàëèäåí íîìåð',
-            DB_ERROR_MISMATCH           => 'ïîãðåøíà óïîòðåáà',
-            DB_ERROR_NODBSELECTED       => 'íå å èçáðàíà áàçà äàííè',
-            DB_ERROR_NOSUCHFIELD        => 'íåñúùåñòâóâàùî ïîëå',
-            DB_ERROR_NOSUCHTABLE        => 'íåñúùåñòâóâàùà òàáëèöà',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'íå å íàìåðåíà',
-            DB_ERROR_NOT_LOCKED         => 'íå å çàêëþ÷åíà',
-            DB_ERROR_SYNTAX             => 'ãðåøåí ñèíòàêñèñ',
-            DB_ERROR_UNSUPPORTED        => 'íå ñå ïîääúðæà',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'íåêîðåêòåí áðîé êîëîíè â ðåäà',
-            DB_ERROR_INVALID_DSN        => 'íåâàëèäåí DSN',
-            DB_ERROR_CONNECT_FAILED     => 'âðúçêàòà íå ìîæå äà áúäå îñúùåñòâåíà',
-            0	                        => 'íÿìà ãðåøêè', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ïðåäîñòàâåíèòå äàííè ñà íåäîñòàòú÷íè',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'ðàçøèðåíèåòî íå å íàìåðåíî',
-            DB_ERROR_NOSUCHDB           => 'íåñúùåñòâóâàùà áàçà äàííè',
-            DB_ERROR_ACCESS_VIOLATION   => 'íÿìàòå äîñòàòú÷íî ïðàâà'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-bgutf8.inc.php b/includes/adodb/lang/adodb-bgutf8.inc.php
deleted file mode 100644
index 5281ed53..00000000
--- a/includes/adodb/lang/adodb-bgutf8.inc.php
+++ /dev/null
@@ -1,37 +0,0 @@
-
-*/
-
-$ADODB_LANG_ARRAY = array (
-            'LANG'                      => 'bgutf8',
-            DB_ERROR                    => 'неизвеÑтна грешка',
-            DB_ERROR_ALREADY_EXISTS     => 'вече ÑъщеÑтвува',
-            DB_ERROR_CANNOT_CREATE      => 'не може да бъде Ñъздадена',
-            DB_ERROR_CANNOT_DELETE      => 'не може да бъде изтрита',
-            DB_ERROR_CANNOT_DROP        => 'не може да бъде унищожена',
-            DB_ERROR_CONSTRAINT         => 'нарушено уÑловие',
-            DB_ERROR_DIVZERO            => 'деление на нула',
-            DB_ERROR_INVALID            => 'неправилно',
-            DB_ERROR_INVALID_DATE       => 'некоректна дата или чаÑ',
-            DB_ERROR_INVALID_NUMBER     => 'невалиден номер',
-            DB_ERROR_MISMATCH           => 'погрешна употреба',
-            DB_ERROR_NODBSELECTED       => 'не е избрана база данни',
-            DB_ERROR_NOSUCHFIELD        => 'неÑъщеÑтвуващо поле',
-            DB_ERROR_NOSUCHTABLE        => 'неÑъщеÑтвуваща таблица',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'не е намерена',
-            DB_ERROR_NOT_LOCKED         => 'не е заключена',
-            DB_ERROR_SYNTAX             => 'грешен ÑинтакÑиÑ',
-            DB_ERROR_UNSUPPORTED        => 'не Ñе поддържа',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'некоректен брой колони в реда',
-            DB_ERROR_INVALID_DSN        => 'невалиден DSN',
-            DB_ERROR_CONNECT_FAILED     => 'връзката не може да бъде оÑъщеÑтвена',
-            0	                        => 'нÑма грешки', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'предоÑтавените данни Ñа недоÑтатъчни',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'разширението не е намерено',
-            DB_ERROR_NOSUCHDB           => 'неÑъщеÑтвуваща база данни',
-            DB_ERROR_ACCESS_VIOLATION   => 'нÑмате доÑтатъчно права'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-ca.inc.php b/includes/adodb/lang/adodb-ca.inc.php
deleted file mode 100644
index 3640ebd0..00000000
--- a/includes/adodb/lang/adodb-ca.inc.php
+++ /dev/null
@@ -1,34 +0,0 @@
- 'ca',
-            DB_ERROR                    => 'error desconegut',
-            DB_ERROR_ALREADY_EXISTS     => 'ja existeix',
-            DB_ERROR_CANNOT_CREATE      => 'no es pot crear',
-            DB_ERROR_CANNOT_DELETE      => 'no es pot esborrar',
-            DB_ERROR_CANNOT_DROP        => 'no es pot eliminar',
-            DB_ERROR_CONSTRAINT         => 'violació de constraint',
-            DB_ERROR_DIVZERO            => 'divisió per zero',
-            DB_ERROR_INVALID            => 'no és vàlid',
-            DB_ERROR_INVALID_DATE       => 'la data o l\'hora no són vàlides',
-            DB_ERROR_INVALID_NUMBER     => 'el nombre no és vàlid',
-            DB_ERROR_MISMATCH           => 'no hi ha coincidència',
-            DB_ERROR_NODBSELECTED       => 'cap base de dades seleccionada',
-            DB_ERROR_NOSUCHFIELD        => 'camp inexistent',
-            DB_ERROR_NOSUCHTABLE        => 'taula inexistent',
-            DB_ERROR_NOT_CAPABLE        => 'l\'execució secundària de DB no pot',
-            DB_ERROR_NOT_FOUND          => 'no trobat',
-            DB_ERROR_NOT_LOCKED         => 'no blocat',
-            DB_ERROR_SYNTAX             => 'error de sintaxi',
-            DB_ERROR_UNSUPPORTED        => 'no suportat',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'el nombre de columnes no coincideix amb el nombre de valors en la fila',
-            DB_ERROR_INVALID_DSN        => 'el DSN no és vàlid',
-            DB_ERROR_CONNECT_FAILED     => 'connexió fallida',
-            0	                       => 'cap error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'les dades subministrades són insuficients',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensió no trobada',
-            DB_ERROR_NOSUCHDB           => 'base de dades inexistent',
-            DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficients'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-cn.inc.php b/includes/adodb/lang/adodb-cn.inc.php
deleted file mode 100644
index 44d5f490..00000000
--- a/includes/adodb/lang/adodb-cn.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
- 'cn',
-            DB_ERROR                    => 'δ֪´íÎó',
-            DB_ERROR_ALREADY_EXISTS     => 'ÒѾ­´æÔÚ',
-            DB_ERROR_CANNOT_CREATE      => '²»ÄÜ´´½¨',
-            DB_ERROR_CANNOT_DELETE      => '²»ÄÜɾ³ý',
-            DB_ERROR_CANNOT_DROP        => '²»ÄܶªÆú',
-            DB_ERROR_CONSTRAINT         => 'Ô¼ÊøÏÞÖÆ',
-            DB_ERROR_DIVZERO            => '±»0³ý',
-            DB_ERROR_INVALID            => 'ÎÞЧ',
-            DB_ERROR_INVALID_DATE       => 'ÎÞЧµÄÈÕÆÚ»òÕßʱ¼ä',
-            DB_ERROR_INVALID_NUMBER     => 'ÎÞЧµÄÊý×Ö',
-            DB_ERROR_MISMATCH           => '²»Æ¥Åä',
-            DB_ERROR_NODBSELECTED       => 'ûÓÐÊý¾Ý¿â±»Ñ¡Ôñ',
-            DB_ERROR_NOSUCHFIELD        => 'ûÓÐÏàÓ¦µÄ×Ö¶Î',
-            DB_ERROR_NOSUCHTABLE        => 'ûÓÐÏàÓ¦µÄ±í',
-            DB_ERROR_NOT_CAPABLE        => 'Êý¾Ý¿âºǫ́²»¼æÈÝ',
-            DB_ERROR_NOT_FOUND          => 'ûÓз¢ÏÖ',
-            DB_ERROR_NOT_LOCKED         => 'ûÓб»Ëø¶¨',
-            DB_ERROR_SYNTAX             => 'Óï·¨´íÎó',
-            DB_ERROR_UNSUPPORTED        => '²»Ö§³Ö',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'ÔÚÐÐÉÏÀÛ¼ÆÖµ',
-            DB_ERROR_INVALID_DSN        => 'ÎÞЧµÄÊý¾ÝÔ´ (DSN)',
-            DB_ERROR_CONNECT_FAILED     => 'Á¬½Óʧ°Ü',
-            0	                       => 'ûÓдíÎó', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ÌṩµÄÊý¾Ý²»ÄÜ·ûºÏÒªÇó',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'À©Õ¹Ã»Óб»·¢ÏÖ',
-            DB_ERROR_NOSUCHDB           => 'ûÓÐÏàÓ¦µÄÊý¾Ý¿â',
-            DB_ERROR_ACCESS_VIOLATION   => 'ûÓкÏÊʵÄȨÏÞ'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-cz.inc.php b/includes/adodb/lang/adodb-cz.inc.php
deleted file mode 100644
index 1f5c08a9..00000000
--- a/includes/adodb/lang/adodb-cz.inc.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-$ADODB_LANG_ARRAY = array (
-            'LANG'                      => 'cz',
-            DB_ERROR                    => 'neznámá chyba',
-            DB_ERROR_ALREADY_EXISTS     => 'ji? existuje',
-            DB_ERROR_CANNOT_CREATE      => 'nelze vytvo?it',
-            DB_ERROR_CANNOT_DELETE      => 'nelze smazat',
-            DB_ERROR_CANNOT_DROP        => 'nelze odstranit',
-            DB_ERROR_CONSTRAINT         => 'poru?ení omezující podmínky',
-            DB_ERROR_DIVZERO            => 'd?lení nulou',
-            DB_ERROR_INVALID            => 'neplatné',
-            DB_ERROR_INVALID_DATE       => 'neplatné datum nebo ?as',
-            DB_ERROR_INVALID_NUMBER     => 'neplatné ?íslo',
-            DB_ERROR_MISMATCH           => 'nesouhlasí',
-            DB_ERROR_NODBSELECTED       => '?ádná databáze není vybrána',
-            DB_ERROR_NOSUCHFIELD        => 'pole nenalezeno',
-            DB_ERROR_NOSUCHTABLE        => 'tabulka nenalezena',
-            DB_ERROR_NOT_CAPABLE        => 'nepodporováno',
-            DB_ERROR_NOT_FOUND          => 'nenalezeno',
-            DB_ERROR_NOT_LOCKED         => 'nezam?eno',
-            DB_ERROR_SYNTAX             => 'syntaktická chyba',
-            DB_ERROR_UNSUPPORTED        => 'nepodporováno',
-            DB_ERROR_VALUE_COUNT_ON_ROW => '',
-            DB_ERROR_INVALID_DSN        => 'neplatné DSN',
-            DB_ERROR_CONNECT_FAILED     => 'p?ipojení selhalo',
-            0	                        => 'bez chyb', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'málo zdrojových dat',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'roz?í?ení nenalezeno',
-            DB_ERROR_NOSUCHDB           => 'databáze neexistuje',
-            DB_ERROR_ACCESS_VIOLATION   => 'nedostate?ná práva'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-da.inc.php b/includes/adodb/lang/adodb-da.inc.php
deleted file mode 100644
index ca0e72d6..00000000
--- a/includes/adodb/lang/adodb-da.inc.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'da',
-            DB_ERROR                    => 'ukendt fejl',
-            DB_ERROR_ALREADY_EXISTS     => 'eksisterer allerede',
-            DB_ERROR_CANNOT_CREATE      => 'kan ikke oprette',
-            DB_ERROR_CANNOT_DELETE      => 'kan ikke slette',
-            DB_ERROR_CANNOT_DROP        => 'kan ikke droppe',
-            DB_ERROR_CONSTRAINT         => 'begrænsning krænket',
-            DB_ERROR_DIVZERO            => 'division med nul',
-            DB_ERROR_INVALID            => 'ugyldig',
-            DB_ERROR_INVALID_DATE       => 'ugyldig dato eller klokkeslet',
-            DB_ERROR_INVALID_NUMBER     => 'ugyldigt tal',
-            DB_ERROR_MISMATCH           => 'mismatch',
-            DB_ERROR_NODBSELECTED       => 'ingen database valgt',
-            DB_ERROR_NOSUCHFIELD        => 'felt findes ikke',
-            DB_ERROR_NOSUCHTABLE        => 'tabel findes ikke',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend opgav',
-            DB_ERROR_NOT_FOUND          => 'ikke fundet',
-            DB_ERROR_NOT_LOCKED         => 'ikke låst',
-            DB_ERROR_SYNTAX             => 'syntaksfejl',
-            DB_ERROR_UNSUPPORTED        => 'ikke understøttet',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'resulterende antal felter svarer ikke til forespørgslens antal felter',
-            DB_ERROR_INVALID_DSN        => 'ugyldig DSN',
-            DB_ERROR_CONNECT_FAILED     => 'tilslutning mislykkedes',
-            0	                        => 'ingen fejl', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'utilstrækkelige data angivet',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'udvidelse ikke fundet',
-            DB_ERROR_NOSUCHDB           => 'database ikke fundet',
-            DB_ERROR_ACCESS_VIOLATION   => 'utilstrækkelige rettigheder'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-de.inc.php b/includes/adodb/lang/adodb-de.inc.php
deleted file mode 100644
index 44c57e9f..00000000
--- a/includes/adodb/lang/adodb-de.inc.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'de',
-			DB_ERROR                    => 'Unbekannter Fehler',
-            DB_ERROR_ALREADY_EXISTS     => 'existiert bereits',
-            DB_ERROR_CANNOT_CREATE      => 'kann nicht erstellen',
-            DB_ERROR_CANNOT_DELETE      => 'kann nicht löschen',
-            DB_ERROR_CANNOT_DROP        => 'Tabelle oder Index konnte nicht gelöscht werden',
-            DB_ERROR_CONSTRAINT         => 'Constraint Verletzung',
-            DB_ERROR_DIVZERO            => 'Division durch Null',
-            DB_ERROR_INVALID            => 'ung¨ltig',
-            DB_ERROR_INVALID_DATE       => 'ung¨ltiges Datum oder Zeit',
-            DB_ERROR_INVALID_NUMBER     => 'ung¨ltige Zahl',
-            DB_ERROR_MISMATCH           => 'Unverträglichkeit',
-            DB_ERROR_NODBSELECTED       => 'keine Dantebank ausgewählt',
-            DB_ERROR_NOSUCHFIELD        => 'Feld nicht vorhanden',
-            DB_ERROR_NOSUCHTABLE        => 'Tabelle nicht vorhanden',
-            DB_ERROR_NOT_CAPABLE        => 'Funktion nicht installiert',
-            DB_ERROR_NOT_FOUND          => 'nicht gefunden',
-            DB_ERROR_NOT_LOCKED         => 'nicht gesperrt',
-            DB_ERROR_SYNTAX             => 'Syntaxfehler',
-            DB_ERROR_UNSUPPORTED        => 'nicht Unterst¨tzt',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'Anzahl der zur¨ckgelieferten Felder entspricht nicht der Anzahl der Felder in der Abfrage',
-            DB_ERROR_INVALID_DSN        => 'ung¨ltiger DSN',
-            DB_ERROR_CONNECT_FAILED     => 'Verbindung konnte nicht hergestellt werden',
-            0	                       => 'kein Fehler', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'Nicht gen¨gend Daten geliefert',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'erweiterung nicht gefunden',
-            DB_ERROR_NOSUCHDB           => 'keine Datenbank',
-            DB_ERROR_ACCESS_VIOLATION   => 'ungen¨gende Rechte'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-en.inc.php b/includes/adodb/lang/adodb-en.inc.php
deleted file mode 100644
index 6895995e..00000000
--- a/includes/adodb/lang/adodb-en.inc.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'en',
-            DB_ERROR                    => 'unknown error',
-            DB_ERROR_ALREADY_EXISTS     => 'already exists',
-            DB_ERROR_CANNOT_CREATE      => 'can not create',
-            DB_ERROR_CANNOT_DELETE      => 'can not delete',
-            DB_ERROR_CANNOT_DROP        => 'can not drop',
-            DB_ERROR_CONSTRAINT         => 'constraint violation',
-            DB_ERROR_DIVZERO            => 'division by zero',
-            DB_ERROR_INVALID            => 'invalid',
-            DB_ERROR_INVALID_DATE       => 'invalid date or time',
-            DB_ERROR_INVALID_NUMBER     => 'invalid number',
-            DB_ERROR_MISMATCH           => 'mismatch',
-            DB_ERROR_NODBSELECTED       => 'no database selected',
-            DB_ERROR_NOSUCHFIELD        => 'no such field',
-            DB_ERROR_NOSUCHTABLE        => 'no such table',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'not found',
-            DB_ERROR_NOT_LOCKED         => 'not locked',
-            DB_ERROR_SYNTAX             => 'syntax error',
-            DB_ERROR_UNSUPPORTED        => 'not supported',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
-            DB_ERROR_INVALID_DSN        => 'invalid DSN',
-            DB_ERROR_CONNECT_FAILED     => 'connect failed',
-            0	                       => 'no error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'insufficient data supplied',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
-            DB_ERROR_NOSUCHDB           => 'no such database',
-            DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-es.inc.php b/includes/adodb/lang/adodb-es.inc.php
deleted file mode 100644
index 1e0afbb4..00000000
--- a/includes/adodb/lang/adodb-es.inc.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'es',
-            DB_ERROR                    => 'error desconocido',
-            DB_ERROR_ALREADY_EXISTS     => 'ya existe',
-            DB_ERROR_CANNOT_CREATE      => 'imposible crear',
-            DB_ERROR_CANNOT_DELETE      => 'imposible borrar',
-            DB_ERROR_CANNOT_DROP        => 'imposible hacer drop',
-            DB_ERROR_CONSTRAINT         => 'violacion de constraint',
-            DB_ERROR_DIVZERO            => 'division por cero',
-            DB_ERROR_INVALID            => 'invalido',
-            DB_ERROR_INVALID_DATE       => 'fecha u hora invalida',
-            DB_ERROR_INVALID_NUMBER     => 'numero invalido',
-            DB_ERROR_MISMATCH           => 'error',
-            DB_ERROR_NODBSELECTED       => 'no hay base de datos seleccionada',
-            DB_ERROR_NOSUCHFIELD        => 'campo invalido',
-            DB_ERROR_NOSUCHTABLE        => 'tabla no existe',
-            DB_ERROR_NOT_CAPABLE        => 'capacidad invalida para esta DB',
-            DB_ERROR_NOT_FOUND          => 'no encontrado',
-            DB_ERROR_NOT_LOCKED         => 'no bloqueado',
-            DB_ERROR_SYNTAX             => 'error de sintaxis',
-            DB_ERROR_UNSUPPORTED        => 'no soportado',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'la cantidad de columnas no corresponden a la cantidad de valores',
-            DB_ERROR_INVALID_DSN        => 'DSN invalido',
-            DB_ERROR_CONNECT_FAILED     => 'fallo la conexion',
-            0	                       => 'sin error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'insuficientes datos',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension no encontrada',
-            DB_ERROR_NOSUCHDB           => 'base de datos no encontrada',
-            DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficientes'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-esperanto.inc.php b/includes/adodb/lang/adodb-esperanto.inc.php
deleted file mode 100644
index 16ca00e2..00000000
--- a/includes/adodb/lang/adodb-esperanto.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
- 'eo',
-            DB_ERROR                    => 'nekonata eraro',
-            DB_ERROR_ALREADY_EXISTS     => 'jam ekzistas',
-            DB_ERROR_CANNOT_CREATE      => 'maleblas krei',
-            DB_ERROR_CANNOT_DELETE      => 'maleblas elimini',
-            DB_ERROR_CANNOT_DROP        => 'maleblas elimini (drop)',
-            DB_ERROR_CONSTRAINT         => 'rompo de kondicxoj de provo',
-            DB_ERROR_DIVZERO            => 'divido per 0 (nul)',
-            DB_ERROR_INVALID            => 'malregule',
-            DB_ERROR_INVALID_DATE       => 'malregula dato kaj tempo',
-            DB_ERROR_INVALID_NUMBER     => 'malregula nombro',
-            DB_ERROR_MISMATCH           => 'eraro',
-            DB_ERROR_NODBSELECTED       => 'datumbazo ne elektita',
-            DB_ERROR_NOSUCHFIELD        => 'ne ekzistas kampo',
-            DB_ERROR_NOSUCHTABLE        => 'ne ekzistas tabelo',
-            DB_ERROR_NOT_CAPABLE        => 'DBMS ne povas',
-            DB_ERROR_NOT_FOUND          => 'ne trovita',
-            DB_ERROR_NOT_LOCKED         => 'ne blokita',
-            DB_ERROR_SYNTAX             => 'sintaksa eraro',
-            DB_ERROR_UNSUPPORTED        => 'ne apogata',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'nombrilo de valoroj en linio',
-            DB_ERROR_INVALID_DSN        => 'malregula DSN-o',
-            DB_ERROR_CONNECT_FAILED     => 'konekto malsukcesa',
-            0                               => 'cxio bone', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ne suficxe da datumo',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'etendo ne trovita',
-            DB_ERROR_NOSUCHDB           => 'datumbazo ne ekzistas',
-            DB_ERROR_ACCESS_VIOLATION   => 'ne suficxe da rajto por atingo'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-fa.inc.php b/includes/adodb/lang/adodb-fa.inc.php
deleted file mode 100644
index a58a21cc..00000000
--- a/includes/adodb/lang/adodb-fa.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
- */
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'fa',
-            DB_ERROR                    => 'خطای ناشناخته',
-            DB_ERROR_ALREADY_EXISTS     => 'وجود دارد',
-            DB_ERROR_CANNOT_CREATE      => 'امکان create وجود ندارد',
-            DB_ERROR_CANNOT_DELETE      => 'امکان حذ٠وجود ندارد',
-            DB_ERROR_CANNOT_DROP        => 'امکان drop وجود ندارد',
-            DB_ERROR_CONSTRAINT         => 'نقض شرط',
-            DB_ERROR_DIVZERO            => 'تقسیم بر صÙر',
-            DB_ERROR_INVALID            => 'نامعتبر',
-            DB_ERROR_INVALID_DATE       => 'زمان یا تاریخ نامعتبر',
-            DB_ERROR_INVALID_NUMBER     => 'عدد نامعتبر',
-            DB_ERROR_MISMATCH           => 'عدم مطابقت',
-            DB_ERROR_NODBSELECTED       => 'بانک اطلاعاتی انتخاب نشده است',
-            DB_ERROR_NOSUCHFIELD        => 'چنین ستونی وجود ندارد',
-            DB_ERROR_NOSUCHTABLE        => 'چنین جدولی وجود ندارد',
-            DB_ERROR_NOT_CAPABLE        => 'backend بانک اطلاعاتی قادر نیست',
-            DB_ERROR_NOT_FOUND          => 'پیدا نشد',
-            DB_ERROR_NOT_LOCKED         => 'Ù‚ÙÙ„ نشده',
-            DB_ERROR_SYNTAX             => 'خطای دستوری',
-            DB_ERROR_UNSUPPORTED        => 'پشتیبانی نمی شود',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'شمارش مقادیر روی ردیÙ',
-            DB_ERROR_INVALID_DSN        => 'DSN نامعتبر',
-            DB_ERROR_CONNECT_FAILED     => 'ارتباط برقرار نشد',
-            0	                       => 'بدون خطا', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'داده ناکاÙÛŒ است',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension پیدا نشد',
-            DB_ERROR_NOSUCHDB           => 'چنین بانک اطلاعاتی وجود ندارد',
-            DB_ERROR_ACCESS_VIOLATION   => 'حق دسترسی ناکاÙÛŒ'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-fr.inc.php b/includes/adodb/lang/adodb-fr.inc.php
deleted file mode 100644
index 11127cd6..00000000
--- a/includes/adodb/lang/adodb-fr.inc.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'fr',
-	DB_ERROR                    => 'erreur inconnue',
-	DB_ERROR_ALREADY_EXISTS     => 'existe déjà',
-	DB_ERROR_CANNOT_CREATE      => 'crétion impossible',
-	DB_ERROR_CANNOT_DELETE      => 'effacement impossible',
-	DB_ERROR_CANNOT_DROP        => 'suppression impossible',
-	DB_ERROR_CONSTRAINT         => 'violation de contrainte',
-	DB_ERROR_DIVZERO            => 'division par zéro',
-	DB_ERROR_INVALID            => 'invalide',
-	DB_ERROR_INVALID_DATE       => 'date ou heure invalide',
-	DB_ERROR_INVALID_NUMBER     => 'nombre invalide',
-	DB_ERROR_MISMATCH           => 'erreur de concordance',
-	DB_ERROR_NODBSELECTED       => 'pas de base de donnéessélectionnée',
-	DB_ERROR_NOSUCHFIELD        => 'nom de colonne invalide',
-	DB_ERROR_NOSUCHTABLE        => 'table ou vue inexistante',
-	DB_ERROR_NOT_CAPABLE        => 'fonction optionnelle non installée',
-	DB_ERROR_NOT_FOUND          => 'pas trouvé',
-	DB_ERROR_NOT_LOCKED         => 'non verrouillé',
-	DB_ERROR_SYNTAX             => 'erreur de syntaxe',
-	DB_ERROR_UNSUPPORTED        => 'non supporté',
-	DB_ERROR_VALUE_COUNT_ON_ROW => 'valeur insérée trop grande pour colonne',
-	DB_ERROR_INVALID_DSN        => 'DSN invalide',
-	DB_ERROR_CONNECT_FAILED     => 'échec à la connexion',
-	0                        => "pas d'erreur", // DB_OK
-	DB_ERROR_NEED_MORE_DATA     => 'données fournies insuffisantes',
-	DB_ERROR_EXTENSION_NOT_FOUND=> 'extension non trouvée',
-	DB_ERROR_NOSUCHDB           => 'base de données inconnue',
-	DB_ERROR_ACCESS_VIOLATION   => 'droits insuffisants'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-hu.inc.php b/includes/adodb/lang/adodb-hu.inc.php
deleted file mode 100644
index d6f0ef82..00000000
--- a/includes/adodb/lang/adodb-hu.inc.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'hu',
-            DB_ERROR                    => 'ismeretlen hiba',
-            DB_ERROR_ALREADY_EXISTS     => 'már létezik',
-            DB_ERROR_CANNOT_CREATE      => 'nem sikerült létrehozni',
-            DB_ERROR_CANNOT_DELETE      => 'nem sikerült törölni',
-            DB_ERROR_CANNOT_DROP        => 'nem sikerült eldobni',
-            DB_ERROR_CONSTRAINT         => 'szabályok megszegése',
-            DB_ERROR_DIVZERO            => 'osztás nullával',
-            DB_ERROR_INVALID            => 'érvénytelen',
-            DB_ERROR_INVALID_DATE       => 'érvénytelen dátum vagy idõ',
-            DB_ERROR_INVALID_NUMBER     => 'érvénytelen szám',
-            DB_ERROR_MISMATCH           => 'nem megfelelõ',
-            DB_ERROR_NODBSELECTED       => 'nincs kiválasztott adatbázis',
-            DB_ERROR_NOSUCHFIELD        => 'nincs ilyen mezõ',
-            DB_ERROR_NOSUCHTABLE        => 'nincs ilyen tábla',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend nem támogatja',
-            DB_ERROR_NOT_FOUND          => 'nem található',
-            DB_ERROR_NOT_LOCKED         => 'nincs lezárva',
-            DB_ERROR_SYNTAX             => 'szintaktikai hiba',
-            DB_ERROR_UNSUPPORTED        => 'nem támogatott',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'soron végzett érték számlálás',
-            DB_ERROR_INVALID_DSN        => 'hibás DSN',
-            DB_ERROR_CONNECT_FAILED     => 'sikertelen csatlakozás',
-            0	                       => 'nincs hiba', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'túl kevés az adat',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'bõvítmény nem található',
-            DB_ERROR_NOSUCHDB           => 'nincs ilyen adatbázis',
-            DB_ERROR_ACCESS_VIOLATION   => 'nincs jogosultság'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-it.inc.php b/includes/adodb/lang/adodb-it.inc.php
deleted file mode 100644
index ac5cc5a7..00000000
--- a/includes/adodb/lang/adodb-it.inc.php
+++ /dev/null
@@ -1,34 +0,0 @@
- 'it',
-            DB_ERROR                    => 'errore sconosciuto',
-            DB_ERROR_ALREADY_EXISTS     => 'esiste già',
-            DB_ERROR_CANNOT_CREATE      => 'non posso creare',
-            DB_ERROR_CANNOT_DELETE      => 'non posso cancellare',
-            DB_ERROR_CANNOT_DROP        => 'non posso eliminare',
-            DB_ERROR_CONSTRAINT         => 'violazione constraint',
-            DB_ERROR_DIVZERO            => 'divisione per zero',
-            DB_ERROR_INVALID            => 'non valido',
-            DB_ERROR_INVALID_DATE       => 'data od ora non valida',
-            DB_ERROR_INVALID_NUMBER     => 'numero non valido',
-            DB_ERROR_MISMATCH           => 'diversi',
-            DB_ERROR_NODBSELECTED       => 'nessun database selezionato',
-            DB_ERROR_NOSUCHFIELD        => 'nessun campo trovato',
-            DB_ERROR_NOSUCHTABLE        => 'nessuna tabella trovata',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend non abilitato',
-            DB_ERROR_NOT_FOUND          => 'non trovato',
-            DB_ERROR_NOT_LOCKED         => 'non bloccato',
-            DB_ERROR_SYNTAX             => 'errore di sintassi',
-            DB_ERROR_UNSUPPORTED        => 'non supportato',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'valore inserito troppo grande per una colonna',
-            DB_ERROR_INVALID_DSN        => 'DSN non valido',
-            DB_ERROR_CONNECT_FAILED     => 'connessione fallita',
-            0                           => 'nessun errore', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'dati inseriti insufficienti',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'estensione non trovata',
-            DB_ERROR_NOSUCHDB           => 'database non trovato',
-            DB_ERROR_ACCESS_VIOLATION   => 'permessi insufficienti'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-nl.inc.php b/includes/adodb/lang/adodb-nl.inc.php
deleted file mode 100644
index abe77b52..00000000
--- a/includes/adodb/lang/adodb-nl.inc.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'nl',
-            DB_ERROR                    => 'onbekende fout',
-            DB_ERROR_ALREADY_EXISTS     => 'bestaat al',
-            DB_ERROR_CANNOT_CREATE      => 'kan niet aanmaken',
-            DB_ERROR_CANNOT_DELETE      => 'kan niet wissen',
-            DB_ERROR_CANNOT_DROP        => 'kan niet verwijderen',
-            DB_ERROR_CONSTRAINT         => 'constraint overtreding',
-            DB_ERROR_DIVZERO            => 'poging tot delen door nul',
-            DB_ERROR_INVALID            => 'ongeldig',
-            DB_ERROR_INVALID_DATE       => 'ongeldige datum of tijd',
-            DB_ERROR_INVALID_NUMBER     => 'ongeldig nummer',
-            DB_ERROR_MISMATCH           => 'is incorrect',
-            DB_ERROR_NODBSELECTED       => 'geen database geselecteerd',
-            DB_ERROR_NOSUCHFIELD        => 'onbekend veld',
-            DB_ERROR_NOSUCHTABLE        => 'onbekende tabel',
-            DB_ERROR_NOT_CAPABLE        => 'database systeem is niet tot uitvoer in staat',
-            DB_ERROR_NOT_FOUND          => 'niet gevonden',
-            DB_ERROR_NOT_LOCKED         => 'niet vergrendeld',
-            DB_ERROR_SYNTAX             => 'syntaxis fout',
-            DB_ERROR_UNSUPPORTED        => 'niet ondersteund',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'waarde telling op rij',
-            DB_ERROR_INVALID_DSN        => 'ongeldige DSN',
-            DB_ERROR_CONNECT_FAILED     => 'connectie mislukt',
-            0	                       => 'geen fout', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'onvoldoende data gegeven',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensie niet gevonden',
-            DB_ERROR_NOSUCHDB           => 'onbekende database',
-            DB_ERROR_ACCESS_VIOLATION   => 'onvoldoende rechten'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-pl.inc.php b/includes/adodb/lang/adodb-pl.inc.php
deleted file mode 100644
index 9d9e3906..00000000
--- a/includes/adodb/lang/adodb-pl.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'pl',
-            DB_ERROR                    => 'niezidentyfikowany b³±d',
-            DB_ERROR_ALREADY_EXISTS     => 'ju¿ istniej±',
-            DB_ERROR_CANNOT_CREATE      => 'nie mo¿na stworzyæ',
-            DB_ERROR_CANNOT_DELETE      => 'nie mo¿na usun±æ',
-            DB_ERROR_CANNOT_DROP        => 'nie mo¿na porzuciæ',
-            DB_ERROR_CONSTRAINT         => 'pogwa³cenie uprawnieñ',
-            DB_ERROR_DIVZERO            => 'dzielenie przez zero',
-            DB_ERROR_INVALID            => 'b³êdny',
-            DB_ERROR_INVALID_DATE       => 'b³êdna godzina lub data',
-            DB_ERROR_INVALID_NUMBER     => 'b³êdny numer',
-            DB_ERROR_MISMATCH           => 'niedopasowanie',
-            DB_ERROR_NODBSELECTED       => 'baza danych nie zosta³a wybrana',
-            DB_ERROR_NOSUCHFIELD        => 'nie znaleziono pola',
-            DB_ERROR_NOSUCHTABLE        => 'nie znaleziono tabeli',
-            DB_ERROR_NOT_CAPABLE        => 'nie zdolny',
-            DB_ERROR_NOT_FOUND          => 'nie znaleziono',
-            DB_ERROR_NOT_LOCKED         => 'nie zakmniêty',
-            DB_ERROR_SYNTAX             => 'b³±d sk³adni',
-            DB_ERROR_UNSUPPORTED        => 'nie obs³uguje',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'warto¶æ liczona w szeregu',
-            DB_ERROR_INVALID_DSN        => 'b³êdny DSN',
-            DB_ERROR_CONNECT_FAILED     => 'po³±czenie nie zosta³o zrealizowane',
-            0	                       => 'brak b³êdów', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'niedostateczna ilo¶æ informacji',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'nie znaleziono rozszerzenia',
-            DB_ERROR_NOSUCHDB           => 'nie znaleziono bazy',
-            DB_ERROR_ACCESS_VIOLATION   => 'niedostateczne uprawnienia'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-pt-br.inc.php b/includes/adodb/lang/adodb-pt-br.inc.php
deleted file mode 100644
index cd28f7e5..00000000
--- a/includes/adodb/lang/adodb-pt-br.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
- 'pt-br',
-            DB_ERROR                    => 'erro desconhecido',
-            DB_ERROR_ALREADY_EXISTS     => 'já existe',
-            DB_ERROR_CANNOT_CREATE      => 'impossível criar',
-            DB_ERROR_CANNOT_DELETE      => 'impossível excluír',
-            DB_ERROR_CANNOT_DROP        => 'impossível remover',
-            DB_ERROR_CONSTRAINT         => 'violação do confinamente',
-            DB_ERROR_DIVZERO            => 'divisão por zero',
-            DB_ERROR_INVALID            => 'inválido',
-            DB_ERROR_INVALID_DATE       => 'data ou hora inválida',
-            DB_ERROR_INVALID_NUMBER     => 'número inválido',
-            DB_ERROR_MISMATCH           => 'erro',
-            DB_ERROR_NODBSELECTED       => 'nenhum banco de dados selecionado',
-            DB_ERROR_NOSUCHFIELD        => 'campo inválido',
-            DB_ERROR_NOSUCHTABLE        => 'tabela inexistente',
-            DB_ERROR_NOT_CAPABLE        => 'capacidade inválida para este BD',
-            DB_ERROR_NOT_FOUND          => 'não encontrado',
-            DB_ERROR_NOT_LOCKED         => 'não bloqueado',
-            DB_ERROR_SYNTAX             => 'erro de sintaxe',
-            DB_ERROR_UNSUPPORTED        => 
-'não suportado',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'a quantidade de colunas não corresponde ao de valores',
-            DB_ERROR_INVALID_DSN        => 'DSN inválido',
-            DB_ERROR_CONNECT_FAILED     => 'falha na conexão',
-            0				=> 'sem erro', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'dados insuficientes',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensão não encontrada',
-            DB_ERROR_NOSUCHDB           => 'banco de dados não encontrado',
-            DB_ERROR_ACCESS_VIOLATION   => 'permissão insuficiente'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-ro.inc.php b/includes/adodb/lang/adodb-ro.inc.php
deleted file mode 100644
index bcd7d132..00000000
--- a/includes/adodb/lang/adodb-ro.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
- */
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'ro',
-            DB_ERROR                    => 'eroare necunoscuta',
-            DB_ERROR_ALREADY_EXISTS     => 'deja exista',
-            DB_ERROR_CANNOT_CREATE      => 'nu se poate creea',
-            DB_ERROR_CANNOT_DELETE      => 'nu se poate sterge',
-            DB_ERROR_CANNOT_DROP        => 'nu se poate executa drop',
-            DB_ERROR_CONSTRAINT         => 'violare de constrain',
-            DB_ERROR_DIVZERO            => 'se divide la zero',
-            DB_ERROR_INVALID            => 'invalid',
-            DB_ERROR_INVALID_DATE       => 'data sau timp invalide',
-            DB_ERROR_INVALID_NUMBER     => 'numar invalid',
-            DB_ERROR_MISMATCH           => 'nepotrivire-mismatch',
-            DB_ERROR_NODBSELECTED       => 'nu exista baza de date selectata',
-            DB_ERROR_NOSUCHFIELD        => 'camp inexistent',
-            DB_ERROR_NOSUCHTABLE        => 'tabela inexistenta',
-            DB_ERROR_NOT_CAPABLE        => 'functie optionala neinstalata',
-            DB_ERROR_NOT_FOUND          => 'negasit',
-            DB_ERROR_NOT_LOCKED         => 'neblocat',
-            DB_ERROR_SYNTAX             => 'eroare de sintaxa',
-            DB_ERROR_UNSUPPORTED        => 'nu e suportat',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'valoare prea mare pentru coloana',
-            DB_ERROR_INVALID_DSN        => 'DSN invalid',
-            DB_ERROR_CONNECT_FAILED     => 'conectare esuata',
-            0	                       => 'fara eroare', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'data introduse insuficiente',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensie negasita',
-            DB_ERROR_NOSUCHDB           => 'nu exista baza de date',
-            DB_ERROR_ACCESS_VIOLATION   => 'permisiuni insuficiente'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-ru1251.inc.php b/includes/adodb/lang/adodb-ru1251.inc.php
deleted file mode 100644
index e273f427..00000000
--- a/includes/adodb/lang/adodb-ru1251.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
- 'ru1251',
-            DB_ERROR                    => 'íåèçâåñòíàÿ îøèáêà',
-            DB_ERROR_ALREADY_EXISTS     => 'óæå ñóùåñòâóåò',
-            DB_ERROR_CANNOT_CREATE      => 'íåâîçìîæíî ñîçäàòü',
-            DB_ERROR_CANNOT_DELETE      => 'íåâîçìîæíî óäàëèòü',
-            DB_ERROR_CANNOT_DROP        => 'íåâîçìîæíî óäàëèòü (drop)',
-            DB_ERROR_CONSTRAINT         => 'íàðóøåíèå óñëîâèé ïðîâåðêè',
-            DB_ERROR_DIVZERO            => 'äåëåíèå íà 0',
-            DB_ERROR_INVALID            => 'íåïðàâèëüíî',
-            DB_ERROR_INVALID_DATE       => 'íåêîððåêòíàÿ äàòà èëè âðåìÿ',
-            DB_ERROR_INVALID_NUMBER     => 'íåêîððåêòíîå ÷èñëî',
-            DB_ERROR_MISMATCH           => 'îøèáêà',
-            DB_ERROR_NODBSELECTED       => 'ÁÄ íå âûáðàíà',
-            DB_ERROR_NOSUCHFIELD        => 'íå ñóùåñòâóåò ïîëå',
-            DB_ERROR_NOSUCHTABLE        => 'íå ñóùåñòâóåò òàáëèöà',
-            DB_ERROR_NOT_CAPABLE        => 'ÑÓÁÄ íå â ñîñòîÿíèè',
-            DB_ERROR_NOT_FOUND          => 'íå íàéäåíî',
-            DB_ERROR_NOT_LOCKED         => 'íå çàáëîêèðîâàíî',
-            DB_ERROR_SYNTAX             => 'ñèíòàêñè÷åñêàÿ îøèáêà',
-            DB_ERROR_UNSUPPORTED        => 'íå ïîääåðæèâàåòñÿ',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'ñ÷åò÷èê çíà÷åíèé â ñòðîêå',
-            DB_ERROR_INVALID_DSN        => 'íåïðàâèëüíàÿ DSN',
-            DB_ERROR_CONNECT_FAILED     => 'ñîåäèíåíèå íåóñïåøíî',
-            0                               => 'íåò îøèáêè', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ïðåäîñòàâëåíî íåäîñòàòî÷íî äàííûõ',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'ðàñøèðåíèå íå íàéäåíî',
-            DB_ERROR_NOSUCHDB           => 'íå ñóùåñòâóåò ÁÄ',
-            DB_ERROR_ACCESS_VIOLATION   => 'íåäîñòàòî÷íî ïðàâ äîñòóïà'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-sv.inc.php b/includes/adodb/lang/adodb-sv.inc.php
deleted file mode 100644
index 64a5b4bb..00000000
--- a/includes/adodb/lang/adodb-sv.inc.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'en',
-            DB_ERROR                    => 'Okänt fel',
-            DB_ERROR_ALREADY_EXISTS     => 'finns redan',
-            DB_ERROR_CANNOT_CREATE      => 'kan inte skapa',
-            DB_ERROR_CANNOT_DELETE      => 'kan inte ta bort',
-            DB_ERROR_CANNOT_DROP        => 'kan inte släppa',
-            DB_ERROR_CONSTRAINT         => 'begränsning kränkt',
-            DB_ERROR_DIVZERO            => 'division med noll',
-            DB_ERROR_INVALID            => 'ogiltig',
-            DB_ERROR_INVALID_DATE       => 'ogiltigt datum eller tid',
-            DB_ERROR_INVALID_NUMBER     => 'ogiltigt tal',
-            DB_ERROR_MISMATCH           => 'felaktig matchning',
-            DB_ERROR_NODBSELECTED       => 'ingen databas vald',
-            DB_ERROR_NOSUCHFIELD        => 'inget sådant fält',
-            DB_ERROR_NOSUCHTABLE        => 'ingen sådan tabell',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend klarar det inte',
-            DB_ERROR_NOT_FOUND          => 'finns inte',
-            DB_ERROR_NOT_LOCKED         => 'inte låst',
-            DB_ERROR_SYNTAX             => 'syntaxfel',
-            DB_ERROR_UNSUPPORTED        => 'stöds ej',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'värde räknat på rad',
-            DB_ERROR_INVALID_DSN        => 'ogiltig DSN',
-            DB_ERROR_CONNECT_FAILED     => 'anslutning misslyckades',
-            0	                       => 'inget fel', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'otillräckligt med data angivet',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'utökning hittades ej',
-            DB_ERROR_NOSUCHDB           => 'ingen sådan databas',
-            DB_ERROR_ACCESS_VIOLATION   => 'otillräckliga rättigheter'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb-uk1251.inc.php b/includes/adodb/lang/adodb-uk1251.inc.php
deleted file mode 100644
index 675016d1..00000000
--- a/includes/adodb/lang/adodb-uk1251.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
- 'uk1251',
-            DB_ERROR                    => 'íåâ³äîìà ïîìèëêà',
-            DB_ERROR_ALREADY_EXISTS     => 'âæå ³ñíóº',
-            DB_ERROR_CANNOT_CREATE      => 'íåìîæëèâî ñòâîðèòè',
-            DB_ERROR_CANNOT_DELETE      => 'íåìîæëèâî âèäàëèòè',
-            DB_ERROR_CANNOT_DROP        => 'íåìîæëèâî çíèùèòè (drop)',
-            DB_ERROR_CONSTRAINT         => 'ïîðóøåííÿ óìîâ ïåðåâ³ðêè',
-            DB_ERROR_DIVZERO            => 'ä³ëåííÿ íà 0',
-            DB_ERROR_INVALID            => 'íåïðàâèëüíî',
-            DB_ERROR_INVALID_DATE       => 'íåïðàâèëüíà äàòà ÷è ÷àñ',
-            DB_ERROR_INVALID_NUMBER     => 'íåïðàâèëüíå ÷èñëî',
-            DB_ERROR_MISMATCH           => 'ïîìèëêà',
-            DB_ERROR_NODBSELECTED       => 'íå âèáðàíî ÁÄ',
-            DB_ERROR_NOSUCHFIELD        => 'íå ³ñíóº ïîëå',
-            DB_ERROR_NOSUCHTABLE        => 'íå ³ñíóº òàáëèöÿ',
-            DB_ERROR_NOT_CAPABLE        => 'ÑÓÁÄ íå â ñòàí³',
-            DB_ERROR_NOT_FOUND          => 'íå çíàéäåíî',
-            DB_ERROR_NOT_LOCKED         => 'íå çàáëîêîâàíî',
-            DB_ERROR_SYNTAX             => 'ñèíòàêñè÷íà ïîìèëêà',
-            DB_ERROR_UNSUPPORTED        => 'íå ï³äòðèìóºòüñÿ',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'ðàõ³âíèê çíà÷åíü â ñòð³÷ö³',
-            DB_ERROR_INVALID_DSN        => 'íåïðàâèëüíà DSN',
-            DB_ERROR_CONNECT_FAILED     => 'ç\'ºäíàííÿ íåóñï³øíå',
-            0                               => 'âñå ãàðàçä', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'íàäàíî íåäîñòàòíüî äàíèõ',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'ðîçøèðåííÿ íå çíàéäåíî',
-            DB_ERROR_NOSUCHDB           => 'íå ³ñíóº ÁÄ',
-            DB_ERROR_ACCESS_VIOLATION   => 'íåäîñòàòíüî ïðàâ äîñòóïà'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/lang/adodb_th.inc.php b/includes/adodb/lang/adodb_th.inc.php
deleted file mode 100644
index 3fdd9970..00000000
--- a/includes/adodb/lang/adodb_th.inc.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'th',
-            DB_ERROR                    => 'error ไม่รู้สาเหตุ',
-            DB_ERROR_ALREADY_EXISTS     => 'มี�ล้ว',
-            DB_ERROR_CANNOT_CREATE      => 'สร้างไม่ได้',
-            DB_ERROR_CANNOT_DELETE      => 'ลบไม่ได้',
-            DB_ERROR_CANNOT_DROP        => 'drop ไม่ได้',
-            DB_ERROR_CONSTRAINT         => 'constraint violation',
-            DB_ERROR_DIVZERO            => 'หา�ด้วยสู�',
-            DB_ERROR_INVALID            => 'ไม่ valid',
-            DB_ERROR_INVALID_DATE       => 'วันที่ เวลา ไม่ valid',
-            DB_ERROR_INVALID_NUMBER     => 'เลขไม่ valid',
-            DB_ERROR_MISMATCH           => 'mismatch',
-            DB_ERROR_NODBSELECTED       => 'ไม่ได้เลือ��านข้อมูล',
-            DB_ERROR_NOSUCHFIELD        => 'ไม่มีฟีลด์นี้',
-            DB_ERROR_NOSUCHTABLE        => 'ไม่มีตารางนี้',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'ไม่พบ',
-            DB_ERROR_NOT_LOCKED         => 'ไม่ได้ล๊อ�',
-            DB_ERROR_SYNTAX             => 'ผิด syntax',
-            DB_ERROR_UNSUPPORTED        => 'ไม่ support',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
-            DB_ERROR_INVALID_DSN        => 'invalid DSN',
-            DB_ERROR_CONNECT_FAILED     => 'ไม่สามารถ connect',
-            0	                        => 'no error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ข้อมูลไม่เพียงพอ',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'ไม่พบ extension',
-            DB_ERROR_NOSUCHDB           => 'ไม่มีข้อมูลนี้',
-            DB_ERROR_ACCESS_VIOLATION   => 'permissions ไม่พอ'
-);
-?>
\ No newline at end of file
diff --git a/includes/adodb/license.txt b/includes/adodb/license.txt
deleted file mode 100644
index 9821fcb7..00000000
--- a/includes/adodb/license.txt
+++ /dev/null
@@ -1,182 +0,0 @@
-ADOdb is dual licensed using BSD and LGPL. 
-
-In plain English, you do not need to distribute your application  in source code form, nor do you need to distribute ADOdb source code, provided you follow the rest of terms of the BSD license.
-
-For more info about ADOdb, visit http://adodb.sourceforge.net/
-
-BSD Style-License
-=================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004 John Lim
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list 
-of conditions and the following disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list 
-of conditions and the following disclaimer in the documentation and/or other materials 
-provided with the distribution. 
-
-Neither the name of the John Lim nor the names of its contributors may be used to 
-endorse or promote products derived from this software without specific prior written 
-permission. 
-
-DISCLAIMER:
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
-JOHN LIM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-==========================================================
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999 
- 
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
- 
- 
-Preamble
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. 
-
-This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. 
-
-When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. 
-
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. 
-
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. 
-
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. 
-
-To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. 
-
-Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. 
-
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. 
-
-When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. 
-
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. 
-
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. 
-
-In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. 
-
-Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. 
-
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. 
-
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
-
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. 
-
-The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) 
-
-"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. 
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 
-
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. 
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
-
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
-
-
-a) The modified work must itself be a software library. 
-b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. 
-c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. 
-d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. 
-(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) 
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. 
-
-In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
-
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. 
-
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. 
-
-This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 
-
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. 
-
-If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 
-
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
-
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
-
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. 
-
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) 
-
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 
-
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. 
-
-You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: 
-
-
-a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) 
-b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. 
-c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. 
-d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. 
-e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. 
-For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
-
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 
-
-7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: 
-
-
-a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. 
-b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
-
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 
-
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
-
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. 
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. 
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
-
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
-
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
-
-Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 
-
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
-
-NO WARRANTY 
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
-
-
-END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/includes/adodb/pear/Auth/Container/ADOdb.php b/includes/adodb/pear/Auth/Container/ADOdb.php
deleted file mode 100644
index 37d7d074..00000000
--- a/includes/adodb/pear/Auth/Container/ADOdb.php
+++ /dev/null
@@ -1,413 +0,0 @@
-
-// |	Richard Tango-Lowy                                   |
-// +----------------------------------------------------------------------+
-//
-// $Id: ADOdb.php,v 1.3 2005/05/18 06:58:47 jlim Exp $
-//
-
-require_once 'Auth/Container.php';
-require_once 'adodb.inc.php';
-require_once 'adodb-pear.inc.php';
-require_once 'adodb-errorpear.inc.php';
-
-/**
- * Storage driver for fetching login data from a database using ADOdb-PHP.
- *
- * This storage driver can use all databases which are supported
- * by the ADBdb DB abstraction layer to fetch login data.
- * See http://php.weblogs.com/adodb for information on ADOdb.
- * NOTE: The ADOdb directory MUST be in your PHP include_path!
- *
- * @author   Richard Tango-Lowy 
- * @package  Auth
- * @version  $Revision: 1.3 $
- */
-class Auth_Container_ADOdb extends Auth_Container
-{
-
-    /**
-     * Additional options for the storage container
-     * @var array
-     */
-    var $options = array();
-
-    /**
-     * DB object
-     * @var object
-     */
-    var $db = null;
-    var $dsn = '';
-	
-    /**
-     * User that is currently selected from the DB.
-     * @var string
-     */
-    var $activeUser = '';
-
-    // {{{ Constructor
-
-    /**
-     * Constructor of the container class
-     *
-     * Initate connection to the database via PEAR::ADOdb
-     *
-     * @param  string Connection data or DB object
-     * @return object Returns an error object if something went wrong
-     */
-    function Auth_Container_ADOdb($dsn)
-    {
-        $this->_setDefaults();
-		
-        if (is_array($dsn)) {
-            $this->_parseOptions($dsn);
-
-            if (empty($this->options['dsn'])) {
-                PEAR::raiseError('No connection parameters specified!');
-            }
-        } else {
-        	// Extract db_type from dsn string.
-            $this->options['dsn'] = $dsn;
-        }
-    }
-
-    // }}}
-    // {{{ _connect()
-
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @access private
-     * @param  string DSN string
-     * @return mixed  Object on error, otherwise bool
-     */
-     function _connect($dsn)
-    {
-        if (is_string($dsn) || is_array($dsn)) {
-        	if(!$this->db) {
-	        	$this->db = ADONewConnection($dsn);
-	    		if( $err = ADODB_Pear_error() ) {
-	   	    		return PEAR::raiseError($err);
-	    		}
-        	}
-        	
-        } else {
-            return PEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__,
-                                    41,
-                                    PEAR_ERROR_RETURN,
-                                    null,
-                                    null
-                                    );
-        }
-        
-        if(!$this->db) {
-        	return PEAR::raiseError(ADODB_Pear_error());
-        } else {
-        	return true;
-        }
-    }
-
-    // }}}
-    // {{{ _prepare()
-
-    /**
-     * Prepare database connection
-     *
-     * This function checks if we have already opened a connection to
-     * the database. If that's not the case, a new connection is opened.
-     *
-     * @access private
-     * @return mixed True or a DB error object.
-     */
-    function _prepare()
-    {
-    	if(!$this->db) {
-    		$res = $this->_connect($this->options['dsn']);  		
-    	}
-        return true;
-    }
-
-    // }}}
-    // {{{ query()
-
-    /**
-     * Prepare query to the database
-     *
-     * This function checks if we have already opened a connection to
-     * the database. If that's not the case, a new connection is opened.
-     * After that the query is passed to the database.
-     *
-     * @access public
-     * @param  string Query string
-     * @return mixed  a DB_result object or DB_OK on success, a DB
-     *                or PEAR error on failure
-     */
-    function query($query)
-    {
-        $err = $this->_prepare();
-        if ($err !== true) {
-            return $err;
-        }
-        return $this->db->query($query);
-    }
-
-    // }}}
-    // {{{ _setDefaults()
-
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    function _setDefaults()
-    {
-    	$this->options['db_type']	= 'mysql';
-        $this->options['table']       = 'auth';
-        $this->options['usernamecol'] = 'username';
-        $this->options['passwordcol'] = 'password';
-        $this->options['dsn']         = '';
-        $this->options['db_fields']   = '';
-        $this->options['cryptType']   = 'md5';
-    }
-
-    // }}}
-    // {{{ _parseOptions()
-
-    /**
-     * Parse options passed to the container class
-     *
-     * @access private
-     * @param  array
-     */
-    function _parseOptions($array)
-    {
-        foreach ($array as $key => $value) {
-            if (isset($this->options[$key])) {
-                $this->options[$key] = $value;
-            }
-        }
-
-        /* Include additional fields if they exist */
-        if(!empty($this->options['db_fields'])){
-            if(is_array($this->options['db_fields'])){
-                $this->options['db_fields'] = join($this->options['db_fields'], ', ');
-            }
-            $this->options['db_fields'] = ', '.$this->options['db_fields'];
-        }
-    }
-
-    // }}}
-    // {{{ fetchData()
-
-    /**
-     * Get user information from database
-     *
-     * This function uses the given username to fetch
-     * the corresponding login data from the database
-     * table. If an account that matches the passed username
-     * and password is found, the function returns true.
-     * Otherwise it returns false.
-     *
-     * @param   string Username
-     * @param   string Password
-     * @return  mixed  Error object or boolean
-     */
-    function fetchData($username, $password)
-    {
-        // Prepare for a database query
-        $err = $this->_prepare();
-        if ($err !== true) {
-            return PEAR::raiseError($err->getMessage(), $err->getCode());
-        }
-
-        // Find if db_fields contains a *, i so assume all col are selected
-        if(strstr($this->options['db_fields'], '*')){
-            $sql_from = "*";
-        }
-        else{
-            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
-        }
-        
-        $query = "SELECT ".$sql_from.
-                " FROM ".$this->options['table'].
-                " WHERE ".$this->options['usernamecol']." = " . $this->db->Quote($username);
-        
-        $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-        $rset = $this->db->Execute( $query );
-        $res = $rset->fetchRow();
-
-        if (DB::isError($res)) {
-            return PEAR::raiseError($res->getMessage(), $res->getCode());
-        }
-        if (!is_array($res)) {
-            $this->activeUser = '';
-            return false;
-        }
-        if ($this->verifyPassword(trim($password, "\r\n"),
-                                  trim($res[$this->options['passwordcol']], "\r\n"),
-                                  $this->options['cryptType'])) {
-            // Store additional field values in the session
-            foreach ($res as $key => $value) {
-                if ($key == $this->options['passwordcol'] ||
-                    $key == $this->options['usernamecol']) {
-                    continue;
-                }
-                // Use reference to the auth object if exists
-                // This is because the auth session variable can change so a static call to setAuthData does not make sence
-                if(is_object($this->_auth_obj)){
-                    $this->_auth_obj->setAuthData($key, $value);
-                } else {
-                    Auth::setAuthData($key, $value);
-                }
-            }
-
-            return true;
-        }
-
-        $this->activeUser = $res[$this->options['usernamecol']];
-        return false;
-    }
-
-    // }}}
-    // {{{ listUsers()
-
-    function listUsers()
-    {
-        $err = $this->_prepare();
-        if ($err !== true) {
-            return PEAR::raiseError($err->getMessage(), $err->getCode());
-        }
-
-        $retVal = array();
-
-        // Find if db_fileds contains a *, i so assume all col are selected
-        if(strstr($this->options['db_fields'], '*')){
-            $sql_from = "*";
-        }
-        else{
-            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
-        }
-
-        $query = sprintf("SELECT %s FROM %s",
-                         $sql_from,
-                         $this->options['table']
-                         );
-        $res = $this->db->getAll($query, null, DB_FETCHMODE_ASSOC);
-
-        if (DB::isError($res)) {
-            return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
-            foreach ($res as $user) {
-                $user['username'] = $user[$this->options['usernamecol']];
-                $retVal[] = $user;
-            }
-        }
-        return $retVal;
-    }
-
-    // }}}
-    // {{{ addUser()
-
-    /**
-     * Add user to the storage container
-     *
-     * @access public
-     * @param  string Username
-     * @param  string Password
-     * @param  mixed  Additional information that are stored in the DB
-     *
-     * @return mixed True on success, otherwise error object
-     */
-    function addUser($username, $password, $additional = "")
-    {
-        if (function_exists($this->options['cryptType'])) {
-            $cryptFunction = $this->options['cryptType'];
-        } else {
-            $cryptFunction = 'md5';
-        }
-
-        $additional_key   = '';
-        $additional_value = '';
-
-        if (is_array($additional)) {
-            foreach ($additional as $key => $value) {
-                $additional_key .= ', ' . $key;
-                $additional_value .= ", '" . $value . "'";
-            }
-        }
-
-        $query = sprintf("INSERT INTO %s (%s, %s%s) VALUES ('%s', '%s'%s)",
-                         $this->options['table'],
-                         $this->options['usernamecol'],
-                         $this->options['passwordcol'],
-                         $additional_key,
-                         $username,
-                         $cryptFunction($password),
-                         $additional_value
-                         );
-
-        $res = $this->query($query);
-
-        if (DB::isError($res)) {
-           return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
-          return true;
-        }
-    }
-
-    // }}}
-    // {{{ removeUser()
-
-    /**
-     * Remove user from the storage container
-     *
-     * @access public
-     * @param  string Username
-     *
-     * @return mixed True on success, otherwise error object
-     */
-    function removeUser($username)
-    {
-        $query = sprintf("DELETE FROM %s WHERE %s = '%s'",
-                         $this->options['table'],
-                         $this->options['usernamecol'],
-                         $username
-                         );
-
-        $res = $this->query($query);
-
-        if (DB::isError($res)) {
-           return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
-          return true;
-        }
-    }
-
-    // }}}
-}
-
-function showDbg( $string ) {
-	print "
--- $string
";
-}
-function dump( $var, $str, $vardump = false ) {
-	print "
$str
";
-	( !$vardump ) ? ( print_r( $var )) : ( var_dump( $var ));
-	print "
";
-}
-?>
diff --git a/includes/adodb/pear/readme.Auth.txt b/includes/adodb/pear/readme.Auth.txt
deleted file mode 100644
index b6b0c157..00000000
--- a/includes/adodb/pear/readme.Auth.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Rich Tango-Lowy (richtl#arscognita.com)
-Date: Sat, May 29, 2004 11:20 am
-
-OK, I hacked out an ADOdb container for PEAR-Auth. The error handling's 
-a bit of a mess, but all the methods work.
-
-Copy ADOdb.php to your pear/Auth/Container/ directory.
-
-Use the ADOdb container exactly as you would the DB
-container, but specify 'ADOdb' instead of 'DB':
-
-$dsn = "mysql://myuser:mypass@localhost/authdb";
-$a = new Auth("ADOdb", $dsn, "loginFunction");
-
-
--------------------
-
-John Lim adds:
-
-See http://pear.php.net/manual/en/package.authentication.php
diff --git a/includes/adodb/pivottable.inc.php b/includes/adodb/pivottable.inc.php
deleted file mode 100644
index 622c5266..00000000
--- a/includes/adodb/pivottable.inc.php
+++ /dev/null
@@ -1,187 +0,0 @@
-databaseType,'access') !== false; 
-		// note - vfp 6 still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
-	
-	//$hidecnt = false;
-	
- 	if ($where) $where = "\nWHERE $where";
-	if (!is_array($colfield)) $colarr = $db->GetCol("select distinct $colfield from $tables $where order by 1");
-	if (!$aggfield) $hidecnt = false;
-	
-	$sel = "$rowfields, ";
-	if (is_array($colfield)) {
-		foreach ($colfield as $k => $v) {
-			$k = trim($k);
-			if (!$hidecnt) {
-				$sel .= $iif ? 
-					"\n\t$aggfn(IIF($v,1,0)) AS \"$k\", "
-					:
-					"\n\t$aggfn(CASE WHEN $v THEN 1 ELSE 0 END) AS \"$k\", ";
-			}
-			if ($aggfield) {
-				$sel .= $iif ?
-					"\n\t$aggfn(IIF($v,$aggfield,0)) AS \"$sumlabel$k\", "
-					:
-					"\n\t$aggfn(CASE WHEN $v THEN $aggfield ELSE 0 END) AS \"$sumlabel$k\", ";
-			}
-		} 
-	} else {
-		foreach ($colarr as $v) {
-			if (!is_numeric($v)) $vq = $db->qstr($v);
-			else $vq = $v;
-			$v = trim($v);
-			if (strlen($v) == 0	) $v = 'null';
-			if (!$hidecnt) {
-				$sel .= $iif ?
-					"\n\t$aggfn(IIF($colfield=$vq,1,0)) AS \"$v\", "
-					:
-					"\n\t$aggfn(CASE WHEN $colfield=$vq THEN 1 ELSE 0 END) AS \"$v\", ";
-			}
-			if ($aggfield) {
-				if ($hidecnt) $label = $v;
-				else $label = "{$v}_$aggfield";
-				$sel .= $iif ?
-					"\n\t$aggfn(IIF($colfield=$vq,$aggfield,0)) AS \"$label\", "
-					:
-					"\n\t$aggfn(CASE WHEN $colfield=$vq THEN $aggfield ELSE 0 END) AS \"$label\", ";
-			}
-		}
-	}
-	if ($aggfield && $aggfield != '1'){
-		$agg = "$aggfn($aggfield)";
-		$sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";		
-	}
-	
-	if ($showcount)
-		$sel .= "\n\tSUM(1) as Total";
-	else
-		$sel = substr($sel,0,strlen($sel)-2);
-	
-	
-	// Strip aliases
-	$rowfields = preg_replace('/ AS (\w+)/i', '', $rowfields);
-	
-	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
-	
-	return $sql;
- }
-
-/* EXAMPLES USING MS NORTHWIND DATABASE */
-if (0) {
-
-# example1
-#
-# Query the main "product" table
-# Set the rows to CompanyName and QuantityPerUnit
-# and the columns to the Categories
-# and define the joins to link to lookup tables 
-# "categories" and "suppliers"
-#
-
- $sql = PivotTableSQL(
- 	$gDB,  											# adodb connection
- 	'products p ,categories c ,suppliers s',  		# tables
-	'CompanyName,QuantityPerUnit',					# row fields
-	'CategoryName',									# column fields 
-	'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where
-);
- print "
$sql";
- $rs = $gDB->Execute($sql);
- rs2html($rs);
- 
-/*
-Generated SQL:
-
-SELECT CompanyName,QuantityPerUnit, 
-	SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
-	SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
-	SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections", 
-	SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy Products", 
-	SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals", 
-	SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry", 
-	SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
-	SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
-	SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
-GROUP BY CompanyName,QuantityPerUnit
-*/
-//=====================================================================
-
-# example2
-#
-# Query the main "product" table
-# Set the rows to CompanyName and QuantityPerUnit
-# and the columns to the UnitsInStock for diiferent ranges
-# and define the joins to link to lookup tables 
-# "categories" and "suppliers"
-#
- $sql = PivotTableSQL(
- 	$gDB,										# adodb connection
- 	'products p ,categories c ,suppliers s',	# tables
-	'CompanyName,QuantityPerUnit',				# row fields
-												# column ranges
-array(										
-' 0 ' => 'UnitsInStock <= 0',
-"1 to 5" => '0 < UnitsInStock and UnitsInStock <= 5',
-"6 to 10" => '5 < UnitsInStock and UnitsInStock <= 10',
-"11 to 15"  => '10 < UnitsInStock and UnitsInStock <= 15',
-"16+" =>'15 < UnitsInStock'
-),
-	' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # joins/where
-	'UnitsInStock', 							# sum this field
-	'Sum'										# sum label prefix
-);
- print "
$sql";
- $rs = $gDB->Execute($sql);
- rs2html($rs);
- /*
- Generated SQL:
- 
-SELECT CompanyName,QuantityPerUnit, 
-	SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum  0 ", 
-	SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock ELSE 0 END) AS "Sum 1 to 5", 
-	SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock ELSE 0 END) AS "Sum 6 to 10", 
-	SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock ELSE 0 END) AS "Sum 11 to 15", 
-	SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 16+",
-	SUM(UnitsInStock) AS "Sum UnitsInStock", 
-	SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE  p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
-GROUP BY CompanyName,QuantityPerUnit
- */
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/readme.txt b/includes/adodb/readme.txt
deleted file mode 100644
index 009b94c5..00000000
--- a/includes/adodb/readme.txt
+++ /dev/null
@@ -1,62 +0,0 @@
->> ADODB Library for PHP4
-
-(c) 2000-2004 John Lim (jlim@natsoft.com.my)
-
-Released under both BSD and GNU Lesser GPL library license. 
-This means you can use it in proprietary products.
- 
- 
->> Introduction
-
-PHP's database access functions are not standardised. This creates a 
-need for a database class library to hide the differences between the 
-different databases (encapsulate the differences) so we can easily 
-switch databases.
-
-We currently support MySQL, Interbase, Sybase, PostgreSQL, Oracle, 
-Microsoft SQL server,  Foxpro ODBC, Access ODBC, Informix, DB2,
-Sybase SQL Anywhere, generic ODBC and Microsoft's ADO. 
-
-We hope more people will contribute drivers to support other databases.
-
-
->> Documentation and Examples
-
-Refer to the adodb/docs directory for full documentation and examples. 
-There is also a  tutorial tute.htm that contrasts ADODB code with 
-mysql code.
-
-
->>> Files
-Adodb.inc.php is the main file. You need to include only this file.
-
-Adodb-*.inc.php are the database specific driver code.
-
-Test.php contains a list of test commands to exercise the class library.
-
-Adodb-session.php is the PHP4 session handling code.
-
-Testdatabases.inc.php contains the list of databases to apply the tests on.
-
-Benchmark.php is a simple benchmark to test the throughput of a simple SELECT 
-statement for databases described in testdatabases.inc.php. The benchmark
-tables are created in test.php.
-
-readme.htm is the main documentation.
-
-tute.htm is the tutorial.
-
-
->> More Info
-
-For more information, including installation see readme.htm
-or visit
-           http://adodb.sourceforge.net/
-
-
->> Feature Requests and Bug Reports
-
-Email to jlim@natsoft.com.my 
-
-
- 
\ No newline at end of file
diff --git a/includes/adodb/rsfilter.inc.php b/includes/adodb/rsfilter.inc.php
deleted file mode 100644
index c5a54ce8..00000000
--- a/includes/adodb/rsfilter.inc.php
+++ /dev/null
@@ -1,61 +0,0 @@
- $v) {
-			$arr[$k] = ucwords($v);
-		}
-	}
-	$rs = RSFilter($rs,'do_ucwords');
- */
-function RSFilter($rs,$fn)
-{
-	if ($rs->databaseType != 'array') {
-		if (!$rs->connection) return false;
-		
-		$rs = $rs->connection->_rs2rs($rs);
-	}
-	$rows = $rs->RecordCount();
-	for ($i=0; $i < $rows; $i++) {
-		if (is_array ($fn)) {
-        	$obj = $fn[0];
-        	$method = $fn[1];
-        	$obj->$method ($rs->_array[$i],$rs);
-      } else {
-			$fn($rs->_array[$i],$rs);
-      }
-	  
-	}
-	if (!$rs->EOF) {
-		$rs->_currentRow = 0;
-		$rs->fields = $rs->_array[0];
-	}
-	
-	return $rs;
-}
-?>
\ No newline at end of file
diff --git a/includes/adodb/server.php b/includes/adodb/server.php
deleted file mode 100644
index f79a289f..00000000
--- a/includes/adodb/server.php
+++ /dev/null
@@ -1,100 +0,0 @@
-Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
-$sql = undomq($_REQUEST['sql']);
-
-if (isset($_REQUEST['fetch']))
-	$ADODB_FETCH_MODE = $_REQUEST['fetch'];
-	
-if (isset($_REQUEST['nrows'])) {
-	$nrows = $_REQUEST['nrows'];
-	$offset = isset($_REQUEST['offset']) ? $_REQUEST['offset'] : -1;
-	$rs = $conn->SelectLimit($sql,$nrows,$offset);
-} else 
-	$rs = $conn->Execute($sql);
-if ($rs){ 
-	//$rs->timeToLive = 1;
-	echo _rs2serialize($rs,$conn,$sql);
-	$rs->Close();
-} else
-	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
-
-?>
\ No newline at end of file
diff --git a/includes/adodb/toexport.inc.php b/includes/adodb/toexport.inc.php
deleted file mode 100644
index 4df0c5a6..00000000
--- a/includes/adodb/toexport.inc.php
+++ /dev/null
@@ -1,134 +0,0 @@
-FieldTypesArray();
-		reset($fieldTypes);
-		$i = 0;
-		while(list(,$o) = each($fieldTypes)) {
-		
-			$v = ($o) ? $o->name : 'Field'.($i++);
-			if ($escquote) $v = str_replace($quote,$escquotequote,$v);
-			$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
-			$elements[] = $v;
-			
-		}
-		$s .= implode($sep, $elements).$NEWLINE;
-	}
-	$hasNumIndex = isset($rs->fields[0]);
-	
-	$line = 0;
-	$max = $rs->FieldCount();
-	
-	while (!$rs->EOF) {
-		$elements = array();
-		$i = 0;
-		
-		if ($hasNumIndex) {
-			for ($j=0; $j < $max; $j++) {
-				$v = $rs->fields[$j];
-				if (!is_object($v)) $v = trim($v);
-				else $v = 'Object';
-				if ($escquote) $v = str_replace($quote,$escquotequote,$v);
-				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
-				
-				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
-				else $elements[] = $v;
-			}
-		} else { // ASSOCIATIVE ARRAY
-			foreach($rs->fields as $v) {
-				if ($escquote) $v = str_replace($quote,$escquotequote,trim($v));
-				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
-				
-				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
-				else $elements[] = $v;
-			}
-		}
-		$s .= implode($sep, $elements).$NEWLINE;
-		$rs->MoveNext();
-		$line += 1;
-		if ($fp && ($line % $BUFLINES) == 0) {
-			if ($fp === true) echo $s;
-			else fwrite($fp,$s);
-			$s = '';
-		}
-	}
-	
-	if ($fp) {
-		if ($fp === true) echo $s;
-		else fwrite($fp,$s);
-		$s = '';
-	}
-	
-	return $s;
-}
-?>
\ No newline at end of file
diff --git a/includes/smarty/Config_File.class.php b/includes/smarty/Config_File.class.php
deleted file mode 100644
index 5787ad15..00000000
--- a/includes/smarty/Config_File.class.php
+++ /dev/null
@@ -1,393 +0,0 @@
-
- * @access public
- * @package Smarty
- */
-
-/* $Id: Config_File.class.php 3149 2009-05-23 20:59:25Z monte.ohrt $ */
-
-/**
- * Config file reading class
- * @package Smarty
- */
-class Config_File {
-    /**#@+
-     * Options
-     * @var boolean
-     */
-    /**
-     * Controls whether variables with the same name overwrite each other.
-     */
-    var $overwrite        =    true;
-
-    /**
-     * Controls whether config values of on/true/yes and off/false/no get
-     * converted to boolean values automatically.
-     */
-    var $booleanize        =    true;
-
-    /**
-     * Controls whether hidden config sections/vars are read from the file.
-     */
-    var $read_hidden     =    true;
-
-    /**
-     * Controls whether or not to fix mac or dos formatted newlines.
-     * If set to true, \r or \r\n will be changed to \n.
-     */
-    var $fix_newlines =    true;
-    /**#@-*/
-
-    /** @access private */
-    var $_config_path    = "";
-    var $_config_data    = array();
-    /**#@-*/
-
-    /**
-     * Constructs a new config file class.
-     *
-     * @param string $config_path (optional) path to the config files
-     */
-    function Config_File($config_path = NULL)
-    {
-        if (isset($config_path))
-            $this->set_path($config_path);
-    }
-
-
-    /**
-     * Set the path where configuration files can be found.
-     *
-     * @param string $config_path path to the config files
-     */
-    function set_path($config_path)
-    {
-        if (!empty($config_path)) {
-            if (!is_string($config_path) || !file_exists($config_path) || !is_dir($config_path)) {
-                $this->_trigger_error_msg("Bad config file path '$config_path'");
-                return;
-            }
-            if(substr($config_path, -1) != DIRECTORY_SEPARATOR) {
-                $config_path .= DIRECTORY_SEPARATOR;
-            }
-
-            $this->_config_path = $config_path;
-        }
-    }
-
-
-    /**
-     * Retrieves config info based on the file, section, and variable name.
-     *
-     * @param string $file_name config file to get info for
-     * @param string $section_name (optional) section to get info for
-     * @param string $var_name (optional) variable to get info for
-     * @return string|array a value or array of values
-     */
-    function get($file_name, $section_name = NULL, $var_name = NULL)
-    {
-        if (empty($file_name)) {
-            $this->_trigger_error_msg('Empty config file name');
-            return;
-        } else {
-            $file_name = $this->_config_path . $file_name;
-            if (!isset($this->_config_data[$file_name]))
-                $this->load_file($file_name, false);
-        }
-
-        if (!empty($var_name)) {
-            if (empty($section_name)) {
-                return $this->_config_data[$file_name]["vars"][$var_name];
-            } else {
-                if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name]))
-                    return $this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name];
-                else
-                    return array();
-            }
-        } else {
-            if (empty($section_name)) {
-                return (array)$this->_config_data[$file_name]["vars"];
-            } else {
-                if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"]))
-                    return (array)$this->_config_data[$file_name]["sections"][$section_name]["vars"];
-                else
-                    return array();
-            }
-        }
-    }
-
-
-    /**
-     * Retrieves config info based on the key.
-     *
-     * @param $file_name string config key (filename/section/var)
-     * @return string|array same as get()
-     * @uses get() retrieves information from config file and returns it
-     */
-    function &get_key($config_key)
-    {
-        list($file_name, $section_name, $var_name) = explode('/', $config_key, 3);
-        $result = &$this->get($file_name, $section_name, $var_name);
-        return $result;
-    }
-
-    /**
-     * Get all loaded config file names.
-     *
-     * @return array an array of loaded config file names
-     */
-    function get_file_names()
-    {
-        return array_keys($this->_config_data);
-    }
-
-
-    /**
-     * Get all section names from a loaded file.
-     *
-     * @param string $file_name config file to get section names from
-     * @return array an array of section names from the specified file
-     */
-    function get_section_names($file_name)
-    {
-        $file_name = $this->_config_path . $file_name;
-        if (!isset($this->_config_data[$file_name])) {
-            $this->_trigger_error_msg("Unknown config file '$file_name'");
-            return;
-        }
-
-        return array_keys($this->_config_data[$file_name]["sections"]);
-    }
-
-
-    /**
-     * Get all global or section variable names.
-     *
-     * @param string $file_name config file to get info for
-     * @param string $section_name (optional) section to get info for
-     * @return array an array of variables names from the specified file/section
-     */
-    function get_var_names($file_name, $section = NULL)
-    {
-        if (empty($file_name)) {
-            $this->_trigger_error_msg('Empty config file name');
-            return;
-        } else if (!isset($this->_config_data[$file_name])) {
-            $this->_trigger_error_msg("Unknown config file '$file_name'");
-            return;
-        }
-
-        if (empty($section))
-            return array_keys($this->_config_data[$file_name]["vars"]);
-        else
-            return array_keys($this->_config_data[$file_name]["sections"][$section]["vars"]);
-    }
-
-
-    /**
-     * Clear loaded config data for a certain file or all files.
-     *
-     * @param string $file_name file to clear config data for
-     */
-    function clear($file_name = NULL)
-    {
-        if ($file_name === NULL)
-            $this->_config_data = array();
-        else if (isset($this->_config_data[$file_name]))
-            $this->_config_data[$file_name] = array();
-    }
-
-
-    /**
-     * Load a configuration file manually.
-     *
-     * @param string $file_name file name to load
-     * @param boolean $prepend_path whether current config path should be
-     *                              prepended to the filename
-     */
-    function load_file($file_name, $prepend_path = true)
-    {
-        if ($prepend_path && $this->_config_path != "")
-            $config_file = $this->_config_path . $file_name;
-        else
-            $config_file = $file_name;
-
-        ini_set('track_errors', true);
-        $fp = @fopen($config_file, "r");
-        if (!is_resource($fp)) {
-            $this->_trigger_error_msg("Could not open config file '$config_file'");
-            return false;
-        }
-
-        $contents = ($size = filesize($config_file)) ? fread($fp, $size) : '';
-        fclose($fp);
-
-        $this->_config_data[$config_file] = $this->parse_contents($contents);
-        return true;
-    }
-
-    /**
-     * Store the contents of a file manually.
-     *
-     * @param string $config_file file name of the related contents
-     * @param string $contents the file-contents to parse
-     */
-    function set_file_contents($config_file, $contents)
-    {
-        $this->_config_data[$config_file] = $this->parse_contents($contents);
-        return true;
-    }
-
-    /**
-     * parse the source of a configuration file manually.
-     *
-     * @param string $contents the file-contents to parse
-     */
-    function parse_contents($contents)
-    {
-        if($this->fix_newlines) {
-            // fix mac/dos formatted newlines
-            $contents = preg_replace('!\r\n?!', "\n", $contents);
-        }
-
-        $config_data = array();
-        $config_data['sections'] = array();
-        $config_data['vars'] = array();
-
-        /* reference to fill with data */
-        $vars =& $config_data['vars'];
-
-        /* parse file line by line */
-        preg_match_all('!^.*\r?\n?!m', $contents, $match);
-        $lines = $match[0];
-        for ($i=0, $count=count($lines); $i<$count; $i++) {
-            $line = $lines[$i];
-            if (empty($line)) continue;
-
-            if ( substr($line, 0, 1) == '[' && preg_match('!^\[(.*?)\]!', $line, $match) ) {
-                /* section found */
-                if (substr($match[1], 0, 1) == '.') {
-                    /* hidden section */
-                    if ($this->read_hidden) {
-                        $section_name = substr($match[1], 1);
-                    } else {
-                        /* break reference to $vars to ignore hidden section */
-                        unset($vars);
-                        $vars = array();
-                        continue;
-                    }
-                } else {                    
-                    $section_name = $match[1];
-                }
-                if (!isset($config_data['sections'][$section_name]))
-                    $config_data['sections'][$section_name] = array('vars' => array());
-                $vars =& $config_data['sections'][$section_name]['vars'];
-                continue;
-            }
-
-            if (preg_match('/^\s*(\.?\w+)\s*=\s*(.*)/s', $line, $match)) {
-                /* variable found */
-                $var_name = rtrim($match[1]);
-                if (strpos($match[2], '"""') === 0) {
-                    /* handle multiline-value */
-                    $lines[$i] = substr($match[2], 3);
-                    $var_value = '';
-                    while ($i<$count) {
-                        if (($pos = strpos($lines[$i], '"""')) === false) {
-                            $var_value .= $lines[$i++];
-                        } else {
-                            /* end of multiline-value */
-                            $var_value .= substr($lines[$i], 0, $pos);
-                            break;
-                        }
-                    }
-                    $booleanize = false;
-
-                } else {
-                    /* handle simple value */
-                    $var_value = preg_replace('/^([\'"])(.*)\1$/', '\2', rtrim($match[2]));
-                    $booleanize = $this->booleanize;
-
-                }
-                $this->_set_config_var($vars, $var_name, $var_value, $booleanize);
-            }
-            /* else unparsable line / means it is a comment / means ignore it */
-        }
-        return $config_data;
-    }
-
-    /**#@+ @access private */
-    /**
-     * @param array &$container
-     * @param string $var_name
-     * @param mixed $var_value
-     * @param boolean $booleanize determines whether $var_value is converted to
-     *                            to true/false
-     */
-    function _set_config_var(&$container, $var_name, $var_value, $booleanize)
-    {
-        if (substr($var_name, 0, 1) == '.') {
-            if (!$this->read_hidden)
-                return;
-            else
-                $var_name = substr($var_name, 1);
-        }
-
-        if (!preg_match("/^[a-zA-Z_]\w*$/", $var_name)) {
-            $this->_trigger_error_msg("Bad variable name '$var_name'");
-            return;
-        }
-
-        if ($booleanize) {
-            if (preg_match("/^(on|true|yes)$/i", $var_value))
-                $var_value = true;
-            else if (preg_match("/^(off|false|no)$/i", $var_value))
-                $var_value = false;
-        }
-
-        if (!isset($container[$var_name]) || $this->overwrite)
-            $container[$var_name] = $var_value;
-        else {
-            settype($container[$var_name], 'array');
-            $container[$var_name][] = $var_value;
-        }
-    }
-
-    /**
-     * @uses trigger_error() creates a PHP warning/error
-     * @param string $error_msg
-     * @param integer $error_type one of
-     */
-    function _trigger_error_msg($error_msg, $error_type = E_USER_WARNING)
-    {
-        trigger_error("Config_File error: $error_msg", $error_type);
-    }
-    /**#@-*/
-}
-
-?>
diff --git a/includes/smarty/Smarty.class.php b/includes/smarty/Smarty.class.php
deleted file mode 100644
index e7298f2e..00000000
--- a/includes/smarty/Smarty.class.php
+++ /dev/null
@@ -1,1961 +0,0 @@
-
- * @author Andrei Zmievski 
- * @package Smarty
- * @version 2.6.26
- */
-
-/* $Id: Smarty.class.php 3163 2009-06-17 14:39:24Z monte.ohrt $ */
-
-/**
- * DIR_SEP isn't used anymore, but third party apps might
- */
-if(!defined('DIR_SEP')) {
-    define('DIR_SEP', DIRECTORY_SEPARATOR);
-}
-
-/**
- * set SMARTY_DIR to absolute path to Smarty library files.
- * if not defined, include_path will be used. Sets SMARTY_DIR only if user
- * application has not already defined it.
- */
-
-if (!defined('SMARTY_DIR')) {
-    define('SMARTY_DIR', dirname(__FILE__) . DIRECTORY_SEPARATOR);
-}
-
-if (!defined('SMARTY_CORE_DIR')) {
-    define('SMARTY_CORE_DIR', SMARTY_DIR . 'internals' . DIRECTORY_SEPARATOR);
-}
-
-define('SMARTY_PHP_PASSTHRU',   0);
-define('SMARTY_PHP_QUOTE',      1);
-define('SMARTY_PHP_REMOVE',     2);
-define('SMARTY_PHP_ALLOW',      3);
-
-/**
- * @package Smarty
- */
-class Smarty
-{
-    /**#@+
-     * Smarty Configuration Section
-     */
-
-    /**
-     * The name of the directory where templates are located.
-     *
-     * @var string
-     */
-    var $template_dir    =  'templates';
-
-    /**
-     * The directory where compiled templates are located.
-     *
-     * @var string
-     */
-    var $compile_dir     =  'templates_c';
-
-    /**
-     * The directory where config files are located.
-     *
-     * @var string
-     */
-    var $config_dir      =  'configs';
-
-    /**
-     * An array of directories searched for plugins.
-     *
-     * @var array
-     */
-    var $plugins_dir     =  array('plugins');
-
-    /**
-     * If debugging is enabled, a debug console window will display
-     * when the page loads (make sure your browser allows unrequested
-     * popup windows)
-     *
-     * @var boolean
-     */
-    var $debugging       =  false;
-
-    /**
-     * When set, smarty does uses this value as error_reporting-level.
-     *
-     * @var integer
-     */
-    var $error_reporting  =  null;
-
-    /**
-     * This is the path to the debug console template. If not set,
-     * the default one will be used.
-     *
-     * @var string
-     */
-    var $debug_tpl       =  '';
-
-    /**
-     * This determines if debugging is enable-able from the browser.
-     * 
    
-     *  
  • NONE => no debugging control allowed
    • 
-     *  
  • URL => enable debugging when SMARTY_DEBUG is found in the URL.
    • 
-     * 

-     * @link http://www.foo.dom/index.php?SMARTY_DEBUG
-     * @var string
-     */
-    var $debugging_ctrl  =  'NONE';
-
-    /**
-     * This tells Smarty whether to check for recompiling or not. Recompiling
-     * does not need to happen unless a template or config file is changed.
-     * Typically you enable this during development, and disable for
-     * production.
-     *
-     * @var boolean
-     */
-    var $compile_check   =  true;
-
-    /**
-     * This forces templates to compile every time. Useful for development
-     * or debugging.
-     *
-     * @var boolean
-     */
-    var $force_compile   =  false;
-
-    /**
-     * This enables template caching.
-     * 
    
-     *  
  • 0 = no caching
    • 
-     *  
  • 1 = use class cache_lifetime value
    • 
-     *  
  • 2 = use cache_lifetime in cache file
    • 
-     * 

-     * @var integer
-     */
-    var $caching         =  0;
-
-    /**
-     * The name of the directory for cache files.
-     *
-     * @var string
-     */
-    var $cache_dir       =  'cache';
-
-    /**
-     * This is the number of seconds cached content will persist.
-     * 
    
-     *  
  • 0 = always regenerate cache
    • 
-     *  
  • -1 = never expires
    • 
-     * 

-     *
-     * @var integer
-     */
-    var $cache_lifetime  =  3600;
-
-    /**
-     * Only used when $caching is enabled. If true, then If-Modified-Since headers
-     * are respected with cached content, and appropriate HTTP headers are sent.
-     * This way repeated hits to a cached page do not send the entire page to the
-     * client every time.
-     *
-     * @var boolean
-     */
-    var $cache_modified_check = false;
-
-    /**
-     * This determines how Smarty handles "" tags in templates.
-     * possible values:
-     * 
    
-     *  
  • SMARTY_PHP_PASSTHRU -> print tags as plain text
    • 
-     *  
  • SMARTY_PHP_QUOTE    -> escape tags as entities
    • 
-     *  
  • SMARTY_PHP_REMOVE   -> remove php tags
    • 
-     *  
  • SMARTY_PHP_ALLOW    -> execute php tags
    • 
-     * 

-     *
-     * @var integer
-     */
-    var $php_handling    =  SMARTY_PHP_PASSTHRU;
-
-    /**
-     * This enables template security. When enabled, many things are restricted
-     * in the templates that normally would go unchecked. This is useful when
-     * untrusted parties are editing templates and you want a reasonable level
-     * of security. (no direct execution of PHP in templates for example)
-     *
-     * @var boolean
-     */
-    var $security       =   false;
-
-    /**
-     * This is the list of template directories that are considered secure. This
-     * is used only if {@link $security} is enabled. One directory per array
-     * element.  {@link $template_dir} is in this list implicitly.
-     *
-     * @var array
-     */
-    var $secure_dir     =   array();
-
-    /**
-     * These are the security settings for Smarty. They are used only when
-     * {@link $security} is enabled.
-     *
-     * @var array
-     */
-    var $security_settings  = array(
-                                    'PHP_HANDLING'    => false,
-                                    'IF_FUNCS'        => array('array', 'list',
-                                                               'isset', 'empty',
-                                                               'count', 'sizeof',
-                                                               'in_array', 'is_array',
-                                                               'true', 'false', 'null'),
-                                    'INCLUDE_ANY'     => false,
-                                    'PHP_TAGS'        => false,
-                                    'MODIFIER_FUNCS'  => array('count'),
-                                    'ALLOW_CONSTANTS'  => false,
-                                    'ALLOW_SUPER_GLOBALS' => true
-                                   );
-
-    /**
-     * This is an array of directories where trusted php scripts reside.
-     * {@link $security} is disabled during their inclusion/execution.
-     *
-     * @var array
-     */
-    var $trusted_dir        = array();
-
-    /**
-     * The left delimiter used for the template tags.
-     *
-     * @var string
-     */
-    var $left_delimiter  =  '{';
-
-    /**
-     * The right delimiter used for the template tags.
-     *
-     * @var string
-     */
-    var $right_delimiter =  '}';
-
-    /**
-     * The order in which request variables are registered, similar to
-     * variables_order in php.ini E = Environment, G = GET, P = POST,
-     * C = Cookies, S = Server
-     *
-     * @var string
-     */
-    var $request_vars_order    = 'EGPCS';
-
-    /**
-     * Indicates wether $HTTP_*_VARS[] (request_use_auto_globals=false)
-     * are uses as request-vars or $_*[]-vars. note: if
-     * request_use_auto_globals is true, then $request_vars_order has
-     * no effect, but the php-ini-value "gpc_order"
-     *
-     * @var boolean
-     */
-    var $request_use_auto_globals      = true;
-
-    /**
-     * Set this if you want different sets of compiled files for the same
-     * templates. This is useful for things like different languages.
-     * Instead of creating separate sets of templates per language, you
-     * set different compile_ids like 'en' and 'de'.
-     *
-     * @var string
-     */
-    var $compile_id            = null;
-
-    /**
-     * This tells Smarty whether or not to use sub dirs in the cache/ and
-     * templates_c/ directories. sub directories better organized, but
-     * may not work well with PHP safe mode enabled.
-     *
-     * @var boolean
-     *
-     */
-    var $use_sub_dirs          = false;
-
-    /**
-     * This is a list of the modifiers to apply to all template variables.
-     * Put each modifier in a separate array element in the order you want
-     * them applied. example: array('escape:"htmlall"');
-     *
-     * @var array
-     */
-    var $default_modifiers        = array();
-
-    /**
-     * This is the resource type to be used when not specified
-     * at the beginning of the resource path. examples:
-     * $smarty->display('file:index.tpl');
-     * $smarty->display('db:index.tpl');
-     * $smarty->display('index.tpl'); // will use default resource type
-     * {include file="file:index.tpl"}
-     * {include file="db:index.tpl"}
-     * {include file="index.tpl"} {* will use default resource type *}
-     *
-     * @var array
-     */
-    var $default_resource_type    = 'file';
-
-    /**
-     * The function used for cache file handling. If not set, built-in caching is used.
-     *
-     * @var null|string function name
-     */
-    var $cache_handler_func   = null;
-
-    /**
-     * This indicates which filters are automatically loaded into Smarty.
-     *
-     * @var array array of filter names
-     */
-    var $autoload_filters = array();
-
-    /**#@+
-     * @var boolean
-     */
-    /**
-     * This tells if config file vars of the same name overwrite each other or not.
-     * if disabled, same name variables are accumulated in an array.
-     */
-    var $config_overwrite = true;
-
-    /**
-     * This tells whether or not to automatically booleanize config file variables.
-     * If enabled, then the strings "on", "true", and "yes" are treated as boolean
-     * true, and "off", "false" and "no" are treated as boolean false.
-     */
-    var $config_booleanize = true;
-
-    /**
-     * This tells whether hidden sections [.foobar] are readable from the
-     * tempalates or not. Normally you would never allow this since that is
-     * the point behind hidden sections: the application can access them, but
-     * the templates cannot.
-     */
-    var $config_read_hidden = false;
-
-    /**
-     * This tells whether or not automatically fix newlines in config files.
-     * It basically converts \r (mac) or \r\n (dos) to \n
-     */
-    var $config_fix_newlines = true;
-    /**#@-*/
-
-    /**
-     * If a template cannot be found, this PHP function will be executed.
-     * Useful for creating templates on-the-fly or other special action.
-     *
-     * @var string function name
-     */
-    var $default_template_handler_func = '';
-
-    /**
-     * The file that contains the compiler class. This can a full
-     * pathname, or relative to the php_include path.
-     *
-     * @var string
-     */
-    var $compiler_file        =    'Smarty_Compiler.class.php';
-
-    /**
-     * The class used for compiling templates.
-     *
-     * @var string
-     */
-    var $compiler_class        =   'Smarty_Compiler';
-
-    /**
-     * The class used to load config vars.
-     *
-     * @var string
-     */
-    var $config_class          =   'Config_File';
-
-/**#@+
- * END Smarty Configuration Section
- * There should be no need to touch anything below this line.
- * @access private
- */
-    /**
-     * where assigned template vars are kept
-     *
-     * @var array
-     */
-    var $_tpl_vars             = array();
-
-    /**
-     * stores run-time $smarty.* vars
-     *
-     * @var null|array
-     */
-    var $_smarty_vars          = null;
-
-    /**
-     * keeps track of sections
-     *
-     * @var array
-     */
-    var $_sections             = array();
-
-    /**
-     * keeps track of foreach blocks
-     *
-     * @var array
-     */
-    var $_foreach              = array();
-
-    /**
-     * keeps track of tag hierarchy
-     *
-     * @var array
-     */
-    var $_tag_stack            = array();
-
-    /**
-     * configuration object
-     *
-     * @var Config_file
-     */
-    var $_conf_obj             = null;
-
-    /**
-     * loaded configuration settings
-     *
-     * @var array
-     */
-    var $_config               = array(array('vars'  => array(), 'files' => array()));
-
-    /**
-     * md5 checksum of the string 'Smarty'
-     *
-     * @var string
-     */
-    var $_smarty_md5           = 'f8d698aea36fcbead2b9d5359ffca76f';
-
-    /**
-     * Smarty version number
-     *
-     * @var string
-     */
-    var $_version              = '2.6.26';
-
-    /**
-     * current template inclusion depth
-     *
-     * @var integer
-     */
-    var $_inclusion_depth      = 0;
-
-    /**
-     * for different compiled templates
-     *
-     * @var string
-     */
-    var $_compile_id           = null;
-
-    /**
-     * text in URL to enable debug mode
-     *
-     * @var string
-     */
-    var $_smarty_debug_id      = 'SMARTY_DEBUG';
-
-    /**
-     * debugging information for debug console
-     *
-     * @var array
-     */
-    var $_smarty_debug_info    = array();
-
-    /**
-     * info that makes up a cache file
-     *
-     * @var array
-     */
-    var $_cache_info           = array();
-
-    /**
-     * default file permissions
-     *
-     * @var integer
-     */
-    var $_file_perms           = 0644;
-
-    /**
-     * default dir permissions
-     *
-     * @var integer
-     */
-    var $_dir_perms               = 0771;
-
-    /**
-     * registered objects
-     *
-     * @var array
-     */
-    var $_reg_objects           = array();
-
-    /**
-     * table keeping track of plugins
-     *
-     * @var array
-     */
-    var $_plugins              = array(
-                                       'modifier'      => array(),
-                                       'function'      => array(),
-                                       'block'         => array(),
-                                       'compiler'      => array(),
-                                       'prefilter'     => array(),
-                                       'postfilter'    => array(),
-                                       'outputfilter'  => array(),
-                                       'resource'      => array(),
-                                       'insert'        => array());
-
-
-    /**
-     * cache serials
-     *
-     * @var array
-     */
-    var $_cache_serials = array();
-
-    /**
-     * name of optional cache include file
-     *
-     * @var string
-     */
-    var $_cache_include = null;
-
-    /**
-     * indicate if the current code is used in a compiled
-     * include
-     *
-     * @var string
-     */
-    var $_cache_including = false;
-
-    /**#@-*/
-    /**
-     * The class constructor.
-     */
-    function Smarty()
-    {
-      $this->assign('SCRIPT_NAME', isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME']
-                    : @$GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME']);
-    }
-
-    /**
-     * assigns values to template variables
-     *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed $value the value to assign
-     */
-    function assign($tpl_var, $value = null)
-    {
-        if (is_array($tpl_var)){
-            foreach ($tpl_var as $key => $val) {
-                if ($key != '') {
-                    $this->_tpl_vars[$key] = $val;
-                }
-            }
-        } else {
-            if ($tpl_var != '')
-                $this->_tpl_vars[$tpl_var] = $value;
-        }
-    }
-
-    /**
-     * assigns values to template variables by reference
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed $value the referenced value to assign
-     */
-    function assign_by_ref($tpl_var, &$value)
-    {
-        if ($tpl_var != '')
-            $this->_tpl_vars[$tpl_var] = &$value;
-    }
-
-    /**
-     * appends values to template variables
-     *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed $value the value to append
-     */
-    function append($tpl_var, $value=null, $merge=false)
-    {
-        if (is_array($tpl_var)) {
-            // $tpl_var is an array, ignore $value
-            foreach ($tpl_var as $_key => $_val) {
-                if ($_key != '') {
-                    if(!@is_array($this->_tpl_vars[$_key])) {
-                        settype($this->_tpl_vars[$_key],'array');
-                    }
-                    if($merge && is_array($_val)) {
-                        foreach($_val as $_mkey => $_mval) {
-                            $this->_tpl_vars[$_key][$_mkey] = $_mval;
-                        }
-                    } else {
-                        $this->_tpl_vars[$_key][] = $_val;
-                    }
-                }
-            }
-        } else {
-            if ($tpl_var != '' && isset($value)) {
-                if(!@is_array($this->_tpl_vars[$tpl_var])) {
-                    settype($this->_tpl_vars[$tpl_var],'array');
-                }
-                if($merge && is_array($value)) {
-                    foreach($value as $_mkey => $_mval) {
-                        $this->_tpl_vars[$tpl_var][$_mkey] = $_mval;
-                    }
-                } else {
-                    $this->_tpl_vars[$tpl_var][] = $value;
-                }
-            }
-        }
-    }
-
-    /**
-     * appends values to template variables by reference
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed $value the referenced value to append
-     */
-    function append_by_ref($tpl_var, &$value, $merge=false)
-    {
-        if ($tpl_var != '' && isset($value)) {
-            if(!@is_array($this->_tpl_vars[$tpl_var])) {
-             settype($this->_tpl_vars[$tpl_var],'array');
-            }
-            if ($merge && is_array($value)) {
-                foreach($value as $_key => $_val) {
-                    $this->_tpl_vars[$tpl_var][$_key] = &$value[$_key];
-                }
-            } else {
-                $this->_tpl_vars[$tpl_var][] = &$value;
-            }
-        }
-    }
-
-
-    /**
-     * clear the given assigned template variable.
-     *
-     * @param string $tpl_var the template variable to clear
-     */
-    function clear_assign($tpl_var)
-    {
-        if (is_array($tpl_var))
-            foreach ($tpl_var as $curr_var)
-                unset($this->_tpl_vars[$curr_var]);
-        else
-            unset($this->_tpl_vars[$tpl_var]);
-    }
-
-
-    /**
-     * Registers custom function to be used in templates
-     *
-     * @param string $function the name of the template function
-     * @param string $function_impl the name of the PHP function to register
-     */
-    function register_function($function, $function_impl, $cacheable=true, $cache_attrs=null)
-    {
-        $this->_plugins['function'][$function] =
-            array($function_impl, null, null, false, $cacheable, $cache_attrs);
-
-    }
-
-    /**
-     * Unregisters custom function
-     *
-     * @param string $function name of template function
-     */
-    function unregister_function($function)
-    {
-        unset($this->_plugins['function'][$function]);
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @param string $object name of template object
-     * @param object &$object_impl the referenced PHP object to register
-     * @param null|array $allowed list of allowed methods (empty = all)
-     * @param boolean $smarty_args smarty argument format, else traditional
-     * @param null|array $block_functs list of methods that are block format
-     */
-    function register_object($object, &$object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
-    {
-        settype($allowed, 'array');
-        settype($smarty_args, 'boolean');
-        $this->_reg_objects[$object] =
-            array(&$object_impl, $allowed, $smarty_args, $block_methods);
-    }
-
-    /**
-     * Unregisters object
-     *
-     * @param string $object name of template object
-     */
-    function unregister_object($object)
-    {
-        unset($this->_reg_objects[$object]);
-    }
-
-
-    /**
-     * Registers block function to be used in templates
-     *
-     * @param string $block name of template block
-     * @param string $block_impl PHP function to register
-     */
-    function register_block($block, $block_impl, $cacheable=true, $cache_attrs=null)
-    {
-        $this->_plugins['block'][$block] =
-            array($block_impl, null, null, false, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregisters block function
-     *
-     * @param string $block name of template function
-     */
-    function unregister_block($block)
-    {
-        unset($this->_plugins['block'][$block]);
-    }
-
-    /**
-     * Registers compiler function
-     *
-     * @param string $function name of template function
-     * @param string $function_impl name of PHP function to register
-     */
-    function register_compiler_function($function, $function_impl, $cacheable=true)
-    {
-        $this->_plugins['compiler'][$function] =
-            array($function_impl, null, null, false, $cacheable);
-    }
-
-    /**
-     * Unregisters compiler function
-     *
-     * @param string $function name of template function
-     */
-    function unregister_compiler_function($function)
-    {
-        unset($this->_plugins['compiler'][$function]);
-    }
-
-    /**
-     * Registers modifier to be used in templates
-     *
-     * @param string $modifier name of template modifier
-     * @param string $modifier_impl name of PHP function to register
-     */
-    function register_modifier($modifier, $modifier_impl)
-    {
-        $this->_plugins['modifier'][$modifier] =
-            array($modifier_impl, null, null, false);
-    }
-
-    /**
-     * Unregisters modifier
-     *
-     * @param string $modifier name of template modifier
-     */
-    function unregister_modifier($modifier)
-    {
-        unset($this->_plugins['modifier'][$modifier]);
-    }
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @param string $type name of resource
-     * @param array $functions array of functions to handle resource
-     */
-    function register_resource($type, $functions)
-    {
-        if (count($functions)==4) {
-            $this->_plugins['resource'][$type] =
-                array($functions, false);
-
-        } elseif (count($functions)==5) {
-            $this->_plugins['resource'][$type] =
-                array(array(array(&$functions[0], $functions[1])
-                            ,array(&$functions[0], $functions[2])
-                            ,array(&$functions[0], $functions[3])
-                            ,array(&$functions[0], $functions[4]))
-                      ,false);
-
-        } else {
-            $this->trigger_error("malformed function-list for '$type' in register_resource");
-
-        }
-    }
-
-    /**
-     * Unregisters a resource
-     *
-     * @param string $type name of resource
-     */
-    function unregister_resource($type)
-    {
-        unset($this->_plugins['resource'][$type]);
-    }
-
-    /**
-     * Registers a prefilter function to apply
-     * to a template before compiling
-     *
-     * @param callback $function
-     */
-    function register_prefilter($function)
-    {
-        $this->_plugins['prefilter'][$this->_get_filter_name($function)]
-            = array($function, null, null, false);
-    }
-
-    /**
-     * Unregisters a prefilter function
-     *
-     * @param callback $function
-     */
-    function unregister_prefilter($function)
-    {
-        unset($this->_plugins['prefilter'][$this->_get_filter_name($function)]);
-    }
-
-    /**
-     * Registers a postfilter function to apply
-     * to a compiled template after compilation
-     *
-     * @param callback $function
-     */
-    function register_postfilter($function)
-    {
-        $this->_plugins['postfilter'][$this->_get_filter_name($function)]
-            = array($function, null, null, false);
-    }
-
-    /**
-     * Unregisters a postfilter function
-     *
-     * @param callback $function
-     */
-    function unregister_postfilter($function)
-    {
-        unset($this->_plugins['postfilter'][$this->_get_filter_name($function)]);
-    }
-
-    /**
-     * Registers an output filter function to apply
-     * to a template output
-     *
-     * @param callback $function
-     */
-    function register_outputfilter($function)
-    {
-        $this->_plugins['outputfilter'][$this->_get_filter_name($function)]
-            = array($function, null, null, false);
-    }
-
-    /**
-     * Unregisters an outputfilter function
-     *
-     * @param callback $function
-     */
-    function unregister_outputfilter($function)
-    {
-        unset($this->_plugins['outputfilter'][$this->_get_filter_name($function)]);
-    }
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     */
-    function load_filter($type, $name)
-    {
-        switch ($type) {
-            case 'output':
-                $_params = array('plugins' => array(array($type . 'filter', $name, null, null, false)));
-                require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
-                smarty_core_load_plugins($_params, $this);
-                break;
-
-            case 'pre':
-            case 'post':
-                if (!isset($this->_plugins[$type . 'filter'][$name]))
-                    $this->_plugins[$type . 'filter'][$name] = false;
-                break;
-        }
-    }
-
-    /**
-     * clear cached content for the given template and cache id
-     *
-     * @param string $tpl_file name of template file
-     * @param string $cache_id name of cache_id
-     * @param string $compile_id name of compile_id
-     * @param string $exp_time expiration time
-     * @return boolean
-     */
-    function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
-    {
-
-        if (!isset($compile_id))
-            $compile_id = $this->compile_id;
-
-        if (!isset($tpl_file))
-            $compile_id = null;
-
-        $_auto_id = $this->_get_auto_id($cache_id, $compile_id);
-
-        if (!empty($this->cache_handler_func)) {
-            return call_user_func_array($this->cache_handler_func,
-                                  array('clear', &$this, &$dummy, $tpl_file, $cache_id, $compile_id, $exp_time));
-        } else {
-            $_params = array('auto_base' => $this->cache_dir,
-                            'auto_source' => $tpl_file,
-                            'auto_id' => $_auto_id,
-                            'exp_time' => $exp_time);
-            require_once(SMARTY_CORE_DIR . 'core.rm_auto.php');
-            return smarty_core_rm_auto($_params, $this);
-        }
-
-    }
-
-
-    /**
-     * clear the entire contents of cache (all templates)
-     *
-     * @param string $exp_time expire time
-     * @return boolean results of {@link smarty_core_rm_auto()}
-     */
-    function clear_all_cache($exp_time = null)
-    {
-        return $this->clear_cache(null, null, null, $exp_time);
-    }
-
-
-    /**
-     * test to see if valid cache exists for this template
-     *
-     * @param string $tpl_file name of template file
-     * @param string $cache_id
-     * @param string $compile_id
-     * @return string|false results of {@link _read_cache_file()}
-     */
-    function is_cached($tpl_file, $cache_id = null, $compile_id = null)
-    {
-        if (!$this->caching)
-            return false;
-
-        if (!isset($compile_id))
-            $compile_id = $this->compile_id;
-
-        $_params = array(
-            'tpl_file' => $tpl_file,
-            'cache_id' => $cache_id,
-            'compile_id' => $compile_id
-        );
-        require_once(SMARTY_CORE_DIR . 'core.read_cache_file.php');
-        return smarty_core_read_cache_file($_params, $this);
-    }
-
-
-    /**
-     * clear all the assigned template variables.
-     *
-     */
-    function clear_all_assign()
-    {
-        $this->_tpl_vars = array();
-    }
-
-    /**
-     * clears compiled version of specified template resource,
-     * or all compiled template files if one is not specified.
-     * This function is for advanced use only, not normally needed.
-     *
-     * @param string $tpl_file
-     * @param string $compile_id
-     * @param string $exp_time
-     * @return boolean results of {@link smarty_core_rm_auto()}
-     */
-    function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
-    {
-        if (!isset($compile_id)) {
-            $compile_id = $this->compile_id;
-        }
-        $_params = array('auto_base' => $this->compile_dir,
-                        'auto_source' => $tpl_file,
-                        'auto_id' => $compile_id,
-                        'exp_time' => $exp_time,
-                        'extensions' => array('.inc', '.php'));
-        require_once(SMARTY_CORE_DIR . 'core.rm_auto.php');
-        return smarty_core_rm_auto($_params, $this);
-    }
-
-    /**
-     * Checks whether requested template exists.
-     *
-     * @param string $tpl_file
-     * @return boolean
-     */
-    function template_exists($tpl_file)
-    {
-        $_params = array('resource_name' => $tpl_file, 'quiet'=>true, 'get_source'=>false);
-        return $this->_fetch_resource_info($_params);
-    }
-
-    /**
-     * Returns an array containing template variables
-     *
-     * @param string $name
-     * @param string $type
-     * @return array
-     */
-    function &get_template_vars($name=null)
-    {
-        if(!isset($name)) {
-            return $this->_tpl_vars;
-        } elseif(isset($this->_tpl_vars[$name])) {
-            return $this->_tpl_vars[$name];
-        } else {
-            // var non-existant, return valid reference
-            $_tmp = null;
-            return $_tmp;   
-        }
-    }
-
-    /**
-     * Returns an array containing config variables
-     *
-     * @param string $name
-     * @param string $type
-     * @return array
-     */
-    function &get_config_vars($name=null)
-    {
-        if(!isset($name) && is_array($this->_config[0])) {
-            return $this->_config[0]['vars'];
-        } else if(isset($this->_config[0]['vars'][$name])) {
-            return $this->_config[0]['vars'][$name];
-        } else {
-            // var non-existant, return valid reference
-            $_tmp = null;
-            return $_tmp;
-        }
-    }
-
-    /**
-     * trigger Smarty error
-     *
-     * @param string $error_msg
-     * @param integer $error_type
-     */
-    function trigger_error($error_msg, $error_type = E_USER_WARNING)
-    {
-        trigger_error("Smarty error: $error_msg", $error_type);
-    }
-
-
-    /**
-     * executes & displays the template results
-     *
-     * @param string $resource_name
-     * @param string $cache_id
-     * @param string $compile_id
-     */
-    function display($resource_name, $cache_id = null, $compile_id = null)
-    {
-        $this->fetch($resource_name, $cache_id, $compile_id, true);
-    }
-
-    /**
-     * executes & returns or displays the template results
-     *
-     * @param string $resource_name
-     * @param string $cache_id
-     * @param string $compile_id
-     * @param boolean $display
-     */
-    function fetch($resource_name, $cache_id = null, $compile_id = null, $display = false)
-    {
-        static $_cache_info = array();
-        
-        $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(isset($this->error_reporting)
-               ? $this->error_reporting : error_reporting() & ~E_NOTICE);
-
-        if (!$this->debugging && $this->debugging_ctrl == 'URL') {
-            $_query_string = $this->request_use_auto_globals ? $_SERVER['QUERY_STRING'] : $GLOBALS['HTTP_SERVER_VARS']['QUERY_STRING'];
-            if (@strstr($_query_string, $this->_smarty_debug_id)) {
-                if (@strstr($_query_string, $this->_smarty_debug_id . '=on')) {
-                    // enable debugging for this browser session
-                    @setcookie('SMARTY_DEBUG', true);
-                    $this->debugging = true;
-                } elseif (@strstr($_query_string, $this->_smarty_debug_id . '=off')) {
-                    // disable debugging for this browser session
-                    @setcookie('SMARTY_DEBUG', false);
-                    $this->debugging = false;
-                } else {
-                    // enable debugging for this page
-                    $this->debugging = true;
-                }
-            } else {
-                $this->debugging = (bool)($this->request_use_auto_globals ? @$_COOKIE['SMARTY_DEBUG'] : @$GLOBALS['HTTP_COOKIE_VARS']['SMARTY_DEBUG']);
-            }
-        }
-
-        if ($this->debugging) {
-            // capture time for debugging info
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $_debug_start_time = smarty_core_get_microtime($_params, $this);
-            $this->_smarty_debug_info[] = array('type'      => 'template',
-                                                'filename'  => $resource_name,
-                                                'depth'     => 0);
-            $_included_tpls_idx = count($this->_smarty_debug_info) - 1;
-        }
-
-        if (!isset($compile_id)) {
-            $compile_id = $this->compile_id;
-        }
-
-        $this->_compile_id = $compile_id;
-        $this->_inclusion_depth = 0;
-
-        if ($this->caching) {
-            // save old cache_info, initialize cache_info
-            array_push($_cache_info, $this->_cache_info);
-            $this->_cache_info = array();
-            $_params = array(
-                'tpl_file' => $resource_name,
-                'cache_id' => $cache_id,
-                'compile_id' => $compile_id,
-                'results' => null
-            );
-            require_once(SMARTY_CORE_DIR . 'core.read_cache_file.php');
-            if (smarty_core_read_cache_file($_params, $this)) {
-                $_smarty_results = $_params['results'];
-                if (!empty($this->_cache_info['insert_tags'])) {
-                    $_params = array('plugins' => $this->_cache_info['insert_tags']);
-                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
-                    smarty_core_load_plugins($_params, $this);
-                    $_params = array('results' => $_smarty_results);
-                    require_once(SMARTY_CORE_DIR . 'core.process_cached_inserts.php');
-                    $_smarty_results = smarty_core_process_cached_inserts($_params, $this);
-                }
-                if (!empty($this->_cache_info['cache_serials'])) {
-                    $_params = array('results' => $_smarty_results);
-                    require_once(SMARTY_CORE_DIR . 'core.process_compiled_include.php');
-                    $_smarty_results = smarty_core_process_compiled_include($_params, $this);
-                }
-
-
-                if ($display) {
-                    if ($this->debugging)
-                    {
-                        // capture time for debugging info
-                        $_params = array();
-                        require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-                        $this->_smarty_debug_info[$_included_tpls_idx]['exec_time'] = smarty_core_get_microtime($_params, $this) - $_debug_start_time;
-                        require_once(SMARTY_CORE_DIR . 'core.display_debug_console.php');
-                        $_smarty_results .= smarty_core_display_debug_console($_params, $this);
-                    }
-                    if ($this->cache_modified_check) {
-                        $_server_vars = ($this->request_use_auto_globals) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
-                        $_last_modified_date = @substr($_server_vars['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_server_vars['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
-                        $_gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT';
-                        if (@count($this->_cache_info['insert_tags']) == 0
-                            && !$this->_cache_serials
-                            && $_gmt_mtime == $_last_modified_date) {
-                            if (php_sapi_name()=='cgi')
-                                header('Status: 304 Not Modified');
-                            else
-                                header('HTTP/1.1 304 Not Modified');
-
-                        } else {
-                            header('Last-Modified: '.$_gmt_mtime);
-                            echo $_smarty_results;
-                        }
-                    } else {
-                            echo $_smarty_results;
-                    }
-                    error_reporting($_smarty_old_error_level);
-                    // restore initial cache_info
-                    $this->_cache_info = array_pop($_cache_info);
-                    return true;
-                } else {
-                    error_reporting($_smarty_old_error_level);
-                    // restore initial cache_info
-                    $this->_cache_info = array_pop($_cache_info);
-                    return $_smarty_results;
-                }
-            } else {
-                $this->_cache_info['template'][$resource_name] = true;
-                if ($this->cache_modified_check && $display) {
-                    header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT');
-                }
-            }
-        }
-
-        // load filters that are marked as autoload
-        if (count($this->autoload_filters)) {
-            foreach ($this->autoload_filters as $_filter_type => $_filters) {
-                foreach ($_filters as $_filter) {
-                    $this->load_filter($_filter_type, $_filter);
-                }
-            }
-        }
-
-        $_smarty_compile_path = $this->_get_compile_path($resource_name);
-
-        // if we just need to display the results, don't perform output
-        // buffering - for speed
-        $_cache_including = $this->_cache_including;
-        $this->_cache_including = false;
-        if ($display && !$this->caching && count($this->_plugins['outputfilter']) == 0) {
-            if ($this->_is_compiled($resource_name, $_smarty_compile_path)
-                    || $this->_compile_resource($resource_name, $_smarty_compile_path))
-            {
-                include($_smarty_compile_path);
-            }
-        } else {
-            ob_start();
-            if ($this->_is_compiled($resource_name, $_smarty_compile_path)
-                    || $this->_compile_resource($resource_name, $_smarty_compile_path))
-            {
-                include($_smarty_compile_path);
-            }
-            $_smarty_results = ob_get_contents();
-            ob_end_clean();
-
-            foreach ((array)$this->_plugins['outputfilter'] as $_output_filter) {
-                $_smarty_results = call_user_func_array($_output_filter[0], array($_smarty_results, &$this));
-            }
-        }
-
-        if ($this->caching) {
-            $_params = array('tpl_file' => $resource_name,
-                        'cache_id' => $cache_id,
-                        'compile_id' => $compile_id,
-                        'results' => $_smarty_results);
-            require_once(SMARTY_CORE_DIR . 'core.write_cache_file.php');
-            smarty_core_write_cache_file($_params, $this);
-            require_once(SMARTY_CORE_DIR . 'core.process_cached_inserts.php');
-            $_smarty_results = smarty_core_process_cached_inserts($_params, $this);
-
-            if ($this->_cache_serials) {
-                // strip nocache-tags from output
-                $_smarty_results = preg_replace('!(\{/?nocache\:[0-9a-f]{32}#\d+\})!s'
-                                                ,''
-                                                ,$_smarty_results);
-            }
-            // restore initial cache_info
-            $this->_cache_info = array_pop($_cache_info);
-        }
-        $this->_cache_including = $_cache_including;
-
-        if ($display) {
-            if (isset($_smarty_results)) { echo $_smarty_results; }
-            if ($this->debugging) {
-                // capture time for debugging info
-                $_params = array();
-                require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-                $this->_smarty_debug_info[$_included_tpls_idx]['exec_time'] = (smarty_core_get_microtime($_params, $this) - $_debug_start_time);
-                require_once(SMARTY_CORE_DIR . 'core.display_debug_console.php');
-                echo smarty_core_display_debug_console($_params, $this);
-            }
-            error_reporting($_smarty_old_error_level);
-            return;
-        } else {
-            error_reporting($_smarty_old_error_level);
-            if (isset($_smarty_results)) { return $_smarty_results; }
-        }
-    }
-
-    /**
-     * load configuration values
-     *
-     * @param string $file
-     * @param string $section
-     * @param string $scope
-     */
-    function config_load($file, $section = null, $scope = 'global')
-    {
-        require_once($this->_get_plugin_filepath('function', 'config_load'));
-        smarty_function_config_load(array('file' => $file, 'section' => $section, 'scope' => $scope), $this);
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param string $name
-     * @return object
-     */
-    function &get_registered_object($name) {
-        if (!isset($this->_reg_objects[$name]))
-        $this->_trigger_fatal_error("'$name' is not a registered object");
-
-        if (!is_object($this->_reg_objects[$name][0]))
-        $this->_trigger_fatal_error("registered '$name' is not an object");
-
-        return $this->_reg_objects[$name][0];
-    }
-
-    /**
-     * clear configuration values
-     *
-     * @param string $var
-     */
-    function clear_config($var = null)
-    {
-        if(!isset($var)) {
-            // clear all values
-            $this->_config = array(array('vars'  => array(),
-                                         'files' => array()));
-        } else {
-            unset($this->_config[0]['vars'][$var]);
-        }
-    }
-
-    /**
-     * get filepath of requested plugin
-     *
-     * @param string $type
-     * @param string $name
-     * @return string|false
-     */
-    function _get_plugin_filepath($type, $name)
-    {
-        $_params = array('type' => $type, 'name' => $name);
-        require_once(SMARTY_CORE_DIR . 'core.assemble_plugin_filepath.php');
-        return smarty_core_assemble_plugin_filepath($_params, $this);
-    }
-
-   /**
-     * test if resource needs compiling
-     *
-     * @param string $resource_name
-     * @param string $compile_path
-     * @return boolean
-     */
-    function _is_compiled($resource_name, $compile_path)
-    {
-        if (!$this->force_compile && file_exists($compile_path)) {
-            if (!$this->compile_check) {
-                // no need to check compiled file
-                return true;
-            } else {
-                // get file source and timestamp
-                $_params = array('resource_name' => $resource_name, 'get_source'=>false);
-                if (!$this->_fetch_resource_info($_params)) {
-                    return false;
-                }
-                if ($_params['resource_timestamp'] <= filemtime($compile_path)) {
-                    // template not expired, no recompile
-                    return true;
-                } else {
-                    // compile template
-                    return false;
-                }
-            }
-        } else {
-            // compiled template does not exist, or forced compile
-            return false;
-        }
-    }
-
-   /**
-     * compile the template
-     *
-     * @param string $resource_name
-     * @param string $compile_path
-     * @return boolean
-     */
-    function _compile_resource($resource_name, $compile_path)
-    {
-
-        $_params = array('resource_name' => $resource_name);
-        if (!$this->_fetch_resource_info($_params)) {
-            return false;
-        }
-
-        $_source_content = $_params['source_content'];
-        $_cache_include    = substr($compile_path, 0, -4).'.inc';
-
-        if ($this->_compile_source($resource_name, $_source_content, $_compiled_content, $_cache_include)) {
-            // if a _cache_serial was set, we also have to write an include-file:
-            if ($this->_cache_include_info) {
-                require_once(SMARTY_CORE_DIR . 'core.write_compiled_include.php');
-                smarty_core_write_compiled_include(array_merge($this->_cache_include_info, array('compiled_content'=>$_compiled_content, 'resource_name'=>$resource_name)),  $this);
-            }
-
-            $_params = array('compile_path'=>$compile_path, 'compiled_content' => $_compiled_content);
-            require_once(SMARTY_CORE_DIR . 'core.write_compiled_resource.php');
-            smarty_core_write_compiled_resource($_params, $this);
-
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-   /**
-     * compile the given source
-     *
-     * @param string $resource_name
-     * @param string $source_content
-     * @param string $compiled_content
-     * @return boolean
-     */
-    function _compile_source($resource_name, &$source_content, &$compiled_content, $cache_include_path=null)
-    {
-        if (file_exists(SMARTY_DIR . $this->compiler_file)) {
-            require_once(SMARTY_DIR . $this->compiler_file);
-        } else {
-            // use include_path
-            require_once($this->compiler_file);
-        }
-
-
-        $smarty_compiler = new $this->compiler_class;
-
-        $smarty_compiler->template_dir      = $this->template_dir;
-        $smarty_compiler->compile_dir       = $this->compile_dir;
-        $smarty_compiler->plugins_dir       = $this->plugins_dir;
-        $smarty_compiler->config_dir        = $this->config_dir;
-        $smarty_compiler->force_compile     = $this->force_compile;
-        $smarty_compiler->caching           = $this->caching;
-        $smarty_compiler->php_handling      = $this->php_handling;
-        $smarty_compiler->left_delimiter    = $this->left_delimiter;
-        $smarty_compiler->right_delimiter   = $this->right_delimiter;
-        $smarty_compiler->_version          = $this->_version;
-        $smarty_compiler->security          = $this->security;
-        $smarty_compiler->secure_dir        = $this->secure_dir;
-        $smarty_compiler->security_settings = $this->security_settings;
-        $smarty_compiler->trusted_dir       = $this->trusted_dir;
-        $smarty_compiler->use_sub_dirs      = $this->use_sub_dirs;
-        $smarty_compiler->_reg_objects      = &$this->_reg_objects;
-        $smarty_compiler->_plugins          = &$this->_plugins;
-        $smarty_compiler->_tpl_vars         = &$this->_tpl_vars;
-        $smarty_compiler->default_modifiers = $this->default_modifiers;
-        $smarty_compiler->compile_id        = $this->_compile_id;
-        $smarty_compiler->_config            = $this->_config;
-        $smarty_compiler->request_use_auto_globals  = $this->request_use_auto_globals;
-
-        if (isset($cache_include_path) && isset($this->_cache_serials[$cache_include_path])) {
-            $smarty_compiler->_cache_serial = $this->_cache_serials[$cache_include_path];
-        }
-        $smarty_compiler->_cache_include = $cache_include_path;
-
-
-        $_results = $smarty_compiler->_compile_file($resource_name, $source_content, $compiled_content);
-
-        if ($smarty_compiler->_cache_serial) {
-            $this->_cache_include_info = array(
-                'cache_serial'=>$smarty_compiler->_cache_serial
-                ,'plugins_code'=>$smarty_compiler->_plugins_code
-                ,'include_file_path' => $cache_include_path);
-
-        } else {
-            $this->_cache_include_info = null;
-
-        }
-
-        return $_results;
-    }
-
-    /**
-     * Get the compile path for this resource
-     *
-     * @param string $resource_name
-     * @return string results of {@link _get_auto_filename()}
-     */
-    function _get_compile_path($resource_name)
-    {
-        return $this->_get_auto_filename($this->compile_dir, $resource_name,
-                                         $this->_compile_id) . '.php';
-    }
-
-    /**
-     * fetch the template info. Gets timestamp, and source
-     * if get_source is true
-     *
-     * sets $source_content to the source of the template, and
-     * $resource_timestamp to its time stamp
-     * @param string $resource_name
-     * @param string $source_content
-     * @param integer $resource_timestamp
-     * @param boolean $get_source
-     * @param boolean $quiet
-     * @return boolean
-     */
-
-    function _fetch_resource_info(&$params)
-    {
-        if(!isset($params['get_source'])) { $params['get_source'] = true; }
-        if(!isset($params['quiet'])) { $params['quiet'] = false; }
-
-        $_return = false;
-        $_params = array('resource_name' => $params['resource_name']) ;
-        if (isset($params['resource_base_path']))
-            $_params['resource_base_path'] = $params['resource_base_path'];
-        else
-            $_params['resource_base_path'] = $this->template_dir;
-
-        if ($this->_parse_resource_name($_params)) {
-            $_resource_type = $_params['resource_type'];
-            $_resource_name = $_params['resource_name'];
-            switch ($_resource_type) {
-                case 'file':
-                    if ($params['get_source']) {
-                        $params['source_content'] = $this->_read_file($_resource_name);
-                    }
-                    $params['resource_timestamp'] = filemtime($_resource_name);
-                    $_return = is_file($_resource_name) && is_readable($_resource_name);
-                    break;
-
-                default:
-                    // call resource functions to fetch the template source and timestamp
-                    if ($params['get_source']) {
-                        $_source_return = isset($this->_plugins['resource'][$_resource_type]) &&
-                            call_user_func_array($this->_plugins['resource'][$_resource_type][0][0],
-                                                 array($_resource_name, &$params['source_content'], &$this));
-                    } else {
-                        $_source_return = true;
-                    }
-
-                    $_timestamp_return = isset($this->_plugins['resource'][$_resource_type]) &&
-                        call_user_func_array($this->_plugins['resource'][$_resource_type][0][1],
-                                             array($_resource_name, &$params['resource_timestamp'], &$this));
-
-                    $_return = $_source_return && $_timestamp_return;
-                    break;
-            }
-        }
-
-        if (!$_return) {
-            // see if we can get a template with the default template handler
-            if (!empty($this->default_template_handler_func)) {
-                if (!is_callable($this->default_template_handler_func)) {
-                    $this->trigger_error("default template handler function \"$this->default_template_handler_func\" doesn't exist.");
-                } else {
-                    $_return = call_user_func_array(
-                        $this->default_template_handler_func,
-                        array($_params['resource_type'], $_params['resource_name'], &$params['source_content'], &$params['resource_timestamp'], &$this));
-                }
-            }
-        }
-
-        if (!$_return) {
-            if (!$params['quiet']) {
-                $this->trigger_error('unable to read resource: "' . $params['resource_name'] . '"');
-            }
-        } else if ($_return && $this->security) {
-            require_once(SMARTY_CORE_DIR . 'core.is_secure.php');
-            if (!smarty_core_is_secure($_params, $this)) {
-                if (!$params['quiet'])
-                    $this->trigger_error('(secure mode) accessing "' . $params['resource_name'] . '" is not allowed');
-                $params['source_content'] = null;
-                $params['resource_timestamp'] = null;
-                return false;
-            }
-        }
-        return $_return;
-    }
-
-
-    /**
-     * parse out the type and name from the resource
-     *
-     * @param string $resource_base_path
-     * @param string $resource_name
-     * @param string $resource_type
-     * @param string $resource_name
-     * @return boolean
-     */
-
-    function _parse_resource_name(&$params)
-    {
-
-        // split tpl_path by the first colon
-        $_resource_name_parts = explode(':', $params['resource_name'], 2);
-
-        if (count($_resource_name_parts) == 1) {
-            // no resource type given
-            $params['resource_type'] = $this->default_resource_type;
-            $params['resource_name'] = $_resource_name_parts[0];
-        } else {
-            if(strlen($_resource_name_parts[0]) == 1) {
-                // 1 char is not resource type, but part of filepath
-                $params['resource_type'] = $this->default_resource_type;
-                $params['resource_name'] = $params['resource_name'];
-            } else {
-                $params['resource_type'] = $_resource_name_parts[0];
-                $params['resource_name'] = $_resource_name_parts[1];
-            }
-        }
-
-        if ($params['resource_type'] == 'file') {
-            if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $params['resource_name'])) {
-                // relative pathname to $params['resource_base_path']
-                // use the first directory where the file is found
-                foreach ((array)$params['resource_base_path'] as $_curr_path) {
-                    $_fullpath = $_curr_path . DIRECTORY_SEPARATOR . $params['resource_name'];
-                    if (file_exists($_fullpath) && is_file($_fullpath)) {
-                        $params['resource_name'] = $_fullpath;
-                        return true;
-                    }
-                    // didn't find the file, try include_path
-                    $_params = array('file_path' => $_fullpath);
-                    require_once(SMARTY_CORE_DIR . 'core.get_include_path.php');
-                    if(smarty_core_get_include_path($_params, $this)) {
-                        $params['resource_name'] = $_params['new_file_path'];
-                        return true;
-                    }
-                }
-                return false;
-            } else {
-                /* absolute path */
-                return file_exists($params['resource_name']);
-            }
-        } elseif (empty($this->_plugins['resource'][$params['resource_type']])) {
-            $_params = array('type' => $params['resource_type']);
-            require_once(SMARTY_CORE_DIR . 'core.load_resource_plugin.php');
-            smarty_core_load_resource_plugin($_params, $this);
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Handle modifiers
-     *
-     * @param string|null $modifier_name
-     * @param array|null $map_array
-     * @return string result of modifiers
-     */
-    function _run_mod_handler()
-    {
-        $_args = func_get_args();
-        list($_modifier_name, $_map_array) = array_splice($_args, 0, 2);
-        list($_func_name, $_tpl_file, $_tpl_line) =
-            $this->_plugins['modifier'][$_modifier_name];
-
-        $_var = $_args[0];
-        foreach ($_var as $_key => $_val) {
-            $_args[0] = $_val;
-            $_var[$_key] = call_user_func_array($_func_name, $_args);
-        }
-        return $_var;
-    }
-
-    /**
-     * Remove starting and ending quotes from the string
-     *
-     * @param string $string
-     * @return string
-     */
-    function _dequote($string)
-    {
-        if ((substr($string, 0, 1) == "'" || substr($string, 0, 1) == '"') &&
-            substr($string, -1) == substr($string, 0, 1))
-            return substr($string, 1, -1);
-        else
-            return $string;
-    }
-
-
-    /**
-     * read in a file
-     *
-     * @param string $filename
-     * @return string
-     */
-    function _read_file($filename)
-    {
-        if ( file_exists($filename) && is_readable($filename) && ($fd = @fopen($filename, 'rb')) ) {
-            $contents = '';
-            while (!feof($fd)) {
-                $contents .= fread($fd, 8192);
-            }
-            fclose($fd);
-            return $contents;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * get a concrete filename for automagically created content
-     *
-     * @param string $auto_base
-     * @param string $auto_source
-     * @param string $auto_id
-     * @return string
-     * @staticvar string|null
-     * @staticvar string|null
-     */
-    function _get_auto_filename($auto_base, $auto_source = null, $auto_id = null)
-    {
-        $_compile_dir_sep =  $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
-        $_return = $auto_base . DIRECTORY_SEPARATOR;
-
-        if(isset($auto_id)) {
-            // make auto_id safe for directory names
-            $auto_id = str_replace('%7C',$_compile_dir_sep,(urlencode($auto_id)));
-            // split into separate directories
-            $_return .= $auto_id . $_compile_dir_sep;
-        }
-
-        if(isset($auto_source)) {
-            // make source name safe for filename
-            $_filename = urlencode(basename($auto_source));
-            $_crc32 = sprintf('%08X', crc32($auto_source));
-            // prepend %% to avoid name conflicts with
-            // with $params['auto_id'] names
-            $_crc32 = substr($_crc32, 0, 2) . $_compile_dir_sep .
-                      substr($_crc32, 0, 3) . $_compile_dir_sep . $_crc32;
-            $_return .= '%%' . $_crc32 . '%%' . $_filename;
-        }
-
-        return $_return;
-    }
-
-    /**
-     * unlink a file, possibly using expiration time
-     *
-     * @param string $resource
-     * @param integer $exp_time
-     */
-    function _unlink($resource, $exp_time = null)
-    {
-        if(isset($exp_time)) {
-            if(time() - @filemtime($resource) >= $exp_time) {
-                return @unlink($resource);
-            }
-        } else {
-            return @unlink($resource);
-        }
-    }
-
-    /**
-     * returns an auto_id for auto-file-functions
-     *
-     * @param string $cache_id
-     * @param string $compile_id
-     * @return string|null
-     */
-    function _get_auto_id($cache_id=null, $compile_id=null) {
-    if (isset($cache_id))
-        return (isset($compile_id)) ? $cache_id . '|' . $compile_id  : $cache_id;
-    elseif(isset($compile_id))
-        return $compile_id;
-    else
-        return null;
-    }
-
-    /**
-     * trigger Smarty plugin error
-     *
-     * @param string $error_msg
-     * @param string $tpl_file
-     * @param integer $tpl_line
-     * @param string $file
-     * @param integer $line
-     * @param integer $error_type
-     */
-    function _trigger_fatal_error($error_msg, $tpl_file = null, $tpl_line = null,
-            $file = null, $line = null, $error_type = E_USER_ERROR)
-    {
-        if(isset($file) && isset($line)) {
-            $info = ' ('.basename($file).", line $line)";
-        } else {
-            $info = '';
-        }
-        if (isset($tpl_line) && isset($tpl_file)) {
-            $this->trigger_error('[in ' . $tpl_file . ' line ' . $tpl_line . "]: $error_msg$info", $error_type);
-        } else {
-            $this->trigger_error($error_msg . $info, $error_type);
-        }
-    }
-
-
-    /**
-     * callback function for preg_replace, to call a non-cacheable block
-     * @return string
-     */
-    function _process_compiled_include_callback($match) {
-        $_func = '_smarty_tplfunc_'.$match[2].'_'.$match[3];
-        ob_start();
-        $_func($this);
-        $_ret = ob_get_contents();
-        ob_end_clean();
-        return $_ret;
-    }
-
-
-    /**
-     * called for included templates
-     *
-     * @param string $_smarty_include_tpl_file
-     * @param string $_smarty_include_vars
-     */
-
-    // $_smarty_include_tpl_file, $_smarty_include_vars
-
-    function _smarty_include($params)
-    {
-        if ($this->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $debug_start_time = smarty_core_get_microtime($_params, $this);
-            $this->_smarty_debug_info[] = array('type'      => 'template',
-                                                  'filename'  => $params['smarty_include_tpl_file'],
-                                                  'depth'     => ++$this->_inclusion_depth);
-            $included_tpls_idx = count($this->_smarty_debug_info) - 1;
-        }
-
-        $this->_tpl_vars = array_merge($this->_tpl_vars, $params['smarty_include_vars']);
-
-        // config vars are treated as local, so push a copy of the
-        // current ones onto the front of the stack
-        array_unshift($this->_config, $this->_config[0]);
-
-        $_smarty_compile_path = $this->_get_compile_path($params['smarty_include_tpl_file']);
-
-
-        if ($this->_is_compiled($params['smarty_include_tpl_file'], $_smarty_compile_path)
-            || $this->_compile_resource($params['smarty_include_tpl_file'], $_smarty_compile_path))
-        {
-            include($_smarty_compile_path);
-        }
-
-        // pop the local vars off the front of the stack
-        array_shift($this->_config);
-
-        $this->_inclusion_depth--;
-
-        if ($this->debugging) {
-            // capture time for debugging info
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $this->_smarty_debug_info[$included_tpls_idx]['exec_time'] = smarty_core_get_microtime($_params, $this) - $debug_start_time;
-        }
-
-        if ($this->caching) {
-            $this->_cache_info['template'][$params['smarty_include_tpl_file']] = true;
-        }
-    }
-
-
-    /**
-     * get or set an array of cached attributes for function that is
-     * not cacheable
-     * @return array
-     */
-    function &_smarty_cache_attrs($cache_serial, $count) {
-        $_cache_attrs =& $this->_cache_info['cache_attrs'][$cache_serial][$count];
-
-        if ($this->_cache_including) {
-            /* return next set of cache_attrs */
-            $_return = current($_cache_attrs);
-            next($_cache_attrs);
-            return $_return;
-
-        } else {
-            /* add a reference to a new set of cache_attrs */
-            $_cache_attrs[] = array();
-            return $_cache_attrs[count($_cache_attrs)-1];
-
-        }
-
-    }
-
-
-    /**
-     * wrapper for include() retaining $this
-     * @return mixed
-     */
-    function _include($filename, $once=false, $params=null)
-    {
-        if ($once) {
-            return include_once($filename);
-        } else {
-            return include($filename);
-        }
-    }
-
-
-    /**
-     * wrapper for eval() retaining $this
-     * @return mixed
-     */
-    function _eval($code, $params=null)
-    {
-        return eval($code);
-    }
-    
-    /**
-     * Extracts the filter name from the given callback
-     * 
-     * @param callback $function
-     * @return string
-     */
-	function _get_filter_name($function)
-	{
-		if (is_array($function)) {
-			$_class_name = (is_object($function[0]) ?
-				get_class($function[0]) : $function[0]);
-			return $_class_name . '_' . $function[1];
-		}
-		else {
-			return $function;
-		}
-	}
-  
-    /**#@-*/
-
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/Smarty_Compiler.class.php b/includes/smarty/Smarty_Compiler.class.php
deleted file mode 100644
index 1178b84d..00000000
--- a/includes/smarty/Smarty_Compiler.class.php
+++ /dev/null
@@ -1,2365 +0,0 @@
-
- * @author Andrei Zmievski 
- * @version 2.6.26
- * @copyright 2001-2005 New Digital Group, Inc.
- * @package Smarty
- */
-
-/* $Id: Smarty_Compiler.class.php 3163 2009-06-17 14:39:24Z monte.ohrt $ */
-
-/**
- * Template compiling class
- * @package Smarty
- */
-class Smarty_Compiler extends Smarty {
-
-    // internal vars
-    /**#@+
-     * @access private
-     */
-    var $_folded_blocks         =   array();    // keeps folded template blocks
-    var $_current_file          =   null;       // the current template being compiled
-    var $_current_line_no       =   1;          // line number for error messages
-    var $_capture_stack         =   array();    // keeps track of nested capture buffers
-    var $_plugin_info           =   array();    // keeps track of plugins to load
-    var $_init_smarty_vars      =   false;
-    var $_permitted_tokens      =   array('true','false','yes','no','on','off','null');
-    var $_db_qstr_regexp        =   null;        // regexps are setup in the constructor
-    var $_si_qstr_regexp        =   null;
-    var $_qstr_regexp           =   null;
-    var $_func_regexp           =   null;
-    var $_reg_obj_regexp        =   null;
-    var $_var_bracket_regexp    =   null;
-    var $_num_const_regexp      =   null;
-    var $_dvar_guts_regexp      =   null;
-    var $_dvar_regexp           =   null;
-    var $_cvar_regexp           =   null;
-    var $_svar_regexp           =   null;
-    var $_avar_regexp           =   null;
-    var $_mod_regexp            =   null;
-    var $_var_regexp            =   null;
-    var $_parenth_param_regexp  =   null;
-    var $_func_call_regexp      =   null;
-    var $_obj_ext_regexp        =   null;
-    var $_obj_start_regexp      =   null;
-    var $_obj_params_regexp     =   null;
-    var $_obj_call_regexp       =   null;
-    var $_cacheable_state       =   0;
-    var $_cache_attrs_count     =   0;
-    var $_nocache_count         =   0;
-    var $_cache_serial          =   null;
-    var $_cache_include         =   null;
-
-    var $_strip_depth           =   0;
-    var $_additional_newline    =   "\n";
-
-    /**#@-*/
-    /**
-     * The class constructor.
-     */
-    function Smarty_Compiler()
-    {
-        // matches double quoted strings:
-        // "foobar"
-        // "foo\"bar"
-        $this->_db_qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"';
-
-        // matches single quoted strings:
-        // 'foobar'
-        // 'foo\'bar'
-        $this->_si_qstr_regexp = '\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
-
-        // matches single or double quoted strings
-        $this->_qstr_regexp = '(?:' . $this->_db_qstr_regexp . '|' . $this->_si_qstr_regexp . ')';
-
-        // matches bracket portion of vars
-        // [0]
-        // [foo]
-        // [$bar]
-        $this->_var_bracket_regexp = '\[\$?[\w\.]+\]';
-
-        // matches numerical constants
-        // 30
-        // -12
-        // 13.22
-        $this->_num_const_regexp = '(?:\-?\d+(?:\.\d+)?)';
-
-        // matches $ vars (not objects):
-        // $foo
-        // $foo.bar
-        // $foo.bar.foobar
-        // $foo[0]
-        // $foo[$bar]
-        // $foo[5][blah]
-        // $foo[5].bar[$foobar][4]
-        $this->_dvar_math_regexp = '(?:[\+\*\/\%]|(?:-(?!>)))';
-        $this->_dvar_math_var_regexp = '[\$\w\.\+\-\*\/\%\d\>\[\]]';
-        $this->_dvar_guts_regexp = '\w+(?:' . $this->_var_bracket_regexp
-                . ')*(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . ')*)*(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?';
-        $this->_dvar_regexp = '\$' . $this->_dvar_guts_regexp;
-
-        // matches config vars:
-        // #foo#
-        // #foobar123_foo#
-        $this->_cvar_regexp = '\#\w+\#';
-
-        // matches section vars:
-        // %foo.bar%
-        $this->_svar_regexp = '\%\w+\.\w+\%';
-
-        // matches all valid variables (no quotes, no modifiers)
-        $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|'
-           . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
-
-        // matches valid variable syntax:
-        // $foo
-        // $foo
-        // #foo#
-        // #foo#
-        // "text"
-        // "text"
-        $this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_qstr_regexp . ')';
-
-        // matches valid object call (one level of object nesting allowed in parameters):
-        // $foo->bar
-        // $foo->bar()
-        // $foo->bar("text")
-        // $foo->bar($foo, $bar, "text")
-        // $foo->bar($foo, "foo")
-        // $foo->bar->foo()
-        // $foo->bar->foo->bar()
-        // $foo->bar($foo->bar)
-        // $foo->bar($foo->bar())
-        // $foo->bar($foo->bar($blah,$foo,44,"foo",$foo[0].bar))
-        $this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')';
-        $this->_obj_restricted_param_regexp = '(?:'
-                . '(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')'
-                . '(?:\s*,\s*(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . '))*)?\))?)*)';
-        $this->_obj_single_param_regexp = '(?:\w+|' . $this->_obj_restricted_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
-                . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)';
-        $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
-                . '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
-        $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
-        $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
-        
-        // matches valid modifier syntax:
-        // |foo
-        // |@foo
-        // |foo:"bar"
-        // |foo:$bar
-        // |foo:"bar":$foobar
-        // |foo|bar
-        // |foo:$foo->bar
-        $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|'
-           . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
-
-        // matches valid function name:
-        // foo123
-        // _foo_bar
-        $this->_func_regexp = '[a-zA-Z_]\w*';
-
-        // matches valid registered object:
-        // foo->bar
-        $this->_reg_obj_regexp = '[a-zA-Z_]\w*->[a-zA-Z_]\w*';
-
-        // matches valid parameter values:
-        // true
-        // $foo
-        // $foo|bar
-        // #foo#
-        // #foo#|bar
-        // "text"
-        // "text"|bar
-        // $foo->bar
-        $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|'
-           . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
-
-        // matches valid parenthesised function parameters:
-        //
-        // "text"
-        //    $foo, $bar, "text"
-        // $foo|bar, "foo"|bar, $foo->bar($foo)|bar
-        $this->_parenth_param_regexp = '(?:\((?:\w+|'
-                . $this->_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
-                . $this->_param_regexp . ')))*)?\))';
-
-        // matches valid function call:
-        // foo()
-        // foo_bar($foo)
-        // _foo_bar($foo,"bar")
-        // foo123($foo,$foo->bar(),"foo")
-        $this->_func_call_regexp = '(?:' . $this->_func_regexp . '\s*(?:'
-           . $this->_parenth_param_regexp . '))';
-    }
-
-    /**
-     * compile a resource
-     *
-     * sets $compiled_content to the compiled source
-     * @param string $resource_name
-     * @param string $source_content
-     * @param string $compiled_content
-     * @return true
-     */
-    function _compile_file($resource_name, $source_content, &$compiled_content)
-    {
-
-        if ($this->security) {
-            // do not allow php syntax to be executed unless specified
-            if ($this->php_handling == SMARTY_PHP_ALLOW &&
-                !$this->security_settings['PHP_HANDLING']) {
-                $this->php_handling = SMARTY_PHP_PASSTHRU;
-            }
-        }
-
-        $this->_load_filters();
-
-        $this->_current_file = $resource_name;
-        $this->_current_line_no = 1;
-        $ldq = preg_quote($this->left_delimiter, '~');
-        $rdq = preg_quote($this->right_delimiter, '~');
-
-        // run template source through prefilter functions
-        if (count($this->_plugins['prefilter']) > 0) {
-            foreach ($this->_plugins['prefilter'] as $filter_name => $prefilter) {
-                if ($prefilter === false) continue;
-                if ($prefilter[3] || is_callable($prefilter[0])) {
-                    $source_content = call_user_func_array($prefilter[0],
-                                                            array($source_content, &$this));
-                    $this->_plugins['prefilter'][$filter_name][3] = true;
-                } else {
-                    $this->_trigger_fatal_error("[plugin] prefilter '$filter_name' is not implemented");
-                }
-            }
-        }
-
-        /* fetch all special blocks */
-        $search = "~{$ldq}\*(.*?)\*{$rdq}|{$ldq}\s*literal\s*{$rdq}(.*?){$ldq}\s*/literal\s*{$rdq}|{$ldq}\s*php\s*{$rdq}(.*?){$ldq}\s*/php\s*{$rdq}~s";
-
-        preg_match_all($search, $source_content, $match,  PREG_SET_ORDER);
-        $this->_folded_blocks = $match;
-        reset($this->_folded_blocks);
-
-        /* replace special blocks by "{php}" */
-        $source_content = preg_replace($search.'e', "'"
-                                       . $this->_quote_replace($this->left_delimiter) . 'php'
-                                       . "' . str_repeat(\"\n\", substr_count('\\0', \"\n\")) .'"
-                                       . $this->_quote_replace($this->right_delimiter)
-                                       . "'"
-                                       , $source_content);
-
-        /* Gather all template tags. */
-        preg_match_all("~{$ldq}\s*(.*?)\s*{$rdq}~s", $source_content, $_match);
-        $template_tags = $_match[1];
-        /* Split content by template tags to obtain non-template content. */
-        $text_blocks = preg_split("~{$ldq}.*?{$rdq}~s", $source_content);
-
-        /* loop through text blocks */
-        for ($curr_tb = 0, $for_max = count($text_blocks); $curr_tb < $for_max; $curr_tb++) {
-            /* match anything resembling php tags */
-            if (preg_match_all('~(<\?(?:\w+|=)?|\?>|language\s*=\s*[\"\']?\s*php\s*[\"\']?)~is', $text_blocks[$curr_tb], $sp_match)) {
-                /* replace tags with placeholders to prevent recursive replacements */
-                $sp_match[1] = array_unique($sp_match[1]);
-                usort($sp_match[1], '_smarty_sort_length');
-                for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) {
-                    $text_blocks[$curr_tb] = str_replace($sp_match[1][$curr_sp],'%%%SMARTYSP'.$curr_sp.'%%%',$text_blocks[$curr_tb]);
-                }
-                /* process each one */
-                for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) {
-                    if ($this->php_handling == SMARTY_PHP_PASSTHRU) {
-                        /* echo php contents */
-                        $text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', ''."\n", $text_blocks[$curr_tb]);
-                    } else if ($this->php_handling == SMARTY_PHP_QUOTE) {
-                        /* quote php tags */
-                        $text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', htmlspecialchars($sp_match[1][$curr_sp]), $text_blocks[$curr_tb]);
-                    } else if ($this->php_handling == SMARTY_PHP_REMOVE) {
-                        /* remove php tags */
-                        $text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', '', $text_blocks[$curr_tb]);
-                    } else {
-                        /* SMARTY_PHP_ALLOW, but echo non php starting tags */
-                        $sp_match[1][$curr_sp] = preg_replace('~(<\?(?!php|=|$))~i', ''."\n", $sp_match[1][$curr_sp]);
-                        $text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', $sp_match[1][$curr_sp], $text_blocks[$curr_tb]);
-                    }
-                }
-            }
-        }
-        
-        /* Compile the template tags into PHP code. */
-        $compiled_tags = array();
-        for ($i = 0, $for_max = count($template_tags); $i < $for_max; $i++) {
-            $this->_current_line_no += substr_count($text_blocks[$i], "\n");
-            $compiled_tags[] = $this->_compile_tag($template_tags[$i]);
-            $this->_current_line_no += substr_count($template_tags[$i], "\n");
-        }
-        if (count($this->_tag_stack)>0) {
-            list($_open_tag, $_line_no) = end($this->_tag_stack);
-            $this->_syntax_error("unclosed tag \{$_open_tag} (opened line $_line_no).", E_USER_ERROR, __FILE__, __LINE__);
-            return;
-        }
-
-        /* Reformat $text_blocks between 'strip' and '/strip' tags,
-           removing spaces, tabs and newlines. */
-        $strip = false;
-        for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
-            if ($compiled_tags[$i] == '{strip}') {
-                $compiled_tags[$i] = '';
-                $strip = true;
-                /* remove leading whitespaces */
-                $text_blocks[$i + 1] = ltrim($text_blocks[$i + 1]);
-            }
-            if ($strip) {
-                /* strip all $text_blocks before the next '/strip' */
-                for ($j = $i + 1; $j < $for_max; $j++) {
-                    /* remove leading and trailing whitespaces of each line */
-                    $text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]);
-                    if ($compiled_tags[$j] == '{/strip}') {                       
-                        /* remove trailing whitespaces from the last text_block */
-                        $text_blocks[$j] = rtrim($text_blocks[$j]);
-                    }
-                    $text_blocks[$j] = ""\'", "\\"=>"\\\\")) . "'; ?>";
-                    if ($compiled_tags[$j] == '{/strip}') {
-                        $compiled_tags[$j] = "\n"; /* slurped by php, but necessary
-                                    if a newline is following the closing strip-tag */
-                        $strip = false;
-                        $i = $j;
-                        break;
-                    }
-                }
-            }
-        }
-        $compiled_content = '';
-        
-        $tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%';
-        
-        /* Interleave the compiled contents and text blocks to get the final result. */
-        for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
-            if ($compiled_tags[$i] == '') {
-                // tag result empty, remove first newline from following text block
-                $text_blocks[$i+1] = preg_replace('~^(\r\n|\r|\n)~', '', $text_blocks[$i+1]);
-            }
-            // replace legit PHP tags with placeholder
-            $text_blocks[$i] = str_replace('\n", $compiled_content);
-        $compiled_content = preg_replace("~(?\n", $compiled_content);
-
-        // recover legit tags
-        $compiled_content = str_replace($tag_guard, '_cache_serial)) {
-            $compiled_content = "_cache_serials['".$this->_cache_include."'] = '".$this->_cache_serial."'; ?>" . $compiled_content;
-        }
-
-        // run compiled template through postfilter functions
-        if (count($this->_plugins['postfilter']) > 0) {
-            foreach ($this->_plugins['postfilter'] as $filter_name => $postfilter) {
-                if ($postfilter === false) continue;
-                if ($postfilter[3] || is_callable($postfilter[0])) {
-                    $compiled_content = call_user_func_array($postfilter[0],
-                                                              array($compiled_content, &$this));
-                    $this->_plugins['postfilter'][$filter_name][3] = true;
-                } else {
-                    $this->_trigger_fatal_error("Smarty plugin error: postfilter '$filter_name' is not implemented");
-                }
-            }
-        }
-
-        // put header at the top of the compiled template
-        $template_header = "_version.", created on ".strftime("%Y-%m-%d %H:%M:%S")."\n";
-        $template_header .= "         compiled from ".strtr(urlencode($resource_name), array('%2F'=>'/', '%3A'=>':'))." */ ?>\n";
-
-        /* Emit code to load needed plugins. */
-        $this->_plugins_code = '';
-        if (count($this->_plugin_info)) {
-            $_plugins_params = "array('plugins' => array(";
-            foreach ($this->_plugin_info as $plugin_type => $plugins) {
-                foreach ($plugins as $plugin_name => $plugin_info) {
-                    $_plugins_params .= "array('$plugin_type', '$plugin_name', '" . strtr($plugin_info[0], array("'" => "\\'", "\\" => "\\\\")) . "', $plugin_info[1], ";
-                    $_plugins_params .= $plugin_info[2] ? 'true),' : 'false),';
-                }
-            }
-            $_plugins_params .= '))';
-            $plugins_code = "\n";
-            $template_header .= $plugins_code;
-            $this->_plugin_info = array();
-            $this->_plugins_code = $plugins_code;
-        }
-
-        if ($this->_init_smarty_vars) {
-            $template_header .= "\n";
-            $this->_init_smarty_vars = false;
-        }
-
-        $compiled_content = $template_header . $compiled_content;
-        return true;
-    }
-
-    /**
-     * Compile a template tag
-     *
-     * @param string $template_tag
-     * @return string
-     */
-    function _compile_tag($template_tag)
-    {
-        /* Matched comment. */
-        if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*')
-            return '';
-        
-        /* Split tag into two three parts: command, command modifiers and the arguments. */
-        if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp
-                . '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*))
-                      (?:\s+(.*))?$
-                    ~xs', $template_tag, $match)) {
-            $this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__);
-        }
-        
-        $tag_command = $match[1];
-        $tag_modifier = isset($match[2]) ? $match[2] : null;
-        $tag_args = isset($match[3]) ? $match[3] : null;
-
-        if (preg_match('~^' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '$~', $tag_command)) {
-            /* tag name is a variable or object */
-            $_return = $this->_parse_var_props($tag_command . $tag_modifier);
-            return "" . $this->_additional_newline;
-        }
-
-        /* If the tag name is a registered object, we process it. */
-        if (preg_match('~^\/?' . $this->_reg_obj_regexp . '$~', $tag_command)) {
-            return $this->_compile_registered_object_tag($tag_command, $this->_parse_attrs($tag_args), $tag_modifier);
-        }
-
-        switch ($tag_command) {
-            case 'include':
-                return $this->_compile_include_tag($tag_args);
-
-            case 'include_php':
-                return $this->_compile_include_php_tag($tag_args);
-
-            case 'if':
-                $this->_push_tag('if');
-                return $this->_compile_if_tag($tag_args);
-
-            case 'else':
-                list($_open_tag) = end($this->_tag_stack);
-                if ($_open_tag != 'if' && $_open_tag != 'elseif')
-                    $this->_syntax_error('unexpected {else}', E_USER_ERROR, __FILE__, __LINE__);
-                else
-                    $this->_push_tag('else');
-                return '';
-
-            case 'elseif':
-                list($_open_tag) = end($this->_tag_stack);
-                if ($_open_tag != 'if' && $_open_tag != 'elseif')
-                    $this->_syntax_error('unexpected {elseif}', E_USER_ERROR, __FILE__, __LINE__);
-                if ($_open_tag == 'if')
-                    $this->_push_tag('elseif');
-                return $this->_compile_if_tag($tag_args, true);
-
-            case '/if':
-                $this->_pop_tag('if');
-                return '';
-
-            case 'capture':
-                return $this->_compile_capture_tag(true, $tag_args);
-
-            case '/capture':
-                return $this->_compile_capture_tag(false);
-
-            case 'ldelim':
-                return $this->left_delimiter;
-
-            case 'rdelim':
-                return $this->right_delimiter;
-
-            case 'section':
-                $this->_push_tag('section');
-                return $this->_compile_section_start($tag_args);
-
-            case 'sectionelse':
-                $this->_push_tag('sectionelse');
-                return "";
-                break;
-
-            case '/section':
-                $_open_tag = $this->_pop_tag('section');
-                if ($_open_tag == 'sectionelse')
-                    return "";
-                else
-                    return "";
-
-            case 'foreach':
-                $this->_push_tag('foreach');
-                return $this->_compile_foreach_start($tag_args);
-                break;
-
-            case 'foreachelse':
-                $this->_push_tag('foreachelse');
-                return "";
-
-            case '/foreach':
-                $_open_tag = $this->_pop_tag('foreach');
-                if ($_open_tag == 'foreachelse')
-                    return "";
-                else
-                    return "";
-                break;
-
-            case 'strip':
-            case '/strip':
-                if (substr($tag_command, 0, 1)=='/') {
-                    $this->_pop_tag('strip');
-                    if (--$this->_strip_depth==0) { /* outermost closing {/strip} */
-                        $this->_additional_newline = "\n";
-                        return '{' . $tag_command . '}';
-                    }
-                } else {
-                    $this->_push_tag('strip');
-                    if ($this->_strip_depth++==0) { /* outermost opening {strip} */
-                        $this->_additional_newline = "";
-                        return '{' . $tag_command . '}';
-                    }
-                }
-                return '';
-
-            case 'php':
-                /* handle folded tags replaced by {php} */
-                list(, $block) = each($this->_folded_blocks);
-                $this->_current_line_no += substr_count($block[0], "\n");
-                /* the number of matched elements in the regexp in _compile_file()
-                   determins the type of folded tag that was found */
-                switch (count($block)) {
-                    case 2: /* comment */
-                        return '';
-
-                    case 3: /* literal */
-                        return ""\'", "\\"=>"\\\\")) . "'; ?>" . $this->_additional_newline;
-
-                    case 4: /* php */
-                        if ($this->security && !$this->security_settings['PHP_TAGS']) {
-                            $this->_syntax_error("(secure mode) php tags not permitted", E_USER_WARNING, __FILE__, __LINE__);
-                            return;
-                        }
-                        return '';
-                }
-                break;
-
-            case 'insert':
-                return $this->_compile_insert_tag($tag_args);
-
-            default:
-                if ($this->_compile_compiler_tag($tag_command, $tag_args, $output)) {
-                    return $output;
-                } else if ($this->_compile_block_tag($tag_command, $tag_args, $tag_modifier, $output)) {
-                    return $output;
-                } else if ($this->_compile_custom_tag($tag_command, $tag_args, $tag_modifier, $output)) {
-                    return $output;                    
-                } else {
-                    $this->_syntax_error("unrecognized tag '$tag_command'", E_USER_ERROR, __FILE__, __LINE__);
-                }
-
-        }
-    }
-
-
-    /**
-     * compile the custom compiler tag
-     *
-     * sets $output to the compiled custom compiler tag
-     * @param string $tag_command
-     * @param string $tag_args
-     * @param string $output
-     * @return boolean
-     */
-    function _compile_compiler_tag($tag_command, $tag_args, &$output)
-    {
-        $found = false;
-        $have_function = true;
-
-        /*
-         * First we check if the compiler function has already been registered
-         * or loaded from a plugin file.
-         */
-        if (isset($this->_plugins['compiler'][$tag_command])) {
-            $found = true;
-            $plugin_func = $this->_plugins['compiler'][$tag_command][0];
-            if (!is_callable($plugin_func)) {
-                $message = "compiler function '$tag_command' is not implemented";
-                $have_function = false;
-            }
-        }
-        /*
-         * Otherwise we need to load plugin file and look for the function
-         * inside it.
-         */
-        else if ($plugin_file = $this->_get_plugin_filepath('compiler', $tag_command)) {
-            $found = true;
-
-            include_once $plugin_file;
-
-            $plugin_func = 'smarty_compiler_' . $tag_command;
-            if (!is_callable($plugin_func)) {
-                $message = "plugin function $plugin_func() not found in $plugin_file\n";
-                $have_function = false;
-            } else {
-                $this->_plugins['compiler'][$tag_command] = array($plugin_func, null, null, null, true);
-            }
-        }
-
-        /*
-         * True return value means that we either found a plugin or a
-         * dynamically registered function. False means that we didn't and the
-         * compiler should now emit code to load custom function plugin for this
-         * tag.
-         */
-        if ($found) {
-            if ($have_function) {
-                $output = call_user_func_array($plugin_func, array($tag_args, &$this));
-                if($output != '') {
-                $output = '_push_cacheable_state('compiler', $tag_command)
-                                   . $output
-                                   . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>';
-                }
-            } else {
-                $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     * compile block function tag
-     *
-     * sets $output to compiled block function tag
-     * @param string $tag_command
-     * @param string $tag_args
-     * @param string $tag_modifier
-     * @param string $output
-     * @return boolean
-     */
-    function _compile_block_tag($tag_command, $tag_args, $tag_modifier, &$output)
-    {
-        if (substr($tag_command, 0, 1) == '/') {
-            $start_tag = false;
-            $tag_command = substr($tag_command, 1);
-        } else
-            $start_tag = true;
-
-        $found = false;
-        $have_function = true;
-
-        /*
-         * First we check if the block function has already been registered
-         * or loaded from a plugin file.
-         */
-        if (isset($this->_plugins['block'][$tag_command])) {
-            $found = true;
-            $plugin_func = $this->_plugins['block'][$tag_command][0];
-            if (!is_callable($plugin_func)) {
-                $message = "block function '$tag_command' is not implemented";
-                $have_function = false;
-            }
-        }
-        /*
-         * Otherwise we need to load plugin file and look for the function
-         * inside it.
-         */
-        else if ($plugin_file = $this->_get_plugin_filepath('block', $tag_command)) {
-            $found = true;
-
-            include_once $plugin_file;
-
-            $plugin_func = 'smarty_block_' . $tag_command;
-            if (!function_exists($plugin_func)) {
-                $message = "plugin function $plugin_func() not found in $plugin_file\n";
-                $have_function = false;
-            } else {
-                $this->_plugins['block'][$tag_command] = array($plugin_func, null, null, null, true);
-
-            }
-        }
-
-        if (!$found) {
-            return false;
-        } else if (!$have_function) {
-            $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
-            return true;
-        }
-
-        /*
-         * Even though we've located the plugin function, compilation
-         * happens only once, so the plugin will still need to be loaded
-         * at runtime for future requests.
-         */
-        $this->_add_plugin('block', $tag_command);
-
-        if ($start_tag)
-            $this->_push_tag($tag_command);
-        else
-            $this->_pop_tag($tag_command);
-
-        if ($start_tag) {
-            $output = '_push_cacheable_state('block', $tag_command);
-            $attrs = $this->_parse_attrs($tag_args);
-            $_cache_attrs='';
-            $arg_list = $this->_compile_arg_list('block', $tag_command, $attrs, $_cache_attrs);
-            $output .= "$_cache_attrs\$this->_tag_stack[] = array('$tag_command', array(".implode(',', $arg_list).')); ';
-            $output .= '$_block_repeat=true;' . $this->_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], null, $this, $_block_repeat);';
-            $output .= 'while ($_block_repeat) { ob_start(); ?>';
-        } else {
-            $output = '_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], $_block_content, $this, $_block_repeat)';
-            if ($tag_modifier != '') {
-                $this->_parse_modifiers($_out_tag_text, $tag_modifier);
-            }
-            $output .= '$_block_repeat=false;echo ' . $_out_tag_text . '; } ';
-            $output .= " array_pop(\$this->_tag_stack); " . $this->_pop_cacheable_state('block', $tag_command) . '?>';
-        }
-
-        return true;
-    }
-
-
-    /**
-     * compile custom function tag
-     *
-     * @param string $tag_command
-     * @param string $tag_args
-     * @param string $tag_modifier
-     * @return string
-     */
-    function _compile_custom_tag($tag_command, $tag_args, $tag_modifier, &$output)
-    {
-        $found = false;
-        $have_function = true;
-
-        /*
-         * First we check if the custom function has already been registered
-         * or loaded from a plugin file.
-         */
-        if (isset($this->_plugins['function'][$tag_command])) {
-            $found = true;
-            $plugin_func = $this->_plugins['function'][$tag_command][0];
-            if (!is_callable($plugin_func)) {
-                $message = "custom function '$tag_command' is not implemented";
-                $have_function = false;
-            }
-        }
-        /*
-         * Otherwise we need to load plugin file and look for the function
-         * inside it.
-         */
-        else if ($plugin_file = $this->_get_plugin_filepath('function', $tag_command)) {
-            $found = true;
-
-            include_once $plugin_file;
-
-            $plugin_func = 'smarty_function_' . $tag_command;
-            if (!function_exists($plugin_func)) {
-                $message = "plugin function $plugin_func() not found in $plugin_file\n";
-                $have_function = false;
-            } else {
-                $this->_plugins['function'][$tag_command] = array($plugin_func, null, null, null, true);
-
-            }
-        }
-
-        if (!$found) {
-            return false;
-        } else if (!$have_function) {
-            $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
-            return true;
-        }
-
-        /* declare plugin to be loaded on display of the template that
-           we compile right now */
-        $this->_add_plugin('function', $tag_command);
-
-        $_cacheable_state = $this->_push_cacheable_state('function', $tag_command);
-        $attrs = $this->_parse_attrs($tag_args);
-        $_cache_attrs = '';
-        $arg_list = $this->_compile_arg_list('function', $tag_command, $attrs, $_cache_attrs);
-
-        $output = $this->_compile_plugin_call('function', $tag_command).'(array('.implode(',', $arg_list)."), \$this)";
-        if($tag_modifier != '') {
-            $this->_parse_modifiers($output, $tag_modifier);
-        }
-
-        if($output != '') {
-            $output =  '_pop_cacheable_state('function', $tag_command) . "?>" . $this->_additional_newline;
-        }
-
-        return true;
-    }
-
-    /**
-     * compile a registered object tag
-     *
-     * @param string $tag_command
-     * @param array $attrs
-     * @param string $tag_modifier
-     * @return string
-     */
-    function _compile_registered_object_tag($tag_command, $attrs, $tag_modifier)
-    {
-        if (substr($tag_command, 0, 1) == '/') {
-            $start_tag = false;
-            $tag_command = substr($tag_command, 1);
-        } else {
-            $start_tag = true;
-        }
-
-        list($object, $obj_comp) = explode('->', $tag_command);
-
-        $arg_list = array();
-        if(count($attrs)) {
-            $_assign_var = false;
-            foreach ($attrs as $arg_name => $arg_value) {
-                if($arg_name == 'assign') {
-                    $_assign_var = $arg_value;
-                    unset($attrs['assign']);
-                    continue;
-                }
-                if (is_bool($arg_value))
-                    $arg_value = $arg_value ? 'true' : 'false';
-                $arg_list[] = "'$arg_name' => $arg_value";
-            }
-        }
-
-        if($this->_reg_objects[$object][2]) {
-            // smarty object argument format
-            $args = "array(".implode(',', (array)$arg_list)."), \$this";
-        } else {
-            // traditional argument format
-            $args = implode(',', array_values($attrs));
-            if (empty($args)) {
-                $args = '';
-            }
-        }
-
-        $prefix = '';
-        $postfix = '';
-        $newline = '';
-        if(!is_object($this->_reg_objects[$object][0])) {
-            $this->_trigger_fatal_error("registered '$object' is not an object" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
-        } elseif(!empty($this->_reg_objects[$object][1]) && !in_array($obj_comp, $this->_reg_objects[$object][1])) {
-            $this->_trigger_fatal_error("'$obj_comp' is not a registered component of object '$object'", $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
-        } elseif(method_exists($this->_reg_objects[$object][0], $obj_comp)) {
-            // method
-            if(in_array($obj_comp, $this->_reg_objects[$object][3])) {
-                // block method
-                if ($start_tag) {
-                    $prefix = "\$this->_tag_stack[] = array('$obj_comp', $args); ";
-                    $prefix .= "\$_block_repeat=true; \$this->_reg_objects['$object'][0]->$obj_comp(\$this->_tag_stack[count(\$this->_tag_stack)-1][1], null, \$this, \$_block_repeat); ";
-                    $prefix .= "while (\$_block_repeat) { ob_start();";
-                    $return = null;
-                    $postfix = '';
-                } else {
-                    $prefix = "\$_obj_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;";
-                    $return = "\$this->_reg_objects['$object'][0]->$obj_comp(\$this->_tag_stack[count(\$this->_tag_stack)-1][1], \$_obj_block_content, \$this, \$_block_repeat)";
-                    $postfix = "} array_pop(\$this->_tag_stack);";
-                }
-            } else {
-                // non-block method
-                $return = "\$this->_reg_objects['$object'][0]->$obj_comp($args)";
-            }
-        } else {
-            // property
-            $return = "\$this->_reg_objects['$object'][0]->$obj_comp";
-        }
-
-        if($return != null) {
-            if($tag_modifier != '') {
-                $this->_parse_modifiers($return, $tag_modifier);
-            }
-
-            if(!empty($_assign_var)) {
-                $output = "\$this->assign('" . $this->_dequote($_assign_var) ."',  $return);";
-            } else {
-                $output = 'echo ' . $return . ';';
-                $newline = $this->_additional_newline;
-            }
-        } else {
-            $output = '';
-        }
-
-        return '" . $newline;
-    }
-
-    /**
-     * Compile {insert ...} tag
-     *
-     * @param string $tag_args
-     * @return string
-     */
-    function _compile_insert_tag($tag_args)
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-        $name = $this->_dequote($attrs['name']);
-
-        if (empty($name)) {
-            return $this->_syntax_error("missing insert name", E_USER_ERROR, __FILE__, __LINE__);
-        }
-        
-        if (!preg_match('~^\w+$~', $name)) {
-            return $this->_syntax_error("'insert: 'name' must be an insert function name", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        if (!empty($attrs['script'])) {
-            $delayed_loading = true;
-        } else {
-            $delayed_loading = false;
-        }
-
-        foreach ($attrs as $arg_name => $arg_value) {
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
-            $arg_list[] = "'$arg_name' => $arg_value";
-        }
-
-        $this->_add_plugin('insert', $name, $delayed_loading);
-
-        $_params = "array('args' => array(".implode(', ', (array)$arg_list)."))";
-
-        return "" . $this->_additional_newline;
-    }
-
-    /**
-     * Compile {include ...} tag
-     *
-     * @param string $tag_args
-     * @return string
-     */
-    function _compile_include_tag($tag_args)
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-        $arg_list = array();
-
-        if (empty($attrs['file'])) {
-            $this->_syntax_error("missing 'file' attribute in include tag", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        foreach ($attrs as $arg_name => $arg_value) {
-            if ($arg_name == 'file') {
-                $include_file = $arg_value;
-                continue;
-            } else if ($arg_name == 'assign') {
-                $assign_var = $arg_value;
-                continue;
-            }
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
-            $arg_list[] = "'$arg_name' => $arg_value";
-        }
-
-        $output = '_tpl_vars;\n";
-
-
-        $_params = "array('smarty_include_tpl_file' => " . $include_file . ", 'smarty_include_vars' => array(".implode(',', (array)$arg_list)."))";
-        $output .= "\$this->_smarty_include($_params);\n" .
-        "\$this->_tpl_vars = \$_smarty_tpl_vars;\n" .
-        "unset(\$_smarty_tpl_vars);\n";
-
-        if (isset($assign_var)) {
-            $output .= "\$this->assign(" . $assign_var . ", ob_get_contents()); ob_end_clean();\n";
-        }
-
-        $output .= ' ?>';
-
-        return $output;
-
-    }
-
-    /**
-     * Compile {include ...} tag
-     *
-     * @param string $tag_args
-     * @return string
-     */
-    function _compile_include_php_tag($tag_args)
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-
-        if (empty($attrs['file'])) {
-            $this->_syntax_error("missing 'file' attribute in include_php tag", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        $assign_var = (empty($attrs['assign'])) ? '' : $this->_dequote($attrs['assign']);
-        $once_var = (empty($attrs['once']) || $attrs['once']=='false') ? 'false' : 'true';
-
-        $arg_list = array();
-        foreach($attrs as $arg_name => $arg_value) {
-            if($arg_name != 'file' AND $arg_name != 'once' AND $arg_name != 'assign') {
-                if(is_bool($arg_value))
-                    $arg_value = $arg_value ? 'true' : 'false';
-                $arg_list[] = "'$arg_name' => $arg_value";
-            }
-        }
-
-        $_params = "array('smarty_file' => " . $attrs['file'] . ", 'smarty_assign' => '$assign_var', 'smarty_once' => $once_var, 'smarty_include_vars' => array(".implode(',', $arg_list)."))";
-
-        return "" . $this->_additional_newline;
-    }
-
-
-    /**
-     * Compile {section ...} tag
-     *
-     * @param string $tag_args
-     * @return string
-     */
-    function _compile_section_start($tag_args)
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-        $arg_list = array();
-
-        $output = '_syntax_error("missing section name", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        $output .= "unset(\$this->_sections[$section_name]);\n";
-        $section_props = "\$this->_sections[$section_name]";
-
-        foreach ($attrs as $attr_name => $attr_value) {
-            switch ($attr_name) {
-                case 'loop':
-                    $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n";
-                    break;
-
-                case 'show':
-                    if (is_bool($attr_value))
-                        $show_attr_value = $attr_value ? 'true' : 'false';
-                    else
-                        $show_attr_value = "(bool)$attr_value";
-                    $output .= "{$section_props}['show'] = $show_attr_value;\n";
-                    break;
-
-                case 'name':
-                    $output .= "{$section_props}['$attr_name'] = $attr_value;\n";
-                    break;
-
-                case 'max':
-                case 'start':
-                    $output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n";
-                    break;
-
-                case 'step':
-                    $output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n";
-                    break;
-
-                default:
-                    $this->_syntax_error("unknown section attribute - '$attr_name'", E_USER_ERROR, __FILE__, __LINE__);
-                    break;
-            }
-        }
-
-        if (!isset($attrs['show']))
-            $output .= "{$section_props}['show'] = true;\n";
-
-        if (!isset($attrs['loop']))
-            $output .= "{$section_props}['loop'] = 1;\n";
-
-        if (!isset($attrs['max']))
-            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
-        else
-            $output .= "if ({$section_props}['max'] < 0)\n" .
-                       "    {$section_props}['max'] = {$section_props}['loop'];\n";
-
-        if (!isset($attrs['step']))
-            $output .= "{$section_props}['step'] = 1;\n";
-
-        if (!isset($attrs['start']))
-            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
-        else {
-            $output .= "if ({$section_props}['start'] < 0)\n" .
-                       "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" .
-                       "else\n" .
-                       "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
-        }
-
-        $output .= "if ({$section_props}['show']) {\n";
-        if (!isset($attrs['start']) && !isset($attrs['step']) && !isset($attrs['max'])) {
-            $output .= "    {$section_props}['total'] = {$section_props}['loop'];\n";
-        } else {
-            $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
-        }
-        $output .= "    if ({$section_props}['total'] == 0)\n" .
-                   "        {$section_props}['show'] = false;\n" .
-                   "} else\n" .
-                   "    {$section_props}['total'] = 0;\n";
-
-        $output .= "if ({$section_props}['show']):\n";
-        $output .= "
-            for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
-                 {$section_props}['iteration'] <= {$section_props}['total'];
-                 {$section_props}['index'] += {$section_props}['step'], {$section_props}['iteration']++):\n";
-        $output .= "{$section_props}['rownum'] = {$section_props}['iteration'];\n";
-        $output .= "{$section_props}['index_prev'] = {$section_props}['index'] - {$section_props}['step'];\n";
-        $output .= "{$section_props}['index_next'] = {$section_props}['index'] + {$section_props}['step'];\n";
-        $output .= "{$section_props}['first']      = ({$section_props}['iteration'] == 1);\n";
-        $output .= "{$section_props}['last']       = ({$section_props}['iteration'] == {$section_props}['total']);\n";
-
-        $output .= "?>";
-
-        return $output;
-    }
-
-
-    /**
-     * Compile {foreach ...} tag.
-     *
-     * @param string $tag_args
-     * @return string
-     */
-    function _compile_foreach_start($tag_args)
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-        $arg_list = array();
-
-        if (empty($attrs['from'])) {
-            return $this->_syntax_error("foreach: missing 'from' attribute", E_USER_ERROR, __FILE__, __LINE__);
-        }
-        $from = $attrs['from'];
-
-        if (empty($attrs['item'])) {
-            return $this->_syntax_error("foreach: missing 'item' attribute", E_USER_ERROR, __FILE__, __LINE__);
-        }
-        $item = $this->_dequote($attrs['item']);
-        if (!preg_match('~^\w+$~', $item)) {
-            return $this->_syntax_error("foreach: 'item' must be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        if (isset($attrs['key'])) {
-            $key  = $this->_dequote($attrs['key']);
-            if (!preg_match('~^\w+$~', $key)) {
-                return $this->_syntax_error("foreach: 'key' must to be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__);
-            }
-            $key_part = "\$this->_tpl_vars['$key'] => ";
-        } else {
-            $key = null;
-            $key_part = '';
-        }
-
-        if (isset($attrs['name'])) {
-            $name = $attrs['name'];
-        } else {
-            $name = null;
-        }
-
-        $output = '_foreach[$name]";
-            $output .= "{$foreach_props} = array('total' => count(\$_from), 'iteration' => 0);\n";
-            $output .= "if ({$foreach_props}['total'] > 0):\n";
-            $output .= "    foreach (\$_from as $key_part\$this->_tpl_vars['$item']):\n";
-            $output .= "        {$foreach_props}['iteration']++;\n";
-        } else {
-            $output .= "if (count(\$_from)):\n";
-            $output .= "    foreach (\$_from as $key_part\$this->_tpl_vars['$item']):\n";
-        }
-        $output .= '?>';
-
-        return $output;
-    }
-
-
-    /**
-     * Compile {capture} .. {/capture} tags
-     *
-     * @param boolean $start true if this is the {capture} tag
-     * @param string $tag_args
-     * @return string
-     */
-
-    function _compile_capture_tag($start, $tag_args = '')
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-
-        if ($start) {
-            $buffer = isset($attrs['name']) ? $attrs['name'] : "'default'";
-            $assign = isset($attrs['assign']) ? $attrs['assign'] : null;
-            $append = isset($attrs['append']) ? $attrs['append'] : null;
-            
-            $output = "";
-            $this->_capture_stack[] = array($buffer, $assign, $append);
-        } else {
-            list($buffer, $assign, $append) = array_pop($this->_capture_stack);
-            $output = "_smarty_vars['capture'][$buffer] = ob_get_contents(); ";
-            if (isset($assign)) {
-                $output .= " \$this->assign($assign, ob_get_contents());";
-            }
-            if (isset($append)) {
-                $output .= " \$this->append($append, ob_get_contents());";
-            }
-            $output .= "ob_end_clean(); ?>";
-        }
-
-        return $output;
-    }
-
-    /**
-     * Compile {if ...} tag
-     *
-     * @param string $tag_args
-     * @param boolean $elseif if true, uses elseif instead of if
-     * @return string
-     */
-    function _compile_if_tag($tag_args, $elseif = false)
-    {
-
-        /* Tokenize args for 'if' tag. */
-        preg_match_all('~(?>
-                ' . $this->_obj_call_regexp . '(?:' . $this->_mod_regexp . '*)? | # valid object call
-                ' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)?    | # var or quoted string
-                \-?0[xX][0-9a-fA-F]+|\-?\d+(?:\.\d+)?|\.\d+|!==|===|==|!=|<>|<<|>>|<=|>=|\&\&|\|\||\(|\)|,|\!|\^|=|\&|\~|<|>|\||\%|\+|\-|\/|\*|\@    | # valid non-word token
-                \b\w+\b                                                        | # valid word token
-                \S+                                                           # anything else
-                )~x', $tag_args, $match);
-
-        $tokens = $match[0];
-
-        if(empty($tokens)) {
-            $_error_msg = $elseif ? "'elseif'" : "'if'";
-            $_error_msg .= ' statement requires arguments'; 
-            $this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__);
-        }
-            
-                
-        // make sure we have balanced parenthesis
-        $token_count = array_count_values($tokens);
-        if(isset($token_count['(']) && $token_count['('] != $token_count[')']) {
-            $this->_syntax_error("unbalanced parenthesis in if statement", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        $is_arg_stack = array();
-
-        for ($i = 0; $i < count($tokens); $i++) {
-
-            $token = &$tokens[$i];
-
-            switch (strtolower($token)) {
-                case '!':
-                case '%':
-                case '!==':
-                case '==':
-                case '===':
-                case '>':
-                case '<':
-                case '!=':
-                case '<>':
-                case '<<':
-                case '>>':
-                case '<=':
-                case '>=':
-                case '&&':
-                case '||':
-                case '|':
-                case '^':
-                case '&':
-                case '~':
-                case ')':
-                case ',':
-                case '+':
-                case '-':
-                case '*':
-                case '/':
-                case '@':
-                    break;
-
-                case 'eq':
-                    $token = '==';
-                    break;
-
-                case 'ne':
-                case 'neq':
-                    $token = '!=';
-                    break;
-
-                case 'lt':
-                    $token = '<';
-                    break;
-
-                case 'le':
-                case 'lte':
-                    $token = '<=';
-                    break;
-
-                case 'gt':
-                    $token = '>';
-                    break;
-
-                case 'ge':
-                case 'gte':
-                    $token = '>=';
-                    break;
-
-                case 'and':
-                    $token = '&&';
-                    break;
-
-                case 'or':
-                    $token = '||';
-                    break;
-
-                case 'not':
-                    $token = '!';
-                    break;
-
-                case 'mod':
-                    $token = '%';
-                    break;
-
-                case '(':
-                    array_push($is_arg_stack, $i);
-                    break;
-
-                case 'is':
-                    /* If last token was a ')', we operate on the parenthesized
-                       expression. The start of the expression is on the stack.
-                       Otherwise, we operate on the last encountered token. */
-                    if ($tokens[$i-1] == ')') {
-                        $is_arg_start = array_pop($is_arg_stack);
-                        if ($is_arg_start != 0) {
-                            if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) {
-                                $is_arg_start--;
-                            } 
-                        } 
-                    } else
-                        $is_arg_start = $i-1;
-                    /* Construct the argument for 'is' expression, so it knows
-                       what to operate on. */
-                    $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
-
-                    /* Pass all tokens from next one until the end to the
-                       'is' expression parsing function. The function will
-                       return modified tokens, where the first one is the result
-                       of the 'is' expression and the rest are the tokens it
-                       didn't touch. */
-                    $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
-
-                    /* Replace the old tokens with the new ones. */
-                    array_splice($tokens, $is_arg_start, count($tokens), $new_tokens);
-
-                    /* Adjust argument start so that it won't change from the
-                       current position for the next iteration. */
-                    $i = $is_arg_start;
-                    break;
-
-                default:
-                    if(preg_match('~^' . $this->_func_regexp . '$~', $token) ) {
-                            // function call
-                            if($this->security &&
-                               !in_array($token, $this->security_settings['IF_FUNCS'])) {
-                                $this->_syntax_error("(secure mode) '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
-                            }
-                    } elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') {
-                        // variable function call
-                        $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);                      
-                    } elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) {
-                        // object or variable
-                        $token = $this->_parse_var_props($token);
-                    } elseif(is_numeric($token)) {
-                        // number, skip it
-                    } else {
-                        $this->_syntax_error("unidentified token '$token'", E_USER_ERROR, __FILE__, __LINE__);
-                    }
-                    break;
-            }
-        }
-
-        if ($elseif)
-            return '';
-        else
-            return '';
-    }
-
-
-    function _compile_arg_list($type, $name, $attrs, &$cache_code) {
-        $arg_list = array();
-
-        if (isset($type) && isset($name)
-            && isset($this->_plugins[$type])
-            && isset($this->_plugins[$type][$name])
-            && empty($this->_plugins[$type][$name][4])
-            && is_array($this->_plugins[$type][$name][5])
-            ) {
-            /* we have a list of parameters that should be cached */
-            $_cache_attrs = $this->_plugins[$type][$name][5];
-            $_count = $this->_cache_attrs_count++;
-            $cache_code = "\$_cache_attrs =& \$this->_smarty_cache_attrs('$this->_cache_serial','$_count');";
-
-        } else {
-            /* no parameters are cached */
-            $_cache_attrs = null;
-        }
-
-        foreach ($attrs as $arg_name => $arg_value) {
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
-            if (is_null($arg_value))
-                $arg_value = 'null';
-            if ($_cache_attrs && in_array($arg_name, $_cache_attrs)) {
-                $arg_list[] = "'$arg_name' => (\$this->_cache_including) ? \$_cache_attrs['$arg_name'] : (\$_cache_attrs['$arg_name']=$arg_value)";
-            } else {
-                $arg_list[] = "'$arg_name' => $arg_value";
-            }
-        }
-        return $arg_list;
-    }
-
-    /**
-     * Parse is expression
-     *
-     * @param string $is_arg
-     * @param array $tokens
-     * @return array
-     */
-    function _parse_is_expr($is_arg, $tokens)
-    {
-        $expr_end = 0;
-        $negate_expr = false;
-
-        if (($first_token = array_shift($tokens)) == 'not') {
-            $negate_expr = true;
-            $expr_type = array_shift($tokens);
-        } else
-            $expr_type = $first_token;
-
-        switch ($expr_type) {
-            case 'even':
-                if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
-                    $expr_end++;
-                    $expr_arg = $tokens[$expr_end++];
-                    $expr = "!(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
-                } else
-                    $expr = "!(1 & $is_arg)";
-                break;
-
-            case 'odd':
-                if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
-                    $expr_end++;
-                    $expr_arg = $tokens[$expr_end++];
-                    $expr = "(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
-                } else
-                    $expr = "(1 & $is_arg)";
-                break;
-
-            case 'div':
-                if (@$tokens[$expr_end] == 'by') {
-                    $expr_end++;
-                    $expr_arg = $tokens[$expr_end++];
-                    $expr = "!($is_arg % " . $this->_parse_var_props($expr_arg) . ")";
-                } else {
-                    $this->_syntax_error("expecting 'by' after 'div'", E_USER_ERROR, __FILE__, __LINE__);
-                }
-                break;
-
-            default:
-                $this->_syntax_error("unknown 'is' expression - '$expr_type'", E_USER_ERROR, __FILE__, __LINE__);
-                break;
-        }
-
-        if ($negate_expr) {
-            $expr = "!($expr)";
-        }
-
-        array_splice($tokens, 0, $expr_end, $expr);
-
-        return $tokens;
-    }
-
-
-    /**
-     * Parse attribute string
-     *
-     * @param string $tag_args
-     * @return array
-     */
-    function _parse_attrs($tag_args)
-    {
-
-        /* Tokenize tag attributes. */
-        preg_match_all('~(?:' . $this->_obj_call_regexp . '|' . $this->_qstr_regexp . ' | (?>[^"\'=\s]+)
-                         )+ |
-                         [=]
-                        ~x', $tag_args, $match);
-        $tokens       = $match[0];
-
-        $attrs = array();
-        /* Parse state:
-            0 - expecting attribute name
-            1 - expecting '='
-            2 - expecting attribute value (not '=') */
-        $state = 0;
-
-        foreach ($tokens as $token) {
-            switch ($state) {
-                case 0:
-                    /* If the token is a valid identifier, we set attribute name
-                       and go to state 1. */
-                    if (preg_match('~^\w+$~', $token)) {
-                        $attr_name = $token;
-                        $state = 1;
-                    } else
-                        $this->_syntax_error("invalid attribute name: '$token'", E_USER_ERROR, __FILE__, __LINE__);
-                    break;
-
-                case 1:
-                    /* If the token is '=', then we go to state 2. */
-                    if ($token == '=') {
-                        $state = 2;
-                    } else
-                        $this->_syntax_error("expecting '=' after attribute name '$last_token'", E_USER_ERROR, __FILE__, __LINE__);
-                    break;
-
-                case 2:
-                    /* If token is not '=', we set the attribute value and go to
-                       state 0. */
-                    if ($token != '=') {
-                        /* We booleanize the token if it's a non-quoted possible
-                           boolean value. */
-                        if (preg_match('~^(on|yes|true)$~', $token)) {
-                            $token = 'true';
-                        } else if (preg_match('~^(off|no|false)$~', $token)) {
-                            $token = 'false';
-                        } else if ($token == 'null') {
-                            $token = 'null';
-                        } else if (preg_match('~^' . $this->_num_const_regexp . '|0[xX][0-9a-fA-F]+$~', $token)) {
-                            /* treat integer literally */
-                        } else if (!preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . ')*$~', $token)) {
-                            /* treat as a string, double-quote it escaping quotes */
-                            $token = '"'.addslashes($token).'"';
-                        }
-
-                        $attrs[$attr_name] = $token;
-                        $state = 0;
-                    } else
-                        $this->_syntax_error("'=' cannot be an attribute value", E_USER_ERROR, __FILE__, __LINE__);
-                    break;
-            }
-            $last_token = $token;
-        }
-
-        if($state != 0) {
-            if($state == 1) {
-                $this->_syntax_error("expecting '=' after attribute name '$last_token'", E_USER_ERROR, __FILE__, __LINE__);
-            } else {
-                $this->_syntax_error("missing attribute value", E_USER_ERROR, __FILE__, __LINE__);
-            }
-        }
-
-        $this->_parse_vars_props($attrs);
-
-        return $attrs;
-    }
-
-    /**
-     * compile multiple variables and section properties tokens into
-     * PHP code
-     *
-     * @param array $tokens
-     */
-    function _parse_vars_props(&$tokens)
-    {
-        foreach($tokens as $key => $val) {
-            $tokens[$key] = $this->_parse_var_props($val);
-        }
-    }
-
-    /**
-     * compile single variable and section properties token into
-     * PHP code
-     *
-     * @param string $val
-     * @param string $tag_attrs
-     * @return string
-     */
-    function _parse_var_props($val)
-    {
-        $val = trim($val);
-
-        if(preg_match('~^(' . $this->_obj_call_regexp . '|' . $this->_dvar_regexp . ')(' . $this->_mod_regexp . '*)$~', $val, $match)) {
-            // $ variable or object
-            $return = $this->_parse_var($match[1]);
-            $modifiers = $match[2];
-            if (!empty($this->default_modifiers) && !preg_match('~(^|\|)smarty:nodefaults($|\|)~',$modifiers)) {
-                $_default_mod_string = implode('|',(array)$this->default_modifiers);
-                $modifiers = empty($modifiers) ? $_default_mod_string : $_default_mod_string . '|' . $modifiers;
-            }
-            $this->_parse_modifiers($return, $modifiers);
-            return $return;
-        } elseif (preg_match('~^' . $this->_db_qstr_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
-                // double quoted text
-                preg_match('~^(' . $this->_db_qstr_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
-                $return = $this->_expand_quoted_text($match[1]);
-                if($match[2] != '') {
-                    $this->_parse_modifiers($return, $match[2]);
-                }
-                return $return;
-            }
-        elseif(preg_match('~^' . $this->_num_const_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
-                // numerical constant
-                preg_match('~^(' . $this->_num_const_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
-                if($match[2] != '') {
-                    $this->_parse_modifiers($match[1], $match[2]);
-                    return $match[1];
-                }
-            }
-        elseif(preg_match('~^' . $this->_si_qstr_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
-                // single quoted text
-                preg_match('~^(' . $this->_si_qstr_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
-                if($match[2] != '') {
-                    $this->_parse_modifiers($match[1], $match[2]);
-                    return $match[1];
-                }
-            }
-        elseif(preg_match('~^' . $this->_cvar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
-                // config var
-                return $this->_parse_conf_var($val);
-            }
-        elseif(preg_match('~^' . $this->_svar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
-                // section var
-                return $this->_parse_section_prop($val);
-            }
-        elseif(!in_array($val, $this->_permitted_tokens) && !is_numeric($val)) {
-            // literal string
-            return $this->_expand_quoted_text('"' . strtr($val, array('\\' => '\\\\', '"' => '\\"')) .'"');
-        }
-        return $val;
-    }
-
-    /**
-     * expand quoted text with embedded variables
-     *
-     * @param string $var_expr
-     * @return string
-     */
-    function _expand_quoted_text($var_expr)
-    {
-        // if contains unescaped $, expand it
-        if(preg_match_all('~(?:\`(?_dvar_guts_regexp . '(?:' . $this->_obj_ext_regexp . ')*\`)|(?:(?_parse_var(str_replace('`','',$_var)) . ')."';
-            }
-            $var_expr = strtr($var_expr, $_replace);
-            $_return = preg_replace('~\.""|(?_dvar_math_regexp.'|'.$this->_qstr_regexp.')~', $var_expr, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-        if(count($_math_vars) > 1) {
-            $_first_var = "";
-            $_complete_var = "";
-            $_output = "";
-            // simple check if there is any math, to stop recursion (due to modifiers with "xx % yy" as parameter)
-            foreach($_math_vars as $_k => $_math_var) {
-                $_math_var = $_math_vars[$_k];
-
-                if(!empty($_math_var) || is_numeric($_math_var)) {
-                    // hit a math operator, so process the stuff which came before it
-                    if(preg_match('~^' . $this->_dvar_math_regexp . '$~', $_math_var)) {
-                        $_has_math = true;
-                        if(!empty($_complete_var) || is_numeric($_complete_var)) {
-                            $_output .= $this->_parse_var($_complete_var);
-                        }
-
-                        // just output the math operator to php
-                        $_output .= $_math_var;
-
-                        if(empty($_first_var))
-                            $_first_var = $_complete_var;
-
-                        $_complete_var = "";
-                    } else {
-                        $_complete_var .= $_math_var;
-                    }
-                }
-            }
-            if($_has_math) {
-                if(!empty($_complete_var) || is_numeric($_complete_var))
-                    $_output .= $this->_parse_var($_complete_var);
-
-                // get the modifiers working (only the last var from math + modifier is left)
-                $var_expr = $_complete_var;
-            }
-        }
-
-        // prevent cutting of first digit in the number (we _definitly_ got a number if the first char is a digit)
-        if(is_numeric(substr($var_expr, 0, 1)))
-            $_var_ref = $var_expr;
-        else
-            $_var_ref = substr($var_expr, 1);
-        
-        if(!$_has_math) {
-            
-            // get [foo] and .foo and ->foo and (...) pieces
-            preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match);
-                        
-            $_indexes = $match[0];
-            $_var_name = array_shift($_indexes);
-
-            /* Handle $smarty.* variable references as a special case. */
-            if ($_var_name == 'smarty') {
-                /*
-                 * If the reference could be compiled, use the compiled output;
-                 * otherwise, fall back on the $smarty variable generated at
-                 * run-time.
-                 */
-                if (($smarty_ref = $this->_compile_smarty_ref($_indexes)) !== null) {
-                    $_output = $smarty_ref;
-                } else {
-                    $_var_name = substr(array_shift($_indexes), 1);
-                    $_output = "\$this->_smarty_vars['$_var_name']";
-                }
-            } elseif(is_numeric($_var_name) && is_numeric(substr($var_expr, 0, 1))) {
-                // because . is the operator for accessing arrays thru inidizes we need to put it together again for floating point numbers
-                if(count($_indexes) > 0)
-                {
-                    $_var_name .= implode("", $_indexes);
-                    $_indexes = array();
-                }
-                $_output = $_var_name;
-            } else {
-                $_output = "\$this->_tpl_vars['$_var_name']";
-            }
-
-            foreach ($_indexes as $_index) {
-                if (substr($_index, 0, 1) == '[') {
-                    $_index = substr($_index, 1, -1);
-                    if (is_numeric($_index)) {
-                        $_output .= "[$_index]";
-                    } elseif (substr($_index, 0, 1) == '$') {
-                        if (strpos($_index, '.') !== false) {
-                            $_output .= '[' . $this->_parse_var($_index) . ']';
-                        } else {
-                            $_output .= "[\$this->_tpl_vars['" . substr($_index, 1) . "']]";
-                        }
-                    } else {
-                        $_var_parts = explode('.', $_index);
-                        $_var_section = $_var_parts[0];
-                        $_var_section_prop = isset($_var_parts[1]) ? $_var_parts[1] : 'index';
-                        $_output .= "[\$this->_sections['$_var_section']['$_var_section_prop']]";
-                    }
-                } else if (substr($_index, 0, 1) == '.') {
-                    if (substr($_index, 1, 1) == '$')
-                        $_output .= "[\$this->_tpl_vars['" . substr($_index, 2) . "']]";
-                    else
-                        $_output .= "['" . substr($_index, 1) . "']";
-                } else if (substr($_index,0,2) == '->') {
-                    if(substr($_index,2,2) == '__') {
-                        $this->_syntax_error('call to internal object members is not allowed', E_USER_ERROR, __FILE__, __LINE__);
-                    } elseif($this->security && substr($_index, 2, 1) == '_') {
-                        $this->_syntax_error('(secure) call to private object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
-                    } elseif (substr($_index, 2, 1) == '$') {
-                        if ($this->security) {
-                            $this->_syntax_error('(secure) call to dynamic object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
-                        } else {
-                            $_output .= '->{(($_var=$this->_tpl_vars[\''.substr($_index,3).'\']) && substr($_var,0,2)!=\'__\') ? $_var : $this->trigger_error("cannot access property \\"$_var\\"")}';
-                        }
-                    } else {
-                        $_output .= $_index;
-                    }
-                } elseif (substr($_index, 0, 1) == '(') {
-                    $_index = $this->_parse_parenth_args($_index);
-                    $_output .= $_index;
-                } else {
-                    $_output .= $_index;
-                }
-            }
-        }
-
-        return $_output;
-    }
-
-    /**
-     * parse arguments in function call parenthesis
-     *
-     * @param string $parenth_args
-     * @return string
-     */
-    function _parse_parenth_args($parenth_args)
-    {
-        preg_match_all('~' . $this->_param_regexp . '~',$parenth_args, $match);
-        $orig_vals = $match = $match[0];
-        $this->_parse_vars_props($match);
-        $replace = array();
-        for ($i = 0, $count = count($match); $i < $count; $i++) {
-            $replace[$orig_vals[$i]] = $match[$i];
-        }
-        return strtr($parenth_args, $replace);
-    }
-
-    /**
-     * parse configuration variable expression into PHP code
-     *
-     * @param string $conf_var_expr
-     */
-    function _parse_conf_var($conf_var_expr)
-    {
-        $parts = explode('|', $conf_var_expr, 2);
-        $var_ref = $parts[0];
-        $modifiers = isset($parts[1]) ? $parts[1] : '';
-
-        $var_name = substr($var_ref, 1, -1);
-
-        $output = "\$this->_config[0]['vars']['$var_name']";
-
-        $this->_parse_modifiers($output, $modifiers);
-
-        return $output;
-    }
-
-    /**
-     * parse section property expression into PHP code
-     *
-     * @param string $section_prop_expr
-     * @return string
-     */
-    function _parse_section_prop($section_prop_expr)
-    {
-        $parts = explode('|', $section_prop_expr, 2);
-        $var_ref = $parts[0];
-        $modifiers = isset($parts[1]) ? $parts[1] : '';
-
-        preg_match('!%(\w+)\.(\w+)%!', $var_ref, $match);
-        $section_name = $match[1];
-        $prop_name = $match[2];
-
-        $output = "\$this->_sections['$section_name']['$prop_name']";
-
-        $this->_parse_modifiers($output, $modifiers);
-
-        return $output;
-    }
-
-
-    /**
-     * parse modifier chain into PHP code
-     *
-     * sets $output to parsed modified chain
-     * @param string $output
-     * @param string $modifier_string
-     */
-    function _parse_modifiers(&$output, $modifier_string)
-    {
-        preg_match_all('~\|(@?\w+)((?>:(?:'. $this->_qstr_regexp . '|[^|]+))*)~', '|' . $modifier_string, $_match);
-        list(, $_modifiers, $modifier_arg_strings) = $_match;
-
-        for ($_i = 0, $_for_max = count($_modifiers); $_i < $_for_max; $_i++) {
-            $_modifier_name = $_modifiers[$_i];
-
-            if($_modifier_name == 'smarty') {
-                // skip smarty modifier
-                continue;
-            }
-
-            preg_match_all('~:(' . $this->_qstr_regexp . '|[^:]+)~', $modifier_arg_strings[$_i], $_match);
-            $_modifier_args = $_match[1];
-
-            if (substr($_modifier_name, 0, 1) == '@') {
-                $_map_array = false;
-                $_modifier_name = substr($_modifier_name, 1);
-            } else {
-                $_map_array = true;
-            }
-
-            if (empty($this->_plugins['modifier'][$_modifier_name])
-                && !$this->_get_plugin_filepath('modifier', $_modifier_name)
-                && function_exists($_modifier_name)) {
-                if ($this->security && !in_array($_modifier_name, $this->security_settings['MODIFIER_FUNCS'])) {
-                    $this->_trigger_fatal_error("[plugin] (secure mode) modifier '$_modifier_name' is not allowed" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
-                } else {
-                    $this->_plugins['modifier'][$_modifier_name] = array($_modifier_name,  null, null, false);
-                }
-            }
-            $this->_add_plugin('modifier', $_modifier_name);
-
-            $this->_parse_vars_props($_modifier_args);
-
-            if($_modifier_name == 'default') {
-                // supress notifications of default modifier vars and args
-                if(substr($output, 0, 1) == '$') {
-                    $output = '@' . $output;
-                }
-                if(isset($_modifier_args[0]) && substr($_modifier_args[0], 0, 1) == '$') {
-                    $_modifier_args[0] = '@' . $_modifier_args[0];
-                }
-            }
-            if (count($_modifier_args) > 0)
-                $_modifier_args = ', '.implode(', ', $_modifier_args);
-            else
-                $_modifier_args = '';
-
-            if ($_map_array) {
-                $output = "((is_array(\$_tmp=$output)) ? \$this->_run_mod_handler('$_modifier_name', true, \$_tmp$_modifier_args) : " . $this->_compile_plugin_call('modifier', $_modifier_name) . "(\$_tmp$_modifier_args))";
-
-            } else {
-
-                $output = $this->_compile_plugin_call('modifier', $_modifier_name)."($output$_modifier_args)";
-
-            }
-        }
-    }
-
-
-    /**
-     * add plugin
-     *
-     * @param string $type
-     * @param string $name
-     * @param boolean? $delayed_loading
-     */
-    function _add_plugin($type, $name, $delayed_loading = null)
-    {
-        if (!isset($this->_plugin_info[$type])) {
-            $this->_plugin_info[$type] = array();
-        }
-        if (!isset($this->_plugin_info[$type][$name])) {
-            $this->_plugin_info[$type][$name] = array($this->_current_file,
-                                                      $this->_current_line_no,
-                                                      $delayed_loading);
-        }
-    }
-
-
-    /**
-     * Compiles references of type $smarty.foo
-     *
-     * @param string $indexes
-     * @return string
-     */
-    function _compile_smarty_ref(&$indexes)
-    {
-        /* Extract the reference name. */
-        $_ref = substr($indexes[0], 1);
-        foreach($indexes as $_index_no=>$_index) {
-            if (substr($_index, 0, 1) != '.' && $_index_no<2 || !preg_match('~^(\.|\[|->)~', $_index)) {
-                $this->_syntax_error('$smarty' . implode('', array_slice($indexes, 0, 2)) . ' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
-            }
-        }
-
-        switch ($_ref) {
-            case 'now':
-                $compiled_ref = 'time()';
-                $_max_index = 1;
-                break;
-
-            case 'foreach':
-                array_shift($indexes);
-                $_var = $this->_parse_var_props(substr($indexes[0], 1));
-                $_propname = substr($indexes[1], 1);
-                $_max_index = 1;
-                switch ($_propname) {
-                    case 'index':
-                        array_shift($indexes);
-                        $compiled_ref = "(\$this->_foreach[$_var]['iteration']-1)";
-                        break;
-                        
-                    case 'first':
-                        array_shift($indexes);
-                        $compiled_ref = "(\$this->_foreach[$_var]['iteration'] <= 1)";
-                        break;
-
-                    case 'last':
-                        array_shift($indexes);
-                        $compiled_ref = "(\$this->_foreach[$_var]['iteration'] == \$this->_foreach[$_var]['total'])";
-                        break;
-                        
-                    case 'show':
-                        array_shift($indexes);
-                        $compiled_ref = "(\$this->_foreach[$_var]['total'] > 0)";
-                        break;
-                        
-                    default:
-                        unset($_max_index);
-                        $compiled_ref = "\$this->_foreach[$_var]";
-                }
-                break;
-
-            case 'section':
-                array_shift($indexes);
-                $_var = $this->_parse_var_props(substr($indexes[0], 1));
-                $compiled_ref = "\$this->_sections[$_var]";
-                break;
-
-            case 'get':
-                if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
-                    $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
-                    return;
-                }
-                $compiled_ref = "\$_GET";
-                break;
-
-            case 'post':
-                if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
-                    $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
-                    return;
-                }
-                $compiled_ref = "\$_POST";
-                break;
-
-            case 'cookies':
-                if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
-                    $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
-                    return;
-                }
-                $compiled_ref = "\$_COOKIE";
-                break;
-
-            case 'env':
-                if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
-                    $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
-                    return;
-                }
-                $compiled_ref = "\$_ENV";
-                break;
-
-            case 'server':
-                if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
-                    $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
-                    return;
-                }
-                $compiled_ref = "\$_SERVER";
-                break;
-
-            case 'session':
-                if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
-                    $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
-                    return;
-                }
-                $compiled_ref = "\$_SESSION";
-                break;
-
-            /*
-             * These cases are handled either at run-time or elsewhere in the
-             * compiler.
-             */
-            case 'request':
-                if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
-                    $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
-                    return;
-                }
-                if ($this->request_use_auto_globals) {
-                    $compiled_ref = "\$_REQUEST";
-                    break;
-                } else {
-                    $this->_init_smarty_vars = true;
-                }
-                return null;
-
-            case 'capture':
-                return null;
-
-            case 'template':
-                $compiled_ref = "'$this->_current_file'";
-                $_max_index = 1;
-                break;
-
-            case 'version':
-                $compiled_ref = "'$this->_version'";
-                $_max_index = 1;
-                break;
-
-            case 'const':
-                if ($this->security && !$this->security_settings['ALLOW_CONSTANTS']) {
-                    $this->_syntax_error("(secure mode) constants not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
-                    return;
-                }
-                array_shift($indexes);
-                if (preg_match('!^\.\w+$!', $indexes[0])) {
-                    $compiled_ref = '@' . substr($indexes[0], 1);
-                } else {
-                    $_val = $this->_parse_var_props(substr($indexes[0], 1));
-                    $compiled_ref = '@constant(' . $_val . ')';
-                }
-                $_max_index = 1;
-                break;
-
-            case 'config':
-                $compiled_ref = "\$this->_config[0]['vars']";
-                $_max_index = 3;
-                break;
-
-            case 'ldelim':
-                $compiled_ref = "'$this->left_delimiter'";
-                break;
-
-            case 'rdelim':
-                $compiled_ref = "'$this->right_delimiter'";
-                break;
-                
-            default:
-                $this->_syntax_error('$smarty.' . $_ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__);
-                break;
-        }
-
-        if (isset($_max_index) && count($indexes) > $_max_index) {
-            $this->_syntax_error('$smarty' . implode('', $indexes) .' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        array_shift($indexes);
-        return $compiled_ref;
-    }
-
-    /**
-     * compiles call to plugin of type $type with name $name
-     * returns a string containing the function-name or method call
-     * without the paramter-list that would have follow to make the
-     * call valid php-syntax
-     *
-     * @param string $type
-     * @param string $name
-     * @return string
-     */
-    function _compile_plugin_call($type, $name) {
-        if (isset($this->_plugins[$type][$name])) {
-            /* plugin loaded */
-            if (is_array($this->_plugins[$type][$name][0])) {
-                return ((is_object($this->_plugins[$type][$name][0][0])) ?
-                        "\$this->_plugins['$type']['$name'][0][0]->"    /* method callback */
-                        : (string)($this->_plugins[$type][$name][0][0]).'::'    /* class callback */
-                       ). $this->_plugins[$type][$name][0][1];
-
-            } else {
-                /* function callback */
-                return $this->_plugins[$type][$name][0];
-
-            }
-        } else {
-            /* plugin not loaded -> auto-loadable-plugin */
-            return 'smarty_'.$type.'_'.$name;
-
-        }
-    }
-
-    /**
-     * load pre- and post-filters
-     */
-    function _load_filters()
-    {
-        if (count($this->_plugins['prefilter']) > 0) {
-            foreach ($this->_plugins['prefilter'] as $filter_name => $prefilter) {
-                if ($prefilter === false) {
-                    unset($this->_plugins['prefilter'][$filter_name]);
-                    $_params = array('plugins' => array(array('prefilter', $filter_name, null, null, false)));
-                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
-                    smarty_core_load_plugins($_params, $this);
-                }
-            }
-        }
-        if (count($this->_plugins['postfilter']) > 0) {
-            foreach ($this->_plugins['postfilter'] as $filter_name => $postfilter) {
-                if ($postfilter === false) {
-                    unset($this->_plugins['postfilter'][$filter_name]);
-                    $_params = array('plugins' => array(array('postfilter', $filter_name, null, null, false)));
-                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
-                    smarty_core_load_plugins($_params, $this);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Quote subpattern references
-     *
-     * @param string $string
-     * @return string
-     */
-    function _quote_replace($string)
-    {
-        return strtr($string, array('\\' => '\\\\', '$' => '\\$'));
-    }
-
-    /**
-     * display Smarty syntax error
-     *
-     * @param string $error_msg
-     * @param integer $error_type
-     * @param string $file
-     * @param integer $line
-     */
-    function _syntax_error($error_msg, $error_type = E_USER_ERROR, $file=null, $line=null)
-    {
-        $this->_trigger_fatal_error("syntax error: $error_msg", $this->_current_file, $this->_current_line_no, $file, $line, $error_type);
-    }
-
-
-    /**
-     * check if the compilation changes from cacheable to
-     * non-cacheable state with the beginning of the current
-     * plugin. return php-code to reflect the transition.
-     * @return string
-     */
-    function _push_cacheable_state($type, $name) {
-        $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
-        if ($_cacheable
-            || 0<$this->_cacheable_state++) return '';
-        if (!isset($this->_cache_serial)) $this->_cache_serial = md5(uniqid('Smarty'));
-        $_ret = 'if ($this->caching && !$this->_cache_including): echo \'{nocache:'
-            . $this->_cache_serial . '#' . $this->_nocache_count
-            . '}\'; endif;';
-        return $_ret;
-    }
-
-
-    /**
-     * check if the compilation changes from non-cacheable to
-     * cacheable state with the end of the current plugin return
-     * php-code to reflect the transition.
-     * @return string
-     */
-    function _pop_cacheable_state($type, $name) {
-        $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
-        if ($_cacheable
-            || --$this->_cacheable_state>0) return '';
-        return 'if ($this->caching && !$this->_cache_including): echo \'{/nocache:'
-            . $this->_cache_serial . '#' . ($this->_nocache_count++)
-            . '}\'; endif;';
-    }
-
-
-    /**
-     * push opening tag-name, file-name and line-number on the tag-stack
-     * @param string the opening tag's name
-     */
-    function _push_tag($open_tag)
-    {
-        array_push($this->_tag_stack, array($open_tag, $this->_current_line_no));
-    }
-
-    /**
-     * pop closing tag-name
-     * raise an error if this stack-top doesn't match with the closing tag
-     * @param string the closing tag's name
-     * @return string the opening tag's name
-     */
-    function _pop_tag($close_tag)
-    {
-        $message = '';
-        if (count($this->_tag_stack)>0) {
-            list($_open_tag, $_line_no) = array_pop($this->_tag_stack);
-            if ($close_tag == $_open_tag) {
-                return $_open_tag;
-            }
-            if ($close_tag == 'if' && ($_open_tag == 'else' || $_open_tag == 'elseif' )) {
-                return $this->_pop_tag($close_tag);
-            }
-            if ($close_tag == 'section' && $_open_tag == 'sectionelse') {
-                $this->_pop_tag($close_tag);
-                return $_open_tag;
-            }
-            if ($close_tag == 'foreach' && $_open_tag == 'foreachelse') {
-                $this->_pop_tag($close_tag);
-                return $_open_tag;
-            }
-            if ($_open_tag == 'else' || $_open_tag == 'elseif') {
-                $_open_tag = 'if';
-            } elseif ($_open_tag == 'sectionelse') {
-                $_open_tag = 'section';
-            } elseif ($_open_tag == 'foreachelse') {
-                $_open_tag = 'foreach';
-            }
-            $message = " expected {/$_open_tag} (opened line $_line_no).";
-        }
-        $this->_syntax_error("mismatched tag {/$close_tag}.$message",
-                             E_USER_ERROR, __FILE__, __LINE__);
-    }
-
-}
-
-/**
- * compare to values by their string length
- *
- * @access private
- * @param string $a
- * @param string $b
- * @return 0|-1|1
- */
-function _smarty_sort_length($a, $b)
-{
-    if($a == $b)
-        return 0;
-
-    if(strlen($a) == strlen($b))
-        return ($a > $b) ? -1 : 1;
-
-    return (strlen($a) > strlen($b)) ? -1 : 1;
-}
-
-
-/* vim: set et: */
-
-?>
diff --git a/includes/smarty/debug.tpl b/includes/smarty/debug.tpl
deleted file mode 100644
index c05ef5d0..00000000
--- a/includes/smarty/debug.tpl
+++ /dev/null
@@ -1,157 +0,0 @@
-{* Smarty *}
-{* debug.tpl, last updated version 2.1.0 *}
-{assign_debug_info}
-{capture assign=debug_output}
-
-
-
-    Smarty Debug Console
-{literal}
-
-{/literal}
-
-
-
-
Smarty Debug Console

-
-
included templates & config files (load time in seconds)

-
-

-{section name=templates loop=$_debug_tpls}
-    {section name=indent loop=$_debug_tpls[templates].depth}   {/section}
-    
-        {$_debug_tpls[templates].filename|escape:html}
-    {if isset($_debug_tpls[templates].exec_time)}
-        
-        ({$_debug_tpls[templates].exec_time|string_format:"%.5f"})
-        {if %templates.index% eq 0}(total){/if}
-        
-    {/if}
-    

-{sectionelse}
-    
no templates included

-{/section}
-

-
-
assigned template variables

-
-
-    {section name=vars loop=$_debug_keys}
-        
-            
-            
-    {sectionelse}
-        
-    {/section}
-
{ldelim}${$_debug_keys[vars]|escape:'html'}{rdelim}{$_debug_vals[vars]|@debug_print_var}
no template variables assigned

-
-
assigned config file variables (outer template scope)

-
-
-    {section name=config_vars loop=$_debug_config_keys}
-        
-            
-            
-    {sectionelse}
-        
-    {/section}
-
{ldelim}#{$_debug_config_keys[config_vars]|escape:'html'}#{rdelim}{$_debug_config_vals[config_vars]|@debug_print_var}
no config vars assigned

-
-
-{/capture}
-{if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"}
-    {$debug_output}
-{else}
-
-{/if}
\ No newline at end of file
diff --git a/includes/smarty/internals/core.assemble_plugin_filepath.php b/includes/smarty/internals/core.assemble_plugin_filepath.php
deleted file mode 100644
index 690d3ddb..00000000
--- a/includes/smarty/internals/core.assemble_plugin_filepath.php
+++ /dev/null
@@ -1,67 +0,0 @@
-plugins_dir as $_plugin_dir) {
-
-        $_plugin_filepath = $_plugin_dir . DIRECTORY_SEPARATOR . $_plugin_filename;
-
-        // see if path is relative
-        if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/", $_plugin_dir)) {
-            $_relative_paths[] = $_plugin_dir;
-            // relative path, see if it is in the SMARTY_DIR
-            if (@is_readable(SMARTY_DIR . $_plugin_filepath)) {
-                $_return = SMARTY_DIR . $_plugin_filepath;
-                break;
-            }
-        }
-        // try relative to cwd (or absolute)
-        if (@is_readable($_plugin_filepath)) {
-            $_return = $_plugin_filepath;
-            break;
-        }
-    }
-
-    if($_return === false) {
-        // still not found, try PHP include_path
-        if(isset($_relative_paths)) {
-            foreach ((array)$_relative_paths as $_plugin_dir) {
-
-                $_plugin_filepath = $_plugin_dir . DIRECTORY_SEPARATOR . $_plugin_filename;
-
-                $_params = array('file_path' => $_plugin_filepath);
-                require_once(SMARTY_CORE_DIR . 'core.get_include_path.php');
-                if(smarty_core_get_include_path($_params, $smarty)) {
-                    $_return = $_params['new_file_path'];
-                    break;
-                }
-            }
-        }
-    }
-    $_filepaths_cache[$_plugin_filename] = $_return;
-    return $_return;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.assign_smarty_interface.php b/includes/smarty/internals/core.assign_smarty_interface.php
deleted file mode 100644
index 7e65a73e..00000000
--- a/includes/smarty/internals/core.assign_smarty_interface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- * Name:     assign_smarty_interface

- * Purpose:  assign the $smarty interface variable
- * @param array Format: null
- * @param Smarty
- */
-function smarty_core_assign_smarty_interface($params, &$smarty)
-{
-        if (isset($smarty->_smarty_vars) && isset($smarty->_smarty_vars['request'])) {
-            return;
-        }
-
-        $_globals_map = array('g'  => 'HTTP_GET_VARS',
-                             'p'  => 'HTTP_POST_VARS',
-                             'c'  => 'HTTP_COOKIE_VARS',
-                             's'  => 'HTTP_SERVER_VARS',
-                             'e'  => 'HTTP_ENV_VARS');
-
-        $_smarty_vars_request  = array();
-
-        foreach (preg_split('!!', strtolower($smarty->request_vars_order)) as $_c) {
-            if (isset($_globals_map[$_c])) {
-                $_smarty_vars_request = array_merge($_smarty_vars_request, $GLOBALS[$_globals_map[$_c]]);
-            }
-        }
-        $_smarty_vars_request = @array_merge($_smarty_vars_request, $GLOBALS['HTTP_SESSION_VARS']);
-
-        $smarty->_smarty_vars['request'] = $_smarty_vars_request;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.create_dir_structure.php b/includes/smarty/internals/core.create_dir_structure.php
deleted file mode 100644
index 3eecc497..00000000
--- a/includes/smarty/internals/core.create_dir_structure.php
+++ /dev/null
@@ -1,79 +0,0 @@
-_dir_perms) && !is_dir($_new_dir)) {
-                $smarty->trigger_error("problem creating directory '" . $_new_dir . "'");
-                return false;
-            }
-            $_new_dir .= '/';
-        }
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.display_debug_console.php b/includes/smarty/internals/core.display_debug_console.php
deleted file mode 100644
index 1a80f390..00000000
--- a/includes/smarty/internals/core.display_debug_console.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- * Name:     display_debug_console

- * Purpose:  display the javascript debug console window
- * @param array Format: null
- * @param Smarty
- */
-function smarty_core_display_debug_console($params, &$smarty)
-{
-    // we must force compile the debug template in case the environment
-    // changed between separate applications.
-
-    if(empty($smarty->debug_tpl)) {
-        // set path to debug template from SMARTY_DIR
-        $smarty->debug_tpl = SMARTY_DIR . 'debug.tpl';
-        if($smarty->security && is_file($smarty->debug_tpl)) {
-            $smarty->secure_dir[] = realpath($smarty->debug_tpl);
-        }
-        $smarty->debug_tpl = 'file:' . SMARTY_DIR . 'debug.tpl';
-    }
-
-    $_ldelim_orig = $smarty->left_delimiter;
-    $_rdelim_orig = $smarty->right_delimiter;
-
-    $smarty->left_delimiter = '{';
-    $smarty->right_delimiter = '}';
-
-    $_compile_id_orig = $smarty->_compile_id;
-    $smarty->_compile_id = null;
-
-    $_compile_path = $smarty->_get_compile_path($smarty->debug_tpl);
-    if ($smarty->_compile_resource($smarty->debug_tpl, $_compile_path))
-    {
-        ob_start();
-        $smarty->_include($_compile_path);
-        $_results = ob_get_contents();
-        ob_end_clean();
-    } else {
-        $_results = '';
-    }
-
-    $smarty->_compile_id = $_compile_id_orig;
-
-    $smarty->left_delimiter = $_ldelim_orig;
-    $smarty->right_delimiter = $_rdelim_orig;
-
-    return $_results;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.get_include_path.php b/includes/smarty/internals/core.get_include_path.php
deleted file mode 100644
index 43432412..00000000
--- a/includes/smarty/internals/core.get_include_path.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
diff --git a/includes/smarty/internals/core.get_microtime.php b/includes/smarty/internals/core.get_microtime.php
deleted file mode 100644
index f1a28e04..00000000
--- a/includes/smarty/internals/core.get_microtime.php
+++ /dev/null
@@ -1,23 +0,0 @@
-
diff --git a/includes/smarty/internals/core.get_php_resource.php b/includes/smarty/internals/core.get_php_resource.php
deleted file mode 100644
index 786d4e78..00000000
--- a/includes/smarty/internals/core.get_php_resource.php
+++ /dev/null
@@ -1,80 +0,0 @@
-trusted_dir;
-    $smarty->_parse_resource_name($params, $smarty);
-
-    /*
-     * Find out if the resource exists.
-     */
-
-    if ($params['resource_type'] == 'file') {
-        $_readable = false;
-        if(file_exists($params['resource_name']) && is_readable($params['resource_name'])) {
-            $_readable = true;
-        } else {
-            // test for file in include_path
-            $_params = array('file_path' => $params['resource_name']);
-            require_once(SMARTY_CORE_DIR . 'core.get_include_path.php');
-            if(smarty_core_get_include_path($_params, $smarty)) {
-                $_include_path = $_params['new_file_path'];
-                $_readable = true;
-            }
-        }
-    } else if ($params['resource_type'] != 'file') {
-        $_template_source = null;
-        $_readable = is_callable($smarty->_plugins['resource'][$params['resource_type']][0][0])
-            && call_user_func_array($smarty->_plugins['resource'][$params['resource_type']][0][0],
-                                    array($params['resource_name'], &$_template_source, &$smarty));
-    }
-
-    /*
-     * Set the error function, depending on which class calls us.
-     */
-    if (method_exists($smarty, '_syntax_error')) {
-        $_error_funcc = '_syntax_error';
-    } else {
-        $_error_funcc = 'trigger_error';
-    }
-
-    if ($_readable) {
-        if ($smarty->security) {
-            require_once(SMARTY_CORE_DIR . 'core.is_trusted.php');
-            if (!smarty_core_is_trusted($params, $smarty)) {
-                $smarty->$_error_funcc('(secure mode) ' . $params['resource_type'] . ':' . $params['resource_name'] . ' is not trusted');
-                return false;
-            }
-        }
-    } else {
-        $smarty->$_error_funcc($params['resource_type'] . ':' . $params['resource_name'] . ' is not readable');
-        return false;
-    }
-
-    if ($params['resource_type'] == 'file') {
-        $params['php_resource'] = $params['resource_name'];
-    } else {
-        $params['php_resource'] = $_template_source;
-    }
-    return true;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.is_secure.php b/includes/smarty/internals/core.is_secure.php
deleted file mode 100644
index d54abd43..00000000
--- a/includes/smarty/internals/core.is_secure.php
+++ /dev/null
@@ -1,59 +0,0 @@
-security || $smarty->security_settings['INCLUDE_ANY']) {
-        return true;
-    }
-
-    if ($params['resource_type'] == 'file') {
-        $_rp = realpath($params['resource_name']);
-        if (isset($params['resource_base_path'])) {
-            foreach ((array)$params['resource_base_path'] as $curr_dir) {
-                if ( ($_cd = realpath($curr_dir)) !== false &&
-                     strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
-                     substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR ) {
-                    return true;
-                }
-            }
-        }
-        if (!empty($smarty->secure_dir)) {
-            foreach ((array)$smarty->secure_dir as $curr_dir) {
-                if ( ($_cd = realpath($curr_dir)) !== false) {
-                    if($_cd == $_rp) {
-                        return true;
-                    } elseif (strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
-                        substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR) {
-                        return true;
-                    }
-                }
-            }
-        }
-    } else {
-        // resource is not on local file system
-        return call_user_func_array(
-            $smarty->_plugins['resource'][$params['resource_type']][0][2],
-            array($params['resource_name'], &$smarty));
-    }
-
-    return false;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.is_trusted.php b/includes/smarty/internals/core.is_trusted.php
deleted file mode 100644
index 42997315..00000000
--- a/includes/smarty/internals/core.is_trusted.php
+++ /dev/null
@@ -1,47 +0,0 @@
-trusted_dir)) {
-            $_rp = realpath($params['resource_name']);
-            foreach ((array)$smarty->trusted_dir as $curr_dir) {
-                if (!empty($curr_dir) && is_readable ($curr_dir)) {
-                    $_cd = realpath($curr_dir);
-                    if (strncmp($_rp, $_cd, strlen($_cd)) == 0
-                        && substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR ) {
-                        $_smarty_trusted = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-    } else {
-        // resource is not on local file system
-        $_smarty_trusted = call_user_func_array($smarty->_plugins['resource'][$params['resource_type']][0][3],
-                                                array($params['resource_name'], $smarty));
-    }
-
-    return $_smarty_trusted;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.load_plugins.php b/includes/smarty/internals/core.load_plugins.php
deleted file mode 100644
index 6db1dc51..00000000
--- a/includes/smarty/internals/core.load_plugins.php
+++ /dev/null
@@ -1,125 +0,0 @@
-_plugins[$_type][$_name];
-
-        /*
-         * We do not load plugin more than once for each instance of Smarty.
-         * The following code checks for that. The plugin can also be
-         * registered dynamically at runtime, in which case template file
-         * and line number will be unknown, so we fill them in.
-         *
-         * The final element of the info array is a flag that indicates
-         * whether the dynamically registered plugin function has been
-         * checked for existence yet or not.
-         */
-        if (isset($_plugin)) {
-            if (empty($_plugin[3])) {
-                if (!is_callable($_plugin[0])) {
-                    $smarty->_trigger_fatal_error("[plugin] $_type '$_name' is not implemented", $_tpl_file, $_tpl_line, __FILE__, __LINE__);
-                } else {
-                    $_plugin[1] = $_tpl_file;
-                    $_plugin[2] = $_tpl_line;
-                    $_plugin[3] = true;
-                    if (!isset($_plugin[4])) $_plugin[4] = true; /* cacheable */
-                }
-            }
-            continue;
-        } else if ($_type == 'insert') {
-            /*
-             * For backwards compatibility, we check for insert functions in
-             * the symbol table before trying to load them as a plugin.
-             */
-            $_plugin_func = 'insert_' . $_name;
-            if (function_exists($_plugin_func)) {
-                $_plugin = array($_plugin_func, $_tpl_file, $_tpl_line, true, false);
-                continue;
-            }
-        }
-
-        $_plugin_file = $smarty->_get_plugin_filepath($_type, $_name);
-
-        if (! $_found = ($_plugin_file != false)) {
-            $_message = "could not load plugin file '$_type.$_name.php'\n";
-        }
-
-        /*
-         * If plugin file is found, it -must- provide the properly named
-         * plugin function. In case it doesn't, simply output the error and
-         * do not fall back on any other method.
-         */
-        if ($_found) {
-            include_once $_plugin_file;
-
-            $_plugin_func = 'smarty_' . $_type . '_' . $_name;
-            if (!function_exists($_plugin_func)) {
-                $smarty->_trigger_fatal_error("[plugin] function $_plugin_func() not found in $_plugin_file", $_tpl_file, $_tpl_line, __FILE__, __LINE__);
-                continue;
-            }
-        }
-        /*
-         * In case of insert plugins, their code may be loaded later via
-         * 'script' attribute.
-         */
-        else if ($_type == 'insert' && $_delayed_loading) {
-            $_plugin_func = 'smarty_' . $_type . '_' . $_name;
-            $_found = true;
-        }
-
-        /*
-         * Plugin specific processing and error checking.
-         */
-        if (!$_found) {
-            if ($_type == 'modifier') {
-                /*
-                 * In case modifier falls back on using PHP functions
-                 * directly, we only allow those specified in the security
-                 * context.
-                 */
-                if ($smarty->security && !in_array($_name, $smarty->security_settings['MODIFIER_FUNCS'])) {
-                    $_message = "(secure mode) modifier '$_name' is not allowed";
-                } else {
-                    if (!function_exists($_name)) {
-                        $_message = "modifier '$_name' is not implemented";
-                    } else {
-                        $_plugin_func = $_name;
-                        $_found = true;
-                    }
-                }
-            } else if ($_type == 'function') {
-                /*
-                 * This is a catch-all situation.
-                 */
-                $_message = "unknown tag - '$_name'";
-            }
-        }
-
-        if ($_found) {
-            $smarty->_plugins[$_type][$_name] = array($_plugin_func, $_tpl_file, $_tpl_line, true, true);
-        } else {
-            // output error
-            $smarty->_trigger_fatal_error('[plugin] ' . $_message, $_tpl_file, $_tpl_line, __FILE__, __LINE__);
-        }
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.load_resource_plugin.php b/includes/smarty/internals/core.load_resource_plugin.php
deleted file mode 100644
index a7d37d1a..00000000
--- a/includes/smarty/internals/core.load_resource_plugin.php
+++ /dev/null
@@ -1,74 +0,0 @@
-_plugins['resource'][$params['type']];
-    if (isset($_plugin)) {
-        if (!$_plugin[1] && count($_plugin[0])) {
-            $_plugin[1] = true;
-            foreach ($_plugin[0] as $_plugin_func) {
-                if (!is_callable($_plugin_func)) {
-                    $_plugin[1] = false;
-                    break;
-                }
-            }
-        }
-
-        if (!$_plugin[1]) {
-            $smarty->_trigger_fatal_error("[plugin] resource '" . $params['type'] . "' is not implemented", null, null, __FILE__, __LINE__);
-        }
-
-        return;
-    }
-
-    $_plugin_file = $smarty->_get_plugin_filepath('resource', $params['type']);
-    $_found = ($_plugin_file != false);
-
-    if ($_found) {            /*
-         * If the plugin file is found, it -must- provide the properly named
-         * plugin functions.
-         */
-        include_once($_plugin_file);
-
-        /*
-         * Locate functions that we require the plugin to provide.
-         */
-        $_resource_ops = array('source', 'timestamp', 'secure', 'trusted');
-        $_resource_funcs = array();
-        foreach ($_resource_ops as $_op) {
-            $_plugin_func = 'smarty_resource_' . $params['type'] . '_' . $_op;
-            if (!function_exists($_plugin_func)) {
-                $smarty->_trigger_fatal_error("[plugin] function $_plugin_func() not found in $_plugin_file", null, null, __FILE__, __LINE__);
-                return;
-            } else {
-                $_resource_funcs[] = $_plugin_func;
-            }
-        }
-
-        $smarty->_plugins['resource'][$params['type']] = array($_resource_funcs, true);
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.process_cached_inserts.php b/includes/smarty/internals/core.process_cached_inserts.php
deleted file mode 100644
index 1d78edd9..00000000
--- a/includes/smarty/internals/core.process_cached_inserts.php
+++ /dev/null
@@ -1,71 +0,0 @@
-_smarty_md5.'{insert_cache (.*)}'.$smarty->_smarty_md5.'!Uis',
-                   $params['results'], $match);
-    list($cached_inserts, $insert_args) = $match;
-
-    for ($i = 0, $for_max = count($cached_inserts); $i < $for_max; $i++) {
-        if ($smarty->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $debug_start_time = smarty_core_get_microtime($_params, $smarty);
-        }
-
-        $args = unserialize($insert_args[$i]);
-        $name = $args['name'];
-
-        if (isset($args['script'])) {
-            $_params = array('resource_name' => $smarty->_dequote($args['script']));
-            require_once(SMARTY_CORE_DIR . 'core.get_php_resource.php');
-            if(!smarty_core_get_php_resource($_params, $smarty)) {
-                return false;
-            }
-            $resource_type = $_params['resource_type'];
-            $php_resource = $_params['php_resource'];
-
-
-            if ($resource_type == 'file') {
-                $smarty->_include($php_resource, true);
-            } else {
-                $smarty->_eval($php_resource);
-            }
-        }
-
-        $function_name = $smarty->_plugins['insert'][$name][0];
-        if (empty($args['assign'])) {
-            $replace = $function_name($args, $smarty);
-        } else {
-            $smarty->assign($args['assign'], $function_name($args, $smarty));
-            $replace = '';
-        }
-
-        $params['results'] = substr_replace($params['results'], $replace, strpos($params['results'], $cached_inserts[$i]), strlen($cached_inserts[$i]));
-        if ($smarty->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $smarty->_smarty_debug_info[] = array('type'      => 'insert',
-                                                'filename'  => 'insert_'.$name,
-                                                'depth'     => $smarty->_inclusion_depth,
-                                                'exec_time' => smarty_core_get_microtime($_params, $smarty) - $debug_start_time);
-        }
-    }
-
-    return $params['results'];
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.process_compiled_include.php b/includes/smarty/internals/core.process_compiled_include.php
deleted file mode 100644
index 904d5974..00000000
--- a/includes/smarty/internals/core.process_compiled_include.php
+++ /dev/null
@@ -1,37 +0,0 @@
-_cache_including;
-    $smarty->_cache_including = true;
-
-    $_return = $params['results'];
-
-    foreach ($smarty->_cache_info['cache_serials'] as $_include_file_path=>$_cache_serial) {
-        $smarty->_include($_include_file_path, true);
-    }
-
-    foreach ($smarty->_cache_info['cache_serials'] as $_include_file_path=>$_cache_serial) {
-        $_return = preg_replace_callback('!(\{nocache\:('.$_cache_serial.')#(\d+)\})!s',
-                                         array(&$smarty, '_process_compiled_include_callback'),
-                                         $_return);
-    }
-    $smarty->_cache_including = $_cache_including;
-    return $_return;
-}
-
-?>
diff --git a/includes/smarty/internals/core.read_cache_file.php b/includes/smarty/internals/core.read_cache_file.php
deleted file mode 100644
index c60e113a..00000000
--- a/includes/smarty/internals/core.read_cache_file.php
+++ /dev/null
@@ -1,101 +0,0 @@
-force_compile) {
-        // force compile enabled, always regenerate
-        return false;
-    }
-
-    if (isset($content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']])) {
-        list($params['results'], $smarty->_cache_info) = $content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']];
-        return true;
-    }
-
-    if (!empty($smarty->cache_handler_func)) {
-        // use cache_handler function
-        call_user_func_array($smarty->cache_handler_func,
-                             array('read', &$smarty, &$params['results'], $params['tpl_file'], $params['cache_id'], $params['compile_id'], null));
-    } else {
-        // use local cache file
-        $_auto_id = $smarty->_get_auto_id($params['cache_id'], $params['compile_id']);
-        $_cache_file = $smarty->_get_auto_filename($smarty->cache_dir, $params['tpl_file'], $_auto_id);
-        $params['results'] = $smarty->_read_file($_cache_file);
-    }
-
-    if (empty($params['results'])) {
-        // nothing to parse (error?), regenerate cache
-        return false;
-    }
-
-    $_contents = $params['results'];
-    $_info_start = strpos($_contents, "\n") + 1;
-    $_info_len = (int)substr($_contents, 0, $_info_start - 1);
-    $_cache_info = unserialize(substr($_contents, $_info_start, $_info_len));
-    $params['results'] = substr($_contents, $_info_start + $_info_len);
-
-    if ($smarty->caching == 2 && isset ($_cache_info['expires'])){
-        // caching by expiration time
-        if ($_cache_info['expires'] > -1 && (time() > $_cache_info['expires'])) {
-            // cache expired, regenerate
-            return false;
-        }
-    } else {
-        // caching by lifetime
-        if ($smarty->cache_lifetime > -1 && (time() - $_cache_info['timestamp'] > $smarty->cache_lifetime)) {
-            // cache expired, regenerate
-            return false;
-        }
-    }
-
-    if ($smarty->compile_check) {
-        $_params = array('get_source' => false, 'quiet'=>true);
-        foreach (array_keys($_cache_info['template']) as $_template_dep) {
-            $_params['resource_name'] = $_template_dep;
-            if (!$smarty->_fetch_resource_info($_params) || $_cache_info['timestamp'] < $_params['resource_timestamp']) {
-                // template file has changed, regenerate cache
-                return false;
-            }
-        }
-
-        if (isset($_cache_info['config'])) {
-            $_params = array('resource_base_path' => $smarty->config_dir, 'get_source' => false, 'quiet'=>true);
-            foreach (array_keys($_cache_info['config']) as $_config_dep) {
-                $_params['resource_name'] = $_config_dep;
-                if (!$smarty->_fetch_resource_info($_params) || $_cache_info['timestamp'] < $_params['resource_timestamp']) {
-                    // config file has changed, regenerate cache
-                    return false;
-                }
-            }
-        }
-    }
-
-    $content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']] = array($params['results'], $_cache_info);
-
-    $smarty->_cache_info = $_cache_info;
-    return true;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.rm_auto.php b/includes/smarty/internals/core.rm_auto.php
deleted file mode 100644
index b251f649..00000000
--- a/includes/smarty/internals/core.rm_auto.php
+++ /dev/null
@@ -1,71 +0,0 @@
- $params['auto_base'],
-            'level' => 0,
-            'exp_time' => $params['exp_time']
-        );
-        require_once(SMARTY_CORE_DIR . 'core.rmdir.php');
-        $_res = smarty_core_rmdir($_params, $smarty);
-    } else {
-        $_tname = $smarty->_get_auto_filename($params['auto_base'], $params['auto_source'], $params['auto_id']);
-
-        if(isset($params['auto_source'])) {
-            if (isset($params['extensions'])) {
-                $_res = false;
-                foreach ((array)$params['extensions'] as $_extension)
-                    $_res |= $smarty->_unlink($_tname.$_extension, $params['exp_time']);
-            } else {
-                $_res = $smarty->_unlink($_tname, $params['exp_time']);
-            }
-        } elseif ($smarty->use_sub_dirs) {
-            $_params = array(
-                'dirname' => $_tname,
-                'level' => 1,
-                'exp_time' => $params['exp_time']
-            );
-            require_once(SMARTY_CORE_DIR . 'core.rmdir.php');
-            $_res = smarty_core_rmdir($_params, $smarty);
-        } else {
-            // remove matching file names
-            $_handle = opendir($params['auto_base']);
-            $_res = true;
-            while (false !== ($_filename = readdir($_handle))) {
-                if($_filename == '.' || $_filename == '..') {
-                    continue;
-                } elseif (substr($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, 0, strlen($_tname)) == $_tname) {
-                    $_res &= (bool)$smarty->_unlink($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, $params['exp_time']);
-                }
-            }
-        }
-    }
-
-    return $_res;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.rmdir.php b/includes/smarty/internals/core.rmdir.php
deleted file mode 100644
index 2166c44d..00000000
--- a/includes/smarty/internals/core.rmdir.php
+++ /dev/null
@@ -1,54 +0,0 @@
- keep root)
- * WARNING: no tests, it will try to remove what you tell it!
- *
- * @param string $dirname
- * @param integer $level
- * @param integer $exp_time
- * @return boolean
- */
-
-//  $dirname, $level = 1, $exp_time = null
-
-function smarty_core_rmdir($params, &$smarty)
-{
-   if(!isset($params['level'])) { $params['level'] = 1; }
-   if(!isset($params['exp_time'])) { $params['exp_time'] = null; }
-
-   if($_handle = @opendir($params['dirname'])) {
-
-        while (false !== ($_entry = readdir($_handle))) {
-            if ($_entry != '.' && $_entry != '..') {
-                if (@is_dir($params['dirname'] . DIRECTORY_SEPARATOR . $_entry)) {
-                    $_params = array(
-                        'dirname' => $params['dirname'] . DIRECTORY_SEPARATOR . $_entry,
-                        'level' => $params['level'] + 1,
-                        'exp_time' => $params['exp_time']
-                    );
-                    smarty_core_rmdir($_params, $smarty);
-                }
-                else {
-                    $smarty->_unlink($params['dirname'] . DIRECTORY_SEPARATOR . $_entry, $params['exp_time']);
-                }
-            }
-        }
-        closedir($_handle);
-   }
-
-   if ($params['level']) {
-       return @rmdir($params['dirname']);
-   }
-   return (bool)$_handle;
-
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.run_insert_handler.php b/includes/smarty/internals/core.run_insert_handler.php
deleted file mode 100644
index 71c38450..00000000
--- a/includes/smarty/internals/core.run_insert_handler.php
+++ /dev/null
@@ -1,71 +0,0 @@
-debugging) {
-        $_params = array();
-        $_debug_start_time = smarty_core_get_microtime($_params, $smarty);
-    }
-
-    if ($smarty->caching) {
-        $_arg_string = serialize($params['args']);
-        $_name = $params['args']['name'];
-        if (!isset($smarty->_cache_info['insert_tags'][$_name])) {
-            $smarty->_cache_info['insert_tags'][$_name] = array('insert',
-                                                             $_name,
-                                                             $smarty->_plugins['insert'][$_name][1],
-                                                             $smarty->_plugins['insert'][$_name][2],
-                                                             !empty($params['args']['script']) ? true : false);
-        }
-        return $smarty->_smarty_md5."{insert_cache $_arg_string}".$smarty->_smarty_md5;
-    } else {
-        if (isset($params['args']['script'])) {
-            $_params = array('resource_name' => $smarty->_dequote($params['args']['script']));
-            require_once(SMARTY_CORE_DIR . 'core.get_php_resource.php');
-            if(!smarty_core_get_php_resource($_params, $smarty)) {
-                return false;
-            }
-
-            if ($_params['resource_type'] == 'file') {
-                $smarty->_include($_params['php_resource'], true);
-            } else {
-                $smarty->_eval($_params['php_resource']);
-            }
-            unset($params['args']['script']);
-        }
-
-        $_funcname = $smarty->_plugins['insert'][$params['args']['name']][0];
-        $_content = $_funcname($params['args'], $smarty);
-        if ($smarty->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $smarty->_smarty_debug_info[] = array('type'      => 'insert',
-                                                'filename'  => 'insert_'.$params['args']['name'],
-                                                'depth'     => $smarty->_inclusion_depth,
-                                                'exec_time' => smarty_core_get_microtime($_params, $smarty) - $_debug_start_time);
-        }
-
-        if (!empty($params['args']["assign"])) {
-            $smarty->assign($params['args']["assign"], $_content);
-        } else {
-            return $_content;
-        }
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.smarty_include_php.php b/includes/smarty/internals/core.smarty_include_php.php
deleted file mode 100644
index 30c6e765..00000000
--- a/includes/smarty/internals/core.smarty_include_php.php
+++ /dev/null
@@ -1,50 +0,0 @@
- $params['smarty_file']);
-    require_once(SMARTY_CORE_DIR . 'core.get_php_resource.php');
-    smarty_core_get_php_resource($_params, $smarty);
-    $_smarty_resource_type = $_params['resource_type'];
-    $_smarty_php_resource = $_params['php_resource'];
-
-    if (!empty($params['smarty_assign'])) {
-        ob_start();
-        if ($_smarty_resource_type == 'file') {
-            $smarty->_include($_smarty_php_resource, $params['smarty_once'], $params['smarty_include_vars']);
-        } else {
-            $smarty->_eval($_smarty_php_resource, $params['smarty_include_vars']);
-        }
-        $smarty->assign($params['smarty_assign'], ob_get_contents());
-        ob_end_clean();
-    } else {
-        if ($_smarty_resource_type == 'file') {
-            $smarty->_include($_smarty_php_resource, $params['smarty_once'], $params['smarty_include_vars']);
-        } else {
-            $smarty->_eval($_smarty_php_resource, $params['smarty_include_vars']);
-        }
-    }
-}
-
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.write_cache_file.php b/includes/smarty/internals/core.write_cache_file.php
deleted file mode 100644
index fa3cdd74..00000000
--- a/includes/smarty/internals/core.write_cache_file.php
+++ /dev/null
@@ -1,96 +0,0 @@
-_cache_info['timestamp'] = time();
-    if ($smarty->cache_lifetime > -1){
-        // expiration set
-        $smarty->_cache_info['expires'] = $smarty->_cache_info['timestamp'] + $smarty->cache_lifetime;
-    } else {
-        // cache will never expire
-        $smarty->_cache_info['expires'] = -1;
-    }
-
-    // collapse nocache.../nocache-tags
-    if (preg_match_all('!\{(/?)nocache\:[0-9a-f]{32}#\d+\}!', $params['results'], $match, PREG_PATTERN_ORDER)) {
-        // remove everything between every pair of outermost noache.../nocache-tags
-        // and replace it by a single nocache-tag
-        // this new nocache-tag will be replaced by dynamic contents in
-        // smarty_core_process_compiled_includes() on a cache-read
-        
-        $match_count = count($match[0]);
-        $results = preg_split('!(\{/?nocache\:[0-9a-f]{32}#\d+\})!', $params['results'], -1, PREG_SPLIT_DELIM_CAPTURE);
-        
-        $level = 0;
-        $j = 0;
-        for ($i=0, $results_count = count($results); $i < $results_count && $j < $match_count; $i++) {
-            if ($results[$i] == $match[0][$j]) {
-                // nocache tag
-                if ($match[1][$j]) { // closing tag
-                    $level--;
-                    unset($results[$i]);
-                } else { // opening tag
-                    if ($level++ > 0) unset($results[$i]);
-                }
-                $j++;
-            } elseif ($level > 0) {
-                unset($results[$i]);
-            }
-        }
-        $params['results'] = implode('', $results);
-    }
-    $smarty->_cache_info['cache_serials'] = $smarty->_cache_serials;
-
-    // prepend the cache header info into cache file
-    $_cache_info = serialize($smarty->_cache_info);
-    $params['results'] = strlen($_cache_info) . "\n" . $_cache_info . $params['results'];
-
-    if (!empty($smarty->cache_handler_func)) {
-        // use cache_handler function
-        call_user_func_array($smarty->cache_handler_func,
-                             array('write', &$smarty, &$params['results'], $params['tpl_file'], $params['cache_id'], $params['compile_id'], $smarty->_cache_info['expires']));
-    } else {
-        // use local cache file
-
-        if(!@is_writable($smarty->cache_dir)) {
-            // cache_dir not writable, see if it exists
-            if(!@is_dir($smarty->cache_dir)) {
-                $smarty->trigger_error('the $cache_dir \'' . $smarty->cache_dir . '\' does not exist, or is not a directory.', E_USER_ERROR);
-                return false;
-            }
-            $smarty->trigger_error('unable to write to $cache_dir \'' . realpath($smarty->cache_dir) . '\'. Be sure $cache_dir is writable by the web server user.', E_USER_ERROR);
-            return false;
-        }
-
-        $_auto_id = $smarty->_get_auto_id($params['cache_id'], $params['compile_id']);
-        $_cache_file = $smarty->_get_auto_filename($smarty->cache_dir, $params['tpl_file'], $_auto_id);
-        $_params = array('filename' => $_cache_file, 'contents' => $params['results'], 'create_dirs' => true);
-        require_once(SMARTY_CORE_DIR . 'core.write_file.php');
-        smarty_core_write_file($_params, $smarty);
-        return true;
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.write_compiled_include.php b/includes/smarty/internals/core.write_compiled_include.php
deleted file mode 100644
index c14adb5f..00000000
--- a/includes/smarty/internals/core.write_compiled_include.php
+++ /dev/null
@@ -1,91 +0,0 @@
-caching && \!\$this->_cache_including\)\: echo \'\{nocache\:('.$params['cache_serial'].')#(\d+)\}\'; endif;';
-    $_tag_end   = 'if \(\$this->caching && \!\$this->_cache_including\)\: echo \'\{/nocache\:(\\2)#(\\3)\}\'; endif;';
-
-    preg_match_all('!('.$_tag_start.'(.*)'.$_tag_end.')!Us',
-                   $params['compiled_content'], $_match_source, PREG_SET_ORDER);
-    
-    // no nocache-parts found: done
-    if (count($_match_source)==0) return;
-
-    // convert the matched php-code to functions
-    $_include_compiled =  "_version.", created on ".strftime("%Y-%m-%d %H:%M:%S")."\n";
-    $_include_compiled .= "         compiled from " . strtr(urlencode($params['resource_name']), array('%2F'=>'/', '%3A'=>':')) . " */\n\n";
-
-    $_compile_path = $params['include_file_path'];
-
-    $smarty->_cache_serials[$_compile_path] = $params['cache_serial'];
-    $_include_compiled .= "\$this->_cache_serials['".$_compile_path."'] = '".$params['cache_serial']."';\n\n?>";
-
-    $_include_compiled .= $params['plugins_code'];
-    $_include_compiled .= "= 5.0) ? '_smarty' : 'this';
-    for ($_i = 0, $_for_max = count($_match_source); $_i < $_for_max; $_i++) {
-        $_match =& $_match_source[$_i];
-        $source = $_match[4];
-        if ($this_varname == '_smarty') {
-            /* rename $this to $_smarty in the sourcecode */
-            $tokens = token_get_all('\n";
-
-    $_params = array('filename' => $_compile_path,
-                     'contents' => $_include_compiled, 'create_dirs' => true);
-
-    require_once(SMARTY_CORE_DIR . 'core.write_file.php');
-    smarty_core_write_file($_params, $smarty);
-    return true;
-}
-
-
-?>
diff --git a/includes/smarty/internals/core.write_compiled_resource.php b/includes/smarty/internals/core.write_compiled_resource.php
deleted file mode 100644
index b902eff3..00000000
--- a/includes/smarty/internals/core.write_compiled_resource.php
+++ /dev/null
@@ -1,35 +0,0 @@
-compile_dir)) {
-        // compile_dir not writable, see if it exists
-        if(!@is_dir($smarty->compile_dir)) {
-            $smarty->trigger_error('the $compile_dir \'' . $smarty->compile_dir . '\' does not exist, or is not a directory.', E_USER_ERROR);
-            return false;
-        }
-        $smarty->trigger_error('unable to write to $compile_dir \'' . realpath($smarty->compile_dir) . '\'. Be sure $compile_dir is writable by the web server user.', E_USER_ERROR);
-        return false;
-    }
-
-    $_params = array('filename' => $params['compile_path'], 'contents' => $params['compiled_content'], 'create_dirs' => true);
-    require_once(SMARTY_CORE_DIR . 'core.write_file.php');
-    smarty_core_write_file($_params, $smarty);
-    return true;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/internals/core.write_file.php b/includes/smarty/internals/core.write_file.php
deleted file mode 100644
index 8a3a3b39..00000000
--- a/includes/smarty/internals/core.write_file.php
+++ /dev/null
@@ -1,54 +0,0 @@
- $_dirname);
-        require_once(SMARTY_CORE_DIR . 'core.create_dir_structure.php');
-        smarty_core_create_dir_structure($_params, $smarty);
-    }
-
-    // write to tmp file, then rename it to avoid file locking race condition
-    $_tmp_file = tempnam($_dirname, 'wrt');
-
-    if (!($fd = @fopen($_tmp_file, 'wb'))) {
-        $_tmp_file = $_dirname . DIRECTORY_SEPARATOR . uniqid('wrt');
-        if (!($fd = @fopen($_tmp_file, 'wb'))) {
-            $smarty->trigger_error("problem writing temporary file '$_tmp_file'");
-            return false;
-        }
-    }
-
-    fwrite($fd, $params['contents']);
-    fclose($fd);
-
-    if (DIRECTORY_SEPARATOR == '\\' || !@rename($_tmp_file, $params['filename'])) {
-        // On platforms and filesystems that cannot overwrite with rename() 
-        // delete the file before renaming it -- because windows always suffers
-        // this, it is short-circuited to avoid the initial rename() attempt
-        @unlink($params['filename']);
-        @rename($_tmp_file, $params['filename']);
-    }
-    @chmod($params['filename'], $smarty->_file_perms);
-
-    return true;
-}
-
-/* vim: set expandtab: */
-
-?>
\ No newline at end of file
diff --git a/includes/smarty/plugins/block.t.php b/includes/smarty/plugins/block.t.php
deleted file mode 100644
index ca7382ae..00000000
--- a/includes/smarty/plugins/block.t.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- * @copyright 2004-2005 Sagi Bashari
- */
- 
-/**
- * Replaces arguments in a string with their values.
- * Arguments are represented by % followed by their number.
- *
- * @param	string	Source string
- * @param	mixed	Arguments, can be passed in an array or through single variables.
- * @returns	string	Modified string
- */
-function smarty_gettext_strarg($str)
-{
-	$tr = array();
-	$p = 0;
-
-	for ($i=1; $i < func_num_args(); $i++) {
-		$arg = func_get_arg($i);
-		
-		if (is_array($arg)) {
-			foreach ($arg as $aarg) {
-				$tr['%'.++$p] = $aarg;
-			}
-		} else {
-			$tr['%'.++$p] = $arg;
-		}
-	}
-	
-	return strtr($str, $tr);
-}
-
-/**
- * Smarty block function, provides gettext support for smarty.
- *
- * The block content is the text that should be translated.
- *
- * Any parameter that is sent to the function will be represented as %n in the translation text, 
- * where n is 1 for the first parameter. The following parameters are reserved:
- *   - escape - sets escape mode:
- *       - 'html' for HTML escaping, this is the default.
- *       - 'js' for javascript escaping.
- *       - 'url' for url escaping.
- *       - 'no'/'off'/0 - turns off escaping
- *   - plural - The plural version of the text (2nd parameter of ngettext())
- *   - count - The item count for plural mode (3rd parameter of ngettext())
- */
-function smarty_block_t($params, $text, &$smarty)
-{
-	$text = stripslashes($text);
-	
-	// set escape mode
-	if (isset($params['escape'])) {
-		$escape = $params['escape'];
-		unset($params['escape']);
-	}
-	
-	// set plural version
-	if (isset($params['plural'])) {
-		$plural = $params['plural'];
-		unset($params['plural']);
-		
-		// set count
-		if (isset($params['count'])) {
-			$count = $params['count'];
-			unset($params['count']);
-		}
-	}
-	
-	// use plural if required parameters are set
-	if (isset($count) && isset($plural)) {
-		$text = ngettext($text, $plural, $count);
-	} else { // use normal
-		$text = gettext($text);
-	}
-
-	// run strarg if there are parameters
-	if (count($params)) {
-		$text = smarty_gettext_strarg($text, $params);
-	}
-
-	if (!isset($escape) || $escape == 'html') { // html escape, default
-	   $text = nl2br(htmlspecialchars($text));
-   } elseif (isset($escape)) {
-		switch ($escape) {
-			case 'javascript':
-			case 'js':
-				// javascript escape
-				$text = str_replace('\'', '\\\'', stripslashes($text));
-				break;
-			case 'url':
-				// url escape
-				$text = urlencode($text);
-				break;
-		}
-	}
-	
-	return $text;
-}
-
-?>
diff --git a/includes/smarty/plugins/block.textformat.php b/includes/smarty/plugins/block.textformat.php
deleted file mode 100644
index 8cd010ac..00000000
--- a/includes/smarty/plugins/block.textformat.php
+++ /dev/null
@@ -1,103 +0,0 @@
-
- * Name:     textformat

- * Purpose:  format text a certain way with preset styles
- *           or custom wrap/indent settings

- * @link http://smarty.php.net/manual/en/language.function.textformat.php {textformat}
- *       (Smarty online manual)
- * @param array
- * 
- * Params:   style: string (email)
- *           indent: integer (0)
- *           wrap: integer (80)
- *           wrap_char string ("\n")
- *           indent_char: string (" ")
- *           wrap_boundary: boolean (true)
- * 

- * @author Monte Ohrt 
- * @param string contents of the block
- * @param Smarty clever simulation of a method
- * @return string string $content re-formatted
- */
-function smarty_block_textformat($params, $content, &$smarty)
-{
-    if (is_null($content)) {
-        return;
-    }
-
-    $style = null;
-    $indent = 0;
-    $indent_first = 0;
-    $indent_char = ' ';
-    $wrap = 80;
-    $wrap_char = "\n";
-    $wrap_cut = false;
-    $assign = null;
-    
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'style':
-            case 'indent_char':
-            case 'wrap_char':
-            case 'assign':
-                $$_key = (string)$_val;
-                break;
-
-            case 'indent':
-            case 'indent_first':
-            case 'wrap':
-                $$_key = (int)$_val;
-                break;
-
-            case 'wrap_cut':
-                $$_key = (bool)$_val;
-                break;
-
-            default:
-                $smarty->trigger_error("textformat: unknown attribute '$_key'");
-        }
-    }
-
-    if ($style == 'email') {
-        $wrap = 72;
-    }
-
-    // split into paragraphs
-    $_paragraphs = preg_split('![\r\n][\r\n]!',$content);
-    $_output = '';
-
-    for($_x = 0, $_y = count($_paragraphs); $_x < $_y; $_x++) {
-        if ($_paragraphs[$_x] == '') {
-            continue;
-        }
-        // convert mult. spaces & special chars to single space
-        $_paragraphs[$_x] = preg_replace(array('!\s+!','!(^\s+)|(\s+$)!'), array(' ',''), $_paragraphs[$_x]);
-        // indent first line
-        if($indent_first > 0) {
-            $_paragraphs[$_x] = str_repeat($indent_char, $indent_first) . $_paragraphs[$_x];
-        }
-        // wordwrap sentences
-        $_paragraphs[$_x] = wordwrap($_paragraphs[$_x], $wrap - $indent, $wrap_char, $wrap_cut);
-        // indent lines
-        if($indent > 0) {
-            $_paragraphs[$_x] = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraphs[$_x]);
-        }
-    }
-    $_output = implode($wrap_char . $wrap_char, $_paragraphs);
-
-    return $assign ? $smarty->assign($assign, $_output) : $_output;
-
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/plugins/block.translate.php b/includes/smarty/plugins/block.translate.php
deleted file mode 100644
index 5be4afc1..00000000
--- a/includes/smarty/plugins/block.translate.php
+++ /dev/null
@@ -1,11 +0,0 @@
-
diff --git a/includes/smarty/plugins/compiler.assign.php b/includes/smarty/plugins/compiler.assign.php
deleted file mode 100644
index abef377f..00000000
--- a/includes/smarty/plugins/compiler.assign.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- * Name:     assign

- * Purpose:  assign a value to a template variable
- * @link http://smarty.php.net/manual/en/language.custom.functions.php#LANGUAGE.FUNCTION.ASSIGN {assign}
- *       (Smarty online manual)
- * @author Monte Ohrt  (initial author)
- * @author messju mohr  (conversion to compiler function)
- * @param string containing var-attribute and value-attribute
- * @param Smarty_Compiler
- */
-function smarty_compiler_assign($tag_attrs, &$compiler)
-{
-    $_params = $compiler->_parse_attrs($tag_attrs);
-
-    if (!isset($_params['var'])) {
-        $compiler->_syntax_error("assign: missing 'var' parameter", E_USER_WARNING);
-        return;
-    }
-
-    if (!isset($_params['value'])) {
-        $compiler->_syntax_error("assign: missing 'value' parameter", E_USER_WARNING);
-        return;
-    }
-
-    return "\$this->assign({$_params['var']}, {$_params['value']});";
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/plugins/function.assign_debug_info.php b/includes/smarty/plugins/function.assign_debug_info.php
deleted file mode 100644
index 65404987..00000000
--- a/includes/smarty/plugins/function.assign_debug_info.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- * Name:     assign_debug_info

- * Purpose:  assign debug info to the template

- * @author Monte Ohrt 
- * @param array unused in this plugin, this plugin uses {@link Smarty::$_config},
- *              {@link Smarty::$_tpl_vars} and {@link Smarty::$_smarty_debug_info}
- * @param Smarty
- */
-function smarty_function_assign_debug_info($params, &$smarty)
-{
-    $assigned_vars = $smarty->_tpl_vars;
-    ksort($assigned_vars);
-    if (@is_array($smarty->_config[0])) {
-        $config_vars = $smarty->_config[0];
-        ksort($config_vars);
-        $smarty->assign("_debug_config_keys", array_keys($config_vars));
-        $smarty->assign("_debug_config_vals", array_values($config_vars));
-    }
-    
-    $included_templates = $smarty->_smarty_debug_info;
-    
-    $smarty->assign("_debug_keys", array_keys($assigned_vars));
-    $smarty->assign("_debug_vals", array_values($assigned_vars));
-    
-    $smarty->assign("_debug_tpls", $included_templates);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/plugins/function.config_load.php b/includes/smarty/plugins/function.config_load.php
deleted file mode 100644
index db89f638..00000000
--- a/includes/smarty/plugins/function.config_load.php
+++ /dev/null
@@ -1,142 +0,0 @@
-
- * Name:     config_load

- * Purpose:  load config file vars
- * @link http://smarty.php.net/manual/en/language.function.config.load.php {config_load}
- *       (Smarty online manual)
- * @author Monte Ohrt 
- * @author messju mohr  (added use of resources)
- * @param array Format:
- * 
- * array('file' => required config file name,
- *       'section' => optional config file section to load
- *       'scope' => local/parent/global
- *       'global' => overrides scope, setting to parent if true)
- * 

- * @param Smarty
- */
-function smarty_function_config_load($params, &$smarty)
-{
-        if ($smarty->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $_debug_start_time = smarty_core_get_microtime($_params, $smarty);
-        }
-
-        $_file = isset($params['file']) ? $smarty->_dequote($params['file']) : null;
-        $_section = isset($params['section']) ? $smarty->_dequote($params['section']) : null;
-        $_scope = isset($params['scope']) ? $smarty->_dequote($params['scope']) : 'global';
-        $_global = isset($params['global']) ? $smarty->_dequote($params['global']) : false;
-
-        if (!isset($_file) || strlen($_file) == 0) {
-            $smarty->trigger_error("missing 'file' attribute in config_load tag", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        if (isset($_scope)) {
-            if ($_scope != 'local' &&
-                $_scope != 'parent' &&
-                $_scope != 'global') {
-                $smarty->trigger_error("invalid 'scope' attribute value", E_USER_ERROR, __FILE__, __LINE__);
-            }
-        } else {
-            if ($_global) {
-                $_scope = 'parent';
-            } else {
-                $_scope = 'local';
-            }
-        }
-
-        $_params = array('resource_name' => $_file,
-                         'resource_base_path' => $smarty->config_dir,
-                         'get_source' => false);
-        $smarty->_parse_resource_name($_params);
-        $_file_path = $_params['resource_type'] . ':' . $_params['resource_name'];
-        if (isset($_section))
-            $_compile_file = $smarty->_get_compile_path($_file_path.'|'.$_section);
-        else
-            $_compile_file = $smarty->_get_compile_path($_file_path);
-
-        if($smarty->force_compile || !file_exists($_compile_file)) {
-            $_compile = true;
-        } elseif ($smarty->compile_check) {
-            $_params = array('resource_name' => $_file,
-                             'resource_base_path' => $smarty->config_dir,
-                             'get_source' => false);
-            $_compile = $smarty->_fetch_resource_info($_params) &&
-                $_params['resource_timestamp'] > filemtime($_compile_file);
-        } else {
-            $_compile = false;
-        }
-
-        if($_compile) {
-            // compile config file
-            if(!is_object($smarty->_conf_obj)) {
-                require_once SMARTY_DIR . $smarty->config_class . '.class.php';
-                $smarty->_conf_obj = new $smarty->config_class();
-                $smarty->_conf_obj->overwrite = $smarty->config_overwrite;
-                $smarty->_conf_obj->booleanize = $smarty->config_booleanize;
-                $smarty->_conf_obj->read_hidden = $smarty->config_read_hidden;
-                $smarty->_conf_obj->fix_newlines = $smarty->config_fix_newlines;
-            }
-
-            $_params = array('resource_name' => $_file,
-                             'resource_base_path' => $smarty->config_dir,
-                             $_params['get_source'] = true);
-            if (!$smarty->_fetch_resource_info($_params)) {
-                return;
-            }
-            $smarty->_conf_obj->set_file_contents($_file, $_params['source_content']);
-            $_config_vars = array_merge($smarty->_conf_obj->get($_file),
-                    $smarty->_conf_obj->get($_file, $_section));
-            if(function_exists('var_export')) {
-                $_output = '';
-            } else {
-                $_output = ''\\\'', '\\'=>'\\\\')) . '\'); ?>';
-            }
-            $_params = (array('compile_path' => $_compile_file, 'compiled_content' => $_output, 'resource_timestamp' => $_params['resource_timestamp']));
-            require_once(SMARTY_CORE_DIR . 'core.write_compiled_resource.php');
-            smarty_core_write_compiled_resource($_params, $smarty);
-        } else {
-            include($_compile_file);
-        }
-
-        if ($smarty->caching) {
-            $smarty->_cache_info['config'][$_file] = true;
-        }
-
-        $smarty->_config[0]['vars'] = @array_merge($smarty->_config[0]['vars'], $_config_vars);
-        $smarty->_config[0]['files'][$_file] = true;
-
-        if ($_scope == 'parent') {
-                $smarty->_config[1]['vars'] = @array_merge($smarty->_config[1]['vars'], $_config_vars);
-                $smarty->_config[1]['files'][$_file] = true;
-        } else if ($_scope == 'global') {
-            for ($i = 1, $for_max = count($smarty->_config); $i < $for_max; $i++) {
-                $smarty->_config[$i]['vars'] = @array_merge($smarty->_config[$i]['vars'], $_config_vars);
-                $smarty->_config[$i]['files'][$_file] = true;
-            }
-        }
-
-        if ($smarty->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $smarty->_smarty_debug_info[] = array('type'      => 'config',
-                                                'filename'  => $_file.' ['.$_section.'] '.$_scope,
-                                                'depth'     => $smarty->_inclusion_depth,
-                                                'exec_time' => smarty_core_get_microtime($_params, $smarty) - $_debug_start_time);
-        }
-
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/plugins/function.counter.php b/includes/smarty/plugins/function.counter.php
deleted file mode 100644
index 1f26db5f..00000000
--- a/includes/smarty/plugins/function.counter.php
+++ /dev/null
@@ -1,80 +0,0 @@
-
- * Name:     counter

- * Purpose:  print out a counter value
- * @author Monte Ohrt 
- * @link http://smarty.php.net/manual/en/language.function.counter.php {counter}
- *       (Smarty online manual)
- * @param array parameters
- * @param Smarty
- * @return string|null
- */
-function smarty_function_counter($params, &$smarty)
-{
-    static $counters = array();
-
-    $name = (isset($params['name'])) ? $params['name'] : 'default';
-    if (!isset($counters[$name])) {
-        $counters[$name] = array(
-            'start'=>1,
-            'skip'=>1,
-            'direction'=>'up',
-            'count'=>1
-            );
-    }
-    $counter =& $counters[$name];
-
-    if (isset($params['start'])) {
-        $counter['start'] = $counter['count'] = (int)$params['start'];
-    }
-
-    if (!empty($params['assign'])) {
-        $counter['assign'] = $params['assign'];
-    }
-
-    if (isset($counter['assign'])) {
-        $smarty->assign($counter['assign'], $counter['count']);
-    }
-    
-    if (isset($params['print'])) {
-        $print = (bool)$params['print'];
-    } else {
-        $print = empty($counter['assign']);
-    }
-
-    if ($print) {
-        $retval = $counter['count'];
-    } else {
-        $retval = null;
-    }
-
-    if (isset($params['skip'])) {
-        $counter['skip'] = $params['skip'];
-    }
-    
-    if (isset($params['direction'])) {
-        $counter['direction'] = $params['direction'];
-    }
-
-    if ($counter['direction'] == "down")
-        $counter['count'] -= $counter['skip'];
-    else
-        $counter['count'] += $counter['skip'];
-    
-    return $retval;
-    
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/plugins/function.cycle.php b/includes/smarty/plugins/function.cycle.php
deleted file mode 100644
index fe78bb87..00000000
--- a/includes/smarty/plugins/function.cycle.php
+++ /dev/null
@@ -1,102 +0,0 @@
-
- * Name:     cycle

- * Date:     May 3, 2002

- * Purpose:  cycle through given values

- * Input:
- *         - name = name of cycle (optional)
- *         - values = comma separated list of values to cycle,
- *                    or an array of values to cycle
- *                    (this can be left out for subsequent calls)
- *         - reset = boolean - resets given var to true
- *         - print = boolean - print var or not. default is true
- *         - advance = boolean - whether or not to advance the cycle
- *         - delimiter = the value delimiter, default is ","
- *         - assign = boolean, assigns to template var instead of
- *                    printed.
- *
- * Examples:

- * 
- * {cycle values="#eeeeee,#d0d0d0d"}
- * {cycle name=row values="one,two,three" reset=true}
- * {cycle name=row}
- * 

- * @link http://smarty.php.net/manual/en/language.function.cycle.php {cycle}
- *       (Smarty online manual)
- * @author Monte Ohrt 
- * @author credit to Mark Priatel 
- * @author credit to Gerard 
- * @author credit to Jason Sweat 
- * @version  1.3
- * @param array
- * @param Smarty
- * @return string|null
- */
-function smarty_function_cycle($params, &$smarty)
-{
-    static $cycle_vars;
-    
-    $name = (empty($params['name'])) ? 'default' : $params['name'];
-    $print = (isset($params['print'])) ? (bool)$params['print'] : true;
-    $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true;
-    $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
-            
-    if (!in_array('values', array_keys($params))) {
-        if(!isset($cycle_vars[$name]['values'])) {
-            $smarty->trigger_error("cycle: missing 'values' parameter");
-            return;
-        }
-    } else {
-        if(isset($cycle_vars[$name]['values'])
-            && $cycle_vars[$name]['values'] != $params['values'] ) {
-            $cycle_vars[$name]['index'] = 0;
-        }
-        $cycle_vars[$name]['values'] = $params['values'];
-    }
-
-    $cycle_vars[$name]['delimiter'] = (isset($params['delimiter'])) ? $params['delimiter'] : ',';
-    
-    if(is_array($cycle_vars[$name]['values'])) {
-        $cycle_array = $cycle_vars[$name]['values'];
-    } else {
-        $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
-    }
-    
-    if(!isset($cycle_vars[$name]['index']) || $reset ) {
-        $cycle_vars[$name]['index'] = 0;
-    }
-    
-    if (isset($params['assign'])) {
-        $print = false;
-        $smarty->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
-    }
-        
-    if($print) {
-        $retval = $cycle_array[$cycle_vars[$name]['index']];
-    } else {
-        $retval = null;
-    }
-
-    if($advance) {
-        if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
-            $cycle_vars[$name]['index'] = 0;
-        } else {
-            $cycle_vars[$name]['index']++;
-        }
-    }
-    
-    return $retval;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/plugins/function.debug.php b/includes/smarty/plugins/function.debug.php
deleted file mode 100644
index 43452307..00000000
--- a/includes/smarty/plugins/function.debug.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- * Name:     debug

- * Date:     July 1, 2002

- * Purpose:  popup debug window
- * @link http://smarty.php.net/manual/en/language.function.debug.php {debug}
- *       (Smarty online manual)
- * @author   Monte Ohrt 
- * @version  1.0
- * @param array
- * @param Smarty
- * @return string output from {@link Smarty::_generate_debug_output()}
- */
-function smarty_function_debug($params, &$smarty)
-{
-    if (isset($params['output'])) {
-        $smarty->assign('_smarty_debug_output', $params['output']);
-    }
-    require_once(SMARTY_CORE_DIR . 'core.display_debug_console.php');
-    return smarty_core_display_debug_console(null, $smarty);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/plugins/function.eval.php b/includes/smarty/plugins/function.eval.php
deleted file mode 100644
index ff0472de..00000000
--- a/includes/smarty/plugins/function.eval.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- * Name:     eval

- * Purpose:  evaluate a template variable as a template

- * @link http://smarty.php.net/manual/en/language.function.eval.php {eval}
- *       (Smarty online manual)
- * @author Monte Ohrt 
- * @param array
- * @param Smarty
- */
-function smarty_function_eval($params, &$smarty)
-{
-
-    if (!isset($params['var'])) {
-        $smarty->trigger_error("eval: missing 'var' parameter");
-        return;
-    }
-
-    if($params['var'] == '') {
-        return;
-    }
-
-    $smarty->_compile_source('evaluated template', $params['var'], $_var_compiled);
-
-    ob_start();
-    $smarty->_eval('?>' . $_var_compiled);
-    $_contents = ob_get_contents();
-    ob_end_clean();
-
-    if (!empty($params['assign'])) {
-        $smarty->assign($params['assign'], $_contents);
-    } else {
-        return $_contents;
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/plugins/function.fetch.php b/includes/smarty/plugins/function.fetch.php
deleted file mode 100644
index 81b1bfc6..00000000
--- a/includes/smarty/plugins/function.fetch.php
+++ /dev/null
@@ -1,221 +0,0 @@
-
- * Name:     fetch

- * Purpose:  fetch file, web or ftp data and display results
- * @link http://smarty.php.net/manual/en/language.function.fetch.php {fetch}
- *       (Smarty online manual)
- * @author Monte Ohrt 
- * @param array
- * @param Smarty
- * @return string|null if the assign parameter is passed, Smarty assigns the
- *                     result to a template variable
- */
-function smarty_function_fetch($params, &$smarty)
-{
-    if (empty($params['file'])) {
-        $smarty->_trigger_fatal_error("[plugin] parameter 'file' cannot be empty");
-        return;
-    }
-
-    $content = '';
-    if ($smarty->security && !preg_match('!^(http|ftp)://!i', $params['file'])) {
-        $_params = array('resource_type' => 'file', 'resource_name' => $params['file']);
-        require_once(SMARTY_CORE_DIR . 'core.is_secure.php');
-        if(!smarty_core_is_secure($_params, $smarty)) {
-            $smarty->_trigger_fatal_error('[plugin] (secure mode) fetch \'' . $params['file'] . '\' is not allowed');
-            return;
-        }
-        
-        // fetch the file
-        if($fp = @fopen($params['file'],'r')) {
-            while(!feof($fp)) {
-                $content .= fgets ($fp,4096);
-            }
-            fclose($fp);
-        } else {
-            $smarty->_trigger_fatal_error('[plugin] fetch cannot read file \'' . $params['file'] . '\'');
-            return;
-        }
-    } else {
-        // not a local file
-        if(preg_match('!^http://!i',$params['file'])) {
-            // http fetch
-            if($uri_parts = parse_url($params['file'])) {
-                // set defaults
-                $host = $server_name = $uri_parts['host'];
-                $timeout = 30;
-                $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
-                $agent = "Smarty Template Engine ".$smarty->_version;
-                $referer = "";
-                $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
-                $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
-                $_is_proxy = false;
-                if(empty($uri_parts['port'])) {
-                    $port = 80;
-                } else {
-                    $port = $uri_parts['port'];
-                }
-                if(!empty($uri_parts['user'])) {
-                    $user = $uri_parts['user'];
-                }
-                if(!empty($uri_parts['pass'])) {
-                    $pass = $uri_parts['pass'];
-                }
-                // loop through parameters, setup headers
-                foreach($params as $param_key => $param_value) {
-                    switch($param_key) {
-                        case "file":
-                        case "assign":
-                        case "assign_headers":
-                            break;
-                        case "user":
-                            if(!empty($param_value)) {
-                                $user = $param_value;
-                            }
-                            break;
-                        case "pass":
-                            if(!empty($param_value)) {
-                                $pass = $param_value;
-                            }
-                            break;
-                        case "accept":
-                            if(!empty($param_value)) {
-                                $accept = $param_value;
-                            }
-                            break;
-                        case "header":
-                            if(!empty($param_value)) {
-                                if(!preg_match('![\w\d-]+: .+!',$param_value)) {
-                                    $smarty->_trigger_fatal_error("[plugin] invalid header format '".$param_value."'");
-                                    return;
-                                } else {
-                                    $extra_headers[] = $param_value;
-                                }
-                            }
-                            break;
-                        case "proxy_host":
-                            if(!empty($param_value)) {
-                                $proxy_host = $param_value;
-                            }
-                            break;
-                        case "proxy_port":
-                            if(!preg_match('!\D!', $param_value)) {
-                                $proxy_port = (int) $param_value;
-                            } else {
-                                $smarty->_trigger_fatal_error("[plugin] invalid value for attribute '".$param_key."'");
-                                return;
-                            }
-                            break;
-                        case "agent":
-                            if(!empty($param_value)) {
-                                $agent = $param_value;
-                            }
-                            break;
-                        case "referer":
-                            if(!empty($param_value)) {
-                                $referer = $param_value;
-                            }
-                            break;
-                        case "timeout":
-                            if(!preg_match('!\D!', $param_value)) {
-                                $timeout = (int) $param_value;
-                            } else {
-                                $smarty->_trigger_fatal_error("[plugin] invalid value for attribute '".$param_key."'");
-                                return;
-                            }
-                            break;
-                        default:
-                            $smarty->_trigger_fatal_error("[plugin] unrecognized attribute '".$param_key."'");
-                            return;
-                    }
-                }
-                if(!empty($proxy_host) && !empty($proxy_port)) {
-                    $_is_proxy = true;
-                    $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout);
-                } else {
-                    $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
-                }
-
-                if(!$fp) {
-                    $smarty->_trigger_fatal_error("[plugin] unable to fetch: $errstr ($errno)");
-                    return;
-                } else {
-                    if($_is_proxy) {
-                        fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
-                    } else {
-                        fputs($fp, "GET $uri HTTP/1.0\r\n");
-                    }
-                    if(!empty($host)) {
-                        fputs($fp, "Host: $host\r\n");
-                    }
-                    if(!empty($accept)) {
-                        fputs($fp, "Accept: $accept\r\n");
-                    }
-                    if(!empty($agent)) {
-                        fputs($fp, "User-Agent: $agent\r\n");
-                    }
-                    if(!empty($referer)) {
-                        fputs($fp, "Referer: $referer\r\n");
-                    }
-                    if(isset($extra_headers) && is_array($extra_headers)) {
-                        foreach($extra_headers as $curr_header) {
-                            fputs($fp, $curr_header."\r\n");
-                        }
-                    }
-                    if(!empty($user) && !empty($pass)) {
-                        fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n");
-                    }
-
-                    fputs($fp, "\r\n");
-                    while(!feof($fp)) {
-                        $content .= fgets($fp,4096);
-                    }
-                    fclose($fp);
-                    $csplit = split("\r\n\r\n",$content,2);
-
-                    $content = $csplit[1];
-
-                    if(!empty($params['assign_headers'])) {
-                        $smarty->assign($params['assign_headers'],split("\r\n",$csplit[0]));
-                    }
-                }
-            } else {
-                $smarty->_trigger_fatal_error("[plugin] unable to parse URL, check syntax");
-                return;
-            }
-        } else {
-            // ftp fetch
-            if($fp = @fopen($params['file'],'r')) {
-                while(!feof($fp)) {
-                    $content .= fgets ($fp,4096);
-                }
-                fclose($fp);
-            } else {
-                $smarty->_trigger_fatal_error('[plugin] fetch cannot read file \'' . $params['file'] .'\'');
-                return;
-            }
-        }
-
-    }
-
-
-    if (!empty($params['assign'])) {
-        $smarty->assign($params['assign'],$content);
-    } else {
-        return $content;
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/plugins/function.grid_paginate.php b/includes/smarty/plugins/function.grid_paginate.php
deleted file mode 100644
index cf0e4121..00000000
--- a/includes/smarty/plugins/function.grid_paginate.php
+++ /dev/null
@@ -1,22 +0,0 @@
-translate("grid_first") .'" id="'.$module.'_grid_pageinate_first" />';
-	echo '';
-	echo '';
-	echo '';
-	echo '';		
-}
- 
-?>
\ No newline at end of file
diff --git a/includes/smarty/plugins/function.html_checkboxes.php b/includes/smarty/plugins/function.html_checkboxes.php
deleted file mode 100644
index ed8ad7f3..00000000
--- a/includes/smarty/plugins/function.html_checkboxes.php
+++ /dev/null
@@ -1,143 +0,0 @@
-
- * Type:       function

- * Name:       html_checkboxes

- * Date:       24.Feb.2003

- * Purpose:    Prints out a list of checkbox input types

- * Input:

- *           - name       (optional) - string default "checkbox"
- *           - values     (required) - array
- *           - options    (optional) - associative array
- *           - checked    (optional) - array default not set
- *           - separator  (optional) - ie 
 or  
- *           - output     (optional) - the output next to each checkbox
- *           - assign     (optional) - assign the output as an array to this variable
- * Examples:
- * 
- * {html_checkboxes values=$ids output=$names}
- * {html_checkboxes values=$ids name='box' separator='
' output=$names}
- * {html_checkboxes values=$ids checked=$checked separator='
' output=$names}
- * 

- * @link http://smarty.php.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
- *      (Smarty online manual)
- * @author     Christopher Kvarme 
- * @author credits to Monte Ohrt 
- * @version    1.0
- * @param array
- * @param Smarty
- * @return string
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_checkboxes($params, &$smarty)
-{
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
-
-    $name = 'checkbox';
-    $values = null;
-    $options = null;
-    $selected = null;
-    $separator = '';
-    $labels = true;
-    $output = null;
-
-    $extra = '';
-
-    foreach($params as $_key => $_val) {
-        switch($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = $_val;
-                break;
-
-            case 'labels':
-                $$_key = (bool)$_val;
-                break;
-
-            case 'options':
-                $$_key = (array)$_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array)$_val);
-                break;
-
-            case 'checked':
-            case 'selected':
-                $selected = array_map('strval', array_values((array)$_val));
-                break;
-
-            case 'checkboxes':
-                $smarty->trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING);
-                $options = (array)$_val;
-                break;
-
-            case 'assign':
-                break;
-
-            default:
-                if(!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
-                } else {
-                    $smarty->trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
-
-    settype($selected, 'array');
-    $_html_result = array();
-
-    if (isset($options)) {
-
-        foreach ($options as $_key=>$_val)
-            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
-
-
-    } else {
-        foreach ($values as $_i=>$_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
-        }
-
-    }
-
-    if(!empty($params['assign'])) {
-        $smarty->assign($params['assign'], $_html_result);
-    } else {
-        return implode("\n",$_html_result);
-    }
-
-}
-
-function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels) {
-    $_output = '';
-    if ($labels) $_output .= '';
-    $_output .=  $separator;
-
-    return $_output;
-}
-
-?>
diff --git a/includes/smarty/plugins/function.html_image.php b/includes/smarty/plugins/function.html_image.php
deleted file mode 100644
index 9abae72e..00000000
--- a/includes/smarty/plugins/function.html_image.php
+++ /dev/null
@@ -1,142 +0,0 @@
-
- * Name:     html_image

- * Date:     Feb 24, 2003

- * Purpose:  format HTML tags for the image

- * Input:

- *         - file = file (and path) of image (required)
- *         - height = image height (optional, default actual height)
- *         - width = image width (optional, default actual width)
- *         - basedir = base directory for absolute paths, default
- *                     is environment variable DOCUMENT_ROOT
- *         - path_prefix = prefix for path output (optional, default empty)
- *
- * Examples: {html_image file="/images/masthead.gif"}
- * Output:   
- * @link http://smarty.php.net/manual/en/language.function.html.image.php {html_image}
- *      (Smarty online manual)
- * @author   Monte Ohrt 
- * @author credits to Duda  - wrote first image function
- *           in repository, helped with lots of functionality
- * @version  1.0
- * @param array
- * @param Smarty
- * @return string
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_image($params, &$smarty)
-{
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
-    
-    $alt = '';
-    $file = '';
-    $height = '';
-    $width = '';
-    $extra = '';
-    $prefix = '';
-    $suffix = '';
-    $path_prefix = '';
-    $server_vars = ($smarty->request_use_auto_globals) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
-    $basedir = isset($server_vars['DOCUMENT_ROOT']) ? $server_vars['DOCUMENT_ROOT'] : '';
-    foreach($params as $_key => $_val) {
-        switch($_key) {
-            case 'file':
-            case 'height':
-            case 'width':
-            case 'dpi':
-            case 'path_prefix':
-            case 'basedir':
-                $$_key = $_val;
-                break;
-
-            case 'alt':
-                if(!is_array($_val)) {
-                    $$_key = smarty_function_escape_special_chars($_val);
-                } else {
-                    $smarty->trigger_error("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-
-            case 'link':
-            case 'href':
-                $prefix = '';
-                $suffix = '';
-                break;
-
-            default:
-                if(!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
-                } else {
-                    $smarty->trigger_error("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (empty($file)) {
-        $smarty->trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
-        return;
-    }
-
-    if (substr($file,0,1) == '/') {
-        $_image_path = $basedir . $file;
-    } else {
-        $_image_path = $file;
-    }
-    
-    if(!isset($params['width']) || !isset($params['height'])) {
-        if(!$_image_data = @getimagesize($_image_path)) {
-            if(!file_exists($_image_path)) {
-                $smarty->trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
-                return;
-            } else if(!is_readable($_image_path)) {
-                $smarty->trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
-                return;
-            } else {
-                $smarty->trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
-                return;
-            }
-        }
-        if ($smarty->security &&
-            ($_params = array('resource_type' => 'file', 'resource_name' => $_image_path)) &&
-            (require_once(SMARTY_CORE_DIR . 'core.is_secure.php')) &&
-            (!smarty_core_is_secure($_params, $smarty)) ) {
-            $smarty->trigger_error("html_image: (secure) '$_image_path' not in secure directory", E_USER_NOTICE);
-        }        
-        
-        if(!isset($params['width'])) {
-            $width = $_image_data[0];
-        }
-        if(!isset($params['height'])) {
-            $height = $_image_data[1];
-        }
-
-    }
-
-    if(isset($params['dpi'])) {
-        if(strstr($server_vars['HTTP_USER_AGENT'], 'Mac')) {
-            $dpi_default = 72;
-        } else {
-            $dpi_default = 96;
-        }
-        $_resize = $dpi_default/$params['dpi'];
-        $width = round($width * $_resize);
-        $height = round($height * $_resize);
-    }
-
-    return $prefix . ''.$alt.'' . $suffix;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/plugins/function.html_options.php b/includes/smarty/plugins/function.html_options.php
deleted file mode 100644
index cebadde4..00000000
--- a/includes/smarty/plugins/function.html_options.php
+++ /dev/null
@@ -1,122 +0,0 @@
-
- * Name:     html_options

- * Input:

- *           - name       (optional) - string default "select"
- *           - values     (required if no options supplied) - array
- *           - options    (required if no values supplied) - associative array
- *           - selected   (optional) - string default not set
- *           - output     (required if not options supplied) - array
- * Purpose:  Prints the list of 
!is", $source, $match);
-    $_pre_blocks = $match[0];
-    $source = preg_replace("!]*?>.*?
!is",
-                           '@@@SMARTY:TRIM:PRE@@@', $source);
-    
-    // Pull out the textarea blocks
-    preg_match_all("!]*?>.*?!is", $source, $match);
-    $_textarea_blocks = $match[0];
-    $source = preg_replace("!]*?>.*?!is",
-                           '@@@SMARTY:TRIM:TEXTAREA@@@', $source);
-
-    // remove all leading spaces, tabs and carriage returns NOT
-    // preceeded by a php close tag.
-    $source = trim(preg_replace('/((?)\n)[\s]+/m', '\1', $source));
-
-    // replace textarea blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $source);
-
-    // replace pre blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:PRE@@@",$_pre_blocks, $source);
-
-    // replace script blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$_script_blocks, $source);
-
-    return $source;
-}
-
-function smarty_outputfilter_trimwhitespace_replace($search_str, $replace, &$subject) {
-    $_len = strlen($search_str);
-    $_pos = 0;
-    for ($_i=0, $_count=count($replace); $_i<$_count; $_i++)
-        if (($_pos=strpos($subject, $search_str, $_pos))!==false)
-            $subject = substr_replace($subject, $replace[$_i], $_pos, $_len);
-        else
-            break;
-
-}
-
-?>
diff --git a/includes/smarty/plugins/shared.escape_special_chars.php b/includes/smarty/plugins/shared.escape_special_chars.php
deleted file mode 100644
index c07ce31b..00000000
--- a/includes/smarty/plugins/shared.escape_special_chars.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
- * Purpose:  used by other smarty functions to escape
- *           special chars except for already escaped ones
- * @author   Monte Ohrt 
- * @param string
- * @return string
- */
-function smarty_function_escape_special_chars($string)
-{
-    if(!is_array($string)) {
-        $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-        $string = htmlspecialchars($string);
-        $string = str_replace(array('%%%SMARTY_START%%%','%%%SMARTY_END%%%'), array('&',';'), $string);
-    }
-    return $string;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/plugins/shared.make_timestamp.php b/includes/smarty/plugins/shared.make_timestamp.php
deleted file mode 100644
index b42eb11d..00000000
--- a/includes/smarty/plugins/shared.make_timestamp.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- * Purpose:  used by other smarty functions to make a timestamp
- *           from a string.
- * @author   Monte Ohrt 
- * @param string
- * @return string
- */
-function smarty_make_timestamp($string)
-{
-    if(empty($string)) {
-        // use "now":
-        $time = time();
-
-    } elseif (preg_match('/^\d{14}$/', $string)) {
-        // it is mysql timestamp format of YYYYMMDDHHMMSS?            
-        $time = mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
-                       substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
-        
-    } elseif (is_numeric($string)) {
-        // it is a numeric string, we handle it as timestamp
-        $time = (int)$string;
-        
-    } else {
-        // strtotime should handle it
-        $time = strtotime($string);
-        if ($time == -1 || $time === false) {
-            // strtotime() was not able to parse $string, use "now":
-            $time = time();
-        }
-    }
-    return $time;
-
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/includes/smarty/tsmarty2c.php b/includes/smarty/tsmarty2c.php
deleted file mode 100755
index 6e0b9944..00000000
--- a/includes/smarty/tsmarty2c.php
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/env php
-  <..> > smarty.c
- *
- * If a parameter is a directory, the template files within will be parsed.
- *
- * @package	smarty-gettext
- * @version	$Id: tsmarty2c.php,v 1.3 2005/07/27 17:59:39 sagi Exp $
- * @link	http://smarty-gettext.sf.net/
- * @author	Sagi Bashari 
- * @copyright 2004-2005 Sagi Bashari
- */
-
-// smarty open tag
-$ldq = preg_quote('{');
-
-// smarty close tag
-$rdq = preg_quote('}');
-
-// smarty command
-$cmd = preg_quote('t');
-
-// extensions of smarty files, used when going through a directory
-$extensions = array('tpl');
-
-// "fix" string - strip slashes, escape and convert new lines to \n
-function fs($str)
-{
-	$str = stripslashes($str);
-	$str = str_replace('"', '\"', $str);
-	$str = str_replace("\n", '\n', $str);
-	return $str;
-}
-
-// rips gettext strings from $file and prints them in C format
-function do_file($file)
-{
-	$content = @file_get_contents($file);
-
-	if (empty($content)) {
-		return;
-	}
-
-	global $ldq, $rdq, $cmd;
-
-	preg_match_all(
-			"/{$ldq}\s*({$cmd})\s*([^{$rdq}]*){$rdq}([^{$ldq}]*){$ldq}\/\\1{$rdq}/",
-			$content,
-			$matches
-	);
-	
-	for ($i=0; $i < count($matches[0]); $i++) {
-		// TODO: add line number
-		echo "/* $file */\n"; // credit: Mike van Lammeren 2005-02-14
-		
-		if (preg_match('/plural\s*=\s*["\']?\s*(.[^\"\']*)\s*["\']?/', $matches[2][$i], $match)) {
-			echo 'ngettext("'.fs($matches[3][$i]).'","'.fs($match[1]).'",x);'."\n";
-		} else {
-			echo 'gettext("'.fs($matches[3][$i]).'");'."\n";
-		}
-
-		echo "\n";
-	}
-}
-
-// go through a directory
-function do_dir($dir)
-{
-	$d = dir($dir);
-
-	while (false !== ($entry = $d->read())) {
-		if ($entry == '.' || $entry == '..') {
-			continue;
-		}
-
-		$entry = $dir.'/'.$entry;
-
-		if (is_dir($entry)) { // if a directory, go through it
-			do_dir($entry);
-		} else { // if file, parse only if extension is matched
-			$pi = pathinfo($entry);
-			
-			if (isset($pi['extension']) && in_array($pi['extension'], $GLOBALS['extensions'])) {
-				do_file($entry);
-			}
-		}
-	}
-
-	$d->close();
-}
-
-for ($ac=1; $ac < $_SERVER['argc']; $ac++) {
-	if (is_dir($_SERVER['argv'][$ac])) { // go through directory
-		do_dir($_SERVER['argv'][$ac]);
-	} else { // do file
-		do_file($_SERVER['argv'][$ac]);
-	}
-}
-
-?>
diff --git a/modules/core/auth.inc.php b/modules/core/auth.inc.php
deleted file mode 100644
index 68bd2002..00000000
--- a/modules/core/auth.inc.php
+++ /dev/null
@@ -1,304 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Auth Class
- *
- * @package AgileBill
- * @subpackage Core
- */
-class CORE_auth {
-	private $account = 0;
-	private $logged = false;
-	private $group = array();
-
-	public function __construct($force) {
-		global $VAR;
-
-		if (defined('SESS_LOGGED')) {
-			if (SESS_LOGGED == '1') {
-				$this->logged = true;
-				$this->account = SESS_ACCOUNT;
-			}
-
-		} else {
-			if (! defined('SESS_LOGGED'))
-				define('SESS_LOGGED',false);
-			if (! defined('SESS'))
-				define('SESS',false);
-		}
-
-		if ($force && defined('FORCE_SESS_ACCOUNT')) {
-			$this->account = FORCE_SESS_ACCOUNT;
-			$this->logged = true;
-		}
-
-		$this->auth_update();
-
-		if (isset($VAR['_logout']) || isset($VAR['_login']) || isset($VAR['lid']) || $force == true || CACHE_SESSIONS != '1') {
-			return;
-
-		} else {
-			if ($this->session_auth_cache_retrieve()) {
-				$this->module_count = count($this->module);
-
-				return;
-			}
-		}
-	}
-
-	public function auth_update() {
-		$this->group = array('0');
-		$this->module = array('0');
-
-		if ($this->account) {
-			$this->group_list($this->account);
-
-			if (! $this->group)
-				return;
-
-			$db = &DB();
-			$p = AGILE_DB_PREFIX;
-			$sql = "
-SELECT DISTINCT MM.module_id, GM.method_id, GM.group_id, M.name AS module_name, M.parent_id AS module_parent_id, M.menu_display AS module_display, MM.name AS method_name, MM.page AS method_page, MM.menu_display AS method_display
-FROM {$p}group_method as GM
-LEFT JOIN {$p}module as M on (GM.module_id=M.id and M.site_id=".DEFAULT_SITE.")
-LEFT JOIN {$p}module_method as MM on (GM.method_id=MM.id and MM.site_id=".DEFAULT_SITE.") ";
-
-			for ($i=0; $igroup); $i++)
-				if ($i==0)
-					$sql .= sprintf('WHERE (GM.group_id=%s ',$this->group[$i]);
-				else
-					$sql .= sprintf('OR GM.group_id=%s ',$this->group[$i]);
-
-			$sql .= sprintf(') AND GM.site_id=%s ORDER BY M.name,MM.name',DEFAULT_SITE);
-			$result=$db->Execute($sql);
-
-			if ($result === false) {
-				global $C_debug;
-
-				$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg().'
'.$q);
-				return;
-			}
-
-			while (!$result->EOF) {
-				$module_name = $result->fields['module_name'];
-				$method_name = $result->fields['method_name'];
-
-				if (empty($this->module[$module_name]))
-					$this->module[$module_name] = array($result->fields['module_id'],$result->fields['module_parent_id'],$result->fields['module_display']);
-
-				if (empty($this->module[$module_name][$method_name]))
-					$this->module[$module_name][$method_name] = array($result->fields['method_id'],$result->fields['method_display'],$result->fields['method_page']);
-
-				$result->MoveNext();
-			}
-		}
-
-		$this->session_auth_cache_update();
-	}
-
-	private function session_auth_cache_update() {
-		$db = &DB();
-
-		$expire = time()+7200; // 1 hour
-
-		if (isset($this->group) && is_array($this->group))
-			$group = serialize($this->group);
-		else
-			$group = 0;
-
-		if (isset($this->module) && is_array($this->module))
-			$module = serialize($this->module);
-		else
-			$module = 0;
-
-		$db->Execute(sqlDelete($db,'session_auth_cache',array('session_id'=>SESS)));
-		$db->Execute(sqlInsert($db,'session_auth_cache',array('session_id'=>SESS,'date_expire'=>$expire,'group_arr'=>$group,'module_arr'=>$module)));
-	}
-
-	private function session_auth_cache_retrieve() {
-		global $C_sess;
-
-		if (! empty($C_sess->auth_cache)) {
-			if ($C_sess->auth_cache['date_expire'] > time()) {
-				$group = $C_sess->auth_cache['group_arr'];
-				$module = $C_sess->auth_cache['module_arr'];
-
-				if ($group != '0' && $group != '')
-					$this->group = unserialize($group);
-				if ($module != '0' && $module != '')
-					$this->module = unserialize($module);
-
-				return true;
-			}
-		}
-
-		$db = &DB();
-		$result = $db->Execute(sqlSelect($db,'session_auth_cache','*',sprintf('session_id=::%s:: AND date_expire >= %s',SESS,time())));
-		if ($result->RecordCount() > 0) {
-			$group = $result->fields['group_arr'];
-			$module = $result->fields['module_arr'];
-
-			if ($group != '0' && $group != '')
-				$this->group = unserialize($group);
-			if ($module != '0' && $module != '')
-				$this->module = unserialize($module);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	private function group_list($account) {
-		$this->group[0] = '0';
-		$time = time();
-		$db = &DB();
-		$p = AGILE_DB_PREFIX;
-		$q = "
-SELECT DISTINCT ag.group_id AS group_id,g.parent_id AS parent_id
-FROM {$p}account_group as ag
-INNER JOIN {$p}group as g ON (ag.group_id=g.id AND g.status=1 AND g.site_id=".DEFAULT_SITE.")
-WHERE ag.account_id = '$account'
-	AND (ag.date_start IS NULL OR ag.date_start < $time)
-	AND (ag.date_expire IS NULL OR ag.date_expire = 0 OR ag.date_expire > $time)
-	AND (g.date_start IS NULL OR g.date_start <= $time)
-	AND (g.date_expire IS NULL OR g.date_expire = 0 OR g.date_expire > $time)
-	AND ag.active=1 AND g.status=1
-	AND ag.site_id=".DEFAULT_SITE;
-
-		$result = $db->Execute($q);
-
-		if ($result === false) {
-			global $C_debug;
-
-			echo $db->ErrorMsg();
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-
-			exit;
-
-		} elseif ($result->RecordCount() == 0) {
-			return;
-
-		} else {
-			$arr = array();
-			while (!$result->EOF) {
-				array_push($arr,$result->fields);
-				$result->MoveNext();
-			}
-		}
-
-		for ($i=0; $igroup); $ii++)
-				if ($this->group[$ii] == $arr[$i]['group_id'])
-					$do = false;
-
-			if ($do) {
-				array_push($this->group,$arr[$i]['group_id']);
-
-				if (! empty($arr[$i]['parent_id']) && $arr[$i]['parent_id'] != $arr[$i]['group_id']) {
-					$do = true;
-
-					for ($ii=0; $iigroup); $ii++)
-						if ($this->group[$ii] == $arr[$i]['parent_id'])
-							$do = false;
-
-					if ($do)
-						array_push($this->group,$arr[$i]['parent_id']);
-				}
-			}
-		}
-
-		if ($account != SESS_ACCOUNT)
-			return $this->group;
-	}
-
-	public function auth_method_by_name($module,$method) {
-		if (isset($this->module[$module][$method]))
-			return true;
-
-		if ($module == 'core')
-			if ($method == 'cleanup')
-				return true;
-			else
-				return false;
-
-		if (is_file(PATH_MODULES.$module.'/auth.inc.php')) {
-			include(PATH_MODULES.$module.'/auth.inc.php');
-
-			$this->auth_methods = $auth_methods;
-
-			for ($i=0; $iauth_methods); $i++)
-				if ($module == @$this->auth_methods[$i]['module'])
-					if ($method == false || $method == @$this->auth_methods[$i]['method'])
-						return true;
-		}
-
-		return false;
-	}
-
-	public function auth_group_by_id($id) {
-		$ids = array();
-
-		if (! is_array($id))
-			array_push($ids,$id);
-		else
-			$ids = $id;
-
-		foreach ($ids as $group_id)
-			if (isset($this->group))
-				foreach ($this->group as $this_group_id)
-					if ($this_group_id == $group_id)
-						return true;
-
-		return false;
-	}
-
-	public function auth_group_by_account_id($account, $id) {
-		if (SESS_LOGGED == true && $account == SESS_ACCOUNT)
-			return $this->auth_group_by_id($id);
-
-		unset($this->group);
-		$this->group_list($account);
-
-		for ($i=0; $igroup); $i++)
-			if ($this->group[$i] == $id)
-				return true;
-
-		return false;
-	}
-
-	/**
-	 * Generate the admin menu
-	 */
-	public function generate_admin_menu() {
-		include_once(PATH_CORE.'auth_generate_admin_menu.inc.php');
-
-		return auth_generate_admin_menu($this);
-	}
-}
-?>
diff --git a/modules/core/auth_generate_admin_menu.inc.php b/modules/core/auth_generate_admin_menu.inc.php
deleted file mode 100644
index c620254e..00000000
--- a/modules/core/auth_generate_admin_menu.inc.php
+++ /dev/null
@@ -1,150 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Menu
- */
-
-/**
- * The main AgileBill Admin Menu Method
- *
- * @package AgileBill
- * @subpackage Menu
- */
-
-function auth_generate_admin_menu($menu_obj) {
-	global $C_translate,$smarty,$C_list;
-
-	$menu_obj->auth_update();
-
-	$i = 1;
-	$js = '';
-	$arr = $menu_obj->module;
-	$arr2 = $menu_obj->module;
-
-	# Loop through the modules
-	while (list($module,$val) = each($arr)) {
-		if (! empty($val[2])) {
-			if ($val[1] == $val[0] || empty($val[0]) || empty($val[1])) {
-				$module_name = $C_translate->translate('menu',$module,'','menutitle');
-				$parent = $val[0];
-				$module_id = $val[0];
-				$module_arr[$i]['name'] = $module_name;
-				$module_arr[$i]['module'] = $module;
-
-				# Loop through the methods
-				while (list($method,$meth_arr) = each($arr[$module])) {
-					if (gettype($meth_arr) == 'array' && ! empty($meth_arr[1])) {
-						$method_name = $C_translate->translate($method,$module,'','methodtitle');
-
-						if(empty($meth_arr[2]))
-							$page = $module.':'.$method;
-						else
-							$page = htmlspecialchars(str_replace('%%',$module,$meth_arr[2]));
-
-						$module_arr[$i]['methods'][] = array('name'=>$method_name,'page'=>$page);
-					}
-				}
-
-				# Loop through the sub-modules:
-				reset($arr2);
-				$ii = 0;
-				while (list($module,$val) = each ($arr2)) {
-					if (! empty($val[2])) {
-						if ($val[1] == $parent && $module_id != $val[0]) {
-							$module_name = $C_translate->translate('menu',$module,'','menutitle');
-							$module_arr[$i]["sub_name"][$ii] = $module_name;
-
-							# Loop through the methods
-							while (list($method,$meth_arr) = each($arr2[$module])) {
-								if (gettype($meth_arr) == 'array' && ! empty($meth_arr[1])) {
-									$method_name = $C_translate->translate($method,$module,'','methodtitle');
-
-									if(empty($meth_arr[2]))
-										$page = $module.':'.$method;
-									else
-										$page = htmlspecialchars(str_replace('%%',$module,$meth_arr[2]));
-
-									$module_arr[$i]['sub_methods'][$ii][] = array('name'=>$method_name,'page'=>$page);
-								}
-							}
-
-							$ii++;
-						}
-					}
-				}
-
-			$i++;
-			}
-		}
-	}
-
-	# Generate the main modules:
-	$js = '';
-	$js .= ".|Overview|javascript:openUrl('?_page=core:admin');\n";
-	$js .= ".|Exit Administration|javascript:exitAdmin();\n";
-
-	for ($i=1; $i<=count($module_arr); $i++) {
-		$name = $module_arr[$i]['name'];
-		$js .= ".|{$name}\n";
-
-		# Generate the main methods:
-		for ($ii=0; $iiassign('today_start',$C_list->date(mktime(0,0,0,date('m'),date('d'),date('Y'))));
-	$smarty->assign('week_start',$C_list->date(mktime(0,0,0,date('m'),date('d')-7,date('Y'))));
-	$smarty->assign('month_start',$C_list->date(mktime(0,0,0,date('m'),1,date('Y'))));
-
-	# Generate the menu
-	require_once(PATH_INCLUDES.'phplayers/PHPLIB.php');
-	require_once(PATH_INCLUDES.'phplayers/layersmenu-common.inc.php');
-	require_once(PATH_INCLUDES.'phplayers/treemenu.inc.php');
-
-	# Unstoppable agileco logo ;)
-	echo 'Logo';
-
-	$mnu = new TreeMenu();
-	$mnu->setMenuStructureString($js);
-	$mnu->setIconsize(16,16);
-	$mnu->parseStructureForMenu('treemenu1');
-	$mnu->setTreemenuTheme('kde_');
-	return $mnu->newTreeMenu('treemenu1');
-}
-?>
diff --git a/modules/core/calendar.inc.php b/modules/core/calendar.inc.php
deleted file mode 100644
index a5cac502..00000000
--- a/modules/core/calendar.inc.php
+++ /dev/null
@@ -1,194 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-/**
- * Core Calendar Class
- * 
- * @example $cal = new calendar; 
- * $cal->add("Paid - $9,458.00", mktime(0,1,1,date('m'), date('d')+2, date('Y')), 'green', 'green');
- * $cal->add("Due  - $455.25", mktime(0,1,1,date('m'), date('d')+2, date('Y')), 'red', 'red', "alert('Message')");
- * echo $cal->generate();
- * 
- */
-class calendar
-{
-	var $month;
-	var $year;
-
-	var $days;		
-	var $months;
-	var $leap;
-	
-	var $start;					// starting timestamp, based on month/year specified
-	var $end;					// ending timestamp, based on month/year specified
-	
-	var $start_day_num=1;		// first day to show
- 	var $total_days;			// max days to show
- 	var $on=0;					// first day of month (0-sunday)
- 	
- 	var $items;					// holds array of items to display on the calenday
- 	
-	function calendar() {
-		$this->leap	  = date("l");
-		$this->months = Array('jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec');
-		$this->days   = Array(31,($this->leap == 1 ? 29 : 28),31,30,31,30,31,31,30,31,30,31); 
-		if(empty($this->year)) $this->year = date("Y"); 
-		if(empty($this->month)) $this->month = date("m")-1; 
-		if(empty($this->total_days)) $this->total_days = $this->days["$this->month"]; 
-		$this->start = mktime(0,0,0,$this->month+1, 1, $this->year); 
-		$this->end   = mktime(23, 59, 59, $this->month+1, $this->total_days, $this->year); 
-		$this->days	 = Array("Sun","Mon","Tue","Wed","Thu","Fri","Sat"); 
-	}
-	
-	/**
-	 * Add an item to the calendar for display
-	 *
-	 * @param string $data The data to display on the given date/timestamp
-	 * @param date $timestamp The day of month (1-31) or the unix timestamp
-	 * @param string $border The color of the border
-	 * @param string $color The font color
-	 */
-	function add($data, $timestamp, $border='#ddd', $color='#000', $onclick=false) {
-		if($timestamp > 31) {
-			$day = date('d', $timestamp);
-		} else {
-			$day = $timestamp;
-		}
-		$this->items["$day"][] = Array("data" => $data, "border"=> $border, "color"=> $color, "onclick"=>$onclick);  
-	}
-	
-	/**
-	 * Generate the full calendar HTML
-	 *
-	 * @return string
-	 */
-	function generate() 
-	{    
-		// Today's date in number (such as 21th or whatever) 
-		$today_num = $tnc = date("j");
-		
-		// Today's day of the week (eg: Sat)
-		$today_day=date("D");
-		
-		// $tdc contains the index number of today in $this->days 
-		$tdc=array_search(date("D"),$this->days);
-		
-		// This is loop is used to get the day of the week on the 1st day of this month (eg: January 1st)
-		// $tdc is the day of the week in number (the index number in $this->days)
-		// $tnc is decreased until it hits 1 (the first day of the month)
-		// $tdc is also decreased if it goes below 0 (sunday), then it is set to 6 (saturday)
-		while ($tnc > 1) { 
-			$tdc--;
-			if ($tdc < 0) { $tdc=6; } 
-			$tnc--; 
-		}
-		
-		// set $counter_day the first day of the month (eg: Saturday)
-		$counter_day=$this->days[$tdc];
-		  
-		// Just the title.. displays the month and the year
-		$date_display_title="". date("F") ." ( ".date("Y"). " )";
-		
-		// Creates the table with 7 columns
-		$out = "

-			
-			
-			
-				
-				
-				
-				
-				
-				
-				
-			
-			 ";
-		
-		// This is the loop.. starts the the first day of the month and works its way up to the last day of the month
-		while ($this->start_day_num <= $this->total_days) {
-			
-			// create a new row if we're at the last column (which is Saturday)
-			if ($this->on > 6) { 
-				$this->on=0; 
-				$out .= ""; 
-			}
-			
-			/* Jan 1st 2005 is on Saturday. We're on the Monday column,
-				so leave this column blank, go to the next column, and start again from the loop's condition
-			*/
-			if ($counter_day != $this->days[$this->on]) { 
-				$out .= ""; 
-				$this->on++; 
-				continue; 
-			}
-			
-			/* if we are display a date thats not yet been past (which is the future), then dull down the colors
-				For example, if its 16th today, and we are displaying the 17th, then set the text color to grey
-			*/
-			if (isset($dull)) {
-				$out .= "";
-			}
-			
-			/*
-			If we are not displaying the future dates, then display it normally.
-			If we are displaying today's date, set $dull as true so the dates that we dislay from here on are dull-colored
-			*/
-			else {
-				$out .= ""; 
-				if ($this->start_day_num == date("j")) { $dull=true; }
-			}
-			
-			// Move on to the next day, if all goes well
-			$this->start_day_num++;
-			
-			// Move on to the next day of the week's index (refer to the $this->days array)
-			$next_day=array_search($counter_day,$this->days) + 1;
-			
-			// If its over 6 (saturday), then set it to 0 (sunday) since the 7th index doesn't exist in $this->days
-			$counter_day=$this->days[($next_day > 6 ? 0 : $next_day)];
-			
-			// go to the next column
-			$this->on++;
-		} 
-		$out .= "
{$date_display_title}
SunMonTueWedThuFriSat
start_day_num ."> start_day_num ." valign=top>
-				
". $this->start_day_num ."
";
-				if(is_array($this->items["{$this->start_day_num}"])) {
-					foreach($this->items["{$this->start_day_num}"] as $item) {
-						if($item['onclick']) $onClick="onClick=\"{$item['onclick']}\" "; else $onClick='';
-						$out .= "
{$item['data']}
"; 
-					}
-				} else { 
-					$out .= " "; 
-				}				
-				$out .= "		start_day_num ." valign=top>
-				
". $this->start_day_num ."
";  
-				if(is_array($this->items["{$this->start_day_num}"])) {
-					foreach($this->items["{$this->start_day_num}"] as $item) {
-						if($item['onclick']) $onClick="onClick=\"{$item['onclick']}\" "; else $onClick='';
-						$out .= "
{$item['data']}
"; 
-					}
-				} else { 
-					$out .= " "; 
-				}
-				$out .= "
";		 
-		return $out;
-	} 
-} 
-?>
\ No newline at end of file
diff --git a/modules/core/core.inc.php b/modules/core/core.inc.php
deleted file mode 100644
index abdf2915..00000000
--- a/modules/core/core.inc.php
+++ /dev/null
@@ -1,444 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-define('AGILE_SESS_EXPIRE_DAYS',        15);
-define('AGILE_SESS_AFFIL_EXPIRE_DAYS',  180);
-define('AGILE_LOG_ERR_EXPIRE_DAYS',     15);
-define('AGILE_ACCOUNT_CLEANUP_DAYS',    60);
-define('AGILE_INVOICE_CLEANUP_DAYS',    60);
-define('AGILE_LOGIN_LOGS_EXPIRE_DAYS',  180);
-
-class core
-{
-    # Main cleanup function
-    function cleanup($VAR)
-    {
-		$alert = false;
-		
-        /*
-          cleanup:  sessions
-                    session auth cache
-                    searches
-                    saved searches
-                    old task logs
-                    old error logs
-                    old login logs
-                    old login locks
-                    old temporary data
-                    old backups
-                    expired groups
-                    
-          */
-          
-          $clean = Array(
- 
-                    Array ( 'table' => 'log_error',
-                            'field' => 'date_orig',
-                            'where' => '<=',
-                            'cond'  => time()-86400*AGILE_LOG_ERR_EXPIRE_DAYS
-                          ),
-
-                    Array ( 'table' => 'login_log',
-                            'field' => 'date_orig',
-                            'where' => '<=',
-                            'cond'  => time()-86400*AGILE_LOGIN_LOGS_EXPIRE_DAYS
-                          ),
-
-                    Array ( 'table' => 'session_auth_cache',
-                            'field' => 'date_expire',
-                            'where' => '<=',
-                            'cond'  => time()
-                          ),
-
-
-                    Array ( 'table' => 'search',
-                            'field' => 'date_expire',
-                            'where' => '<=',
-                            'cond'  => time()
-                          ),
-
-
-                    Array ( 'table' => 'search_saved',
-                            'field' => 'date_expire',
-                            'where' => '<=',
-                            'cond'  => time()
-                          ),
-                          
-                    Array ( 'table' => 'login_lock',
-                            'field' => 'date_expire',
-                            'where' => '<=',
-                            'cond'  => time()
-                          ),
-                          
-                    Array ( 'table' => 'temporary_data',
-                            'field' => 'date_expire',
-                            'where' => '<=',
-                            'cond'  => time()
-                          )  
-                        );
-						 
-                        
-        for($i=0; $iqstr($clean[$i]['cond']);
-            $result=$db->Execute($sql);
-        }
-		
-		########################################################################
-		### Remove old sessions
-		########################################################################
-				
-        $sql = "DELETE FROM ".AGILE_DB_PREFIX."session WHERE
-        		site_id     = ".$db->qstr(DEFAULT_SITE)." AND
-        		date_last	< ".$db->qstr(time()-86400*AGILE_SESS_EXPIRE_DAYS)."   
-                AND
-                ( 
-                	affiliate_id IS NULL OR
-                	affiliate_id = '' OR
-                	affiliate_id = 0 OR
-                	campaign_id IS NULL OR
-                	campaign_id = '' OR
-                	campaign_id = 0 OR
-                	date_last	< ".$db->qstr(time()-86400*AGILE_SESS_AFFIL_EXPIRE_DAYS)."
-                )"; 
-        $result = $db->Execute($sql);	      
-
-               
-		########################################################################
-		### Remove expired group access
-		########################################################################
-				
-        $sql = "DELETE FROM ".AGILE_DB_PREFIX."account_group WHERE
-                site_id        = ".$db->qstr(DEFAULT_SITE)." AND
-                date_expire IS NOT NULL AND
-                date_expire > 0 AND
-                date_expire <= ".$db->qstr(time());
-        $result = $db->Execute($sql);	
-			
-        
-        ########################################################################
-        ### Remove old backups
-        ########################################################################
-        
-        $sql = "SELECT * FROM ".AGILE_DB_PREFIX."backup WHERE
-                site_id        = ".$db->qstr(DEFAULT_SITE)." AND
-                date_expire   != ".$db->qstr('')." AND
-                date_expire   != ".$db->qstr('0')." AND
-                date_expire   != ".$db->qstr(time());
-        $result = $db->Execute($sql);
-        if ( $result != false && $result->RecordCount() > 0)
-        {
-            while (!$result->EOF)
-            {
-                ## Delete this one..
-                $arr["delete_id"] = $result->fields['id'];
-                include_once (PATH_MODULES . 'backup/backup.inc.php');
-                $backup = new backup;
-                $backup->delete($arr,$backup);
-                $result->MoveNext();
-            }
-        }
-
-        #########################################################################
-        ### Repair/optimize DB Tables (MYSQL ONLY!)
-        #########################################################################
-
-        if(AGILE_DB_TYPE == 'mysql')
-        {
-            $db = &DB();
-            $q  = "SELECT name FROM ".AGILE_DB_PREFIX."module WHERE site_id = ".$db->qstr(DEFAULT_SITE);
-            $rs = $db->Execute($q);
-
-            while ( !$rs->EOF )
-            {
-                $table = $rs->fields['name'];
-                $sql = "CHECK TABLE ".AGILE_DB_PREFIX.$table;
-                $db->Execute($sql);
-
-                $sql = "REPAIR TABLE ".AGILE_DB_PREFIX.$table;
-                $db->Execute($sql);
-
-                $sql = "OPTIMIZE TABLE ".AGILE_DB_PREFIX.$table;
-                $db->Execute($sql);
-
-                $rs->MoveNext();
-            }
-        }
-		
-        #########################################################################
-        ### Force the correct id keys in each table that has unique ids
-        ######################################################################### 
-        $sql = "SELECT name FROM ".AGILE_DB_PREFIX."module WHERE
-                site_id  = ".$db->qstr(DEFAULT_SITE)." AND
-                status   = ".$db->qstr('1')." 
-				ORDER BY name";	
-		$rs = $db->Execute($sql);
-		while(!$rs->EOF)	
-		{
-			$module = $rs->fields['name'];
-			
-			# check if key table exists:
-        	$sql = "SELECT id FROM ".AGILE_DB_PREFIX.$module."_id ORDER BY id DESC";
-			$keytable = $db->Execute($sql);
-			if ($module != 'session' && $module != 'affiliate' && $keytable != false && $keytable->RecordCount() > 0) 
-			{ 
-				$current_id = $keytable->fields['id'];
-				
-				# get the current id from the main table:
-	        	$sql = "SELECT id FROM ".AGILE_DB_PREFIX.$module." ORDER BY id DESC";
-				$table = $db->Execute($sql);	
-				if ($table != false && $table->RecordCount() > 0) 
-				{ 
-					$last_id = $table->fields['id'];
-					
-					# does key need updated?
-					if($current_id < $last_id)
-					{
-						$id = $last_id + 1;						
-						$sql = "UPDATE ".AGILE_DB_PREFIX.$module."_id
-								SET 
-								id = ".$db->qstr($id)." 
-								WHERE
-								id = ".$db->qstr($current_id);
-						 $db->Execute($sql);	
-						 $alert.= "Corrected incorrect primary key on the $module table.
"; 
-						
-					}
-				}							
-			}   
-			$rs->MoveNext() ;
-		} 
-		
-        #########################################################################
-        ### Run any new upgrade files in the /upgrades directory
-        #########################################################################
-		 		 
-        @$dir = opendir(PATH_AGILE.'upgrades'); 
-        while (@$file_name = readdir($dir))
-        {
-            $display = true; 
-            if($file_name != '..' && $file_name != '.')
-            {
-				# check if upgrade has been run:
-				$md5 = md5($file_name); 
-				$sql = "SELECT data FROM ".AGILE_DB_PREFIX."temporary_data
-						WHERE
-						data = ".$db->qstr($md5)." AND
-						field1 = ".$db->qstr('upgrade');
-				$rs = $db->Execute($sql);
-				if($rs->RecordCount() == 0)
-				{
-					# Run the upgrade: 
-					if(is_file(PATH_AGILE.'upgrades/'.$file_name) && !is_dir(PATH_AGILE.'upgrades/'.$file_name))
-						include_once(PATH_AGILE.'upgrades/'.$file_name); 
-						
-					$function = strtolower(ereg_replace('.php', '', $file_name)); 
-					
-					if(ereg('^upgrade', $function))
-					{
-						if(is_callable($function)) 
-						{
-							$result = call_user_func ( $function ); 
-							#$result = true;
-						}
-						else
-						{
-							$result = false;
-	            		}						
-					}	
-					    
-					# If success, save so it is not run again:
-					if($result)
-					{  
-						/* Start: SQL Insert Statement */
-						$sql = "SELECT * FROM ".AGILE_DB_PREFIX."temporary_data WHERE id = -1";
-						$rs = $db->Execute($sql); 
-		 
-						$id = $db->GenID(AGILE_DB_PREFIX . 'temporary_data_id');
-						$insert = Array (	'id' 			=> $id,
-											'site_id' 		=> DEFAULT_SITE,
-											'data' 			=> $md5,
-											'field1' 		=> 'upgrade',
-											'date_orig' 	=> time(),
-											'date_expire' 	=> time()+86400*365*20);
-						 
-						$sql = $db->GetInsertSQL($rs, $insert); 
-						$result = $db->Execute($sql);  
-				        if ($result === false) {
-				        	global $C_debug;
-				        	$C_debug->error('core.inc.php','core :: cleanup()', $db->ErrorMsg(). "\r\n\r\n". $sql); 
-				        }						
-						/* End: SQL Insert Statement */
-						 				
-						$alert .= "Upgraded to $file_name!
";
-					} else {
-						$alert .= "The $file_name upgrade failed!
";
-					}				
-				}			 
-            }	
-		}	
-		
-		
-		
-		#########################################################################
-		## Print any alerts:
-		#########################################################################
-		
-		if(!empty($alert))
-		{
-			global $C_debug;
-			$C_debug->alert($alert);
-		}
-		
-        return true;
-    }
-
-	
-	/**
-	 * Update invoices that are within 1 cent of full payment to paid in full
-	 * so they are not suspended because of minor currency fluctuations.
-	 * Change the $diff variable to the max allowable balance due on the invoice
-	 * in order for the update to take place.
-	 */
-	function paid_fraction($VAR) {
-		$diff=.02;
-		$db=&DB();
-		$p=AGILE_DB_PREFIX;
-		$s=DEFAULT_SITE;
-		$sql="UPDATE {$p}invoice SET process_status=1,billing_status=1,billed_amt=total_amt 
-			WHERE ((total_amt-billed_amt)<=$diff) AND (total_amt!=billed_amt)";
-		$db->Execute($sql);
-		return true;
-	}
-	
-	
-	/**
-	* send advance invoice notice via email
-	*/
-	function invoice_advance_notice($VAR) {
-		include_once(PATH_MODULES . 'invoice/advance_notice.php');
-		$obj = new advance_notice();
-		$obj->task();	
-	}
-	
-	
-	/**
-	 *  Loop though all accounts to delete inactive accounts with no 
-	 * invoices, services, and no staff or affiliate accts 
-	 */
-    function account_cleanup($VAR)
-    { 
-        # Load the account admin class
-        include_once(PATH_MODULES.'account_admin/account_admin.inc.php');
-        $acct = new account_admin;
-
-        # Get each account:
-        $time = time()-(AGILE_ACCOUNT_CLEANUP_DAYS*86400);
-        $db   = &DB();
-        $db->SetFetchMode(ADODB_FETCH_ASSOC);
-        $sql    = 'SELECT id,username,email,first_name,last_name,company FROM '.AGILE_DB_PREFIX.'account WHERE date_orig <= '.$time.' AND id>1 AND site_id = '.DEFAULT_SITE.' ORDER BY id';
-        $rs = $db->Execute($sql);
-        echo "Accounts Deleted:
";
-        while (!$rs->EOF)
-        {
-            # Get acct id
-            $id = $rs->fields['id']; 
-            $do = true;
-             
-            # Check for staff/admin account
-            if ($do) {
-            	$sql = 'SELECT id FROM ' . AGILE_DB_PREFIX . 'account_group WHERE group_id in (4,1001) AND AND account_id='.$id.' site_id = ' . $db->qstr(DEFAULT_SITE);
-            	$rs2 = $db->Execute($sql);
-            	if($rs2 && $rs2->RecordCount()) $do = false; 
-            }           
-
-            # Check for invoices
-            if ($do) {
-	            $sql = 'SELECT id FROM ' . AGILE_DB_PREFIX . 'invoice WHERE account_id =  ' . $db->qstr( $id ) . ' AND site_id = ' . $db->qstr(DEFAULT_SITE);
-	            $rs2 = $db->Execute($sql);
-	            if($rs2 && $rs2->RecordCount()) $do = false; 
-            }
-
-            # Check for services
-            if ($do) {
-            	$sql = 'SELECT id FROM ' . AGILE_DB_PREFIX . 'service WHERE account_id =  ' . $db->qstr( $id ) . ' AND site_id = ' . $db->qstr(DEFAULT_SITE);
-            	$rs2 = $db->Execute($sql);
-            	if($rs2 && $rs2->RecordCount()) $do = false; 
-            }
-
-            # Check for affiliate acct
-           if ($do) {
-            	$sql = 'SELECT id FROM ' . AGILE_DB_PREFIX . 'affiliate WHERE account_id =  ' . $db->qstr( $id ) . ' AND site_id = ' . $db->qstr(DEFAULT_SITE);
-            	$rs2 = $db->Execute($sql);
-            	if($rs2 && $rs2->RecordCount()) $do = false; 
-            }
-
-            # Check for staff acct
-            if ($do) {
-            	$sql = 'SELECT id FROM ' . AGILE_DB_PREFIX . 'staff WHERE account_id =  ' . $db->qstr( $id ) . ' AND site_id = ' . $db->qstr(DEFAULT_SITE);
-            	$rs2 = $db->Execute($sql);
-            	if($rs2 && $rs2->RecordCount()) $do = false; 
-            }
-
-            # Delete the account
-            if ($do) { 
-            	$arr['id'] = $id;
-            	foreach($rs->fields as $v) echo "$v	";
-            	echo "\r\n";
-            	$acct->delete($arr, $acct);
-            }
-           
-            $rs->MoveNext();
-        }
-        echo "
";
-    }
-
-    # Delete inactive/unpaid invoices older than the allowed period:
-    function invoice_cleanup($VAR)
-    {
-        # Load the account admin class
-        include_once(PATH_MODULES.'invoice/invoice.inc.php');
-        $invoice = new invoice;
-        $exp = time() - 86400*AGILE_INVOICE_CLEANUP_DAYS;
-
-        # Get each account:
-        $db     = &DB();
-        $sql    = 'SELECT id FROM ' . AGILE_DB_PREFIX . 'invoice
-                    WHERE
-                    process_status  =  ' . $db->qstr( 0 ) . '  AND
-                    billing_status  =  ' . $db->qstr( 0 ) . '  AND
-                    billed_amt      <= ' . $db->qstr( 0 ) . '  AND
-                    date_last       <= ' . $db->qstr( $exp ) . '  AND
-                    site_id         =  ' . $db->qstr(DEFAULT_SITE);
-        $rs = $db->Execute($sql);
-        while (!$rs->EOF)
-        {
-            $arr['id'] = $rs->fields['id'];
-            $invoice->delete( $arr, $invoice );
-            $rs->MoveNext();
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/modules/core/crypt.inc.php b/modules/core/crypt.inc.php
deleted file mode 100644
index a16826a9..00000000
--- a/modules/core/crypt.inc.php
+++ /dev/null
@@ -1,333 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-if (! defined('LICENSE_KEY'))
-	define('LICENSE_KEY','47012093-4943-32127707');
-
-/**
- * The main AgileBill CORE RSA Class
- *
- * @package AgileBill
- * @subpackage Core
- * @todo This Class appears unused.
- */
-class CORE_RSA {
-	private $primes = array();
-	private $maxprimes = 0;
-
-	public function __construct() {
-		mt_srand((double)microtime()*1000000);
-
-		$this->primes = array(
-		4507,4513,4517,4519,4523,4547,4549,4561,4567,4583,4591,4597,
-		4603,4621,4637,4639,4643,4649,4651,4657,4663,4673,4679,4691,4703,4721,4723,4729,4733,4751,
-		4759,4783,4787,4789,4793,4799,4801,4813,4817,4831,4861,4871,4877,4889,4903,4909,4919,4931,
-		4933,4937,4943,4951,4957,4967,4969,4973,4987,4993,4999,5003,5009,5011,5021,5023,5039,5051,
-		5059,5077,5081,5087,5099,5101,5107,5113,5119,5147,5153,5167,5171,5179,5189,5197,5209,5227,
-		5231,5233,5237,5261,5273,5279,5281,5297,5303,5309,5323,5333,5347,5351,5381,5387,5393,5399,
-		5407,5413,5417,5419,5431,5437,5441,5443,5449,5471,5477,5479,5483,5501,5503,5507,5519,5521,
-		5527,5531,5557,5563,5569,5573,5581,5591,5623,5639,5641,5647,5651,5653,5657,5659,5669,5683,
-		5689,5693,5701,5711,5717,5737,5741,5743,5749,5779,5783,5791,5801,5807,5813,5821,5827,5839,
-		5843,5849,5851,5857,5861,5867,5869,5879,5881,5897,5903,5923,5927,5939,5953,5981,5987,6007,
-		6011,6029,6037,6043,6047,6053,6067,6073,6079,6089,6091,6101,6113,6121,6131,6133,6143,6151,
-		6163,6173,6197,6199,6203,6211,6217,6221,6229,6247,6257,6263,6269,6271,6277,6287,6299,6301,
-		6311,6317,6323,6329,6337,6343,6353,6359,6361,6367,6373,6379,6389,6397,6421,6427,6449,6451,
-		6469,6473,6481,6491,6521,6529,6547,6551,6553,6563,6569,6571,6577,6581,6599,6607,6619,6637,
-		6653,6659,6661,6673,6679,6689,6691,6701,6703,6709,6719,6733,6737,6761,6763,6779,6781,6791,
-		6793,6803,6823,6827,6829,6833,6841,6857,6863,6869,6871,6883,6899,6907,6911,6917,6947,6949,
-		6959,6961,6967,6971,6977,6983,6991,6997,7001,7013,7019,7027,7039,7043,7057,7069,7079,7103,
-		7109,7121,7127,7129,7151,7159,7177,7187,7193,7207,7211,7213,7219,7229,7237,7243,7247,7253,
-		7283,7297,7307,7309,7321,7331,7333,7349,7351,7369,7393,7411,7417,7433,7451,7457,7459,7477,
-		7481,7487,7489,7499,7507,7517,7523,7529,7537,7541,7547,7549,7559,7561,7573,7577,7583,7589,
-		7591,7603,7607,7621,7639,7643,7649,7669,7673,7681,7687,7691,7699,7703,7717,7723,7727,7741,
-		7753,7757,7759,7789,7793,7817,7823,7829,7841,7853,7867,7873,7877,7879,7883,7901,7907,7919,
-		7927,7933,7937,7949,7951,7963,7993,8009,8011,8017,8039,8053,8059,8069,8081,8087,8089,8093,
-		8101,8111,8117,8123,8147,8161,8167,8171,8179,8191,8209,8219,8221,8231,8233,8237,8243,8263,
-		8269,8273,8287,8291,8293,8297,8311,8317,8329,8353,8363,8369,8377,8387,8389,8419,8423,8429,
-		8431,8443,8447,8461,8467,8501,8513,8521,8527,8537,8539,8543,8563,8573,8581,8597,8599,8609,
-		8623,8627,8629,8641,8647,8663,8669,8677,8681,8689,8693,8699,8707,8713,8719,8731,8737,8741,
-		8747,8753,8761,8779,8783,8803,8807,8819,8821,8831,8837,8839,8849,8861,8863,8867,8887,8893,
-		8923,8929,8933,8941,8951,8963,8969,8971,8999,9001,9007,9011,9013,9029,9041,9043,9049,9059,
-		9067,9091,9103,9109,9127,9133,9137,9151,9157,9161,9173,9181,9187,9199,9203,9209,9221,9227,
-		9239,9241,9257,9277,9281,9283,9293,9311,9319,9323,9337,9341,9343,9349,9371,9377,9391,9397,
-		9403,9413,9419,9421,9431,9433,9437,9439,9461,9463,9467,9473,9479,9491,9497,9511,9521,9533);
-
-		$this->maxprimes = count($this->primes)-1;
-	}
-
-	public function generate_keys(){
-		$e = false;
-		$d = false;
-		$q = false;
-
-		while (! $e || ! $d) {
-			$p = $this->primes[mt_rand(0,$this->maxprimes)];
-
-			while (! $q || ($p==$q))
-				$q = $this->primes[mt_rand(0,$this->maxprimes)];
-
-			$n = $p*$q;
-			$pi = ($p-1)*($q-1);
-			$e = $this->tofindE($pi,$p,$q);
-			$d = $this->extend($e,$pi);
-			$keys = array($n,$e,$d);
-		}
-
-		return $keys;
-	}
-
-	private function mo($g,$l) {
-		return $g-($l*floor($g/$l));
-	}
-
-	private function extend($Ee,$Epi) {
-		$u1 = 1;
-		$u2 = 0;
-		$u3 = $Epi;
-		$v1 = 0;
-		$v2 = 1;
-		$v3 = $Ee;
-
-		while ($v3 != 0) {
-			$qq = floor($u3/$v3);
-			$t1 = $u1-$qq*$v1;
-			$t2 = $u2-$qq*$v2;
-			$t3 = $u3-$qq*$v3;
-			$u1 = $v1;
-			$u2 = $v2;
-			$u3 = $v3;
-			$v1 = $t1;
-			$v2 = $t2;
-			$v3 = $t3;
-			$z = 1;
-		}
-
-		$uu = $u1;
-		$vv = $u2;
-
-		if ($vv < 0)
-			$inverse = $vv+$Epi;
-		else
-			$inverse = $vv;
-
-		return $inverse;
-	}
-
-	private function GCD($e,$pi) {
-		$y = $e;
-		$x = $pi;
-
-		while ($y != 0) {
-			$w = $this->mo($x,$y);
-			$x = $y;
-			$y = $w;
-		}
-
-		return $x;
-	}
-
-	private function tofindE($pi) {
-		$great = 0;
-		$cc = mt_rand(0,$this->maxprimes);
-		$startcc = $cc;
-
-		while ($cc >= 0) {
-			$se = $this->primes[$cc];
-			$great = $this->GCD($se,$pi);
-			$cc--;
-
-			if ($great == 1)
-				break;
-		}
-
-		if ($great == 0) {
-			$cc = $startcc + 1;
-
-			while ($cc <= $this->maxprimes) {
-				$se = $this->primes[$cc];
-				$great = $this->GCD($se,$pi);
-				$cc++;
-
-				if ($great == 1)
-					break;
-			}
-		}
-
-		return $se;
-	}
-
-	public function rsa_encrypt($m,$e,$n) {
-		$asci = array();
-		$coded = '';
-
-		for ($i=0; $ipowmod($asci[$k],$e,$n);
-			$coded .= $resultmod.' ';
-		}
-
-		return trim($coded);
-	}
-
-	private function powmod($base,$exp,$modulus) {
-		$accum = 1;
-		$i = 0;
-		$basepow2 = $base;
-
-		while (($exp >> $i)>0) {
-			if ((($exp >> $i) & 1) == 1)
-				$accum = $this->mo(($accum*$basepow2),$modulus);
-
-			$basepow2 = $this->mo(($basepow2*$basepow2),$modulus);
-
-			$i++;
-		}
-
-		return $accum;
-	}
-
-	public function rsa_decrypt($c,$d,$n) {
-		$decryptarray = explode(' ',$c);
-		$resultd = '';
-		$deencrypt = '';
-
-		for ($u=0; $upowmod($decryptarray[$u],$d,$n);
-			$deencrypt .= substr($resultmod,1,strlen($resultmod)-2);
-		}
-
-		for ($u=0; $ursa_encrypt($data,$keys[1],$keys[0]);
-	$rc4_data = do_rc4($rsa_data,'en',$rc4_key);
-
-	return $rc4_data;
-}
-
-/**
- * Decrypt the data
- */
-function CORE_decrypt($data) {
-	$rsa = new CORE_RSA;
-
-	$keys = explode('-',LICENSE_KEY);
-	$rc4_key = do_rc4(LICENSE_KEY,'en',false);
-
-	$rc4_data = do_rc4($data,'de',$rc4_key);
-	$rsa_data = $rsa->rsa_decrypt($rc4_data,$keys[2],$keys[0]);
-
-	return $rsa_data;
-}
-
-/**
- * Do the encryption/decryption
- */
-function do_rc4($data,$case,$pwd) {
-	if (! $pwd)
-		$pwd = '21e0*kO-(uV9B0@jFk-er';
-
-	if ($case == 'de')
-		$data = urldecode($data);
-
-	$key = array();
-	$box = array();
-	$temp_swap = '';
-	$pwd_length = strlen($pwd);
-
-	for ($i = 0; $i <= 255; $i++) {
-		$key[$i] = ord(substr($pwd,($i%$pwd_length),1));
-		$box[$i] = $i;
-	}
-
-	$x = 0;
-	for ($i=0; $i<=255; $i++) {
-		$x = ($x+$box[$i]+$key[$i])%256;
-		$temp_swap = $box[$i];
-		$box[$i] = $box[$x];
-		$box[$x] = $temp_swap;
-	}
-
-	$temp = '';
-	$k = '';
-	$cipherby = '';
-	$cipher = '';
-	$a = 0;
-	$j = 0;
-
-	for ($i=0; $i
diff --git a/modules/core/database.inc.php b/modules/core/database.inc.php
deleted file mode 100644
index cf189e49..00000000
--- a/modules/core/database.inc.php
+++ /dev/null
@@ -1,369 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Database Class
- *
- * @package AgileBill
- * @subpackage Core
- */
-class CORE_database {
-	public function add($VAR,$construct,$type) {
-		include_once(PATH_CORE.'database_add.inc.php');
-		return CORE_database_add($VAR,$construct,$type);
-	}
-
-	public function update($VAR,$construct,$type) {
-		include_once(PATH_CORE.'database_update.inc.php');
-		return CORE_database_update($VAR,$construct,$type);
-	}
-
-	public function search_form($VAR,$construct,$type) {
-		include_once(PATH_CORE.'database_search_form.inc.php');
-		return CORE_database_search_form($VAR,$construct,$type);
-	}
-
-	public function search($VAR,$construct,$type) {
-		include_once(PATH_CORE.'database_search.inc.php');
-		return CORE_database_search($VAR,$construct,$type);
-	}
-
-	public function search_show($VAR,$construct,$type) {
-		include_once(PATH_CORE.'database_search_show.inc.php');
-		return CORE_database_search_show($VAR,$construct,$type);
-	}
-
-	public function view($VAR,$construct,$type) {
-		include_once(PATH_CORE.'database_view.inc.php');
-		return CORE_database_view($VAR,$construct,$type);
-	}
-
-	public function mass_delete($VAR,$construct,$type) {
-		include_once(PATH_CORE.'database_mass_delete.inc.php');
-		return CORE_database_mass_delete($VAR,$construct,$type);
-	}
-
-	public function delete($VAR,$construct,$type) {
-		include_once(PATH_CORE.'database_delete.inc.php');
-		return CORE_database_delete($VAR,$construct,$type);
-	}
-
-	public function join_fields($result,$linked) {
-		include_once(PATH_CORE.'database_join_fields.inc.php');
-		return CORE_database_join_fields($result,$linked);
-	}
-
-	// replaced in v1.4.91 (use sqlSelect)
-	# @todo To deprecate
-	public function sql_select($TableList,$FieldList,$Conditions,$Order,&$db) {
-		return sqlSelect($db,$TableList,$FieldList,$Conditions,$Order);
-	}
-
-	/**
-	 * Remove fields from the standard construct type to ignore insert/select/validation rules set in construct
-	 *
-	 * @param array $ignore_fields
-	 * @param string $construct_fields
-	 * @return array
-	 */
-	public function ignore_fields($ignore_fields,$construct_fields) {
-		if (! is_array($construct_fields))
-			$fields = explode(',',$construct_fields);
-		else
-			$fields = $construct_fields;
-
-		foreach ($fields as $id=>$fld)
-			if (in_array($fld,$ignore_fields))
-				unset($fields[$id]);
-
-		return $fields;
-	}
-}
-
-/**
- * The main AgileBill CORE Debugger Class
- *
- * @package AgileBill
- * @subpackage Core
- */
-class CORE_debugger {
-	public function alert($message) {
-		$this->alert = array($message);
-	}
-
-	public function error($module,$method,$message) {
-		$this->error = sprintf('%s:%s => %s
',$module,$method,$message);
-
-		if (defined('ERROR_REPORTING') && ERROR_REPORTING > 0)
-			$this->alert($this->error);
-
-		$db = &DB();
-		$result = $db->Execute(sqlInsert($db,'log_error',array('date_orig'=>time(),'account_id'=>SESS_ACCOUNT,'module'=>$module,'method'=>$method,'message'=>$message)));
-	}
-}
-
-/**
- * The main AgileBill CORE Database Function
- */
-function DB($debug=false) {
-	static $saved_db_conn;
-
-	if (isset($saved_db_conn) && defined('AGILE_DB_CACHE')) {
-		if ($debug)
-			$saved_db_conn->debug = true;
-		else
-			$saved_db_conn->debug = false;
-
-		return $saved_db_conn;
-	}
-
-	$saved_db_conn = NewADOConnection(AGILE_DB_TYPE);
-	if (defined('AGILE_DB_PCONNECT') && AGILE_DB_PCONNECT == true)
-		$saved_db_conn->PConnect(AGILE_DB_HOST,AGILE_DB_USERNAME,AGILE_DB_PASSWORD,AGILE_DB_DATABASE);
-	else
-		$saved_db_conn->Connect(AGILE_DB_HOST,AGILE_DB_USERNAME,AGILE_DB_PASSWORD,AGILE_DB_DATABASE);
-
-	if ($debug)
-		$saved_db_conn->debug = true;
-	else
-		$saved_db_conn->debug = false;
-
-	$saved_db_conn->SetFetchMode(ADODB_FETCH_ASSOC);
-
-	return $saved_db_conn;
-}
-
-/**
- * Get the next SQL index ID for a table
- *
- * @param $db
- * @param $table
- * @return int
- */
-function sqlGenID($db,$table) {
-	$id = 0;
-
-	# Check if our ID table exists, and if not
-	static $CACHE = array();
-	$dbname = md5($db->databaseType.$db->host.$db->database.$db->user);
-
-	if (! isset($CACHE[$dbname][$table])) {
-		$CACHE[$dbname][$table] = true;
-		$rs = $db->Execute(sprintf('SELECT id FROM %s%s_id WHERE 1=0',AGILE_DB_PREFIX,$table));
-
-		if ($rs) {
-			$rs = $db->Execute(sprintf('SELECT MAX(id) AS max FROM %s%s',AGILE_DB_PREFIX,$table));
-			if ($rs)
-				$id = $rs->fields['max']+1;
-		}
-	}
-
-	return $db->GenID(sprintf('%s%s_id',AGILE_DB_PREFIX,$table),$id);
-}
-
-/**
- * Generate SQL Conditions for a Query
- */
-function sqlConditions($db,$Conditions=false,$Tables=false) {
-	$db = &DB();
-	$where = 'WHERE ';
-
-	if ($Conditions) {
-		if (is_array($Conditions)) {
-			foreach ($Conditions as $a => $b)
-				if (is_array($b))
-					$where .= sprintf("%s IN ('%s') AND ",$a,implode("','",$b));
-				elseif ($db->qstr($b) == 'NULL')
-					$where .= sprintf('%s IS NULL AND ',$a);
-				else
-					$where .= sprintf('%s=%s AND ',$a,$db->qstr($b));
-
-		} else {
-			if (preg_match('/::/',$Conditions)) {
-				$s = explode('::',$Conditions);
-				$ii = 1;
-				$Conditions = '';
-
-				for ($i=0; $iqstr($s[$i]);
-						$ii = 1;
-					}
-				}
-			}
-
-			$where .= sprintf('%s AND ',$Conditions);
-		}
-	}
-
-	# Add the SITE ID
-	if (! is_array($Tables) || count($Tables) == 1) {
-		if (in_array($Tables,array('setup','currency','tax')))
-			$where .= sprintf('id=%s',DEFAULT_SITE);
-		else
-			$where .= sprintf('site_id=%s',DEFAULT_SITE);
-
-	} else {
-		$tbarr = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V');
-		for ($i=0; $i0)
-				$where .= ' AND ';
-
-			$where .= sprintf(' %s.site_id = %s',$tbarr[$i],DEFAULT_SITE);
-		}
-	}
-
-	$where = str_replace('{p}',AGILE_DB_PREFIX,$where);
-
-	return $where;
-}
-
-/**
- * Generate SQL to delete from the database
- */
-function sqlDelete($db,$table,$where) {
-	$db = &DB();
-	$where = sqlConditions($db,$where);
-
-	return sprintf('DELETE FROM %s%s %s',AGILE_DB_PREFIX,$table,$where);
-}
-
-/**
- * Generate SQL to insert into the database
- */
-function sqlInsert($db,$table,$FieldList,$id=false) {
-	$db = &DB();
-
-	if (! $id)
-		$id = sqlGenID($db,$table);
-
-	$FieldList['id'] = $id;
-	if (empty($FieldList['site_id']))
-		$FieldList['site_id'] = DEFAULT_SITE;
-
-	$table = AGILE_DB_PREFIX.$table;
-	return $db->GetInsertSQL($table,$FieldList,get_magic_quotes_gpc());
-}
-
-/**
- * Generate SQL to update records in the database
- */
-function sqlUpdate($table,$FieldList,$options=array()) {
-	$sql = array();
-	$force = false;
-	$db = &DB();
-
-	# Transition until all calls to sqlUpdate() are changed
-	# @todo To deprecate
-	if (func_num_args() >= 4) {
-		$args = func_get_args();
-		$db = array_shift($args);
-		$table = array_shift($args);
-		$FieldList = array_shift($args); if (! is_array($FieldList)) $FieldList=array($FieldList);
-		$options['where'] = array_shift($args);
-		$options['force'] = count($args) ? array_shift($args) : false;
-	}
-
-	if (isset($options['force']))
-		$force = $options['force'];
-	if (isset($options['where']))
-		$sql['where'] = $options['where'];
-
-	$rs = $db->Execute(sqlSelect($table,'*',$sql));
-	return $db->GetUpdateSQL($rs,$FieldList,$force,get_magic_quotes_gpc());
-}
-
-/**
- * Generate SQL to select records from the database
- */
-function sqlSelect($TableList,$FieldList,$sql=array()) {
-	# Transition until all calls to sqlSelect() are changed
-	# @todo To deprecate
-	if (func_num_args() >= 4) {
-		$sql = array();
-
-		$args = func_get_args();
-		$db = array_shift($args);
-		$TableList = array_shift($args);
-		$FieldList = array_shift($args);
-		$sql['where'] = array_shift($args);
-		$sql['orderby'] = count($args) ? array_shift($args) : '';
-		$sql['limit'] = count($args) ? array_shift($args) : 0;
-		$sql['distinct'] = count($args) ? array_shift($args) : false;
-		$sql['groupby'] = count($args) ? array_shift($args) : '';
-	}
-
-	# Table(s)
-	if (is_array($TableList)) {
-		$tbarr = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V');
-		$table = '';
-
-		$i = 0;
-		foreach ($TableList as $index => $value) {
-			if ($i++>0)
-				$table .= ',';
-
-			$table .= sprintf('%s%s AS %s',AGILE_DB_PREFIX,$value,$tbarr[$index]);
-		}
-	} else {
-		$table = AGILE_DB_PREFIX.$TableList;
-	}
-
-	# Field(s)
-	if (isset($sql['distinct']) && $sql['distinct'])
-		$fields = 'DISTINCT '.$FieldList;
-	else
-		$fields = $FieldList;
-
-	# Condition(s)
-	# @todo to remove sqlConditions() doesnt need $db
-	if (! isset($db))
-		$db = &DB();
-	$where = sqlConditions($db,$sql['where'],$TableList);
-
-	$line = '';
-	# Group By
-	if (isset($sql['groupby']) && $sql['groupby'])
-		$line .= sprintf(' GROUP BY %s',$sql['groupby']);
-
-	# Order By
-	if (isset($sql['orderby']) && $sql['orderby'])
-		$line .= sprintf(' ORDER BY %s',$sql['orderby']);
-
-	# Limit
-	if (isset($sql['limit']) && $sql['limit'])
-		$line .= ' LIMIT '.$sql['limit'];
-
-	$SQL = sprintf('SELECT %s FROM %s %s %s',$fields,$table,$where,$line);
-
-	if (isset($sql['debug']))
-		printf('
%s
',$SQL);
-
-	return $SQL;
-}
-?>
diff --git a/modules/core/database_add.inc.php b/modules/core/database_add.inc.php
deleted file mode 100644
index 120b3e92..00000000
--- a/modules/core/database_add.inc.php
+++ /dev/null
@@ -1,236 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Database ADD Method
- *
- * @uses CORE_validate
- * @uses CORE_static_var
- * @uses CORE_trigger
- */
-
-function CORE_database_add($VAR,$construct,$type) {
-	global $C_translate;
-
-	# Temp during code rework
-	if (! is_array($construct->val_error))
-		$construct->val_error = array();
-
-	# Set the field list for this method
-	$arr = $construct->method[$type];
-
-	# Define the validation class
-	include_once(PATH_CORE.'validate.inc.php');
-	$validate = new CORE_validate($VAR,$construct->module);
-	$construct->validated = true;
-
-	# Quick Validation to see if we have too many variables.
-	foreach ($VAR as $field_name => $value)
-		if (preg_match("/^{$construct->module}_/",$field_name))
-			if (! in_array(preg_replace("/^{$construct->module}_/",'',$field_name),$arr))
-				array_push($construct->val_error,array(
-					'field'=>sprintf('%s_%s',$construct->table,$field_name),
-					'field_trans'=>$field_name,
-					'error'=>sprintf('WARNING: Variable passed to %s but it will be ignored.',__METHOD__),
-					'method'=>sprintf('%s:%s(%s)',__FILE__,__METHOD__,__LINE__)
-				));
-
-	# Quick Validation to see if we are missing variables.
-	foreach ($construct->method[$type] as $field_name) {
-		$field_var = sprintf('%s_%s',$construct->module,$field_name);
-
-		if (! array_key_exists($field_var,$VAR))
-			array_push($construct->val_error,array(
-				'field'=>$field_var,
-				'field_trans'=>$field_name,
-				'error'=>sprintf('WARNING: Variable NOT passed to %s.',__METHOD__),
-				'method'=>sprintf('%s:%s(%s)',__FILE__,__METHOD__,__LINE__)
-			));
-	}
-
-	# Perform each field validation
-	while (list($key,$field_name) = each($arr)) {
-		# Get the field value
-		$field_var = sprintf('%s_%s',$construct->module,$field_name);
-
-		# Check if this value is unique
-		if (isset($construct->field[$field_name]['unique']) && isset($VAR[$field_var])) {
-			if (! $validate->validate_unique($construct->table,$field_name,'record_id',$VAR[$field_var])) {
-				$construct->validated = false;
-
-				array_push($construct->val_error,array(
-					'field'=>sprintf('%s_%s',$construct->module,$field_name),
-					'field_trans'=>$C_translate->translate('field_'.$field_name,$construct->module,''),
-					'error'=>$C_translate->translate('validate_unique','',''),
-					'method'=>sprintf('%s:%s(%s)',__FILE__,__METHOD__,__LINE__)
-				));
-			}
-		}
-
-		# Check if the submitted value meets the specifed requirements
-		if (isset($construct->field[$field_name]['validate'])) {
-			if (isset($VAR[$field_var]) && ($VAR[$field_var] != '')) {
-				if (! $validate->validate($field_name,$construct->field[$field_name],$VAR[$field_var],$construct->field[$field_name]['validate'])) {
-					$construct->validated = false;
-
-					array_push($construct->val_error,array(
-						'field'=>sprintf('%s_%s',$construct->module,$field_name),
-						'field_trans'=>$C_translate->translate('field_'.$field_name,$construct->module,''),
-						'error'=>$validate->error[$field_name],
-						'method'=>sprintf('%s:%s(%s)',__FILE__,__METHOD__,__LINE__)
-					));
-				}
-
-			} else {
-				$construct->validated = false;
-
-				array_push($construct->val_error,array(
-					'field'=>sprintf('%s_%s',$construct->module,$field_name),
-					'field_trans'=>$C_translate->translate('field_'.$field_name,$construct->module,''),
-					'error'=>$C_translate->translate('validate_any','',''),
-					'method'=>sprintf('%s:%s(%s)',__FILE__,__METHOD__,__LINE__)
-				));
-			}
-		}
-	}
-
-	# Get required static_vars and validate them
-	require_once(PATH_CORE.'static_var.inc.php');
-	$static_var = new CORE_static_var;
-
-	$all_error = $static_var->validate_form($construct->module,$construct->val_error);
-
-	if ($all_error != false && gettype($all_error) == 'array')
-		$construct->validated = false;
-	else
-		$construct->validated = true;
-
-	/* If validation has failed, skip the db insert & set the errors & original fields as Smarty objects,
-	   and change the page to be loaded.*/
-	if (! $construct->validated) {
-		global $smarty;
-
-		# Set the errors as a Smarty Object
-		$smarty->assign('form_validation',$construct->val_error);
-
-		# Set the page to be loaded
-		if (! defined('FORCE_PAGE'))
-			define('FORCE_PAGE',$VAR['_page_current']);
-
-		# Define any triggers
-		if (isset($construct->trigger[$type])) {
-			include_once(PATH_CORE.'trigger.inc.php');
-			$trigger = new CORE_trigger;
-
-			$trigger->trigger($construct->trigger[$type],0,$VAR);
-		}
-
-		# Strip slashes
-		global $C_vars;
-		$C_vars->strip_slashes_all();
-
-		return false;
-
-	} else {
-		# Begin the new database class
-		$db = &DB();
-
-		# Loop through the field list to create the sql queries
-		$field_list = array();
-		reset($arr);
-		while (list($key,$field_name) = each($arr)) {
-			# Get the field value
-			$field_var = sprintf('%s_%s',$construct->module,$field_name);
-
-			if (isset($VAR[$field_var])) {
-				# Check if HTML allowed
-				if (@$construct->field[$field_name]['html'] != 1 && ! is_array($VAR[$field_var]))
-					$insert_value = htmlspecialchars($VAR[$field_var]);
-				else
-					$insert_value = $VAR[$field_var];
-
-				# Perform data conversions
-				if (isset($construct->field[$field_name]['convert']) && ! isset($VAR['_noconvert']))
-					$insert_value = $validate->convert($field_name,$insert_value,$construct->field[$field_name]['convert']);
-
-				# Create the sql statement
-				if (! is_null($insert_value))
-					$field_list[$field_name] = $insert_value;
-			}
-		}
-
-		# Check and see if we have some default fields
-		foreach (array('date_orig','date_last') as $field_name) {
-			$field_var = sprintf('%s_%s',$construct->module,$field_name);
-
-			if (isset($construct->field[$field_name]) && ! isset($VAR[$field_var]))
-				if (isset($construct->field[$field_name]['convert']) && ! isset($VAR['_noconvert']))
-					$field_list[$field_name] = $validate->convert($field_name,time(),$construct->field[$field_name]['convert']);
-				else
-					$field_list[$field_name] = time();
-		}
-
-		# Determine the record id
-		$construct->record_id = isset($field_list['id']) ? $field_list['id'] : $db->GenID(AGILE_DB_PREFIX.$construct->table.'_id');
-
-		# Execute the query
-		$result = $db->Execute(sqlInsert($db,$construct->table,$field_list,$construct->record_id));
-
-		# Error reporting
-		if ($result === false) {
-			global $C_debug;
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-
-			if (isset($construct->trigger[$type])) {
-				include_once(PATH_CORE.'trigger.inc.php');
-				$trigger = new CORE_trigger;
-
-				$trigger->trigger($construct->trigger[$type],0,$VAR);
-			}
-
-			return false;
-		}
-
-		# Define any triggers
-		if (isset($construct->trigger[$type])) {
-			include_once(PATH_CORE.'trigger.inc.php');
-			$trigger = new CORE_trigger;
-
-			$trigger->trigger($construct->trigger[$type],1,$VAR);
-		}
-
-		# Insert the static vars
-		$static_var->add($VAR,$construct->module,$construct->record_id);
-
-		$_escape = '';
-		if (isset($VAR['_escape']) || isset($VAR['_escape_next']))
-			$_escape = '&_escape=1&_escape_next=1';
-
-		if (! isset($VAR['_noredirect']))
-			define('REDIRECT_PAGE',sprintf('?_page=%s&id=%s%s',$VAR['_page'],$construct->record_id,$_escape));
-
-		return $construct->record_id;
-	}
-}
-?>
diff --git a/modules/core/database_delete.inc.php b/modules/core/database_delete.inc.php
deleted file mode 100644
index 53e907ee..00000000
--- a/modules/core/database_delete.inc.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- */
-
-/**
- * The main AgileBill CORE Database DELETE Method
- *
- * @package AgileBill
- * @subpackage Core:Database
- * @uses CORE_Trigger
- */
-
-function CORE_database_delete($VAR,$construct,$type) {
-	global $C_debug,$C_translate;
-
-	$db = &DB();
-
-	# Execute the SQL
-	$result = $db->Execute(sqlDelete($db,$construct->table,array('id'=>$VAR['id'])));
-
-	# Alert
-	$C_debug->value['id'] = $VAR[$construct->table.'_id'];
-	$C_debug->value['module_name'] = $C_translate->translate('menu',$construct->module,'');
-	$C_debug->alert($C_translate->translate('alert_delete_id','',''));
-
-	# error reporting
-	if ($result === false) {
-		global $C_debug;
-		$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-	}
-
-
-	if (isset($construct->trigger[$type])) {
-		include_once(PATH_CORE.'trigger.inc.php');
-		$trigger = new CORE_trigger;
-
-		$trigger->trigger($construct->trigger[$type],0,$VAR);
-	}
-}
-?>
diff --git a/modules/core/database_join_fields.inc.php b/modules/core/database_join_fields.inc.php
deleted file mode 100644
index 3e0edf64..00000000
--- a/modules/core/database_join_fields.inc.php
+++ /dev/null
@@ -1,94 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-function CORE_database_join_fields($result, $linked)
-{  
-	# get any linked fields
-	for($i=0; $i < count($linked); $i++)
-	{
-		$field      = $linked["$i"]["field"];
-		$link_field = $linked["$i"]["link_field"];
-		$link_table = $linked["$i"]["link_table"];		
-
-		# get an array of the values to select from the database
-		$arr = '';
-		$ids = '';
-		for ($ii=0; $ii < count($result); $ii++ ) {
-			$curr = $result["$ii"]["$field"];
-			if(!isset($arr["$curr"]))
-			{
-				if($ids == '')
-				{
-					$arr["$curr"] = true;
-					$ids .= " id = '" . $curr . "'";	
-				}
-				else
-				{
-					$arr["$curr"] = true;	
-					$ids .= " OR id = '" . $curr . "'";						
-				}
-			}
-		}
-
-		if($ids != '')
-		{
-			# generate the SQL query
-			$sql= "
-			SELECT id,$link_field FROM " . AGILE_DB_PREFIX . "$link_table
-			WHERE
-			( $ids )
-			AND site_id = '" . DEFAULT_SITE . "'";				
-			$db = &DB();
-			$rss = $db->Execute($sql);
-
-
-		# error reporting
-		if ($rss === false)
-		{
-			global $C_debug;
-			$C_debug->error('database.inc.php','join_fields', $db->ErrorMsg());
-		}			
-		else
-		{		 
-			# set the results as an array
-			while (!$rss->EOF) {					
-				for ($ii=0; $ii < count($result); $ii++ ) {
-					if($result[$ii][$field] == $rss->fields[id]) {
-						if(preg_match('/,/',$link_field)) {
-							$fields = explode(',',$link_field);
-							for($iii=0; $iiifields[$fieldname];
-								$result[$ii][$fieldname] = $rss->fields[$fieldname];
-							} 
-						} else  {								
-							# change the field from the id to the name...
-							$result[$ii][$field] = $rss->fields[$link_field];
-						}
-					}
-				}	
-				$rss->MoveNext();					
-			}					
-		}				
-	}
-	}
-	return $result;
-}		
-?>
diff --git a/modules/core/database_mass_delete.inc.php b/modules/core/database_mass_delete.inc.php
deleted file mode 100644
index 8e2fd804..00000000
--- a/modules/core/database_mass_delete.inc.php
+++ /dev/null
@@ -1,105 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Database MASS DELETE Method
- *
- * @uses CORE_trigger
- */
-
-function CORE_database_mass_delete($VAR,$construct,$type) {
-	global $C_auth,$C_debug;
-
-	$db = &DB();
-
-	if (isset($VAR['delete_id']))
-		$ids = explode(',',preg_replace('/,$/','',$VAR['delete_id']));
-	elseif (isset($VAR['id']))
-		$ids = explode(',',preg_replace('/,$/','',$VAR['id']));
-
-	# Check and see if the user is authorised to delete this records
-	foreach ($ids as $i => $id) {
-		$groups = $db->Execute(sqlSelect($db,'account_group','group_id',array('account_id'=>$id),'group_id'));
-
-		$group = array();
-		while (! $groups->EOF) {
-			array_push($group,$groups->fields['group_id']);
-			$groups->MoveNext();
-		}
-		# Verify the user has access to view this account
-		foreach ($group as $gid) {
-			if (! $C_auth->auth_group_by_id($gid)) {
-				unset($ids[$i]);
-				break;
-			}
-		}
-	}
-
-	# Nothing to delete
-	if (! count($ids))
-		return false;
-
-	# Execute the query
-	$result = $db->Execute(sqlDelete($db,$construct->table,array('id'=>$ids)));
-
-	# Error reporting
-	if ($result === false) {
-		$C_debug->error(__FILE__,__METHOD__, $db->ErrorMsg());
-
-		if (isset($construct->trigger[$type])) {
-			include_once(PATH_CORE.'trigger.inc.php');
-			$trigger = new CORE_trigger;
-
-			$trigger->trigger($construct->trigger[$type],0,$VAR);
-		}
-
-	} else {
-		# Delete any associated records
-		if (isset($construct->associated_DELETE) && is_array($construct->associated_DELETE) && count($construct->associated_DELETE)) {
-			foreach ($construct->associated_DELETE as $assoc) {
-				$db->Execute(sqlDelete($db,$assoc['table'],array($assoc['field']=>$ids)));
-
-				# Alert delete message
-				if (! defined('AJAX')) {
-					global $C_translate;
-
-					$C_translate->value['CORE']['module_name'] = $C_translate->translate('name',$construct->module,'');
-					$message = $C_translate->translate('alert_delete_ids','CORE','');
-					$message = str_replace('%%module_name%%','', $message);
-					$C_debug->alert($message);
-				}
-
-				if (isset($construct->trigger[$type])) {
-					include_once(PATH_CORE.'trigger.inc.php');
-					$trigger = new CORE_trigger;
-
-					$trigger->trigger($construct->trigger[$type],1,$VAR);
-				}
-			}
-		}
-	}
-
-	return $result;
-}
-?>
diff --git a/modules/core/database_search.inc.php b/modules/core/database_search.inc.php
deleted file mode 100644
index 2f7ad794..00000000
--- a/modules/core/database_search.inc.php
+++ /dev/null
@@ -1,282 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Database SEARCH Method
- *
- * @uses CORE_validate
- * @uses CORE_trigger
- * @uses CORE_search
- */
-
-function CORE_database_search($VAR,$construct,$type) {
-	global $C_list;
-
-	include_once(PATH_CORE.'validate.inc.php');
-	$validate = new CORE_validate;
-
-	$db = &DB();
-
-	# Set the search criteria array
-	$arr = $VAR;
-
-	# Loop through the submitted field_names to get the WHERE statement
-	$where_list = '';
-	$i=0;
-	$pat = sprintf('/^%s_/',$construct->module);
-	while (list($key,$value) = each($arr)) {
-		if ($value != '') {
-			if (preg_match($pat,$key)) {
-				$field = preg_replace($pat,'',$key);
-
-				if (! is_array($value) && preg_match('/%/',$value)) {
-					# Do any data conversion for this field (date, encrypt, etc...)
-					if (isset($construct->field[$field]['convert']))
-						$value = $validate->convert($field,$value,$construct->field[$field]['convert']);
-
-					if ($i)
-						$where_list .= sprintf(' AND %s LIKE %s ',$field,$db->qstr($value,get_magic_quotes_gpc()));
-					else
-						$where_list .= sprintf(' WHERE %s LIKE %s',$field,$db->qstr($value,get_magic_quotes_gpc()));
-
-					$i++;
-
-				} else {
-					# Check if array
-					if (is_array($value)) {
-						for ($i_arr=0; $i_arr, <, etc...)
-								$f_opt = '=';
-								$pat_field = sprintf('%s_%s',$construct->module,$field);
-
-								if (isset($VAR['field_option'][$pat_field][$i_arr])) {
-									$f_opt = $VAR['field_option'][$pat_field][$i_arr];
-									# Error checking, safety precaution
-									if (! in_array($f_opt,array('=','>','<','>=','<=','!=')))
-										$f_opt = '=';
-								}
-
-								# Do any data conversion for this field (date, encrypt, etc...)
-								if (isset($construct->field[$field]['convert']))
-									$value[$i_arr] = $validate->convert($field,$value[$i_arr],$construct->field[$field]['convert']);
-
-								if (($i_arr == 0) && ($i==0))
-									$where_list .= sprintf(' WHERE %s %s %s',$field,$f_opt,$db->qstr($value[$i_arr],get_magic_quotes_gpc()));
-								else
-									$where_list .= sprintf(' AND %s %s %s',$field,$f_opt,$db->qstr($value[$i_arr],get_magic_quotes_gpc()));
-
-								$i++;
-							}
-						}
-
-					} else {
-						if ($i)
-							$where_list .= sprintf(' AND %s=%s ',$field,$db->qstr($value,get_magic_quotes_gpc()));
-						else
-							$where_list .= sprintf(' WHERE %s=%s',$field,$db->qstr($value,get_magic_quotes_gpc()));
-
-						$i++;
-					}
-				}
-			}
-		}
-	}
-
-	# Some table joins
-	$join_table = '';
-	if (isset($VAR['join']) && is_array($VAR['join']))
-		foreach ($VAR['join'] as $table => $joins)
-			if ($C_list->is_installed($table)) {
-
-				include_once(PATH_MODULES.sprintf('%s/%s.inc.php',$table,$table));
-				$join = new $table;
-
-				if (method_exists($join,'sql_join')) {
-					foreach ($joins as $jointable => $id)
-						$q_join .= $join->sql_join($jointable,$id);
-
-					$join_table .= sprintf(',%s%s',AGILE_DB_PREFIX,$jointable);
-				}
-
-				if ($where_list)
-					$where_list .= sprintf(' AND %s',$q_join);
-				else
-					$where_list .= sprintf(' WHERE %s',$q_join);
-			}
-
-	# Finalize the WHERE statement
-	if ($where_list == '')
-		$where_list .= ' WHERE ';
-	else
-		$where_list .= ' AND ';
-
-	# Get limit type
-	if (isset($VAR['limit']))
-		$limit = $VAR['limit'];
-	else
-		$limit = $construct->limit;
-
-	# Get order by
-	if (isset($VAR['order_by']))
-		$order_by = $VAR['order_by'];
-	else
-		$order_by = $construct->order_by;
-
-	# Get any addition fields to select:
-	if (isset($construct->custom_EXP))
-		for ($ei=1; $eicustom_EXP); $ei++)
-			$field_list = sprintf(',%s',$construct->custom_EXP[$ei]['field']);
-
-	# Get any static vars to search
-	$join_list = '';
-	$pre = AGILE_DB_PREFIX;
-/*
-	if (! empty($VAR['static_relation']) && count($VAR['static_relation']>0)) {
-		while (list($idx,$value) = each($VAR['static_relation'])) {
-			if ($value != '') {
-				$join_list .= sprintf(" INNER JOIN %sstatic_var_record AS s%s ON (s%s.record_id=%s%s.id AND s%s.static_var_relation_id='%s' AND s%s.site_id=%s AND",
-					$pre,$idx,$idx,$pre,$this->table,$idx,$idx,$idx,$db->qstr(DEFAULT_SITE));
-
-				if(preg_match('/%/',$value))
-					$join_list .= sprintf(' s%s.value LIKE %s',$idx,$db->qstr($VAR['static_relation'][$idx]));
-				else
-					$join_list .= sprintf(' s%s.value = %s',$idx,$db->qstr($VAR['static_relation'][$idx]));
-
-				$join_list .= ') ';
-			}
-		}
-	}
-
-        # standard where list
-        $q .= $join_list . $where_list ." ".AGILE_DB_PREFIX."account.site_id = " . $db->qstr(DEFAULT_SITE);
-
-        # Code for member group
-        if(!empty($VAR['account_group'])) {
-            $q .= " AND ".AGILE_DB_PREFIX."account_group.group_id = " . $db->qstr($VAR['account_group'])."
-                    AND ".AGILE_DB_PREFIX."account_group.site_id  = " . $db->qstr(DEFAULT_SITE);
-        }
-        if(!empty($VAR['account_group'])) {
-            $q_save .= " LEFT JOIN ".AGILE_DB_PREFIX."account_group ON ".AGILE_DB_PREFIX."account_group.account_id = ".AGILE_DB_PREFIX."account.id  ";
-
-            if(!empty($join_list))
-                $q_save .= $join_list;
-
-            $q_save .= $where_list ." %%whereList%% ";
-            $q_save .= AGILE_DB_PREFIX."account_group.group_id = " . $db->qstr($VAR['account_group'])." AND ";
-        } else {
-            if(!empty($join_list))
-                $q_save .= $join_list;
-
-            $q_save .= $where_list ." %%whereList%% ";
-        }
-*/
-
-	# generate the full query
-	$q = sprintf('SELECT %s%s.id AS id%s FROM %s%s %s %s %s%s.site_id=%s',
-		AGILE_DB_PREFIX,$construct->table,$field_list,
-		AGILE_DB_PREFIX,$construct->table,$join_table,
-		$where_list,AGILE_DB_PREFIX,$construct->table,DEFAULT_SITE);
-	$q_save = "SELECT %%fieldList%% FROM %%tableList%% $join_table".$where_list." %%whereList%% ";
-	$result = $db->Execute($q);
-
-	# Error reporting
-	if ($result === false) {
-		global $C_debug;
-		$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-
-		if (isset($construct->trigger[$type])) {
-			include_once(PATH_CORE.'trigger.inc.php');
-			$trigger = new CORE_trigger;
-			$trigger->trigger($construct->trigger[$type],0,$VAR);
-		}
-
-		return;
-	}
-
-	# Get the result count:
-	$results = $result->RecordCount();
-
-	# Get the first record id:
-	if ($results == 1)
-		$record_id = $result->fields['id'];
-
-	# Run any custom validation on this result for this module
-	if (isset($construct->custom_EXP)) {
-		$results = 0;
-
-		while (! $result->EOF) {
-			for ($ei=0; $eicustom_EXP); $ei++) {
-				$field = $construct->custom_EXP[$ei]['field'];
-				$value = $construct->custom_EXP[$ei]['value'];
-
-				if ($result->fields[$field] == $value) {
-					$ei = count($construct->custom_EXP);
-					$results++;
-				}
-			}
-
-			$result->MoveNext();
-		}
-	}
-
-	# Define the DB vars as a Smarty accessible block
-	global $smarty;
-
-	# Create the definition for fast-forwarding to a single record:
-	if ($results == 1 && !isset($construct->fast_forward))
-		$smarty->assign('record_id',$record_id);
-
-	# create the search record:
-	if ($results > 0) {
-		# create the search record
-		include_once(PATH_CORE.'search.inc.php');
-		$search = new CORE_search;
-		$arr['module'] = $construct->module;
-		$arr['sql']	= $q_save;
-		$arr['limit'] = $limit;
-		$arr['order_by']= $order_by;
-		$arr['results']	= $results;
-		$search->add($arr);
-
-		# define the search id and other parameters for Smarty
-		$smarty->assign('search_id',$search->id);
-		# page:
-		$smarty->assign('page','1');
-		# limit:
-		$smarty->assign('limit',$limit);
-		# order_by:
-		$smarty->assign('order_by',$order_by);
-	}
-
-	# define the result count
-	$smarty->assign('results',$results);
-
-	if (isset($construct->trigger[$type])) {
-		include_once(PATH_CORE.'trigger.inc.php');
-		$trigger = new CORE_trigger;
-		$trigger->trigger($construct->trigger[$type],1,$VAR);
-	}
-}
-?>
diff --git a/modules/core/database_search_form.inc.php b/modules/core/database_search_form.inc.php
deleted file mode 100644
index 1fa5cc4e..00000000
--- a/modules/core/database_search_form.inc.php
+++ /dev/null
@@ -1,71 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-function CORE_database_search_form($VAR, $construct, $type)
-{
-	global $C_translate, $smarty;		
-
-	# set the field list for this method:
-	$arr = $construct->method[$type];
-
-	# loop through the field list to create the order_by list
-	$field_list = '';
-	$i = 0;
-	while (list ($key, $value) = each ($arr))
-	{
-		$field_list["$i"]['translate']      = $C_translate->translate('field_' . $value, $construct->module, "");											
-		if (! $field_list["$i"]['translate'])
-			$field_list["$i"]['translate'] = sprintf('field_%s',$value);
-		$field_list["$i"]['field']  = $value;
-		$i++;
-	}
-
-	# define the field list as a Smarty accessible array
-	$smarty->assign('field_list',$field_list);
-
-	# define the default ORDER BY field
-	$smarty->assign('field_order_by',$construct->order_by);
-
-	# define the default LIMIT count
-	$smarty->assign('field_limit',$construct->limit);
-
-	# define the recent search menu & javascript
-	include_once(PATH_CORE   . 'search.inc.php');
-	$search = new CORE_search;
-
-	# build the RECENT SEARCH menu & JS		
-	$search->build_recent($construct->module);
-
-	# send the RECENT SEARCH menu to Smarty
-	$smarty->assign($construct->module . "_recent_menu", $search->recent_menu);
-
-	# send the finished RECENT SEARCH JavaScript to Smarty
-	$smarty->assign($construct->module . "_recent_js", $search->recent_js);	
-
-	# build the SAVED SEARCH menu & JS
-	$search->build_saved($construct->module);
-
-	# send the SAVED SEARCH menu to Smarty
-	$smarty->assign($construct->module . "_saved_menu", $search->saved_menu);
-
-	# send the finished SAVED SEARCH JavaScript to Smarty
-	$smarty->assign($construct->module . "_saved_js", $search->saved_js);	 	
-}
-?>
diff --git a/modules/core/database_search_show.inc.php b/modules/core/database_search_show.inc.php
deleted file mode 100644
index 13719354..00000000
--- a/modules/core/database_search_show.inc.php
+++ /dev/null
@@ -1,252 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Database SEARCH_SHOW Method
- *
- * @uses CORE_search
- * @uses CORE_trigger
- */
-
-function CORE_database_search_show($VAR, &$construct, $type) {
-	# Set the field list for this method:
-	$arr = $construct->method[$type];
-	$field_list = '';
-	$construct->linked = array();
-
-	$i=0;
-	while (list($key,$value) = each($arr)) {
-		$field_var = sprintf('%s_%s',$construct->table,$value);
-
-		if ($i == 0)
-			$field_list .= sprintf('%s%s.%s',AGILE_DB_PREFIX,$construct->table,$value);
-		else
-			$field_list .= sprintf(',%s%s.%s',AGILE_DB_PREFIX,$construct->table,$value);
-
-		# Determine if this record is linked to another table/field
-		if ($construct->field[$value]['asso_table'] != '')
-			array_push($construct->linked,array('field'=>$value,'link_table'=>$construct->field[$value]['asso_table'],'link_field'=>$construct->field[$value]['asso_field']));
-
-		$i++;
-	}
-
-	# Get the search details:
-	if (isset($VAR['search_id'])) {
-		include_once(PATH_CORE.'search.inc.php');
-		$search = new CORE_search;
-
-		$search->get($VAR['search_id']);
-
-	} else {
-		# Invalid search!
-		echo '
The search terms submitted were invalid!
';
-
-		if (isset($construct->trigger[$type])) {
-			include_once(PATH_CORE.'trigger.inc.php');
-			$trigger = new CORE_trigger;
-
-			$trigger->trigger($construct->trigger[$type],0,$VAR);
-		}
-	}
-
-	# Check that this search has not been taken over by another account
-	if ($search->session != SESS && $search->account != SESS_ACCOUNT) {
-		global $C_debug;
-		$C_debug->alert('You are not authorized to view this search!');
-
-		return false;
-	}
-
-	# Get the sort order details:
-	if (isset($VAR['order_by']) && $VAR['order_by'] != '') {
-		$order_by = sprintf(' ORDER BY %s',$VAR['order_by']);
-
-		$smarty_order = $VAR['order_by'];
-
-	} else {
-		$order_by = sprintf(' ORDER BY %s',$construct->order_by);
-		$smarty_order = $search->order_by;
-	}
-
-	# Determine the sort order
-	if (isset($VAR['desc'])) {
-		$order_by .= ' DESC';
-		$smarty_sort = 'desc=';
-
-	} elseif (isset($VAR['asc'])) {
-		$order_by .= ' ASC';
-		$smarty_sort = 'asc=';
-
-	} else {
-		if (! preg_match('/date/',$smarty_order)) {
-			$order_by .= ' ASC';
-			$smarty_sort = 'asc=';
-
-		} else {
-			$order_by .= ' DESC';
-			$smarty_sort = 'desc=';
-		}
-	}
-
-	# Generate the full query
-	$db = &DB();
-
-	$q = str_replace('%%fieldList%%',$field_list,$search->sql);
-	$q = str_replace('%%tableList%%',AGILE_DB_PREFIX.$construct->table,$q);
-	$q = str_replace('%%whereList%%','',$q);
-
-	$q .= sprintf(' %s.site_id = %s',AGILE_DB_PREFIX.$construct->table,DEFAULT_SITE);
-	$q .= $order_by;
-
-	# Determine the offset & limit
-	$current_page = 1;
-	$offset = -1;
-
-	if (! empty($VAR['page']))
-		$current_page = $VAR['page'];
-	if (empty($search->limit))
-		$search->limit=25;
-
-	if ($current_page>1)
-		$offset = (($current_page*$search->limit)-$search->limit);
-
-	$result = $db->SelectLimit($q,$search->limit,$offset);
-
-	# Error reporting
-	if ($result === false) {
-		global $C_debug;
-		$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-
-		if (isset($construct->trigger[$type])) {
-			include_once(PATH_CORE.'trigger.inc.php');
-			$trigger = new CORE_trigger;
-
-			$trigger->trigger($construct->trigger[$type],0,$VAR);
-		}
-
-		return;
-	}
-
-	# Run any custom validation on this result for this module
-	$i = 0;
-	$class_name = true;
-	if (isset($construct->custom_EXP)) {
-		while (! $result->EOF) {
-			for ($ei=0; $eicustom_EXP); $ei++) {
-				$field = $construct->custom_EXP[$ei]['field'];
-				$value = $construct->custom_EXP[$ei]['value'];
-
-				if ($result->fields[$field] == $value) {
-					$smart[$i] = $result->fields;
-
-					if ($class_name) {
-						$smart[$i]['_C'] = 'row1';
-						$class_name = false;
-					} else {
-						$smart[$i]['_C'] = 'row2';
-						$class_name = true;
-					}
-
-					$i++;
-					$ei = count($construct->custom_EXP);
-				}
-			}
-
-			$result->MoveNext();
-		}
-
-	} else {
-		while (! $result->EOF) {
-			$smart[$i] = $result->fields;
-
-			if ($class_name) {
-				$smart[$i]['_C'] = 'row1';
-				$class_name = false;
-			} else {
-				$smart[$i]['_C'] = 'row2';
-				$class_name = true;
-			}
-
-			$result->MoveNext();
-			$i++;
-		}
-	}
-
-	# Get any linked fields
-	if ($i > 0)  {
-		$db_join = new CORE_database;
-		$construct->result = $db_join->join_fields($smart, $construct->linked);
-
-	} else {
-		$construct->result = $smart;
-	}
-
-	# Get the result count:
-	$results = $result->RecordCount();
-
-	# define the DB vars as a Smarty accessible block
-	global $smarty;
-
-	# define the results
-	$smarty->assign('search_show',$construct->result);
-	$smarty->assign('page',$VAR['page']);
-	$smarty->assign('order',$smarty_order);
-	$smarty->assign('sort',$smarty_sort);
-	$smarty->assign('limit',$search->limit);
-	$smarty->assign('search_id',$search->id);
-	$smarty->assign('results',$search->results);
-
-	# get the total pages for this search:
-	if (empty($search->limit))
-		$construct->pages = 1;
-	else
-		$construct->pages = intval($search->results / $search->limit);
-
-	if ($search->results % $search->limit)
-		$construct->pages++;
-
-	# Total pages
-	$smarty->assign('pages',$construct->pages);
-
-	# Current page
-	$smarty->assign('page',$current_page);
-
-	$page_arr = array();
-	for ($i=0; $i<=$construct->pages; $i++)
-		if ($construct->page != $i)
-			array_push($page_arr,$i);
-
-	# Page array for menu
-	$smarty->assign('page_arr',$page_arr);
-
-	if(isset($construct->trigger[$type])) {
-		include_once(PATH_CORE.'trigger.inc.php');
-		$trigger = new CORE_trigger;
-
-		$trigger->trigger($construct->trigger[$type],1,$VAR);
-	}
-
-	return $construct->result;
-}
-?>
diff --git a/modules/core/database_update.inc.php b/modules/core/database_update.inc.php
deleted file mode 100644
index 4ff31155..00000000
--- a/modules/core/database_update.inc.php
+++ /dev/null
@@ -1,202 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Database UPDATE Method
- *
- * @uses CORE_validate
- * @uses CORE_trigger
- */
-
-function CORE_database_update($VAR,$construct,$type) {
-	global $C_translate;
-
-	# Temp during code rework
-	if (! is_array($construct->val_error))
-		$construct->val_error = array();
-
-	# Set the field list for this method
-	$arr = $construct->method[$type];
-
-	# Define the validation class
-	include_once(PATH_CORE.'validate.inc.php');
-	$validate = new CORE_validate($VAR,$construct->module);
-	$construct->validated = true;
-
-	# Quick Validation to see if we have too many variables.
-	if (! isset($VAR['_ignoreval']))
-		foreach ($VAR as $field_name => $value)
-			if (preg_match("/^{$construct->module}_/",$field_name))
-				if (! in_array(preg_replace("/^{$construct->module}_/",'',$field_name),$arr))
-					array_push($construct->val_error,array(
-						'field'=>sprintf('%s_%s',$construct->table,$field_name),
-						'field_trans'=>$field_name,
-						'error'=>sprintf('WARNING: Variable passed to %s but it will be ignored.',__METHOD__),
-						'method'=>sprintf('%s:%s(%s)',__FILE__,__METHOD__,__LINE__)
-					));
-
-	# Define this record id
-	$id = $VAR[$construct->module.'_id'];
-
-	# Perform each field validation
-	while (list($key,$field_name) = each($arr)) {
-		# Get the field value
-		$field_var = sprintf('%s_%s',$construct->module,$field_name);
-
-		# Check if the conversion type required is not one ignored on updates
-		$ignore_con = false;
-		$ignore_convert = array('sha','md5','rc5','crypt');
-		for ($ic=0; $icfield[$field_name]['convert']) && ! isset($VAR['_noconvert']))
-				if ($construct->field[$field_name]['convert'] == $ignore_convert[$ic])
-					$ignore_con = true;
-
-		if (! $ignore_con) {
-			# check if this value is unique
-			if (isset($construct->field[$field_name]['unique']) && isset($VAR[$field_var])) {
-				if (! $validate->validate_unique($construct->table,$field_name,$id,$VAR[$field_var])) {
-					$construct->validated = false;
-
-					array_push($construct->val_error,array(
-						'field'=>sprintf('%s_%s',$construct->module,$field_name),
-						'field_trans'=>$C_translate->translate('field_'.$field_name,$construct->module,''),
-						'error'=>$C_translate->translate('validate_unique','',''),
-						'method'=>sprintf('%s:%s(%s)',__FILE__,__METHOD__,__LINE__)
-					));
-				}
-			}
-
-			# Check if the submitted value meets the specifed requirements
-			if (isset($construct->field[$field_name]['validate'])) {
-				if (isset($VAR[$field_var]) && ($VAR[$field_var] != '')) {
-					if (! $validate->validate($field_name,$construct->field[$field_name],$VAR[$field_var],$construct->field[$field_name]['validate'])) {
-						$construct->validated = false;
-
-						array_push($construct->val_error,array(
-							'field'=>sprintf('%s_%s',$construct->module,$field_name),
-							'field_trans'=>$C_translate->translate('field_'.$field_name,$construct->module,''),
-							'error'=>$validate->error[$field_name],
-							'method'=>sprintf('%s:%s(%s)',__FILE__,__METHOD__,__LINE__)
-						));
-					}
-
-				} else {
-					$construct->validated = false;
-
-					array_push($construct->val_error,array(
-						'field'=>sprintf('%s_%s',$construct->module,$field_name),
-						'field_trans'=>$C_translate->translate('field_'.$field_name,$construct->module,'') ? $C_translate->translate('field_'.$field_name,$construct->module,'') : $field_name,
-						'error'=>$C_translate->translate('validate_any','',''),
-						'method'=>sprintf('%s:%s(%s)',__FILE__,__METHOD__,__LINE__)
-					));
-
-				}
-			}
-		}
-	}
-
-	/* If validation has failed, skip the db insert & set the errors & original fields as Smarty objects,
-	   and change the page to be loaded.*/
-	if (! $construct->validated) {
-		global $smarty;
-
-		# Set the errors as a Smarty Object
-		$smarty->assign('form_validation',$construct->val_error);
-
-		# Change the page to be loaded
-		$VAR['_page'] = $construct->module.':view';
-
-		# Define any triggers
-		if (isset($construct->trigger[$type])) {
-			include_once(PATH_CORE.'trigger.inc.php');
-			$trigger = new CORE_trigger;
-
-			$trigger->trigger($construct->trigger[$type],0,$VAR);
-		}
-
-		# Strip slashes
-		global $C_vars;
-		$C_vars->strip_slashes_all();
-
-		return false;
-
-	} else {
-		# Begin the new database class
-		$db = &DB();
-
-		# Loop through the field list to create the sql queries
-		$field_list = array();
-		reset($arr);
-		while (list($key,$field_name) = each($arr)) {
-			# Get the field value
-			$field_var = sprintf('%s_%s',$construct->module,$field_name);
-
-			if (isset($VAR[$field_var]) && $VAR[$field_var] != 'IGNORE-ARRAY-VALUE') {
-				# Check if HTML allowed
-				if (@$construct->field[$field_name]['html'] != 1 && ! is_array($VAR[$field_var]))
-					$insert_value = htmlspecialchars($VAR[$field_var]);
-				else
-					$insert_value = $VAR[$field_var];
-
-				# Perform data conversions
-				if (isset($construct->field[$field_name]['convert']) && trim($construct->field[$field_name]['convert']) && ! isset($VAR['_noconvert']))
-					$insert_value = $validate->convert($field_name,$insert_value,$construct->field[$field_name]['convert']);
-
-				$field_list[$field_name] = $insert_value;
-
-			} elseif (@$construct->field[$field_name]['convert'] == 'array' && @$VAR[$field_var] != 'IGNORE-ARRAY-VALUE')
-				# Handle blank array string
-				$field_list[$field_name] = serialize(array());
-		}
-
-		# Execute the query
-		$result = $db->Execute(sqlUpdate($db,$construct->table,$field_list,array('id'=>$id)));
-
-		# Error reporting
-		if ($result === false) {
-			global $C_debug;
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-
-			if (isset($construct->trigger[$type])) {
-				include_once(PATH_CORE.'trigger.inc.php');
-				$trigger = new CORE_trigger;
-
-				$trigger->trigger($construct->trigger[$type],0,$VAR);
-			}
-
-			return false;
-
-		}
-		# Define any triggers
-		if (isset($construct->trigger[$type])) {
-			include_once(PATH_CORE.'trigger.inc.php');
-			$trigger = new CORE_trigger;
-
-			$trigger->trigger($construct->trigger[$type],1,$VAR);
-		}
-
-		return true;
-	}
-}
-?>
diff --git a/modules/core/database_view.inc.php b/modules/core/database_view.inc.php
deleted file mode 100644
index 55810c6e..00000000
--- a/modules/core/database_view.inc.php
+++ /dev/null
@@ -1,111 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Database VIEW Method
- *
- * This function should only return 1 record.
- *
- * @uses CORE_trigger
- * @uses CORE_static_var
- */
-
-function CORE_database_view($VAR,$construct,$type) {
-	require_once(PATH_CORE.'static_var.inc.php');
-
-	# Some Validaiton
-	if (! isset($VAR['id']))
-		return;
-
-	# If we have more than 1 entry, then return. Javascript should bring us back with 1 entry to view.
-	if (count(explode(',',preg_replace('/,$/','',$VAR['id']))) > 1)
-		return;
-
-	# Set our db.
-	$db = &DB();
-
-	$result = $db->Execute(sqlSelect($db,$construct->table,implode(',',$construct->method[$type]),array('id'=>$VAR['id']),$construct->order_by));
-
-	# Error reporting
-	if ($result === false) {
-		global $C_debug;
-
-		$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-
-		if (isset($construct->trigger[$type])) {
-			include_once(PATH_CORE.'trigger.inc.php');
-			$trigger = new CORE_trigger;
-
-			$trigger->trigger($construct->trigger[$type],0,$VAR);
-		}
-
-		return;
-
-	# No results:
-	} elseif (! $result->RecordCount()) {
-		global $C_debug;
-		$C_debug->error(__FILE__,__METHOD__,'The selected record does not exist any longer, or your account is not authorized to view it');
-
-		return;
-	}
-
-	# Get the static vars
-	$static_var = new CORE_static_var;
-	$arr = $static_var->update_form($construct->module,'update',$result->fields['id']);
-	if (is_array($arr))
-		$smart['static_var'] = $arr;
-
-	# Run any custom validation on this result for this module
-	if (isset($construct->custom_EXP)) {
-		for ($ei=0; $eicustom_EXP); $ei++) {
-			$field = $construct->custom_EXP[$ei]['field'];
-			$value = $construct->custom_EXP[$ei]['value'];
-
-			if ($result->fields[$field] == $value) {
-				$smart = $result->fields;
-
-				$result->MoveNext();
-				$ei = count($construct->custom_EXP);
-			}
-		}
-
-	} else {
-		$smart = $result->fields;
-	}
-
-	# Define the results
-	global $smarty;
-	$smarty->assign('record',$smart);
-
-	if (isset($construct->trigger[$type])) {
-		include_once(PATH_CORE.'trigger.inc.php');
-		$trigger = new CORE_trigger;
-
-		$trigger->trigger($construct->trigger[$type],1,$VAR);
-	}
-
-	# Return the retrieved records
-	return $smart;
-}
-?>
diff --git a/modules/core/easyadmin.inc.php b/modules/core/easyadmin.inc.php
deleted file mode 100644
index fc08000e..00000000
--- a/modules/core/easyadmin.inc.php
+++ /dev/null
@@ -1,345 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-/* 
- * easyAdmin Remote Class 
- */
-class EASYADMIN
-{ 
-	var $host;  	 
-	var $user;
-	var $pass;
-	var $debug;
-	var $reseller;
-	var $cookiepath; 
-
-	/*
-	* Check for Agilebill
-	*/
-	function EASYADMIN()
-	{
-		if(!defined("PATH_FILES"))
-		{
-			echo "Dependancy Failure!";
-			exit;
-		} 	
-
-	}
-
-	/*
-	* Login the user
-	*/		
-	function login()
-	{ 		 
-		# clear the cookies
-		if(is_file($this->cookiepath))
-			unlink($this->cookiepath);			
-
-		$post = "";
-		$ret = $this->connect($post);	
-		if($this->debug) echo "

$this->host?$post
";				
-
-		$post = "name=$this->user&pass=$this->pass&submit.x=0&submit.y=0";
-		$ret = $this->connect($post);	
-		if($this->debug) echo "

$this->host?$post
";
-		if(empty($ret) || eregi('Username or password incorrect', $ret) || eregi('You have cookies disabled', $ret))
-			return false;
-		else
-			return true;
-	}
-
-
-	/*
-	* Get the unique domain id
-	*/		
-	function sitenum()
-	{
-		$post = "function=viewsites&sortkey=domain&filtertype=2&hostdomain=$this->domain&filtersubmit=Display";
-		$ret = $this->connect($post);	
-		if($this->debug) echo "

$this->host?$post
";
-		if(!empty($ret)) 
-		{ 
-			# Get the Package ID Just added			
-			$domain = strtolower($this->domain);
-			preg_match ("/(function=edit&sitenum=)+([0-9]){1,}+(\">www.)+($domain)/i", $ret, $arr); 			 
-			if(is_array($arr) && count($arr) > 0) 
-			{ 
-				$sitenum = ereg_replace("function=edit&sitenum=","", $arr[0]); 					
-				$sitenum = ereg_replace("\">www.$domain","", $sitenum); 
-				$this->sitenumber = $sitenum;
-				return $sitenum;
-			}				
-		}
-		return false;		
-	}
-
-
-	/*
-	* Add a website
-	*/ 
-	function add()
-	{   
-		# login:
-		if(!$this->login())	 return false;
-
-		# add  
-		$post = "function=confirmsite". 
-				"&hostname=www"	.
-				"&webaliases="	.
-				"&emailaliases=".
-				"&directives="	.
-				"&extrainfo="	.
-				"&ipx="			. $this->ip			.
-				"&reseller="	. $this->reseller	. 
-				"&domain="		. strtolower($this->domain)	.
-				"¬ify="		. $this->email		.
-				"&wpasswd="		. $this->passwd		.
-				"&vwpasswd="	. $this->passwd		.
-				"&users="		. $this->prod['users'] 		.
-				""a="		. $this->prod['quota'] 		.
-				"&enfp="		. $this->prod['enfp'] 		.
-				"&enphp="		. $this->prod['enphp'] 		.
-				"&enshell="		. $this->prod['enshell'] 	.
-				"&enssi="		. $this->prod['enssi'] 		. 
-				"&encgi="		. $this->prod['encgi'] 		.
-				"&ensuexec="	. $this->prod['ensuexec'] 	.
-				"&enthrottle="	. $this->prod['enthrottle'] 	.
-				"&enraw="		. $this->prod['enraw'] 		.
-				"&enmiva="		. $this->prod['enmiva'] 		.
-				"&enssl="		. $this->prod['enssl'] 		.
-				"&enfilter="	. $this->prod['enfilter']; 
-		$ret = $this->connect($post,4);	
-		if($this->debug) echo "

$this->host?$post
";
-
-		# set bandwith
-		if($this->prod['enthrottle'] == "1") 
-			$this->throttle(false); 
-
-		# add user
-		$this->add_user();						
-
-		return true;	 
-   }
-
-   /*
-   * Add the main user
-   */ 
-   function add_user()
-   {	
-		# get unique sitenum
-		if(empty($this->sitenumber))
-		{
-			$sitenum = $this->sitenum();
-			if(!$sitenum) return false;	   
-		} else {
-			$sitenum = $this->sitenumber;
-		}
-
-		# throttle  
-		$post = "function=goadduser".
-				"&subweb="			.
-				"&sitenum=$sitenum"	. 
-				"&remoteaccess=FTP"	.
-				"&useradmin=1"		.
-				"&fileadmin=1"		.
-				""a="			. $this->prod['quota'] 		.
-				"&fullname="		. $this->username 	.
-				"&username="		. $this->username 	.
-				"&passwd="			. $this->passwd 	.
-				"&vpasswd="			. $this->passwd; 					 												
-		$ret = $this->connect($post,3);	
-		if($this->debug) echo "

$this->host?$post
";
-		return true;						
-   }
-
-
-   /*
-   * Edit the bandwith
-   */ 
-   function throttle($sitenum)
-   {	
-		# get unique sitenum
-		if(!$sitenum)
-		{
-			$sitenum = $this->sitenum();
-			if(!$sitenum) return false;	   
-		}
-
-		# throttle  
-		$post = "function=editthrottle". 
-				"&sitenum=$sitenum"	. 
-				"&limit="			. $this->prod['limit'] 		.
-				"&bwunit="			. $this->prod['bwunit'] 	.
-				"&duration="		. $this->prod['duration'] 		.
-				"&durationunit="	. $this->prod['durationunit']; 					 												
-		$ret = $this->connect($post,2);	
-		if($this->debug) echo "

$this->host?$post
";
-		return true;						
-   }
-
-
-   /*
-   * Edit the account
-   */ 
-   function edit()
-   {
-		# login:
-		if(!$this->login())	 return false;	   
-
-		# get unique sitenum
-		$sitenum = $this->sitenum();
-		if(!$sitenum) return false;
-
-		# edit  
-		$post = "function=updatesite&sitenum=$sitenum". 
-				"&hostname=www"	. 
-				"&ipx="			. $this->ip			.
-				"&reseller="	. $this->reseller	. 
-				"&domain="		. strtolower($this->domain)	.
-				"¬ify="		. $this->email		.
-				"&wpasswd="		. $this->passwd		.
-				"&vwpasswd="	. $this->passwd		.
-				"&users="		. $this->prod['users'] 		.
-				""a="		. $this->prod['quota'] 		.
-				"&enfp="		. $this->prod['enfp'] 		.
-				"&enphp="		. $this->prod['enphp'] 		.
-				"&enshell="		. $this->prod['enshell'] 	.
-				"&enssi="		. $this->prod['enssi'] 		. 
-				"&encgi="		. $this->prod['encgi'] 		.
-				"&ensuexec="	. $this->prod['ensuexec'] 	.
-				"&enthrottle="	. $this->prod['enthrottle'] 	.
-				"&enraw="		. $this->prod['enraw'] 		.
-				"&enmiva="		. $this->prod['enmiva'] 		.
-				"&enssl="		. $this->prod['enssl'] 		.
-				"&enfilter="	. $this->prod['enfilter']; 
-		$ret = $this->connect($post,2);	
-		if($this->debug) echo "

$this->host?$post
"; 
-
-		# set bandwith 
-		if($this->prod['enthrottle'] == "1") 
-			$this->throttle($sitenum);
-
-		# add user
-		$this->add_user();
-
-		return true; 					
-   }
-
-
-   /*
-   * Suspend account
-   */ 
-   function suspend($dologin=true)
-   {
-		# login:
-		if($dologin)
-			if(!$this->login())	
-				return false;	   
-
-		# get unique sitenum
-		$sitenum = $this->sitenum();
-		if(!$sitenum) return false;
-
-		# suspend
-		$post = "function=suspendsite&sitenum=$sitenum&action=suspend&confirm=1";
-		$ret = $this->connect($post,2);	
-		if($this->debug) echo "

$this->host?$post
"; 
-
-		return true; 
-   }
-
-
-   /*
-   * Unsuspend account  
-   */ 
-   function unsuspend($dologin=true)
-   {
-		# login:
-		if($dologin)
-			if(!$this->login())	
-				return false;	   
-
-		# get unique sitenum
-		$sitenum = $this->sitenum();
-		if(!$sitenum) return false;
-
-		# unsuspend
-		$post = "function=suspendsite&sitenum=$sitenum&action=activate";
-		$ret = $this->connect($post,2);	
-		if($this->debug) echo "

$this->host?$post
"; 
-
-		return true;    
-   }
-
-
-   /*
-   * Delete account 
-   */ 
-   function del()
-   {	   
-		# login:
-		if(!$this->login())	 return false;	   
-
-		# get unique sitenum
-		$sitenum = $this->sitenum();
-		if(!$sitenum) return false;
-
-		# delete
-		$post = "function=delete&sitenum=$sitenum&value=Yes, delete this site";
-		$ret = $this->connect($post,2);	
-		if($this->debug) echo "

$this->host?$post
";
-
-		return true;   
-   }	     
-
-
-   /*
-   * Curl connect 
-   */  	   
-   function connect($post, $timeout=false)
-   {    
-		$ch = curl_init(); 			
-		if($timeout != false)			
-		curl_setopt($ch, CURLOPT_TIMEOUT, 			$timeout); 
-		curl_setopt($ch, CURLOPT_COOKIEJAR, 		$this->cookiepath);
-		curl_setopt($ch, CURLOPT_COOKIEFILE, 		$this->cookiepath);	 
-		curl_setopt($ch, CURLOPT_URL, 				$this->host );  
-		if(!empty($post))
-		{
-			curl_setopt($ch, CURLOPT_POST, 			1); 
-			curl_setopt($ch, CURLOPT_POSTFIELDS, 	$post);  
-		}
-		else
-		{
-			curl_setopt($ch, CURLOPT_HTTPGET, 		true);  
-		}
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 	1);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 	0);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 	0); 
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 	1); 
-		curl_setopt($ch, CURLOPT_HEADER, 			1);
-
-		$data = curl_exec ($ch); 
-		curl_close ($ch);  
-
-		return $data; 
-   }    	      
-}
-?>
\ No newline at end of file
diff --git a/modules/core/email.inc.php b/modules/core/email.inc.php
deleted file mode 100644
index 780280af..00000000
--- a/modules/core/email.inc.php
+++ /dev/null
@@ -1,217 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Mail Class
- *
- * This class handles the interface to SMTP and Mail() functions.
- *
- * 
- * $arr = array(
- *  'from_html'     =>  'true/false'  (so we know whether to stripslashes or not)
- *  'html'          =>  '0/1',
- *  'from_name'     =>  '',
- *  'from_email'    =>  '',
- *  'priority'      =>  '0/1',
- *  'to_email'      =>  'email@email.com',
- *  'to_name'       =>  '',
- *  'bcc_list'      =>  array('email@email.com'),
- *  'cc_list'       =>  array('email@email.com'),
- *  'subject'       =>  '',
- *  'body_text'     =>  '',
- *  'body_html'     =>  '',
- *  'attachments'   =>  array(array('file' => 'file.exe',
- *                                  'data' => 'file data here...'))
- *  'server'        =>  'mail.domain.com',
- *  'account'       =>  '',
- *  'password'      =>  '');
- * 
- *
- * @package AgileBill
- * @subpackage Core
- */
-class CORE_email {
-	var $debug=false;
-
-	public function PHP_Mail($arr) {
-		# SET THE SMTP SETTINGS
-		#ini_set('sendmail_from',@$arr['from_email']);
-		#ini_set('SMTP',@$arr['server']);
-
-		# CC LIST
-		$cc = '';
-		if (isset($arr['cc_list']) && is_array($arr['cc_list']))
-			$cc = implode(',',$arr['cc_list']);
-
-		# BCC LIST
-		$bcc = '';
-		if (isset($arr['bcc_list']) && is_array($arr['bcc_list']))
-			$bcc = implode(',',$arr['bcc_list']);
-
-		$headers = '';
-		# FROM:
-		$headers .= sprintf('From: "%s" <%s>',$arr['from_name'],$arr['from_email'])."\r\n";
-		$headers .= sprintf('Reply-To: "%s" <%s>',$arr['from_name'],$arr['from_email'])."\r\n";
-
-		# HTML/non-HTML version of body & headers
-		$headers .= "MIME-Version: 1.0\r\n";
-		if (isset($arr['html']) && $arr['html'] == '1' && isset($arr['body_html'])) {
-			# Specify MIME version 1.0
-			$headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
-			$body = $arr['body_html'];
-
-		} else {
-			# Specify MIME version 1.0
-			$headers .= "Content-type: text/plain; charset=iso-8859-1\r\n";
-			$body = $arr['body_text'];
-		}
-
-		# CC:
-		if (trim($cc))
-			$headers .= sprintf('Cc: %s',$cc)."\r\n";
-
-		# BCC:
-		if (trim($bcc))
-			$headers .= sprintf('Bcc: %s',$bcc)."\r\n";
-
-		### PRIORITY
-		if(isset($arr['priority']) && $arr['priority'] == '1')
-			$headers .= "X-Priority: 1\r\n";
-		else
-			$headers .= "X-Priority: 3\r\n";
-
-		# Strip Slashes
-		if (! isset($arr['from_html']) || @$arr['html_form'] == false) {
-			# From database, we must strip slashes
-			$arr['subject'] = stripslashes($arr['subject']);
-			$body = stripslashes($body);
-
-		} elseif (@$arr['from_html'] == true && get_magic_quotes_gpc()) {
-			# Straight from html, we must strip slashes
-			$arr['subject'] = stripslashes($arr['subject']);
-			$body = stripslashes($body);
-		}
-
-		if ($this->debug) {
-			if (mail($arr['to_email'],$arr['subject'],$body,$headers)) {
-				global $C_debug;
-				$C_debug->alert(__FILE__,__METHOD__,sprintf('PHP mail() failed to send message "%s" to "%s"',$arr['subject'],$arr['to_email']));
-
-				return false;
-			}
-
-		} else {
-			if (@mail($arr['to_email'],$arr['subject'],$body,$headers)) {
-				global $C_debug;
-				$C_debug->alert(__FILE__,__METHOD__,sprintf('PHP mail() failed to send message "%s" to "%s"',$arr['subject'],$arr['to_email']));
-
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public function SMTP_Mail($arr) {
-		# Include the phpmailer class
-		require_once(PATH_INCLUDES.'phpmailer/class.phpmailer.php');
-		$mail = new PHPMailer();
-
-		$mail->IsSMTP();
-		$mail->SMTPAuth = true;
-		$mail->Host = @$arr['server'];
-		$mail->Username = @$arr['account'];
-		$mail->Password = @$arr['password'];
-		$mail->From = $arr['from_email'];
-		$mail->FromName = $arr['from_name'];
-		$mail->AddAddress($arr['to_email'],@$arr['to_name']);
-		#$mail->AddReplyTo($arr['from_name'], $arr['from_email']);
-
-		# CC LIST
-		if (isset($arr['cc_list']) && is_array($arr['cc_list']))
-			foreach ($arr['cc_list'] as $email)
-				$mail->AddCC($email,'');
-
-		# BCC LIST
-		if (isset($arr['bcc_list']) && is_array($arr['bcc_list']))
-			foreach ($arr['bcc_list'] as $email)
-				$mail->AddBCC($email,'');
-
-		# Strip Slashes
-		if (! isset($arr['from_html']) || @$arr['html_form'] == false) {
-			# From database, we must strip slashes
-			$arr['subject'] = stripslashes($arr['subject']);
-			@$arr['body_html'] = stripslashes($arr['body_html']);
-			@$arr['body_text'] = stripslashes($arr['body_text']);
-
-		} elseif (@$arr['from_html'] == true && get_magic_quotes_gpc()) {
-			# Straight from html, we must strip slashes
-			$arr['subject'] = stripslashes($arr['subject']);
-			@$arr['body_html'] = stripslashes($arr['body_html']);
-			@$arr['body_text'] = stripslashes($arr['body_text']);
-		}
-
-		# HTML/non-HTML version of body & headers
-		if (isset($arr['html']) && $arr['html'] == '1' && isset($arr['body_html'])) {
-			$mail->IsHTML(true);
-			$mail->Body = @$arr['body_html'];
-			$mail->AltBody = @$arr['body_text'];
-
-		} else {
-			$mail->IsHTML(false);
-			$mail->Body = @$arr['body_text'];
-			$mail->WordWrap = 50;
-		}
-
-		# Subject
-		$mail->Subject = $arr['subject'];
-
-		# PRIORITY
-		if(isset($arr['priority']) && $arr['priority'] == '1')
-			$mail->Priority = 1;
-		else
-			$mail->Priority = 3;
-
-		/* Attachments
-		$mail->AddAttachment("/var/tmp/file.tar.gz");
-		$mail->AddAttachment("/tmp/image.jpg", "new.jpg");
-		*/
-
-		if (! $mail->Send()) {
-			global $C_debug;
-			$C_debug->error(__FILE__,__METHOD__,sprintf('SMTP mail() failed to send message "%s" to "%s" on server "%s" (%s)',
-				$arr['subject'],$arr['to_email'],$arr['server'],$mail->ErrorInfo));
-
-			if ($this->debug) {
-				echo 'Message was not sent 
';
-				printf('Mailer Error: %s',$mail->ErrorInfo);
-			}
-
-			return false;
-		}
-
-		return true;
-	}
-}
-?>
diff --git a/modules/core/email_piping.inc.php b/modules/core/email_piping.inc.php
deleted file mode 100644
index b4ce6b99..00000000
--- a/modules/core/email_piping.inc.php
+++ /dev/null
@@ -1,269 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	 
-class email_piping
-{
-	var $results;
-	var $delete_action=true;
-	var $move_mbox='Trash';
-	var $get_attachments=true; 
-	var $max_attachment=2048; // max filesize of attachment in KB
-		
-	/**
-	 * Start the email retrieval
-	 *
-	 * @param int $id email_setup.id 
-	 */
-	function email_piping($id)
-	{
-		global $C_debug;
-		
-		# check for imap support:
-		if(!is_callable('imap_open')) { 
-			$C_debug->error('core::email_piping','email_piping()', 'imap_open() - not supported');
-			return;
-		}
-  
-        $db = &DB();
-        $sql    = 'SELECT * FROM ' . AGILE_DB_PREFIX . 'setup_email WHERE site_id = ' . $db->qstr(DEFAULT_SITE) . ' AND id = ' . $db->qstr($id);
-        $result = $db->Execute($sql); 
-        if($result && $result->RecordCount()) {
-        
-	        $this->cfg = $result->fields;  
-	        $this->delete_action = $this->cfg['piping_action'];
-	        $type = $this->cfg['piping']; // imap/pop
-	        
-	        // get imap_open connection string
-	       	$constr = $this->get_connection_string($type, $this->cfg['piping_host']);
-	        
-	        // attempt connection
-			error_reporting(0); 
-			@$mbox = imap_open($constr, $this->cfg['piping_username'], $this->cfg['piping_password']); 		
-			
-			// attempt alternate conneciton
-			if(!$mbox) { 
-				$constr = $this->get_connection_string($type+2, $this->cfg['piping_host']); 
-				@$mbox = imap_open($constr, $this->cfg['piping_username'], $this->cfg['piping_password']);	
-			}
-			
-			// error log
-			if(!$mbox) {			
-		   		$C_debug->error('core::email_piping','email_piping()', imap_last_error() .' -- '. $constr ); 
-		   	 	return false;
-			} 			
-
-			// check for messages
-			if (@$hdr = imap_check($mbox)) { 
-				$msgCount = $hdr->Nmsgs;
-				if($msgCount==0) return false;
-			} else {
-			   	return false; // no messages
-			}
-			 
-			// get folder overview
-			@$overview=imap_fetch_overview($mbox,"1:$msgCount",0);
-			$size=sizeof($overview);
-			  
-			// loop through messages
-			for($i=$size-1;$i>=0;$i--)
-			{ 
-				$val=$overview[$i];
-				$msg=$val->msgno;
-				$this->attachments[$msg]=false;
-				
-				// formatting for from e-mail address
-			   	$from=$val->from;
-			   	$sender=$from=$val->from;
-			   	$from=ereg_replace("\"","",$from);
-			   	if(ereg("<",$from)) {
-			   		$f=explode("<", $from);
-			   		$sender=$f[0];
-			   		$from=$f[1];
-			   		$from=str_replace(">","",$from);
-			   	}
-				  
-	           	// retrieve body
-				$body = $this->get_part($mbox, $msg, "TEXT/PLAIN");
-				if(empty($body)) {
-					$body = $this->get_part($mbox, $msg, "TEXT/HTML");
-					if(!empty($body)) $body=str_replace("
", "\r\n", $body);
-				}
-				  
-				// get attachements
-				if($this->get_attachments) {				
-				   	$struct=imap_fetchstructure($mbox,$msg);
-				   	$contentParts = count($struct->parts);				   
-				  	if ($contentParts >= 2) {				  		
-				  		
-						for ($ii=2; $ii<=$contentParts; $ii++) {
-							$c=($ii-2);
-				   			$att[$c] = imap_bodystruct($mbox,$msg,$ii); 
-				   		}
-				   		
-				   		// download tmp file and add to attachemnt array
-				   		for ($k=0;$kdownload_file($mbox, $msg, $k, $att[$k]->parameters[0]->value);
-				   		} 
-				   	}   
-				}
- 			
-				// Set the result array:
-			    $this->results[] = Array('uniqueId' => $val->message_id,
-			    						 'date'		=> $val->date,
-			    						 'from'		=> trim($from),
-			    						 'to'		=> $val->to,
-			    						 'sender'   => trim($sender),
-			    						 'subject'	=> trim($val->subject),
-			    						 'body'		=> trim($body),
-			    						 'attach'	=> $this->attachments[$msg]);
- 			    						 			      
-				// mark for deletion or move 				 
-				if($this->cfg['piping_action'] == 1) {
-					if($this->delete_action) 
-						imap_delete($mbox, $msg);
-					else if(($type==2 || $type==4 ) && !empty($this->move_mbox))
-						imap_mail_move($mbox, $msg, $this->move_mbox); 	 
-				}   			
-			}  
-			imap_close($mbox, CL_EXPUNGE);			 
-        } 
-	}
-	
-	/**
-	 * Get an attached file 
-	 */
-   	function download_file(&$mbox, $msg, $file, $filename) { 
-   		$filetype = strrev(substr(strrev($filename),0,3));
-   		$filecontent = imap_fetchbody($mbox,$msg,$file+2);
-   		if(empty($filecontent)) return false;  
-   		$tmp = PATH_FILES.'/'. md5('piping'.$filename.microtime());
-   		file_put_contents($tmp,$filecontent);    
-   		$this->attachments[$msg][] = Array('tmp'=>$tmp, 'file'=>$filename, 'type'=> $filetype);
-    }	
-	
-	/**
-	 * Get MIME Type 
-	 */
-	function get_mime_type(&$structure) {
-		$primary_mime_type = array("TEXT", "MULTIPART","MESSAGE", "APPLICATION", "AUDIO","IMAGE", "VIDEO", "OTHER");
-	   	if($structure->subtype) {
-	   		return $primary_mime_type[(int) $structure->type] . '/' .$structure->subtype;
-	   	}
-	   	return "TEXT/PLAIN";
-   	}
-   
-   	/**
-   	 * Get Message Part 
-   	 */
-   	function get_part($stream, $msg_number, $mime_type, $structure=false, $part_number=false) {   
-		if(!$structure) {
-	   		$structure = imap_fetchstructure($stream, $msg_number);
-	   	}
-	   	if($structure) {
-	   		if($mime_type == $this->get_mime_type($structure)) {
-	   			if(!$part_number) {
-	   				$part_number = "1";
-	   			}
-	   			$text = imap_fetchbody($stream, $msg_number, $part_number);
-	   			if($structure->encoding == 3) {
-	   				return imap_base64($text);
-	   			} else if($structure->encoding == 4) {
-	   				return imap_qprint($text);
-	   			} else {
-	   				return $text;
-	   			}
-	   		}
-	   		// multipart 
-			if($structure->type == 1)  {
-	   			while(list($index, $sub_structure) = each($structure->parts)) {
-		   			if($part_number) {
-		   				$prefix = $part_number . '.';
-		   			}
-		   			$data = $this->get_part($stream, $msg_number, $mime_type, $sub_structure, @$prefix.($index + 1));
-		   			if($data) {
-	   					return $data;
-	   				}
-	   			} 
-	   		} 
-		} 
-	   	return false;
-   	}  	
-	 
-	
-	/**
-	 * Get a connection string to use
-	 *
-	 * @param string $type 1=pop3, 2=imap, 3=pop3 alternate, 4=imap alternate
-	 * @param string $host HOSTNAME OR HOSTNAME:PORT|MBOX
-	 * @return string Connection string for imap_open()
-	 */
-	function get_connection_string($type,$host,$port=false,$mbox=false) {
-		 
-		# Determine the path, host, & mbox name:
-		if(ereg(":", $host)) {
-			$arr = explode(":", $host);
-			
-			# host
-			@$host = $arr[0];
-						  
-			# port
-			if(!$port && is_numeric($arr[1])) @$port = $arr[1];
-			  
-			# mbox
-			elseif(preg_match('[|]', $arr[1])) {
-				$arr2 = explode('|', $arr[1]);
-				if(!$port && is_numeric($arr2[0]) ) @$port = $arr2[0];
-				if(!$mbox) @$mbox = $arr2[1];
-			}    	
-		}
-		
-		# defaults: 
-		if(empty($port) && $type==1 || $type==3) $port = "110";
-		if(empty($port) && $type==2 || $type==4) ;
-		if(empty($mbox)) $mbox = "INBOX";
-
-		// pop3
-		if($type==1) {
-			if(empty($port)) $port = "110";
-			return "{".$host.":".$port."/pop3}".$mbox; 
-		}
-		
-		// pop3 alternate
-		if($type==3) {
-			if(empty($port)) $port = "110";
-			return  "{".$host.":".$port."/pop3/notls/novalidate-cert}".$mbox;
-		}
-						
-		// imap 
-		if($type==2 ) {
-			if(empty($port)) $port = "143";
-			return "{".$host.":".$port."}".$mbox; 		
-		}
-		
-		// imap alternate
-		if($type==4 ) {
-			if(empty($port)) $port = "143";
-			return "{".$host.":".$port."/imap/notls/novalidate-cert}".$mbox; 		
-		}		
- 	
-		return string;
-	} 
-} 
-?>
diff --git a/modules/core/export.inc.php b/modules/core/export.inc.php
deleted file mode 100644
index 1a1c3c09..00000000
--- a/modules/core/export.inc.php
+++ /dev/null
@@ -1,1213 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-
-/**
-* Export Handler Class
-* 
-* This class handles the various export methods for excel, pdf, csv, xml, & txt (tab frormatted).  
-*/
-class CORE_export
-{
-
-
-########################################
-##	EXPORT MULTIPE PDF INVOICES    #####
-########################################
-
-function pdf_invoice($VAR, $construct, $type)
-{
-	global $V_validate, $C_list, $C_translate;
-
-	# loop through the field list to create the sql queries
-	$arr = $construct->method[$type];
-	$field_list = '';
-	$i=0;
-	while (list ($key, $value) = each ($arr))
-	{
-		if($i == 0)
-		{
-			$field_var =  $construct->table . '_' . $value;
-			$field_list .= AGILE_DB_PREFIX . $construct->table . '.' . $value;
-
-			// determine if this record is linked to another table/field
-			if($construct->field[$value]["asso_table"] != "")
-			{
-				$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-			}
-		}
-		else
-		{
-			$field_var =  $construct->table . '_' . $value;
-			$field_list .= "," . AGILE_DB_PREFIX . $construct->table . "." . $value;
-
-			// determine if this record is linked to another table/field
-			if($construct->field[$value]["asso_table"] != "")
-			{
-				$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-			}
-		}
-		$i++;
-	}
-
-	# get the search details:
-	if(isset($VAR['search_id']))
-	{
-		include_once(PATH_CORE   . 'search.inc.php');
-		$search = new CORE_search;
-		$search->get($VAR['search_id']);
-	}
-	else
-	{
-		echo '
 The search terms submitted were invalid!';
-	}
-
-	# get the sort order details:
-	if(isset($VAR['order_by']) && $VAR['order_by'] != "")
-	{
-		$order_by = ' ORDER BY ' . AGILE_DB_PREFIX . $construct->table . '.' .  $VAR['order_by'];
-		$smarty_order =  $VAR['order_by'];
-	}
-	else
-	{
-		$order_by = ' ORDER BY ' . AGILE_DB_PREFIX . $construct->table . '.' .  $construct->order_by;
-		$smarty_order =  $search->order_by;
-	}
-
-	# format saved search string
-	$sql = explode (" WHERE ", $search->sql);
-
-	# generate the full query
-	$db = &DB();
-	$q = eregi_replace("%%fieldList%%", $field_list, $search->sql);
-	$q = eregi_replace("%%tableList%%", AGILE_DB_PREFIX.$construct->table, $q);
-	$q = eregi_replace("%%whereList%%", "", $q);
-	$q .= " ".AGILE_DB_PREFIX . "invoice.site_id = '" . DEFAULT_SITE . "'";
-	$q .= $order_by;
-
-	$invoice = $db->Execute($q);
-
-	# error reporting
-	if ($invoice === false)
-	{
-		global $C_debug;
-		$C_debug->error('core:export.inc.php','pdf_invoice', $db->ErrorMsg() . '

' .$q);
-		echo "An SQL error has occured!";
-		return;
-	}
-
-	include_once(PATH_MODULES.'invoice/invoice.inc.php');
-	$iv=new invoice;
-
-	$iv->pdfExport($invoice);
-
-
-}	
-
-
-
-########################################
-##	ADMIN SEARCH EXCEL EXPORT      #####
-########################################
-
-function search_excel($VAR, $construct, $type)
-{
-	global $C_translate;
-
-	# set the field list for this method:
-	$arr = $construct->method["$type"];
-	$filename = 'Export.xls';
-
-
-	# determine what action to take:
-	# inline display, download, email, web save    	
-
-	if($VAR["type"] == "display")
-	{
-	   header ('Content-type: application/x-msexcel');
-	   header ("Content-Disposition: inline; filename=$filename" );
-	   header ("Content-Description: PHP/INTERBASE Generated Data" );
-	}
-
-	else if($VAR["type"] == "download")
-	{
-		header ("Content-Disposition: attachment; filename=$filename" );
-	}
-
-	else if($VAR["type"] == "email")
-	{
-		echo "Email exports not supported yet!";
-		exit;
-	}
-
-	else if($VAR["type"] == "email")
-	{
-		echo "Saving exports not supported yet!";
-		exit;
-	}           	
-
-	# Start the Excel Stream
-	xlsBOF();
-
-
-		/************** BEGIN STANDARD EXPORT SEARCH CODE *********************/
-
-
-		   # set the field list for this method:
-		 $arr = $construct->method["$type"];
-
-		 # loop through the field list to create the sql queries
-		 $arr = $construct->method[$type];
-		 $field_list = '';
-		 $i=0;
-		 while (list ($key, $value) = each ($arr))
-		 {
-			 if($i == 0)
-			 {
-				 $field_var =  $construct->table . '_' . $value;
-				 $field_list .= AGILE_DB_PREFIX . $construct->table . '.' . $value;
-
-				// determine if this record is linked to another table/field
-				if($construct->field[$value]["asso_table"] != "")
-				{
-					$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-				}
-			 }
-			 else
-			 {
-				 $field_var =  $construct->table . '_' . $value;
-				 $field_list .= "," . AGILE_DB_PREFIX . $construct->table . "." . $value;
-
-				// determine if this record is linked to another table/field
-				if($construct->field[$value]["asso_table"] != "")
-				{
-					$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-				}
-			 }
-			 $i++;
-		 }
-
-		# get the search details:
-		if(isset($VAR['search_id']))
-		{
-			include_once(PATH_CORE   . 'search.inc.php');
-			$search = new CORE_search;
-			$search->get($VAR['search_id']);
-		}
-		else
-		{
-			echo '
 The search terms submitted were invalid!';
-		}
-
-		# get the sort order details:
-		if(isset($VAR['order_by']) && $VAR['order_by'] != "")
-		{
-			$order_by = ' ORDER BY ' .   AGILE_DB_PREFIX . $construct->table . '.' .  $VAR['order_by'];
-			$smarty_order =  $VAR['order_by'];
-		}
-		else
-		{
-			$order_by = ' ORDER BY ' .   AGILE_DB_PREFIX . $construct->table . '.' .  $construct->order_by;
-			$smarty_order =  $search->order_by;
-		}
-
-		# determine the offset & limit
-		if(isset($VAR['page']))
-		{
-			$current_page = $VAR['page'];
-		}
-		else
-		{
-			$current_page = '0';
-		}
-
-		# determine the offset & limit
-		if($current_page==0)
-		{
-			$offset = '0,10000000';
-		}
-		else
-		{
-			$offset =  (($current_page * $search->limit) - $search->limit). ',' . $search->limit;
-		}
-
-		# format saved search string
-		$sql = explode (" WHERE ", $search->sql);
-
-		# generate the full query
-		$q = eregi_replace("%%fieldList%%", $field_list, $search->sql);
-		$q = eregi_replace("%%tableList%%", AGILE_DB_PREFIX.$construct->table, $q);
-		$q = eregi_replace("%%whereList%%", "", $q);
-		$q .= " " . AGILE_DB_PREFIX . $construct->table.".site_id = '" . DEFAULT_SITE . "'";
-		$q .= $order_by;
-		$db = &DB();
-
-		# determine the offset & limit             
-		$result = $db->Execute($q);
-
-		# error reporting
-		if ($result === false)
-		{
-			global $C_debug;
-			$C_debug->error('core:export.inc.php','search_xml', $db->ErrorMsg() . '

' .$q);
-			echo "An SQL error has occured!";
-			return;
-		}
-
-		# put the results into an array
-		$i=0;
-		$class_name = TRUE;
-		$results = '';
-		while (!$result->EOF) {
-			$results[$i] = $result->fields;
-			   $result->MoveNext();
-			   $i++;
-		}
-
-		# get any linked fields
-		if($i > 0)
-		{
-			$this->result = $results;
-			$db_join = new CORE_database;
-			$this->result = $db_join->join_fields($results, $this->linked);
-		}
-		else
-		{
-			$this->result = $results;
-		}
-
-		/************** END STANDARD EXPORT SEARCH CODE *********************/
-
-
-	# WRITE THE FIRST COLUMN
-	reset($arr);
-	$column=0;
-	while (list ($key, $value) = each ($arr))
-	{
-		// get the translated field name
-		$field = $C_translate->translate('field_'.$value, $construct->module,'');
-
-		if(gettype($this->result["$ii"]["$key"]) != "string" )
-		{
-			xlsWriteLabel($row,$column,$field);
-		}
-		$column++;
-	}
-
-
-	# LOOP THROUGH THE RESULTS & DISPLAY AS EXCEL
-	$row = 1;
-	for($ii = 0; $ii < count($this->result); $ii++)
-	{
-		# get the data for each cell:
-		reset($arr);
-		$column=0;
-		while (list ($key, $value) = each ($arr))
-		{
-			if  ($construct->field["$value"][convert] == 'date'      ||
-				 $construct->field["$value"][convert] == 'time'      ||
-				 $construct->field["$value"][convert] == 'date-now'  ||
-				 $construct->field["$value"][convert] == 'date-time' )
-			{
-				 $data = date(UNIX_DATE_FORMAT,$this->result["$ii"]["$value"]);
-			} else {
-				 $data = $this->result["$ii"]["$value"];
-			}
-
-			if(is_numeric ($data))
-				xlsWriteNumber($row,$column,$data);
-			else
-				xlsWriteLabel($row,$column,$data);
-
-			$column++;
-		}
-		$row++;
-	}
-
-
-	# Dispay the output
-	xlsEOF();
-	exit();
-}	
-
-
-
-
-
-
-
-
-
-
-
-
-	###################################
-	##	ADMIN SEARCH PDF EXPORT   #####
-	###################################
-
-	function search_pdf($VAR, $construct, $type)
-	{
-		# include fpdf class:
-		include_once(PATH_CORE . 'fpdf.inc.php');
-
-		# set the field list for this method:
-		$arr = $construct->method["$type"];
-
-		# loop through the field list to create the sql queries
-		$field_list = '';
-		$heading_list = '';
-		$width_list = '';
-		$i=0;
-		while (list ($key, $value) = each ($arr))
-		{
-			if($i == 0)
-			{
-				$field_var =  $construct->table . '_' . $value;
-				$field_list .= $value;
-				$heading_list .= strtoupper($value);		 // <- translate
-				$width_list .= $construct->field[$value]['pdf_width'];
-			}
-			else
-			{
-				$field_var =  $construct->table . '_' . $value;
-				$field_list .= "," . $value;
-				$heading_list .= "," . strtoupper($value);		// <- translate
-				$width_list .= "," . $construct->field[$value]['pdf_width'];
-			}
-			$i++;
-		}
-
-		# start the new PDF class...
-		$pdf = new PDF_MC_Table();
-		$pdf->Open();
-		$pdf->AddPage();
-
-		# Determine the number of columns and width for each one...	
-		$SetWidths = explode(",",$width_list);
-		$pdf->SetWidths($SetWidths);	
-
-		# Define the table heading	
-		$TableHeading =  explode(",",$heading_list);			
-
-		# Define the Properties for the table heading cells:			
-		# set the font:
-		$pdf->HeadFontFamily 	= "Arial";
-		$pdf->HeadFontStyle  	= "BI";
-		$pdf->HeadFontSize		= 8;
-
-		# set the font color:
-		$pdf->HeadTextColor1	= 255;
-		$pdf->HeadTextColor2	= 255;
-		$pdf->HeadTextColor3	= 255;
-
-		# set the bg color:
-		$pdf->HeadFillColor1	= 90;
-		$pdf->HeadFillColor2	= 90;
-		$pdf->HeadFillColor3	= 90;
-
-		# set the hieght
-		$pdf->HeadHeight		= 6;
-
-		# Print the Heading:
-		$pdf->HeadRow($TableHeading);
-
-		# Define the row settings for the rest of the cells...	
-		# define the font settings
-		$pdf->SetFontFamily 	= "Arial";
-		$pdf->SetFontStyle  	= "";
-		$pdf->SetFontSize		= "7";
-
-		# set the hieght
-		$pdf->RowHeight		= 4;			
-
-
-
-
-		/************** BEGIN STANDARD EXPORT SEARCH CODE *********************/
-
-
-		 # set the field list for this method:
-		 $arr = $construct->method["$type"];
-
-		 # loop through the field list to create the sql queries
-		 $arr = $construct->method[$type];
-		 $field_list = '';
-		 $i=0;
-		 while (list ($key, $value) = each ($arr))
-		 {
-			 if($i == 0)
-			 {
-				 $field_var =  $construct->table . '_' . $value;
-				 $field_list .= AGILE_DB_PREFIX . $construct->table . '.' . $value;
-
-				// determine if this record is linked to another table/field
-				if($construct->field[$value]["asso_table"] != "")
-				{
-					$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-				}
-			 }
-			 else
-			 {
-				 $field_var =  $construct->table . '_' . $value;
-				 $field_list .= "," . AGILE_DB_PREFIX . $construct->table . "." . $value;
-
-				// determine if this record is linked to another table/field
-				if($construct->field[$value]["asso_table"] != "")
-				{
-					$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-				}
-			 }
-			 $i++;
-		 }
-
-		# get the search details:
-		if(isset($VAR['search_id']))
-		{
-			include_once(PATH_CORE   . 'search.inc.php');
-			$search = new CORE_search;
-			$search->get($VAR['search_id']);
-		}
-		else
-		{
-			echo '
 The search terms submitted were invalid!';
-		}
-
-		# get the sort order details:
-		if(isset($VAR['order_by']) && $VAR['order_by'] != "")
-		{
-			$order_by = ' ORDER BY ' . AGILE_DB_PREFIX . $construct->table . '.' .  $VAR['order_by'];
-			$smarty_order =  $VAR['order_by'];
-		}
-		else
-		{
-			$order_by = ' ORDER BY ' . AGILE_DB_PREFIX . $construct->table . '.' .  $construct->order_by;
-			$smarty_order =  $search->order_by;
-		}
-
-		# format saved search string
-		$sql = explode (" WHERE ", $search->sql);
-
-		# generate the full query
-		$q = eregi_replace("%%fieldList%%", $field_list, $search->sql);
-		$q = eregi_replace("%%tableList%%", AGILE_DB_PREFIX.$construct->table, $q);
-		$q = eregi_replace("%%whereList%%", "", $q);
-		$q .= " ".AGILE_DB_PREFIX . $construct->table.".site_id = '" . DEFAULT_SITE . "'";
-		$q .= $order_by;
-		$db = &DB();
-
-		$result = $db->Execute($q);
-
-		# error reporting
-		if ($result === false)
-		{
-			global $C_debug;
-			$C_debug->error('core:export.inc.php','search_xml', $db->ErrorMsg() . '

' .$q);
-			echo "An SQL error has occured!";
-			return;
-		}
-
-		# put the results into an array
-		$i=0;
-		$class_name = TRUE;
-		$results = '';
-		while (!$result->EOF) {
-			$results[$i] = $result->fields;
-			   $result->MoveNext();
-			   $i++;
-		}
-
-		# get any linked fields
-		if($i > 0)
-		{
-			$this->result = $results;
-			$db_join = new CORE_database;
-			$this->result = $db_join->join_fields($results, $this->linked);
-		}
-		else
-		{
-			$this->result = $results;
-		}
-
-		/************** END STANDARD EXPORT SEARCH CODE *********************/
-
-
-
-
-
-		# LOOP THROUGH THE RESULTS & DISPLAY AS PDF
-		$results = $result->RecordCount();
-		$BackAlt = TRUE;
-		while (!$result->EOF)
-		{
-			# get the data for each cell:
-			reset($arr);
-			$CurrRow='';
-			$i=0;
-			while (list ($key, $value) = each ($arr))
-			{
-				if($i == 0)
-				{
-					$CurrRow .= $result->fields["$key"];
-				}
-				else
-				{
-					$CurrRow .= "::" . $result->fields["$key"];
-				}
-				$i++;
-			}		
-			$ThisRow =  explode("::",$CurrRow);			
-
-			# set the colors & fonts
-			if($BackAlt)
-			{
-				# alternating row 1:
-				$pdf->SetTextColorVar1	= "50";
-				$pdf->SetTextColorVar2	= "50";
-				$pdf->SetTextColorVar3	= "50";			
-				$pdf->SetFillColorVar1	= 255;
-				$pdf->SetFillColorVar2	= 255;
-				$pdf->SetFillColorVar3	= 255;						
-				$BackAlt = FALSE;									
-			}
-			else
-			{
-				# alternating row 2:				
-				$pdf->SetTextColorVar1	= "0";
-				$pdf->SetTextColorVar2	= "0";
-				$pdf->SetTextColorVar3	= "0";			
-				$pdf->SetFillColorVar1	= 240;
-				$pdf->SetFillColorVar2	= 240;
-				$pdf->SetFillColorVar3	= 240;					
-				$BackAlt = TRUE;			
-			}
-
-			# check for needed page break
-			$nb=0;
-			for($ii=0;$iiNbLines($pdf->widths[$ii],$dataarr[$ii]));
-			$h=5*$nb;
-
-			# Issue a page break first if needed
-			if($pdf->CheckPageBreak($h))
-				# print the Table Heading again
-				$pdf->HeadRow($TableHeading);
-				$pdf->Row($ThisRow);		
-			# Next record
-			$result->MoveNext();
-		}
-
-		# Dispay the output
-		$pdf->Output();
-		exit;
-	}	
-
-
-
-
-
-
-
-
-
-
-########################################
-##	ADMIN SEARCH CSV EXPORT        #####
-########################################
-
-function search_csv($VAR, $construct, $type)
-{
-	global $C_translate;
-
-	include_once(PATH_ADODB  . 'toexport.inc.php');
-	$filename = 'Export.csv';
-
-
-	# determine what action to take:
-	# inline display, download, email, web save    	
-
-	if($VAR["type"] == "display")
-	{
-	   header ('Content-type: application/x-csv');
-	   header ("Content-Disposition: inline; filename=$filename" );
-	}
-
-	else if($VAR["type"] == "download")
-	{
-		header ("Content-Disposition: attachment; filename=$filename" );
-	}
-
-
-
-		 /************** BEGIN STANDARD EXPORT SEARCH CODE *********************/
-
-
-		 # set the field list for this method:
-		 $arr = $construct->method["$type"];
-
-		 # loop through the field list to create the sql queries
-		 $arr = $construct->method[$type];
-		 $field_list = '';
-		 $i=0;
-		 while (list ($key, $value) = each ($arr))
-		 {
-			 if($i == 0)
-			 {
-				 $field_var =  $construct->table . '_' . $value;
-				 $field_list .= AGILE_DB_PREFIX . $construct->table . '.' . $value;
-
-				// determine if this record is linked to another table/field
-				if($construct->field[$value]["asso_table"] != "")
-				{
-					$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-				}
-			 }
-			 else
-			 {
-				 $field_var =  $construct->table . '_' . $value;
-				 $field_list .= "," . AGILE_DB_PREFIX . $construct->table . "." . $value;
-
-				// determine if this record is linked to another table/field
-				if($construct->field[$value]["asso_table"] != "")
-				{
-					$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-				}
-			 }
-			 $i++;
-		 }
-
-		# get the search details:
-		if(isset($VAR['search_id']))
-		{
-			include_once(PATH_CORE   . 'search.inc.php');
-			$search = new CORE_search;
-			$search->get($VAR['search_id']);
-		}
-		else
-		{
-			echo '
 The search terms submitted were invalid!';
-		}
-
-		# get the sort order details:
-		if(isset($VAR['order_by']) && $VAR['order_by'] != "")
-		{
-			$order_by = ' ORDER BY ' . AGILE_DB_PREFIX . $construct->table . '.' .  $VAR['order_by'];
-			$smarty_order =  $VAR['order_by'];
-		}
-		else
-		{
-			$order_by = ' ORDER BY ' . AGILE_DB_PREFIX . $construct->table . '.' .  $construct->order_by;
-			$smarty_order =  $search->order_by;
-		}
-
-		# format saved search string
-		$sql = explode (" WHERE ", $search->sql);
-
-		# generate the full query
-		$q = eregi_replace("%%fieldList%%", $field_list, $search->sql);
-		$q = eregi_replace("%%tableList%%", AGILE_DB_PREFIX.$construct->table, $q);
-		$q = eregi_replace("%%whereList%%", "", $q);
-		$q .= " ".AGILE_DB_PREFIX . $construct->table.".site_id = '" . DEFAULT_SITE . "'";
-		$q .= $order_by;
-		$db = &DB();
-
-		$result = $db->Execute($q);
-
-		# error reporting
-		if ($result === false)
-		{
-			global $C_debug;
-			$C_debug->error('core:export.inc.php','search_xml', $db->ErrorMsg() . '

' .$q);
-			echo "An SQL error has occured!";
-			return;
-		}
-
-		# put the results into an array
-		$i=0;
-		$class_name = TRUE;
-		$results = '';
-		while (!$result->EOF) {
-			$results[$i] = $result->fields;
-			   $result->MoveNext();
-			   $i++;
-		}
-
-		# get any linked fields
-		if($i > 0)
-		{
-			$this->result = $results;
-			$db_join = new CORE_database;
-			$this->result = $db_join->join_fields($results, $this->linked);
-		}
-		else
-		{
-			$this->result = $results;
-		}
-
-		/************** END STANDARD EXPORT SEARCH CODE *********************/
-
-
-
-	# LOOP THROUGH THE RESULTS & DISPLAY AS CSV
-	for($ii = 0; $ii < count($this->result); $ii++)
-	{
-		# print the heading:
-		if($ii == 0)
-		{
-			reset($arr);
-			$total_fields = count($arr) - 1;
-			$iii = 0;
-			while (list ($key, $value) = each ($arr))
-			{
-				 $field = $C_translate->translate('field_'.$value, $construct->module,'');
-				 echo '"' . $field . '"';
-				 if($total_fields > $iii) echo ',';
-				 $iii++;
-			}
-		}	
-
-
-
-		# new line
-		echo '
-';				
-		# print the data for each cell:
-		reset($arr);
-		$total_fields = count($arr) - 1;
-		$iii = 0;
-		while (list ($key, $value) = each ($arr))
-		{
-			if  ($construct->field["$value"][convert] == 'date'      ||
-				 $construct->field["$value"][convert] == 'time'      ||
-				 $construct->field["$value"][convert] == 'date-now'  ||
-				 $construct->field["$value"][convert] == 'date-time' )
-			{
-				 $data = date(UNIX_DATE_FORMAT,$this->result["$ii"]["$value"]);
-			} else {
-				 $data = $this->result["$ii"]["$value"];
-			}
-
-			echo '"' . $data . '"';
-			if($total_fields > $iii) echo ',';
-			$iii++;
-		}
-	}	
-	exit();
-}	
-
-
-
-
-
-
-
-
-
-########################################
-##	ADMIN SEARCH TAB EXPORT        #####
-########################################
-
-function search_tab($VAR, $construct, $type)
-{
-	global $C_translate;
-	include_once(PATH_ADODB  . '/toexport.inc.php');		
-	$filename = 'Export.txt';
-
-
-	# determine what action to take:
-	# inline display, download, email, web save    	
-
-	if($VAR["type"] == "display")
-	{
-	   header ('Content-type: application/x-txt');
-	   header ("Content-Disposition: inline; filename=$filename" );
-	}
-
-	else if($VAR["type"] == "download")
-	{
-		header ("Content-Disposition: attachment; filename=$filename" );
-	}
-
-		/************** BEGIN STANDARD EXPORT SEARCH CODE *********************/
-
-
-		   # set the field list for this method:
-		 $arr = $construct->method["$type"];
-
-		 # loop through the field list to create the sql queries
-		 $arr = $construct->method[$type];
-		 $field_list = '';
-		 $i=0;
-		 while (list ($key, $value) = each ($arr))
-		 {
-			 if($i == 0)
-			 {
-				 $field_var =  $construct->table . '_' . $value;
-				 $field_list .= AGILE_DB_PREFIX . $construct->table . '.' . $value;
-
-				// determine if this record is linked to another table/field
-				if($construct->field[$value]["asso_table"] != "")
-				{
-					$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-				}
-			 }
-			 else
-			 {
-				 $field_var =  $construct->table . '_' . $value;
-				 $field_list .= "," . AGILE_DB_PREFIX . $construct->table . "." . $value;
-
-				// determine if this record is linked to another table/field
-				if($construct->field[$value]["asso_table"] != "")
-				{
-					$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-				}
-			 }
-			 $i++;
-		 }
-
-		# get the search details:
-		if(isset($VAR['search_id']))
-		{
-			include_once(PATH_CORE   . 'search.inc.php');
-			$search = new CORE_search;
-			$search->get($VAR['search_id']);
-		}
-		else
-		{
-			echo '
 The search terms submitted were invalid!';
-		}
-
-		# get the sort order details:
-		if(isset($VAR['order_by']) && $VAR['order_by'] != "")
-		{
-			$order_by = ' ORDER BY ' . AGILE_DB_PREFIX . $construct->table . '.' .  $VAR['order_by'];
-			$smarty_order =  $VAR['order_by'];
-		}
-		else
-		{
-			$order_by = ' ORDER BY ' . AGILE_DB_PREFIX . $construct->table . '.' .  $construct->order_by;
-			$smarty_order =  $search->order_by;
-		}
-
-		# format saved search string
-		$sql = explode (" WHERE ", $search->sql);
-
-		# generate the full query
-		$q = eregi_replace("%%fieldList%%", $field_list, $search->sql);
-		$q = eregi_replace("%%tableList%%", AGILE_DB_PREFIX.$construct->table, $q);
-		$q = eregi_replace("%%whereList%%", "", $q);
-		$q .= " ".AGILE_DB_PREFIX . $construct->table.".site_id = '" . DEFAULT_SITE . "'";
-		$q .= $order_by;
-		$db = &DB();
-
-		$result = $db->Execute($q);
-
-		# error reporting
-		if ($result === false)
-		{
-			global $C_debug;
-			$C_debug->error('core:export.inc.php','search_xml', $db->ErrorMsg() . '

' .$q);
-			echo "An SQL error has occured!";
-			return;
-		}
-
-		# put the results into an array
-		$i=0;
-		$class_name = TRUE;
-		$results = '';
-		while (!$result->EOF) {
-			$results[$i] = $result->fields;
-			   $result->MoveNext();
-			   $i++;
-		}
-
-		# get any linked fields
-		if($i > 0)
-		{
-			$this->result = $results;
-			$db_join = new CORE_database;
-			$this->result = $db_join->join_fields($results, $this->linked);
-		}
-		else
-		{
-			$this->result = $results;
-		}
-
-		/************** END STANDARD EXPORT SEARCH CODE *********************/
-
-
-
-
-	# LOOP THROUGH THE RESULTS & DISPLAY AS CSV
-	for($ii = 0; $ii < count($this->result); $ii++)
-	{
-		# print the heading:
-		if($ii == 0)
-		{
-			reset($arr);
-			$total_fields = count($arr) - 1;
-			$iii = 0;
-			while (list ($key, $value) = each ($arr))
-			{
-				 $data = $C_translate->translate('field_'.$value, $construct->module,'');
-				 echo $data;
-				 if($total_fields > $iii) echo '    ';
-				 $iii++;
-			}
-		}
-
-
-
-		# new line
-		echo '
-';				
-		# print the data for each cell:
-		reset($arr);
-		$total_fields = count($arr) - 1;
-		$iii = 0;
-		while (list ($key, $value) = each ($arr))
-		{
-			if  ($construct->field["$value"][convert] == 'date'      ||
-				 $construct->field["$value"][convert] == 'time'      ||
-				 $construct->field["$value"][convert] == 'date-now'  ||
-				 $construct->field["$value"][convert] == 'date-time' )
-			{
-				 $data = date(UNIX_DATE_FORMAT,$this->result["$ii"]["$value"]);
-			} else {
-				 $data = $this->result["$ii"]["$value"];
-			}
-
-			echo addslashes($data);
-			if($total_fields > $iii) echo ' ';
-			$iii++;
-		}
-	}	
-	exit();
-}
-
-
-
-
-
-
-
-
-	########################################
-	##	ADMIN SEARCH XML EXPORT        #####
-	########################################
-
-	function search_xml($VAR, $construct, $type)
-	{
-
-		/************** BEGIN STANDARD EXPORT SEARCH CODE *********************/
-
-
-		# set the field list for this method:
-		$arr = $construct->method["$type"];
-
-		# loop through the field list to create the sql queries
-		 $arr = $construct->method[$type];
-		 $field_list = '';
-		 $i=0;
-		 while (list ($key, $value) = each ($arr))
-		 {
-			 if($i == 0)
-			 {
-				 $field_var =  $construct->table . '_' . $value;
-				 $field_list .= AGILE_DB_PREFIX . $construct->table . '.' . $value;
-
-				// determine if this record is linked to another table/field
-				if($construct->field[$value]["asso_table"] != "")
-				{
-					$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-				}
-			 }
-			 else
-			 {
-				 $field_var =  $construct->table . '_' . $value;
-				 $field_list .= "," . AGILE_DB_PREFIX . $construct->table . "." . $value;
-
-				// determine if this record is linked to another table/field
-				if($construct->field[$value]["asso_table"] != "")
-				{
-					$this->linked[] = array('field' => $value, 'link_table' => $construct->field[$value]["asso_table"], 'link_field' => $construct->field[$value]["asso_field"]);
-				}
-			 }
-			 $i++;
-		 }
-
-		# get the search details:
-		if(isset($VAR['search_id']))
-		{
-			include_once(PATH_CORE   . 'search.inc.php');
-			$search = new CORE_search;
-			$search->get($VAR['search_id']);
-		}
-		else
-		{
-			echo '
 The search terms submitted were invalid!';
-		}
-
-		# get the sort order details:
-		if(isset($VAR['order_by']) && $VAR['order_by'] != "")
-		{
-			$order_by = ' ORDER BY ' . AGILE_DB_PREFIX . $construct->table . '.' .  $VAR['order_by'];
-			$smarty_order =  $VAR['order_by'];
-		}
-		else
-		{
-			$order_by = ' ORDER BY ' . AGILE_DB_PREFIX . $construct->table . '.' .  $construct->order_by;
-			$smarty_order =  $search->order_by;
-		}
-
-		# format saved search string
-		$sql = explode (" WHERE ", $search->sql);
-
-		# generate the full query
-		$q = eregi_replace("%%fieldList%%", $field_list, $search->sql);
-		$q = eregi_replace("%%tableList%%", AGILE_DB_PREFIX.$construct->table, $q);
-		$q = eregi_replace("%%whereList%%", "", $q);
-		$q .= " ".AGILE_DB_PREFIX . $construct->table.".site_id = '" . DEFAULT_SITE . "'";
-		$q .= $order_by;
-		$db = &DB();
-
-		$result = $db->Execute($q);
-
-		# error reporting
-		if ($result === false)
-		{
-			global $C_debug;
-			$C_debug->error('core:export.inc.php','search_xml', $db->ErrorMsg() . '

' .$q);
-			echo "An SQL error has occured!";
-			return;
-		}
-
-		# put the results into an array
-		$i=0;
-		$class_name = TRUE;
-		$results = '';
-		while (!$result->EOF) {
-			$results[$i] = $result->fields;
-			$result->MoveNext();
-			$i++;
-		}
-
-		# get any linked fields
-		if($i > 0)
-		{
-			$this->result = $results;
-			$db_join = new CORE_database;
-			$this->result = $db_join->join_fields($results, $this->linked);
-		}
-		else
-		{
-			$this->result = $results;
-		}
-
-		/************** END STANDARD EXPORT SEARCH CODE *********************/
-
-
-
-
-
-		# create the xml processing instruction
-		# header("Content-type: text/xml");
-		$filename = 'XML_Export.xml';
-
-		# determine what action to take:
-		if($VAR["type"] == "display") {
-		   header ('Content-type: application/x-xml');
-		   header ("Content-Disposition: inline; filename=$filename" );
-		}
-
-		else if($VAR["type"] == "download") {
-			header ("Content-Disposition: attachment; filename=$filename" );
-		}
-
-		$_xml ="\r\n";
-		$_xml .="\r\n";
-
-		# loop through the resulsts and display as PDF
-		$row = 0;
-		for($ii = 0; $ii < count($this->result); $ii++)
-		{
-			$_xml .= "	<" . $construct->table . ">\r\n";
-
-			# get the data for each cell:
-			reset($arr);
-			$column=0;
-			while (list ($key, $value) = each ($arr))
-			{
-				if  ($construct->field["$value"][convert] == 'date'      ||
-					 $construct->field["$value"][convert] == 'time'      ||
-					 $construct->field["$value"][convert] == 'date-now'  ||
-					 $construct->field["$value"][convert] == 'date-time' )
-					 {
-						$date = date(UNIX_DATE_FORMAT,$this->result["$ii"]["$value"]);
-						$data = htmlspecialchars($date,0,'ISO8859-1');
-						//$data = test;
-					 } else {
-						$data = htmlspecialchars($this->result["$ii"]["$value"],0,'ISO8859-1');
-					 }
-				$_xml .= "		<$value>" . $data . "\r\n";
-			}
-
-			# Next record
-			$_xml .= "	table . ">\r\n";
-
-		}
-		$_xml .="\r\n";
-		echo $_xml;	
-		exit();
-	}
-}
-
-
-
-// ----- begin of excel export function library -----
-// Excel begin of file header
-function xlsBOF() {
-	echo pack("ssssss", 0x809, 0x8, 0x0, 0x10, 0x0, 0x0);
-	return;
-}
-
-// Excel end of file footer
-function xlsEOF() {
-   echo pack("ss", 0x0A, 0x00);
-   return;
-}
-
-
-// Function to write a Number (double) into Row, Col
-function xlsWriteNumber($Row, $Col, $Value) {
-	echo pack("sssss", 0x203, 14, $Row, $Col, 0x0);
-	echo pack("d", $Value);
-	return;
-}
-
-
-// Function to write a label (text) into Row, Col
- function xlsWriteLabel($Row, $Col, $Value ) {
-	$L = strlen($Value);
-	echo pack("ssssss", 0x204, 8 + $L, $Row, $Col, 0x0, $L);
-	echo $Value;
-	return;
-}	
-?>
\ No newline at end of file
diff --git a/modules/core/file_extensions.inc.php b/modules/core/file_extensions.inc.php
deleted file mode 100644
index caf6f5d1..00000000
--- a/modules/core/file_extensions.inc.php
+++ /dev/null
@@ -1,66 +0,0 @@
-arr = Array
-		(
-			Array ('name' => 'jpg',     'type' => 'image/jpeg',            			'disposition' => 'inline'),
-			Array ('name' => 'jpeg',    'type' => 'image/jpeg',            			'disposition' => 'inline'),
-			Array ('name' => 'jpe',    	'type' => 'image/jpeg',            			'disposition' => 'inline'),
-			Array ('name' => 'gif',     'type' => 'image/gif',             			'disposition' => 'inline'),
-			Array ('name' => 'bmp',     'type' => 'image/bmp',             			'disposition' => 'inline'),
-			Array ('name' => 'tif',     'type' => 'image/tif',             			'disposition' => 'inline'),
-			Array ('name' => 'png',     'type' => 'image/png',             			'disposition' => 'inline'),
-			Array ('name' => 'wbmp',    'type' => 'image/vnd.wap.wbmp',             'disposition' => 'inline'),
-			
-			Array ('name' => 'pdf',     'type' => 'application/pdf',       			'disposition' => 'inline'),
-			Array ('name' => 'exe',     'type' => 'application/octet-stream',		'disposition'=>  'attatchment'),
-			Array ('name' => 'zip',     'type' => 'application/x-zip',     			'disposition' => 'attatchment'),
-			Array ('name' => 'gzip',    'type' => 'application/gzip',      			'disposition' => 'attatchment'),
-			Array ('name' => 'tgz',     'type' => 'application/tgz',       			'disposition' => 'attatchment'),
-			Array ('name' => 'gz',      'type' => 'application/gz',        			'disposition' => 'attatchment'),
-			Array ('name' => 'doc',     'type' => 'application/ms-word',   			'disposition' => 'inline'),
-			Array ('name' => 'xls',     'type' => 'application/ms-excel',  			'disposition' => 'inline'),
-			Array ('name' => 'csv',     'type' => 'application/ms-excel',  			'disposition' => 'inline'),
-			Array ('name' => 'swf',   	'type' => 'application/x-shockwave-flash', 	'disposition' => 'inline'),
-			
-			Array ('name' => 'txt',     'type' => 'text/plain',            			'disposition' => 'inline'),
-			Array ('name' => 'text',    'type' => 'text/plain',            			'disposition' => 'inline'),
-			Array ('name' => 'rtf',     'type' => 'text/richtext',         			'disposition' => 'inline'),
-			Array ('name' => 'xml',     'type' => 'text/xml',       				'disposition' => 'inline'),
-			Array ('name' => 'css',     'type' => 'text/css',            			'disposition' => 'inline'),
-			Array ('name' => 'js',      'type' => 'text/plain',            			'disposition' => 'inline'),
-			Array ('name' => 'wml',     'type' => 'text/vnd.wap.wml',            	'disposition' => 'inline'),
-			
-			Array ('name' => 'avi',     'type' => 'video/avi',            			'disposition' => 'attatchment'),
-			Array ('name' => 'mpg',     'type' => 'video/mpeg',            			'disposition' => 'attatchment'),
-			Array ('name' => 'mpeg',    'type' => 'video/mpeg',            			'disposition' => 'attatchment'),
-			Array ('name' => 'mpe',     'type' => 'video/mpeg',            			'disposition' => 'attatchment'),
-			Array ('name' => 'wmv',   	'type' => 'video/x-ms-wmv', 				'disposition' => 'attatchment'),
-			Array ('name' => 'asf',   	'type' => 'video/x-ms-asf', 				'disposition' => 'attatchment')
-		);
-	}
-	
-	function content_type($file)
-	{
-		for($i=0; $iarr); $i++)		
-			if(eregi($this->arr[$i]['name'].'$', $file))
-				return $this->arr[$i]['type']; 					
-	}
-	
-	/**
-	 * Set headers for a specific file extension 
-	 */
-	function set_headers_ext($ext,$name="Download",$size=0) {  
-		foreach($this->arr as $types) {
-			if($types['name'] == strtolower($ext)) {
-				header("Content-type: {$types['type']}");
-				header("Content-disposition: \"{$types['disposition']}\"; filename=\"$name.$ext\"; size=\"$size\""); 			 
-				return $types['type'];
-			}
-		}  
-	}
-}       
-?>
\ No newline at end of file
diff --git a/modules/core/fpdf.inc.php b/modules/core/fpdf.inc.php
deleted file mode 100644
index a945820c..00000000
--- a/modules/core/fpdf.inc.php
+++ /dev/null
@@ -1,219 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	 			
-require_once(PATH_FPDF . '/fpdf.php');
-
-/**
-* FPDF Handler Class
-* 
-* This class handles the conversion to PDF format for printing, etc. 
-*/ 
-class CORE_fpdf
-{
-
-	/**
-	* Opens the FPDF class and gets ready for data conversion...
-	* 
-	* @return 	void
-	* @since 	Version 1.0
-	*/
-
-	function CORE_fpdf()
-	{
-	}
-
-
-
-	/**
-	* FPDF Table Class
-	* 
-	* This class handles the of tables to PDF, for searches, lists, reports, etc.
-	*  
-	* @version 1.0 Beta, 2003/06/07
-	* @package Core
-	*/
-}
-
-class PDF_MC_Table extends FPDF
-{
-	var $widths;
-
-	function SetWidths($w)
-	{
-		//Set the array of column widths
-		$this->widths=$w;
-	}
-
-	function Header()
-	{
-		//Select Arial bold 15
-		$this->SetFont('Arial','I',12);
-		//Move to the right
-		$this->Cell(190,10,"Search Results (translate)",'0','0','C');
-		//Line break
-		$this->Ln(10);
-	}	
-
-	function Footer()
-	{
-		//Go to 1.5 cm from bottom right
-		$this->SetXY(-20,-15);
-		//Select Arial italic 8
-		$this->SetFont('Arial','I',8);
-		//Print page number
-		$this->Cell(0,10,'Page '.$this->PageNo(),0,0,'C');
-		//Go to 1.5 cm from bottom left
-		$this->SetXY(10,-15);		
-		//Select Arial italic 8
-		$this->SetFont('Arial','I',8);		
-		//Print date
-		$this->Cell(0,10,date("m-d-Y"),0,0,'L');
-	}
-
-
-	function HeadRow($data)
-	{
-		// Set the fill color
-		#$this->SetDrawColor(0,0,0);	
-		$this->SetFillColor($this->HeadFillColor1,$this->HeadFillColor2,$this->HeadFillColor3);
-		$this->SetTextColor($this->HeadTextColor1,$this->HeadTextColor2,$this->HeadTextColor3);
-		$this->SetFont($this->HeadFontFamily,$this->HeadFontStyle,$this->HeadFontSize);
-
-		//Calculate the height of the row
-		$nb=0;
-		for($i=0;$iNbLines($this->widths[$i],$data[$i]));
-		$h=$this->HeadHeight*$nb;
-
-		//Draw the cells of the row
-		for($i=0;$iwidths[$i];
-			//Save the current position
-			$x=$this->GetX();
-			$y=$this->GetY();
-			//Draw the border
-			$this->Rect($x,$y,$w,$h);
-			//Print the text
-			$this->MultiCell($w,$this->HeadHeight,$data[$i],1,'L',1);
-			//Put the position to the right of the cell
-			$this->SetXY($x+$w,$y);
-		}
-		//Go to the next line
-		$this->Ln($h);
-	}
-
-
-
-	function Row($data)
-	{
-		// Set the fill color
-		#$this->SetDrawColor(0,0,0);	
-		$this->SetFillColor($this->SetFillColorVar1,$this->SetFillColorVar2,$this->SetFillColorVar3);
-		$this->SetTextColor($this->SetTextColorVar1,$this->SetTextColorVar2,$this->SetTextColorVar3);
-		$this->SetFont($this->SetFontFamily,$this->SetFontStyle,$this->SetFontSize);
-
-		//Calculate the height of the row
-		$nb=0;
-		for($i=0;$iNbLines($this->widths[$i],$data[$i]));
-		$h=$this->RowHeight*$nb;
-
-		//Draw the cells of the row
-		for($i=0;$iwidths[$i];
-			//Save the current position
-			$x=$this->GetX();
-			$y=$this->GetY();
-			//Draw the border
-			$this->Rect($x,$y,$w,$h);
-			//Print the text
-			$this->MultiCell($w,$this->RowHeight,$data[$i],1,'L',1);
-			//Put the position to the right of the cell
-			$this->SetXY($x+$w,$y);
-		}
-		//Go to the next line
-		$this->Ln($h);
-	}
-
-	function CheckPageBreak($h)
-	{
-		//If the height h would cause an overflow, add a new page immediately
-		if($this->GetY()+$h>$this->PageBreakTrigger)
-		{
-			$this->AddPage($this->CurOrientation);
-			return TRUE;
-		}
-
-	}
-
-	function NbLines($w,$txt)
-	{
-		//Computes the number of lines a MultiCell of width w will take
-		$cw=&$this->CurrentFont['cw'];
-		if($w==0)
-			$w=$this->w-$this->rMargin-$this->x;
-		$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
-		$s=str_replace("\r",'',$txt);
-		$nb=strlen($s);
-		if($nb>0 and $s[$nb-1]=="\n")
-			$nb--;
-		$sep=-1;
-		$i=0;
-		$j=0;
-		$l=0;
-		$nl=1;
-		while($i<$nb)
-		{
-			$c=$s[$i];
-			if($c=="\n")
-			{
-				$i++;
-				$sep=-1;
-				$j=$i;
-				$l=0;
-				$nl++;
-				continue;
-			}
-			if($c==' ')
-				$sep=$i;
-			$l+=$cw[$c];
-			if($l>$wmax)
-			{
-				if($sep==-1)
-				{
-					if($i==$j)
-						$i++;
-				}
-				else
-					$i=$sep+1;
-				$sep=-1;
-				$j=$i;
-				$l=0;
-				$nl++;
-			}
-			else
-				$i++;
-		}
-		return $nl;
-	}
-}
-?>
\ No newline at end of file
diff --git a/modules/core/ftp.inc.php b/modules/core/ftp.inc.php
deleted file mode 100644
index bef6421f..00000000
--- a/modules/core/ftp.inc.php
+++ /dev/null
@@ -1,171 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-
-/**
-* FTP Connection Class
-* 
-* This class creates a connection to a remote host for file upload/download/deletion.
-*/
-class CORE_ftp
-{
-	var $server='';
-	var $username='';
-	var $password='';
-	var $port=21;
-	var $remote_dir='';
-
-
-
-	### Setup the connection:
-	function CORE_ftp($server, $username='anonymous', $password='anonymous@domain.com', $port=21)
-	{
-		$this->server=$server;
-		$this->username=$username;
-		$this->password=$password;
-		$this->port=$port;
-	}
-
-
-
-
-	### Test the connection:
-	function return_connection()
-	{
-		# SET THE ERROR REPORTING LEVEL OFF!
-		error_reporting(0);
-
-		$conn_id = @ftp_connect($this->server, $this->port);
-		if (!$conn_id) return false;
-
-		$login_result = @ftp_login($conn_id, $this->username, $this->password);
-		if (!$login_result) return false;
-
-		# SET THE ERROR REPORTING LEVEL ( E_ALL ^ E_NOTICE )
-		$error_reporting_eval = 'error_reporting('.ERROR_REPORTING.');';
-		eval($error_reporting_eval);
-		return $conn_id;
-	}
-
-
-
-
-	### Kill the connection:
-	function kill()
-	{
-		if(isset($this->conn))
-		$this->disconnect();
-		unset($this);
-	}
-
-
-
-
-	### Delete a file:
-	function delete($filename)
-	{
-		# SET THE ERROR REPORTING LEVEL OFF!
-		error_reporting(0);
-
-		$conn=$this->return_connection();
-		if (!$conn) return false;
-
-		@ftp_pasv($conn, $passive);
-		$this->set_remote_dir(ftp_pwd($conn));
-		if(!ftp_delete($conn, $filename))
-		{
-			@ftp_quit($this->conn);
-			return false;
-		}
-		else
-		{
-			@ftp_quit($this->conn);
-			return true;
-		}
-
-		# SET THE ERROR REPORTING LEVEL ( E_ALL ^ E_NOTICE )
-		$error_reporting_eval = 'error_reporting('.ERROR_REPORTING.');';
-		eval($error_reporting_eval);
-		return true;
-	}
-
-
-
-
-	### Send a file:
-	function send($filename='', $save_as='', $passive=TRUE)
-	{
-		# SET THE ERROR REPORTING LEVEL OFF!
-		error_reporting(0);
-
-		$conn=$this->return_connection();
-		if ( !$conn ) return false;
-
-		@ftp_pasv($conn, $passive);
-		$this->set_remote_dir(ftp_pwd($conn));
-		if(!ftp_put($conn, $save_as, $filename, FTP_BINARY))
-		{
-			@ftp_quit($this->conn);
-			return false;
-		}
-		else
-		{
-			@ftp_quit($this->conn);
-			return true;
-		}
-
-		# SET THE ERROR REPORTING LEVEL ( E_ALL ^ E_NOTICE )
-		$error_reporting_eval = 'error_reporting('.ERROR_REPORTING.');';
-		eval($error_reporting_eval);
-		return true;
-	}
-
-	### Get a file
-	function get($filename='', $save_as='', $passive=TRUE)
-	{
-		# SET THE ERROR REPORTING LEVEL OFF!
-		error_reporting(0);
-
-		$conn=$this->return_connection();
-		if (!$conn) return false;
-
-		@ftp_pasv($conn, $passive);
-		$this->set_remote_dir(ftp_pwd($conn));
-		if(!ftp_get($conn, $save_as, $this->remote_dir.$filename, FTP_BINARY))
-		{
-			@ftp_quit($this->conn);
-			return false;
-		}
-		else
-		{
-			@ftp_quit($this->conn);
-			return true;
-		}
-	}
-
-	### Set the current directory:
-	function set_remote_dir($dir)
-	{
-		$x = substr($dir, (strlen($dir)-1));
-		if($x != "/" && $x != "\\")
-		$dir.="/";
-		$this->remote_dir=$dir;
-	}	
-} 
-?>
\ No newline at end of file
diff --git a/modules/core/graph.inc.php b/modules/core/graph.inc.php
deleted file mode 100644
index bfbccf51..00000000
--- a/modules/core/graph.inc.php
+++ /dev/null
@@ -1,405 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-class CORE_graph
-{
-
-
-	########################################################################
-	### Create a Bar Graph
-	########################################################################
-
-	function PIE_graph($module, $method, $type, $start, $extra_fields)
-	{
-		global $C_translate, $C_auth;
-		include_once(PATH_CORE . 'validate.inc.php');
-		$dt = new CORE_validate;
-
-		include (PATH_GRAPH."jpgraph.php");
-
-		####################################################################
-		### Check if 'search' is authorized for this account
-		####################################################################
-
-		# check the validation for this function
-		if($C_auth->auth_method_by_name($module,'search'))
-		{
-			# validate this file exists, and include it.
-			if (file_exists(PATH_MODULES . '/' . $module . '/' . $module . '.inc.php'))
-			{
-				include_once(PATH_MODULES . '/' . $module . '/' . $module . '.inc.php');
-			}
-			else
-			{
-				### Not exist!
-				$error = $C_translate->translate('module_non_existant','','');
-			}
-		}
-		else
-		{
-			### Not auth
-			$error = $C_translate->translate('module_non_auth','','');
-		}
-
-
-		if(isset($error))
-		{
-			include (PATH_GRAPH."jpgraph_canvas.php");
-			// Create the graph.
-			$graph = new CanvasGraph(460,55,"auto");
-			$t1 = new Text($error);
-			$t1->Pos(0.2,0.5);
-			$t1->SetOrientation("h");
-			$t1->SetBox("white","black",'gray');
-			$t1->SetFont(FF_FONT1,FS_NORMAL);
-			$t1->SetColor("black");
-			$graph->AddText($t1);
-			$graph->Stroke();
-			exit;
-		}
-
-
-		# initialize the module, if it has not already been initialized
-		$eval = '$' . $module . ' = new ' . $module . '; ';
-		$eval .= '$this_Obj  = $' . $module . ';';
-		eval ($eval);
-
-		# run the function
-		$array = call_user_func (array($module, $method), $start_str, $end_str, $constraint_array, $default_array, $extra_fields);
-
-
-		include  (PATH_GRAPH."jpgraph_pie.php");
-		include  (PATH_GRAPH."jpgraph_pie3d.php");
-
-
-		$data    = $array['data'];
-		$legends = $array['legends'];
-
-		// Create the Pie Graph.
-		$graph = new PieGraph(500,250,"auto");
-		$graph->SetScale("textlin");
-		$graph->SetMarginColor('#F9F9F9');
-		$graph->SetFrame(true,'#FFFFFF',0);
-		$graph->SetColor('#F9F9F9');
-
-		// Create pie plot
-		$p1 = new PiePlot3d($data);
-		$p1->SetTheme("water");
-		$p1->SetCenter(0.4);
-		$p1->SetAngle(30);
-		$p1->value->SetFont(FF_FONT1,FS_NORMAL,8);
-		$p1->SetLegends($legends);
-
-		// Explode the larges slice:
-		$largest = 0;
-		for($i=0; $i $largest)
-			{
-				$largest = $data[$i];
-				$explode = $i;
-			}
-		}
-		if($explode)
-		$p1->ExplodeSlice($explode);
-
-		$graph->Add($p1);
-		$graph->Stroke();
-	}
-
-
-
-
-	########################################################################
-	### Create a Bar Graph
-	########################################################################
-
-	function BAR_graph($module, $type, $start, $extra_fields)
-	{
-		global $C_translate, $C_auth;
-		include_once(PATH_CORE . 'validate.inc.php');
-		$dt = new CORE_validate;
-
-		include (PATH_GRAPH."jpgraph.php");
-
-		####################################################################
-		### Check if 'search' is authorized for this account
-		####################################################################
-
-		# check the validation for this function
-		if($C_auth->auth_method_by_name($module,'search'))
-		{
-			# validate this file exists, and include it.
-			if (file_exists(PATH_MODULES . '/' . $module . '/' . $module . '.inc.php'))
-			{
-				include_once(PATH_MODULES . '/' . $module . '/' . $module . '.inc.php');
-			}
-			else
-			{
-				### Not exist!
-				$error = $C_translate->translate('module_non_existant','','');
-			}
-		}
-		else
-		{
-			### Not auth
-			$error = $C_translate->translate('module_non_auth','','');
-		}
-
-
-		if(isset($error))
-		{
-			include (PATH_GRAPH."jpgraph_canvas.php");
-			// Create the graph.
-			$graph = new CanvasGraph(460,55,"auto");
-			$t1 = new Text($error);
-			$t1->Pos(0.2,0.5);
-			$t1->SetOrientation("h");
-			$t1->SetBox("white","black",'gray');
-			$t1->SetFont(FF_FONT1,FS_NORMAL);
-			$t1->SetColor("black");
-			$graph->AddText($t1);
-			$graph->Stroke();
-			exit;
-		}
-
-
-
-
-		####################################################################
-		### BY WEEK
-		####################################################################
-
-		if ($type == 'week')
-		{
-			$FONT_SIZE= 7;
-			$AbsWidth = 12;
-			$interval = 4;
-
-			$type = $C_translate->translate('week','','');
-			if($start == "" || $start <= 12)
-			{
-				## Get the beginning/end of this week
-				$start_str    = mktime (24,0,0,12, 31, date("Y")-1);
-				$start        = date(UNIX_DATE_FORMAT, $start_str);
-				$end_str      = mktime (24,0,0,12, 30, date("Y",$start_str));
-				$end          = date(UNIX_DATE_FORMAT, $end_str);
-
-			}
-			else
-			{
-				## Get the beginning/end of the specified week
-				$start_str    = mktime (24,0,0,12, 31, date("$start")-1);
-				$start        = date(UNIX_DATE_FORMAT, $start_str);
-				$end_str      = mktime (24,0,0,12, 30, date("Y",$start_str));
-				$end          = date(UNIX_DATE_FORMAT, $end_str);
-
-			}
-
-			### Set the constraint array:
-			$curr_str = $start_str;
-			while ( $curr_str <= $end_str )
-			{
-				$new_curr_str       = mktime (0,0,0,date("m",$curr_str), date("d",$curr_str)+7, date("Y",$curr_str));
-				$constraint_array[] = Array('start' => $curr_str, 'end'   => $new_curr_str);	
-				$curr_str = $new_curr_str;
-				$default_array[] = 0;
-			}
-		}
-
-
-		####################################################################
-		### MONTH
-		####################################################################
-
-		else if ($type == 'month')
-		{
-			$FONT_SIZE = 10;
-			$AbsWidth = 12;
-			$TickLables = $gDateLocale->GetShortMonth();
-			$interval =1;
-			$type = $C_translate->translate('month','','');
-
-			if($start == "" || $start < 12)
-			{
-				## Get the beginning/end of this week
-				$start_str    = mktime (24,0,0,12, 31, date("Y")-1);
-				$start        = date(UNIX_DATE_FORMAT, $start_str);
-				$end_str      = mktime (24,0,0,12, 30, date("Y",$start_str));
-				$end          = date(UNIX_DATE_FORMAT, $end_str);
-			}
-			else
-			{
-				## Get the beginning/end of the specified week
-				## Get the beginning/end of this week
-				$start_str    = mktime (24,0,0,12, 31, date("$start")-1);
-				$start        = date(UNIX_DATE_FORMAT, $start_str);
-				$end_str      = mktime (24,0,0,12, 30, date("Y",$start_str));
-				$end          = date(UNIX_DATE_FORMAT, $end_str);
-			}
-
-			### Set the constraint array:
-			$curr_str = $start_str;
-			while ( $curr_str <= $end_str )
-			{
-				$new_curr_str       = mktime (0,0,0,date("m",$curr_str)+1, date("d",$curr_str), date("Y",$curr_str));
-				$constraint_array[] = Array('start' => $curr_str, 'end'   => $new_curr_str);
-				$curr_str = $new_curr_str;
-				$default_array[] = 0;
-			}
-
-
-		}
-
-
-		####################################################################
-		### BY YEAR
-		####################################################################
-
-		else if ($type == 'year')
-		{
-			$FONT_SIZE = 10;
-			$interval =1;
-			$AbsWidth = 13;
-
-			$type = $C_translate->translate('year','','');
-
-
-			## Get the beginning/end of this year - 10
-			$start_str    = mktime (0,0,0,1,1, date("Y")-9);
-			$start        = date(UNIX_DATE_FORMAT, $start_str);
-			$end_str      = mktime (0,0,0,12,30, date("Y",$start_str)+9);
-			$end          = date(UNIX_DATE_FORMAT, $end_str);    		         		
-
-
-			### Set the constraint array:
-			$curr_str = $start_str;
-			while ( $curr_str <= $end_str )
-			{
-				$new_curr_str       = mktime (0,0,0,date("m",$curr_str), date("d",$curr_str), date("Y",$curr_str)+1);
-				$constraint_array[] = Array('start' => $curr_str, 'end'   => $new_curr_str);	
-				$TickLables[]       = date("Y",$curr_str);
-				$curr_str = $new_curr_str;
-				$default_array[] = 0;
-			}    		
-		}
-
-
-
-
-		####################################################################
-		### BY DAY
-		####################################################################
-
-		else
-		{
-			$FONT_SIZE= 8;
-			$interval = 3;
-			$AbsWidth = 4;
-			$type     = $C_translate->translate('day','','');
-
-			if($start == ""  || $start > 12 || $start < 1 )
-			{
-				## Get the beginning/end of this week
-				$start_str    = mktime (0,0,0,date("m"), 1, date("Y"));
-				$start        = date(UNIX_DATE_FORMAT, $start_str);
-				$end_str      = mktime (0,0,0,date("m",$start_str)+1, 1, date("Y",$start_str));
-				$end          = date(UNIX_DATE_FORMAT, $end_str);
-			}
-			else
-			{
-				## Get the beginning/end of the specified week
-				$start_str    = mktime (0,0,0,date("$start"), 1, date("Y"));
-				$start        = date(UNIX_DATE_FORMAT, $start_str);
-				$end_str      = mktime (0,0,0,date("m",$start_str)+1, 1, date("Y",$start_str));
-				$end          = date(UNIX_DATE_FORMAT, $end_str);
-
-			}
-
-			### Set the constraint array:
-			$curr_str = $start_str;
-			while ( $curr_str < $end_str )
-			{
-				$new_curr_str       = mktime (0,0,0,date("m",$curr_str), date("d",$curr_str)+1, date("Y",$curr_str));
-				$constraint_array[] = Array('start' => $curr_str, 'end'   => $new_curr_str);	
-				$TickLables[]       = date("j",$curr_str);
-				$curr_str           = $new_curr_str;
-				$default_array[]    = 0;
-			}
-		}
-
-
-		# initialize the module, if it has not already been initialized
-		$eval = '$' . $module . ' = new ' . $module . '; ';
-		$eval .= '$this_Obj  = $' . $module . ';';
-		eval ($eval);
-
-		# run the function
-		$array = call_user_func (array($module, "graph"), $start_str, $end_str, $constraint_array, $default_array, $extra_fields);
-
-
-		include  (PATH_GRAPH."jpgraph_bar.php");
-
-		$datay=$array['results'];
-
-		// Create the graph. These two calls are always required
-		$graph = new Graph(550,200,"auto");
-		$graph->SetScale("textlin");
-		$graph->yaxis->scale->SetGrace(25);
-		$graph->SetMarginColor('#F9F9F9');
-		$graph->SetFrame(true,'darkgreen',0);
-		$graph->SetColor('#FFFFFF');
-		#$graph->SetFrame(false);
-
-
-		// Adjust the margin a bit to make more room for titles
-		$graph->img->SetMargin(45,10,15,25);
-
-		// Create a bar pot
-		$bplot = new BarPlot($datay);
-
-		// Set the X
-		if(isset($TickLables))
-		$graph->xaxis->SetTickLabels($TickLables);
-		$graph->xaxis->SetTextLabelInterval($interval);
-		$graph->xaxis->SetColor("navy");
-		$graph->yaxis->SetColor("navy");
-
-		// Adjust fill color
-		$bplot->SetFillColor('#506DC7');
-		$bplot->value->Show();
-		$bplot->value->SetFont(FF_FONT1,FS_NORMAL,$FONT_SIZE);
-		$bplot->value->SetAngle(90);
-		$bplot->value->SetFormat('%0.0f');
-		$bplot->value->SetColor("darkblue");
-		$graph->Add($bplot);
-
-		// Setup the titles
-		$title = $array['title'];
-		$graph->title->Set($title . "     $start - $end");
-		$graph->title->SetFont(FF_FONT1,FS_BOLD);
-		$graph->title->SetColor("black");
-
-
-		// Display the graph
-		$graph->Stroke();
-	}
-}
-?>
\ No newline at end of file
diff --git a/modules/core/helm.inc.php b/modules/core/helm.inc.php
deleted file mode 100644
index 225873e6..00000000
--- a/modules/core/helm.inc.php
+++ /dev/null
@@ -1,219 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-/**
- * Helm Remote Class  
- */
-class HELM
-{ 
-	var $host;
-	var $port;
-	var $ssl;		 
-	var $user;
-	var $pass;
-	var $home_dir;
-	var $shell; 
-
-	/*
-	* Check for Agilebill
-	*/
-	function HELM()
-	{
-		if(!defined("PATH_FILES"))
-		{
-			echo "Dependancy Failure!";
-			exit;
-		}
-	}
-
-	/*
-	* Add a user and define available modules 
-	*/ 
-	function add($reseller,$username,$domain,$tld,$plan_id,$plan_name,$fname,$lname,$company,$address,$city,$state,$zip,$email)
-	{  
-
-		# got to login first... 
-		$url  = $this->host.'/default.asp';
-		$post = "txtUsername=tony&txtPassword=slashdot1&RememberMe=1&btnProcess=Login&selLanguageCode=EN&selInterface=standard_XP";
-		$ret = $this->connect($url,$post);	
-
-		# logged in ok?
-		if(!eregi("You are now logged in", $ret)) {
-			echo "Login failed";
-			return false;
-		} 
-
-		# create the user
-		$url  = $this->host.'/interfaces/standard/addUser.asp'; 
-		$post = "processing=1".
-				"&UserAccNum=$reseller".
-				"&SendWelcomeMessage=1".
-				"&action=ADD".
-				"&edited=TRUE". 
-				"&NewAccountNumber=$username".
-				"&FirstName=$fname".
-				"&LastName=$lname".
-				"&CompanyName=$company".
-				"&Address1=$address".
-				"&Town=$city".
-				"&County=$state".
-				"&Postcode=$zip".
-				"&PrimaryEmail=$email".
-				"&Country=US"; 
-		$ret = $this->connect($url,$post); 
-		if($this->debug) echo "

$url?$post
";		
-
-		# Add the package
-		$url  = $this->host.'/interfaces/standard/addpackage.asp'; 
-		$post = "processing=0".
-				"&txtStatus=0".
-				"&UserAccNum=$username". 
-				"&action=ADD".
-				"&PlanID=$plan_id". 
-				"&PackageName=$plan_name"; 
-		$ret = $this->connect($url,$post); 
-		if($this->debug) echo "

$url?$post
";		
-
-		# Get the Package ID Just added			
-		$USERNAME = strtoupper($username);
-		preg_match ("/(UserAccNum=$USERNAME&PackageID=)+([0-9]){1,}/i", $ret, $arr); 			 
-		if(is_array($arr) && count($arr) > 0) 
-		{ 
-			$package = ereg_replace("UserAccNum=$USERNAME&PackageID=","", $arr[0]); 
-		}	
-
-		# Test for package id
-		if(!@$package > 0) 
-		{
-			if($this->debug) echo  'Invalid package Id, cannot add domain.';
-			return false;
-		}
-
-		# Add the Domain
-		$url  = $this->host.'/interfaces/standard/AddDomain.asp'; 
-		$post = "processing=0". 
-				"&stage=4".
-				"&UserAccNum=$username". 
-				"&action=ADD". 
-				"&selDomainReg=NONE".
-				"&PackageID=$package".
-				"&DomainName=$domain".
-				"&DomainExt=$tld"; 
-		$ret = $this->connect($url,$post, 5); 
-		if($this->debug) echo "

$url?$post
";		 
-
-		# if it timed out, no errors took place!
-		if(empty($ret))			
-		return true; 
-		else
-		return false;
-   }
-
-
-   /*
-   * Suspend account in helm
-   */ 
-   function suspend($username)
-   {
-		# Add the Domain
-		$url  = $this->host.'/interfaces/standard/user.asp'; 
-		$post = "action=EDIT".  
-				"&UserAccNum=$username". 
-				"&txtStatus=1"; 
-		$ret = $this->connect($url,$post, 5); 
-		if($this->debug) echo "

$url?$post
";		 
-
-		if($ret != false)
-		return true;
-		else
-		return false;
-   }
-
-
-   /*
-   * Unsuspend account in helm
-   */ 
-   function unsuspend($username)
-   {
-		# Add the Domain
-		$url  = $this->host.'/interfaces/standard/user.asp'; 
-		$post = "action=EDIT". 
-				"&UserAccNum=$username". 
-				"&txtStatus=0"; 
-		$ret = $this->connect($url,$post, 5); 
-		if($this->debug) echo "

$url?$post
";		 
-
-		if($ret != false)
-		return true;
-		else
-		return false;	   
-   }
-
-
-   /*
-   * Delete account from helm
-   */ 
-   function del($username)
-   {
-		# Add the Domain
-		$url  = $this->host.'/interfaces/standard/user.asp'; 
-		$post = "action=DELETE". 
-				"&UserAccNum=$username"; 
-		$ret = $this->connect($url,$post, 5); 
-		if($this->debug) echo "

$url?$post
";		 
-
-		if($ret == false)
-		return true;
-		else
-		return false;		   
-   }	     
-
-
-   /*
-   * Curl connect 
-   */  	   
-   function connect($url,$post, $timeout=false)
-   {
-		if($this->ssl) 
-		$url = 'https://'.$url;   
-		else
-		$url = 'http://'.$url;
-
-		$ch = curl_init(); 			
-		if($timeout != false)			
-		curl_setopt($ch, CURLOPT_TIMEOUT, 			$timeout);
-		curl_setopt($ch, CURLOPT_COOKIEJAR, 		$this->cookie_path);
-		curl_setopt($ch, CURLOPT_COOKIEFILE, 		$this->cookie_path);			 
-		curl_setopt($ch, CURLOPT_URL, 				$url);
-		curl_setopt($ch, CURLOPT_POST, 				1); 
-		curl_setopt($ch, CURLOPT_POSTFIELDS, 		$post);  
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 	1);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 	0);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 	0); 
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 	1);
-		curl_setopt($ch, CURLOPT_VERBOSE, 			1 );
-		curl_setopt($ch, CURLOPT_HEADER, 			1);
-
-		$data = curl_exec ($ch); 
-		curl_close ($ch);  
-		return $data; 
-   }    	      
-}
-?>
\ No newline at end of file
diff --git a/modules/core/import.inc.php b/modules/core/import.inc.php
deleted file mode 100644
index 494ace6e..00000000
--- a/modules/core/import.inc.php
+++ /dev/null
@@ -1,342 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-	
-/**
- * Import Handler Module.
- */
-class CORE_import
-{
-
-	### Validate the import file/upload.	
-	### Generate the array to display the field options.
-
-	function prepare_import($VAR, $construct)
-	{
-		global $_FILES, $C_debug, $smarty;
-
-		if($VAR['filetype'] == 'upload')
-		{
-			if(isset($_FILES['file']) && $_FILES['file']['size'] > 0)
-			{ 
-				# added str_replace for spaces, because Linux really doesn't like them much.
-				$this->filename = str_replace(" ","_",'import_'.$VAR['module'].'_'.$_FILES['file']['name']);
-				$this->file = PATH_FILES . $this->filename;
-				copy($_FILES['file']['tmp_name'], $this->file);		 
-			}	
-			else
-			{
-				$C_debug->alert('Please go back and enter a file to upload!');
-				return false;
-			}			
-		}
-		elseif ($VAR['filetype'] == 'local')
-		{
-			@$this->filename = $VAR['file'];
-			@$this->file = PATH_FILES.$VAR['file'];
-			if(!is_file($this->file))
-				$C_debug->alert('The specified file does not exist!');
-				return false;
-		}
-		else
-		{
-			$C_debug->alert('Please go back and enter all required fields!');
-			return false;
-		}
-
-		# open the file for parsing
-		$data 	= file_get_contents($this->file);
-		$rows 	= explode("\r\n", $data);
-
-
-		if($VAR['type'] == 'csv')
-			$sp = ',';
-		elseif($VAR['type'] == 'tab')
-			$sp = '	';
-		else
-			return false;
-
-		# get the first row for the example data
-		if(count($rows) == 0)
-		{	
-			return false;
-		}
-		else
-		{  
-			# set the columns and sample data smarty array:
-			$columns = explode($sp, $rows[0]);
-			$this->sbox = array('-- Use Constant Value --');
-
-			for($i=0;$isbox[] = "Field #$i: ".$columns[$i];
-
-				if($VAR['type'] && ereg("^\"",$smart[$i]['sample']) && ereg("\"$",$smart[$i]['sample']))
-				{
-					$smart[$i]['sample'] = ereg_replace("^\"","",$smart[$i]['sample']);
-					$smart[$i]['sample'] = ereg_replace("\"$","",$smart[$i]['sample']);
-				}
-			}
-
-			# set the smarty vars:
-			$smarty->assign('rows',count($rows));
-			$smarty->assign('columns',$smart);
-			$smarty->assign('file', $this->filename);
-			$smarty->assign('type', $VAR['type']);
-
-			# set the available fields:
-			$fields = explode(',', '--NONE--,'.$construct->method['import']);
-			$smarty->assign('fields', $fields);
-
-
-			$smarty->assign('fields_array',$this->build_fields($construct));	
-			return true;
-		}		
-	}
-
-	function build_fields(&$construct)
-	{
-		$fields_array = explode(",",$construct->method['import']);
-		$i = 0;
-		foreach ($fields_array as $f) {
-			$itbl[$i]['field'] = $f;
-			$itbl[$i]['options'] = @$this->sbox;
-			$itbl[$i]['type'] = '';
-			$itbl[$i]['custom'] = 0;
-			$i++;
-		}
-		if(isset($construct->import_custom) && count($construct->import_custom)) {
-			foreach ($construct->import_custom as $f) {
-				$itbl[$i]['field'] = $f['name'];
-				$itbl[$i]['options'] = $f['value'];
-				$itbl[$i]['type'] = $f['type'];
-				$itbl[$i]['custom'] = 1;
-				$i++;
-			}
-		}
-		return $itbl;			
-	}
-
-	### Perform the actual import
-	function do_new_import(&$VAR, &$construct)
-	{
-		global $C_debug;
-		$this->file = PATH_FILES.$VAR['file'];
-		$data 	= file_get_contents($this->file);
-		$rows 	= explode("\r\n", $data);
-
-		# get the file type:	
-		if($VAR['type'] == 'csv')
-			$sp = ',';
-		elseif($VAR['type'] == 'tab')
-			$sp = '	';
-		else
-			return false;
-
-		# get the first row for the example data
-		if(count($rows) == 0)
-		{	
-			return false;
-		}
-		else
-		{  
-			# get the available fields:
-			$fields = $this->build_fields($construct);
-
-			# start the insert statement				
-			$db = &DB();
-			$q = "INSERT INTO ".AGILE_DB_PREFIX."$construct->table ";
-			$sql = "SELECT * FROM ".AGILE_DB_PREFIX."$construct->table WHERE id = -1";  
-			$rs = $db->Execute($sql); 
-
-			$bad = 0;
-			# loop through the rows
-			for($row=0; $row".print_r($columns,true)."
";
-					$record = array();	  
-					for($i=0;$i 0) {
-							$record[$fields[$i]['field']] = @$columns[--$idx];
-							if($VAR['type'] && ereg("^\"",$record[$fields[$i]['field']]) && ereg("\"$",$record[$fields[$i]['field']])) {
-								$record[$fields[$i]['field']] = ereg_replace("^\"","",$record[$fields[$i]['field']]);
-								$record[$fields[$i]['field']] = ereg_replace("\"$","",$record[$fields[$i]['field']]);
-							}							
-						} else {
-							$record[$fields[$i]['field']] = @$VAR['import_constant'][$fields[$i]['field']];
-						}					
-
-					}
-
-					$record['site_id'] = DEFAULT_SITE; 
-					if(empty($record['id'])) 
-						$record['id'] = $db->GenID(AGILE_DB_PREFIX . $construct->table . '_id');
-
-					$SQL = $db->GetInsertSQL($rs, $record); 	
-					# echo $SQL."
";
-
-					/* call import_line_process */
-					if (is_callable(array($construct,'import_line_process'))) {
-						$construct->import_line_process($db, $VAR, $fields, $record);
-					}
-
-					if($VAR['import_type'] == 'db')			
-					{
-						# execute command
-						$db->Execute($SQL);
-					} 
-					else
-					{
-						# add to sql command for download
-						@$SQL_DL .= $SQL . ";\r\n\r\n";
-					}
-				} else {
-					$bad++;
-				}
-			}
-
-			if(@$VAR['import_type'] == 'dl')
-			{
-				header ("Content-Disposition: attachment; filename=$construct->table.sql" );
-				echo $SQL_DL;
-				exit;
-			}
-
-			$C_debug->alert("Imported $row record(s) and $bad record(s) were skipped.");
-			return true;
-		}						
-	}	    
-
-
-	### Validate the fields.
-	### Perform the actual import
-
-	function do_import($VAR, $construct)
-	{
-		global $C_debug;
-		$this->file = PATH_FILES.$VAR['file'];
-		$data 	= file_get_contents($this->file);
-		$rows 	= explode("\r\n", $data);
-
-		# get the file type:	
-		if($VAR['type'] == 'csv')
-			$sp = ',';
-		elseif($VAR['type'] == 'tab')
-			$sp = '	';
-		else
-			return false;
-
-		# get the first row for the example data
-		if(count($rows) == 0)
-		{	
-			return false;
-		}
-		else
-		{  
-			# get the available fields:
-			$fields = explode(',', ','.$construct->method['import']);
-
-			# start the insert statement				
-			$db = &DB();
-			$q = "INSERT INTO ".AGILE_DB_PREFIX."$construct->table ";
-			$sql = "SELECT * FROM ".AGILE_DB_PREFIX."$construct->table WHERE id = -1";  
-			$rs = $db->Execute($sql); 
-
-
-			# loop through the rows
-			for($row=0; $rowalert("You have used the table $field more than once!");
-						return false;
-					}
-
-					# get the field data:
-					if(!empty($field))
-					{ 
-						# get the data:
-						$data = $columns[$i];					
-						if($VAR['type'] && ereg("^\"",$data) && ereg("\"$",$data))
-						{
-							$data = ereg_replace("^\"","",$data);
-							$data = ereg_replace("\"$","",$data);
-						} 
-
-						# check for relational records:
-
-
-						$record["$field"] = $data;
-					}	 		
-				}
-
-				$record['site_id'] = DEFAULT_SITE; 
-				if(empty($record['id'])) 
-					$record['id'] = $db->GenID(AGILE_DB_PREFIX . $construct->table . '_id');
-
-				$SQL = $db->GetInsertSQL($rs, $record); 	
-
-				if($VAR['import_type'] == 'db')			
-				{
-					# execute command
-					$db->Execute($SQL);
-					if($import_rs === false)
-					{
-						# error message
-					}
-				} 
-				else
-				{
-					# add to sql command for download
-					@$SQL_DL .= $SQL . ";\r\n\r\n";
-				}
-			}
-
-			if($VAR['import_type'] == 'dl')
-			{
-				header ("Content-Disposition: attachment; filename=$construct->table.sql" );
-				echo $SQL_DL;
-				exit;
-			}
-
-			$C_debug->alert("Imported $row record(s).");	 				
-			return true;
-		}						
-	}	    
-} 
-?>
diff --git a/modules/core/list.inc.php b/modules/core/list.inc.php
deleted file mode 100644
index 2a0f18e1..00000000
--- a/modules/core/list.inc.php
+++ /dev/null
@@ -1,518 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE List Class
- *
- * @package AgileBill
- * @subpackage Core
- */
-class CORE_list {
-	private $id = 100;
-
-	/**
-	 * @todo deprecite this function - replace with mmenu()
-	 */
-	public function menu($input_id,$name,$table,$field,$default,$class,$all=false) {
-		$this->mmenu($input_id,$name,$table,$field,$default,'',$class,$all);
-	}
-	/**
-	 * Generate a select list, using the values in a table
-	 *
-	 * @param string $input_id HTML id="" value.
-	 *	+ If 'no', then a hot click img wont be included
-	 *	+ If 'all', then a blank item will be included
-	 * @param string $name HTML name="" value.
-	 * @param string $table Table to query for a list of items.
-	 * @param string $field Column to query for a list of items.
-	 * @param string $default Default Value to pre-select (if it exists)
-	 *	+ If 'all', then a blank item will be included
-	 * @param string|array $where SQL where conditions
-	 * @param string $class CSS class for the select list
-	 * @param bool $all If true, then a blank item will be included.
-	 *
-	 * @todo Remove the many ways of selecting all
-	 */
-	public function mmenu($input_id,$name,$table,$field,$default,$where,$class,$all=false) {
-		global $C_translate;
-
-		$noicon = false;
-
-		if ($input_id == 'no') {
-			$input_id = '';
-			$noicon = true;
-		}
-
-		if (! $input_id)
-			$input_id = sprintf('%s_%s_%s',$table,$field,$this->id++);
-
-		$db = &DB();
-		$result = $db->Execute(sqlSelect($db,$table,sprintf('id,%s',$field),$where,$field));
-		if ($result === false) {
-			global $C_debug;
-
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-
-		} else {
-			$return = sprintf('';
-
-			if ($i==0)
-				$return = $C_translate->translate('lists_none_defined');
-
-			if ($i > 0 && ! $noicon)
-				$return .= sprintf(' Zoom',THEME_NAME,$table,$input_id);
-
-			echo $return;
-		}
-	}
-
-	function decrypt($data) {
-		include_once(PATH_CORE.'crypt.inc.php');
-
-		return CORE_decrypt($data);
-	}
-
-	function menu_cc_admin($field,$account,$default,$class,$user=false) {
-		include_once(PATH_MODULES.'account_billing/account_billing.inc.php');
-		$abo = new account_billing;
-
-		echo $abo->menu_admin($field,$account,$default,$class,$user);
-	}
-
-	function menu_multi($default,$name,$table,$field,$id,$max,$class) {
-		include_once(PATH_CORE.'list_menu_multi.inc.php');
-
-		echo list_menu_multi($default,$name,$table,$field,$id,$max,$class);
-	}
-
-	function menu_files($id,$name,$default,$path,$pre,$ext,$class) {
-		include_once(PATH_CORE.'list_menu_files.inc.php');
-
-		echo list_menu_files($id,$name,$default,$path,$pre,$ext,$class);
-	}
-
-	/**
-	 * Generate a list of frequently used selections in OSB
-	 *
-	 * @param string $type List type
-	 * @param string $input_id HTML id="" value.
-	 * @param string $name HTML name="" value.
-	 * @param string $default Default Value to pre-select (if it exists)
-	 * @param string $class CSS class for the select list
-	 * @param bool $all If true, then a blank item will be included.
-	 */
-	public function menu_staticlist($type,$input_id,$name,$default,$class,$all=false) {
-		include_once(PATH_CORE.'list_staticlist.inc.php');
-		return list_menu_staticlist($type,$input_id,$name,$default,$class,$all);
-	}
-
-	public function format_currency($number,$currency_id=DEFAULT_CURRENCY) {
-		$number = $this->format_currency_decimal($number,$currency_id);
-
-		if (! $currency_id)
-			$currency_id = DEFAULT_CURRENCY;
-
-		return sprintf('%s%s %s',
-			$this->format_currency[$currency_id]['symbol'],
-			($number > .05 || $number == 0 || $number < -1 || DEFAULT_DECIMAL_PLACE == 2)
-				? number_format($number,DEFAULT_DECIMAL_PLACE)
-				: number_format($this->format_currency_decimal($number,$currency_id,2)),
-			$this->currency_iso($currency_id));
-	}
-
-	public function format_currency_num($number,$currency_id=DEFAULT_CURRENCY) {
-		$number = $this->format_currency_decimal($number,$currency_id);
-
-		if (! $currency_id)
-			$currency_id = DEFAULT_CURRENCY;
-
-		return sprintf('%s%s',
-			$this->format_currency[$currency_id]['symbol'],
-			($number > .05 || $number == 0 || $number < -1 || DEFAULT_DECIMAL_PLACE == 2)
-				? number_format($number,DEFAULT_DECIMAL_PLACE)
-				: number_format($this->format_currency_decimal($number,$currency_id),2));
-	}
-
-	public function format_currency_decimal($number,$currency_id,$decimals=DEFAULT_DECIMAL_PLACE) {
-		return ($number);
-		if (empty($number))
-			return 0;
-		if (empty($currency_id))
-			$currency_id = DEFAULT_CURRENCY;
-		if (! isset($this->format_currency[$currency_id]))
-			$this->currency($currency_id);
-		if (! isset($this->format_currency[DEFAULT_CURRENCY]))
-			$this->currency(DEFAULT_CURRENCY);
-
-		return round($number*=$this->format_currency[DEFAULT_CURRENCY]['convert'][$currency_id]['rate'],$decimals);
-	}
-
-	public function currency_list($ret,$currency_id=DEFAULT_CURRENCY)  {
-		global $smarty;
-
-		if (! isset($this->format_currency[$currency_id]))
-			$this->currency(DEFAULT_CURRENCY);
-
-		$smarty->assign($ret,$this->format_currency[DEFAULT_CURRENCY]['convert']);
-	}
-
-	public function currency_iso($currency_id=DEFAULT_CURRENCY) {
-		if (! isset($this->format_currency[$currency_id]))
-			$this->currency(DEFAULT_CURRENCY);
-
-		return $this->format_currency[$currency_id]['iso'];
-	}
-
-	public function currency($currency_id) {
-		static $CACHE = array();
-		$db = &DB();
-
-		if (! isset($CACHE[$currency_id])) {
-			$rs = $db->Execute(sqlSelect('currency','*',array('where'=>array('id'=>$currency_id))));
-			if ($rs && $rs->RecordCount())
-				$this->format_currency[$currency_id] = array(
-					'symbol' => $rs->fields['symbol'],
-					'convert' => unserialize($rs->fields['convert_array']),
-					'iso' => $rs->fields['three_digit']);
-			else
-				return false;
-		}
-
-		return true;
-	}
-
-	public function radio($input_id,$name,$table,$field,$id,$class) {
-		include_once(PATH_CORE.'list_radio.inc.php');
-
-		echo list_radio($input_id,$name,$table,$field,$id,$class);
-	}
-
-	public function check($input_id,$name,$table,$field,$default,$class) {
-		include_once(PATH_CORE.'list_check.inc.php');
-
-		echo list_check($input_id,$name,$table,$field,$default,$class);
-	}
-
-	public function select_groups($default,$field_name,$class,$size,$own_account) {
-		include_once(PATH_CORE.'list_select_groups.inc.php');
-
-		return list_select_groups($default,$field_name,$class,$size,$own_account);
-	}
-
-	public function calender_view($field,$default,$css,$id) {
-		include_once(PATH_CORE.'list_calendar.inc.php');
-
-		if (isset($default) && $default != '' && $default != '0')
-			$default = date(UNIX_DATE_FORMAT,$default);
-		else
-			$default = '';
-
-		echo list_calender_add($field,$default,$css,$id);
-	}
-
-	public function calender_add($field,$default,$css,$id='') {
-		if ($default == 'now')
-			$default = date(UNIX_DATE_FORMAT,time());
-
-		include_once(PATH_CORE.'list_calendar.inc.php');
-		echo list_calender_add($field,$default,$css,$id);
-	}
-
-	# @todo Remove?
-	public function calender_add_static_var($field,$default,$css) {
-		include_once(PATH_CORE.'list_calendar.inc.php');
-
-		if ($default == 'now')
-			$default = date(UNIX_DATE_FORMAT,time());
-
-		echo list_calender_add_static($field,$default,$css);
-	}
-
-	public function calender_search($field,$default,$css) {
-		if ($default == 'now')
-			$default = date(UNIX_DATE_FORMAT,time());
-
-		foreach (array(0,1) as $id) {
-			printf('  ',$field,$id);
-			$this->calender_view($field,$default,$css,$id);
-			echo '
';
-		}
-	}
-
-	public function setup_default_date($default,$css)	{
-		include_once(PATH_CORE.'list_setup_default_date.inc.php');
-
-		echo list_setup_default_date($default,$css);
-	}
-
-	public function card_type_menu($default_selected,$checkout_id,$field='checkout_plugin_data[card_type]',$class,$all=false) {
-		include_once(PATH_CORE.'list_card_type_menu.inc.php');
-
-		echo list_card_type_menu($default_selected,$checkout_id,$field,$class,$all);
-	}
-
-	public function time($date) {
-		if ($date == '')
-			$date = time();
-
-		return date(DEFAULT_TIME_FORMAT,$date);
-	}
-
-	public function date($date) {
-		if ($date == '')
-			$date = time();
-
-		return date(UNIX_DATE_FORMAT,$date);
-	}
-
-	public function date_time($date) {
-		if ($date == '')
-			return 'UNKNOWN';
-
-		return sprintf('%s  %s',$this->date($date),$this->time($date));
-	}
-
-	public function unserial($data,$var) {
-		global $smarty;
-
-		if (is_string($data))
-			$array = unserialize($data);
-		if (is_array($array))
-			$smarty->assign($var,$array);
-	}
-
-	public function smarty_array($table,$field,$sql,$return) { return $this->tmSmartyArray($table,$field,$sql,$return); }
-	public function tmSmartyArray($table,$field,$sql,$return) {
-		$db = &DB();
-		$smart = array();
-
-		# @todo this sqlSelect() is using a call for DEFAULT_SITE until all calls to smarty_array() dont start $sql with 'AND'
-		$result = $db->Execute($s=sqlSelect($table,sprintf('id,%s',$field),array('where'=>sprintf('site_id=%s %s',DEFAULT_SITE,$sql),'orderby'=>$field)));
-		if (! $result) {
-			global $C_debug;
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-
-			return false;
-		}
-
-		while (! $result->EOF) {
-			array_push($smart,$result->fields);
-			$result->MoveNext();
-		}
-
-		global $smarty;
-		$smarty->assign($return,$smart);
-
-		return true;
-	}
-
-	function translate($table,$field1,$field2,$id,$var) {
-		global $smarty;
-		$db = &DB();
-		$sql= "SELECT id, $field1 FROM ".AGILE_DB_PREFIX."$table
-			  WHERE site_id = " . $db->qstr(DEFAULT_SITE) . " AND
-			  language_id   = " . $db->qstr(SESS_LANGUAGE).  " AND " .
-			  $field2 . "   = " . $db->qstr($id);
-		$result = $db->Execute($sql);
-		if ($result === false)
-		{
-			global $C_debug;
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-			return false;
-		} else if($result->RecordCount() > 0) {
-			$smarty->assign("$var",$result->fields);
-			return $result->fields;
-		} else {
-			if (SESS_LANGUAGE == DEFAULT_LANGUAGE) {
-				return false;
-			} else {
-				$sql= "SELECT id, $field1 FROM ".AGILE_DB_PREFIX."$table
-					  WHERE site_id = " . $db->qstr(DEFAULT_SITE) . " AND
-					  language_id   = " . $db->qstr(DEFAULT_LANGUAGE).  " AND " .
-					  $field2 . "   = " . $db->qstr($id);
-				$result = $db->Execute($sql);
-				if ($result === false) {
-					global $C_debug;
-					$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-					return false;
-				} else if($result->RecordCount() > 0) {
-					$smarty->assign("$var",$result->fields);
-					return $result->fields;
-				} else {
-					return false;
-				}
-			}
-		}
-	}
-
-	public function bool($field,$curr_value,$class='form_menu',$extra='') {
-		# If the field is blank, we'll just return true/false
-		if (! $field)
-			return $curr_value ? _('Yes') : _('No');
-
-		if ($curr_value == 'all') {
-			$true = '';
-			$false= '';
-
-		} elseif($curr_value == '1') {
-			$true = ' selected="selected"';
-			$false= '';
-
-		} else {
-			$true = '';
-			$false= ' selected="selected"';
-		}
-
-		$return = sprintf('';
-
-		echo $return;
-	}
-
-	function graphview() {
-		global $VAR,$C_method;
-		$auth = Array('product:top','account_admin:top','affiliate:top','invoice:compare');
-		for($i=0; $iexe_noauth($m[0],$m[1]);
-				exit;
-			}
-		}
-	}
-
-	function bar_graph() {
-		global $VAR;
-		require_once(PATH_CORE   . 'graph.inc.php');
-		$graph   = new CORE_graph;
-		@$module = $VAR['graph_module'];
-		@$range  = $VAR['graph_range'];
-		@$start  = $VAR['graph_start'];
-		@$extra  = $VAR['graph_extra'];
-		$graph->BAR_graph($module,$range,$start,$extra);
-	}
-
-	function pie_graph() {
-		global $VAR;
-		require_once(PATH_CORE   . 'graph.inc.php');
-		$graph   = new CORE_graph;
-		@$module = $VAR['graph_module'];
-		@$method = $VAR['graph_method'];
-		@$range  = $VAR['graph_range'];
-		@$start  = $VAR['graph_start'];
-		@$extra  = $VAR['graph_extra'];
-		$graph->PIE_graph($module,$method,$range,$start,$extra);
-	}
-
-	# @todo consider changing this so that it returns the .inc file if the module is installed
-	# so that $a = x->is_installed('y'); require_once $a can be used
-	/**
-	 * Check if a module is installed
-	 *
-	 * @param string Name of Module to check
-	 * @return string include path to module, if installed, otherwise false
-	 */
-	public function is_installed($module) {
-		$file = sprintf('%s%s/%s.inc.php',PATH_MODULES,$module,$module);
-
-		# If we have already checked, then return the file.
-		if (isset($this->is_installed[$module]) && $this->is_installed[$module])
-			return $file;
-
-		if (file_exists($file) && $this->auth_method_by_name($module,'search')) {
-			$this->is_installed[$module] = true;
-			return $file;
-		}
-
-		$db = &DB();
-		$result = $db->Execute(sqlSelect('module','id',array('where'=>array('name'=>$module,'status'=>1))));
-		if ($result && $result->RecordCount() && file_exists($file)) {
-			$this->is_installed[$module] = true;
-			return $file;
-
-		} else {
-			return false;
-		}
-	}
-
-	# @todo this should probably be private?
-	public function auth_method_by_name($module,$method) {
-		global $C_auth;
-
-		if (! is_object($C_auth))
-			return false;
-
-		return $C_auth->auth_method_by_name($module,$method);
-	}
-
-	/**
-	 * Generate the admin menu
-	 */
-	public function generate_admin_menu() {
-		global $C_auth;
-
-		echo $C_auth->generate_admin_menu();
-	}
-
-	# @todo to deprecate
-	private function account($field) {
-		if (empty($this->account) && SESS_LOGGED) {
-			$db = &DB();
-			$sql    = 'SELECT * FROM ' . AGILE_DB_PREFIX . 'account WHERE
-						site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-						id  = ' . $db->qstr(SESS_ACCOUNT);
-			$result = $db->Execute($sql);
-			$this->account = $result->fields;
-		}
-		echo $this->account[$field];
-	}
-
-	# Get the AgileBill version info
-	# @todo to deprecate
-	private function version()  {
-		die();
-		require_once(PATH_CORE.'version.inc.php');
-	}
-}
-?>
diff --git a/modules/core/list_calendar.inc.php b/modules/core/list_calendar.inc.php
deleted file mode 100644
index d835516e..00000000
--- a/modules/core/list_calendar.inc.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Template:Calendar
- */
-
-/**
- * The main AgileBill Template Calendar Method
- *
- * @package AgileBill
- * @subpackage Template:Calendar
- */
-
-function list_calender_add($field,$default,$css,$fid) {
-	# Set the date to current date if 'now' is set as $default
-	if ($default == 'now')
-		 $default = date(UNIX_DATE_FORMAT,time());
-
-	$id = rand(9,999);
-	$ret = '';
-	if ($fid)
-		$ret .= sprintf(' ',$field,$fid,$id,$field,$fid,$css,$default);
-	else
-		$ret .= sprintf(' ',$field,$fid,$id,$field,$css,$default);
-	$ret .= sprintf('',$field,$fid,$id);
-	$ret .= '';
-
-	return $ret;
-}
-
-# @todo Remove?
-function list_calender_add_static($field,$default,$css) {
-	return list_calender_add($field,$default,$css,'');
-
-	# Set the date to current date if 'now' is set as $default
-	if ($default == 'now')
-		 $default = date(UNIX_DATE_FORMAT);
-
-	$id = rand(9,999);
-	$ret = '
-		 
-		
-		
-		';
-	return $ret;
-}
-?>
diff --git a/modules/core/list_card_type_menu.inc.php b/modules/core/list_card_type_menu.inc.php
deleted file mode 100644
index ebe60c5b..00000000
--- a/modules/core/list_card_type_menu.inc.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Unknown
- */
-
-/**
- * The main AgileBill List Credit Card Method
- *
- * @package AgileBill
- * @subpackage Unknown
- */
-
-function list_card_type_menu($default_selected,$checkout_id,$field,$class,$all=false) { 
-	global $C_translate;
-
-	# Define default list of accepted CC types
-	$def_accepted_arr = array(
-		'visa',
-		'mc',
-		'amex',
-		'discover',
-		'delta',
-		'solo',
-		'switch',
-		'jcb',
-		'diners',
-		'carteblanche',
-		'enroute');
-
-	$accepted_arr = array();
-	$db = &DB();
-
-	$rs = $db->Execute($q=sqlSelect($db,'checkout','plugin_data',$checkout_id ? array('id'=>$checkout_id) : ''));
-	if ($rs == false || $rs->RecordCount() == 0)
-		$accepted_arr = $def_accepted_arr;
-	else
-		while (! $rs->EOF) {
-			$cfg = unserialize($rs->fields['plugin_data']);
-
-			if ($cfg['card_type'])
-				$accepted_arr = array_merge($accepted_arr,$cfg['card_type']);
-
-			$rs->MoveNext();
-		}
-
-	if (! count($accepted_arr))
-		$accepted_arr = $def_accepted_arr;
-	else
-		$accepted_arr = array_values(array_unique($accepted_arr));
-
-	asort($accepted_arr);
-	$data = sprintf('';
-
-	return $data;
-}
-?>
diff --git a/modules/core/list_check.inc.php b/modules/core/list_check.inc.php
deleted file mode 100644
index b142cb48..00000000
--- a/modules/core/list_check.inc.php
+++ /dev/null
@@ -1,81 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-function list_check($input_id, $name, $table, $field, $default, $class)
-{
-	global $C_translate;
-
-	# get default
-	if(!isset($default))
-	{
-		$default = Array('');
-	}
-	else if (gettype($default) == 'array')
-	{
-		$default = $default;
-	}
-	else if (gettype($default) == 'string')
-	{
-		$default = unserialize($default);
-	}
-	else
-	{
-		$default = Array('');
-	}
-
-	# get the records
-	$db = &DB();
-	$sql= "SELECT id, $field FROM ".AGILE_DB_PREFIX."$table
-				WHERE site_id = " . $db->qstr(DEFAULT_SITE) . "
-				ORDER BY $field";
-	$result = $db->Execute($sql);
-
-	# error handling
-	if ($result === false)
-	{
-		global $C_debug;
-		$C_debug->error('list.inc.php','check', $db->ErrorMsg());
-	}			
-
-	# loop through the records
-	$i = 0;
-	while (!$result->EOF) {
-
-		#  Create the return code for Smarty
-		$checked  = '';
-		for($ii=0; $iifields["id"] || $default[$i] == 'all') $checked = ' checked';
-		}
-
-		$return .= ' ' . $result->fields["$field"] . '
';
-
-		$i++;
-		$result->MoveNext();
-	}
-
-	if($i==0)
-		$return .= 'None Defined'; ### TRANSLATE
-
-	echo $return;
-}
-?>
\ No newline at end of file
diff --git a/modules/core/list_currency.inc.php b/modules/core/list_currency.inc.php
deleted file mode 100644
index 45bdabd5..00000000
--- a/modules/core/list_currency.inc.php
+++ /dev/null
@@ -1,72 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-function list_format_currency ($number, $currency_id)
-{
-	if(empty($currency_id)) $currency_id = DEFAULT_CURRENCY;
-	if(isset($this->format_currency["currency_id"]))
-	{
-		return $this->format_currency["currency_id"]
-				. "" . number_format($number, DEFAULT_DECIMAL_PLACE) . " "
-				. $this->format_currency["currency_id"]["iso"];
-	}
-	else
-	{
-		$db     = &DB();
-		$sql    = 'SELECT * FROM ' . AGILE_DB_PREFIX . 'currency WHERE
-				   site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-				   id          = ' . $db->qstr($currency_id);
-		$result = $db->Execute($sql);
-		if($result->RecordCount() > 0)
-		{
-			$this->format_currency["currency_id"] = Array (
-								'symbol' => $result->fields["symbol"],
-								'iso'    => $result->fields["three_digit"]);                	
-			return $result->fields["symbol"]
-					. "" . number_format($number, DEFAULT_DECIMAL_PLACE) . " "
-					. $result->fields["three_digit"];
-		}
-		else
-		{
-			return number_format($number, DEFAULT_DECIMAL_PLACE);
-		}
-	}
-}
-
-
-function list_currency_iso ($currency_id)
-{
-	if(empty($currency_id)) $currency_id = DEFAULT_CURRENCY;
-	if(isset($this->format_currency["currency_id"]))
-	{
-		return $this->format_currency["currency_id"]["iso"];
-	}
-	else
-	{
-		$db     = &DB();
-		$sql    = 'SELECT * FROM ' . AGILE_DB_PREFIX . 'currency WHERE
-					site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-					id          = ' . $db->qstr($currency_id);
-		$result = $db->Execute($sql);
-		if($result->RecordCount() > 0)
-			return  $result->fields["three_digit"];
-	}
-}
-?>
\ No newline at end of file
diff --git a/modules/core/list_menu_files.inc.php b/modules/core/list_menu_files.inc.php
deleted file mode 100644
index 7988936c..00000000
--- a/modules/core/list_menu_files.inc.php
+++ /dev/null
@@ -1,87 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Smarty
- */
-
-/**
- * SMARTY template helper - list files
- */
-
-function list_menu_files($id,$name,$default,$path,$pre,$ext,$class) {
-	global $C_translate;
-
-	switch ($path) {
-		case 'product_cat': $path = sprintf('%s%s/blocks/product_cat/',PATH_THEMES,DEF_THEME_N); break;
-		case 'whois_plugin': $path = sprintf('%s/whois/',PATH_PLUGINS); break;
-		case 'product': $path = sprintf('%s/product/',PATH_PLUGINS); break;
-		case 'e911': $path = sprintf('%s/e911/',PATH_PLUGINS); break;
-		case 'provision_plugin': $path = sprintf('%s/provision/',PATH_PLUGINS); break;
-		case 'affiliate_plugin': $path = sprintf('%s/affiliate/',PATH_PLUGINS); break;
-		case 'checkout_plugin': $path = sprintf('%s/checkout/',PATH_PLUGINS); break;
-		case 'theme': $path = PATH_THEMES; break;
-		case 'language': $path = sprintf('%s/core/',PATH_LANGUAGE); break;
-	}
-
-	$dir = opendir($path);
-	while ($file_name = readdir($dir)) {
-		$display = true;
-
-		if (in_array($file_name,array('.','..')))
-			continue;
-
-		if (! empty($ext)) {
-				$cute = preg_replace("/{$ext}$/",'',$file_name);
-
-			if (! preg_match("/{$ext}$/",$file_name))
-				$display = false;
-		}
-
-		if (! empty($pre)) {
-				$cute = preg_replace("/^{$pre}/",'',$cute);
-
-				if (! preg_match("/^{$pre}/",$file_name))
-					$display = false;
-		}
-
-		if ($display)
-			$arr[$cute] = preg_replace('/_/',' ',$cute);
-	}
-
-	asort($arr);
-
-	$return = sprintf('';
-	}
-
-	echo $return;
-}
-?>
diff --git a/modules/core/list_menu_multi.inc.php b/modules/core/list_menu_multi.inc.php
deleted file mode 100644
index 38c09f7e..00000000
--- a/modules/core/list_menu_multi.inc.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage List
- */
-
-/**
- * The main AgileBill Menu List Multiple Method
- *
- * @package AgileBill
- * @subpackage List
- * @todo $id seems rendundant
- */
-
-function list_menu_multi($default,$name,$table,$field,$id,$max,$class) {
-	global $C_translate;
-
-	if (! isset($default))
-		$default = array('');
-	elseif (gettype($default) == 'array') {}
-	elseif (gettype($default) == 'string')
-		$default = unserialize($default);
-	else
-		$default = array('');
-
-	$db = &DB();
-	$result = $db->Execute(sqlSelect($db,$table,sprintf('id,%s',$field),'',$field));
-	if ($result === false) {
-		global $C_debug;
-
-		$C_debug->error(__FILE__,__METHOD__, $db->ErrorMsg());
-		return;
-	}
-
-	if ($result->RecordCount() > $max && $result->RecordCount() != 0)
-		$size = $max;
-	else
-		$size = $result->RecordCount();
-
-	$return = sprintf('';
-
-	if ($i==0) {
-		$return = $C_translate->translate('lists_none_defined');
-		if ($name)
-			$return .= sprintf('',$name);
-	}
-
-	echo $return;
-}
-?>
diff --git a/modules/core/list_menu_theme.inc.php b/modules/core/list_menu_theme.inc.php
deleted file mode 100644
index 46c5327b..00000000
--- a/modules/core/list_menu_theme.inc.php
+++ /dev/null
@@ -1,85 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-function list_menu_theme ($name, $id, $class)
-{
-	global $C_translate, $C_auth;
-
-	if(!isset($this->id)) $this->id = 100;
-
-	# set the input id
-	if($id = '') $id = DEFAULT_THEME;
-
-
-	# get the records
-	$db = &DB();
-	$sql= "SELECT * FROM "
-		.AGILE_DB_PREFIX."theme WHERE site_id = '" . DEFAULT_SITE . "' ORDER BY name,description";
-	$result = $db->Execute($sql);	
-
-	# error handling
-	if ($result === false)
-	{
-		global $C_debug;
-		$C_debug->error('list.inc.php','menu', $db->ErrorMsg());
-		return false;
-	}		
-
-	# start the return variable
-	$return = '';
-	return $return;
-}
-?>
\ No newline at end of file
diff --git a/modules/core/list_radio.inc.php b/modules/core/list_radio.inc.php
deleted file mode 100644
index 8e8648ab..00000000
--- a/modules/core/list_radio.inc.php
+++ /dev/null
@@ -1,57 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-function list_radio($input_id, $name, $table, $field, $id, $class)
-{
-	global $C_translate;
-	$db = &DB();
-	$sql= "SELECT id, $field FROM ".AGILE_DB_PREFIX."$table WHERE site_id = '" . DEFAULT_SITE . "' ORDER BY $field";
-	$result = $db->Execute($sql);
-	if ($result === false)
-	{
-		global $C_debug;
-		$C_debug->error('list.inc.php','radio', $db->ErrorMsg());
-	}			
-	if($result->RecordCount() >= 5)
-	{
-		$count = 5;
-	}else{
-		$count = $result->RecordCount();
-	}
-	if($id == "all")
-		$return .= ' All 
';	
-	$i = 0;
-	while (!$result->EOF) {
-		if($id == $result->fields["id"])
-		{
-			$return .= ' ' . $result->fields["$field"] . '
';
-		}
-		else
-		{
-			$return .= ' ' . $result->fields["$field"] . '
';
-		}
-		$i++;
-		$result->MoveNext();
-	}								
-	if($i==0)
-		$return .= ''. $C_translate->translate('lists_none_defined','CORE','');
-	return $return;
-}
-?>
\ No newline at end of file
diff --git a/modules/core/list_select_groups.inc.php b/modules/core/list_select_groups.inc.php
deleted file mode 100644
index 2ec8a1bf..00000000
--- a/modules/core/list_select_groups.inc.php
+++ /dev/null
@@ -1,180 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-function list_select_groups($default, $field_name, $class, $size, $own_account)
-{
-	global $C_auth;	
-
-	# get the default group	
-	if(!isset($default) && $default == "")
-	{
-		$default = Array(DEFAULT_GROUP);
-	}
-	else if(gettype($default) == 'array')
-	{
-		#$default = $default;
-	}
-	else if(gettype($default) == 'string')
-	{
-	  $default = unserialize($default);
-	}
-
-
-	for($i=0; $iExecute($sql); 
-	if ($result === false)
-	{
-		global $C_debug;
-		$C_debug->error('list.inc.php','select_groups', $db->ErrorMsg());
-	}		
-
-	# number of results
-	if($result->RecordCount() > 0)
-	{
-
-		# set the results to an array:
-		$arr = $result->GetArray();	
-
-		# start the list
-		$ret = '';
-
-		#----------------------
-		# start the parent loop
-		#----------------------
-		$group = 0;
-		$arr_count = count($arr); 		
-		for($i=0; $i < $arr_count; $i++)
-		{
-
-		####################
-		### Is auth?
-		if(!$C_auth->auth_group_by_id($arr[$i]['id']))
-		$disabled = ' disabled="disabled"';
-		else
-		$disabled = '';
-
-		#####################
-
-			$level = 0;
-			if($arr[$i]['parent_id'] == $group)
-			{
-				#if($own_account && $checked[$arr[$i]['id']] == true) $disabled = ' disabled';
-
-				$ret .= '  '. $arr[$i]['name'] .'
';
-
-				#----------------------
-				# start the child loop
-				#----------------------
-				$level++;
-				$ii_group = $arr[$i]['id'];
-				$ii_print = 1;
-
-				# count the available childs for this group
-				$count_child[$ii_group]=0;
-				for($c_child=0; $c_child < $arr_count; $c_child++)
-					if($arr[$c_child]['parent_id'] == $ii_group) $count_child[$ii_group]++;
-
-				for($ii=0; $ii < $arr_count; $ii++)
-				{
-
-			################
-			### Is auth?
-			if(!$C_auth->auth_group_by_id($arr[$ii]['id']))
-			$disabled = ' disabled="disabled"';
-			else
-			$disabled = '';
-			#################
-
-					if($arr[$ii]['parent_id'] == $ii_group)
-					{
-						#if($own_account && $checked[$arr[$ii]['id']] == true) $disabled = ' disabled';
-
-						$ret .= '  |__';
-						$ret .= '  '. $arr[$ii]['name'] .'
';
-
-						$ii_print++;
-
-						#--------------------------
-						# start the sub-child loop
-						#--------------------------
-						$level++;
-						$iii_group = $arr[$ii]['id'];
-						$iii_print = 0;
-						for($iii=0; $iii < $arr_count; $iii++)
-						{
-
-			################
-			### Is auth?
-			if(!$C_auth->auth_group_by_id($arr[$iii]['id']))
-			$disabled = ' disabled="disabled"';
-			else
-			$disabled = '';
-			#################
-
-							if($arr[$iii]['parent_id'] == $iii_group)
-							{
-								#if($own_account && $checked[$arr[$iii]['id']] == true) $disabled = ' disabled';
-
-								if($count_child[$ii_group] < $ii_print)
-								{
-									$ret .= '         |__ ';
-								}
-								else
-								{
-									$ret .= '  |      |__ ';
-								}
-								$ret .= '  '. $arr[$iii]['name'] .'
';
-								$iii_print++;
-							}	
-						}
-						$level--;	
-						#-----------------------
-						# end of sub-child loop
-						#-----------------------
-
-					}	
-				}
-				$level--;	
-				#-------------------
-				# end of child loop
-				#-------------------
-			}
-		}		    		
-	}	
-	else
-	{
-		return 'No groups available!'; // translate!
-	}
-	return $ret;     	 			
-}
-?>
diff --git a/modules/core/list_setup_default_date.inc.php b/modules/core/list_setup_default_date.inc.php
deleted file mode 100644
index bdd57325..00000000
--- a/modules/core/list_setup_default_date.inc.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage List
- */
-
-/**
- * The main AgileBill List Default Date Method
- *
- * @package AgileBill
- * @subpackage List
- */
-
-function list_setup_default_date($default,$css) {
-	global $C_translate;
-	$arr = unserialize($default);
-	$ret ='';
-
-	# loop through the menus
-	for ($i=0; $i<3; $i++) {
-		$ret .= sprintf('';
-	}
-
-	$ret .= '';
-
-	return $ret;
-}
-?>
diff --git a/modules/core/list_staticlist.inc.php b/modules/core/list_staticlist.inc.php
deleted file mode 100644
index 2e4e57bb..00000000
--- a/modules/core/list_staticlist.inc.php
+++ /dev/null
@@ -1,288 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill Static Lists Method
- *
- * @package AgileBill
- * @subpackage List
- */
-
-/**
- * Generate a list of frequently used selections in OSB
- *
- * @param string $type List type
- * @param string $input_id HTML id="" value.
- * @param string $name HTML name="" value.
- * @param string $default Default Value to pre-select (if it exists)
- * @param string $class CSS class for the select list
- * @param bool $all If true, then a blank item will be included.
- */
-function list_menu_staticlist($type,$input_id,$name,$default,$class,$all=false) {
-	global $C_list;
-
-	# Whether the values are also keys.
-	$nokeys = false;
-	$list = array();
-
-	switch ($type) {
-		case 'assoc_grant_type':
-			$list = array(
-				0=>_('Grant access for specified amount of days'),
-				1=>_('Grant access while associated subscription is active'),
-				2=>_('Grant access forerver')
-			);
-
-			break;
-
-		case 'assoc_prod_type':
-			$list = array(
-				0=>_('Require All Selected Products'),
-				1=>_('Require Any One Selected Product')
-			);
-
-			break;
-
-		case 'charge_sweep':
-			$list = array(
-				0=>_('Daily'),
-				1=>_('Weekly'),
-				2=>_('Monthly'),
-				3=>_('Quarterly'),
-				4=>_('Semi-Annually'),
-				5=>_('Annually'),
-				6=>_('Service Rebill')
-			);
-
-			break;
-
-		case 'commissiontype':
-			$list = array(
-				0=>_('None'),
-				1=>_('Percentage Based'),
-				2=>('Flat Rate')
-			);
-
-			break;
-
-		# @todo To deprecate this and standardise with commissiontype
-		case 'discounttype':
-			$list = array(
-				0=>_('Percentage Based'),
-				1=>_('Flat Rate')
-			);
-
-			break;
-
-		case 'copluginmode':
-			$list = array(
-				0=>_('Test'),
-				1=>_('Live')
-			);
-
-			break;
-
-		case 'domaintype':
-			$list = array(
-				'register'=>_('Register'),
-				'transfer'=>_('Transfer'),
-				'park'=>_('Park')
-			);
-
-			break;
-
-		case 'email_piping':
-			$list = array(
-				0=>' ',
-				1=>'POP',
-				2=>'IMAP'
-			);
-
-			break;
-
-		case 'email_piping_action':
-			$list = array(
-				0=>_('Leave message in mailbox'),
-				1=>_('Delete message from mailbox')
-			);
-
-			break;
-
-		case 'invoice_delivery':
-			$list = array(
-				0=>_('None'),
-				1=>_('E-Mail'),
-				2=>_('Print')
-			);
-
-			break;
-
-		case 'invoice_show_itemized':
-			$list = array(
-				0=>_('Overview Only'),
-				1=>_('Full Detail')
-			);
-
-			break;
-
-		case 'nametitle':
-			$list = array(
-				_('Mr'),
-				_('Ms'),
-				_('Mrs'),
-				_('Miss'),
-				_('Dr'),
-				_('Prof')
-			);
-			$nokeys = true;
-
-			break;
-
-		case 'os':
-			$list = array(
-				0=>'Linux',
-				1=>'Windows'
-			);
-
-			break;
-
-		case 'recur_schedule':
-			$list = array(
-				0=>_('Weekly'),
-				1=>_('Monthly'),
-				2=>_('Quarterly'),
-				3=>_('Semi-Annually'),
-				4=>_('Annually'),
-				5=>_('Two years'),
-				6=>_('Three Years')
-			);
-
-			break;
-
-		case 'recur_type':
-			$list = array(
-				0=>_('Bill on Aniversary Date of Subscription'),
-				1=>_('Bill on Fixed Schedule')
-			);
-
-			break;
-
-		case 'pricetype':
-			$list = array(
-				0=>_('One-time Charge'),
-				1=>_('Recurring Membership/Subscription'),
-				2=>_('Trial for Membership/Subscription')
-			);
-
-			break;
-
-		case 'servicetype':
-			if ($C_list->is_installed('host_server')) {
-				$list['host'] = _('Hosting');
-				$list['host_group'] = _('Hosting & Group Access');
-				$list['domain'] = _('Domain Name');
-			}
-			$list['none'] = _('Recurring Only');
-
-			break;
-
-		case 'servicequeue':
-			$list = array(
-				'new'=>_('Add New'),
-				'active'=>_('Activate'),
-				'inactive'=>_('Deactivate'),
-				'delete'=>_('Delete'),
-				'edit'=>_('Edit/Update'),
-				'queue_none'=>_('None')
-			);
-
-			break;
-
-		case 'statictype':
-			$list = array(
-				'small_text'=>_('Small Text'),
-				'medium_text'=>_('Medium Text'),
-				'large_text'=>_('Large Text'),
-				'dropdown_list'=>_('Dropdown List'),
-				'calendar'=>_('Calendar'),
-				'file_upload'=>_('File Upload'),
-				'status'=>_('Status'),
-				'checkbox'=>_('Checkbox'),
-				'hidden'=>_('Hidden')
-			);
-
-			break;
-
-		case 'tasktype':
-			$list = array(
-				0=>_('Internal Method'),
-				1=>_('System Call')
-			);
-
-			break;
-
-		case 'trial_length':
-			$list = array(
-				0=>_('Days'),
-				1=>_('Weeks'),
-				2=>_('Months')
-			);
-
-			break;
-
-		default: return sprintf('Unknown staticlist: %s',$type);
-	}
-
-	# If ID is blank, we'll just return the value
-	if (! $input_id)
-		return $list[$default];
-
-	# If the NAME is blank, we'll return the list itself
-	if (! $name)
-		return $list;
-
-	$return = sprintf('';
-
-	return $return;
-}
diff --git a/modules/core/login.inc.php b/modules/core/login.inc.php
deleted file mode 100644
index 6d43aad0..00000000
--- a/modules/core/login.inc.php
+++ /dev/null
@@ -1,208 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core:Login
- */
-
-/**
- * The main AgileBill Login Class
- *
- * @package AgileBill
- * @subpackage Core:Login
- */
-class CORE_login_handler {
-	/**
-	 * Login to OSB
-	 */
-	public function login($VAR,$md5=true) {
-		global $C_translate, $C_debug;
-		$db = &DB();
-
-		# check that the username/password are both set
-		if ((! $VAR['_username']) || (! $VAR['_password'])) {
-			$C_debug->alert($C_translate->translate('login_enter_both','',''));
-
-			return false;
-		}
-
-		$pass = $md5 ? md5($VAR['_password']) : $VAR['_password'];
-
-		# Check the database for a match
-		$rs = $db->Execute(
-			sqlSelect('account','id,status,username,password,date_expire',
-				array('where'=>array('username'=>$VAR['_username'],'password'=>$pass))));
-
-		if (! $rs || ! $rs->RecordCount() == 1) {
-			$C_debug->alert($C_translate->translate('login_un_pw_failed','',''));
-
-			# Log as a failed login
-			$this->lock_check($VAR,0,$VAR['_username']);
-
-			return false;
-		}
-
-		# Get the account id
-		$id = $rs->fields['id'];
-
-		# Check that their is no lock on this account id or IP address:
-		if ($this->locked($id)) {
-			$C_debug->alert($C_translate->translate('login_locked','',''));
-
-			return;
-		}
-
-		if ($rs->fields['date_expire'] == 0 || ! $rs->fields['date_expire'])
-			$date_expire = time()+99;
-		else
-			$date_expire = $rs->fields['date_expire'];
-
-		# Check that it is an active account
-		if ($rs->fields['status'] != 1 || $date_expire <= time()) {
-			# Inactive account
-			$C_debug->alert($C_translate->translate('login_inactive','',''));
-
-			# Log as failed login
-			$this->lock_check($VAR,0,$id);
-
-			return;
-
-		} else {
-			# Active account - check for password sharing if login_share module is installed
-			include_once(PATH_CORE.'list.inc.php');
-			$C_list = new CORE_list;
-
-			if ($C_list->is_installed('login_share')) {
-				include_once(PATH_MODULES.'login_share/login_share.inc.php');
-				$share = new login_share;
-
-				if (! $share->login($id,$VAR['_username'])) {
-					# Shared account alert
-					$C_debug->alert($C_translate->translate('shared_account','login_share',''));
-
-					# Log as failed login
-					$this->lock_check($VAR,0,$id);
-
-					return;
-				}
-			}
-		}
-
-		# Set the expiry date of the login session
-		$date_expire = time()+(SESSION_EXPIRE*60);
-
-		# Update the DB
-		$rs = $db->Execute(
-			sqlUpdate($db,'session',array('ip'=>USER_IP,'date_expire'=>$date_expire,'logged'=>1,'account_id'=>$id),array('id'=>SESS)));
-
-		# Delete any old sessions for this account
-		$rs = $db->Execute(sqlDelete($db,'session',sprintf('account_id=%s AND id!="%s"',$id,SESS)));
-
-		# Return logged in message
-		$C_debug->alert($C_translate->translate('login_success','',''));
-
-		# Get the last successful login:
-		$rs = $db->Execute(
-			sqlSelect('login_log','ip,date_orig',array('where'=>array('account_id'=>$id,'status'=>1),'orderby'=>'date_orig DESC','limit'=>1)));
-
-		if ($rs && $rs->RecordCount())
-			$C_debug->alert(
-				str_replace('%DATE%',
-					sprintf('%s  %s',date(UNIX_DATE_FORMAT,$rs->fields['date_orig']),date(DEFAULT_TIME_FORMAT,$rs->fields['date_orig'])),
-					str_replace('%IP%',sprintf('%s',$rs->fields['ip']),_('Last successful login was on %DATE% from %IP%'))));
-
-		# Log the successful login
-		$this->lock_check($VAR,1,$id);
-	}
-
-	public function logout($VAR) {
-		global $C_debug,$C_translate;
-
-		$db = &DB();
-
-		# Logout the current session by editing the database record
-		$db->Execute(sqlUpdate($db,'session',array('logged'=>0),array('id'=>SESS)));
-
-		# Delete any session caches!
-		$db->Execute(sqlDelete($db,'session_auth_cache',array('session_id'=>SESS)));
-
-		# logout success:
-		$C_debug->alert($C_translate->translate('logout_success','',''));
-	}
-
-	# @todo this should move to login_lock.inc.php
-	private function locked($account_id) {
-		global $C_list;
-
-		include_once(PATH_CORE.'list.inc.php');
-		$C_list = new CORE_list;
-
-		if (! $C_list->is_installed('login_lock'))
-			return false;
-
-		$db = &DB();
-
-		$rs = $db->Execute(
-			sqlSelect('login_lock','id',
-				array('where'=>
-					sprintf('ip=::%s:: AND date_expire>=%s %s',USER_IP,time(),$account_id ? sprintf('AND account_id=%s',$account_id) : ''))));
-
-		if ($rs && $rs->RecordCount())
-			return true;
-		else
-			return false;
-	}
-
-	# @todo this should move to login_lock.inc.php
-	private function lock_check($VAR,$status,$account_id) {
-		global $C_list;
-
-		include_once(PATH_CORE.'list.inc.php');
-		$C_list = new CORE_list;
-
-		$db = &DB();
-
-		# Create the appropriate login attempt record.
-		$db->Execute(sqlInsert($db,'login_log',array('ip'=>USER_IP,'account_id'=>$account_id,'date_orig'=>time(),'status'=>$status)));
-
-		# if this is a successfull login, we can now exit...
-		if ($status == 1 || ! $C_list->is_installed('login_lock'))
-			return true;
-
-		# Determine the time period to check for login attempts after:
-		$date_orig = time()-(LOGIN_ATTEMPT_TIME*60);
-
-		# Check the database for all the failed login attempts from this IP withing the time period defined in the setup.
-		$rs = $db->Execute(sqlSelect('login_log','COUNT(id) as id',array('where'=>sprintf('ip=::%s:: AND date_orig>=%s AND status=0',USER_IP,$date_orig))));
-
-		# Check that it does not exceed the allowed failed login attempts
-		if ($rs && $rs->fields['id']>=LOGIN_ATTEMPT_TRY) {
-			# Get the time this login block will expire:
-			$date_expire = time()+(LOGIN_ATTEMPT_LOCK*60);
-
-			# Delete all old blocks for this ip
-			$result = $db->Execute(sqlDelete($db,'login_lock',array('ip'=>USER_IP)));
-
-			# Create a block on this login
-			$result = $db->Execute(sqlInsert($db,'login_lock',array('ip'=>USER_IP,'date_orig'=>time(),'date_expire'=>$date_expire)));
-		}
-	}
-}
-?>
diff --git a/modules/core/method.inc.php b/modules/core/method.inc.php
deleted file mode 100644
index c9ab8c83..00000000
--- a/modules/core/method.inc.php
+++ /dev/null
@@ -1,156 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill Method Class
- *
- * @package AgileBill
- * @subpackage Core
- */
-class CORE_method {
-	public function do_all() {
-		global $C_auth,$C_sess,$C_debug,$C_translate,$VAR;
-
-		# If we dont have anything to do, we'll return
-		if (empty($VAR['do']))
-			return;
-
-		if (! is_array($VAR['do'])) {
-			$C_debug->alert(sprintf('VAR[do] is NOT an array (%s), how did you get here?',serialize($VAR['do'])));
-			return;
-		}
-
-		foreach ($VAR['do'] as $value) {
-			if (preg_match('/:/',$value)) {
-				list($module,$method) = explode(':',$value,2);
-				$C_translate->value['core']['module_name'] = sprintf('%s:%s',$module,$method);
-
-				if ($module && $method) {
-					if ($C_auth->auth_method_by_name($module,$method)) {
-						if (file_exists($file = sprintf('%s/%s/%s.inc.php',PATH_MODULES,$module,$module))) {
-							include_once($file);
-
-							if (class_exists($module) && method_exists($module,$method)) {
-								eval(sprintf('$%s = new %s(%s);$%s->%s($VAR,$%s);',
-									$module,$module,isset($VAR['id']) ? $VAR['id'] : 'null',$module,$method,$module));
-
-							} else {
-								$C_debug->alert($C_translate->translate('method_non_existant','core',''));
-							}
-
-						} else {
-							$C_debug->alert($C_translate->translate('module_non_existant','core',''));
-						}
-
-					} else {
-						$C_debug->alert($C_translate->translate('module_non_auth','core',''));
-					}
-
-				} else {
-					$C_debug->alert($C_translate->translate('method_invalid','core',''));
-				}
-
-			} else {
-				$C_debug->alert($C_translate->translate('method_invalid','core',''));
-			}
-		}
-	}
-
-	/**
-	 * Execute a method that supports output for a template
-	 */
-	public function exetm($module,$method) {
-		return $this->exe($module,'tm'.$method);
-	}
-
-	/**
-	 * Execute a modules method
-	 */
-	public function exe($module,$method) {
-		global $C_auth,$C_sess,$C_debug,$C_translate,$VAR;
-
-		$C_translate->value['core']['module_name'] = sprintf('%s:%s',$module,$method);
-
-		if ($module != '' && $method != '' && gettype($module) == 'string' && gettype($method) == 'string') {
-			if ($C_auth->auth_method_by_name($module,$method)) {
-				$this->exe_noauth($module,$method);
-
-			} else {
-				$this->result = false;
-				$this->error = $C_translate->translate('module_non_auth','core','');
-			}
-
-		} else {
-			$this->result = false;
-			$this->error = $C_translate->translate('method_invalid','core','');
-		}
-	}
-
-	/**
-	 * Execute a modules method
-	 */
-	public function exe_noauth($module,$method) {
-		global $C_auth,$C_sess,$C_debug,$C_translate,$VAR;
-
-		$args = null;
-
-		if (count(func_get_args())>2) {
-			$args = func_get_args();
-			array_shift($args);
-			array_shift($args);
-		}
-
-		$C_translate->value['core']['module_name'] = sprintf('%s:%s',$module,$method);
-
-		if ($module != '' && $method != '' && gettype($module) == 'string' && gettype($method) == 'string') {
-			if (file_exists($file = sprintf('%s/%s/%s.inc.php',PATH_MODULES,$module,$module))) {
-				include_once($file);
-
-				if (class_exists($module) && method_exists($module,$method)) {
-					eval(sprintf('$%s = new %s(%s);$%s->%s($VAR,$%s,$args);',
-						$module,$module,(isset($VAR['id']) ? $VAR['id'] : 'null'),$module,$method,$module));
-
-					global $smarty;
-
-					$smarty->assign_by_ref('return',$account);
-					$this->result = true;
-					$this->error = false;
-
-				} else {
-					$this->result = false;
-					$this->error = $C_translate->translate('method_non_existant','core','');
-				}
-
-			} else {
-				$this->result = false;
-				$this->error = $C_translate->translate('module_non_existant','core','');
-			}
-
-		} else {
-			$this->result = false;
-			$this->error = $C_translate->translate('method_invalid','core','');
-		}
-	}
-}
-?>
diff --git a/modules/core/method_ajax.inc.php b/modules/core/method_ajax.inc.php
deleted file mode 100644
index 48f09f0e..00000000
--- a/modules/core/method_ajax.inc.php
+++ /dev/null
@@ -1,84 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-class CORE_method
-{
-	function do_all()
-	{
-		global $C_auth, $C_sess, $C_debug, $C_translate, $VAR;
-		if(empty($VAR['do'])) return;
-
-		for($i=0; $i < count($VAR['do']); $i++)
-		{
-			if(!empty($VAR['do'][$i]))
-			{
-				if(ereg(":", $VAR['do'][$i]))
-				{
-					$identifier = explode(':',$VAR['do'][$i]);
-					$module = $identifier[0];
-					$method = strtolower($identifier[1]);   		                 
-					if	(
-							$module  != '' 		&&
-							$method  != ''    	&&
-							gettype($module) ==  'string' &&
-							gettype($method) ==  'string'
-						)
-					{
-						if($C_auth->auth_method_by_name($module,$method))
-						{
-							if (file_exists(PATH_MODULES . '/' . $module . '/' . $module . '.inc.php'))
-							{
-								include_once(PATH_MODULES . '/' . $module . '/' . $module . '.inc.php');
-								if(class_exists($module))
-								{
-									$eval = '$' . $module . ' = new ' . $module . '(); ';
-									$eval .= '$this_Obj  = $' . $module . ';';
-									$eval .= '$this_Obj->' . $method . '($VAR,$this_Obj);';
-									eval ($eval); 	
-								}
-								else
-								{
-									echo 'method_non_existant';
-								}
-							}
-							else
-							{
-								echo 'module_non_existant';
-							}
-						}
-						else
-						{
-						   echo 'Logged Out or Non-authorized';
-						}                
-					}
-					else
-					{
-						echo 'method_invalid';
-					}
-				}
-				else
-				{
-					echo 'method_invalid';
-				}
-			}
-		}
-	}
-}	
-?>
\ No newline at end of file
diff --git a/modules/core/post.inc.php b/modules/core/post.inc.php
deleted file mode 100644
index 0c0c2804..00000000
--- a/modules/core/post.inc.php
+++ /dev/null
@@ -1,67 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-/*
- * include_once(PATH_CORE.'post.inc.php');
- * $post = new CORE_post;
- * $result = $post->post_data($host, $url, $data);
- */
-class CORE_post
-{ 
-    // post data and return reply
-    function post_data ($host, $url, $data, $port=80)
-    { 
-    	if (strlen($host)<1) return false; 
-    	if (strlen($url)<1)  return false; 
-    	if ((!is_array($data)) || sizeof($data)<1) return false;
-
-    	$fp = @fsockopen ($host, $port, $errno, $errstr, 120);
-    	$ret = ""; 
-    	@$req = substr ($url, $p);
-    	
-    	if ($fp) {
-    		fputs ($fp, "POST $req HTTP/1.0\n");
-    		$this->post_send_headers ($fp);
-    		fputs ($fp, "Content-type: application/x-www-form-urlencoded\n");
-    		$out = "";
-    		while (list ($k, $v) = each ($data)) {
-    			if(strlen($out) != 0) $out .= "&";
-    			$out .= rawurlencode($k). "=" .rawurlencode($v);
-    		}
-    		$out = trim ($out);
-    		fputs ($fp, "Content-length: ".strlen($out)."\n\n");
-    		fputs ($fp, "$out");
-    		fputs ($fp, "\n");
-    		while(!feof($fp))  
-    			$ret .= fgets($fp,128); 
-    		fclose ($fp);
-    	} 
-    	return $ret; 
-    }	
-
-    // send out "browser" headers
-    function post_send_headers ($fp) {
-    	fputs ($fp, "Accept: */*\n");
-    	fputs ($fp, "Accept-Language: en\n");
-    	fputs ($fp, "Connection: Keep-Alive\n");
-    	fputs ($fp, "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)\n");
-    }
-}
-?>
\ No newline at end of file
diff --git a/modules/core/search.inc.php b/modules/core/search.inc.php
deleted file mode 100644
index 53bf7eff..00000000
--- a/modules/core/search.inc.php
+++ /dev/null
@@ -1,617 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill Search Class
- *
- * @package AgileBill
- * @subpackage Core
- */
-class CORE_search {
-	public $recent_js;
-	public $recent_menu;
-	public $saved_js;
-	public $saved_menu;
-
-	/**
-	 * Create a new search record.
-	 *
-	 * @param array Contains the elements of the search query
-	 * @return void
-	 * @since Version 1.0
-	 */
-	public function add($arr) {
-		$db = &DB();
-
-		# Determine the search id:
-		$this->id = $db->GenID(AGILE_DB_PREFIX.'search_id');
-
-		# Create the search record
-		$result = $db->Execute(sqlInsert($db,'search',array(
-			'session_id'=>SESS,
-			'account_id'=>SESS_ACCOUNT,
-			'module'=>$arr['module'],
-			'date_orig'=>time(),
-			'date_expire'=>(time()+(SEARCH_EXPIRE*60)),
-			'full_sql'=>$arr['sql'],
-			'order_by'=>$arr['order_by'],
-			'limit_no'=>$arr['limit'],
-			'results'=>$arr['results']
-			),$this->id));
-
-		# Error reporting
-		if (! $result) {
-			global $C_debug;
-
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-		}
-	}
-
-	/**
-	 * Retrieves a specific search record, and sets the values to the object.
-	 *
-	 * @param int Contians the Search Id to be retrieved
-	 * @return void
-	 * @since Version 1.0
-	 * @todo Complete the search refresh feature
-	 */
-	public function get($id) {
-		# Get the details for this search
-		$db = &DB();
-
-		$result = $db->Execute(sqlSelect('search','*',array('where'=>array('id'=>$id))));
-
-		# Error reporting
-		if (! $result) {
-			global $C_debug;
-
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-		}
-
-		# Get the search values
-		$this->id = $id;
-		$this->account = $result->fields['account_id'];
-		$this->session = $result->fields['session_id'];
-		$this->date_orig = $result->fields['date_orig'];
-		$this->date_expire = $result->fields['date_expire'];
-		$this->sql = $result->fields['full_sql'];
-		$this->order_by = $result->fields['order_by'];
-		$this->limit = $result->fields['limit_no'];
-
-		# Check if this search has expired:
-		if ($this->date_expire <= time()) {
-			# Refresh the search
-			# $this->results = $this->refresh($id);
-			# echo "
 this search has expired! Refreshing.... 
";
-			$this->results = $result->fields['results'];
-
-		} else {
-			# Use the existing result count
-			$this->results = $result->fields['results'];
-		}
-
-		return;
-	}
-
-	/**
-	 * Refreshes the result count of a specific search and stores the new results in the search record,
-	 * and returns the new search result count.
-	 *
-	 * @param int Contians the Search Id to be refreshed
-	 * @return int Contains the new search results count
-	 * @since Version 1.0
-	 * @todo Complete the search refresh code
-	 * @return int The new search results count
-	*/
-	private function refresh($id) {
-	}
-
-	/**
-	 * Saves the current search for later retreival.
-	 *
-	 * @param string Contains search nickname to remember this search as
-	 * @return void
-	 * @since Version 1.0
-	 * @todo Add some error checking for previously used nicknames, identical searches, etc.
-	 * @param int Contians the Search Id to be saved
-	 * @param string Contains the name of the Module this search was for
-	 */
-	public function save($search_id,$module,$name) {
-		# Save the search
-		$db = &DB();
-
-		# Determine the search id:
-		$this->id = $db->GenID('search_saved');
-
-		$result = $db->Execute(sqlInsert($db,'search_saved',array(
-			'search_id'=>$search_id,
-			'account_id'=>SESS_ACCOUNT,
-			'session_id'=>SESS,
-			'date_orig'=>time(),
-			'date_last'=>time(),
-			'date_expire'=>'',
-			'module'=>$module,
-			'name'=>$name
-			),$this->id));
-
-		# Error reporting
-		if (! $result) {
-			global $C_debug;
-
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-		}
-	}
-
-	/**
-	 * Build the recent search menu and JavaScript
-	 *
-	 * @param string Contains the name of the Module to find recent searches for
-	 * @return void
-	 * @since Version 1.0
-	 */
-	function build_recent($module) {
-		# Disable for now
-		return 0;
-
-		if(isset($this->arr)) unset ($this->arr);
-
-		# Get the recent searches
-		$db = &DB();
-		$q  = "SELECT id, date_orig, date_expire, full_sql, order_by, limit_no
-				FROM " . AGILE_DB_PREFIX . "search
-				WHERE
-				session_id	= '" . SESS . "'
-				OR
-				account_id	= '" . SESS_ACCOUNT . "'
-				AND
-				module		= '$module'
-				AND
-				date_expire >= '" . time() . "'
-				AND
-				site_id 	= '" . DEFAULT_SITE . "'";
-		$result = $db->Execute($q);
-
-		# Error reporting
-		if ($result === false)
-		{
-			global $C_debug;
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-		}
-
-		$results = $result->RecordCount();
-
-
-			$i  = 0;
-			while (!$result->EOF) {
-				# Get the fields for this loop
-				$sql = $result->fields['full_sql'];
-
-				# Remove the WHERE
-				$sql = trim($sql);
-				$sql = eregi_replace("WHERE","",$sql);
-				$sql = eregi_replace("AND$","",$sql);
-				$sql = trim($sql);
-
-				# Replace any sql statements before we split the string
-				$sql = ereg_replace(" = ","===",$sql);
-				$sql = ereg_replace(" LIKE ","===",$sql);
-
-
-				# Determine the number of fields
-
-				$ii=0;
-				if(ereg(" AND ", $sql))
-				{
-					$sql = explode(" AND ",$sql);
-					$this_fields = count($sql);
-
-					# Loop
-					for($count=0; $count < $this_fields; $count++)
-					{
-						# Do each field
-						$sqls = explode("==",$sql[$count]);
-						$field[$count][name]  = $sqls[0];
-						$field[$count][value] = ereg_replace("'","",$sqls[1]);
-						$field[$count][value] = ereg_replace("=","",$field[$count][value]);
-
-						# Check that the name & value are both set...
-						if($field[$count][value] != '' && $field[$count][name] != '')
-						{
-							if(!isset($this->arr[$i][$ii][limit]))
-							{
-								$this->arr[$i][$ii][search] = $result->fields['id'];
-								$this->arr[$i][$ii][limit] = $result->fields['limit_no'];
-								$this->arr[$i][$ii][order] = $result->fields['order_by'];
-							}
-
-						   $this->arr[$i][$ii][0] = $field[$count][name];
-						   $this->arr[$i][$ii][1] = $field[$count][value];
-
-							# echo "

Field/Name: " . $this->arr[$i][$ii][0] . " -> "  . $this->arr[$i][$ii][1];
-							$ii++;
-
-							# Set the menu up for Smarty
-							$this->recent_menu[$i] = $result->fields;
-						}
-					}
-				}
-				else
-				{
-					# Field count
-					$this_fields = 1;
-
-					# Do this one field
-					$sqls = explode("==",$sql);
-					$field[name]  = $sqls[0];
-					$field[value] = ereg_replace("'","",$sqls[1]);
-					$field[value] = ereg_replace("=","",$field[value]);
-
-					# Check that the name & value are both set...
-					if($field[value] != '' && $field[name] != '')
-					{
-						if(!isset($this->arr[$i][$ii][limit]))
-						{
-							$this->arr[$i][$ii][search] = $result->fields['id'];
-							$this->arr[$i][$ii][limit] = $result->fields['limit_no'];
-							$this->arr[$i][$ii][order] = $result->fields['order_by'];
-						}
-
-						$this->arr[$i][$ii][0] = $field[name];
-						$this->arr[$i][$ii][1] = $field[value];
-
-						# echo "

Field/Name: " . $field[name] . " -> "  . $field[value];
-						$ii++;
-
-						# Set the menu up for Smarty
-						$this->recent_menu[$i] = $result->fields;
-					}
-
-				}
-
-
-				# Continue loop
-				$result->MoveNext();
-				if ($ii > 0) $i++;
-			}
-
-		# Finish the JS:
-		if($i > 0 && $ii > 0)
-		{
-			# Build the JavaScript
-			$this->recent_js = '
-			
-			";
-		}
-		else
-		{
-			$this->recent_js = FALSE;
-		}
-	} # End of functino
-
-	/**
-	 * Build the saved search menu and JavaScript
-	 *
-	 * @param string Contains the name of the Module to find saved searches for
-	 * @return void
-	 * @since Version 1.0
-	 */
-	function build_saved($module) {
-		 # Disable for now
-		return 0;
-
-	if(isset($this->arr)) unset ($this->arr);
-
-	# Get the saved searches
-	# Get the recent searches
-	$db1 = &DB();
-	$q  = "SELECT id, search_id, name
-			FROM " . AGILE_DB_PREFIX . "search_saved
-			WHERE
-			session_id	= '" . SESS . "'
-			OR
-			account_id	= '" . SESS_ACCOUNT . "'
-			AND
-			module		= '$module'
-			AND
-			site_id 	= '" . DEFAULT_SITE . "'
-			ORDER BY name ASC";
-	$result1 = $db1->Execute($q);
-
-	# Error reporting
-	if ($result1 === false)
-	{
-		global $C_debug;
-		$C_debug->sql_error($db1->ErrorMsg());
-	}
-
-	$i=0;
-	while (!$result1->EOF)
-	{
-		# Get the information for this search
-		$db = &DB();
-		$q  = "SELECT id, full_sql, order_by, limit_no
-				FROM " . AGILE_DB_PREFIX . "search
-				WHERE
-				id			= '" . $result1->fields['search_id'] . "'
-				AND
-				site_id 	= '" . DEFAULT_SITE . "'";
-		$result = $db->Execute($q);
-
-		# Error reporting
-		if ($result === false)
-		{
-			global $C_debug;
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-		}
-
-				# Get the fields for this loop
-				$sql = $result->fields['full_sql'];
-
-				# Remove the WHERE
-				$sql = trim($sql);
-				$sql = eregi_replace("WHERE","",$sql);
-				$sql = eregi_replace("AND$","",$sql);
-				$sql = trim($sql);
-
-				# Replace any sql statements before we split the string
-				$sql = ereg_replace(" = ","===",$sql);
-				$sql = ereg_replace(" LIKE ","===",$sql);
-
-
-				# Determine the number of fields
-
-				$ii=0;
-				if(ereg(" AND ", $sql))
-				{
-					$sql = explode(" AND ",$sql);
-					$this_fields = count($sql);
-
-					# Loop
-					for($count=0; $count < $this_fields; $count++)
-					{
-						# Do each field
-						$sqls = explode("==",$sql[$count]);
-						$field[$count][name]  = $sqls[0];
-						$field[$count][value] = ereg_replace("'","",$sqls[1]);
-						$field[$count][value] = ereg_replace("=","",$field[$count][value]);
-
-						# Check that the name & value are both set...
-						if($field[$count][value] != '' && $field[$count][name] != '')
-						{
-							if(!isset($this->arr[$i][$ii][limit]))
-							{
-								$this->arr[$i][$ii][search] = $result->fields['id'];
-								$this->arr[$i][$ii][limit] = $result->fields['limit_no'];
-								$this->arr[$i][$ii][order] = $result->fields['order_by'];
-							}
-
-							$this->arr[$i][$ii][0] = $field[$count][name];
-							$this->arr[$i][$ii][1] = $field[$count][value];
-
-							# echo "

Field/Name: " . $this->arr[$i][$ii][0] . " -> "  . $this->arr[$i][$ii][1];
-							$ii++;
-							$this->saved_menu[$i] = $result->fields;
-							$this->saved_menu[$i]["name"] = $result1->fields["name"];
-						}
-					}
-				}
-				else
-				{
-					# Field count
-					$this_fields = 1;
-
-					# Do this one field
-					$sqls = explode("==",$sql);
-					$field[name]  = $sqls[0];
-					$field[value] = ereg_replace("'","",$sqls[1]);
-					$field[value] = ereg_replace("=","",$field[value]);
-
-					# Check that the name & value are both set...
-					if($field[value] != '' && $field[name] != '')
-					{
-						if(!isset($this->arr[$i][$ii][limit]))
-						{
-							$this->arr[$i][$ii][search] = $result->fields['id'];
-							$this->arr[$i][$ii][limit] = $result->fields['limit_no'];
-							$this->arr[$i][$ii][order] = $result->fields['order_by'];
-						}
-
-						$this->arr[$i][$ii][0] = $field[name];
-						$this->arr[$i][$ii][1] = $field[value];
-
-						#	echo "

Field/Name: " . $field[name] . " -> "  . $field[value];
-						$ii++;
-
-						# Set the menu up for Smarty
-						$this->saved_menu[$i] = $result->fields;
-						$this->saved_menu[$i]["name"] = $result1->fields["name"];
-					}
-
-				}
-		$result1->MoveNext();
-		if ($ii > 0) $i++;
-	}
-
-
-
-
-		# Finish the JS:
-		if($i > 0 && $ii > 0)
-		{
-			# Build the JavaScript
-			$this->saved_js = '
-			
-			";
-		}
-		else
-		{
-			$this->saved_js = FALSE;
-		}
-	}
-}
-?>
diff --git a/modules/core/service_domain.inc.php b/modules/core/service_domain.inc.php
deleted file mode 100644
index 832c05f1..00000000
--- a/modules/core/service_domain.inc.php
+++ /dev/null
@@ -1,83 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-class service_domain
-{
-	# Set variables
-	function service_domain ( $rs ) {
-		$this->domain = $rs;
-	}
-
-
-	########################################################
-	# Do domain registration, transfer, park, or renewal  ##
-	########################################################
-
-	function s_new()
-	{
-		# Get the registrar plugin data
-		$db = &DB();
-		$q = "SELECT * FROM  ".AGILE_DB_PREFIX."host_registrar_plugin WHERE
-				id			= ".$db->qstr( $this->domain['host_server_id'] )." AND
-				site_id     = ".$db->qstr(DEFAULT_SITE);;
-		$rs = $db->Execute($q);
-		if ($rs != false && $rs->RecordCount() == 1) {
-			$this->server = $rs->fields;
-		}
-
-		# Get the registrar plugin data
-		$q = "SELECT * FROM  ".AGILE_DB_PREFIX."host_registrar_plugin WHERE
-				id			= ".$db->qstr( $this->domain['domain_host_registrar_id'] )." AND
-				site_id     = ".$db->qstr(DEFAULT_SITE);;
-		$rs = $db->Execute($q);
-		if ($rs === false || $rs->RecordCount() == 0) {
-			return false;
-		} else {
-			# Load the plugin class
-			$this->registrar = unserialize( $rs->fields['plugin_data'] );
-			$filename = PATH_PLUGINS.'registrar/'.$rs->fields['file'].'.php';
-			if(!file_exists($filename)) return false;
-			include_once($filename);
-			$eval = '$_PLG = new plg_reg_'.$rs->fields['file'].'($this);';
-			eval($eval);
-		}
-
-		switch ( $this->domain['domain_type'] )
-		{
-			case 'register':
-				return $_PLG->register();
-			break;
-
-			case 'transfer':
-				return $_PLG->transfer();
-			break;
-
-			case 'park':
-				return $_PLG->park();
-			break;
-
-			case 'renew':
-				return $_PLG->renew();
-			break;
-		}
-		return false;
-	}
-}
-?>
\ No newline at end of file
diff --git a/modules/core/service_group.inc.php b/modules/core/service_group.inc.php
deleted file mode 100644
index b6a46e39..00000000
--- a/modules/core/service_group.inc.php
+++ /dev/null
@@ -1,260 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-class service_group
-{
-	# Set variables
-	function service_group ( $rs, $groups ) {
-		$this->rs = $rs;
-		$this->groups = $groups;
-	}
-
-
-	###############################################
-	# Add new groups
-	###############################################
-
-	function s_new()
-	{
-		# Loop through each group to add:
-		for($i=0; $igroups); $i++)
-		{
-			# Determine the expiry date:
-			$this->calcExpiry();
-
-			# Create the new group
-			$this->addGroup( $this->groups[$i] );
-		}
-	}
-
-
-	###############################################
-	# Activate groups
-	###############################################
-
-	function s_active()
-	{ 
-		# Loop through each group to add:
-		for($i=0; $igroups); $i++)
-		{
-			# Determine the expiry date:
-			$this->calcExpiry();
-
-			# Create the new group
-			$this->addGroup( $this->groups[$i] );
-		}
-	}
-
-	###############################################
-	# Deactivate groups
-	###############################################
-
-	function s_inactive()
-	{ 
-		# Loop through each group to add:
-		for($i=0; $igroups); $i++)
-		{
-			# Create the new group
-			$this->deleteGroup( $this->groups[$i] );
-		}
-	}
-
-	###############################################
-	# Delete Groups
-	###############################################
-
-	function s_delete()
-	{
-		# Loop through each group to add:
-		for($i=0; $igroups); $i++)
-		{
-			# Create the new group
-			$this->deleteGroup( $this->groups[$i] );
-		}
-	}
-
-
-	function s_edit() {
-		return;
-	}
-
-
-
-	########################################################################################################
-	#	MISC METHODS
-	########################################################################################################
-
-
-
-	# Add new group to account
-	function addGroup($id)
-	{
-		# Delete any existing groups for this service & account
-		$db = &DB();
-		$q = "DELETE FROM ".AGILE_DB_PREFIX."account_group WHERE
-				account_id  = ".$db->qstr($this->rs['account_id'])." AND
-				group_id    = ".$db->qstr($id)." 	 				 AND
-				service_id  = ".$db->qstr($this->rs['id'])." 	 	 AND
-				site_id     = ".$db->qstr(DEFAULT_SITE);
-		$db->Execute($q);
-
-		# Create the new group:
-		$idx = $db->GenID(AGILE_DB_PREFIX . 'account_group_id');
-		$q = "INSERT INTO ".AGILE_DB_PREFIX."account_group SET
-				id          = ".$db->qstr( $idx ).",
-				site_id     = ".$db->qstr( DEFAULT_SITE ).",
-				date_orig   = ".$db->qstr( time() ).",
-				date_expire = ".$db->qstr( $this->expire ).",
-				group_id	= ".$db->qstr( $id ).",
-				account_id	= ".$db->qstr( $this->rs['account_id'] ).",
-				service_id	= ".$db->qstr( $this->rs['id'] ).",
-				active		= ".$db->qstr( '1' );
-		$rs1 = $db->Execute($q);
-		if ($rs1 === false) { 
-			global $C_debug;
-			$C_debug->error('service_group.inc.php','addGroup', $db->ErrorMsg());
-		}
-
-		# update session cache
-		if(defined('SESS_ACCOUNT') && SESS_ACCOUNT == $this->rs['account_id'] && SESS_LOGGED == 1)
-		{ 
-			if(CACHE_SESSIONS == '1') {
-				$force = true;
-				$C_auth = new CORE_auth($force);
-				global $C_auth2;
-				$C_auth2 = $C_auth;
-			}			
-		} 
-		elseif (!defined('SESS_ACCOUNT') || SESS_ACCOUNT != $this->rs['account_id']) 
-		{
-			# delete the users_session_auth so it is reloaded on their next page view:
-			$q = "SELECT id FROM ".AGILE_DB_PREFIX."session WHERE
-					account_id  = ".$db->qstr($this->rs['account_id'])." AND
-					site_id     = ".$db->qstr(DEFAULT_SITE);
-			$rss = $db->Execute($q);
-			while(!$rss->EOF)
-			{
-				$q = "DELETE FROM ".AGILE_DB_PREFIX."session_auth_cache WHERE
-						session_id	= ".$db->qstr($rss->fields['id'])." AND 
-						site_id     = ".$db->qstr(DEFAULT_SITE);
-				$db->Execute($q);	
-				$rss->MoveNext();
-			}						
-		}
-
-		# Call the dbmap:
-		$this->dbmap();
-	}
-
-
-
-	# Delete/suspend groups
-	function deleteGroup($id)
-	{
-		# Delete any existing groups for this service & account
-		$db = &DB();
-		$q = "DELETE FROM ".AGILE_DB_PREFIX."account_group WHERE
-				account_id  =  ".$db->qstr($this->rs['account_id'])." AND
-				group_id    =  ".$db->qstr($id)." 	 				 AND
-				service_id  =  ".$db->qstr($this->rs['id'])." 	 AND
-				site_id     =  ".$db->qstr(DEFAULT_SITE);
-		$db->Execute($q);
-
-		# update session cache
-		if(SESS_ACCOUNT == $this->rs['account_id'] && SESS_LOGGED == 1)
-		{ 
-			if(CACHE_SESSIONS == '1') {
-				$force = true;
-				$C_auth = new CORE_auth($force);
-				global $C_auth2;
-				$C_auth2 = $C_auth;
-			}			
-		} 
-		elseif (SESS_ACCOUNT != $this->rs['account_id']) 
-		{
-			# delete the users_session_auth so it is reloaded on their next page view:
-			$q = "SELECT id FROM ".AGILE_DB_PREFIX."session WHERE
-					account_id  = ".$db->qstr($this->rs['account_id'])." AND
-					site_id     = ".$db->qstr(DEFAULT_SITE);
-			$rss = $db->Execute($q);
-			while(!$rss->EOF)
-			{
-				$q = "DELETE FROM ".AGILE_DB_PREFIX."session_auth_cache WHERE
-						session_id	= ".$db->qstr($rss->fields['id'])." AND 
-						site_id     = ".$db->qstr(DEFAULT_SITE);
-				$db->Execute($q);	
-				$rss->MoveNext();
-			}						
-		}
-
-		# Call the dbmap:
-		$this->dbmap();
-	}
-
-
-	# Calculate the expiry date for adding/activating groups:
-	function calcExpiry()
-	{
-		if ($this->rs['group_type'] == 0) {
-			$this->expire = $this->rs['date_orig'] + (86400*$this->rs['group_days']);
-		} else {
-			$this->expire = false;
-		}
-	}
-
-
-	# Force new login by deleting user's session/session_auth_cache records:
-	function forceLogin()
-	{
-		$db = &DB();
-		$q = "SELECT id FROM  ".AGILE_DB_PREFIX."session WHERE
-				account_id	= ".$db->qstr( $this->rs['account_id'] )." AND
-				site_id     = ".$db->qstr(DEFAULT_SITE);;
-		$rs = $db->Execute($q);
-		if ($rs->RecordCount() > 0)
-		{
-			$q = "DELETE FROM ".AGILE_DB_PREFIX."session WHERE
-					id  		= ".$db->qstr($rs->fields['id'])." AND
-					site_id     = ".$db->qstr(DEFAULT_SITE);
-			$db->Execute($q);
-
-			$q = "DELETE FROM ".AGILE_DB_PREFIX."sess_auth_cache WHERE
-					session_id  = ".$db->qstr($rs->fields['id'])." AND
-					site_id     = ".$db->qstr(DEFAULT_SITE);
-			$db->Execute($q);
-		}
-
-		# Call the dbmap:
-		$this->dbmap();
-	}
-
-
-
-	# Call the db_mapping update
-	function dbmap()
-	{
-		global $C_list;
-		if(!is_object($C_list)) {
-			include_once(PATH_CORE . 'list.inc.php');
-			$C_list = new CORE_list;
-		}
-	}
-}
-?>
diff --git a/modules/core/session.inc.php b/modules/core/session.inc.php
deleted file mode 100644
index 759c224b..00000000
--- a/modules/core/session.inc.php
+++ /dev/null
@@ -1,409 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core:Session
- */
-
-/**
- * The main AgileBill Session Class
- *
- * @package AgileBill
- * @subpackage Core:Session
- */
-class CORE_session {
-	# Our session ID
-	private $id = '';
-	# The time our session expires
-	private $sess_date_expire = 0;
-
-	public function __construct() {
-		global $C_debug,$VAR;
-
-		$session_arr = array();
-
-		# Get our SESSION ID, either as a GET/POST or COOKIE
-		if (isset($_GET['s']) && trim($_GET['s']))
-			array_push($session_arr,$_GET['s']);
-
-		elseif (isset($_POST['s']) && trim($_POST['s']))
-			array_push($session_arr,$_POST['s']);
-
-		elseif(isset($_COOKIE[COOKIE_NAME]) && trim($_COOKIE[COOKIE_NAME])) {
-			array_push($session_arr,$_COOKIE[COOKIE_NAME]);
-
-			# Clear the cookie, as we'll validate it
-			$this->id = $_COOKIE[COOKIE_NAME];
-			$this->setcookies(true);
-			$this->id = '';
-		}
-
-		foreach ($session_arr as $s)
-			if ($validate = $this->validate($s))
-				$this->id = $s;
-
-		$this->sess_date_expire = time()+(SESSION_EXPIRE*60);
-
-		if (! $this->id) {
-			$this->tid = empty($VAR['tid']) ? DEFAULT_THEME : $VAR['tid'];
-			$this->lid = empty($VAR['lid']) ? DEFAULT_LANGUAGE : $VAR['lid'];
-			$this->cid = empty($VAR['cid']) ? DEFAULT_COUNTRY : $VAR['cid'];
-			$this->cyid = empty($VAR['cyid']) ? DEFAULT_CURRENCY : $this->get_currency($VAR['cyid']);
-			$this->wid = empty($VAR['wid']) ? DEFAULT_WEIGHT : $VAR['wid'];
-			$this->rid = empty($VAR['rid']) ? null : $VAR['rid'];
-			$this->aid = $this->get_session_link(0,'affiliate');
-			$this->caid = $this->get_session_link(0,'campaign');
-			$this->sess_logged = false;
-			$this->sess_account_id = false;
-			$this->session();
-
-		} else {
-			$this->tid = empty($VAR['tid']) ? $validate['theme_id'] : $VAR['tid'];
-			$this->lid = empty($VAR['lid']) ? $validate['language_id'] : $VAR['lid'];
-			$this->cid = empty($VAR['cid']) ? $validate['country_id'] : $VAR['cid'];
-			$this->cyid = empty($VAR['cyid']) ? $validate['currency_id'] : $this->get_currency($VAR['cyid']);
-			$this->wid = empty($VAR['wid']) ? $validate['weight_id'] : $VAR['wid'];
-			$this->rid = empty($VAR['rid']) ? $validate['reseller_id'] : $VAR['rid'];
-			$this->aid = empty($VAR['aid']) ? $validate['affiliate_id'] : $this->get_session_link($validate['affiliate_id'],'affiliate');
-			$this->caid = empty($VAR['caid']) ? $validate['campaign_id'] : $this->get_session_link($validate['campaign_id'],'campaign');
-			$this->sess_logged = $validate['logged'];
-			$this->sess_account_id = $validate['account_id'];
-
-			$db = &DB();
-
-			# Only update the session (every 5 mins) if we are logged in
-			if ($validate['logged'] && $this->sess_date_expire+60*5 < time())
-				$db->Execute(
-					sqlUpdate($db,'session',array(
-						'date_last'=>time(),
-						'date_expire'=>$this->sess_date_expire,
-						'ip'=>USER_IP,
-						'theme_id'=>$this->tid,
-						'country_id'=>$this->cid,
-						'language_id'=>$this->lid,
-						'currency_id'=>$this->cyid,
-						'weight_id'=>$this->wid,
-						'reseller_id'=>$this->rid,
-						'affiliate_id'=>$this->aid,
-						'campaign_id'=>$this->caid,
-					),array('id'=>$this->id)));
-		}
-
-		if (! defined('SESS'))
-			define('SESS',$this->id);
-
-		$this->setcookies();
-	}
-
-	private function validate($session_id) {
-		global $C_debug;
-
-		$db = &DB();
-
-		$q = str_replace('{p}',AGILE_DB_PREFIX,str_replace('{s}',DEFAULT_SITE,sprintf(
-			'SELECT A.*,B.id AS acct_id,B.status,B.date_expire AS account_date_expire,C.date_expire AS sess_auth_date_expire,C.group_arr,C.module_arr
-			FROM {p}session AS A
-			LEFT JOIN {p}account AS B ON B.id=A.account_id LEFT JOIN {p}session_auth_cache AS C ON A.id=C.session_id
-			WHERE A.id=%s AND A.site_id={s} AND ((B.site_id={s} AND A.account_id IS NOT NULL) OR (B.site_id IS NULL AND A.account_id IS NULL)) AND C.site_id={s}',$db->qstr($session_id)
-		)));
-
-		$rs = $db->Execute($q);
-		if (! $rs) {
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-			printf('Unable to start session: Database Error: %s',$db->ErrorMsg());
-
-			return false;
-
-		} elseif ($rs->RecordCount() == 0) {
-			return false;
-		}
-
-		# Set the auth caching for use in the auth module to save a query there:
-		$this->auth_cache['date_expire'] = $rs->fields['sess_auth_date_expire'];
-		$this->auth_cache['group_arr'] = $rs->fields['group_arr'];
-		$this->auth_cache['module_arr'] = $rs->fields['module_arr'];
-
-		if ($rs->fields['logged'] == 1) {
-			if ($rs->fields['status'] != 1)
-					return false;
-
-			elseif (! empty($rs->fields['account_date_expire']) && $rs->fields['account_date_expire'] < time())
-					return false;
-
-			elseif (SESSION_EXPIRE != 0 && $rs->fields['date_expire'] <= time()) {
-				$this->logout($session_id);
-				return false;
-			}
-		}
-
-		if (SESSION_IP_MATCH && ($rs->fields['ip'] != USER_IP)) {
-			$this->delete($session_id);
-			return false;
-		}
-
-		return $rs->fields;
-	}
-
-	/**
-	 * Set or expire cookies
-	 */
-	private function setcookies($expire=false) {
-		if (defined('AGILE_COOKIE') && AGILE_COOKIE != '') {
-			$domain = AGILE_COOKIE;
-
-		} else {
-			global $_SERVER;
-
-			if (isset($_SERVER['HTTP_HOST'])) {
-				$domain = $_SERVER['HTTP_HOST'];
-			} elseif (isset($_SERVER['SERVER_NAME'])) {
-				$domain = $_SERVER['SERVER_NAME'];
-			} elseif (function_exists('getallheaders')) {
-				$server = getallheaders();
-				$domain = $server['Host'];
-			} else {
-				echo '
';print_r($_SERVER);echo '
';
-				echo 'ERROR: Cant work out our domain?';
-				die();
-			}
-
-			$domain = '.'.preg_replace('/^www./','',$domain);
-		}
-
-		if ($expire)
-			$cookie_expire = 0;
-		elseif (COOKIE_EXPIRE == 0)
-			$cookie_expire = (time()+86400*365);
-		else
-			$cookie_expire = (time()+(COOKIE_EXPIRE*60));
-
-		if (empty($domain) || preg_match('/localhost/',$domain))
-			setcookie(COOKIE_NAME,$this->id,$cookie_expire,'/');
-		else
-			setcookie(COOKIE_NAME,$this->id,$cookie_expire,'/',$domain);
-
-		# Affiliate Cookie
-		if (! empty($this->aid)) {
-			$aid_cookie_name = COOKIE_NAME.'aid';
-			if ($expire)
-				$aid_expire = 0;
-			else
-				$aid_expire = time()+86400*720;
-
-			if (empty($domain) || preg_match('/localhost/',$domain))
-				setcookie($aid_cookie_name,$this->aid,$aid_expire,'/');
-			else
-				setcookie($aid_cookie_name,$this->aid,$aid_expire,'/',$domain);
-		}
-
-		# Campaign Cookie
-		if (! empty($this->caid)) {
-			$cid_cookie_name = COOKIE_NAME.'caid';
-			if ($expire)
-				$cid_expire = 0;
-			else
-				$cid_expire = time()+86400*720;
-
-			if (empty($domain) || preg_match('/localhost/',$domain))
-				setcookie($cid_cookie_name,$this->caid,$cid_expire,'/');
-			else
-				setcookie($cid_cookie_name,$this->caid,$cid_expire,'/',$domain);
-		}
-	}
-
-	private function get_session_link($id,$type) {
-		global $VAR;
-
-		switch($type) {
-			case 'affiliate' : $var = 'aid'; $table = 'affiliate'; break;
-			case 'campaign' : $var = 'caid'; $table = 'campaign'; break;
-			default:
-				return '';
-		}
-
-		$cookie_name = sprintf('%s%s',COOKIE_NAME,$var);
-
-		if (isset($VAR[$var]))
-			$i = $VAR[$var];
-		elseif (isset($_COOKIE[$cookie_name]))
-			$i = $_COOKIE[$cookie_name];
-
-		if (empty($i))
-			return '';
-		elseif ($i == $id)
-			return $i;
-
-		# Validate
-		else {
-			$db = &DB();
-			$rs = $db->Execute(sqlSelect($table,'id',array('where'=>array('id'=>$i))));
-			if ($rs && $rs->RecordCount())
-				return $i;
-			else
-				return '';
-		}
-	}
-
-	private function get_currency($id)  {
-		$db = &DB();
-		$rs = $db->Execute(sqlSelect('currency','status',array('where'=>array('id'=>$id))));
-		if ($rs && $rs->RecordCount() && $rs->fields['status'] == 1)
-			return $id;
-
-		global $VAR;
-		$VAR['cyid'] = DEFAULT_CURRENCY;
-
-		return DEFAULT_CURRENCY;
-	}
-
-	/**
-	 * Create a session
-	 */
-	private function session() {
-		global $C_debug;
-		$db = &DB();
-
-		mt_srand((double)microtime()*1000000);
-		$this->id = md5(uniqid(mt_rand(),1));
-
-		$rs = $db->Execute(sqlSelect('session','id',array('where'=>array('id'=>$this->id))));
-		if (! $rs) {
-			echo 'SESSION FAILED: Unable to connect to database';
-
-			exit;
-		}
-
-		if (! $rs->RecordCount()) {
-			$rs = $db->Execute(
-				sqlInsert($db,'session',array(
-					'date_orig'=>time(),
-					'date_last'=>time(),
-					'date_expire'=>$this->sess_date_expire,
-					'affiliate_id'=>$this->aid,
-					'reseller_id'=>$this->rid,
-					'country_id'=>$this->cid,
-					'language_id'=>$this->lid,
-					'currency_id'=>$this->cyid,
-					'weight_id'=>$this->wid,
-					'theme_id'=>$this->tid,
-					'campaign_id'=>$this->caid,
-					'logged'=>0,
-					'ip'=>USER_IP
-				),$this->id));
-
-			if (! $rs) {
-				$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-				printf('Unable to start session: Db error

%s

%s',$q,$db->ErrorMsg());
-
-				exit;
-			}
-		}
-	}
-
-	private function logout($sess) {
-		$db = &DB();
-
-		$rs = $db->Execute(sqlUpdate($db,'session',array('logged'=>0),array('id'=>$sess)));
-		if (! $rs) {
-			global $C_debug;
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-
-			return false;
-		}
-
-		$db->Execute(sqlDelete($db,'session_auth_cache',array('session_id'=>$sess)));
-
-		define('FORCE_SESS_ACCOUNT',0);
-		define('FORCE_SESS_LOGGED',false);
-
-		if (CACHE_SESSIONS == '1') {
-			$VAR['_login'] = '1';
-			$force = true;
-			$C_auth = new CORE_auth($force);
-
-			global $C_auth2;
-			$C_auth2 = $C_auth;
-		}
-	}
-
-	/**
-	 * Delete a session
-	 */
-	private function delete($sess) {
-		$db = &DB();
-
-		$rs = $db->Execute(sqlDelete($db,'session',array('id'=>$sess)));
-		if (! $rs === false) {
-			global $C_debug;
-			$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-
-			return false;
-		}
-	}
-
-	/**
-	 * Define the session constants
-	 */
-	public function session_constant() {
-		# Define the constants
-		define('SESS_THEME',$this->tid);
-		define('SESS_LANGUAGE',$this->lid);
-		define('SESS_COUNTRY',$this->cid);
-		define('SESS_CURRENCY',$this->cyid);
-		define('SESS_WEIGHT',$this->wid);
-		define('SESS_RESELLER',$this->rid);
-		define('SESS_AFFILIATE',$this->aid);
-		define('SESS_CAMPAIGN',$this->caid);
-	}
-
-	public function session_constant_log() {
-		global $VAR;
-
-		if (isset($VAR['_login']) || isset($VAR['_logout'])) {
-			$db = &DB();
-
-			$rs = $db->Execute(sqlSelect('session','logged,account_id',array('where'=>array('id'=>$this->id))));
-
-			if (! $rs) {
-				global $C_debug;
-				$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
-
-				return;
-			}
-
-			if (! defined('SESS_LOGGED'))
-				define('SESS_LOGGED',$rs->fields['logged']);
-			if (! defined('SESS_ACCOUNT'))
-				define('SESS_ACCOUNT',$rs->fields['account_id']);
-
-		} else {
-			if (! defined('SESS_LOGGED'))
-				define('SESS_LOGGED',$this->sess_logged);
-			if (! defined('SESS_ACCOUNT'))
-				define('SESS_ACCOUNT',$this->sess_account_id);
-		}
-
-		if (SESS_LOGGED)
-			define('SESS_EXPIRES',$this->sess_date_expire);
-		else
-			define('SESS_EXPIRES',0);
-	}
-}
-?>
diff --git a/modules/core/setup.inc.php b/modules/core/setup.inc.php
deleted file mode 100644
index 4ea9f76c..00000000
--- a/modules/core/setup.inc.php
+++ /dev/null
@@ -1,169 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core:Setup
- */
-
-/**
- * The main AgileBill Core Setup Class
- *
- * @package AgileBill
- * @subpackage Core:Setup
- */
-class CORE_setup {
-	public function __construct() {
-		if (defined('MEMCACHE_ENABLED') && MEMCACHE_ENABLED == true) {
-			require_once(PATH_INCLUDES.'cache/cache.php');
-
-			$key = md5('keyname1'.__FILE__.DEFAULT_SITE);
-			$sec = 60*30;
-			$timeout = get_value($key.'_exp');
-			if ($timeout == '' || $timeout < time() || ! $fields = get_value($key)) {
-				$fields = $this->get_setup();
-				store_value($key,$fields);
-				store_value($key.'_exp',time()+$sec);
-			}
-
-		} else {
-			$fields = $this->get_setup();
-		}
-
-		define('DEFAULT_COUNTRY',		$fields['country_id']);
-		define('DEFAULT_LANGUAGE',		$fields['language_id']);
-		define('DEFAULT_CURRENCY',		$fields['currency_id']);
-		define('DEFAULT_WEIGHT',		$fields['weight_id']);
-		define('DEFAULT_THEME',			$fields['theme_id']);
-		define('DEFAULT_ADMIN_THEME',	$fields['admin_theme_id']);
-		define('DEFAULT_GROUP',			$fields['group_id']);
-		define('DEFAULT_AFFILIATE_TEMPLATE',	$fields['affiliate_template_id']);
-		define('DEFAULT_AFFILIATE',		$fields['affiliate_id']);
-		define('DEFAULT_RESELLER',		$fields['reseller_id']);
-		define('DEFAULT_SETUP_EMAIL',	$fields['setup_email_id']);
-		define('DEFAULT_TIME_FORMAT',	$fields['time_format']);
-		define('DEFAULT_ACCOUNT_STATUS',$fields['default_account_status']);
-		$this->default_date_format($fields['date_format']);
-		if (! defined('DEFAULT_TIME_FORMAT'))
-			define('DEFAULT_TIME_FORMAT',$fields['time_format']);
-		define('DEFAULT_DATE_TIME_FORMAT',$fields['date_time_format']);
-		define('DEFAULT_DECIMAL_PLACE',$fields['decimal_place']);
-		define('COOKIE_NAME',			$fields['cookie_name']);
-		define('COOKIE_EXPIRE',			$fields['cookie_expire']);
-		define('SESSION_IP_MATCH',		$fields['session_ip_match']);
-		define('SESSION_EXPIRE',		$fields['login_expire']);
-		define('NEWSLETTER_REGISTRATION',$fields['newsletter_registration']);
-		define('SEARCH_EXPIRE',			$fields['search_expire']);
-		define('ERROR_REPORTING',		$fields['error_reporting']);
-		define('DEBUG',					$fields['debug']);
-
-		define('LOGIN_ATTEMPT_TRY',		$fields['login_attempt_try']);
-		define('LOGIN_ATTEMPT_TIME',	$fields['login_attempt_time']);
-		define('LOGIN_ATTEMPT_LOCK',	$fields['login_attempt_lock']);
-		define('DB_CACHE',				$fields['db_cache']);
-		define('CACHE_SESSIONS',		$fields['cache_sessions']);
-		define('WEBLOG',				$fields['weblog']);
-
-		if (! defined('SSL_URL'))		define('SSL_URL',		$fields['ssl_url']);
-		if (! defined('URL'))			define('URL',			$fields['nonssl_url']);
-		if (! defined('SITE_NAME'))		define('SITE_NAME',		$fields['site_name']);
-		if (! defined('SITE_EMAIL'))	define('SITE_EMAIL',	$fields['site_email']);
-		if (! defined('SITE_ADDRESS'))	define('SITE_ADDRESS',	$fields['site_address']);
-		if (! defined('SITE_CITY'))		define('SITE_CITY',		$fields['site_city']);
-		if (! defined('SITE_STATE'))	define('SITE_STATE',	$fields['site_state']);
-		if (! defined('SITE_ZIP'))		define('SITE_ZIP',		$fields['site_zip']);
-		if (! defined('SITE_PHONE'))	define('SITE_PHONE',	$fields['site_phone']);
-		if (! defined('SITE_FAX'))		define('SITE_FAX',		$fields['site_fax']);
-
-		if ($fields['os'] == 1)
-			define('AGILE_OS',	'WINDOWS');
-		else
-			define('AGILE_OS',	'LINUX');
-
-		define('PATH_CURL',				$fields['path_curl']);
-		define('SHOW_AFFILIATE_LINK',	$fields['show_affiliate_link']);
-		define('AUTO_AFFILIATE',		@$fields['auto_affiliate']);
-		define('SHOW_NEWSLETTER_LINK',	$fields['show_newsletter_link']);
-		define('SHOW_CONTACT_LINK',		$fields['show_contact_link']);
-		define('SHOW_DOMAIN_LINK',		$fields['show_domain_link']);
-		define('SHOW_CART_LINK',		$fields['show_cart_link']);
-		define('SHOW_CHECKOUT_LINK',	$fields['show_checkout_link']);
-		define('SHOW_PRODUCT_LINK',		$fields['show_product_link']);
-		define('SHOW_CAT_BLOCK',		$fields['show_cat_block']);
-		define('SHOW_STATIC_BLOCK',		$fields['show_static_block']);
-		define('SHOW_AFFILIATE_CODE',	$fields['show_affiliate_code']);
-		define('SHOW_DISCOUNT_CODE',	$fields['show_discount_code']);
-		define('BILLING_WEEKDAY',		$fields['billing_weekday']);
-		define('GRACE_PERIOD',			$fields['grace_period']);
-		define('MAX_BILLING_NOTICE',	$fields['max_billing_notice']);
-
-		eval('error_reporting('.ERROR_REPORTING.');');
-	}
-
-	private function get_setup() {
-		$db = &DB();
-		$result = $db->Execute(sqlSelect($db,'setup','*',''));
-		if (! $result || $result->RecordCount() == 0) {
-			if (is_file('install/install.inc'))
-				require_once('install/install.inc');
-			else
-				$this->handle_failure($db);
-			exit;
-
-		} else {
-			return $result->fields;
-		}
-	}
-
-	private function default_date_format($default) {
-		$default = unserialize($default);
-		$format = '';
-		$divider = $default[3];
-
-		for ($i=0; $i<3; $i++) {
-			$format .= $default[$i];
-			if ($i != 2)
-				$format .= $divider;
-		}
-
-		$arr = Array('a','A','b','B','d','j','m','u','y','Y');
-		for ($i=0; $i_errorMsg));
-
-		exit;
-	}
-}
-?>
diff --git a/modules/core/sort_array.inc.php b/modules/core/sort_array.inc.php
deleted file mode 100644
index eebc543a..00000000
--- a/modules/core/sort_array.inc.php
+++ /dev/null
@@ -1,89 +0,0 @@
- "Usr1",
-                                    "Sex"       => "male",
-                                    "Country"   => "US",
-                                    "Children"  => 3,
-                                    "BirthDate" => "1970-07-21"
-                                ),
-                        array   (
-                                    "UserName"  => "TheUser",
-                                    "Sex"       => "female",
-                                    "Country"   => "Canada",
-                                    "Children"  => 0,
-                                    "BirthDate" => "1975-11-05"
-                                )
-                    );
- 
-$srt = new arr_multisort($sample_arr);
-$srt->sort();
-dump_arr($sample_arr);
-
-//Sort by sex descending and children ascending
-$srt->colNames = array("Sex",    "Children");
-$srt->colDirs  = array(SRT_DESC,SRT_ASC);
-$sample_arr = $srt->sort();
- 
-//Sort by sex ascending and Birth date decending
-$srt->colNames = array("Sex",   "BirthDate");
-$srt->colDirs  = array(SRT_ASC,SRT_DESC);
-$sample_arr = $srt->sort();
- 
-*/
-
-
-define("SRT_ASC",1);
-define("SRT_DESC",-1);
-
-Class arr_multisort{
-
-  //The array to be sorted
-  var $arr = NULL;
-  //Single dimensioned array with column names. Ex. array("UserName","Sex","Country")
-  var $colNames = NULL;
-  /*
-  Single dimensioned array with sort directions. Ex. array(SRT_ASC,SRT_ASC,SRT_DESC)
-  Must have the same length as $colNames array
-  */
-  var $colDirs = NULL;
-
-  //Constructor
-  function arr_multisort(&$arr,$colNames=array(),$colDirs=array()){
-    $this->arr = $arr;
-    $this->colNames = $colNames;
-    $this->colDirs = $colDirs;
-  }
-
-  //sort() method
-  function &sort(){
-    usort($this->arr,array($this,"_compare"));
-    return $this->arr;
-  }
-
-  //Comparison function [PRIVATE]
-  function _compare($a,$b,$idx = 0){
-    if(count($this->colNames) == 0 || count($this->colNames) != count($this->colDirs)) return 0;
-    $a_cmp = $a[$this->colNames[$idx]];
-    $b_cmp = $b[$this->colNames[$idx]];
-    $a_dt = strtotime($a_cmp);
-    $b_dt = strtotime($b_cmp);
-    if(($a_dt == -1) || ($b_dt == -1))
-      $ret = $this->colDirs[$idx]*strnatcasecmp($a_cmp,$b_cmp);
-    else{
-      $ret = $this->colDirs[$idx]*(($a_dt > $b_dt)?1:(($a_dt < $b_dt)?-1:0));
-    }
-    if($ret == 0){
-      if($idx < (count($this->colNames)-1))
-        return $this->_compare($a,$b,$idx+1);
-      else
-        return $ret;
-    }
-    else
-      return $ret;
-  }
-}
-?>
diff --git a/modules/core/ssl.inc.php b/modules/core/ssl.inc.php
deleted file mode 100644
index 00991864..00000000
--- a/modules/core/ssl.inc.php
+++ /dev/null
@@ -1,186 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-# Debug 
-if(empty($VAR) && empty($VAR['do']) && !defined("PATH_AGILE"))
-{
-	include_once('../../config.inc.php');
-	$test = new CORE_ssl;
-	$test->test();	
-} 
-
-class CORE_ssl
-{
-	 function CORE_ssl ($type=false)
-	 {
-		$disabled_functions = ini_get('disable_functions');
-
-		if ( defined("PATH_CURL") && is_file(PATH_CURL) )
-			$this->connect_curl_binary 	   = true;
-
-		if ( function_exists('curl_init') && $curl_version = curl_version()) {
-			if ( phpversion() >= 5 ) {
-				if (eregi('openssl', @$curl_version['ssl_version'] )) 
-					$this->connect_curl_module = true;
-			} else {
-				if (eregi('openssl', curl_version()))
-					$this->connect_curl_module = true;
-			}
-		}
-
-		if (phpversion() >= '4.3.0') 
-			if (function_exists("fsockopen") )
-				if (function_exists("openssl_public_decrypt"))
-					$this->connect_fsockopen = true;
-	}
-
-	# debuging...
-	function test() {  
-		echo '";
-	}		
-
-	# type: 1=post 2=get
-	function connect($host, $url, $vars, $ssl, $type) { 
-		if ( @$this->connect_curl_binary ) 
-			return $this->connect_curl_binary ($host, $url, $vars, $ssl, $type);			
-		elseif ( @$this->connect_curl_module ) 
-			return $this->connect_curl_module ($host, $url, $vars, $ssl, $type);	
-		elseif ( @$this->connect_fsockopen ) 	
-			return $this->connect_fsockopen   ($host, $url, $vars, $ssl, $type);		
-		else 				
-			return false;								
-	} 
-
-	# SSL connection with Curl Binary  
-	function connect_curl_binary($host, $url, $vars, $ssl, $type) 	{
-
-		if($ssl)  $urli = 'https://'.$host .''. $url;
-		else 	  $urli = 'http://'.$host .''. $url;	 
-
-		$params = "";  
-		if(is_array($vars)) {
-			for($i=0; $i 0) { $params .= '&'; }
-			   $params .=  $vars[$i][0].'='.urlencode($vars[$i][1]);
-
-			}
-		} elseif (!empty($vars)) {
-		   $params = $vars;
-		} 
-
-		$curl = PATH_CURL;  
-
-		# connect  
-		if(!empty($params)) {
-			//echo $curl ."-d -k \"$params\"". $urli;
-			//echo $urli.'?'.$params;
-			//exit;
-			return `$curl -k -d "$params" $urli`;
-		} else {
-			//echo "$curl -k $urli";
-			return `$curl -k $urli`;
-		}   
-	}	
-
-
-	# SSL connection with Curl Module  
-	function connect_curl_module($host, $url, $vars, $ssl, $type) 	{ 
-
-		if($ssl)  $url = 'https://'.$host .''. $url;
-		else 	  $url = 'http://'.$host .''. $url; 
-
-		$params = '';
-		if(is_array($vars)) {
-			for($i=0; $i 0) { $params .= '&'; }
-			   @$params .=  $vars[$i][0].'='.urlencode($vars[$i][1]);
-
-			}
-		} elseif (!empty($vars)) {
-		   $params = $vars;
-		}   
-
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_POST,				1);
-		curl_setopt($ch, CURLOPT_POSTFIELDS,		$params);
-		curl_setopt($ch, CURLOPT_URL,				$url);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST,  	0); 
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER,	1);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 	FALSE);   
-		$result = curl_exec ($ch);
-		curl_close ($ch);
-		return $result;	 
-	}		
-
-
-	# SSL connection with fsockopen()  
-	function connect_fsockopen($host, $url, $vars, $ssl, $type) 	{
-
-		if($ssl) { 
-			$host = 'ssl://'. $host;
-			$port = 443;
-		} else { 
-			$port = 80;
-		}
-
-		$fp = @fsockopen ($host, $port, $errno, $errstr, 120);
-		$ret = ""; 
-		@$req = substr ($url, $p);
-
-		if ($fp) {
-			fputs ($fp, "POST $req  HTTP/1.1\n");
-			fputs ($fp, "Accept: */*\n");
-			fputs ($fp, "Accept-Language: en\n");
-			fputs ($fp, "Connection: Keep-Alive\n");
-			fputs ($fp, "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)\n");
-			fputs ($fp, "Content-type: application/x-www-form-urlencoded\n");
-			$out = "";  
-			for($i=0; $i0 && !empty($vars[$i][0]))
-					$out .= '&'; 
-				$out .= rawurlencode($vars[$i][0]) .'='. $out .= rawurlencode($vars[$i][1]);
-			} 
-			$out = trim ($out);
-			fputs ($fp, "Content-length: ".strlen($out)."\n\n");
-			fputs ($fp, "$out");
-			fputs ($fp, "\n");
-			while(!feof($fp))  
-				$ret .= fgets($fp,128); 
-			fclose ($fp);
-		} else {
-			return false;
-		}
-		return $ret;  		
-	}			
-}
-?>
\ No newline at end of file
diff --git a/modules/core/static_var.inc.php b/modules/core/static_var.inc.php
deleted file mode 100644
index e162634c..00000000
--- a/modules/core/static_var.inc.php
+++ /dev/null
@@ -1,1452 +0,0 @@
- 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-class CORE_static_var
-{ 
-	##############################
-	##	Generate Static Var List #
-	##############################
-
-	function generate_form($module, $method, $display)
-	{
-		global $VAR, $C_translate;
-		include_once(PATH_CORE . 'validate.inc.php');
-
-		####################################################################
-		### $Method is the method name called to add records, so we know if we
-		### should use the error class, i.e: 'user_add'
-		### $Module is the module name
-		### $Display is the display type (view or update) update allows for
-		### user changes...
-
-		$validate = false;
-		if(isset($VAR['do'])  &&   gettype($VAR['do']) == 'array')
-		{
-			for($i=0; $iExecute($sql);
-
-		if($relation->RecordCount() == 0)
-		{
-			return false;
-		}
-		else
-		{
-			$i = 0;
-			$C_validate = new CORE_validate;
-
-			while (!$relation->EOF)
-			{  
-				################################################################
-				### Get the primary settings for this field
-
-				$id             = $relation->fields['id'];
-				$static_var_id  = $relation->fields['static_var_id'];
-				$default_value  = $relation->fields['default_value'];
-				$description    = $relation->fields['description'];
-				$required       = $relation->fields['required'];
-
-
-
-				############################################################
-				### Get the extended details for this field from the STATIC
-				### VAR records
-
-				$sql    = 'SELECT * FROM ' . AGILE_DB_PREFIX . 'static_var WHERE
-						   site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-						   id          = ' . $db->qstr($static_var_id);
-				$var = $db->Execute($sql);
-
-
-
-				$format         = $var->fields['input_format'];
-				$validation     = $var->fields['validation_type'];
-				$convert        = $var->fields['convert_type'];
-				$name           = $var->fields['name'];
-
-
-
-				############################################################
-				### Generate the field name, translate if it exists,
-				### otherwise, just return the actual field name
-
-				### $this_name      = $C_translate->translate('field_'.$name, $module, '');        		 	
-				### if($this_name = '') $this_name = $name;
-				$this_name = $name;
-
-
-				############################################################
-				### Determine the field value & name
-
-				if(!isset($VAR["static_relation"]["$id"]) || $VAR["static_relation"]["$id"] == '')
-				$static_value = $default_value;
-				else
-				$static_value = $VAR["static_relation"]["$id"];
-
-				$static_relation = 'static_relation['.$id.']';
-
-
-
-				############################################################
-				### Determine The CSS Style to use...
-
-				if($required == '1' && $validate == true)
-				{
-					if(!isset($VAR["static_relation"]["$id"]) || trim($VAR["static_relation"]["$id"]) == '')
-					{
-						$css = 'form_field_error';
-					}
-					else if ($validation != 'any'   &&   $validation != 'none'  &&   $validation != '')
-					{
-						$css = 'form_field_error';
-						$css = 'form_field';
-					}
-					else
-					{
-						$css = 'form_field';
-					}
-				}
-				else
-				{
-					$css = 'form_field';
-				}
-
-				$css_menu = 'form_menu';
-
-
-				############################################################
-				### Create the HTML
-
-				if($format == 'small_text')
-				{
-					if($display == 'update')
-					{
-						### SMALL TEXT FIELD
-						$this_html = '';
-					}
-					elseif($display == 'search')
-					{
-						$this_html = '' . 
-									$C_translate->translate('search_partial', 'CORE', SESS_LANGUAGE);
-					}
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-				else if ($format == 'medium_text')
-				{
-					if($display == 'update')
-					{
-						### MEDIUM TEXT FIELD
-						$this_html = '';
-					}
-					elseif($display == 'search')
-					{
-						$this_html = '' . 
-									$C_translate->translate('search_partial', 'CORE', SESS_LANGUAGE);
-					}                        
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-				else if ($format == 'large_text')
-				{
-					if($display == 'update')
-					{
-						### LARGE TEXT FIELD
-						$this_html = '';
-					}
-					elseif($display == 'search')
-					{
-						$this_html = '' . 
-									$C_translate->translate('search_partial', 'CORE', SESS_LANGUAGE);
-					}                           
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-
-
-				else if ($format == 'dropdown_list')
-				{ 
-					if( $display == 'update')
-					{ 
-						$this_html = '';
-					}
-					elseif ($display == 'search')
-					{
-						$this_html = '';                        	
-					}
-					else
-					{
-						$this_html = $static_value;
-					}  
-				}
-
-
-				else if ($format == 'calendar')
-				{ 
-					if($display == 'update' || $display == 'search')
-					{ 
-						# set the date to current date if 'now' is set as $default
-						if( $static_value == 'now' ) {
-							$default = date(UNIX_DATE_FORMAT);	
-						} else {
-							$default = $static_value;
-						} 
-						$id = rand(9,999);
-						$this_html = '
-							 						
-							
-							
-							';
-
-					}                    
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-				else if ($format == 'file_upload')
-				{
-					if($display == 'update')
-					{
-						### FILE UPLOAD
-						$this_html = 'File upload not yet supported!';
-					}
-					else
-					{
-						$this_html = '';
-					}
-				}
-
-
-				else if ($format == 'status')
-				{
-					if($display == 'update')
-					{
-						### BOOLEAN TRUE/FALSE
-						$C_list = new CORE_list;
-						$this_html = $C_list->bool($static_relation, $static_value, $css_menu);
-					}
-					elseif($display == 'search')
-					{
-						### BOOLEAN TRUE/FALSE
-						$C_list = new CORE_list;
-						$this_html = $C_list->bool($static_relation, 'all', $css_menu);
-					}                          
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-				else if ($format == 'checkbox')
-				{
-					if($display == 'update')
-					{
-						### CHECKBOX
-						if($static_value == '1')
-						$this_html = '';
-						else
-						$this_html = '';
-					}
-					elseif($display == 'search')
-					{
-						### BOOLEAN TRUE/FALSE
-						$C_list = new CORE_list;
-						$this_html = $C_list->bool($static_relation, 'all', $css_menu);
-					}                           
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-				else if ($format == 'hidden')
-				{
-					### HIDDEN FIELD
-					$this_html = '';
-				}
-
-
-				### add to the array
-				$arr[] = Array('name' => $this_name,
-							   'html' => $this_html);
-
-				$i++;
-				$relation->MoveNext();
-			}
-		}
-
-		#echo "
";
-		#htmlspecialchars(print_r(@$arr));
-
-		return $arr;
-	}	
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	function update_form($module, $method, $record_id)
-	{
-	   global $VAR, $C_translate;
-	   include_once(PATH_CORE . 'validate.inc.php');
-
-	   $display = 'update';
-
-		####################################################################
-		### $Method is the method name called to add records, so we know if we
-		### should use the error class, i.e: 'user_add'
-		### $Module is the module name
-		### $Display is the display type (view or update) update allows for
-		### user changes...
-
-		$validate = false;
-		if(isset($VAR['do'])  &&   gettype($VAR['do']) == 'array')
-		{
-			for($i=0; $iExecute($sql);
-
-		if($relation->RecordCount() == 0)
-		{
-			return false;
-		}
-		else
-		{
-			$i = 0;
-			$C_validate = new CORE_validate;
-
-			while (!$relation->EOF)
-			{
-
-				################################################################
-				### Get the primary settings for this field
-
-				$id             = $relation->fields['id'];
-				$static_var_id  = $relation->fields['static_var_id'];
-				$default_value  = $relation->fields['default_value'];
-				$description    = $relation->fields['description'];
-				$required       = $relation->fields['required'];
-
-
-
-				############################################################
-				### Get the extended details for this field from the STATIC
-				### VAR records
-
-				$sql    = 'SELECT * FROM ' . AGILE_DB_PREFIX . 'static_var WHERE
-						   site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-						   id          = ' . $db->qstr($static_var_id);
-				$var = $db->Execute($sql);
-
-
-
-				$format         = $var->fields['input_format'];
-				$validation     = $var->fields['validation_type'];
-				$convert        = $var->fields['convert_type'];
-				$name           = $var->fields['name'];
-
-
-				############################################################
-				### Get the value for this record, if any...
-
-				$sql    = 'SELECT value FROM ' . AGILE_DB_PREFIX . 'static_var_record
-						   WHERE
-						   site_id      = ' . $db->qstr(DEFAULT_SITE) . ' AND
-						   record_id    = ' . $db->qstr($record_id) .' AND
-						   static_var_id= ' . $db->qstr($static_var_id) .' AND
-						   static_var_relation_id = ' . $db->qstr($id) .' AND
-						   module_id = ' . $db->qstr($module_id);
-				$value = $db->Execute($sql);
-
-				$static_value = $value->fields['value'];
-
-
-
-				############################################################
-				### Generate the field name, translate if it exists,
-				### otherwise, just return the actual field name
-
-				### $this_name      = $C_translate->translate('field_'.$name, $module, '');        		 	
-				### if($this_name = '') $this_name = $name;
-				$this_name = $name;
-				$static_relation = 'static_relation['.$id.']';
-
-
-				############################################################
-				### Determine The CSS Style to use...
-
-				if($required == '1' && $validate == true)
-				{
-					if(!isset($VAR["static_relation"]["$id"]) || trim($VAR["static_relation"]["$id"]) == '')
-					{
-						$css = 'form_field_error';
-					}
-					else if ($validation != 'any'   &&   $validation != 'none'  &&   $validation != '')
-					{
-						$css = 'form_field_error';
-						$css = 'form_field';
-					}
-					else
-					{
-						$css = 'form_field';
-					}
-				}
-				else
-				{
-					$css = 'form_field';
-				}
-
-				$css_menu = 'form_menu';
-
-
-
-
-				############################################################
-				### Create the HTML
-
-				if($format == 'small_text')
-				{
-					if($display == 'update')
-					{
-						### SMALL TEXT FIELD
-						$this_html = '';
-					}
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-				else if ($format == 'medium_text')
-				{
-					if($display == 'update')
-					{
-						### MEDIUM TEXT FIELD
-						$this_html = '';
-					}
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-				else if ($format == 'large_text')
-				{
-					if($display == 'update')
-					{
-						### LARGE TEXT FIELD
-						$this_html = '';
-					}
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-
-
-				else if ($format == 'dropdown_list')
-				{
-					if($display == 'update')
-					{
-						### MENU LIST
-						$this_html = '';
-					}
-					else
-					{
-						$this_html = $static_value;
-					} 
-				}
-
-
-				else if ($format == 'calendar')
-				{
-					if($display == 'update')
-					{ 
-						if(!empty($static_value))
-						@$default = date(UNIX_DATE_FORMAT,$static_value);
-						else 
-						$default = false;
-
-						$id = rand(9,999);
-						$this_html = '
-							 						
-							
-							
-							';
-					}
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-				else if ($format == 'file_upload')
-				{
-					if($display == 'update')
-					{
-						### FILE UPLOAD
-						$this_html = 'File upload not yet supported!';
-					}
-					else
-					{
-						$this_html = '';
-					}
-				}
-
-
-				else if ($format == 'status')
-				{
-					if($display == 'update')
-					{
-						### BOOLEAN TRUE/FALSE
-						$C_list = new CORE_list;
-						$this_html = $C_list->bool($static_relation, $static_value, $css_menu);
-					}
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-				else if ($format == 'checkbox')
-				{
-					if($display == 'update')
-					{
-						### CHECKBOX
-						if($static_value == '1')
-						$this_html = '';
-						else
-						$this_html = '';
-					}
-					else
-					{
-						$this_html = $static_value;
-					}
-				}
-
-				else if ($format == 'hidden')
-				{
-					### HIDDEN FIELD
-					$this_html = '';
-				}
-
-
-				### add to the array
-				$arr[] = Array('name' => $this_name,
-								 'html' => $this_html);
-
-				$i++;
-				$relation->MoveNext();
-			}
-		} 	
-		return $arr;
-	}	
-
-
-
-
-
-
-
-
-
-
-
-
-	#################################
-	##	View static vars for Record #
-	#################################
-
-	function view_form($module, $record_id)
-	{
-	   global $VAR, $C_translate; 	
-
-		####################################################################
-		### $Method is the method name called to add records, so we know if we
-		### should use the error class, i.e: 'user_add'
-		### $record_id is the record to retrieve values for
-
-
-		####################################################################
-		### Get the Id for this module
-
-		$db     = &DB();
-		$sql    = 'SELECT id FROM ' . AGILE_DB_PREFIX . 'module WHERE
-					site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-					name        = ' . $db->qstr($module);
-		$result = $db->Execute($sql);
-
-		if($result->RecordCount() == 0)
-		return false;
-		else
-		$module_id = $result->fields['id'];
-
-
-
-		####################################################################	 	
-		### Get all the associated STATIC RELATION records
-
-return false;
-		$sql    = 'SELECT * FROM ' . AGILE_DB_PREFIX . 'static_relation WHERE
-					site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-					module_id   = ' . $db->qstr($module_id) .' ORDER BY sort_order';
-		$relation = $db->Execute($sql);
-
-		if($relation->RecordCount() == 0)
-		{
-			return false;
-		}
-		else
-		{
-			$i = 0;
-
-
-			while (!$relation->EOF)
-			{
-
-				################################################################
-				### Get the primary settings for this field
-
-				$id             = $relation->fields['id'];
-				$static_var_id  = $relation->fields['static_var_id'];
-
-
-				############################################################
-				### Get the extended details for this field from the STATIC
-				### VAR records
-
-				$sql    = 'SELECT * FROM ' . AGILE_DB_PREFIX . 'static_var WHERE
-						   site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-						   id          = ' . $db->qstr($static_var_id);
-				$var = $db->Execute($sql);
-
-				$format         = $var->fields['input_format'];
-				$validation     = $var->fields['validation_type'];
-				$convert        = $var->fields['convert_type'];
-				$this_name      = $var->fields['name'];
-
-
-
-				############################################################
-				### Get the value for this record, if any...
-
-				$sql    = 'SELECT value FROM ' . AGILE_DB_PREFIX . 'static_var_record
-						   WHERE
-						   site_id      = ' . $db->qstr(DEFAULT_SITE) . ' AND
-						   record_id    = ' . $db->qstr($record_id) .' AND
-						   static_var_id= ' . $db->qstr($static_var_id) .' AND
-						   static_var_relation_id = ' . $db->qstr($id) .' AND
-						   module_id = ' . $db->qstr($module_id);
-				$value = $db->Execute($sql);
-
-				$static_value = $value->fields['value'];
-
-				############################################################
-				### Create the HTML
-
-				if($format == 'small_text')
-				{
-					if($display == 'update')
-					{
-						### SMALL TEXT FIELD
-						$this_html = '';
-					}
-					else if ( $static_value != '' )
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-				else if ($format == 'medium_text')
-				{
-					if($display == 'update')
-					{
-						### MEDIUM TEXT FIELD
-						$this_html = '';
-					}
-					else if ( $static_value != '' )
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-				else if ($format == 'large_text')
-				{
-					if($display == 'update')
-					{
-						### LARGE TEXT FIELD
-						$this_html = '';
-					}
-					else if ( $static_value != '' )
-					{
-						$return = '
-';
-						$this_html = ereg_replace($return, '
', $static_value);
-					}
-				}
-
-
-				else if ($format == 'dropdown_list')
-				{
-					if($display == 'update')
-					{
-						### MENU LIST
-						$this_html = '';
-					}
-					else if ( $static_value != '' )
-					{
-						$this_html = $static_value;
-					}
-				}
-
-
-				else if ($format == 'calendar')
-				{
-					if($display == 'update')
-					{
-						### SHOW DATE SELECTOR
-						$C_list = new CORE_list;
-						$this_html = $C_list->calender_add_static_var($static_relation, $static_value, $css);
-					}
-					else if ( $static_value != '' )
-					{
-						$date = date(UNIX_DATE_FORMAT, $static_value);	 		 	
-						$this_html = $date;
-					}
-				}
-
-
-				else if ($format == 'file_upload')
-				{
-					if($display == 'update')
-					{
-						### FILE UPLOAD
-						$this_html = 'File upload not yet supported!';
-					}
-					else if ( $static_value != '' )
-					{
-						$this_html = '';
-					}
-				}
-
-
-				else if ($format == 'status')
-				{
-					if($display == 'update')
-					{
-						### BOOLEAN TRUE/FALSE
-						$C_list = new CORE_list;
-						$this_html = $C_list->bool($static_relation, $static_value, $css_menu);
-					}
-					else if ( $static_value != '' )
-					{
-						if($static_value == 1)
-						$this_html = $C_translate->translate('true','','');
-						else
-						$this_html = $C_translate->translate('false','','');
-					}
-				}
-
-
-				else if ($format == 'checkbox')
-				{
-					if($display == 'update')
-					{
-						### CHECKBOX
-						if($static_value == '1')
-						$this_html = '';
-						else
-						$this_html = '';
-					}
-					else if ( $static_value != '' )
-					{
-						if($static_value == 1)
-						$this_html = $C_translate->translate('true','','');
-						else
-						$this_html = $C_translate->translate('false','','');
-					}
-				}
-
-				else if ($format == 'hidden' && $static_value != '' )
-				{
-					### HIDDEN FIELD
-					$this_html = $static_value;
-				}
-
-
-				### add to the array
-				if ( $static_value != '' )
-				{
-					$arr[] = Array('name' => $this_name, 'html' => $this_html);
-					$i++;
-				}
-
-				$relation->MoveNext();
-			}
-		}		
-		return $arr;
-	}	
-
-
-
-
-
-
-
-
-
-
-
-
-	##############################
-	##	VALIDATE A FORM          #
-	##############################
-
-	function validate_form($module, $errors)
-	{
-	   global $VAR, $C_translate;
-	   include_once(PATH_CORE . 'validate.inc.php');
-
-
-		####################################################################
-		### $Method is the method name called to add records, so we know if we
-		### should use the error class, i.e: 'user_add'
-		### $Module is the module name
-		### $Display is the display type (view or update) update allows for
-		### user changes...
-
-
-		####################################################################
-		### Get the Id for this module
-
-		$db     = &DB();
-		$sql    = 'SELECT id FROM ' . AGILE_DB_PREFIX . 'module WHERE
-					site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-					name        = ' . $db->qstr($module);
-		$result = $db->Execute($sql);
-
-		if($result->RecordCount() == 0)
-		return $errors;
-		else
-		$module_id = $result->fields['id'];
-
-
-return false;
-
-		####################################################################	 	
-		### Get all the associated STATIC RELATION records
-
-		$sql    = 'SELECT * FROM ' . AGILE_DB_PREFIX . 'static_relation WHERE
-					site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-					module_id   = ' . $db->qstr($module_id) .' ORDER BY sort_order';
-		$relation = $db->Execute($sql);
-
-		if($relation->RecordCount() == 0)
-		{
-			 return $errors;
-		}
-		else
-		{
-			$i = 0;
-			$C_validate = new CORE_validate;
-
-			while (!$relation->EOF)
-			{
-
-				################################################################
-				### Get the primary settings for this field
-
-				$id             = $relation->fields['id'];
-				$static_var_id  = $relation->fields['static_var_id'];
-				$default_value  = $relation->fields['default_value'];
-				$description    = $relation->fields['description'];
-				$required       = $relation->fields['required'];
-
-
-
-				############################################################
-				### Get the extended details for this field from the STATIC
-				### VAR records
-
-				$sql    = 'SELECT * FROM ' . AGILE_DB_PREFIX . 'static_var WHERE
-						   site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-						   id          = ' . $db->qstr($static_var_id);
-				$var = $db->Execute($sql);
-
-
-
-				$format         = $var->fields['input_format'];
-				$validation     = $var->fields['validation_type'];
-				$convert        = $var->fields['convert_type'];
-				$name           = $var->fields['name'];
-
-
-
-				############################################################
-				### Generate the field name, translate if it exists,
-				### otherwise, just return the actual field name
-
-				### $this_name      = $C_translate->translate('field_'.$name, $module, '');        		 	
-				### if($this_name = '') $this_name = $name;
-				$this_name = $name;
-				$static_relation = 'static_relation['.$id.']';
-
-				############################################################
-				### Determine the field value & name
-
-				if(!isset($VAR["static_relation"]["$id"]) || $VAR["static_relation"]["$id"] == '')
-				$field_value = '';
-				else
-				$field_value = $VAR["static_relation"]["$id"];
-
-
-
-
-				############################################################
-				### VALIDATE THE FIELD
-
-				if($required == '1')
-				{
-					if($field_value == '')
-					{
-						### ERROR: This field is required!
-						$errors[] =  Array('field' 		    => $name,
-											'field_trans' 	=> $name,							
-											'error' 		=> $C_translate->translate('validate_any',"", ""));	 						 	
-					}
-					else if ($validation != 'any'   &&   $validation != 'none')
-					{
-
-						### VALIDATE THIS FIELD:
-						$val["min_len"] = '1';
-						$val["max_len"] = '999999';
-						if (!$C_validate->validate($name, $val, $field_value, $validation))
-						{
-							### ERROR: Validation failed!
-							### ERROR: This field is required!
-							$errors[] =  Array('field' 		    => $name,
-												'field_trans' 	=> $name,							
-												'error' 		=> $C_validate->error[$name]);						 	
-
-						}
-					}
-				}
-
-				$i++;
-				$relation->MoveNext();
-			}
-		}
-
-
-		if(!isset($errors))
-		return false;
-		else		 	
-		return $errors;
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	##############################
-	##	ADD STATIC VAR RECORDS   #
-	##############################
-
-	function add($VAR, $module, $record_id)
-	{
-		include_once(PATH_CORE . 'validate.inc.php');
-
-
-		####################################################################
-		### $Method is the method name called to add records, so we know if we
-		### should use the error class, i.e: 'user_add'
-
-
-		####################################################################
-		### Get the Id for this module
-
-		$db     = &DB();
-		$sql    = 'SELECT id FROM ' . AGILE_DB_PREFIX . 'module WHERE
-					site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-					name        = ' . $db->qstr($module);
-		$result = $db->Execute($sql);
-
-		if($result->RecordCount() == 0)
-		return false;
-		else
-		$module_id = $result->fields['id'];
-
-
-return false;
-
-		####################################################################	 	
-		### Get all the associated STATIC RELATION records
-
-		$sql    = 'SELECT id, static_var_id FROM ' . AGILE_DB_PREFIX . 'static_relation WHERE
-					site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-					module_id   = ' . $db->qstr($module_id) .' ORDER BY sort_order';
-		$relation = $db->Execute($sql);
-
-		if($relation->RecordCount() == 0)
-		{
-			return false;
-		}
-		else
-		{
-			$i = 0;
-			$C_validate = new CORE_validate;
-
-			# define the validation class
-			$validate = new CORE_validate;		
-
-			while (!$relation->EOF)
-			{
-
-				################################################################
-				### Get the primary settings for this field
-
-				$id             = $relation->fields['id'];
-				$static_var_relation_id = $id;
-				$static_var_id  = $relation->fields['static_var_id'];
-
-
-				############################################################
-				### Get the extended details for this field from the STATIC
-				### VAR records
-
-				$sql    = 'SELECT id,name,convert_type FROM ' . AGILE_DB_PREFIX . 'static_var WHERE
-						   site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-						   id          = ' . $db->qstr($static_var_id);
-				$var = $db->Execute($sql);
-
-				$convert        = $var->fields['convert_type'];
-				$name           = $var->fields['name'];
-
-
-
-				############################################################
-				### Generate the field name, translate if it exists,
-				### otherwise, just return the actual field name
-
-				$static_relation = 'static_relation['.$id.']';
-
-				if(isset($VAR["static_relation"]["$id"]) && $VAR["static_relation"]["$id"] != '')
-				{
-					$value = $VAR["static_relation"]["$id"];
-
-					if($convert != 'none' && $convert != '')
-					$value = $validate->convert($name, $value, $convert);
-
-
-					########################################################
-					### Create the DB Record:
-					$db     = &DB();
-					$idx    = $db->GenID(AGILE_DB_PREFIX . "" . 'static_var_record_id');
-					$sql    = 'INSERT INTO ' . AGILE_DB_PREFIX . 'static_var_record SET
-								site_id  =  ' . $db->qstr(DEFAULT_SITE) . ',
-								id          = ' . $db->qstr($idx) . ',
-								record_id   = ' . $db->qstr($record_id) . ',
-								module_id   = ' . $db->qstr($module_id) . ',
-								static_var_id=' . $db->qstr($static_var_id) . ',
-								static_var_relation_id= ' . $db->qstr($static_var_relation_id) . ',
-								value       = ' . $db->qstr($value) ;
-					$insert = $db->Execute($sql);
-
-					# error reporting:
-					if ($insert === false)
-					{
-						global $C_debug;
-						$C_debug->error('static_var.inc.php','add', $db->ErrorMsg());
-						return false;
-					} 
-				}
-				$relation->MoveNext();
-			}
-		}
-	return true;
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	##############################
-	##	ADD STATIC VAR RECORDS   #
-	##############################
-
-	function update($VAR, $module, $record_id)
-	{
-		include_once(PATH_CORE . 'validate.inc.php');
-
-
-		####################################################################
-		### $Method is the method name called to add records, so we know if we
-		### should use the error class, i.e: 'user_add'
-
-
-		####################################################################
-		### Get the Id for this module
-
-		$db     = &DB();
-		$sql    = 'SELECT id FROM ' . AGILE_DB_PREFIX . 'module WHERE
-					site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-					name        = ' . $db->qstr($module);
-		$result = $db->Execute($sql);
-
-		if($result->RecordCount() == 0)
-		return false;
-		else
-		$module_id = $result->fields['id'];
-
-
-
-		####################################################################	 	
-		### Get all the associated STATIC RELATION records
-
-		$sql    = 'SELECT id, static_var_id FROM ' . AGILE_DB_PREFIX . 'static_relation WHERE
-					site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-					module_id   = ' . $db->qstr($module_id) .' ORDER BY sort_order';
-		$relation = $db->Execute($sql);
-
-		if($relation->RecordCount() == 0)
-		{
-			return false;
-		}
-		else
-		{
-			$i = 0;   
-			$validate = new CORE_validate;		
-
-			while (!$relation->EOF)
-			{
-				unset($value);
-
-				### Get the primary settings for this field 
-				$id             = $relation->fields['id'];
-				$static_var_relation_id = $id;
-				$static_var_id  = $relation->fields['static_var_id'];
-
-
-				### Get the extended details for this field from the STATIC
-				### VAR records
-
-				$sql    = 'SELECT id,name,convert_type FROM ' . AGILE_DB_PREFIX . 'static_var WHERE
-						   site_id     = ' . $db->qstr(DEFAULT_SITE) . ' AND
-						   id          = ' . $db->qstr($static_var_id);
-				$var = $db->Execute($sql);
-
-				$convert        = $var->fields['convert_type'];
-				$name           = $var->fields['name'];
-
-
-
-				############################################################
-				### Generate the field name, translate if it exists,
-				### otherwise, just return the actual field name
-
-				$static_relation = 'static_relation['.$id.']';
-				@$value = $VAR["static_relation"]["$id"];
-
-				if(!empty($VAR["static_relation"]["$id"]) || $value == 0 )
-				{ 
-					if($convert != 'none' && $convert != '')
-					$value = $validate->convert($name, $value, $convert);
-
-					### Test record already exists:
-					$sql    = 'SELECT id,value FROM ' . AGILE_DB_PREFIX . 'static_var_record  
-								WHERE
-								site_id  =  ' . $db->qstr(DEFAULT_SITE) . ' AND
-								record_id   = ' . $db->qstr($record_id) . ' AND
-								module_id   = ' . $db->qstr($module_id) . ' AND
-								static_var_id=' . $db->qstr($static_var_id) . ' AND
-								static_var_relation_id= ' . $db->qstr($static_var_relation_id);                               
-					$return = $db->Execute($sql);        		        
-
-					if ($return->RecordCount() == 0)
-					{ 
-						### Create new record:
-						$idx    = $db->GenID(AGILE_DB_PREFIX . "" . 'static_var_record_id');
-						$sql    = 'INSERT INTO ' . AGILE_DB_PREFIX . 'static_var_record SET
-									site_id  =  ' . $db->qstr(DEFAULT_SITE) . ',
-									id          = ' . $db->qstr($idx) . ',
-									record_id   = ' . $db->qstr($record_id) . ',
-									module_id   = ' . $db->qstr($module_id) . ',
-									static_var_id=' . $db->qstr($static_var_id) . ',
-									static_var_relation_id= ' . $db->qstr($static_var_relation_id) . ',
-									value       = ' . $db->qstr($value) ;
-						$insert = $db->Execute($sql); 
-						if ($insert === false) {
-							global $C_debug;
-							$C_debug->error('static_var.inc.php','update', $db->ErrorMsg());
-							return false;
-						}   
-					}
-					elseif ($value != $return->fields['value'])
-					{ 
-						### UPDATE the DB Record: 
-						$sql    = 'UPDATE ' . AGILE_DB_PREFIX . 'static_var_record SET
-									value       = ' . $db->qstr($value) . '
-									WHERE
-									site_id  	=  ' . $db->qstr(DEFAULT_SITE) . ' AND
-									id   = ' . $db->qstr($return->fields['id']);                                  
-						$insert = $db->Execute($sql); 
-						if ($insert === false) {
-							global $C_debug;
-							$C_debug->error('static_var.inc.php','update', $db->ErrorMsg());
-							return false;
-						}                      	                        	                        	
-					}                  		 	        		                              		 	     		 		 	
-				}
-				else
-				{
-					### Test record already exists:
-					$sql    = 'DELETE FROM ' . AGILE_DB_PREFIX . 'static_var_record  
-								WHERE
-								site_id  =  ' . $db->qstr(DEFAULT_SITE) . ' AND
-								record_id   = ' . $db->qstr($record_id) . ' AND
-								module_id   = ' . $db->qstr($module_id) . ' AND
-								static_var_id=' . $db->qstr($static_var_id) . ' AND
-								static_var_relation_id= ' . $db->qstr($static_var_relation_id);                               
-					$return = $db->Execute($sql);                    	
-				}
-				$relation->MoveNext();
-			}
-		} 
-	}	 	
-} 
-?>
diff --git a/modules/core/theme.inc.php b/modules/core/theme.inc.php
deleted file mode 100644
index bc92f393..00000000
--- a/modules/core/theme.inc.php
+++ /dev/null
@@ -1,204 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Theme Class
- *
- * @package AgileBill
- * @subpackage Core
- * @uses CORE_block
- */
-class CORE_theme {
-	public $id;
-
-	function __construct() {
-		global $VAR,$C_debug,$C_translate,$smarty;
-
-		# Get the cuurent session theme:
-		if(defined('SESS_THEME') && file_exists(PATH_THEMES.SESS_THEME.'/template.tpl')) {
-			if (SESS_THEME == 'default_admin' && SESS_LOGGED != true )
-				define ('THEME_NAME',DEF_THEME_N);
-			elseif (defined('ADMIN_FORCE'))
-				define ('THEME_NAME','default_admin');
-			elseif (! defined('ADMIN_FORCE') && SESS_THEME != 'default_admin')
-				define ('THEME_NAME',SESS_THEME);
-			else
-				define ('THEME_NAME',DEF_THEME_N);
-
-		} elseif(file_exists(PATH_THEMES.DEFAULT_THEME.'/template.tpl')) {
-			define ('THEME_NAME',DEFAULT_THEME);
-
-		} else {
-			define ('THEME_NAME',DEF_THEME_N);
-		}
-
-		# load the block class
-		$block = new CORE_block;
-
-		# Set smarty vars
-		if (isset($smarty->template_dir))
-			unset($smarty->template_dir);
-
-		$smarty->use_sub_dirs = false;
-		$smarty->template_dir = PATH_THEMES.THEME_NAME.'/';
-		$smarty->compile_dir = PATH_SMARTY.'templates/';
-		$smarty->config_dir = PATH_SMARTY.'configs/';
-		$smarty->cache_dir = PATH_SMARTY.'cache/';
-		$this->caching = false;
-		$this->compile_check = true;
-		$smarty->assign('THEME_NAME',THEME_NAME);
-
-		# Frame Theme Escape
-		if (THEME_NAME == 'default_admin') {
-			if (! empty($VAR['tid']) && empty($VAR['_escape'])) {
-				# Get URL string to pass to mainFrame
-				$url = '';
-				$i = 0;
-
-				while (list($key,$val) = each($VAR)) {
-					if ($key != 'tid') {
-						if ($i==0)
-							$url .= '?';
-						else
-							$url .= '&';
-
-						$url .= sprintf('%s=%s',$key,$val);
-						$i++;
-					}
-				}
-
-				$url = preg_replace('/tid=default_admin/','',$url);
-				$smarty->assign('mainFrameUrl',$url);
-				$this_template = sprintf('file:%s%s/template.tpl',PATH_THEMES,THEME_NAME);
-				$smarty->display($this_template);
-
-				exit;
-			}
-
-			if (empty($VAR['_escape']))
-				$block->display('core:top_frame');
-
-			# Force or define page set?
-			if (defined('FORCE_PAGE')) {
-				$block->display(FORCE_PAGE);
-
-			} elseif (@$VAR['_page']) {
-				$block->display($VAR['_page']);
-
-			} else {
-				$block->display('core:admin');
-			}
-
-			if (empty($VAR['_escape']))
-				$block->display('core:bottom_frame');
-
-			exit();
-		}
-
-		# Standard themes
-		if (isset($VAR['_escape'])) {
-			if (isset($VAR['_print'])) {
-				# Load printer friendly version
-				$block->display('core:top_frame');
-				$block->display($VAR['_page']);
-				$block->display('core:bottom_print');
-				exit();
-
-			} else {
-				# Check for force page:
-				if(defined('FORCE_PAGE'))
-					$block->display(FORCE_PAGE);
-				else
-					$block->display($VAR['_page']);
-
-				exit();
-			}
-
-		} else {
-			if (defined('FORCE_PAGE')) {
-				define('THEME_PAGE',FORCE_PAGE);
-
-			} else {
-				if (isset($VAR['_page']))
-					define('THEME_PAGE',$VAR['_page']);
-				else
-					define('THEME_PAGE','core:main');
-			}
-
-		   # Load the block normally
-		   $this_template = sprintf('file:%s%s/template.tpl',PATH_THEMES,THEME_NAME);
-		   $smarty->display($this_template);
-		}
-	}
-}
-
-class CORE_block {
-	public function display($block_r) {
-		global $smarty;
-
-		$savedir = '';
-
-		# If we are in a module, we need to preserve our template path
-		if (isset($smarty->_tpl_vars['meth'][0]) && $smarty->_tpl_vars['meth'][0] != 'core')
-			$savedir = $smarty->template_dir;
-
-		@$resource = explode(':',$block_r);
-		@$module = $resource[0];
-		@$block = $resource[1];
-
-		$displayBlock = false;
-		if ($module == 'TEMPLATE') {
-			$smarty->template_dir = PATH_THEMES.THEME_NAME.'/';
-			$displayBlock = true;
-
-		} else {
-			if (is_file(sprintf('%s%s/blocks/%s/%s.tpl',PATH_THEMES,THEME_NAME,$module,$block))) {
-				$smarty->template_dir = sprintf('%s%s/blocks/%s/',PATH_THEMES,THEME_NAME,$module);
-				$displayBlock = true;
-
-			} elseif (is_file(sprintf('%s%s/blocks/%s/%s.tpl',PATH_THEMES,DEF_THEME_N,$module,$block))) {
-				$smarty->template_dir = sprintf('%s%s/blocks/%s/',PATH_THEMES,DEF_THEME_N,$module);
-				$displayBlock = true;
-
-			} elseif (is_file(sprintf('%s%s/blocks/%s/%s.tpl',PATH_THEMES,'default',$module,$block))) {
-				$smarty->template_dir = sprintf('%s%s/blocks/%s/',PATH_THEMES,'default',$module);
-				$displayBlock = true;
-
-			} else {
-				$smarty->display(sprintf('file:%s%s/blocks/core/invalid_page.tpl',PATH_THEMES,DEF_THEME_N));
-			}
-		}
-
-		if ($displayBlock) {
-			if (! isset($smarty->_tpl_vars['VAR']['_page']) || ! $smarty->_tpl_vars['VAR']['_page'])
-				$smarty->_tpl_vars['VAR']['_page'] = $block_r;
-
-			$smarty->display(sprintf('file:%s%s.tpl',$smarty->template_dir,$block));
-		}
-
-		if ($savedir)
-			$smarty->template_dir = $savedir;
-	}
-}
-?>
diff --git a/modules/core/translate.inc.php b/modules/core/translate.inc.php
deleted file mode 100644
index 84cc7a47..00000000
--- a/modules/core/translate.inc.php
+++ /dev/null
@@ -1,313 +0,0 @@
-
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis 
- * @package AgileBill
- * @subpackage Translation
- */
-
-/**
- * The main AgileBill Translation Class
- *
- * Translation is controlled by:
- * - Templates: Template fields are translated using the {t} macro. This is normal gettext translation
- * - Templates - Table Fields: Table fields are translated using {osb f=tt|ft} macro. This uses the  in the _construct.xml
- * - Templates - Page Titles: Table page titles translated using ??? macro. This uses the  in the _construct.xml
- * - Menu: Fields are translated using the <display> in the _install.xml
- * - General: - Gettext translation using _().
- *
- * @package AgileBill
- * @subpackage Translation
- */
-class CORE_translate { 
-	function CORE_translate() {
-		if(defined("SESS_LANGUAGE")) 
-			$language = SESS_LANGUAGE;
-		else
-			$language = DEFAULT_LANGUAGE; 		
-		$language = $this->get_lang_pack('CORE', $language);
-		define('LANG', $this->language_name);
-	}
-
-
-	function get_lang_pack($module, $language) {	
-		# define the language names / ids (must match the language.name & language.id fields in the DB
-		$this->lang_arr[0] = 'en';
-
-		# get the Core language pack
-		if($module=='CORE') {
-			$pack_file = PATH_LANGUAGE .'core/'. $language . '_core.xml';
-			$this->language_name = $language;
-		} else if ($language != '') {
-			$pack_file = PATH_LANGUAGE . '' . $module . '/' . $language . '_' . $module . '.xml';
-		} 
-		$def_pack_file = PATH_LANGUAGE . '' . $module . '/' . DEFAULT_LANGUAGE . '_' . $module . '.xml';
-
-		# check that the defined file exists, if not, use the default language instead:
-		if(file_exists($pack_file)) {
-			# open the file for parsing	
-			$C_xml = new CORE_xml;
-			$this->lang_pack["$module"]["$language"] = $C_xml->xml_to_array($pack_file);				
-		} else {
-			# open the default language file for parsing	
-			$C_xml = new CORE_xml;
-			$this->lang_pack["$module"]["$language"] = $C_xml->xml_to_array($def_pack_file);
-		}			
-	}
-
-	function translate_resource($module, $resource, $language,$type=null) {	 
-		 if (! empty($this->value[$module]))
-			$array = $this->value[$module]; 
-
-		 @$string = $this->lang_pack[$module][$language]['translate'][$resource];			
-
-		 if (! empty($array) && is_array($array) && ! empty($string)) 
-			 while (list($key,$val) = each($array))  
-				$string = str_replace("%%{$key}%%",$val,$string); 
-
-		# Translate menu items
-		# @todo CACHE this work.
-		switch ($type) {
-			case 'menutitle':
-				$f = sprintf('%s%s/%s_install.xml',PATH_MODULES,$module,$module);
-
-				if (is_file($f)) {
-					# open the XML backup file:
-					$C_xml = new CORE_xml;
-					$module_data = $C_xml->xml_to_array($f);
-	
-					if (isset($module_data['install']['module_properties']['display']))
-						$string = $module_data['install']['module_properties']['display'];
-					else
-						$string = $module;
-				}
-
-				break;
-
-			case 'methodtitle':
-				$f = sprintf('%s%s/%s_install.xml',PATH_MODULES,$module,$module);
-
-				if (is_file($f)) {
-					# open the XML backup file:
-					$C_xml = new CORE_xml;
-					$module_data = $C_xml->xml_to_array($f);
-	
-					if (isset($module_data['install']['module_method'][$resource]['display']))
-						$string = $module_data['install']['module_method'][$resource]['display'];
-					else
-						$string = $resource;
-				}
-				break;
-		}
-
-		 return $string;
-	}
-
-	function value($module, $variable, $value) {
-		$this->value["$module"]["$variable"] = $value;
-	}			
-
-	function translate($resource, $module='CORE', $language=SESS_LANGUAGE,$type=null) {			
-		# determine the language 
-		if(empty($language)) {
-			if(defined("SESS_LANGUAGE")) 
-				$language = SESS_LANGUAGE;
-			else 
-				$language = DEFAULT_LANGUAGE;				
-		}
-
-		#@todo TEMP
-		if ($language == 'en')
-			$language = 'english';
-
-		if(empty($module)) $module = 'CORE';
-
-		if(!empty($resource)) {				
-			# checks if this is the core
-			if($module == 'CORE')	
-				return $this->translate_resource('CORE', $resource, $language,$type);
-
-			# load the language pack for the current module if needed:
-			if(!isset($this->lang_pack["$module"]["$language"]))
-				$this->get_lang_pack($module,$language);
-
-			# translate/return the current resource
-			return $this->translate_resource($module, $resource, $language,$type);				
-		}			
-	}
-
-	private function get_module($module) {
-		if (! file_exists($module_file=sprintf('%s/%s/%s.inc.php',PATH_MODULES,$module,$module))) {
-			printf('Module DOESNT EXIST (%s):%s',$module,__METHOD__);
-			return;
-		}
-
-		include_once($module_file);
-
-		if (! class_exists($module))
-			return false;
-		else
-			return new $module;
-	}
-
-	/**
-	 * Translate a table title
-	 */
-	public function tt($params,$smarty) {
-		if (! is_array($smarty->_tpl_vars['meth'])) 
-			if (! isset($params['module']) || ! isset($params['method'])) {
-				printf('MISSING module OR method: %s',__METHOD__);
-				return;
-			}
-
-		$module = isset($params['module']) ? $params['module'] : $smarty->_tpl_vars['meth'][0];
-		$method = isset($params['method']) ? $params['method'] : $smarty->_tpl_vars['meth'][1];
-
-		if (! $mm=$this->get_module($module))
-			$module = 'core';
-
-		if (! isset($mm->title[$method]) || ! trim($mm->title[$method])) {
-			printf('%s:%s',$module,$method);
-			return;
-		}
-
-		# See if there is a module specific translation
-		if (($module != 'core') && $mm->title[$method] != dgettext($module,$mm->title[$method]))
-			return dgettext($module,$mm->title[$method]);
-		else
-			return _($mm->title[$method]);
-	}
-
-	/**
-	 * Translate a table field
-	 */
-	public function tf($params,$smarty) {
-		if ((! is_array($smarty->_tpl_vars['meth']) || ! isset($params['module'])) && ! isset($params['field'])) {
-			printf('MISSING module OR field: %s',__METHOD__);
-			return;
-		}
-
-		$module = isset($params['module']) ? $params['module'] : $smarty->_tpl_vars['meth'][0];
-		$field = $params['field'];
-		$display = $params['field'];
-		$description = '';
-		$mm = '';
-
-		if (! $mm=$this->get_module($module))
-			$module = 'core';
-
-		# See if there is a module specific information on the attribute
-		else {
-			$display = (isset($mm->field[$field]['display'])) ? $mm->field[$field]['display'] : sprintf('%s:%s',$module,$field);
-			$description = (isset($mm->field[$field]['description'])) ? $mm->field[$field]['description'] : '';
-		}
-
-		# Translate
-		if ($description) {
-			if ($description != dgettext($module,$description))
-				$description = dgettext($module,$description);
-			else
-				$description = _($description);
-		}
-
-		if ($display != dgettext($module,$display))
-			$display = dgettext($module,$display);
-		else
-			$display = _($display);
-
-		if ($description)
-			return sprintf('<a href="#" onmouseover="return overlib(\'%s\');" onmouseout="nd()">%s</a>',$description,$display);
-		else
-			return $display;
-	}
-}
-
-/**
- * If gettext is not available in PHP, then this will provide compatibility for it.
- */
-if (! function_exists('_')) {
-	function _($msg) {
-		return $msg;
-	}
-}
-
-/**
- * This function will convert the browser two character language into the
- * default 5 character language, where the country portion should NOT be
- * assumed to be upper case characters of the first two characters.
- */
-function auto_lang($lang) {
-	switch ($lang) {
-		case 'ja': return 'ja_JP';
-		case 'cs': return 'cs_CZ';
-		default: return sprintf('%s_%s',$lang,strtoupper($lang));
-	}
-}
-
-$lang = array();
-if (DEF_LANGUAGE == 'auto') {
-	# Make sure their browser correctly reports language. If not, skip this.
-	if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-
-		# Get the languages which are spetcified in the HTTP header
-		$lang['lang_http'] = preg_split('/[;,]+/',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
-		foreach ($lang['lang_http'] as $key => $value) {
-			if (substr($value,0,2) == 'q=') {
-				unset($lang['lang_http'][$key]);
-				continue;
-			}
-
-			$value = preg_split('/[-]+/',$value);
-			if (sizeof($value) == 2)
-				$lang['lang_http'][$key] = strtolower($value[0]).'_'.strtoupper($value[1]);
-			else
-				$lang['lang_http'][$key] = auto_lang(strtolower($value[0]));
-		}
-
-		$lang['lang_http'] = array_unique($lang['lang_http']);
-
-		foreach ($lang['lang_http'] as $l) {
-			$lang['language_dir'] = PATH_LANGUAGE.$l;
-			$lang['language'] = $l;
-
-			if ((substr($l,0,2) == 'en') ||
-				(file_exists($lang['language_dir']) && is_readable($lang['language_dir'])))
-				break;
-		}
-
-		#todo Generate an error if language doesnt exist.
-	}
-
-} else {
-	# Grab the language file configured in config.php
-	#todo Generate an error if language doesnt exist.
-	if (DEF_LANGUAGE)
-		$lang['language'] = DEF_LANGUAGE;
-}
-
-# Set language
-if (isset($lang['language'])) {
-	$lang['language'] .= '.UTF-8';
-	setlocale(LC_ALL,$lang['language']); # set LC_ALL to de_DE
-	bindtextdomain('core',PATH_LANGUAGE);
-	bind_textdomain_codeset('core','UTF-8');
-	textdomain('core');
-}
-header('Content-type: text/html; charset=UTF-8',true);
-?>
diff --git a/modules/core/trigger.inc.php b/modules/core/trigger.inc.php
deleted file mode 100644
index 1d01a9f2..00000000
--- a/modules/core/trigger.inc.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * AgileBill - Open Billing Software
- *
- * This body of work is free software; you can redistribute it and/or
- * modify it under the terms of the Open AgileBill License
- * License as published at http://www.agileco.com/agilebill/license1-4.txt
- *
- * Originally authored by Tony Landis, AgileBill LLC
- *
- * Recent modifications by Deon George
- *
- * @author Deon George <deonATleenooksDOTnet>
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis <tony@agileco.com>
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Trigger Class
- *
- * @package AgileBill
- * @subpackage Core
- */
-class CORE_trigger {
-	public function trigger($trigger,$type,$VAR) {
-		if ($type) {
-			# Do success trigger(s)
-			if (isset($trigger['success']))
-				$this->run_triggers($trigger['success']);
-
-		} else {
-			# Do failure trigger(s)
-			if (isset($trigger['failure']))
-				$this->run_triggers($trigger['failure']);
-		}
-	}
-
-	# Run the trigger(s):
-	private function run_triggers($trigger) {
-		global $C_method;
-
-		foreach (explode(',',$trigger) as $details) {
-			$tss = explode(':',$details);
-
-			if (count($tss)==2)
-				$C_method->exe($tss[0],$tss[1]);
-		}
-	}
-}
-?>
diff --git a/modules/core/validate.inc.php b/modules/core/validate.inc.php
deleted file mode 100644
index 6aa81561..00000000
--- a/modules/core/validate.inc.php
+++ /dev/null
@@ -1,734 +0,0 @@
-<?php
-/**
- * AgileBill - Open Billing Software
- *
- * This body of work is free software; you can redistribute it and/or
- * modify it under the terms of the Open AgileBill License
- * License as published at http://www.agileco.com/agilebill/license1-4.txt
- *
- * Originally authored by Tony Landis, AgileBill LLC
- *
- * Recent modifications by Deon George
- *
- * @author Deon George <deonATleenooksDOTnet>
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis <tony@agileco.com>
- * @package AgileBill
- * @subpackage Core
- */
-
-/**
- * The main AgileBill CORE Validation Class
- *
- * @package AgileBill
- * @subpackage Core
- */
-class CORE_validate {
-	# Store our VAR from the caller
-	private $VAR;
-
-	public function __construct($VAR=null,$module='') {
-		$this->VAR = $VAR;
-		$this->module = $module;
-	}
-
-	public function convert($field,$data,$type) {
-		switch($type) {
-			case 'date':
-				return $this->convert_date($data);
-				break;
-
-			case 'time':
-				return $this->convert_time($data);
-				break;
-
-			case 'date-time':
-				return $this->convert_date_time($data);
-				break;
-
-			case 'date-now':
-				return $this->convert_date_now();
-				break;
-
-			case 'md5':
-				return $this->convert_md5($data);
-				break;
-
-			case 'sha':
-				return $this->convert_sha($data);
-				break;
-
-			case 'rc5':
-				return $this->convert_rc5($data);
-				break;
-
-			case 'crypt':
-				return $this->convert_crypt($data);
-				break;
-
-			case 'encrypt':
-				return $this->convert_encrypt($data);
-				break;
-
-			case 'gpg':
-				return $this->convert_gpg($data);
-				break;
-
-			case 'pgp':
-				return $this->convert_pgp($data);
-				break;
-
-			case 'array':
-				return $this->convert_array($data);
-				break;
-
-			case 'html':
-				return $this->convert_html($data);
-				break;
-		}
-	}
-
-	# Convert DEFAULT_TIME_FORMT to unix time stamp
-	public function convert_time($data) {
-		return strtotime($data);
-	}
-
-	# Convert DEFAULT_DATE_FORMT to unix time stamp
-	public function convert_date($date,$format=UNIX_DATE_FORMAT) {
-		if ($date == '0' || $date == '')
-			return '';
-
-		$Arr_format = explode(DEFAULT_DATE_DIVIDER,$format);
-		$Arr_date = explode(DEFAULT_DATE_DIVIDER,$date);
-
-		for ($i=0; $i<3; $i++) {
-			if ($Arr_format[$i] == 'd')
-				$day = $Arr_date[$i];
-
-			if ($Arr_format[$i] == 'm')
-				$month = $Arr_date[$i];
-
-			if ($Arr_format[$i] == 'Y')
-				$year = $Arr_date[$i];
-		}
-
-
-		return mktime(0,0,0,$month,$day,$year);
-	}
-
-	# Convert DEFAULT_DATE_TIME_FORMT to unix time stamp
-	public function convert_date_time($date) {
-		if ($date == '0' || $date == '')
-			return '';
-
-		$Arr_format = explode(DEFAULT_DATE_DIVIDER,UNIX_DATE_FORMAT);
-		$Arr_date = explode(DEFAULT_DATE_DIVIDER,$date);
-
-		for ($i=0; $i<3; $i++) {
-			if ($Arr_format[$i] == 'd')
-				$day = $Arr_date[$i];
-
-			if ($Arr_format[$i] == 'm')
-				$month = $Arr_date[$i];
-
-			if ($Arr_format[$i] == 'Y')
-				$year = $Arr_date[$i];
-		}
-
-		if (empty($day))
-			$day = date('d');
-		if (empty($month))
-			$month = date('m');
-		if (empty($year))
-			$year = date('Y');
-
-		return mktime(date('H'),date('i'),date('s'),$month,$day,$year);
-	}
-
-	public function convert_date_now() {
-		return time();
-	}
-
-	public function convert_md5($data) {
-		if ($data != '')
-			return md5($data);
-		else
-			return '';
-	}
-
-	public function convert_rc5($data) {
-		if ($data != '')
-			return rc5($data);
-		else
-			return '';
-	}
-
-	public function convert_sha($data) {
-		if ($data != '')
-			return sha1($data);
-		else
-			return '';
-	}
-
-	public function convert_crypt($data) {
-		if ($data != '')
-			return crypt($data);
-		else
-			return '';
-	}
-
-	public function convert_encrypt($data) {
-		if ($data != '') {
-			include_once(PATH_CORE.'crypt.inc.php');
-			return CORE_encrypt($data);
-
-		} else
-			return '';
-	}
-
-	public function convert_gpg($data) {
-		if ($data != '')
-			return gpg($data);
-		else
-			return '';
-	}
-
-	public function convert_pgp($data) {
-		if ($data != '')
-			return pgp($data);
-		else
-			return '';
-	}
-
-
-	public function convert_array($data) {
-		if ($data != '')
-			return serialize($data);
-		else
-			return serialize(array());
-	}
-
-	public function convert_html($data) {
-		if ($data == '')
-			return '';
-		else
-			return htmlspecialchars($data);
-	}
-
-	public function validate($field,$arr,$data,$type) {
-		if (isset($arr['min_len']) && ($arr['min_len'] > 1)) {
-			global $C_translate;
-
-			if (strlen($data) < $arr['min_len']) {
-				$C_translate->value['CORE']['min_length'] = $arr['min_len'];
-				$this->error[$field] = $C_translate->translate('validate_min_length','CORE','');
-
-				return false;
-			}
-		}
-
-		if (isset($arr['max_len']) && ($arr['max_len'] > 1)) {
-			global $C_translate;
-
-			if (strlen($data) > $arr['max_len']) {
-				$C_translate->value['CORE']['max_length'] = $arr['max_len'];
-				$this->error[$field] = $C_translate->translate('validate_max_length','CORE','');
-
-				return false;
-			}
-		}
-
-		switch ($type) {
-			case 'email':
-				return $this->validate_email($data,$field);
-				break;
-
-			case 'date':
-				return $this->validate_date($data,$field);
-				break;
-
-			case 'time':
-				return $this->validate_time();
-				break;
-
-			case 'date-time':
-				return $this->validate_date_time();
-				break;
-
-			case 'address':
-				return $this->validate_address($data,$field);
-				break;
-
-			case 'zip':
-				return $this->validate_zip($data,$field);
-				break;
-
-			case 'phone':
-				return $this->validate_phone($data,$field);
-				break;
-
-			case 'cc':
-				return $this->validate_cc($data,$field,false,false);
-				break;
-
-			case 'check':
-				return $this->validate_check();
-				break;
-
-			case 'numeric':
-				return $this->validate_numeric($data,$field);
-				break;
-
-			case 'alphanumeric':
-				return $this->validate_alphanumeric($data,$field);
-				break;
-
-			case 'non_numeric':
-				return $this->validate_non_numeric($data,$field);
-				break;
-
-			case 'float':
-				return $this->validate_float($data,$field);
-				break;
-
-			case 'any':
-				return $this->validate_any($data,$field);
-				break;
-
-			case 'domain':
-				return $this->validate_domain($data,$field);
-				break;
-
-			case 'ip':
-				return $this->validate_ip($data,$field);
-				break;
-
-			case 'password':
-				return $this->validate_password($data,$field);
-				break;
-		}
-	}
-
-	public function validate_email($data,$field) {
-		if (preg_match('/^[a-zA-Z0-9\._-]+@+[a-z0-9\._-]+\.+[a-z]{2,4}$/',$data)) {
-			return true;
-
-		} else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_email','CORE','');
-
-			return false;
-		}
-	}
-
-	public function validate_ip($data,$field) {
-		$ip = $data;
-		$valid = true;
-
-		if (preg_match('/^((127)|(192)|(10).*)$/',$ip)) {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_ip','CORE','');
-
-			return false;
-		}
-
-		$ip = explode('.',$ip);
-		if (count($ip) != 4) {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_ip','CORE','');
-
-			return false;
-		}
-
-		foreach($ip as $block)
-			if (! is_numeric($block) || $block>255 || $block<1)
-				$valid = false;
-
-		if ($valid == false) {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_ip','CORE','');
-
-			return false;
-
-		} else
-			return true;
-	}
-
-	public function validate_domain($data,$field) {
-		if (! preg_match('#^[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+#i',$data)) {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_domain','CORE','');
-
-			return false;
-
-		} else
-			return true;
-	}
-
-
-	public function validate_date($data,$field) {
-		if ($data == '0' || $data == '') {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_date','CORE','');
-
-			return false;
-		}
-
-		$Arr_format = explode(DEFAULT_DATE_DIVIDER,UNIX_DATE_FORMAT);
-		$Arr_date = explode(DEFAULT_DATE_DIVIDER,$data);
-
-		if (! gettype($Arr_date) == 'array' || count($Arr_date) != 3) {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_date','CORE','');
-
-			return false;
-		}
-
-		for ($i=0; $i<3; $i++) {
-			if ($Arr_format[$i] == 'd')
-				$day = $Arr_date[$i];
-
-			if ($Arr_format[$i] == 'm')
-				$month = $Arr_date[$i];
-
-			if ($Arr_format[$i] == 'Y')
-				$year = $Arr_date[$i];
-		}
-
-		$timestamp = mktime(0,0,0,$month,$day,$year);
-		$check_ts = mktime(0,0,0,1,1,1979);
-
-		if ($timestamp >= $check_ts)
-			return true;
-
-		else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_date','CORE','');
-
-			return false;
-		}
-	}
-
-	public function validate_time() {
-		return true;
-	}
-
-	public function validate_date_time() {
-		return true;
-	}
-
-	public function validate_address($data,$field) {
-		if (@strlen($data) >= 2 && preg_match('/[0-9]{1,}/',$data) && preg_match('/[a-z]{1,}/',$data)) {
-			return true;
-
-		} else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_address','CORE','');
-
-			return false;
-		}
-	}
-
-	public function validate_zip($data,$field) {
-		if (@strlen($data) >= 4 && preg_match('/[0-9a-zA-Z-]{4,}/',$data))
-			return true;
-
-		else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_zip','CORE','');
-
-			return false;
-		}
-	}
-
-	public function validate_phone($data,$field) {
-		if (@strlen($data) > 9 && preg_match('/[0-9()-]{10,}/',$data))
-			return true;
-
-		else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_phone','CORE','');
-
-			return false;
-		}
-	}
-
-	public function validate_fax($data,$field) {
-		if (@strlen($data) > 9 && preg_match('/[0-9()-]{10,}/',$data))
-			return true;
-
-		else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_fax','CORE','');
-
-			return false;
-		}
-	}
-
-	public function validate_check() {
-		return true;
-	}
-
-	public function validate_numeric($data,$field) {
-		if (preg_match('/^[0-9]{1,}$/',$data))
-			return true;
-
-		else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_numeric','CORE','');
-
-			return false;
-		}
-	}
-
-	public function validate_alphanumeric($data,$field) {
-		if (preg_match('/^[0-9a-zA-Z-]{1,}$/',$data))
-			return true;
-
-		else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_alphanumeric','CORE','');
-
-			return false;
-		}
-	}
-
-	public function validate_non_numeric($data,$field) {
-		if (! preg_match('/[0-9]{1,}/',$data))
-			return true;
-
-		else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_non_numeric','CORE','');
-
-			return false;
-		}
-	}
-
-	public function validate_float($data,$field) {
-		if (preg_match('/^[0-9\.]{1,}$/',$data))
-			return true;
-
-		else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_float','CORE','');
-
-			return false;
-		}
-	}
-
-	public function validate_any($data,$field) {
-		if ($data != '')
-			return true;
-
-		else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_any','CORE','');
-
-			return false;
-		}
-	}
-
-	public function validate_unique($table,$field,$id,$value) {
-		if ($value == '')
-			return true;
-
-		$db = &DB();
-
-		# Quick check to see if we already have that value
-		$result = $db->Execute(sqlSelect($db,$table,$field,array('id'=>$id,$field=>$value)));
-		if ($result && $result->RecordCount())
-			return true;
-
-		$where = sprintf('%s=%s',$field,$db->qstr($value));
-
-		if ($id != '' && $id != 'record_id')
-			$where .= sprintf(' AND id !=%s',$db->qstr($id));
-
-		$result = $db->Execute(sqlSelect($db,$table,$field,$where));
-
-		if ($result === false) {
-			global $C_debug;
-			$C_debug->error('validate.inc.php','validate_unique',$db->ErrorMsg());
-
-			return false;
-
-		} else {
-			if ($result->RecordCount() == 0)
-				return true;
-			else
-				return false;
-		}
-	}
-
-	public function validate_cc_exp($month,$year) {
-		if (preg_replace('/^0/','',$year) > preg_replace('/^0/','',date('y')))
-			return true;
-		elseif (preg_replace('/^0/','',$year) == preg_replace('/^0/','',date('y')) &&
-			preg_replace('/^0/','',$month) >= preg_replace('/^0/','',date('m')))
-			return true;
-		else
-			return false;
-	}
-
-	public function validate_cc($ccNum,$field,$card_type,$card_type_accepted_arr) {
-		$v_ccNum = false;
-
-		# VISA
-		if ($card_type == 'visa' || ! $card_type) {
-			if (preg_match('/^4[0-9]{12}([0-9]{3})?$/',$ccNum)) {
-				$v_ccNum = true;
-				$c_type = 'visa';
-			}
-
-		# MC
-		} else if ($card_type == 'mc' || ! $card_type) {
-			if (preg_match('/^5[1-5][0-9]{14}$/',$ccNum)) {
-				$v_ccNum = true;
-				$c_type = 'mc';
-			}
-
-		# AMEX
-		} else if ($card_type == 'amex' || ! $card_type) {
-			if (preg_match('^/3[47][0-9]{13}$/',$ccNum)) {
-				$v_ccNum = true;
-				$c_type = 'amex';
-			}
-
-		# DISCOVER
-		} else if ($card_type == 'discover' || ! $card_type) {
-			if (preg_match('^/6011[0-9]{12}/$',$ccNum)) {
-				$v_ccNum = true;
-				$c_type = 'discover';
-			}
-
-		# DELTA ?
-		} else if ($card_type == 'delta' || ! $card_type) {
-			if (preg_match('/^4(1373[3-7]|462[0-9]{2}|5397[8-9]|54313|5443[2-5]|54742|567(2[5-9]|3[0-9]|4[0-5])|658[3-7][0-9]|659(0[1-9]|[1-4][0-9]|50)|844(09|10)|909[6-7][0-9]|9218[1-2]|98824)[0-9]{10}$/')) {
-				$v_ccNum = true;
-				$c_type = 'delta';
-			}
-
-		# SOLO ?
-		} else if ($card_type == 'solo' || ! $card_type) {
-			if (preg_match('^/6(3(34[5-9][0-9])|767[0-9]{2})[0-9]{10}([0-9]{2,3})?$/')) {
-				$v_ccNum = true;
-				$c_type = 'solo';
-			}
-
-		# SWITCH ?
-		} else if ($card_type == 'switch' || ! $card_type) {
-			if (preg_match('^/49(03(0[2-9]|3[5-9])|11(0[1-2]|7[4-9]|8[1-2])|36[0-9]{2})[0-9]{10}([0-9]{2,3})?$/',$ccNum) ||
-				preg_match('^/564182[0-9]{10}([0-9]{2,3})?$/',$ccNum) ||
-				preg_match('^/6(3(33[0-4][0-9])|759[0-9]{2})[0-9]{10}([0-9]{2,3})?$/',$ccNum)) {
-				$v_ccNum = true;
-				$c_type = 'switch';
-			}
-
-		# JCB
-		} else if ($card_type == 'jcb' || ! $card_type) {
-			if (preg_match('^/(3[0-9]{4}|2131|1800)[0-9]{11}$/',$ccNum)) {
-				$v_ccNum = true;
-				$c_type = 'jcb';
-			}
-
-		# DINERS
-		} else if ($card_type == 'diners' || ! $card_type) {
-			if (preg_match('/^3(0[0-5]|[68][0-9])[0-9]{11}$/',$ccNum)) {
-				$v_ccNum = true;
-				$c_type = 'diners';
-			}
-
-		# CARTEBLANCHE
-		} else if ($card_type == 'carteblanche' || ! $card_type) {
-			if (preg_match('/^3(0[0-5]|[68][0-9])[0-9]{11}$/',$ccNum)) {
-				$v_ccNum = true;
-				$c_type = 'carteblanche';
-			}
-
-		# ENROUTE
-		} else if ($card_type == 'enroute' || ! $card_type) {
-			if (in_array(substr($ccNum,0,4),array('2014','2149')) && (strlen($ccNum) == 15)) {
-				$v_ccNum = true;
-				$c_type = 'enroute';
-			}
-		}
-
-		# Validate accepted card type
-		if ($card_type_accepted_arr != false & $v_ccNum) {
-			$v_ccNum = false;
-
-			for ($i=0; $i<count($card_type_accepted_arr); $i++)
-				if ($card_type_accepted_arr[$i] == $c_type)
-					$v_ccNum = true;
-		}
-
-		if ($v_ccNum)
-			return true;
-
-		else {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_cc','CORE','');
-
-			return false;
-		}
-	}
-
-	/**
-	 * Strong password validation
-	 */
-	public function validate_password($data,$field) {
-		# Force numbers and letters
-		if (! preg_match('/[0-9]{1,}/',$data) || ! preg_match('/[a-z]{1,}/',$data)) {
-			global $C_translate;
-			$this->error[$field] = $C_translate->translate('validate_password','CORE','');
-
-			return false;
-		}
-
-		$exclude = array();
-
-		# Values to exclude
-		foreach (array('email','username','first_name','last_name') as $var) {
-			$index = sprintf('%s_%s',$this->module,$var);
-
-			if (isset($this->VAR[$index]) && trim($this->VAR[$index]))
-				array_push($exclude,$this->VAR[$index]);
-		}
-
-		# Not in email eq to email
-		if (isset($this->VAR[$this->module.'_email']) && trim($this->VAR[$this->module.'_email'])) {
-			$e = explode('@',$this->VAR[$this->module.'_email']);
-
-			array_push($exclude,$e[0]);
-		}
-
-		# not eq to initials
-		if (isset($this->VAR[$this->module.'_first_name']) && trim($this->VAR[$this->module.'_first_name']) &&
-			isset($this->VAR[$this->module.'_last_name']) && trim($this->VAR[$this->module.'_last_name'])) {
-
-			array_push($exclude,sprintf('%s%s%s',
-				substr($this->VAR[$this->module.'_first_name'],0,1),
-				isset($this->VAR[$this->module.'_middle_name']) && trim($this->VAR[$this->module.'_middle_name']) ? substr($this->VAR[$this->module.'_middle_name'],0,1) : '',
-				substr($this->VAR[$this->module.'_last_name'],0,1)));
-		}
-
-		# Check against data
-		foreach($exclude as $bad_data) {
-			if (! empty($bad_data) && preg_match("/{$bad_data}/",$data)) {
-				global $C_translate;
-				$this->error[$field] = $C_translate->translate('validate_password','CORE','');
-
-				return false;
-			}
-		}
-
-		return true;
-	}
-}
-?>
diff --git a/modules/core/vars.inc.php b/modules/core/vars.inc.php
deleted file mode 100644
index 6745d1d6..00000000
--- a/modules/core/vars.inc.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-	
-/**
- * AgileBill - Open Billing Software
- *
- * This body of work is free software; you can redistribute it and/or
- * modify it under the terms of the Open AgileBill License
- * License as published at http://www.agileco.com/agilebill/license1-4.txt
- * 
- * For questions, help, comments, discussion, etc., please join the
- * Agileco community forums at http://forum.agileco.com/ 
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis <tony@agileco.com> 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-class CORE_vars
-{
-	var $f;
-	function CORE_vars()
-	{
-		if(isset($_GET) && count($_GET) > 0)
-		{
-			reset ( $_GET );
-			while ( list ($key, $val) = each ( $_GET ) ) {
-				$this->f["$key"] = $val;
-			}
-			reset ( $_GET );
-		}
-		if(isset($_POST) && count($_POST) > 0)
-		{
-			reset ( $_POST );
-			while ( list ($key, $val) = each ( $_POST ) ) $this->f["$key"] = $val;
-			reset ( $_POST );
-		}                	
-
-		// set the shortcuts:
-		if(!isset($this->f["_page"]))
-		{
-			global $_PAGE_SHORTCUTS;
-			for($i=0; $i<count($_PAGE_SHORTCUTS); $i++)
-			{
-				$shortcut = $_PAGE_SHORTCUTS[$i]["s"];
-				if(isset($this->f[$shortcut])) $this->f["_page"] = $_PAGE_SHORTCUTS[$i]["p"];
-			}
-		}
-
-		// mods for hardcoded vars in config/multi-site
-		global $hardcode; 
-		if(is_array($hardcode)) {
-			foreach($hardcode as $hc => $value) { 
-				$this->f[$hc] = $value;
-			}
-		}
-	}
-
-	function strip_slashes($arr) {
-		global $VAR;
-		if(get_magic_quotes_gpc()) {
-			for($i=0; $i<count($arr); $i++) {
-				$VAR[$arr[$i]] = htmlspecialchars(stripslashes($VAR[$arr[$i]]));
-			}
-		}
-	}
-
-	function strip_slashes_all() {
-		global $VAR;
-		if(get_magic_quotes_gpc()) {
-			foreach($VAR as $key=>$val) {
-				if(!is_array($val)) 
-					$VAR["$key"] = htmlspecialchars(stripslashes($val)); 
-				else
-					foreach($VAR["$key"] as $keya=>$vara) $VAR[$key][$keya] = htmlspecialchars(stripslashes($vara));                    
-			}
-		}
-	}
-}
-?>
diff --git a/modules/core/version.inc.php b/modules/core/version.inc.php
deleted file mode 100644
index 8876009d..00000000
--- a/modules/core/version.inc.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-	
-/**
- * AgileBill - Open Billing Software
- *
- * This body of work is free software; you can redistribute it and/or
- * modify it under the terms of the Open AgileBill License
- * License as published at http://www.agileco.com/agilebill/license1-4.txt
- * 
- * For questions, help, comments, discussion, etc., please join the
- * Agileco community forums at http://forum.agileco.com/ 
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis <tony@agileco.com> 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-$list = new CORE_list;
-
-# get version
-$fp = @fopen(PATH_AGILE.'Version.txt', "r");
-if($fp) {
-	$ver = fread($fp, 255);
-	fclose($fp);
-} else {		
-	$ver = "SVN";		
-}
-
-# get latest version
-$fp = fopen('http://agileco.com/Version.txt', "r");
-$abv = fread($fp, 255);
-fclose($fp);
-# get encoding version
-$tmp = file_get_contents(PATH_AGILE.'index.php');
-
-if(eregi('ioncube', $tmp))
-	$enc = 'ioncube';
-elseif(eregi('zend', $tmp))
-	$enc = 'zend';
-else
-	$enc = 'ioncube';	
-
-# get installed optional modules: 
-$modules   = Array ('affiliate'  	=> Array ('affiliate', 'campaign', 'affiliate_commission', 'affiliate_template'),
-					'charge'	 	=> Array ('charge'),
-					'email_queue'	=> Array ('email_queue'),
-					'faq'			=> Array ('faq','faq_translate', 'faq_category'),
-					'import'		=> Array ('import'),
-					'hosting'		=> Array ('host_server', 'host_registrar_plugin', 'host_tld'),
-					'login_share'	=> Array ('login_share'), 
-					'static_page'	=> Array ('static_page', 'static_page_category','static_page_translate') );	
-
-foreach($modules as $name => $m) {
-	foreach($m as $module)  {  
-		if( empty($avail["$name"]) && $list->is_installed( $module ) ) {
-			$avail["$name"] = true; 
-			$module_arr[] = $name;
-		}
-	}
-}   
-
-# set smarty vars
-global $smarty;
-$smarty->assign('version',$ver);
-$smarty->assign('ab_version',$abv);
-$smarty->assign('encoding_version',$enc);
-$smarty->assign('modules',@$module_arr);
-?>
diff --git a/modules/core/weblog.inc.php b/modules/core/weblog.inc.php
deleted file mode 100644
index f72545eb..00000000
--- a/modules/core/weblog.inc.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-	
-/**
- * AgileBill - Open Billing Software
- *
- * This body of work is free software; you can redistribute it and/or
- * modify it under the terms of the Open AgileBill License
- * License as published at http://www.agileco.com/agilebill/license1-4.txt
- * 
- * For questions, help, comments, discussion, etc., please join the
- * Agileco community forums at http://forum.agileco.com/ 
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis <tony@agileco.com> 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-
-/**
- * Weblog Handler Class 
- */
-class CORE_weblog
-{
-	/**
-	* Logs the sesson variables.
-	* 
-	* @return 	void
-	* @since 	Version 1.0
-	*/
-
-	function CORE_weblog()
-	{
-		global $current_module, $VAR;		
-		if ($current_module == '')
-			$module = '';
-		else
-			$module = $current_module;
-
-		if (!isset($VAR['_page']) || $VAR['_page'] == '')
-		{
-			$page = '';
-		}
-		else
-		{
-			@$pagearr = explode(':', $VAR['_page']);
-			@$page = $pagearr["1"];
-		}
-
-		### browser type:
-		$arr_browser = $this->get_browser();
-		$browser = $arr_browser["type"]. ' ' . $arr_browser["ver"];
-
-		### product:
-		if (isset($VAR['prid']))
-		$product = $VAR['prid'];
-		else
-		$product = '';
-
-		### log the current hit to the database
-		$db = &DB();
-		$id = $db->GenID(AGILE_DB_PREFIX . "" . 'weblog_id');
-		$sql = "INSERT INTO ".AGILE_DB_PREFIX."weblog SET
-				id      	= ".$db->qstr($id).",
-				date_orig   = ".$db->qstr(time()).",
-				site_id		= ".$db->qstr(DEFAULT_SITE).",
-				session_id	= ".$db->qstr(SESS).",
-				account_id	= ".$db->qstr(SESS_ACCOUNT).",
-				affiliate_id= ".$db->qstr(SESS_AFFILIATE).",
-				reseller_id	= ".$db->qstr(SESS_RESELLER).",
-				campaign_id	= ".$db->qstr(SESS_CAMPAIGN).",
-				product_id	= ".$db->qstr($product).",
-				module		= ".$db->qstr($module).",
-				page		= ".$db->qstr($page).",
-				referrer	= ".$db->qstr($this->get_referrer()).",
-				browser		= ".$db->qstr($browser).",
-				os			= ".$db->qstr($this->get_os());
-		$result = $db->Execute($sql);
-
-		# error reporting:
-		if ($result === false)
-		{
-			global $C_debug;
-			$C_debug->error('weblog.inc.php','weblog', $db->ErrorMsg());
-		}
-
-		return;
-	}
-
-
-
-
-	/**
-	* Gets the current referrer.
-	*
-	* @return 	void
-	* @since 	Version 1.0
-	*/
-
-	function get_referrer()
-	{
-		global $HTTP_REFERER, $_SERVER;
-
-		if(@$HTTP_REFERER != "")
-			$re = @$HTTP_REFERER;
-		else
-			$re = @$_SERVER['HTTP_REFERER'];
-
-
-		if ($re != '')
-		{
-			if (URL != '')
-			{	
-				if (eregi (URL, $re)) return;
-			}
-			if (SSL_URL != '')	
-			{
-				if (eregi (SSL_URL, $re)) return;
-			}
-		}
-
-		return $re;
-	}	
-
-
-	/**
-	* Gets the current user's browser type.
-	*
-	* @return   string
-	* @since 	Version 1.0
-	*/
-
-	function get_browser()
-	{
-		global $HTTP_USER_AGENT, $_SERVER;
-
-		if(@$HTTP_USER_AGENT  == "") @$HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
-
-		$browser=array();
-		if(@eregi("(opera) ([0-9]{1,2}.[0-9]{1,3}){0,1}",$HTTP_USER_AGENT,$match) || @eregi("(opera/)([0-9]{1,2}.[0- 9]{1,3}){0,1}",$HTTP_USER_AGENT,$match))
-		{
-			$browser['type']= "Opera";
-			$browser['ver']=$match[2];
-		} elseif(eregi("(konqueror)/([0-9]{1,2}.[0-9]{1,3})",$HTTP_USER_AGENT,$match)) {
-			$browser['type'] = "Konqueror";
-			$browser['ver']=$match[2];
-		} elseif(eregi("(lynx)/([0-9]{1,2}.[0-9]{1,2}.[0-9]{1,2})",$HTTP_USER_AGENT,$match)) {
-			$browser['type'] = "Lynx";
-			$browser['ver']=$match[2];
-		} elseif(eregi("(links) \(([0-9]{1,2}.[0-9]{1,3})",$HTTP_USER_AGENT,$match)) {
-			$browser['type'] = "Links";
-			$browser['ver']=$match[2];
-		} elseif(eregi("(msie) ([0-9]{1,2}.[0-9]{1,3})",$HTTP_USER_AGENT,$match)) {
-			$browser['type'] = "MSIE";
-			$browser['ver']=$match[2];
-		} elseif(eregi("(netscape6)/(6.[0-9]{1,3})",$HTTP_USER_AGENT,$match)) {
-			$browser['type'] = "Netscape";
-			$browser['ver']=$match[2];
-		} elseif(eregi("mozilla/5",$HTTP_USER_AGENT)) {
-			$browser['type'] = "Mozilla";
-			$browser['ver']="Unknown";
-		} elseif(eregi("(mozilla)/([0-9]{1,2}.[0-9]{1,3})",$HTTP_USER_AGENT,$match)) {
-			$browser['type'] = "Netscape ";
-			$browser['ver']=$match[2];
-		} elseif(eregi("w3m",$HTTP_USER_AGENT)) {
-			$browser['type'] = "w3m";
-			$browser['ver']="Unknown";
-		} else {
-			$browser['type'] = "Unknown";
-			$browser['ver']="Unknown";
-		}
-		return $browser;
-	}
-
-	/**
-	* Gets the current user's AGILE_OS type.
-	*
-	* @return 	string
-	* @since 	Version 1.0
-	*/
-	function get_os()
-	{
-		global $HTTP_USER_AGENT, $_SERVER;
-
-		if(@$HTTP_USER_AGENT  == "") @$HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
-
-		if(eregi("linux",$HTTP_USER_AGENT))
-		{
-			$return = "Linux";
-		} elseif(eregi("win32",$HTTP_USER_AGENT)) {
-			$return = "Windows";
-		} elseif((eregi("(win)([0-9]{2})",$HTTP_USER_AGENT,$match)) || (eregi("(windows) ([0-9]{2})",$HTTP_USER_AGENT,$match))) {
-			$return = "Windows $match[2]";
-		} elseif(eregi("(winnt)([0-9]{1,2}.[0-9]{1,2}){0,1}",$HTTP_USER_AGENT,$match)) {
-			$return = "Windows NT $match[2]";
-		} elseif(eregi("(windows nt)( ){0,1}([0-9]{1,2}.[0-9]{1,2}){0,1}",$HTTP_USER_AGENT,$match)) {
-			$return = "Windows NT $match[3]";
-		} elseif(eregi("mac",$HTTP_USER_AGENT)) {
-			$return = "Macintosh";
-		} elseif(eregi("(sunos) ([0-9]{1,2}.[0-9]{1,2}){0,1}",$HTTP_USER_AGENT,$match)) {
-			$return = "SunOS $match[2]";
-		} elseif(eregi("(beos) r([0-9]{1,2}.[0-9]{1,2}){0,1}",$HTTP_USER_AGENT,$match)) {
-			$return = "BeOS $match[2]";
-		} elseif(eregi("freebsd",$HTTP_USER_AGENT)) {
-			$return = "FreeBSD";
-		} elseif(eregi("openbsd",$HTTP_USER_AGENT)) {
-			$return = "OpenBSD";
-		} elseif(eregi("irix",$HTTP_USER_AGENT)) {
-			$return = "IRIX";
-		} elseif(eregi("os/2",$HTTP_USER_AGENT)) {
-			$return = "AGILE_OS/2";
-		} elseif(eregi("plan9",$HTTP_USER_AGENT)) {
-			$return = "Plan9";
-		} elseif(eregi("unix",$HTTP_USER_AGENT) || eregi("hp-ux",$HTTP_USER_AGENT)) {
-			$return = "Unix";
-		} elseif(eregi("osf",$HTTP_USER_AGENT)) {
-			$return = "OSF";
-		} else {
-			$return = "Unknown";
-		}
-		return $return;
-	}
-}
-?>
\ No newline at end of file
diff --git a/modules/core/webmin.inc.php b/modules/core/webmin.inc.php
deleted file mode 100644
index 83567eee..00000000
--- a/modules/core/webmin.inc.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-	
-/**
- * AgileBill - Open Billing Software
- *
- * This body of work is free software; you can redistribute it and/or
- * modify it under the terms of the Open AgileBill License
- * License as published at http://www.agileco.com/agilebill/license1-4.txt
- * 
- * For questions, help, comments, discussion, etc., please join the
- * Agileco community forums at http://forum.agileco.com/ 
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis <tony@agileco.com> 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-/**
- * Webmin Virtualmin Remote Class 
- */
-class WEBMIN
-{ 
-	var $host;  	 
-	var $user;
-	var $pass;
-	var $debug;
-	var $reseller;
-	var $cookiepath; 
-
-	/*
-	* Check for Agilebill
-	*/
-	function WEBMIN()
-	{
-		if(!defined("PATH_FILES"))
-		{
-			echo "Dependancy Failure!";
-			exit;
-		} 
-	}
-
-
-
-
-	/*
-	* Get the unique domain id
-	*/		
-	function sitenum()
-	{
-		$url  = "{$this->user}:{$this->pass}@{$this->host}:{$this->port}";
-		$cgi  = $url.'/virtual-server/search.cgi';
-		$post = "&field=dom&match=0&what={$this->domain}";		 	
-		$ret  = $this->connect($cgi,$post);					  		
-		preg_match ("/(edit_domain.cgi\?dom=).([0-9]{1,})('>$this->domain<)/i", $ret, $arr); 			 
-		if(is_array($arr) && count($arr) > 0) {
-			$id = ereg_replace("('>$this->domain<)", "", ereg_replace("(edit_domain.cgi\?dom=)","", $arr[0]));
-		} else { 
-			preg_match ("/(edit_domain.cgi\?dom=).([0-9]{1,})('><i>$this->domain<\/i><)/i", $ret, $arr); 			 
-			if(is_array($arr) && count($arr) > 0)
-				$id = ereg_replace("('><i>$this->domain</i><)", "", ereg_replace("(edit_domain.cgi\?dom=)","", $arr[0]));
-			else
-				$id = false;				
-		} 
-
-		if($this->debug) echo "<br><br>{$cgi}?{$post}<br><textarea cols=100 rows=20>$ret</textarea>";
-
-		return $id;	
-	}
-
-
-	/*
-	* Add a domain
-	*/ 
-	function add()
-	{    	 
-		$url  = "{$this->user}:{$this->pass}@{$this->host}:{$this->port}";
-		$cgi  = $url.'/virtual-server/domain_setup.cgi';							
-		$post = "parentuser=&to=&dom={$this->domain}&owner=Created+by+AB&email_def=0&email={$this->email}".
-				"&user_def=0&user={$this->username}&pass={$this->password}&mgroup_def=1&mgroup=&group_def=1&ip=".
-				"&group=&prefix_def=1&mailbox=0&template=0&mailboxlimit_def=1&mailboxlimit=&domslimit_def=1&domslimit=".
-				"&dir={{$this->prod['home_dir']}&unix={$this->prod['unix']}&dns={$this->prod['dns']}".
-				"&web={$this->prod['website']}&webalizer={$this->prod['webalizer']}&logrotate={$this->prod['logrotate']}".
-				"&mysql={$this->prod['mysql']}&webmin={$this->prod['webmin']}&virt={$this->prod['network_interface']}";
-
-		$ret  = $this->connect($cgi,$post);		 
-		if($this->debug) echo "<br><br>{$cgi}?{$post}<br><textarea cols=100 rows=20>$ret</textarea>";
-
-		if(!eregi("Failed", $ret))	 
-		return true;	 
-		else
-		return false;
-   }
-
-
-   /*
-   * Edit the domain
-   */ 
-   function edit()
-   { 
-		/*
-		# get unique sitenum
-		$sitenum = $this->sitenum();
-		if(!$sitenum) return false; 
-
-		$url  = "{$this->user}:{$this->pass}@{$this->host}:{$this->port}";
-		$cgi  = $url.'/virtual-server/save_domain.cgi';							
-		$post = "dom={$sitenum}&virt=0&ip={$this->ip}&owner=Created+by+AB&email_def=0&email={$this->email}&passwd_def=1&passwd={$this->password}". 			 
-				"&dir={{$this->prod['home_dir']}&unix={$this->prod['unix']}&dns={$this->prod['dns']}".
-				"&web={$this->prod['website']}&webalizer={$this->prod['webalizer']}&logrotate={$this->prod['logrotate']}".
-				"&mysql={$this->prod['mysql']}&webmin={$this->prod['webmin']}&virt={$this->prod['network_interface']}";	   		
-
-		$ret  = $this->connect($cgi,$post);	 
-		if($this->debug) echo "<br><br>{$cgi}?{$post}<br><textarea cols=100 rows=20>$ret</textarea>";		
-
-
-		if(!eregi("Failed", $ret))	 
-		return true;	 
-		else
-		return false;	
-		*/
-
-		return true;					
-   }
-
-
-   /*
-   * Suspend account
-   */ 
-   function suspend($dologin=true)
-   {    
-		# get unique sitenum
-		$sitenum = $this->sitenum();
-		if(!$sitenum) return false; 
-
-		$url  = "{$this->user}:{$this->pass}@{$this->host}:{$this->port}";
-		$cgi  = $url.'/virtual-server/disable_domain.cgi';							
-		$post = "confirm=Yes, Disable It&dom={$sitenum}";
-
-		$ret  = $this->connect($cgi,$post);	 
-		if($this->debug) echo "<br><br>{$cgi}?{$post}<br><textarea cols=100 rows=20>$ret</textarea>";		
-
-		if(!eregi("Failed", $ret))	 
-		return true;	 
-		else
-		return false;
-   }
-
-
-   /*
-   * Unsuspend account  
-   */ 
-   function unsuspend($dologin=true)
-   {   
-		# get unique sitenum
-		$sitenum = $this->sitenum(); 
-		if(!$sitenum) return false; 
-
-		$url  = "{$this->user}:{$this->pass}@{$this->host}:{$this->port}";
-		$cgi  = $url.'/virtual-server/enable_domain.cgi';							
-		$post = "confirm=Yes, Enable It&dom={$sitenum}";
-
-		$ret  = $this->connect($cgi,$post);	 
-		if($this->debug) echo "<br><br>{$cgi}?{$post}<br><textarea cols=100 rows=20>$ret</textarea>";		
-
-		if(!eregi("Failed", $ret))	 
-		return true;	 
-		else
-		return false;	   	   
-   }
-
-
-   /*
-   * Delete account 
-   */ 
-   function del()
-   {	
-		# get unique sitenum
-		$sitenum = $this->sitenum();
-		if(!$sitenum) return false; 
-
-		$url  = "{$this->user}:{$this->pass}@{$this->host}:{$this->port}";
-		$cgi  = $url.'/virtual-server/delete_domain.cgi';							
-		$post = "confirm=Yes, Delete It&dom={$sitenum}";
-
-		$ret  = $this->connect($cgi,$post);	 
-		if($this->debug) echo "<br><br>{$cgi}?{$post}<br><textarea cols=100 rows=20>$ret</textarea>";		
-
-		if(!eregi("Failed", $ret))	 
-		return true;	 
-		else
-		return false;
-   }	
-
-
-
-   /*
-   * Curl connect
-   * 
-   */  	   
-   function connect($url,$post)
-   {
-		if($this->ssl)
-			$url = 'https://'.$url;  
-		else
-			$url = 'http://'.$url;
-
-		$ch = curl_init(); 
-		curl_setopt($ch, CURLOPT_URL,$url);
-		curl_setopt($ch, CURLOPT_POST, 1); 
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $post);  
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-
-		#curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-		curl_setopt($ch, CURLOPT_VERBOSE, 1 );
-		curl_setopt($ch, CURLOPT_HEADER, 1);
-
-		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST,  	0);  
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 	FALSE); 			
-
-		$data = curl_exec ($ch); 
-		curl_close ($ch);  
-		return $data; 
-   }  	      
-}
-?>
\ No newline at end of file
diff --git a/modules/core/xml.inc.php b/modules/core/xml.inc.php
deleted file mode 100644
index 67b48331..00000000
--- a/modules/core/xml.inc.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-	
-/**
- * AgileBill - Open Billing Software
- *
- * This body of work is free software; you can redistribute it and/or
- * modify it under the terms of the Open AgileBill License
- * License as published at http://www.agileco.com/agilebill/license1-4.txt
- * 
- * For questions, help, comments, discussion, etc., please join the
- * Agileco community forums at http://forum.agileco.com/ 
- *
- * @link http://www.agileco.com/
- * @copyright 2004-2008 Agileco, LLC.
- * @license http://www.agileco.com/agilebill/license1-4.txt
- * @author Tony Landis <tony@agileco.com> 
- * @package AgileBill
- * @version 1.4.93
- */
-	
-class CORE_xml
-{ 
-	function xml_to_array($file) 
-	{ 
-		if (defined('AGILE_CORE_CACHE_DIR') && AGILE_CORE_CACHE_DIR != '') {
-			$tfile = AGILE_CORE_CACHE_DIR."xml-".md5($file);
-			if (file_exists($tfile)) {
-				#clearstatcache();
-				#$mt = filemtime($file);
-				if (@filemtime($file) <= filemtime($tfile)) {
-					#echo "cached: $file<br>";
-					return unserialize(file_get_contents($tfile));
-				}
-			}
-			#echo "cache miss: $file<br>";
-		}	
-		if(!is_callable('simplexml_load_file') || !is_callable('dom_import_simplexml')) {
-			// call old XML to array class
-			$arr = xmlFileToArray($file, $includeTopTag = true, $lowerCaseTags = true); 				
-		} else {
-			// use SimpleXML class  
-			if(!is_file($file)) return false;
-			$xml = simplexml_load_file ($file);  
-			if(is_object($xml)) {
-				# Comments in the XML field are being translated as comment fields.
-				if (isset($xml->field->comment))
-					unset($xml->field->comment);
-				$dom = dom_import_simplexml ($xml); 
-				$arr["$dom->tagName"] = SimpleXML2Array($xml);				
-			}
-		}
-		if (defined('AGILE_CORE_CACHE_DIR') && AGILE_CORE_CACHE_DIR != '') {
-			$fp = fopen($tfile,"wb");
-			if ($fp) {
-				fwrite($fp, serialize($arr));
-				fclose($fp);
-			}
-		}
-		return $arr;
-	}
-
-	function array_to_xml() { 
-	}
-
-	function xml_string_to_array($string) {
-	}
-} 
-
-// new XML to Array for PHP5 and SimpleXML
-function SimpleXML2Array($xml) {
-   if (is_object($xml) && get_class($xml) == 'SimpleXMLElement') {
-	   $attributes = $xml->attributes();
-	   foreach($attributes as $k=>$v) {
-		   if ($v) $a[$k] = (string) $v;
-	   }
-	   $x = $xml;
-	   $xml = get_object_vars($xml);
-   }
-   if (is_array($xml)) {
-	   if (count($xml) == 0) return (string) $x; // for CDATA
-	   foreach($xml as $key=>$value) {
-		   $r[$key] = simplexml2array($value);
-	   }
-	   if (isset($a)) $r['@'] = $a;    // Attributes
-	   return $r;
-   }
-   return (string) $xml;
-} 
-
-
-function & toString( $fileName )
-{
-	if ($content_array = file($fileName))
-	{
-		$file = implode("", $content_array); 
-		return $file; 
-	}
-	else
-	{
-		// Error
-		$false = false;
-		return $false;
-	}
-}
-
-
-function & xmlFileToArray($fileName, $includeTopTag = false, $lowerCaseTags = true)
-{
-	// Definition file not found
-	if (!file_exists($fileName))
-	{
-		// Error
-		$false = false;
-		return $false;
-	}
-	$p = xml_parser_create();
-	xml_parse_into_struct($p,toString($fileName),$vals,$index);
-	xml_parser_free($p);
-	$xml = array();
-	$levels = array();
-	$multipleData = array();
-	$prevTag = "";
-	$currTag = "";
-	$topTag = false;
-	foreach ($vals as $val)
-	{
-		// Open tag
-		if ($val["type"] == "open")
-		{
-			if (!_xmlFileToArrayOpen($topTag, $includeTopTag, $val, $lowerCaseTags,
-			$levels, $prevTag, $multipleData, $xml))
-			{
-				continue;
-			}
-		}
-		// Close tag
-		else if ($val["type"] == "close")
-		{
-			if (!_xmlFileToArrayClose($topTag, $includeTopTag, $val, $lowerCaseTags,
-			$levels, $prevTag, $multipleData, $xml))
-			{
-				continue;
-			}
-		}
-		// Data tag
-		else if ($val["type"] == "complete" && isset($val["value"]))
-		{
-			$loc =& $xml;
-			foreach ($levels as $level)
-			{
-				$temp =& $loc[str_replace(":arr#", "", $level)];
-				$loc =& $temp;
-			}
-			$tag = $val["tag"];
-			if ($lowerCaseTags)
-			{
-				$tag = strtolower($val["tag"]);
-			}
-			$loc[$tag] = str_replace("\\n", "\n", $val["value"]);
-		}
-		// Tag without data
-		else if ($val["type"] == "complete")
-		{
-			_xmlFileToArrayOpen($topTag, $includeTopTag, $val, $lowerCaseTags,
-			$levels, $prevTag, $multipleData, $xml);
-			_xmlFileToArrayClose($topTag, $includeTopTag, $val, $lowerCaseTags,
-			$levels, $prevTag, $multipleData, $xml);
-		}
-	}
-	return $xml;
-}
-
-
-
-function _xmlFileToArrayOpen(& $topTag, & $includeTopTag, & $val, & $lowerCaseTags,
-& $levels, & $prevTag, & $multipleData, & $xml)
-{
-	// don't include top tag
-	if (!$topTag && !$includeTopTag)
-	{
-		$topTag = $val["tag"];
-		return false;
-	}
-	$currTag = $val["tag"];
-	if ($lowerCaseTags)
-	{
-		$currTag = strtolower($val["tag"]);
-	}
-	$levels[] = $currTag;
-
-	// Multiple items w/ same name. Convert to array.
-	if ($prevTag === $currTag)
-	{
-		if (!array_key_exists($currTag, $multipleData) ||
-		!$multipleData[$currTag]["multiple"])
-		{
-			$loc =& $xml;
-			foreach ($levels as $level)
-			{
-				$temp =& $loc[$level];
-				$loc =& $temp;
-			}
-			$loc = array($loc);
-			$multipleData[$currTag]["multiple"] = true;
-			$multipleData[$currTag]["multiple_count"] = 0;
-		}
-		$multipleData[$currTag]["popped"] = false;
-		$levels[] = ":arr#" . ++$multipleData[$currTag]["multiple_count"];
-	}
-	else
-	{
-		$multipleData[$currTag]["multiple"] = false;
-	}
-
-	// Add attributes array
-	if (array_key_exists("attributes", $val))
-	{
-		$loc =& $xml;
-		foreach ($levels as $level)
-		{
-			$temp =& $loc[str_replace(":arr#", "", $level)];
-			$loc =& $temp;
-		}
-		$keys = array_keys($val["attributes"]);
-		foreach ($keys as $key)
-		{
-			$tag = $key;
-			if ($lowerCaseTags)
-			{
-				$tag = strtolower($tag);
-			}
-			$loc["attributes"][$tag] = & $val["attributes"][$key];
-		}
-	}
-	return true;
-}
-
-
-function _xmlFileToArrayClose(& $topTag, & $includeTopTag, & $val, & $lowerCaseTags,
-& $levels, & $prevTag, & $multipleData, & $xml)
-{
-	// don't include top tag
-	if ($topTag && !$includeTopTag && $val["tag"] == $topTag)
-	{
-		return false;
-	}
-	if(isset($currTag))
-	{
-		if (isset($multipleData[$currTag]["multiple"]))
-		{
-			$tkeys = array_reverse(array_keys($multipleData));
-			foreach ($tkeys as $tkey)
-			{
-				if ($multipleData[$tkey]["multiple"] && !$multipleData[$tkey]["popped"])
-				{
-					array_pop($levels);
-					$multipleData[$tkey]["popped"] = true;
-					break;
-				}
-				else if (!$multipleData[$tkey]["multiple"])
-				{
-					break;
-				}
-			}
-		}
-	}
-	$prevTag = array_pop($levels);
-	if (strpos($prevTag, "arr#"))
-	{
-		$prevTag = array_pop($levels);
-	}
-	return true;
-}
-?>
diff --git a/modules/module.inc.php b/modules/module.inc.php
deleted file mode 100644
index 0ea9d810..00000000
--- a/modules/module.inc.php
+++ /dev/null
@@ -1,572 +0,0 @@
-<?php
-/**
- * osBilling - Open Billing Software
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Originally authored by Deon George
- *
- * @author Deon George <deonATleenooksDOTnet>
- * @copyright 2009 Deon George
- * @link http://osb.leenooks.net
- * @license http://www.gnu.org/licenses/
- * @package AgileBill
- * @subpackage Modules
- */
-
-require_once(PATH_CORE.'xml.inc.php');
-
-/**
- * Module Abstract Class
- * This abstract class provides the basic variables and methods for all modules.
- *
- * @package AgileBill
- * @subpackage Modules
- */
-abstract class OSB_module {
-	# Validation error array
-	public $val_error = array();
-	# Debug output to STDOUT
-	protected $debug = false;
-	# Inbound VAR value
-	protected $VAR = array();
-	# Object database ID & Record
-	private $record = array();
-	# Last Record ID read from DB
-	private $record_id = null;
-
-	/**
-	 * Initialise the module
-	 */
-	public function __construct($id=null) {
-		global $VAR;
-
-		$this->VAR = $VAR;
-
-		if (isset($this->VAR['debug']) && $this->VAR['debug'])
-			$this->debug = true;
-
-		$f = sprintf('%s%s/%s_construct.xml',PATH_MODULES,get_class($this),get_class($this));
-
-		if (is_file($f)) {
-			# Open the construct file for parsing
-			$C_xml = new CORE_xml;
-			$construct = $C_xml->xml_to_array($f);
-
-			# Required attributes of the construct file.
-			foreach (array('module','table','field') as $index) {
-				if (! isset($construct['construct'][$index]))
-					printf('ERROR: Missing [%s] for [%s]',$index,$f);
-				else
-					$this->{$index} = $construct['construct'][$index];
-			}
-
-			# Optional attributes of the construct file.
-			foreach (array('method','trigger','cache','order_by','limit','title','tpl') as $index)
-				if (isset($construct['construct'][$index]))
-					$this->{$index} = $construct['construct'][$index];
-
-			# Bind our language translation path
-			bindtextdomain($this->module,PATH_LANGUAGE);
-			bind_textdomain_codeset($this->module,'UTF-8');
-		}
-
-		$this->sql_LoadRecord($id);
-	}
-
-	/**
-	 * Return this record from the database
-	 */
-	protected function getRecord() {
-		return isset($this->record) ? $this->record : null;
-	}
-
-	protected function clearRecord() {
-		$this->record = array();
-	}
-
-	protected function delRecordAttr($attr) {
-		if (isset($this->record[$attr]))
-			unset($this->record[$attr]);
-	}
-
-	/**
-	 * Return a field from the database record
-	 */
-	protected function getRecordAttr($attr) {
-		return isset($this->record[$attr]) ? $this->record[$attr] : null;
-	}
-
-	protected function setRecordAttr($attr,$value) {
-		$this->record[$attr] = $value;
-		return $value;
-	}
-
-	public function getlist() {
-		# Open the construct file for parsing
-		$C_xml = new CORE_xml;
-
-		$dh = opendir(PATH_MODULES);
-		$modules = array();
-
-		while ($module=readdir($dh))
-			if (! in_array($module,array('.','..')) && is_dir(PATH_MODULES.$module) && is_file($f=sprintf('%s/%s/%s_install.xml',PATH_MODULES,$module,$module))) {
-
-				$install = $C_xml->xml_to_array($f);
-
-				# Determine the type
-				if (! isset($install['install']['module_properties']['type']))
-					$type = 'plugin';
-				else
-					$type = $install['install']['module_properties']['type'];
-
-				# Store the data
-				foreach (array('parent','name','notes','sub_modules','dependancy','type','table-only','method-only') as $index)
-					if (isset($install['install']['module_properties'][$index]))
-						$modules[$type][$module][$index] = $install['install']['module_properties'][$index];
-
-			}
-
-		return $modules;
-	}
-
-	/**
-	 * Basic module helper when interacting with the database.
-	 */
-	private function database($type,$VAR,$method=null) {
-		if ($type && ! is_array($this->method[$type]))
-			$this->method[$type] = explode(',',$this->method[$type]);
-
-		if (is_null($method) && $type)
-			$method = $type;
-
-		$db = new CORE_database;
-
-		if (method_exists($db,$method))
-			return $db->$method($VAR,$this,$type);
-
-		else {
-			global $C_debug;
-
-			$C_debug->error(__FILE__,__METHOD__,sprintf('Method doesnt exist'));
-		}
-	}
-
-	/**
-	 * Export module helper
-	 */
-	private function export($type,$VAR,$method=null) {
-		# Require the export class
-		require_once(PATH_CORE.'export.inc.php');
-
-		$this->method[$type] = explode(',',$this->method[$type]);
-
-		if (is_null($method) && $type)
-			$method = $type;
-
-		$export = new CORE_export;
-
-		if (method_exists($export,$method))
-			$export->$method($VAR,$this,$type);
-
-		else {
-			global $C_debug;
-			$C_debug->error(__FILE__,__METHOD__,sprintf('Method doesnt exist'));
-		}
-	}
-
-	/** ADMIN INTERFACE METHODS **/
-
-	/**
-	 * Add Records to the database
-	 */
-	public function add($VAR) {
-		if ($id = $this->database('add',$VAR))
-			return $id;
-
-		global $VAR;
-
-		# If update fails, return to the add page.
-		if (isset($VAR['_page']) && $VAR['_page'] == sprintf('%s:%s',$this->module,'view'))
-			$VAR['_page'] = sprintf('%s:%s',$this->module,'add');
-
-		return false;
-	}
-
-	/**
-	 * Delete Records in the database
-	 */
-	public function delete($VAR) {
-		return $this->database('',$VAR,'mass_delete');
-	}
-
-	/**
-	 * Search for Records in the database
-	 */
-	public function search($VAR) {
-		$this->database('search',$VAR);
-	}
-
-	/**
-	 * Export Records from the database
-	 */
-	public function search_export($VAR) {
-		switch ($VAR['format']) {
-			case 'csv':
-				$this->export('export_csv',$VAR,'search_csv');
-				break;
-
-			case 'excel':
-				$this->export('export_excel',$VAR,'search_excel');
-				break;
-
-			case 'pdf':
-				$this->export('export_pdf',$VAR,'pdf_invoice');
-				break;
-
-			case 'tab':
-				$this->export('export_tab',$VAR,'search_tab');
-				break;
-
-			case 'xml':
-				$this->export('export_xml',$VAR,'search_xml');
-				break;
-
-			default:
-				global $C_debug;
-				$C_debug->error(__FILE__,__METHOD__,sprintf('Export method doesnt exist'));
-		}
-	}
-
-	/**
-	 * Search for Records in the database
-	 */
-	public function search_form($VAR) {
-		$this->database('search',$VAR,'search_form');
-	}
-
-	/**
-	 * Show the Records from a Search in the database
-	 */
-	public function search_show($VAR) {
-		return $this->database('search',$VAR,'search_show');
-	}
-
-	/**
-	 * Update Records in the database
-	 */
-	public function update($VAR) {
-		return $this->database('update',$VAR);
-	}
-
-	/**
-	 * View a Record in the database
-	 */
-	public function view($VAR) {
-		#@todo implement showing the modified attributes if a update fails.
-		return $this->database('view',$VAR);
-	}
-
-	/** USER INTERFACE METHODS **/
-
-	/**
-	 * Add Records to the database
-	 */
-	public function user_add($VAR) {
-		return $this->database('user_add',$VAR,'add');
-	}
-
-	/**
-	 * Search for Records in the database
-	 */
-	public function user_search($VAR) {
-		if (! SESS_LOGGED) return false;
-
-		if (get_class($this) == 'discount')
-			$VAR[$this->module.'_avail_account_id'] = SESS_ACCOUNT;
-		else
-			$VAR[$this->module.'_account_id'] = SESS_ACCOUNT;
-
-		$this->database('search',$VAR);
-	}
-
-	/**
-	 * Show the Records from a Search in the database
-	 */
-	public function user_search_show($VAR) {
-		if (! SESS_LOGGED) return false;
-
-		return $this->database('search',$VAR,'search_show');
-	}
-
-	/**
-	 * Static Vars
-	 */
-	public function static_var($VAR) {
-		global $smarty;
-
-		require_once(PATH_CORE.'static_var.inc.php');
-		$static_var = new CORE_static_var;
-
-		if (preg_match('/search/',$VAR['_page']))
-			$arr = $static_var->generate_form($this->module,'add','search');
-		else
-			$arr = $static_var->generate_form($this->module,'add','update');
-
-		if (gettype($arr) == 'array') {
-			# Set everything as a smarty array, and return
-			$smarty->assign('show_static_var',true);
-			$smarty->assign('static_var',$arr);
-			return true;
-
-		} else {
-			# Or if no results
-			$smarty->assign('show_static_var',false);
-			return false;
-		}
-	}
-
-	/**
-	 * Render the results of a search
-	 *
-	 * This function can also be used to only render the headers, and the tpl file can be responsible for rendering the data
-	 *
-	 * If $args is null, we only render the header
-	 */
-	public function tpl_search_show($VAR,$object,$args) {
-		global $C_list;
-
-		require_once(PATH_CORE.'translate.inc.php');
-		$C_translate = new CORE_translate;
-
-		list($class,$method) = explode(':',$VAR['_page']);
-
-		$method = strtolower($method);
-
-		if (! isset($this->tpl[$method]))
-			return;
-
-		# If we are only rendering the headers, then skip the table definitions
-		if (! is_null($args)) {
-			echo '<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background"><tr><td>';
-			echo '<table width="100%" border="0" cellspacing="1" cellpadding="3">';
-		}
-
-		# Display the search heading
-		echo '<tr valign="middle" align="center" class="table_heading">';
-
-		foreach ($this->tpl[$method] as $index => $details) {
-			switch ($index) {
-				case 'blank':
-				case 'checkbox':
-				case 'icon':
-				case 'last':
-					printf('<td class="table_heading"%s> </td>',isset($details['width']) ? sprintf(' style="width: %s;"',$details['width']) : '');
-					break;
-
-				default:
-					printf('<td class="table_heading"%s>',isset($details['width']) ? sprintf(' style="width: %s;"',$details['width']) : '');
-					printf('<script type="text/javascript">document.write(search_heading(\'%s\',\'%s\'));</script>',
-						isset($details['translate'])
-							? $C_translate->translate($details['translate'],$this->module)
-							: $C_translate->tf(array('module'=>$this->module,'field'=>$details['field']),null),
-						$details['field']);
-					echo '</td>';
-			}
-		}
-
-		echo '</tr>';
-
-		# Loop through each record
-		if (is_array($args) && count($args[0])) {
-			foreach ($args[0] as $key => $values) {
-				printf('<tr id="row%s" onclick="row_sel(\'%s\',1);" ondblclick="window.location=\'?_page=%s:view&id=%s\';" onmouseover="row_mouseover(\'%s\',\'row_mouse_over_select\',\'row_mouse_over\');" onmouseout="row_mouseout(\'%s\',\'%s\',\'row_select\');" class="%s">',
-					$values['id'],$values['id'],$this->module,$values['id'],$values['id'],$values['id'],$values['_C'],$values['_C']);
-
-				foreach ($this->tpl[$method] as $index => $details) {
-					switch ($details['type']) {
-						case 'bool':
-							printf('<td>%s</td>',$values[$details['field']] ? $C_translate->translate('true') : $C_translate->translate('false'));
-
-							break;
-
-						case 'bool_icon':
-							echo '<td>';
-
-							if ($values[$details['field']])
-								printf('<img src="themes/%s/images/icons/%s" alt="True" width="16" height="16" style="border: 0px;"/>',DEFAULT_THEME,isset($details['true']) ? $details['true'] : 'go_16.gif');
-							else
-								printf('<img src="themes/%s/images/icons/%s" alt="False" width="16" height="16" style="border: 0px;"/>',DEFAULT_THEME,isset($details['false']) ? $details['false'] : 'stop_16.gif');
-
-							echo '</td>';
-
-							break;
-
-						case 'checkbox':
-							echo '<td style="text-align: center">';
-							printf('<input type="checkbox" id="record%s" name="record%s" value="%s" onclick="row_sel(\'%s\',1,\'%s\');"/>',
-								$values['id'],$values['id'],$values['id'],$values['id'],$values['_C']);
-							printf('<script type="text/javascript">row_sel(\'%s\',0,\'%s\'); record_arr[i] = \'%s\'; i++;</script>',$values['id'],$values['_C'],$values['id']);
-							echo '</td>';
-
-							break;
-
-						case 'currency':
-							printf('<td>%s</td>',$C_list->format_currency($values[$details['field']],DEFAULT_CURRENCY));
-
-							break;
-
-						case 'date':
-							printf('<td>%s %s</td>',date(UNIX_DATE_FORMAT,$values[$details['field']]),date(DEFAULT_TIME_FORMAT,$values[$details['field']]));
-
-							break;
-
-						case 'literal':
-							printf('<td>%s</td>',str_replace('%%id%%',$values['id'],$details['data']));
-
-							break;
-
-						default:
-							printf('<td> %s</td>',$values[$details['field']]);
-					}
-				}
-
-				echo '</tr>';
-			}
-		}
-
-		if (! is_null($args)) {
-			echo '</table>';
-			echo '</td></tr></table>';
-		}
-	}
-
-	/**
-	 * Get a record from the table by ID
-	 */
-	protected function getID($id) {
-		$db = &DB();
-		$record = $db->Execute(sqlSelect($db,$this->table,'*',array('id'=>$id)));
-
-		if ($record && $record->RecordCount() == 1)
-			return $record->fields;
-		else
-			return array();
-	}
-
-	/**
-	 * Get a record from the table by Name
-	 */
-	protected function getName($name) {
-		$db = &DB();
-		$record = $db->Execute(sqlSelect($db,$this->table,'*',array('name'=>$name)));
-
-		if ($record && $record->RecordCount() == 1)
-			return $record->fields;
-		else
-			return array();
-	}
-
-	/**
-	 * Graph Statistics
-	 */
-	public function graph($start,$end,$constraint,$default) {
-		global $C_translate;
-
-		$db = &DB();
-		$result = $db->Execute(sqlSelect($db,$this->table,sprintf('date_orig>=%s AND date_orig<=',$start,$end)));
-
-		if ($result->RecordCount() == 0) {
-			$arr['title'] = $C_translate->translate('search_no_results','','');
-			$arr['results'] = $default;
-
-			return $arr;
-		}
-
-		while (! $result->EOF) {
-			$d = $result->fields['date_orig'];
-
-			for ($i=0; $i<count($constraint); $i++) {
-				if ($d >= $constraint[$i]['start'] && $d < $constraint[$i]['end'])
-					$default[$i]++;
-			}
-
-			$result->MoveNext();
-		}
-
-		$C_translate->value[$this->table]['count'] = $result->RecordCount();
-		$title = $C_translate->translate('statistics',$this->table,'');
-		$arr['title'] = $title;
-		$arr['results'] = $default;
-
-		return $arr;
-	}
-
-	protected function sql_SaveRecord($noconvert=false,$ignoreval=false) {
-		global $VAR;
-
-		$lVAR = array();
-		if (is_array($VAR))
-			$lVAR = array_merge($VAR);
-
-		foreach ($this->record as $k => $v)
-			$lVAR[sprintf('%s_%s',$this->table,$k)] = $v;
-		$lVAR['_noredirect'] = true;
-
-		if ($noconvert)
-			$lVAR['_noconvert'] = true;
-		if ($ignoreval)
-			$lVAR['_ignoreval'] = true;
-
-		# Adding record
-		if (! isset($this->record['id']) || $this->record['id'] != $this->record_id)
-			return $this->add($lVAR);
-		else
-			return $this->update($lVAR);
-	}
-
-	protected function sql_LoadRecord($id) {
-		$record = $this->sql_GetRecords(array('where'=>array('id'=>$id)));
-
-		if (count($record) == 1) {
-			$this->record = array_pop($record);
-			$this->record_id = $id;
-
-		} else {
-			$this->record = null;
-			$this->record_id = null;
-		}
-	}
-
-	/**
-	 * Get Data out of the tables for the module
-	 *
-	 * @return array Table records
-	 */
-	protected function sql_GetRecords($opt=array()) {
-		$db = &DB();
-
-		$data = array();
-		$result = $db->Execute(sqlSelect($this->table,'*',$opt));
-
-		if ($result && $result->RecordCount())
-			while (! $result->EOF) {
-				array_push($data,$result->fields);
-				$result->MoveNext();
-			}
-
-		return $data;
-	}
-}
-?>
diff --git a/themes/default.user_theme b/themes/default.user_theme
deleted file mode 100644
index e69de29b..00000000
diff --git a/themes/default/IEFrameWarningBypass.htm b/themes/default/IEFrameWarningBypass.htm
deleted file mode 100644
index 85728750..00000000
--- a/themes/default/IEFrameWarningBypass.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Suppressing Internet Explorer warning on IFRAME in SSL secured page -->
-<!-- _lcid="1033" _version="11.0.5329" _dal="1" -->
-<!-- _LocalBinding -->
-<HTML>
-</HTML>
\ No newline at end of file
diff --git a/themes/default/blocks/core/add_tr_submit.tpl b/themes/default/blocks/core/add_tr_submit.tpl
deleted file mode 100644
index 9ae24d9e..00000000
--- a/themes/default/blocks/core/add_tr_submit.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<tr valign="top">
-	<td> </td>
-	<td>
-		<input type="submit" name="Submit" value="{t}Submit{/t}" class="form_button"/>
-		<input type="hidden" name="_page" value="{$meth.0}:view"/>
-		<input type="hidden" name="_page_current" value="{$VAR._page}"/>
-		<input type="hidden" name="do[]" value="{$meth.0}:{$meth.1}"/>
-		<script type="text/javascript">
-		<!--
-			if (document.getElementById('focus'))
-				document.getElementById('focus').focus();
-		//-->
-		</script>
-	</td>
-</tr>
diff --git a/themes/default/blocks/core/alert.tpl b/themes/default/blocks/core/alert.tpl
deleted file mode 100644
index 5cc7a70b..00000000
--- a/themes/default/blocks/core/alert.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background">
-	<tr>
-		<td>
-			<table width="100%" border="0" cellspacing="1" cellpadding="0">
-				<tr valign="top">
-					<td class="table_heading">{t}Alert{/t}</td>
-				</tr>
-				<tr valign="top">
-					<td class="row1">
-						<table width="100%" border="0" cellpadding="2">
-
-							{foreach from=$alert item=alert}
-								{if $alert != ''}
-							<tr> 
-								<td class="{cycle values="row1,row2"}"><img src="themes/{$THEME_NAME}/images/icons/about_16.gif" alt="Alert" width="16" height="16" style="border: 0px; padding-right: 5px;"/>{$alert}</td>
-							</tr>
-								{/if}
-							{/foreach}
-
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-<br/>
diff --git a/themes/default/blocks/core/alert_fields.tpl b/themes/default/blocks/core/alert_fields.tpl
deleted file mode 100644
index 77eaa6f0..00000000
--- a/themes/default/blocks/core/alert_fields.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background">
-	<tr>
-		<td>
-			<table width="100%" border="0" cellspacing="1" cellpadding="0">
-				<tr valign="top">
-					<td class="table_heading">{t}Alert{/t}</td>
-				</tr>
-				<tr valign="top">
-					<td class="row1">
-						<table width="100%" border="0" cellpadding="2">
-							{foreach from=$form_validation item=recordval} {assign var=$recordval.field value='true'}
-								<tr class="{cycle values='row1,row2'}">
-									<td valign="middle"><b><img src="themes/{$THEME_NAME}/images/icons/flag_16.gif" alt="Alert" width="16" height="16" style="border: 0px; padding-right: 5px;"/>{$recordval.field_trans} :</b>   {$recordval.error}</td>
-								</tr>
-							{/foreach}
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<div>
-	<br/>
-</div>
diff --git a/themes/default/blocks/core/blank.tpl b/themes/default/blocks/core/blank.tpl
deleted file mode 100644
index 8f33e0f8..00000000
--- a/themes/default/blocks/core/blank.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{if $VAR._page != "core:blank"}{/if}
\ No newline at end of file
diff --git a/themes/default/blocks/core/bottom_clean.tpl b/themes/default/blocks/core/bottom_clean.tpl
deleted file mode 100644
index 308b1d01..00000000
--- a/themes/default/blocks/core/bottom_clean.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-</body>
-</html>
diff --git a/themes/default/blocks/core/bottom_print.tpl b/themes/default/blocks/core/bottom_print.tpl
deleted file mode 100644
index 385bfc73..00000000
--- a/themes/default/blocks/core/bottom_print.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{literal}
-					<SCRIPT LANGUAGE=\"JavaScript\">
-					<!-- Begin
-					if (window.print) {
-						agree = confirm('{/literal}{translate}alert_print{/translate}{literal}');
-
-						if (agree) {
-							window.print();
-						}
-						else
-						{
-							window.close();
-						}
-					}
-					//  End -->
-					</script>
-
-{/literal}
diff --git a/themes/default/blocks/core/debug.tpl b/themes/default/blocks/core/debug.tpl
deleted file mode 100644
index bcaa7ae3..00000000
--- a/themes/default/blocks/core/debug.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-  <tr> 
-    <td width="160" valign="top"> <img src="themes/{$THEME_NAME}/images/invisible.gif" width="160" height="1"> 
-    </td>
-    <td width="1" bgcolor="#CCCCCC"> <img src="themes/{$THEME_NAME}/images/invisible.gif" width="1" height="1"><br>
-    </td>
-    <td  valign="top" width="600"> 
-      <table width="100%" border="0" cellspacing="0" cellpadding="8">
-        <tr> 
-          <td valign="middle" class="body" align="center"> <font color="#999999">CPU 
-            time used: 
-            {$smarty.const.EXECUTION_TIME|truncate:5:""}
-                    
-			 SQL Queries Used: 
-            {$smarty.const.SQL_QUERIES}
-            </font> </td>
-        </tr>
-      </table>
-      <img src="themes/{$THEME_NAME}/images/invisible.gif" width="575" height="1"> 
-    </td>
-    <td width="1" bgcolor="#CCCCCC"> <img src="themes/{$THEME_NAME}/images/invisible.gif" width="1" height="1"><br>
-    </td>
-    <td width="50%"> </td>
-  </tr>
-  <tr> 
-    <td width="160" valign="top"></td>
-    <td width="1" bgcolor="#CCCCCC"></td>
-    <td height="1" width="600" bgcolor="#CCCCCC"><img src="themes/{$THEME_NAME}/images/invisible.gif" width="1" height="1"></td>
-    <td width="1" bgcolor="#CCCCCC"></td>
-    <td width="50%"></td>
-  </tr>
-</table>
- 
\ No newline at end of file
diff --git a/themes/default/blocks/core/error.tpl b/themes/default/blocks/core/error.tpl
deleted file mode 100644
index b7bb4bfa..00000000
--- a/themes/default/blocks/core/error.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<title>Site Under Maintenance
-
-
-
-

-  

-  
-    
-      
-    
-  
Site  Maintenance

-        

-        Thank you for visiting! 

-        

-        We are presently conducting scheduled site maintenance. 

-        

-      Our site will operational again very shortly so please check back soon.

-

-
-
diff --git a/themes/default/blocks/core/export_search.tpl b/themes/default/blocks/core/export_search.tpl
deleted file mode 100644
index e2adc0e1..00000000
--- a/themes/default/blocks/core/export_search.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-Export Search Results
-
-

-  {literal}
-  
-  {/literal}
-

-  
-   
-  
-     
-      
-    
-     
-      
-    
-     
-      
-    
-     
-      
-    
-  
 
-        {translate}
-        export_format 
-        {/translate}
-        
 
-        
-         
 
-        {translate}
-        export_pages 
-        {/translate}
-         
 
-        
-      

-  
-    
-    
-    
-    
-    
-    
-	
- 
-  

-
-   
-    
-    
-  
-

-      
-        
-      
-    

diff --git a/themes/default/blocks/core/export_search_display.tpl b/themes/default/blocks/core/export_search_display.tpl
deleted file mode 100644
index f5981ab7..00000000
--- a/themes/default/blocks/core/export_search_display.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{ $method->exe($VAR.module,"search_export") }
-{ if ($method->result == FALSE) }
-    { $block->display("core:method_error") }
-{/if}
\ No newline at end of file
diff --git a/themes/default/blocks/core/export_search_download.tpl b/themes/default/blocks/core/export_search_download.tpl
deleted file mode 100644
index 74b2e6d6..00000000
--- a/themes/default/blocks/core/export_search_download.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{ $method->exe($VAR.module,"search_export") }
-{ if ($method->result == FALSE) }
-    { $block->display("core:method_error") }
-{/if}
diff --git a/themes/default/blocks/core/graph.tpl b/themes/default/blocks/core/graph.tpl
deleted file mode 100644
index 3437802c..00000000
--- a/themes/default/blocks/core/graph.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{ $list->bar_graph() }
\ No newline at end of file
diff --git a/themes/default/blocks/core/graphview.tpl b/themes/default/blocks/core/graphview.tpl
deleted file mode 100644
index 2a261f6b..00000000
--- a/themes/default/blocks/core/graphview.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{ $list->graphview() }
\ No newline at end of file
diff --git a/themes/default/blocks/core/group.tpl b/themes/default/blocks/core/group.tpl
deleted file mode 100644
index 4a9fbd10..00000000
--- a/themes/default/blocks/core/group.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{group id=1 msg="Sorry, you are not authorized for this area"}
-Your html, javascript, images, etc., are placed here for protection within the smarty templates...
-{/group}
\ No newline at end of file
diff --git a/themes/default/blocks/core/import.tpl b/themes/default/blocks/core/import.tpl
deleted file mode 100644
index 99daa9f4..00000000
--- a/themes/default/blocks/core/import.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-{ if $list->auth_method_by_name($VAR.module,"import") } 
-

-  
-     
-      
-    
-  
 
-        
-           
-            
-          
-        
 
-              
-                 
-                  
-                  
-                 
-                 
-                  
-                  
-                
-                 
-                  
-                  
-                
-              
Upload: 
-                    
-                  
Type:
-                    				  
-				  
  
-                    
-                     
-                    
-                    
-					
-                  

-            

-      

-

-

-

-  
-     
-      
-    
-  
 
-        
-           
-            
-          
-        
 
-              
-                 
-                  
-                  
-                 
-                 
-                  
-                  
-                
-                 
-                  
-                  
-                
-              
Enter Filename: (in the /includes/files/ directory)
-                    
-                  
Type:
-                    
-                  
  
-                    
-                     
-                    
-                    
-					
-                  

-            

-      

-

-{else}
-Not authorized!
-{/if}
diff --git a/themes/default/blocks/core/import2.tpl b/themes/default/blocks/core/import2.tpl
deleted file mode 100644
index 7b5c2180..00000000
--- a/themes/default/blocks/core/import2.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-{ if $list->auth_method_by_name($VAR.module,"import") } 
-{if $rows > 0 }
-

-  Ready to import {$rows} rows of data to the {$VAR.module} module:

-  

-  
-     
-      
-    
-  
 
-        
-           
-            
-          
-        
 
-              
-                {foreach from=$columns item=column}
-                 
-                  
-                  
-                
-                {/foreach}
-                 
-                  
-                  
-                
-                 
-                  
-                  
-                
-                
-                  
-                  
-                
-              
Column 
-                    {$column.idx}
-                    , Sample Data:  
-                    {$column.sample|truncate:15}
-                      
-                    
-                  
  
-                    

-                  
Import Type:
-                    
-                    Update Database 
-                    
-                    Download SQL commands
 
-                    
-                    
-                    
-                    
-                    
-                    
-                  

-            

-      

-

-

-{/if}
-{else}
-Not authorized! 
-{/if}
diff --git a/themes/default/blocks/core/import2_new.tpl b/themes/default/blocks/core/import2_new.tpl
deleted file mode 100644
index ff7d4488..00000000
--- a/themes/default/blocks/core/import2_new.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-{ if $list->auth_method_by_name($VAR.module,"import") } 
-

-  
-     
-      
-    
-  
 
-        
-           
-            
-          
-        
 
-              
-                
-                  
-                
-                
-                  
-                
-                 
-                  
-                                    
-                  
-                                 
-                {section name=cur loop=$fields_array}
-                 
-                  
-                                    
-                  
-                 
-                {/section}
-       
-
-                 
-                  
-                  
-                  
-                
-              
Step 3. Please define the field mappings for the import.


-                  For each field below, either enter a value to import always in to the field in the Constant Value Mapping, or
-                  select one of the fields to map from the Field Import Mapping.


-                  There are {$rows} records in the file.
-                  
 
Field Name
-                    Field Import Mapping
-				  
-                    Constant Value Mapping
-                  
{$fields_array[cur].field}: 
-                    
-				  
-                  {if $fields_array[cur].type ne "select"}
-                    
-                  {else}--- {/if}
-                  
  
-                    
-                     
-                    
-                    
-                    
-                    
-                    
-                    
-					
-                   

-            

-      

-

-{else}
-Not authorized!
-{/if}
diff --git a/themes/default/blocks/core/import_new.tpl b/themes/default/blocks/core/import_new.tpl
deleted file mode 100644
index 8a7e2873..00000000
--- a/themes/default/blocks/core/import_new.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{ if $list->auth_method_by_name($VAR.module,"import") } 
-

-  
-     
-      
-    
-  
 
-        
-           
-            
-          
-        
 
-              
-                
-                  
-                
-                 
-                  
-                  
-                 
-
-                
-                  
-                
-
-                
-                  
-                                
-                 
-                  
-                  
-                
-                 
-                  
-                  
-                
-              
Step 1. Please select the file you wish to import.
File to upload: 
-                    
-                  
 
Step 2. Please select the file type below.
File Type:
-                    				  
-				  
  
-                    
-                     
-                    
-                    
-					
-                  

-            

-      

-

-{else}
-Not authorized!
-{/if}
diff --git a/themes/default/blocks/core/invalid_page.tpl b/themes/default/blocks/core/invalid_page.tpl
deleted file mode 100644
index 6986e4ee..00000000
--- a/themes/default/blocks/core/invalid_page.tpl
+++ /dev/null
@@ -1 +0,0 @@
-
{t}Sorry, the page you specified does not exist on our server!{/t}

diff --git a/themes/default/blocks/core/language.tpl b/themes/default/blocks/core/language.tpl
deleted file mode 100644
index 43ef311a..00000000
--- a/themes/default/blocks/core/language.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-
  
-  

-    { $list->menu_files("", "lid", $smarty.const.SESS_LANGUAGE, "language", "", "_core.xml", "form_menu") }
-    
-  

-

diff --git a/themes/default/blocks/core/logout.tpl b/themes/default/blocks/core/logout.tpl
deleted file mode 100644
index 99fd2d1c..00000000
--- a/themes/default/blocks/core/logout.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-	
-	{translate}alert_session_timeout{/translate}
-	
-		{literal}
-			
-		{/literal} 
-	 
-	
-		

-			
{translate}logout_notify{/translate}

-		

-	
-
\ No newline at end of file
diff --git a/themes/default/blocks/core/method_error.tpl b/themes/default/blocks/core/method_error.tpl
deleted file mode 100644
index 379419f8..00000000
--- a/themes/default/blocks/core/method_error.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{if ($method->error == 'auth')}
-	{if $SESS_LOGGED!=1}
-		{translate}login_required{/translate}
-		{$block->display('account:user_login')}
-	{/if}
-{else}
-	{$method->error}
-{/if}
diff --git a/themes/default/blocks/core/popup_list_search.tpl b/themes/default/blocks/core/popup_list_search.tpl
deleted file mode 100644
index 565c73e4..00000000
--- a/themes/default/blocks/core/popup_list_search.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-{ $method->exe($VAR.module,"search") }
-{ if ($method->result == FALSE) } 
-    { $block->display("core:method_error") }
-{else}
-    {if $results > 0}
-
-
-{$smarty.const.SITE_NAME}
-
-
-
-
-
-
-
- 
-
-    

-        

-        {translate}search_results{/translate}
-        

-        {translate}alert_refresh_click{/translate}
-        

-        

-        {translate}alert_click{/translate}
 
-        
-    

-

-        {translate}search_no_results{/translate}
-        

-    
-        

-    

-    {/if}
-{/if}
-	
- 
-    
diff --git a/themes/default/blocks/core/recent_searches.tpl b/themes/default/blocks/core/recent_searches.tpl
deleted file mode 100644
index c0d455ff..00000000
--- a/themes/default/blocks/core/recent_searches.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{if $module_recent_js != false}
-	

-
-		
-			
-				
-			
-			
-				
-			
-		
{t}Your Recent Searches{/t}

-					
-						
-							
-						
-						
-							
-						
-					

-								
-							

-					{$module_recent_js}
-				

-
-		

-			
-		

-	

-{/if}
diff --git a/themes/default/blocks/core/save_search.tpl b/themes/default/blocks/core/save_search.tpl
deleted file mode 100644
index fab54f3e..00000000
--- a/themes/default/blocks/core/save_search.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-{translate}search_save{/translate}
-
-{literal}{/literal}
-
-

-  
{translate}search_save_nickname{/translate}

-      
-    
-    
- 
-  
-     
-      
-    
-     
-      
-    
-     
-      
-    
-  
 
-        
-           
-         
 
-        
-        
 
-        
-      

-

diff --git a/themes/default/blocks/core/save_search_done.tpl b/themes/default/blocks/core/save_search_done.tpl
deleted file mode 100644
index a7812b62..00000000
--- a/themes/default/blocks/core/save_search_done.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-	
-	{translate}search_save{/translate}
-	
- 	{literal} 
-  	
-  	{/literal} 
-   
-    
-	

-  {translate}search_saved{/translate}

-   

-  {translate}close{/translate} 
-

-
diff --git a/themes/default/blocks/core/saved_searches.tpl b/themes/default/blocks/core/saved_searches.tpl
deleted file mode 100644
index 0d5a13f3..00000000
--- a/themes/default/blocks/core/saved_searches.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{if $module_saved_js != false}
-	

-
-		
-			
-				
-			
-			
-				
-			
-		
{t}Your Saved Searches{/t}

-					
-						
-							
-						
-						
-							
-						
-					

-								
-							

-					{$module_saved_js}
-				

-
-		

-			
-		

-	

-{/if}
diff --git a/themes/default/blocks/core/search.tpl b/themes/default/blocks/core/search.tpl
deleted file mode 100644
index 68bd21ed..00000000
--- a/themes/default/blocks/core/search.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-{assign var=meth value=':'|explode:$VAR._page}
-
-
-
-
-{$method->exe($VAR.module,$meth.1)}
-{if ($method->result == false)}
-	{$block->display('core:method_error')}
-
-{else}
-	

-		

-		{if $results > 0}
-			{t}Your search has been completed sucessfully.{/t}

-			

-			{t}If this page does not automaticaly refresh within a few seconds, please click below to continue.{/t}

-			

-
-			
-			{if $results == '1' && $VAR._next_page_one != ''}
-				{t}Click here to continue{/t}
-
-				
-
-			{else}
-				{if $VAR._next_page == ''}
-					{t}Click here to continue{/t}

-				{else}
-					{t}Click here to continue{/t}

-				{/if}
-
-				
-			{/if}
-
-		{else}
-			{t}No results for your search were found.{/t}

-			

-			
-			
-		{/if}
-
-	

-{/if}
diff --git a/themes/default/blocks/core/search_iframe.tpl b/themes/default/blocks/core/search_iframe.tpl
deleted file mode 100644
index 1f7d906e..00000000
--- a/themes/default/blocks/core/search_iframe.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-{$method->exe($VAR.module,'search')}
-{if ($method->result == false)}
-	{$block->display('core:method_error')}
-
-{else}
-	{if $results > 0}
-		
-
-	{else}
-		
-	{/if}
-{/if}
-
-
diff --git a/themes/default/blocks/core/search_post.tpl b/themes/default/blocks/core/search_post.tpl
deleted file mode 100644
index 45cc40af..00000000
--- a/themes/default/blocks/core/search_post.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-	{t}Results per page{/t}
-	
-
-
-	{t}Order results by{/t}
-	
-		
-	
-
-
-	 
-	
-		
-		
-		
-		
-	
-
diff --git a/themes/default/blocks/core/search_show_post-1.tpl b/themes/default/blocks/core/search_show_post-1.tpl
deleted file mode 100644
index d9e6f312..00000000
--- a/themes/default/blocks/core/search_show_post-1.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-{if $VAR._print != true}
-	

-		

-		
-		
-		
-		
-		
-	

-{/if}
-
diff --git a/themes/default/blocks/core/search_show_post-2.tpl b/themes/default/blocks/core/search_show_post-2.tpl
deleted file mode 100644
index 07a04042..00000000
--- a/themes/default/blocks/core/search_show_post-2.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-{if $VAR._print != true}
-	

-		
-			
-				
-			
-		

-					{t}Search Export{/t}
-					{if $mail}
-						{t}Multi Mail{/t}
-					{/if}
-					{t}Search Print{/t}
-					{t}Search New{/t}
-					{osb f=tt method=add}
-				

-	

-{/if}
-
diff --git a/themes/default/blocks/core/search_show_pre.tpl b/themes/default/blocks/core/search_show_pre.tpl
deleted file mode 100644
index c8b9f433..00000000
--- a/themes/default/blocks/core/search_show_pre.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
{t count=$results 1=$results plural='%1 records were found.'}%1 record was found.{/t}

-
-
-
-
-
-

-
-
-

-

-
-
diff --git a/themes/default/blocks/core/search_show_tr_record.tpl b/themes/default/blocks/core/search_show_tr_record.tpl
deleted file mode 100644
index 18c1c249..00000000
--- a/themes/default/blocks/core/search_show_tr_record.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{if ! $module}
-	{assign var=module value=$meth.0}
-{/if}
-
-
-	
-		
-	
diff --git a/themes/default/blocks/core/sess_renew.tpl b/themes/default/blocks/core/sess_renew.tpl
deleted file mode 100644
index eaec9720..00000000
--- a/themes/default/blocks/core/sess_renew.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-{translate}alert_session_timeout{/translate}
-
-	{literal}
-		
-	{/literal} 
- 
-
-  

-	  

-	  {translate}login_renewed{/translate}
-	  

-	  

-	  {translate}close{/translate}
-	  

-

-
diff --git a/themes/default/blocks/core/sess_timeout.tpl b/themes/default/blocks/core/sess_timeout.tpl
deleted file mode 100644
index a632a39c..00000000
--- a/themes/default/blocks/core/sess_timeout.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-{translate}alert_session_timeout{/translate}
-
-{literal}
-  
-{/literal} 
-   
-  
-	  

-  {translate}login_sess_timeout{/translate}

-		  

-		  {translate}logout{/translate}

-		  

-		  {translate}login_renew{/translate}

-		  

-	

-  
- 
diff --git a/themes/default/blocks/core/top_clean.tpl b/themes/default/blocks/core/top_clean.tpl
deleted file mode 100644
index 1063caf0..00000000
--- a/themes/default/blocks/core/top_clean.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-{$smarty.const.SITE_NAME}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{if $alert}
-	{$block->display('core:alert')}
-{/if}
diff --git a/themes/default/blocks/core/url.tpl b/themes/default/blocks/core/url.tpl
deleted file mode 100644
index dc092a60..00000000
--- a/themes/default/blocks/core/url.tpl
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/themes/default/blocks/core/user_search.tpl b/themes/default/blocks/core/user_search.tpl
deleted file mode 100644
index 0441ae70..00000000
--- a/themes/default/blocks/core/user_search.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{assign var=meth value=':'|explode:$VAR._page}
-
-
-{include file='file:search.tpl'}
diff --git a/themes/default/blocks/core/user_search_show_pre.tpl b/themes/default/blocks/core/user_search_show_pre.tpl
deleted file mode 100644
index ce5a13d5..00000000
--- a/themes/default/blocks/core/user_search_show_pre.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
{t count=$results 1=$results plural='%1 records were found.'}%1 record was found.{/t}

-
-
-
-
-
-

-
-
-

-
-
-
diff --git a/themes/default/blocks/core/user_search_show_tr_record.tpl b/themes/default/blocks/core/user_search_show_tr_record.tpl
deleted file mode 100644
index cd9001c6..00000000
--- a/themes/default/blocks/core/user_search_show_tr_record.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	
-		
-	
diff --git a/themes/default/blocks/core/user_view_pre.tpl b/themes/default/blocks/core/user_view_pre.tpl
deleted file mode 100644
index 815f9b16..00000000
--- a/themes/default/blocks/core/user_view_pre.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/themes/default/blocks/core/view_post.tpl b/themes/default/blocks/core/view_post.tpl
deleted file mode 100644
index a073f680..00000000
--- a/themes/default/blocks/core/view_post.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-

-	
-	
-	
-	
-	
-	
-

diff --git a/themes/default/blocks/core/view_pre.tpl b/themes/default/blocks/core/view_pre.tpl
deleted file mode 100644
index 1267e46b..00000000
--- a/themes/default/blocks/core/view_pre.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/themes/default/blocks/core/view_td_delete.tpl b/themes/default/blocks/core/view_td_delete.tpl
deleted file mode 100644
index 1036e331..00000000
--- a/themes/default/blocks/core/view_td_delete.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	
-	
-
diff --git a/themes/default/blocks/core/view_td_submit.tpl b/themes/default/blocks/core/view_td_submit.tpl
deleted file mode 100644
index 8cef36f5..00000000
--- a/themes/default/blocks/core/view_td_submit.tpl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/themes/default/blocks/core/view_tr_submit_delete.tpl b/themes/default/blocks/core/view_tr_submit_delete.tpl
deleted file mode 100644
index 70b25e66..00000000
--- a/themes/default/blocks/core/view_tr_submit_delete.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	
-		
-			
-				{include file='file:../core/view_td_submit.tpl'}
-				{include file='file:../core/view_td_delete.tpl'}
-			
-		

-	
-
-
diff --git a/themes/default/iframe.css b/themes/default/iframe.css
deleted file mode 100644
index 89617eeb..00000000
--- a/themes/default/iframe.css
+++ /dev/null
@@ -1,231 +0,0 @@
-body        {
-                font-family: Verdana, Arial, Helvetica, sans-serif;
-                font-size: 11px
-            }
-
-.body       {
-                font-family: Verdana, Arial, Helvetica, sans-serif;
-                font-size: 11px
-            }
-            
-input,textarea,select
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif; 
-				font-size: 12px; 
-                font-weight: normal;
-				background-color: #FFFFFF; 
-                border-width: 1px; 
-                border-color: #CCCCCC;
-                padding: 2px;  
-			}
-			
-input:focus, textarea:focus, select:focus
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif; 
-				font-size: 12px; 
-                font-weight: normal;
-				background-color: #FFFFC1; 
-                border-width: 1px; 
-                border-color: #000000;
-                padding: 2px;  
-			} 		
-			
-#srchpage select {
-                font-family: Verdana, Arial, Helvetica, sans-serif;
-                font-size: 11px; 
-                font-weight: bold;
-                color: #FFFFFF; 
-                border-color: #CCCCCC; 
-                background-color: #506DC7;
-                padding: 2px; 
-}
-
-#srchpage select:focus {
-                font-family: Verdana, Arial, Helvetica, sans-serif;
-                font-size: 11px; 
-                font-weight: bold;
-                color: #FFFFFF; 
-                border-color: #CCCCCC; 
-                background-color: #506DC7;
-                padding: 2px; 
-}			
-
-.form_field_error
-			{ 
-				font-family: Verdana, Arial, Helvetica, sans-serif; 
-				font-size: 12px; 
-                font-weight: normal;
-				background-color: #F9DEC6; 
-                border-width: 1px; 
-                border-color: #CCCCCC;                
-			} 	
-			            
-            
-.search_nav {
-                font-family: Verdana, Arial, Helvetica, sans-serif;
-                font-size: 12px; font-weight: bold;
-                color: #FFFFFF;
-                background-color: #3399FF;
-                margin: 1px;
-                padding: 1px;
-                border-color: #006600 #006600 #003300 #003300; 
-            }
-            
-.form_button 	
-			{
- 			    font-family: Verdana, Arial, Helvetica, sans-serif;
-				font-size: 12px;
-				color:506DC7;
-				background-color: #f1f1f1;
-				border-color: #333333;
-				border-width: 1px;
-				padding: 1px;
-			}            
-
-.form_button_dead 	
-			{
-				font-family: Verdana,Arial, Helvetica, sans-serif;
-				font-size: 11px;
-				background-color: #FFFFFF;
-				border-color: #FFFFFF;	
-				border-width: 0px
-			}
-                 
-								
-.table_background 
-			{
-				background-color: #CCCCCC;
-			}
-
-.table_heading
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif;
-				font-weight: bold;
-				color: #FFFFFF;
-				font-size: 12px;
-				text-align: center;
-				vertical-align: middle;
-				height: 14px;
-				background-color: #506DC7;
-				border-color: #FFFFFF #FFFFFF #F1F1F1 #FFFFFF;
-				padding: 3px;
-				border-style: solid;
-				border-width: 0px
-			}
-
-.table_heading_txt
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif;
-				font-size: 12px;
-				height: 14px;
-				color: #FFFFFF;
-				padding: 1px;
-			}
-			
-.table_heading_cart
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif;
-				font-weight: bold;
-				color: #333333;
-				font-size: 12px; 
-				vertical-align: middle;
-				height: 18px;
-				background-color: #DBDBDB;
-				border-color: #FFFFFF #FFFFFF #F1F1F1 #FFFFFF;
-				padding: 5px; 
-			}				
-				
-.row1	
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif; 
-				font-size: 11px; 
-				background-color: #F9F9F9;
-				color: #000000;
-			}
-				
-.row2 
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif; 
-				font-size: 11px; 
-				background-color: #FCFCFC;
-				color: #000000;
-			}
-						
-.row_select
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif; 
-				font-size: 11px; 
-				background-color: #C9EEFF;
-				color: #000000;
-			}
-				
-.row_mouse_over
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif;
-				font-size: 11px; 
-				background-color: #FFFFCC;
-				color: #000000;	
-			}
-				
-.row_mouse_over_select
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif; 
-				font-size: 11px; 
-				background-color: #BEDFF1;
-				color: #000000;
-			}
-			
-                
-.menu_background
-			{
-				background-color: #C2D5F3;
-				font-family: Verdana, Arial, Helvetica, sans-serif; 
-				font-size: 11px;
-				text-weight: bold;			
-			}
-				
-.menu_1
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif;
-				font-size: 12px;
-				background-color: #506DC7;
-				color: #FFFFFF;
-                text-decoration: bold; 
-                padding-top: 2px;
-				padding-bottom: 2px;  
-				text-weight: bold;				
-			}
-				
-.menu_2	
-			{
-				font-family: Verdana, Arial, Helvetica, sans-serif;
-				font-size: 11px;
-				background-color: #DFF3FF;
-				color: #333333;
-                text-decoration: none;
-                padding-top: 2px;
-				padding-bottom: 2px; 
-			}
- 
-			
-			
-a:link,a:active,a:visited { 
-	font-family: Verdana, Arial, Helvetica, sans-serif; 
-	color: #000000;
-	text-decoration: none; 
-}
-			
-
-a:hover { 
-	font-family: Verdana, Arial, Helvetica, sans-serif; 
-	color: #CC6600;
-	text-decoration: underline;
-}
-
-
-div.auto_complete { width: 450px; background: #fff; }
-div.auto_complete ul { border:1px solid #888; margin:0; padding:0; width:100%; list-style-type:none; }
-div.auto_complete ul li { margin:0; padding:3px; }
-div.auto_complete ul li.selected {  background-color: #ffb;  }
-div.auto_complete ul strong.highlight {  color: #800;  margin:0; padding:0; }
-
diff --git a/themes/default/images/logo-big.png b/themes/default/images/logo-big.png
deleted file mode 100644
index 5b24d3351fa411f44b7316be2f9b2c315f4d2760..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26666
zcmaI7Wk8hO_ce@ylr$qC0@CG(NOvP3-5rB;cXu}e(%sSx0s;b3A`(M)NVjyqhx_+`
zzP@^i!-#XmIeYK5*IGMVK~4e_ofsVf0RdA=QcMW};RzJH-b6(PUkhj~8^K>s9F-(Q
z5GwzWY=du*4W%W-5FQ?X=d=|kfOpXBBsCoo5T4^d{&|9smO%vGL~)Xm6-Svtdxh|h
zOX_4o8@%<>NnFE8)YjVC*v1J#)WI0$WNbw4YVKr4E+HkWpze=Fh=4$jASEWO;x@b2
zrfEgJ?M&lkIOt84pzWY6vc5Q_@x3F
zLxUK@0K>olDqM>>{prWo4!w!|Q6XfbGOY@|2vuEKf@Guk0iy$LBe4&?_kv!yiozVp
zGHNuD(j??UwGq-A$@&@JFMKYtMDNb@9~uViNf;B+$F|uxI5`#RAwN#|crvk!G($>D
znPu^d%vWmz^XNy|FhgKJ>`88Y1i_(^^h{h40il~Yr<4)=AaoG?b4#UuDtqlzsIlgy
zm%!znj~xk02n+$C$Xo=@Mj!E1GbxuI-AOkTMx<_mT?1{k#eR>07?Ed?wvp@E&x}D7
z;$Makk@tf+s?N7-g&7$c`SZs@W?tUNnHkOBLqjlgb2MIF-hA8kD-$$?X%)t2*~8%D
z6{@Ciu|hL3ztW?drMVDXF?P!8KnDYiHAmR?agw~1XLlV{C;MrwFN*4HWjJAqkY~D6
z7Zt;*bAmRjweLJh_c*y!RWsRZeGf|KEl~mkg~jI$+iDTzYsWgnxzMSywcNU*8b!7@NGeQnOLlRgx6WT+K3n6t#aKDq
zITn#ezvaa9RfQ33iy12duy`gW$onpHS1;8d;$R2pPJty>QEg)h?y#|y!Ir2RR`pgs
zIUk8!617>xMS8OD@+u;4@5a@|-X0gDTPU7-eAk(c7_)xP+BS~g?Z~buhaO!Z8@tm0
zM^scaB`fO#OKQ;4q3;Kcs*ZaeumBZm-RI{VjZIC8jEU#LFf!D6x*|P@$7P6PlaCvh
z2exiQnkpx1Xg3itao6P~mx+mq-C8f^@87@4A?W;6<@$FM`oY7SqF@opas15F42Y12
zOz^=))k1llGs=)dU^u8q%O_VqYRlmgpQdQ$`PtO%PZS~Rr$jT>nCDWZx`x#^)s>9?
zGu|5KWDfX~odV@$AD4YPUgs*H1_lPEq@{I@jo}dx622D{j13P*yWL;9x1OGHe7LT9
zu(9JB@N7`Q~ANZ7aWjr?x6C
z^L{3-xJ}^vVXnYuy5>%GPV}6(`IXp0-*sr*glhQ6e%q%6H9j&4meij=ejpgu5Vapi
z+g9KB^xpL>w7QDgww+CSLc|w%rjJ}-@GdNHZovA^)tlQ^3eN1S;yiULXNgI5=xn`X
z7Dd78D}Fh=KMEDRJ?B0AzV>1itp9RnAPP1a-~a!MT5Ls~s#jNR)WtNXRHCaWb^v
zxbPNWV+#V=OGZ{!@xKp6`#fOOp1*rN$FVIL|MzpOtb&Wt<3~kMiYYqX%R|H^zC|AaE73fnuJw2yqW`voNMGKXL+w>$rmZXn}`IAn{&@4EMI}TI)!n^M|YUgP%
z8>dc=BSem4m-nu<@&$S@PPiCOWDheJS6EyeZd6Q+p^*{Nr%#{2N{$spfqVGo)KFqr
z6LxmyTwY#o;O$M?tb4Ay8Cmc6IAmjEgPET{y1AMA_n$wj`uFSlUCGBmqf}7rUZV!*dzl(-0&2YY*a+3sL7
zb#wo?ySb16fgfpUX{n*9DNLKtxwuG%9{iZ#cg}dUDkclP4nS%HSpp=dS@n$9WMnQ%
zJvBA&F|e^exw#R6TPD2DGHu&GSfO0|lgazLLc1xVtgP(vaxL~aQvdcTxTGNyc!@AW
zgoAl@N0GT18}Vmqv_hqU5?}Fr#i;0Ln2!%xWMpJYdU`9wgyr$cja;U8T)nb(btO!d
zL6*-J=qb+jiD+wUdvkJ&*==|I6Dv;xDuRQwiQu0{@AYqhZX^4CJG=I<{pKLp=-oS-
zQ#)8qUEL=eYik&I?6I!}dv6XqV%OJ=hn3+mA2cTIb5lXW+uMVJJj=|@9S+uyIzb8&
z*)yf*dv_+G2Of-Qwqn&(oLuqo0A03$wKXPqqQ9rAeiDU2reCsBfePhBMlAgMl3HusjyYV`eBn%p~84{<@K28$;dwB
zD){Bm8)y>L)zuBYdGm%a&vg*2EFnQWb*@@jE=aaIO!*TQ?zoc_%oyF<@;LH4~b0meA`>AFj%_omy-i-l@NDYcyrz&BS7p
zbsYPUJshgTbYW&_xOzV5lTm-6mkB~tC-t8rTon)MAPD~Wi391r$aKIJIPXzw1e|E5y!T{4ii-sK;2vVSM
zRBY@gL&L5}kg~TD%l|~w(?`s1j##COPQS($$m%9bh7rl-mlc_3zt`ojV#Yw^8wTfm
zj7|VnK;4|4on_hF*!Xj*+x@t`@LDPbi|BVIHSgMl$d|VY`V8M+dbJO8&69|$K*YKC
z30++8g*VMymlF7Gj65kBBOI8*hLT`%#c&Y+0WhNJ>1k#{Lc-ywdOmQa6rCrxP3CFs
zu4=eyTqL~!M6@3TzXRy1mz$jx1CdSEHL-HGz?djRR3RcS2fm%NU?Yly1Y*OaF5ICx
zN~t91W8v!OS$CoQ(I36N$Xqdj(7|OcEZ4(D%*;gUXbBB6CTcY`H6NEG_HsL}sH-b?
zud6}*UXWvc*w4E@`EhvBv9Q0!EDNV#`47WUOF4Wn0C@{^1ra@zwKLGC{(ksv4O(x%
zmR^rd>Ea-PXapewXM4}W5@73dlD-OxxFhYmkpIrqe$jTQ>U((MW2?_IDQ`y-Dn{uK
z&=5&VnI{Dv6rfQPP#{=R#VF&1xJW*LY5=~LsED-bfyxQ0C_rP|e+MO>?_Xyo!RfW{AZto#i1`+slz2L_}VlLz_Hkpr7R&3dea9}BC$eGB_o7yzD%
zL-SriM4{4lp`^&%PN55%nPAb)#bNCCtBrIT5Ls?qPf?yP-UU@qOvtM$dwz2>HeN3)
zQQ66=P**LRFyPfX1kn!C7HDB0J;_P5ALEg-HWe$>K#yd%J6W-+nWE_ig03r|$b6IM
zc~`Cc+kkpUeNFd@M>YaE*jL*KKrH+Wqf
zEVNs6c|HcNgodfOhRv$S%arWw;<4>|bBP4#AZ47S0Z8Bft9Jq98RojuNyZ=zLeQUq
zRQniIyV^@TmQNNRw`5lJwW>Og?c@Ik5P1l!^XRA|6bdzPbi|j>;_LkNE5dQdO%335
zfORpv}V`BSMos+Ia>jJX4qMXW<
zEeh3R?!5dmq9*^X^nhFK5I=FqWavY_zYJ}l4$~&rr@52Jcf{w1)(u*w8}0k43U1$y
z3XJimG?)1#?3I<3!6$az-tr|SB{8$I27;PzM>2IGDGd>q(0xoIrx^CGQ*5d)a_C1$
zP()QbUU7#`uDy$>=EDIi17%_oNiqgKFaj4oWt{O$GeEU=t@@;gWH4Qk`o_lJa=8e)
z@sg)2C;n*2O9U*bO;mMt$r}eQ_^KUJyLo2)ba-f>AaZA30i4sUQ+en+mGlcVuOJT%
za*dQc#)9|dF+d5nJ`Xo(Iu&^hEfI1hNV42)o6K6MgLQ^281!W@x2^Sgvqlgj
zDluN;cRtVAnP`
zHEn)d$aps26$F-WRJBu#a(UIBxs!a_3{oMp!8itWB0A1WfRPahuJyvRv_uwki9{Gu$9-t&C1lD{>H7~pw$*E-K1Ps
z9xf|{K##^i@aV7FNi-4EZXJ=Oh*I
z>*RBpYDy`(@)V3XL{tsz48s&{w!Vct?t^{(2iphC+lR~7Ifzfb=3O@Ui^lBEd3qM<
zFysk2~AE1>G|#RxG5Z*wj|w0)0ImfDzm%p!lwcKd~Yin)_X!1)6E
ze0U}|B^P`$Keqg#817$MYMK|lPFv>Fs93!jUcPaE;!D7L#Rtg>?L8SmdeTBIoNO$j
zHQA+%ftY42eB+gK=fmuekfMMp!-c_w_vBUNf+Zn3YI7Quuh%9PoPmI%2)?YY-YMw*
zlp-^P7Bz~
zYyjTG&BV~>e6|`oH}zp6Sx)0|r!hx0C0e}b>P7ydg$Z^>;%086)(8z+2(;U-@ExT4
zGvv=EB0j1g7SfN9?!OTqI(rO{u(9(K<EDwL}JVCxJK$q5t=DlSeg6j@ny3Ub`HwFFfnATgfJXBeTRE2mFSb7;*svvR2
z9JA|}=Jq6J9S@oXFE9eoLRX}zmtT`1zltV^6ud(F`|+6)N96ed)9l>b76ctUa$$(
z(IyN629G{@(9}c*RvZYrp_WSD3niSS>bg%6+S+D^dqTg~$=4mgSrlGjIv5&@D{%;?
zrfrN@%BX8d&zNJ%B67GlGtF)yzQPKO?D-KS!i*VsN2JsrS)7qS
z>p6ogUpz<|hXc=VYA&N~!?>v494Hqv90)HnDTz!w|6omFJ+X7S?8NrTF=lzWcW{uW
zK%X;Xb*}6F<+~|fEodH7_CM`k{6>}jy-wE9)I?!rlh@FQ{5~@zMNahBdJYFMGt`!y
zPM2G@)UcSF&H4?*udz#6G)cNNNE_cLF@uI_v`cj&I=G*N(ch=DKNq}zAH{?$C)-W#tx-Yn*AN$M)o+qWiTbx)M%^%nv9G&wf5q#d
zSN--NDcLGqKh4prqDmh!1i%5T*w?9DZ%$uhO@cT{q)vnC!(TYwH02vRrJBB%I28@-
z^{y@>1Dm4^1i31Vavmlm!sH7-)#hUDecHAz@_=YAGdIuC#IDjZasAL982`JT51Z2lY@^X>EW^yO>;aS-0O@Z!(4nr2BdW!tnN
z_>w(*G%r(&F9lkQjGr2aQdGNOMhU!TT@`G1485x8c<_{6bEj`0zD#@p?grGXJa6MB
zZ<6DTed1gg(TM7c2xAYanZu-998mPEpvd}^$5GYsQuGr$b!DSMYXkTRk$t0oO!Qk7
z+ANZB07+v~sMHBM1eR0`aQO-qYB!5SziXlYBixw*d87e#sj<-525bgVhi~)!N~l>y
zRX(WTT53o+1GNeFnSB@ZaE}WkE-V>(q=$ag+x&b`bVuGDQ&+S#nU+Q)fBAs;u`Oox
z;Y#o?5+H%J%5s$%bKBZ58}v{x@^{B)b>aEt*GUYh%xuw7R~paUo3);)({tTf>+oSQ
z#reI9BY%y8oD?Z|#}M9+ho(b|wh`$Ey8n}b1UkuLIOv*wB+$t#KnZSanv5khz>Wk=
zG11GHp!56DLs_0X*A#gcD#b}^!%7gFE)yihH0(Z+W}EQZI_X#G2CF3xRtH>#{0
zCD;2W;8~6R7vWM@d<6@-;Q59ZIdIcYFm5YbHlfwjYl*pceynK?|4>4ervSEWWS(+H
z@tYULM>g^VBR+yJjfshb?7T>Fx6L>48k>f~jEfI)JErI7**G~lkB?SF`MfT1UcGt+
z*uj|RP92@KP|%=!`0xQB=LmoQCrE*vk-{3Q2bBy~HX<7O5+}!>*piZS$1QG5=DsqG
zvDAgO;OqSu-oJ4ltoD!WS(c_Frna??f^9R{v-;NF^0^^T^yDn@WwHF|
z;$nzW8F%0uO833Zu9L(N32_V77LQ%PAo~7^zce*YT1JpknJ~V1N*Z$Sp~O9?8zs_d
zv{|9VlaJ(W$4zU;8^CCBDNg+R$I{r?IAW8n>&x0_AJ$_C9dlC=ZYa=YO!mD_vY9L)-KAl#REXqdmPbv2G+8(4&;LXNEPR+aa=49&5d|-&!M&
z{{AhDs3!{H#&2E;1jO2v1(cw5YTF4&R2B`yfP_T+>%eVgW5W|Sp&6ejs{shgwY9aB
zjEtX0N6bE;$BoId?82+ltgHDRbuIDQUtc%4x?RrXpH2zN#G0%_wdu~+rB7sG1YZe-
zw2CS`3|yxZzOEf>TKT=Zzj&x*7q};?h{j}j_IX&8DVbuu$eAn*{S`s?KapX=P<58@_i{&uJzcb&SN}r>R^c-{J<0etWdVEG+1P
zJ`nI2kVtWm^B)iJB2qjo&uznU_2lZ21qBT)5GLZ@Ru)eV!UM
z?>re&eIC-d~GP?pe3F=_(4TGag}Li7+Lv$kPr83uU*K52L3Q34=DV
zOx4QPHl1~{Q=}?M|FM5*zwCK;z2vqQ-6KX>1HnMfoSV9mY^uD82ZzkXp}3*E(;=eb&!V^C?-$O3cfGaT`+YWnf~3V_zU$*Z)<
z=S`sncw4C=AkX{~8F{4UH}N%|snmI@DveJVCR9L^vz|T
zxVNtlH(cxwCoG(ox2U>deM{OI{n^&O%kbgyK|7QKPnbMW#LNLNH}z%E<_1n$3IZpW
z1@
z*16^k1``%D0iUSZcfM#o&Y(?;6LZSMN)6rnl!+cHCW{cG4&|o|b{+GLp>hm6$Mg)Z
zZ~Pxw3Ro|4)Te++xb^ACfB0!nqLBos*~Y-AIougp84m7-IqUz4ELodC6aiB9qtZP@
z!FIDWo=nuxYxw?AGDuX{>l{kwd@mq?1!wEt^HY=W-H#w%CZyo
zVA|SpiHC-y#1Ld^ikp=!;RJf-LYg2`6C7QQ9Jz?oX)A&vn9%Hk^J%6WoWiz6i9|Vm
zj*vn5|9Jt()fu-SkpTW4#YPDMz=-$-qbLZzVYmYDhi0(QaKBR!=CL$%>FU$Dt
zh(8&7I1jVx!sFl|H(>#-Akn`8+Ls5XAtsu6n#Sy}XT@G*rBlg(zYvGQWb2x}ke)Jwi%l%ernqSNHStsU=7+Ajau|EMEHg%+T3N6G
z^VXIiDfJuPu3EG~+KTQm!SwHY^wRvr?1CY%$J;qRwtw^x{Ex|HmOZgFz2fqqEnm7`
z!EX39?2BdZ`3gYd+1A$V?OFjFlAqO-Z#YO?lsb;)NhqbI!=O-dw)an#mdQo%@pTsh
z0YhN!n(Q>8&KTn|VLtFnmMEkYTN!QE#m+^orH;-vGbtl+K|HfRV%K!>h?f!M9&Fzw2?{c$cfQjXyb>EBiRAX+-y
zW*^c~%PAb9SFLQnuv|tLXqkBL9236Cs+_NL5HvjBaUmUSx1y}8IzjDNiv1tU3W|q;
zjSZHgqvJRCla17lMt=OHUngQVZnoI_Rs^*ZLyNL1%Q4m8{GU9ArSCp_{8J_-No6iu=kvMsm&wTu(~`jUxJoe6z(O%jLL!MZ)=C6L;0llFqCP~NT6nvJYN7*3&=qD
zo_~jXb#xF+^Dna9JR3pFI%~(T_)Y-_-OyC+DO1ku0JH?($o!CHgkoU!{Rj7*A#T-LkZSFE(K$
z1v5{?(H=ApEF;rf3O4o$e9b51bRG@FHD*n6jLvV^y~%0=-gGIY%YuSp@brmOQBe+>
z$Z$tpbL~G>INRY&D5S9~z-oe#=(K2GToIDGy~Y)fXGt6$Cb!j>YexKK7=;${G+C0I
zOCaXQCD%6%jG|JJ75A@aJQQyttE1#lLTFU2wZpkh$f433=-sf(kWkz8;yd*rJs>cP=4&kws}x*pXUZq>oeim1)9;Uisxq;>`=P+5jHbEY~`s=
zq(Cv}RS0QM5p3Sl=b8bu6G!q{LZGF;;KII}3mqTdYcMjOjq}ariphwYv=BSE{550Q
zYbB#5xn~R!PrU=oGQ7J-pwBr7L=D_h#w#~AaZ|Ge*)^Z|F`^cPG&D&NzojWD=20LN
zLtJ3a;Y>Gp^MYRObW{gm!*>pyN&>MPYkgmRPjP1_uREE4C!2|Z+XSf0HuK+Ba3;sc$E7QzT*Nh|
z?zdupZY0oA$Ir}A1g+!w@-lhX*h;1u19}AqJRvt9GO!06c-($H(R`omIqr6eQ%l2G
z{1Fd>kJnI;iCsLof!uXevmuJ1UhTOIxm}fZ7Oo?A-D%YWIzath*E~E|eCAJTuo&hU
zwiMqYLB#zVLTXd(h&qq$#Rv#+va(%6>eoL$%h~>fHu7?>Q70H6j{to91Cwus2zW0_f~p}{DH0yq<}{Y3)psm^scV1J{lV+wd`V1NyKR0a4^#*I80NW
z7qCiJMj0dW%b>i9mwG&r=lToq7a)uTCIW3XPm1cBLgfVHchuCdrxnGwHx=JH^EAKB
zq%R!x(QWS
zYtZQG8ZMhsSih~t>^54qbMNg@j992AQLG|jWOJYgPENJ%4+q*2hWCME&*U}F`$aRh
zoaZ9LrDYIV-nZo8Q+lF%iRw66nc`*^=sHm32}%VHVj78Ux{c-{WxggFn1}zF7r)eB
z=?_33?A$z|AdCG3+*2LrmK`DQytk!+Y}0qjZ~$)?_tV8q0;C!TMe;`g2NZUlixt0g
zjRqUuJecD|JAt0NtFG>`B=HFPwzR0$p_#i90zjz9_H_!jbNzfG&_U4U;-qdN$9V85
zluMx9>u>bktfe?ZHeFrxxm6DIwG{mZEIkaC;i2s2LJxpQ`Rk{M3wbRja{hYk#
z&s9EodX5Y7VQ>&pQ%Ns;PBec?0DEalUbwqrSP($cM?r)^nJNR!5X92b(whA?-0MmY^H2x>aXM{nh52e!u@|8_ABi_Xpk8o0k=Y)Es2lO~QS
z_UX{dkqOq=x@dD~G_Xy?@@&5mbhFb2_e}^eP~>Mzc1m6^$ytx_EzBYNf(_31D;Zxy
zOifp$X*+lyHqzw=f83_qCZ!1dNUhmJZ`7^Ae
zixyZi&Vuj}UwrGFA=J{xcEKwfd~Y;HX5V>&qvi=J`pld|XJ|pt2JTt9
zH>Y*7Vv=>O#Up?3M$7An1PccI>lJ`243Pe5*)|{Q5;9fR{5u~|!1|GXjNuthRZ($q
zgoyS9Kr?|9o)uaSw7;^6F5p;u>{BJ9ZsqnMS2nf{d9G(Fal#2Y?u)%RteBy5?yyEDxFmw>=Ec9CKU%r^jKX_807GF
zfB$Y}7t8Zus<+s~qFSY;c{5g&2?NV*7mMAoKBrW-hYxoh$M-jfU=zFoQtdnMK+;z*
z^9lm9B+#PJ%+j1f
zP@d+z3~>t4#*EWl`kVAEd(lR;?t{9MX7A-ITj*-0>-mdZS=C@BRItUzT8&?_Wn9wD
zo0m^?8KkFN&{Rjv$WPwd0gg^s};?GqUvZ%fs1|1xYpQ9iq^4G_{U}Mz-5ud2{pU?E^NIj=
zCidby<0S$!Mhs6}eWFGyCFPAL{mu+90JUET0{*@8(ZTT?7*l283XF-5vLOH`o`3^#
zJKY-HO0V?Tk*0$-j3UV3mpXS%3@IE7Nd`IfO(+!;
z4jVIa5gPQnAtr0~NPT^sAMzE_hrB;=>J|nSp((@rrz3QSl_AXjKTIcHVE`)ihuwCU
z>xtV%MFkApqa>SY+@d|MQPV$`8-WYd!EUrswF)(0Vxdp`2uP}*z+)hA(L4;)X^=bf
z-9WIg(!4z{AWkw*`x_Fs?ya_^JCJ(mwVbE8dYmj15GnRw+Fck#gg!*_V;!WqZLYo3JH4L&b!0
zi`W`R!Qqt2R;qRIr@d1cRa@HxT;Z=*r8Qp3)Q_^?H@cs@|&?Fs4%TL|V`=y7uM87=Vr)>L!Z^k{h
zIN;_DfE@u1F)%Pwt$eSoHM}3lzLi>f+b%~9T~MMOp$Y%}*}10q;>BOhB+1mDYs-f3
zM+EeT?|nR4qk$+2bHuMWb2g;55Z74v{eHHjuTqF9A~q1)>MO^2aScMq~JCU5pubH%YUh#=I7Jj?U~ZPLXU%;I=oC%
zb>w=l+a&pm7W%I1-^g>oX>fq{ODdjfv%Hk?ey8gGBOw27cnkD$4uubcXrvIt<4z@1
zTNmdKP$SWhete)bl01iaY%vb!E7Rw+)dhl-7N^iTptX5^F+#qB3^wp%lbe+pytwTb
z+4m%}x+OSshnwoHM0sfb-uA^Iyn;tVn>VH&L!6>LXo!|)orR}|vOovRUj;#tmHO)
z?YR^VO58jVTU}38uV;p3XmRW?@P2=iJY+5TBCFBJdP;#y(8CN`GP@e0X$=gSy6u7~
ziMR<^aRzWQDMLmk{hB6i@Ks0t)A@W^(3Gbr)`1MU!fIZ7*L-q|5m>L|#Pc^gM!-!jSoW+37iZ&j(~3~+XSP3Px`lz~8Bj^U!2ymu*FNTNK6lp+f|go+
zc)%u~qme|EK$dtr6
z`Vz1Xm#g;ws>?SNOG7slzd`phzZ`|#(*d=NFtQU=bKgRd>zdMuVZPqVhx!-$rDrXU
zN+oDdd1{Dc;M83KLmP3pN!p(k4xNCyRlw0(I|5SaHBX9NN{SLQ1`r1c_Ai#!ZhbI(
zx25UtPm94L0&xaJq;%g4S6J*%K5#=o!16cN?61Xuv*Ds50p`K@52*v!xN8>+do(1q
z!Yof+0V3Wq=q+&Tg8hse*e4(y93vjrU(6(5Lp8?~uhEYGIlAMI$3$=H3S!Fjjn3^Fb
zY0S{E8qe7%xlp#^mM9@C-B)FTzsH?7UBkB7QWUmQr7EOPG9!D!YAOnCcBE+m`0SZK
zyjv`+$-X%90+bi%I&qLXN5{}ZyS=F@*3brd(p+QKJ)^6kJx?O`hjvA**+%}Dgi|^2
zU=}Lbqwaq7nCYaCL<=2&E_OYoJUKy)isq*K^2c$z7A4#PH!0uJ=eGxB(bLw+0G3N6
zS(rgg0%R_xM1fCQ9x5LtNkvjz(vf10D|nNtF%XOLxES*s8m?12VCgELz=AIQGC}Gx
zBn05=4+d7hrTDL+FoY9wjs$OjpdZbojiDRMbqk!5i$Tipp-;;MlR1BR3^;_VJ%>8dHd4f|a+s;^h2$&1wEj5{6`?6udB!Nr6(FC?${
zYPxD8CY%TvV%HJ~(K`XAO28K&Cos#ZrEQYe`xbfCHZn~_v*BPeZ6O6zT2sear2&4y
zASQT+jnA-@rTK1?Wgcp&o@>}_2^{pa@1W$Mr>#C))CSeHUjErsvaAN!B{4&Z!<&vI
znb^dIv-;Uiq#v{nzW#EFXhezAObRAP{p@LuCmzv6IZ(`Glp;UbhOl#AW7%3GYr5iPY7h4iAAu8s&QvC}@D~E#p$``mTEN
zlfKq;Ps<~T<$0!B9fwLWR`IsJsR=X*VeiHBg?qDOz8Wj?e;$tfDdq5|CGlVkn8lK^
zxj!^%ef2(#0}ieI8Ip_d0c%{qWdGlTW|uV2L@2Jva_)%Ffu?6F#Kq~1Tgo3uIvJ^-dXAO(+L*BH)GlG
zcvZrmBMcCdd_|aJ0=>Ax7v-f~IeH=Bm;sb#*U3rP!uRn0RZ1_gdi#(+B$+gC;SFUm
zyW@4q>}c|`ijQJ&h|d~lMCX7M2sYIGd>q!7eKMlz5FvO=BQ@)=UpqW*U87
zTb(Ge*4u5fhM6FxDymX?eowBf%{)&&vcBnQqDSKAxbJoBg9#9U$!#8u8zI2G68D)~ByOd;!+c5w
zEM*uJP=T!A_Lp(_u75k+eVcrGQe8iyhuwNyKiCf+gB5F~{&r0eKGo8^?mh{uguR`_{p||b?l8d00s%vUmL%~l*WJfBnx~#KOU}zm%3ldom@P}
z=q4w^Fa(1WmG^mLgB~_BR+Hr_j6e|v20UP2M@0?<#&w8zt_~Bg*l{gtnF2i*3NBEz
zHFR|LY%wkMoz6&bC#BMqBb=X3EG`89ZN%k;LHfNjhG%Vhm6eV9-5v0@si1KAH*_-1
z%3aEpQcf=C!#@`mnqXx1>f_Hj`L
zwhJWx#3*2D?9+RC%Axt!WwaNHbYjFr>za+#O2~7?@Dj$FT3AHaRrOl_MPW(?r72D%`yPHtwg8_Bl_o4ZyNP4OgIW~|do
z1_umORpNDrh&;(uLbIrIx4PRPH-C>I+G`gQiUu3{P2O1VbQ;^z8`WZ+Xh#Wk#oYbU
z(025fdg9Nz%pbfLQ48OtcvfFw(l?}0Rg{nK{$0+U2w1ei|5xkL>Lf+U!dW`YYEBBx
zNtYNOY#HNoEDS>yvWT7B-G8(*y?pX2IxllDm9RN$y;3=o5U{NCdO%Lz0c=;>$_fmq
z1Hdm2Y%lpbO#kP60g02IAacZ+^w-OomKjUq;!0p*1x{SRtPitWy79qk_UiC!l*Pb+
zWPAvmO3&z##RK(nU^9HitWadH&hD~gSuyBWkKvzbN%BOVta3kiG_mGivG-A|juOsg
zr|zg&i{BrE>%+sEFZ5R;`mrxG5!IhCQo({fk8jone-%$$X}*!_y>#{ob+9@l_>toJc6XWt
zoZ}@8vyTRY)k%U;3tNuNkdGT-B6YmPIowz}l)^l-0P$y}aMee5Vp1e~s@z-+ds>7z
z+sJsP%(akIlo2Ad_R<)!EUn~?HZ{AE0C&gI4}|x%cFx&zVuhgQx@Y}nOd3>p7402?
zDUn*ogC!!6eZpr&XU2QyWTDtM-h)+PKEohfhgPEC2gC;sJbM$!I~JyZ>D)vcMTDcR
zQ7YvmV=zMUzky9KAf#1+tO&`a|CP!|ClxOfhT%dU2Vke@<@SZGSF5?hFMbVMa9=~PG$sJ9C88^KJ3C#
zJGrYpGs3O*S4*@XMW=FA%5XS1GWt&oIPtOH5eyjpJAPC3-Qf*!w4s9o9+>I@2Ow$a
zA?S~`y0NFZyI|Ca0L+NExVV5pHC+Be!R_#%o^Ol6`(}B&RL;`A1M%wZ4Y8bVWQMeX
z8+6%18rp$hhFuH$4O#&1hKSfX;MJ(>ivtM@CoL=F%W#Lwyy)1hHBloujPP2osMV*3
zx!{-;2VwtWZj4vZWAt711hUZEN9(EAZp8)t@}xkpLd4Uxi*7ay$>t1r*z6x8tbJWa
zX>rzE9IwDYYR1fTQ8yE09lnF#d>=hMxBi|O-4iBp(Z7`22Ak
zn%q9tj@&|Qe?(NR4Ea=eT6N>DsN#n@%B&xG(;IGeo9rJ_WoqD
zvcEk#iuwl3(gXG+0GfcYlQnZ-X7glx8$rpK7?HmYaxa+}(Re5N*64_RlkyXh{Rw1Tc-;
z89p6x=5nsfr7&FP;gjhtD4&wDxx9TMI{hmx+=)pgNx`EK9Kq9f|>{$+b
zS^5!aL+h=R8FBd4Ro=I@=*9`#!ec(CU8l$ce>Om6plY!O-mk3S50nC9uC)ZqdOa>d
zpMS&8{b@U*`r%Nzr5nAoLc&1ot^MqRU972j8p7zV$p(wca<2(NHm7%N?7=|)qiiOb
z<>md)`Rjv`JK@0L#2Fwg7n`)6Qt^*(+~aP{sY723NZy$ri{Z2grnGU!nxK&NsjP~3
zTmRm<@yajaYv2B480J?|1wChTaZ@
z5$yMk$C&|>J63nH3?&!$Hdp^8UO0ZXnVXBtjLZD!+H{gj}&>DM1`Q
z6*RQE9Cg=#;^G@IffH#L$sP(Ag8V&zL~~^iyg|OBZcI
zYz%>lS~j5CM^H8o$bZr{!6o=4u0e?Bf>=H=Ye%%lUh(c-IuPN0^rL=r%a{(&JZ)L4
z8!Bo1Rr2dZ!JVw*Ebz72H|oGqLR?^QdLX*bT)HAv#6beXM8Y@eDosy#eR8_El;XcU2h;jMmlEkNq9lcE)N$4wYZ#UdDcxjz@C*NW_$T#VVM
z9HmqRh;JoH0ddSoEF{S^5{!7ZtGq5!Yf{9A5ghY=(pQ1LPG82U-oiR;(roud@s#0N
zg~5FCR+D_+*}k9r;oX0n0(9C@OZ@l@)PL`X)>^2jBBU>hT&DTbN=ku88w^Iw
z>>S5AaDy3#cq}c%KPY{?Sd;ZuvBFGbzO;k9{Lx!oB2yIE)(M3wj7ES;u5OV+k>%}L
z<-&9RkZ;fpGvj+`c>Y?~IgX$%iMrO-06_=(VMk9li-@_vg~;t_ec`m_gjskFHAGy42B1A8xp-ANC|l~v1CUL;TpI05D;u`{
z5dM`;9wTwZWsRg15*gsg6u<)7mW=FfI25>_bjrBv+&x-lucKPR_GETxi@9P>nQ8D0
zKD`g3qpkcYMYwj6@Rfy_hUV$+P#Iyi_|4DhgCQ2kv%Tr*Y{VnE=lU$59#8@R>?3HF
zcHl`>qP@1;^FgDADB#m4i0M>~S9|3EI=PQ~L?U`)ohJP{3q=G~|4uc1Vn+St
z5WUTPSKnK2)dr0yvUPVl{s-)GCuzf*h<)}3p7nn{v&N6u9HaX1COaNhUe_WVUw#sy
z7+V>t?JMESGOiV*W8bqo7#Aq(y32O4Mkam2Z!9{23XN?wKLVl*N+{p5|%>{(~CY(a!|
zXZG(_kB0x5g#~diBttD_N_o`BjG>Xl|AO1)#lt9&_DPTdK?Iu5v)w
zE1|g;8!4_6-6Wr^1}lF|6Xi`+Qn;)k2P7o$zjP@&TzVZ>rb-z#WfhNK%GCcWhL$LT
zatApu@NwoR7pG{^ZA}T|(8YW9&0vA=pNKE)S)nDRZRV!Uy#ZTfI-z{0>@V1?^TR4C
z-m(!#x9@t_K!MdMV>h@c=#O4ql+>N5DA0=hq^W;g-rbD9ijhXl$jYRezA;$)nh>J7
z>II6aA*Z0g{X+k#(^TtsU=Eq++?|Td^dbW@hNt?OMtmzAjUaAV)H&IZ^eLavLRuVN
zX|KBjzb390G#Lzp{Mj>|67glblS%74L>aOl;mJJos6Tdi9MDey6Vm@@7zSobV7T*c
zLOr>;Lq+=k3Onnls=8?HTXZAc(o!N)A{`Qv0wNvK4N@W@(jYA%k_V(iT0}rVLQ+bQ
zly2$fz&Fo*$M^5Ojy;5-gTvl?)m(Ev&u`rTXva=EV)tt?X5_rEb4AK4c!noiX@qwF&Y9K+giN|=`7lVQX4Z5qC
z;UIg83E|Dms|%(W@v|5M9xD)@b^W|J$d_pE@5lc=HdawzAMPU_V_P#JByW?N*WyA0
zn)mph%z#gTC
zV`L=eyXd!Oz$ZzYu$AgH2c`LAkfc5pCom-ZIuzlFGgC2GaC^zntJO7sI?1ffbV2SV
zsH+*9E8l`N<;S>(9nMxdtvu0@mXj=u1rk?g`!X|IWaYXRpbfy631k(x;Ct{-!+vwr
zmbCO)ak)_liQF9$>^o3;2eijebK*H?3ef@ohI>JWliN+jI9L1rP&$^neGBxqkeOfe
z@ehy_8IHDvZAg9|p`o6%xnD-Lz;j0PX@n-bB;2*0acHb+f^@~<^MMrx)GW>-7HbAUAfmx=v44ev@R7AMH)W>v67D+l#&A
z9J=%aa#%0(RGxyx5GB$Fi$Ud|5~f`QyV9&0x=re1a5ew>MF^Tvlw%k)8~&Fo{+AlY
zm^jz`E=!#%%CGunty9_KUsXD%ST{C6R^0yT`*?Jf<}zL(|vT5
zXW2EzP2(HO(!RB*H>z^xntcr_0WPvS4X=8~-VI>DRuiNym?|oFctzjMW6+C^Mb-Ko
zJ6c~v3DL;^jA=%0u?=unnNbJ1y%CX6UH&~pko-(y{}W%be;p&2`3YalKjg{P
z)#=stYwH)hlKJYAyZZw_SLj5?1uzPq{R!W3v5ix99*nb0YBX{+c|mdf!hrQu7Bp0O
z2a~gxNB-;)dq(ABGIf&{f$bx-XTxd|7ODa$1cjbnE2#JZ=Va{FXe$A>Sbi!wQ1FY=
zg$}H=r9bjaz4z|3pZBpNy{4x0>80-^DYn#o6+UCHh*#y;B=@`&WE1;Z8$Q3O`16OU
zF?)=he5)gYtw6#z;tci0JLoJ&epQ=;>HH|1j=-RWp&-lfpYfG;^ZiyA{1{C>Xg@+Tr
z$uumTr(Qc9B3z8@!)LuAZ`(K0cSYFIp)5)L#Zi(;twJT3ejV^>23768~^
zK$;M)iRi_{9-K`F*inHUXl=~~MR1~@@Ak6|lAFU0&O*PTe&NTSr^sW?=3Swt@Qg97
zUSK$glkmG$^GSQ$rT^iQMZ<@IoV`v7#Kltbk6RiD1xk9
ziC?^Y$&|@C;#z(91KEVBX~flZe{pIwyC%y0S6;;j!lXpSxntvSZm
zvh;a!DyoBwKHZQ?8stn2+drD1dW2P7n7`;^?iI35_Vz)4?io@&ovvv?^{(^g{L$9r
z#DL#X6~t5M|Lx?*nG8|G>dzn3^=vKij!LfQNx^>2S3^^ocR}_AKqD?PlpzYhJRFI{
zM%bpW7>P`gvzL7y@{G=Es%9p-4f*oOO9g@G>|&ZX4~8_0=hOi7!6m%cIC=cfa4i1k
zm4$Y(|15VhJ>`eqF)hOA?$HrCaoIzO%bSOtF@xM>ihUNDMXRPZ@5J6aMMg;LQMQ`8
ziU=dbNS|mxKI6|gLr8&4`uzLP1soys``J6~uZJhu$LWibJ6aTg1x_Q2%#j&?+f;}%oRJNU+b#jlgzp{u)b4K#=q)d>2y+?NY
zg8I$t7ZO%e8;oWnF7XTTL;mhc=;E199oxtL3Yy;_u^&o6kAPgHI{Rn2aNCq`dgrzY
zR^g!dg~}>mT7ue4bBEW+7cP7#Ms{6RKj41-L@cW<$C)Yr+HONOh((x4vUyY*=I^EQ
zrq-|%G_mpC
z#8~i|26Md3h7!N+{xo@Re_izOH#|G`m$!Ry6Mn!A2W@_T%yw)2XCxzYr=ao>f0D=`
z5yJA;bKl~5+0!^xUU0MF>2&v6iRztwyu9S@Jhj{
z9R6V|K=q@)(a0()s`b9#J)}fWNXuq-A}?`VSyQWbQ(57Fq&}eWilzaAz4QiWtCd+v=uSL^OiZz
zh)arrNh><8eaEDMw{l1SeDR#>v34*JSPL)URBXKoI)I@30dX{D|cIa3bl=#lE
ztiOdjz}*p(1v(4m!$J64cS46JdC;1lLc@>*W<+cLh{D3VC=gnl
z0>C~pPgbI3pJyn@T9=fJ2Rf2(^{K$jXb>C9v#wFDJXu(Z>n(7tA!*6Eq^O6ub_g~aIlnY?c@-bP}`?+
z5JJMS={wjHATtZ|RlPFT&{xCfsuNF`xCWOPmx*fez@hlso%C4^HjU)-P8)7Y0ggP0
zC&ah-C?q=>3n>({npxr9K(L`y(4%+U@E^ZfRpq$LCx~(vVb{P_-g!r$h%`j3QH-
zpV3?V>yNG(1YGO=KzTCj9Vw?{%iv63ehu0H!Vc7S#@@j}ibU=)$NMj<2szg?feAfc
z3f%ER0qrRoql1k$dgJOYsP@79j4FMqsLXXIa(?kXTrV`VWn(Py%emfjpX581;4!a6
zgXvpD;BWcH(@mya2?V?J?&;s~_AIL^-u!%1WtA4%D8@Z2e-ExoJ>PP~^YEQD
z4i){-p}d8Wkb>xozmy5L#*?unVuFHJay#S;H7hdZR36F_A&R73RBx@B21AST^%-we
zjQjhOViu2WKt1k-g#{Xm{P+00*KLDC&J$L~jB?sBoq@2dz?y=>RrU8nZ6!yqbVj&u
z_5rb}82s+=@2#ztOvy5K?uohFNdkLoLoPW84PJu{Vku^OYbxvhezVO90WT}7Y^$nR
zeuu>z9VtSEAH&-TR3kWENH&$F=<`Pe@89Jqk!2H3^{>X?7eL#-5PheN-hFa{)Byw5
z_ew4>u;HTLWRGZ_dUt$J$tW4ClB;dw5CpmN>!ZcM&idZliwhu6K%O-{eA$XU{iQqYFdH|G6i@sB1u+WUxO;}ng$W2E0h)oZRw5y-#X!xJKr$CTJ
zaP$@?5r-j!?e)q$
zsa@~zsofv9G);b0=~8HFo*Xz`F8^R+y1D}4++~9Qg?tY!cFTi@SZbotO$#*qQ*SH$
zWBS)I`@|RH@_G@IDrbL1>C71HDAYkIOea!4nDQYYqYt4|JdN3i6eM44V7{9LFAF^o
zoVMU`?y{_cVZbrJdlHG9W+Hml7=6@%P8potR*AfPnG=R2(>o#>%G7ZDHkWAyHnuN0
z8mm8<`M<&_-W8sT!-T20@ZGzMgMZVP>wy@iYFxF2R#nW}=)d%gSi3P~g51Xovv-Jp
zu4l2}2A_4uidH|OVXaE+cU4g)jJh%*tQ>o79MdkWYe@X7HrP!hs#vES)wAHH;O`-beBgQ+6jcSofTQ*wMVeczQo7)3K=n_gezzl-?@@y44Yc;NEL
zX=ymaA+mA5|Cz4~kvFSMu7iTO6!y+1;tgHm0pYL2_~VZRGh`1BXy>H4(H~zkSeSd3^q(>epI*W#Ow8@ih`Xol_~}c=q^u(audtw~z>n;UIW&
z2OO9z2h6irh$%j1`kPW4oPubEEpEJ;3QsaV468U#%21z)iNAkm|4ow-$HM$K$KS;-
zf1J<}O)+l`s$@xvU)H1ad^Gf)Pc;ujtvfUcxQ;9{n);fxCFCrfIm0)8$(l39Mc(
z?Co(us0I6W*xT!r8ML5`B22|`Sdm0Of7z$`cHun`t-bTQQMSy&C#`_kno3qKK#bzM
zt)M4H5N%vTfW`G{n~~b%8T=DWn!eo(m5|!>i
zVL4IhK50m@QU=qf+m*^+r^M*Omi7Xo`y>=j%_)m!)fm&v<1w$F`N+C|ul&WGJP7-j
z{@y?jYNTUwf#FlTm-)IHTH4DF^6AFRhN0{G71U4M=}0pPD$8VC8!BA3jf4*pGQW}7
z7>Uu5Uqk48%6}?*!^#R{D+-S>v8px%7TmRna;=o1pi%o9TY`_=ePM$AWKrS^qFI7J3oYL(yYL$8!yW6DnO}r3a;NfW+$FOS
zuF)bfqqm?4DtIgPg~t8K0JW
zdn3eR&no+6U^!i|u+smS>uJt;zKyz%_!l-dU40DXYwLSip3A|bbGHI8c|;-?7SHcK
zjGh`1M%8?w41jWq0Cf=%4x)4erEVg=tXrH+L`il&G#v;0C3<)fHu2V`Ru~>N5tqL(
z@l>>d)brZxZC9mPV54@ws~XL0i$-2gea-y{@Oyx~$AgvN|PX3%jxW
z9UH;(htiRc2S%fghZ{VBxe?Sc6wlqwM*?GpibYnt{5HZ?@PiSlFS5E!UOv-)(((u1
zHKb)i+W7MRs=b5QaGb8QtycVtx+U!3u+1lY;cEW7IH!p4jX~-s@ys4My9dq(jU(=~
zc{XM+EdGa|8vES3R-WGGfWEjqz^HP`foS>rrz^Z^vEIa+Kj9zMNOc
z7{malE-s4ENGU8`2@7IXeY{&9D|oaIX{l5uqN&iR&+^*6tnS@XG;@8FzUA<~=`5m)
zhCDJiD@I0D^{(kdk-aj>YyZ?&rQ=CU%R%I-tqri_s*?F2cOP}d6o|0R`NAQ{1~Q&y
z4^Tq!4ac_CR8=zy1G*G~EG(;}9b5+UYVL3>S{)`J*&L7Y~x-Q`5UY{nmdT8>HYN$*-Y^@OI
z?KR!84;$|?l%&*HW4OaQE6DwuVhrAyKkf2Ah~uuG9>_Gz-J*}bNyup$*CP&afcxxWlL&gApKk4Vu43
zFRIYXm4+@Z8mOi|J~Z&J0PDU{&U>DuRnk(^l4Gz5QXoZ(+<*qZuNx_vkI@ZMZ@SD
z8YH?4Y*D$^650?zgQ@hJ(LI2*7P1Fs=(pZ@L+$yG-(>|qCawQng-8C4Xe!e!U2>AI
zWdM>y?UYBbUcGp+@M-dMCd*Nshx)dxV*L1umUi&iM*EK+w*a6E*=6eIzPy4dU40o~EE31s|+Q8bpMVzm3}q
zlu!sT{LFz)#3yIr-rw*T`oYq39h2o@&nVeSbgl`eNuP-)hOYPxa8_eLtAGFntg3*U
z1W_BRG*GA|k~~OOdLK`syAoG7iNHs-;nYU|#+C%QU}OOG$WCImX2d{f68DTF(fgBa
zPugc5Ve$G`np8=1uV#4pYtSA&%f7q;+f>Y1zw=V=9zICZU!HVI%r|T|y|5%&Sz82c
z>2HirMH~h^EoriRX__{ZDc+)lsdf#@p&<^v+}JPD_(PX5Fk
zqQsu1w>?W|QvB|ODRuE>aI}Ca>WlzW+G@Yc{mdTEd#miw3Gg33zcGr{R^}@jLU)}}
zt_?k_Fk_sPy@yXi;tC|7F%WH_O2ko7cp!HDPoqkJpz+}zD6xF6#1~8^
zyv5j^Zxid5&MvMn#97YE<IIa`;v2peGSS`9>4|t^wcz0ZbP40Q#?iX$lvj5%;u{+
zRyPa-XsJQ#v<)J1)#o%;=@fHV^NeY9+m$8hZjhfj|E!j
zQsAP)MLu!oL`!Is@~x*&Oh%);kN=6lLCKh?Xx-f&zTpyjYU;o|8=%1ML9!AIl!aQ*
zzp(dCMIjab(Xx&!l4#7L`R@^@(!W`^^SAoV&0S*i=WXTLIfP`|-*>!3p%&SjE<%V&
zSo)a_9PZlMkcF6oQE>v6#tKNNK)%?cA9?N-%WD;++@CBpF*?zCW#1{fL?XMx?Wu1yM_R|1f~gU~LvX9-1|
zg~~GUa9HVkT3T9m`G67&NxJMJ4p3`XJZD}n&GbE@WLA`hQ#!KMzr))Hx-J_hyzd8W
zrGV51{ZvXG_^AV1vbZsC>^tVT!~fw&SE*(e9#nJnQ0LeEb)8&Q@=yj7(Fkyi5Uo}4v;Lh-=bT%%|&S{F~pKPc=R|nB1NKc5O
z9)nW1zaI{}fS}-u0Z&R^IEd=2^-Ag8>Ww>QicM(_&K?#@ypB1!+_77IH9jlMp-3!B
zM<5Lq`n)`pLk>zY?ASqYj7LY31?8c4di}!h4fkiO2o=NR^b-89e^2_lup*6R^5yl~
z@TXAcfuJ|na*t*>6T3@KPfugU$LJ;e>@`0@pb!Rx
z<;OV{@9mk!PCwFXTZVhV>lK-mk$ejeKZ(-ro3C&dh-YIO+gOg7c~mX=rFx(18^R9Rd`i;C6zJ?FwTId@4{$o4tdY
z0B%Bl8M2Q6jzN)t1K{!O0efMmS~nSNq5F-Y3woJl)*c^EawJ7T_g-0E0|O=?0zoSc
zm-6?RN0cv}oxj0ZGwVFy+JHf942%hSnEMf2vD-;C+#>pp-vo$ZcF4eo$TiA
z<>_t5@`Se_9*6AQe_~*3ekHHM;WbHEa;6;%ij>?EUInsu-ZgNep<%1{`=995xnUY4
fbkmOHS6D{GjlIup8$QFSJ=YZFRAtKm$nyUHRiJIh

diff --git a/themes/default/images/logo-small.png b/themes/default/images/logo-small.png
deleted file mode 100644
index 2fc13978cef1e3304a5c891cfa040a571cea2ff2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2225
zcmV;i2u}BjP)Px##!yUDMG06&_xJbj@9+Hl`~V++=jZ3%-rmN>#?8&n*4EYm9B=>^Spp`SBuAe|
zZoQhIt_muL!N=04th_c>tg^)4GeU0x5=Cfyx3sy(c8$fr!NZTC+YC0xjg+VbEwW^6
zgu%?=RCmK5Mzxflzbi+PQgh%LJeQKR<8GPUE?C`VbDT|DgQ&sr2op1Sevv&zUM*ex
zccb|eC0u5K;4xUo$JFLie)(dN`wTnXEH+Zv;Os|Xpd(A)#@_Mb=k3_r;N|G`0001(
zMG;p30004WQchCmc74NO)>PtsWBM7Yl%N
zk6)T$=k#>cV=Rc?LEleVk@xT2Lu{#^s~cpzG|n8(`CZ6@j^j8)CC+MGb+c(^fBw`+
z^9ne8ZIG(t{1}}9lF!F1XgLm1O>w--V4>J>)ck3b=4sgjt#0s8fa!UhpEQ7pa05MB
zdsh6tR+~Q?=3c0s!dw**eBuMs^DdF;<OT2>GqRkyMxv)L@u&~+^?>QR
zE;2+P;^~P2AvU&P?es#fo)^4{)x5%8<+2H!b
zv2xrU)a%X3KY1IQ?ReS@Z_dvjK(7IM?Pw3vAYZQQxEvdk_A4XteLqkFnBV|Nd-9V~
zd@`kR-F=B`#4NMUOqr%Mme~h%?8Y0N-0GI%4j~w@O(DA0KMBZ6_AZmCLy~QzLKrD4Kes2Mk>VN{iud_v~
z)qkyHJM!GO`k4^3+Ys8PF#X@IOqrK6O_(niEI8wy=Yq`*Cajgv*I*4hq~}fHKZbkq
zo!St!bWw)AizN&{kV#?wfN-czqX9B&QM15Q0z1AlcIsU=i44-E_Vbv%64Sk&2FL`x
zq`)jo?Hrf^G9kbXCgj#vWE3hSAZDMK-Zx;nP(b5JJdE7h{XH_DKo7T)1DMW_G4q2C
zhSS`NGcehkz|QL;Q<%W+klCG5)zurX_cNI!6elvdQ?@4<=H&oNV&>LrH#ncQO{Q@1
z*Q8;YeV5vXdBd!XCy`~k6zD!CY#vu_bz@7N>_tHJna#|bq>I|IxhCb1D1shRGZiyMe26v_{5tvXL
zVH1kVFj3}=!AbK3uEmk5AwR`xj*Z6kHCw`p0iVK?{NyWVLYTf<)K*B`0@&3}+(PCI
z7Ln)8nZNM72~K>weICbCe?cp#eHRat&hV`lfD5>4+130qKjO=nV4AfX=Ole(;ugTd
z!MF+Q^VVzvOas|7Cjl%Ewy1fuYFV9R2}swQ;v9vIQB?NWX5(zIRnbFqpxwda!dK`_
zb1;Sz^(GJ;c1Q1upe!(+7#CpVvPEt8f%IhQlY(JBj_NBYYc@I%QPd2X>OYR*81c_w
zKf77b(Z#*!d<2M;lLuZ4*NPu3T(diIK7<>Zmpv0#bEe-Ip>;Z!UX!sX8p*^kvn;x
zl6_B_whTRs+>I){wyoP+{Rg}ZR##A`SnavuCT{x$e(Tlxptt+{F@B?H3Y=XQHg9YV
zIPfjd7W;YzfA8m+BJ@+AEdGbjPY0~5-}eRTLt?7ZUj!vmN&cx%J2I2`Po-3ae;%2k
zh>Fm9$7eH@CEF@GTg9oetb*EGLW(lW60Wo{!IMg+%+D0=XW+Po8=%XjO0DBsC(x(3$U1>mc%BUuM%z9^s^sA~Nwd
z7P=^Sn$g@UlLyK)F|jBlUDgH-jGIbdRRb~Mnwq&t=xP+PG%yxqCKQdbi8p1SEmNB~
z!4jIq)oX@G@=uX>Yi4H4i%L49RiG(hq^PW2g*6P*V7e+;VHl_>G^$>-m*O%>Op%bk
z)R3!s(aNqgnbMvBH!^L)vk62+MOLntSF9)TCG;#t}Q0pY^%aP
zRM=BC1%gs5|-Y?QnFP;WF7O}@At>^-*cXGe&;+UW~cP@?E`@*UrfQdWW?V_!?G|@&R&4bjYDVvaz+TN!n^@AaKjn|m!
z-{yZWuP)9k3$iPsbLvB0f7trDy7inJzr4P+zPVcaY3qJ^-L5O~y`%5*YZJp>jc1gG
z%+Jqvj86CW_m`KK2NwQwz$vx1wzl&_%lyKhlioQ+&5wTmo}T&jZRE@R?829Yg@w5C
zB8QZHt=|NS*0GI^jq@u4=eQexHns*ob04=Z|A%XOOT*yv_V)IPML~YA@Lz`W+WOko
zmf&V=dEb}!AEvruU%5OV6y)&)3#(h5pWdu)3P&gVrj`WvQye4n?yjtD)U_9DIwTeJ
z3*!rY)vhIUObOCz?Ed7@niAl#O%aV-d6h%C-{l8U;f#b^_c>}X3xjz-re(7^(R_&oA6b%S{GrS#=_ik)#zUzAVdtJb&8F0xs99&|%xwX0Y=V#aC
z!qnWC4Z(VS@0XN@iIw%u^p=^q<@HU$*2AKUv|^jHR5pKU?r)DQn>eMSegW;}Sm+Bo
zO-ka^o~_~W)*C5W9$AJjU%q6s*}Q4N!kVyUQs9{x$E@<4`n`ND;wA4hhyL>V^#~gy
zuk5ag&+Or??+ZUT-R0LK9ddbsXMLOby@EG`{Xc%MoboOFG(GB&w3q+qPaS#1N=t)o@L-#Ykf!o{^Mr!*a*P^h$q0{)NY|KtCk03abC#L1ho
zS@j{%HjOJ>c6MU~tb97tv^1wFT1Llpj9Z%95=S~7C2v-i*P197e{g+3{nWE_2d=fH
zn&~*HI!T9SkC~PB73wPoi~L0ckv%!Pw3s$El8y4}CcdYy($$9O`g^BF0&s~=Y|7Jy
zw~0H8o2tbxpQe)!yxwc1F7tw0V3PmhYVFO%|fkQk1SzoLZ}zrZ-&BsKF0HMIW*$J$8Z
z5A8s6n2b}wgosTjBScn}X%wnJm@dUiJw6EaK1e^2YWLS?wK7Eb9%?Z9;mXI#rXW@a
z-5zojePslmz?89~6gxve^_xp@lOa_tAzRtzU?W#|wDZ6j2{ZE*gr*&5(NTvp9ZwLu
zKg{wKWu!OW+PTa2zINdO6zAcBH5fz(}o-i{caVPVCfR
z{u2v|sHtvlODi~bk7q=zacNHT5SsJmWbEd>A{2wD_MyZIr@TmwCdnN*SrVWhuAES=
ztXbOR!h3$;7F~XEK&*nrQ
zp5OARf1iEu)vWYqQ5FqD;gbpPr2nGPi1E|CMk-Am2VzwcVsxUVlH^8>3}M5b7qzAE
z1Wwr}mKG+vZ9&8ODK4$K9gGR(Y67!$kT5@;e}cSQ)b>D@l46s3K1-p=R5UMBhU
zo)1f}{`7if#58X^-`~;Q`BPz-432o#zyAD?ZFy!d5f1b{kxqfTzcO!~()jil)6(MV
zO;dS%fbL+s_?6L0-7KhG}!oA;?Mri)VFgZpS-9cc`8n=*qhVj_PxFG~DT0hlp)Wkqt?guu+jo%M9ui<9lN
zW;tNClNvD8_)dHn1#tv=CS0crL)>mV0;Na4>qN1{)O)=cJqJy-EP45L(n%#_P;MM&wj_$*KaSG;SFYmjVI{ntcd(VwY3hq*=Hs4@lTt_Pt1ey$f<7#iUuQXZ3yFTTIe#GWv+a2P&?k$NBmWK;cQYSX}PLw!{RwfbabrA_PS3HAPCYsbO(HQBl8&yya|d
z!guCbp3sA(D-o?tJGB;Qv6n9?7}=cC2?)D#Sx?W9XY(^~4MyG9oNPc*kU?3|c0>vl
zo60#Z-fJIqd7MTxWSHD0avY@F55J12P$W0|H)YIFTiL?T%tuQ%hyYg>4#uf@~z9=
zmj}u0(BeC#QC8c&LWi`B6vn8*N-}m>0}8F|0%u+l7$50&uP94;blZ^#qTRV6I9ILN
zhADeUlX4h%L3`wNd}FM~y`m=j$8DFCj4^<67$45Sj@2lQ{0!Hv>3jY&=-0-`Fz++Ffi;97}2NPZc9=q-Q_x1nrvWvz88-GNmg
zr5PRTMrFALSk99*Wz$_Fx3mDOX;Kjs?1o&XQRI8Q6JQ;SvsYp~u3|$O47CZ7Kfu`?
z`ko_q9lL=@u)H5kQj+h2kBkubj6fCAFZ=U#Uq17~BGdo{_xt_`UvVI!fQAUA*G+wX
zOBMaPNzx{B2xCFfE=z$VQwjn-wht=>e^NRFlMfv}@BdJf0}}6WW_8blyAG-#Zc+Sy
z>^e^~Q&CyU_3)oLzn{_n>yzU1hk?f(3^yiBw*C;;8h$IEr$Jhwm_gIG!qFk})*+X-
z%hK%HX)}-Y{Ng9eFCIe6{}sk`-y<~CP(OwkV7Mn`V~Y%FFhDUDB5k{0n8iI-Wl-Bt
z5N0BPuNo+-{V?G^UfP$oeOmNS3k*^SSl^%tHmm>>MomChvbT^2$x?#cor7mpgWA6b
zb#D(`RP|4ACcI&U7!-sQvTPVqsEX0g1OefbOy;iKw=S7_@yDp(-YQ
zIzplfmRyb8o{jPt@_FnG#+yKeRH%VV|D*?J@G)V$I6Q^G)Qe4~M+W%DcIwfd_(sc!
zgGR$Xl5E^tcC=dxaL_ZZ*abFbAtKoEZ+KX3IQpAjbVh2dNNKEypSUX!;i-x;^@JGD
z0^UBOue!hr6!4K}qOP!2x>YSYO)n&q&giC#2eSQdn_z|G=x%H1lWO92Gx4v!k^a;7
zF>8slsSKWsxHLm_eZ>a>+*Kb57PK(mr^bmdFj4ABf14%X>=UeU;?5MpKngHO_8y-m
zO7hXt`pHuE$(E51E)*t1rLhPIX>FbAN@0riV7y2Hl{~zGHjeObga#!JTmNXwBIcYv
zBXA_(p>1@03h>Q3$YVT2OdIE2g}Fw8?{V-0mElR&X*y|XZE6YA(`kd1z>UKH1O-R}
zNJI|}n+kXVVh$sZ{0q~jQj;t61FF{GKz33^CG)&m5T1l;@=Gg$(6S8BmGk&h8Ys_7
z4iKhgmP7QVp-ch|r9r}OtHwlDJ=t4;8H!AEg?*z;K%oo+rTwJbk8x3!?xBiB7_f3@
z;IDdqXSCoP(-?DBBHBJJ6^8_5V%PQI&5^`!GcmdaqVgZI3n`BYrNnE#$S*c@Hxme=
zgpSH&NSyXhu*pW;$wn7uPOXJqqkwwpxpY=eRF%*50)*NsQJf!uBLPy8@tU)uq3qQ7
zl^hZ->8pN1yI+E2DbCwB1qF(EbA8@N=AAA4&oYilAsA2R9g$6t(Rg~OEmktyzhniS
z!o#?E;*2@Lc2!KGTn3$tJP0FqKZyKNmBk&&va(IMWGnv26Plm#sT1-F9@Y5Or#?Ho
z_NWEQ6_RpY(z40=L2e^(2RT1I1<27TN;d(`$zdokyV^FzNrUk!E&p|OzLkb}iYI>Q
znIE5pcsKs^!AMlndY%)bj*~E$m#qQPw1V6n{E`zxql^j*rP*f;vEtD$7
z`F!vhAVZ&KpBqDQ^tF;i1Gq%4K-!>yJ)0FS$CT_rkIoVYwO%f108gWyA+w8`)t+-|
z(rky*%3MqEccAV{%tucQl))C~$6i;Z7CuO7O;mbJ&YlG
zRt;WVp=oBk*q2e5kt$=#FSo$IM%yP`&$fX9WLyz9f*j>^(Hd|U(%b0fW6`*NwdfAP?s8cy*W
zNE|T4-ox`T)#`A{II)ZRu8RuPy22?e1m2=zTQvaj!msi%UA!cgDj>w)>tZ3=WyCzF
z@8s(0$t#%l4dMnF+SXAo-{A}0!ChrEsE-lcs4$&{xyEX^Iu0Oj!yOC|qWa>=P#{0u
zjYqh~0G+I1Is??sY`De&-}3H>@CXMs-=7~NG@HQAytHJN8c7$C&m)^Uf#oh!QP03&5ID
zS`f6ZYSFHl4(=~acppy`W_M!jyXRuMS4z4vmRb=;T~PpHEVDhB14mu4Az7UM%qQ$;
zAosJoLAS0#O&s`7kJMw-ltiZjp;zfxuN$*Nw+!70AYRt>@Q%WlC>ULXGR0Ux<&}Kr
zLAO5LV;KF9r+!#~##h08Y&e;tdUq3d{7rxT{Qc8!`i(#KyBr;`x;k(vaKOf`83chN
F{{t$$#)JR>

diff --git a/themes/default/style.css b/themes/default/style.css
deleted file mode 100644
index c6d3d391..00000000
--- a/themes/default/style.css
+++ /dev/null
@@ -1,187 +0,0 @@
-body {
-background-color: #fafcfc;
-color: #000000;
-font-family: verdana, arial;
-font-size: small;  
-margin:0px 0px 0px 0px; 
-font-family: 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif;
-}
-
-h1 { color: #D49F15; font-size: x-large; } 
-h2 { color: #809BB6; font-size: large; } 
-h3 { color: #333333; font-size: medium; } 
- 
-a:link, a:visited { color: #000099; font-weight: bold; }
-a:hover { color: #ffffff;  background-color: #669933; } 
-a:active { color:#ccc; text-decoration:none; } 
- 
-#content { 
-background-color:#FFFFFF; 
-width: 750px; margin-left: auto; margin-right: auto;
-border-left:1px solid #ccc; 
-border-right:1px solid #ccc;
-border-bottom:1px solid #ccc;
-padding: 10px 0px 0px 0px; }
-
-#menu { 
-background-color:#f4f5f6; 
-text-align:center;  
-font-size:13px;
-word-spacing:4px; 
-height: 20px; padding:4px; 
-margin: 5px 0px 5px 0px;
-border-top:1px solid #ccc;
-border-bottom:1px solid #ccc;  }
-
-#block {
-margin-left:10px;
-margin-right:10px;}
-
-#copywrite { 
-background-color:#fcfcfc; 
-text-align:center;   
-font-size:small;
-word-spacing:1px; 
-height: 20px; padding:4px; 
-margin: 5px 0px 0px 0px;
-border-top:1px solid #f4f5f6 } 
-
-       
-input,textarea,select { 
-font-size: 12px; 
-font-weight: normal; 
-padding: 2px;  
-}
-	
-input:focus, textarea:focus, select:focus {  
-background-color: #FFFFC1;   
-} 		
-			
-#srchpage select { 
-font-size: 11px; 
-font-weight: bold;
-color: #FFFFFF; 
-border-color: #CCCCCC; 
-background-color: #506DC7;
-padding: 2px; 
-}
-
-#srchpage select:focus { 
-font-size: 11px; 
-font-weight: bold;
-color: #FFFFFF; 
-border-color: #CCCCCC; 
-background-color: #506DC7;
-padding: 2px; 
-}			
-
-.form_field_error {  
-font-size: 12px; 
-font-weight: normal;
-background-color: #F9DEC6; 
-border-width: 1px; 
-border-color: #CCCCCC;                
-}			            
-            
-.search_nav { 
-font-size: 12px; font-weight: bold;
-color: #FFFFFF;
-background-color: #3399FF;
-margin: 1px;
-padding: 1px;
-border-color: #006600 #006600 #003300 #003300; 
-}         
- 			 
-.table_heading{ 
-font-weight: bold;
-color: #FFFFFF;
-font-size: 12px;
-text-align: center;
-vertical-align: middle;
-height: 14px;
-background-color: #CCCCCC;
-border-color: #FFFFFF #FFFFFF #F1F1F1 #FFFFFF;
-padding: 3px;
-border-style: solid;
-border-width: 0px
-}
-
-.table_heading_txt { 
-font-size: 12px;
-height: 14px;
-color: #FFFFFF;
-padding: 1px;
-}
-			
-.table_heading_cart { 
-font-weight: bold;
-color: #333333;
-font-size: 12px; 
-vertical-align: middle;
-height: 18px;
-background-color: #DBDBDB;
-border-color: #FFFFFF #FFFFFF #F1F1F1 #FFFFFF;
-padding: 5px; 
-}				
-				
-.row1 { 
-font-size: 11px; 
-background-color: #F9F9F9;
-color: #000000;
-}
-				
-.row2 { 
-font-size: 11px; 
-background-color: #FCFCFC;
-color: #000000;
-}
-						
-.row_select { 
-font-size: 11px; 
-background-color: #C9EEFF;
-color: #000000;
-}
-				
-.row_mouse_over{ 
-font-size: 11px; 
-background-color: #FFFFCC;
-color: #000000;	
-}
-				
-.row_mouse_over_select{  
-font-size: 11px; 
-background-color: #BEDFF1;
-color: #000000;
-}		
-
-.table_heading {
-font-weight: bold;
-color: #000000;
-font-size: large;
-text-align: center;
-vertical-align: middle;
-height: 14px;
-background-color: #CCCCCC;
-border-color: #CCCCCC;
-padding: 1px;
-border-style: solid;
-border-width: 2px }
-
-.table_background  {
-background-color: #FFFFFF;
-border: 1px solid #CCCCCC;
-padding: 1px
-}
-
-.menu_background {
-background-color: #FFFFFF;
-border: 1px solid #CCCCCC;
-padding: 1px
-} 
-
-
-div.auto_complete { width: 450px; background: #fff; }
-div.auto_complete ul { border:1px solid #888; margin:0; padding:0; width:100%; list-style-type:none; }
-div.auto_complete ul li { margin:0; padding:3px; }
-div.auto_complete ul li.selected {  background-color: #ffb;  }
-div.auto_complete ul strong.highlight {  color: #800;  margin:0; padding:0; }
diff --git a/themes/default/template.tpl b/themes/default/template.tpl
deleted file mode 100644
index e33ea8ab..00000000
--- a/themes/default/template.tpl
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-{$smarty.const.SITE_NAME} - Powered by Open Source Billing
-
-
-
-
-
-
-
-
-
-
-

-
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-
Logo

-			
-		
 

-			
-			

-				
-				{if $alert}
-					{$block->display('core:alert')}
-				{/if}
-				
-				{if $VAR._page != ''}
-					{$block->display($smarty.const.THEME_PAGE)}
-				{elseif $SESS_LOGGED == '1'}
-					{$block->display('account:account')}
-				{elseif $smarty.const.DEFAULT_PAGE != ''}
-					{$block->display($smarty.const.DEFAULT_PAGE)}
-				{else}
-				{/if}
-			

-		

-			

-				Billing Software Powered by AgileBill.  Copyright 2004-2008 Agileco, LLC

-				Open Source Billing Software Enhanced by OSB.  Copyright 2009-2010
-			

-		
 

-

-
-{if $list->auth_method_by_name('account','view') && $SESS_LOGGED == '1'}
-	
-{/if}
-
-
diff --git a/themes/default/top.js b/themes/default/top.js
deleted file mode 100644
index a8077526..00000000
--- a/themes/default/top.js
+++ /dev/null
@@ -1,124 +0,0 @@
-// check for cookies to determine if forms/urls need the session included.
-var SESS_check = get_cookie(cookie_name);
-if (SESS_check != SESS) {
-	// cookies on
-	var COOKIE = true;
-	var COOKIE_URL = '';
-	var COOKIE_FORM= '';
-} else {
- 	//cookies off
-	var COOKIE = false;
-	var COOKIE_URL = '&s=' + SESS;
-	var COOKIE_FORM = '';
-}
-
-if(sess_expires >= 120) {
-	sess_timeout = (sess_expires * 1000) - 60000;
-	var url = URL+'?_page=core:sess_timeout&_escape=true';
-	var win = 'SessTimeoutWin';
-	var settings = 'toolbar=no,status=yes,width=200,height=200';
-	ident=window.setTimeout("NewWindow(win,settings,url)",sess_timeout);
-}
-
-function get_cookie(name) {
-	var search = name + "="
-	var returnvalue = "";
-	if (document.cookie.length > 0) {
-		offset = document.cookie.indexOf(search)
-		if (offset != -1) {
-			offset += search.length
-			end = document.cookie.indexOf(";", offset);
-			if (end == -1) end = document.cookie.length;
-				returnvalue=unescape(document.cookie.substring(offset, end))
-		}
-	}
-	return returnvalue;
-}
-
-function refresh(delay,url) {
-	document.write('');
-}
-
-function NewWindow(win,settings,url) {
-	var eval1;
-	eval1 = win + '=window.open("' + url + '","' + win + '","' + settings + '");';
-	eval(eval1);
-}
-
-// Change the class for an object
-function class_change(obj,style) {
-	if(navigator.userAgent.indexOf("Netscape") != -1) {
-		var obj1 = document.getElementById(obj);
-		obj1.setAttribute('class', style);
-		return;
-	} else if(navigator.userAgent.indexOf("MSIE") != -1) {
-		eval(obj+'.className = "'+style+'";');
-		return;
-	} else if(navigator.userAgent.indexOf("Mozilla") != -1) {
-		var obj1 = document.getElementById(obj);
-		obj1.setAttribute('class', style);
-		return;
-	} else {
-		eval(obj+'.className = "'+style+'";');
-		return;
-	}
-}
-
-// View a record based on the item selected from the drop-down menu ($list->menu)
-function menu_item_view(module,id) {
-	var selected_id;
-	eval ('selected_id = document.getElementById("'+id+'").value;');
-	if(selected_id != '')
-		document.location = '?_page='+module+':view&id='+selected_id+',&s='+SESS;
-}
-
-// Add a record based on the item selected from the drop-down menu ($list->menu)
-function menu_item_add(module,id) {
-	var selected_id2;
-	eval ('selected_id2 = document.getElementById("'+id+'").value;');
-	if(selected_id2 != '')
-		document.location = '?_page='+module+':add&id='+selected_id2+',&s='+SESS;
-}
-
-// Display a Iframe
-function showIFrame(element,width,height,src) {
-	document.getElementById(element).style.width = width+'px';
-	document.getElementById(element).style.height = height+'px';
-	if(src != false)
-		frames[element].location.href = src;
-}
-
-// Hide an IFrame
-function hideIFrame(element) {
-	document.getElementById(element).style.width = '0px';
-	document.getElementById(element).style.height = '0px';
-	document.getElementById(element).style.align = 'center';
- 	return false;
-}
-
-// Get the page width
-function getPageWidth(defaultWidth) {
-	if (self.innerWidth) {
-		return self.innerWidth * .96;
-		//return defaultWidth;
-	} else if (document.documentElement && document.documentElement.clientWidth) {
-		//return document.documentElement.clientWidth;
-		return defaultWidth * .96;
-	} else if (document.body) {
-		return document.body.clientWidth *.96;
-	} else {
-		return defaultWidth;
-	}
-}
-
-function getHTTPObject() {
-	var xmlhttp;
-	if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-		try {
-			xmlhttp = new XMLHttpRequest();
-		} catch (e) {
-			xmlhttp = false;
-		}
-	}
-	return xmlhttp;
-}
diff --git a/themes/default/user_search.js b/themes/default/user_search.js
deleted file mode 100644
index 95ce86dd..00000000
--- a/themes/default/user_search.js
+++ /dev/null
@@ -1,262 +0,0 @@
-function search_nav_jump(jmp_to) {
-	var url = '?_page='+module+':user_search_show&search_id='+search_id+'&page='+jmp_to +'&' + sort1 + '&order_by=' + order + p + COOKIE_URL;
-	if(pgescape==true)
-		url += '&_escape=1';
-
-	window.location = url;
-}
-
-function search_nav_jump1(jmp_to) {
-	search_nav_jump(jmp_to);
-}
-
-function search_nav_top() {
-	if(pages <= 1) {
-		return '';
-
-	} else {
-		var rw = '';
-		var ff = '';
-		var jmp= '';
-
-		if(page > 1) {
-			var last = page - 1;
-			rw = ' ';
-			rw += '    ';
-		} else {
-			rw = '   ';
-			rw += '    ';
-		}
-
-		if(page < pages) {
-			var next = page;
-			next++;
-			ff = '   ';
-			ff += '   ';
-		} else {
-			ff = '   ';
-			ff += '   ';
-		}
-
-		jmp = ' ';
-		var ret = '
';
-		ret += '';
-		ret += '' + COOKIE_FORM;
-		ret += '';
-		ret += '
'+ rw +''+ jmp +''+ ff +'
';
-
-		return ret;
-	}
-}
-
-// search heading handler
-function search_heading(title,field) {
-	if(order == field) {
-		if(sort1 == 'desc=') {
-			newsort = 'asc';
-			newimg = 'desc.gif';
-		}
-
-		if(sort1 == 'asc=') {
-			newsort = 'desc';
-			newimg = 'asc.gif';
-		}
-
-	} else {
-		newsort = 'asc';
-		newimg = '';
-	}
-
-	var url = '?_page='+module+':user_search_show&search_id='+search_id+'&page='+page+'&'+newsort+'=&order_by='+field+''+p+COOKIE_URL;
-
-	if (newimg)
-		var returns = ''+title+' ';
-	else
-		var returns = ''+title+'';
-
-	return returns;
-}
-
-// Function to handle select/unselect of values
-function row_sel(id,type,style) {
-	if(type == 0) {
-		eval('document.getElementById("search_show").record'+id+'.checked = false;');
-		class_change('row'+id, style);
-		return;
-	}
-
-	eval('var checked = document.getElementById("search_show").record'+id+'.checked;');
-
-	if(checked == false) {
-		eval('document.getElementById("search_show").record'+id+'.checked = true;');
-	} else {
-		eval('document.getElementById("search_show").record'+id+'.checked = false;');
-	}
-
-	class_change('row'+id, 'row_select');
-	return;
-}
-
-// handles the mouseover event for row...
-function row_mouseover(id,style1,style2) {
-	eval('var checked = document.getElementById("search_show").record'+id+'.checked;');
-
-	class_change('row'+id, checked ? style1 : style2);
-}
-
-// handles the mouseover event for row...
-function row_mouseout(id,style1,style2) {
-	eval('var checked = document.getElementById("search_show").record'+id+'.checked;');
-
-	class_change('row'+id, checked ? style2 : style1);
-}
-
-// selects all the records
-function all_select() {
-	for(i=0; i < limit; i++) {
-		if(record_arr[i] != undefined) {
-			eval('document.getElementById("search_show").record'+record_arr[i]+'.checked = true;');
-			class_change('row'+record_arr[i],'row_select');
-		}
-	}
-}
-
-// unselects all the records
-function all_deselect() {
-	var c = true;
-	for(i=0; i < limit; i++) {
-		if(record_arr[i] != undefined) {
-			eval('document.getElementById("search_show").record'+record_arr[i]+'.checked = false;');
-			if(c) {
-				class_change('row'+record_arr[i],'row1');
-				c = false;
-			} else {
-				class_change('row'+record_arr[i],'row2');
-				c = true;
-			}
-		}
-	}
-}
-
-// select all the records between the first & last selected rows
-function all_range_select() {
-	var start = false;
-	var end = false;
-
-	for(i=0; i < limit; i++) {
-		if(record_arr[i] != undefined) {
-			eval('var checked = document.getElementById("search_show").record'+record_arr[i]+'.checked;');
-
-			if(checked != '') {
-				if(!start) {
-					start = true;
-				} else {
-					end = true;
-				}
-
-			} else {
-				if((start == true) && (end == false)) {
-					eval('document.getElementById("search_show").record'+record_arr[i]+'.checked = true;');
-					class_change('row'+record_arr[i],'row_select');
-				} else {
-					start = false;
-					end = false;
-				}
-			}
-		}
-	}
-}
-
-// Mass update, view, and delete controller
-function mass_do(doit, page, limit, module) {
-	var count = 0;
-	var id = '';
-
-	for(i=0; i < limit; i++) {
-		if(record_arr[i] != undefined) {
-			eval('var checked = document.getElementById("search_show").record'+record_arr[i]+'.checked;');
-			eval('var this_id = document.getElementById("search_show").record'+record_arr[i]+'.value;');
-
-			if(checked != '') {
-				count++;
-				id = id + this_id + ',';
-			}
-		}
-	}
-
-	if(count == 0) {
-		alert('You must first select some records for this action!');
-		return;
-	}
-
-	if(count > 0) {
-		var url = '?_page=' + page + '&id=' + id + '' + COOKIE_URL;
-
-		if(doit != '') {
-			url = url + '&do[]=' + module + ':' + doit;
-
-			if(doit == 'delete') {
-				if(count == 1) {
-					temp = window.confirm('Are you sure you wish to delete this record?');
-				} else {
-					temp = window.confirm('Are you sure you wish to delete these records?');
-				}
-
-				window.status=(temp)?'confirm:true':'confirm:false';
-				if(temp == false) return;
-
-			}
-		}
-
-		window.location = url;
-	}
-}
-
-var nav4 = document.search_results ? true : false;
-function key_handler(e) {
-	// Navigator 4.0x
-	if (nav4) {
-		var whichCode = e.which;
-	} else {
-		// Internet Explorer 4.0x
-		if (e.type == 'keypress') {
-			var whichCode = e.keyCode;
-		} else {
-			var whichCode = e.button;
-		}
-	}
-
-	if (e.type == 'keypress') {
-		var pressed = String.fromCharCode(whichCode);
-	} else {
-		var pressed = whichCode;
-	}
-
-	// determine the function to run, if any...
-	if(pressed == 's' || pressed == 'S') {
-		all_select(record_arr,limit);
-	}
-
-	if(pressed == 'd' || pressed == 'D') {
-		all_deselect(record_arr,limit);
-	}
-
-	if(pressed == 'r' || pressed == 'R') {
-		all_range_select(record_arr,limit);
-	}
-
-	if(pressed == 'x' || pressed == 'X') {
-		mass_do('delete', module+ ":user_search_show&search_id=" +search_id+ "&page=" +page+ "&order_by=" +order+ "&" +sort1, limit, module);
-	}
-
-	if(pressed == 'v' || pressed == 'V') {
-		mass_do('',module+":view", limit, module);
-	}
-}
diff --git a/themes/default/user_view.js b/themes/default/user_view.js
deleted file mode 100644
index 76c04155..00000000
--- a/themes/default/user_view.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Navigation handler, when viewing more than 1 record.
-var array_id = id.split(',');
-var array_ids = ids.split(',');
-
-if (array_id.length > 2) {
-	document.location = '?_page='+module+':user_view&id='+array_id[0]+'&ids='+id;
-} else if (array_ids.length > 2) {
-	document.write(view_nav_top(array_ids,id,ids));
-}
-
-function view_jump(jmp_to,ids) {
-	var url = '?_page='+module+':user_view&id='+jmp_to +'&ids='+ids;
-	if (pgescape==true)
-		url += '&_escape=true';
-	window.location = url;
-}
-
-function view_nav_top(array,id,ids) {
-	var rw = '';
-	var ff = '';
-	var jmp= '';
-
-	var t=array.length;
-
-	var last = false;
-	var next = false;
-	var last_id = array[t];
-
-	jmp = ' ';
-
-	if (array[0] != id) {
-		rw = ' ';
-		rw += '    ';
-	} else {
-		rw = '   ';
-		rw += '    ';
-	}
-
-	if (last_id != id) {
-		ff = '   ';
-		ff += '   ';
-	} else {
-		ff = '   ';
-		ff += '   ';
-	}
-
-	var ret = '
';
-	ret += '';
-	ret += '';
-	ret += '';
-	ret += '
'+rw+''+jmp+'
'+ff+'
';
-
-	return ret;
-}